fix sorting bug, bump to 1.17-pre1

.gitlab-ci.yml

@@ -13,6 +13,7 @@ cache:
 
 stages:
   - build
+  - 1.17.1-pre1
   - 1.17.0
   - 1.16.5
   - 1.16.2
@@ -25,6 +26,12 @@ build:
     - "cd wrapper && python3 PixLyzer.py --only-version=1.17 --dont-compile --only-map"
     - 'cd ../ && mvn clean $MAVEN_CLI_OPTS verify'
 
+1.17.1-pre1:
+  stage: 1.17.1-pre1
+  script:
+    - "cd wrapper && python3 PixLyzer.py --only-version=1.17.1-pre1 --dont-compile"
+
+
 1.17.0:
   stage: 1.17.0
   script:

pom.xml

@@ -17,7 +17,7 @@
         <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <minecraft.version>1.17</minecraft.version>
+        <minecraft.version>1.17.1-pre1</minecraft.version>
     </properties>
 
     <repositories>

src/main/kotlin/de/bixilon/pixlyzer/generator/generators/ItemGenerator.kt

@@ -9,6 +9,7 @@ import de.bixilon.pixlyzer.util.ReflectionUtil.getField
 import de.bixilon.pixlyzer.util.ReflectionUtil.getGetter
 import de.bixilon.pixlyzer.util.Util.nullCast
 import de.bixilon.pixlyzer.util.Util.realName
+import de.bixilon.pixlyzer.util.Util.sort
 import de.bixilon.pixlyzer.util.Util.toJsonArray
 import net.minecraft.block.Block
 import net.minecraft.block.BlockState
@@ -110,7 +111,7 @@ object ItemGenerator : Generator(
                         effectiveMaterials.add(MaterialGenerator.MATERIALS.inverse()[material].toString())
                     }
                     if (effectiveMaterials.size() > 0) {
-                        itemData.add("effective_materials", effectiveMaterials)
+                        itemData.add("effective_materials", effectiveMaterials.sort())
                     }
                 }
             }

src/main/kotlin/de/bixilon/pixlyzer/util/Util.kt

@@ -1,6 +1,7 @@
 package de.bixilon.pixlyzer.util
 
 import com.google.gson.JsonArray
+import com.google.gson.JsonElement
 import com.google.gson.JsonObject
 import com.google.gson.JsonParser
 import net.minecraft.client.MinecraftClient
@@ -78,4 +79,20 @@ object Util {
         }
         return false
     }
+
+    fun JsonArray.sort(): JsonArray {
+        val elements: MutableList<JsonElement> = mutableListOf()
+
+        for (element in this) {
+            elements.add(element)
+        }
+
+        val output = JsonArray()
+        for (element in elements.toSortedSet { first: JsonElement, second: JsonElement ->
+            first.hashCode() - second.hashCode()
+        }) {
+            output.add(element)
+        }
+        return output
+    }
 }

wrapper/PixLyzer.py

@@ -38,9 +38,9 @@ YARN_MANIFEST_URL = "https://maven.fabricmc.net/net/fabricmc/yarn/versions.json"
 TINY_MAPPINGS_BASE_URL = "https://maven.fabricmc.net/net/fabricmc/yarn/"
 INTERMEDIARY_BASE_URL = "https://maven.fabricmc.net/net/fabricmc/intermediary/"
 
-COMPILE_VERSION = "1.17"
+COMPILE_VERSION = "1.17.1-pre1"
 
-MAJOR_VERSIONS = [COMPILE_VERSION, "1.16.5", "1.15.2", "1.14.4"]
+MAJOR_VERSIONS = [COMPILE_VERSION, "1.17", "1.16.5", "1.15.2", "1.14.4"]
 
 failedVersionIds = []
 partlyFailedVersionIds = []