Update to 1.21.3

.github/workflows/build.yml

@@ -35,10 +35,10 @@ jobs:
       - name: compress png
         run: chmod +x ./oxipng/oxipng && ./oxipng/oxipng -o max -s -a -r src
       - name: build
-        run: ./gradlew downloadTranslations build
+        run: ./gradlew build
       - name: capture build artifacts
         if: ${{ runner.os == 'Linux' }} # Only upload artifacts built from LTS java on one OS
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Artifacts
           path: build/libs/

.github/workflows/release.yml

@@ -33,13 +33,13 @@ jobs:
       - name: compress png
         run: chmod +x ./oxipng/oxipng && ./oxipng/oxipng -o max -s -a -r src
       - name: Build and publish with Gradle
-        run: ./gradlew downloadTranslations build publish
+        run: ./gradlew build publish
         env:
           MODRINTH: ${{ secrets.MODRINTH }}
           CHANGELOG: ${{ github.event.release.body }}
           RELEASE: true
       - name: Upload GitHub release
-        uses: AButler/upload-release-assets@v2.0
+        uses: AButler/upload-release-assets@v3.0
         with:
           files: 'build/libs/*.jar;!build/libs/*-sources.jar;!build/libs/*-dev.jar'
           repo-token: ${{ secrets.GITHUB_TOKEN }}

build.gradle

@@ -1,17 +1,5 @@
-buildscript {
-	dependencies {
-		classpath "de.guntram.mcmod:crowdin-translate:1.4+1.19.3"
-	}
-	repositories {
-		maven {
-			name = 'CrowdinTranslate source'
-			url = "https://minecraft.guntram.de/maven/"
-		}
-	}
-}
-
 plugins {
-	id 'fabric-loom' version '1.6.+'
+	id 'fabric-loom' version '1.7.+'
 	id "com.modrinth.minotaur" version "2.+"
 	id 'maven-publish'
 }
@@ -22,12 +10,6 @@ targetCompatibility = JavaVersion.VERSION_21
 archivesBaseName = project.archives_base_name
 group = project.maven_group
 
-apply plugin: 'de.guntram.mcmod.crowdin-translate'
-crowdintranslate.crowdinProjectName = 'patbox-mods'
-crowdintranslate.jsonSourceName = 'polyfactory'
-crowdintranslate.minecraftProjectName = 'polyfactory'
-crowdintranslate.verbose = false
-
 
 if (System.getenv("CI") != null) {
 	if (System.getenv("RELEASE") != null) {
@@ -95,22 +77,22 @@ dependencies {
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-	modImplementation 'eu.pb4:polymer-core:0.9.12+1.21.1'
-	modImplementation 'eu.pb4:polymer-resource-pack:0.9.12+1.21.1'
-	modImplementation 'eu.pb4:polymer-autohost:0.9.12+1.21.1'
-	modImplementation 'eu.pb4:polymer-virtual-entity:0.9.12+1.21.1'
-	modImplementation include('eu.pb4:map-canvas-api:0.4.2+1.21.1')
+	modImplementation 'eu.pb4:polymer-core:0.10.1+1.21.3'
+	modImplementation 'eu.pb4:polymer-resource-pack:0.10.1+1.21.3'
+	modImplementation 'eu.pb4:polymer-autohost:0.10.1+1.21.3'
+	modImplementation 'eu.pb4:polymer-virtual-entity:0.10.1+1.21.3'
+	modImplementation include('eu.pb4:map-canvas-api:0.5.0+1.21.3')
 	modImplementation include('eu.pb4:common-protection-api:1.0.0')
 	modImplementation include('eu.pb4:sidebar-api:0.5.1+1.21.1')
-	modImplementation include('eu.pb4:sgui:1.6.0+1.21')
-	modImplementation include('eu.pb4:factorytools:0.3.2+1.21')
+	modImplementation include('eu.pb4:sgui:1.7.2+1.21.2')
+	modImplementation include('eu.pb4:factorytools:0.4.1+1.21.3')
 	modImplementation include('com.kneelawk.graphlib:graphlib-core-fabric:2.0.3+1.21')
 
 	// Temp hack to allow development
 	//modImplementation include('com.kneelawk:graphlib:1.99.99+1.20.local')
 	//modImplementation include('alexiil.mc.lib:libnetworkstack-base:0.11.0-aaa.patbox')
 
-	modCompileOnly 'maven.modrinth:polydex:1.2.3+1.21'
+	modCompileOnly 'maven.modrinth:polydex:1.3.0+1.21.2'
 	//modCompileOnly 'eu.pb4:polydex:1.2.3-dev2+1.21'
 	// Uncomment the following line to enable the deprecated Fabric API modules.
 	// These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.

gradle.properties

@@ -4,14 +4,14 @@ org.gradle.parallel=true
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.21.1
-	yarn_mappings=1.21.1+build.1
-	loader_version=0.15.11
+	minecraft_version=1.21.3
+	yarn_mappings=1.21.3+build.1
+	loader_version=0.16.7
 
 # Mod Properties
-	mod_version = 0.4.2
+	mod_version = 0.5.0
 	maven_group = eu.pb4
 	archives_base_name = polyfactory
 
 # Dependencies
-	fabric_version=0.102.0+1.21.1
+	fabric_version=0.106.1+1.21.3

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/eu/pb4/polyfactory/FactoryCommands.java

@@ -6,7 +6,6 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import eu.pb4.factorytools.api.virtualentity.BlockModel;
 import eu.pb4.factorytools.api.virtualentity.LodItemDisplayElement;
-import eu.pb4.factorytools.impl.DebugData;
 import eu.pb4.polymer.virtualentity.impl.HolderHolder;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.minecraft.command.CommandRegistryAccess;

src/main/java/eu/pb4/polyfactory/ModInit.java

@@ -83,30 +83,15 @@ public void onInitialize() {
 		FactoryModels.load();
 
 		ConveyorModels.registerAssetsEvents();
-		initModels();
 		UiResourceCreator.setup();
 		GuiTextures.register();
 		PolydexCompat.register();
 		PolymerResourcePackUtils.addModAssets(ID);
+		PolymerResourcePackUtils.addBridgedModelsFolder(id("block"), id("sgui"));
 		PolymerResourcePackUtils.markAsRequired();
 
 		FluidTextures.setup();
 
 		ServerPlayConnectionEvents.JOIN.register(FactorySecrets::onJoin);
 	}
-
-	@SuppressWarnings("ResultOfMethodCallIgnored")
-	private void initModels() {
-		AxleBlock.Model.ITEM_MODEL.getItem();
-		WindmillBlock.Model.MODEL.getItem();
-		AxleWithGearBlock.Model.ITEM_MODEL_1.getItem();
-		AxleWithLargeGearBlock.Model.GEAR_MODEL.getItem();
-		PlanterBlock.Model.OUTPUT_1.getItem();
-		TinyPotatoSpringBlock.Model.BASE_MODEL.getItem();
-		RedstoneOutputBlock.Model.OUTPUT_OVERLAY.item();
-		GenericParts.SMALL_GEAR.isEmpty();
-		DoubleInputTransformerBlock.Model.INPUT_A.getItem();
-		DataMemoryBlock.Model.POWERED_MODEL.getItem();
-		PumpBlock.Model.BLOCK_MODEL.getItem();
-	}
 }