Update to rc1

Patbox · Nov 28, 2024 · 25c25ff · 25c25ff
1 parent 7a4f7fe
commit 25c25ff
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,16 +4,16 @@ org.gradle.jvmargs=-Xmx4G
 # Fabric Properties
 	# check these on https://fabricmc.net/use
 
-minecraft_version=1.21.4-pre3
-yarn_mappings=1.21.4-pre3+build.2
+minecraft_version=1.21.4-rc1
+yarn_mappings=1.21.4-rc1+build.1
 loader_version=0.16.9
 
 # Fabric API
 fabric_version=0.110.2+1.21.4
 
 maven_group = eu.pb4
 
-mod_version = 0.11.0-alpha.1
+mod_version = 0.11.0
 
 minecraft_version_supported = ">=1.21.4-"
 

diff --git a/polymer-common/src/main/java/eu/pb4/polymer/common/api/PolymerCommonUtils.java b/polymer-common/src/main/java/eu/pb4/polymer/common/api/PolymerCommonUtils.java
@@ -33,7 +33,7 @@ private PolymerCommonUtils() {}
 
     public static final SimpleEvent<ResourcePackChangeCallback> ON_RESOURCE_PACK_STATUS_CHANGE = new SimpleEvent<>();
     private static Path cachedClientPath;
-    private final static String SAFE_CLIENT_SHA1 = "b6959dbb500a337a3a26c0ab3ca27216750bcd9f";
+    private final static String SAFE_CLIENT_SHA1 = "e879469d52776f40a14fe8472e8a02dafdf4dc27";
     private final static String SAFE_CLIENT_URL = "https://piston-data.mojang.com/v1/objects/" + SAFE_CLIENT_SHA1 + "/client.jar";
     private static Path cachedClientJarRoot;
 

diff --git a/polymer-core/src/testmod/java/eu/pb4/polymertest/TestMod.java b/polymer-core/src/testmod/java/eu/pb4/polymertest/TestMod.java
@@ -59,6 +59,7 @@
 import net.minecraft.village.VillagerProfession;
 import net.minecraft.world.GameMode;
 import net.minecraft.world.World;
+import org.apache.commons.lang3.mutable.MutableInt;
 import xyz.nucleoid.server.translations.api.LocalizationTarget;
 
 import java.io.IOException;
@@ -500,19 +501,26 @@ public void onInitialize() {
         new Thread(() -> {
             var vanillaJar = PolymerCommonUtils.getClientJarRoot();
 
-            var itemsBase = vanillaJar.resolve("assets/minecraft/items/");
+            var itemsBase = vanillaJar.resolve("/assets/minecraft/items/");
 
             try {
+                var value = new MutableInt();
+                var count = new MutableInt();
                 Files.walk(itemsBase, 1).forEach(path -> {
+                    if (path.equals(itemsBase)) {
+                        return;
+                    }
+                    count.increment();
                     try {
                         var asset = ItemAsset.fromJson(Files.readString(path));
                         //System.out.println(path + ">" + asset);
+                        value.increment();
                     } catch (Throwable e) {
                         System.err.println("Error while parsing file: " + path);
                         e.printStackTrace();
                     }
-
                 });
+                System.out.println("Parsed " + value + " out of " + count + " models!");
             } catch (IOException e) {
                 e.printStackTrace();
             }