Merge pull request #663 from supersaiyansubtlety/24w45a-re-merge

24w45a re merge
QuiltMC · Nov 11, 2024 · 7465c89 · 7465c89 · github-actions · Nov 11, 2024
2 parents 747838a + be473eb
commit 7465c89
Show file tree

Hide file tree

Showing 196 changed files with 1,544 additions and 67 deletions.
diff --git a/buildSrc/src/main/resources/minecraft_specific_words.txt b/buildSrc/src/main/resources/minecraft_specific_words.txt
@@ -106,6 +106,7 @@ whitelisted
 shorthair
 highlightable
 timespan
+chainmail
 
 // commands
 deop

diff --git a/buildSrc/src/test/java/quilt/internal/TasksTest.java b/buildSrc/src/test/java/quilt/internal/TasksTest.java
@@ -1,5 +1,6 @@
 package quilt.internal;
 
+import daomephsta.unpick.constantmappers.datadriven.parser.UnpickSyntaxException;
 import net.fabricmc.mappingio.tree.MappingTree;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.MethodOrderer;
@@ -48,6 +49,7 @@ public class TasksTest {
     private static Path mappingsDir;
     private static Path profilePath;
     private static Path unpickDefinitions;
+    private static Path brokenUnpickDefinitions;
 
     private static Path perVersionMappingsJar;
     private static Path outputsDir;
@@ -91,6 +93,7 @@ public static void setup() throws Exception {
         mappingsDir = testProjectDir.resolve("mappings/");
         profilePath = testProjectDir.resolve("enigma_profile.json");
         unpickDefinitions = testProjectDir.resolve("unpick-definitions/");
+        brokenUnpickDefinitions = testProjectDir.resolve("broken-unpick-definitions/");
 
         perVersionMappings = getResource("/test-intermediate.tiny");
         perVersionMappingsJar = testProjectDir.resolve("test-hashed.jar");
@@ -263,6 +266,13 @@ public void testCombineUnpickDefinitions() throws Exception {
         assertEquals("g_type", file.getReturnConstantGroup("com/example/GClass", "toType", "(Ljava/lang/String;)I"));
     }
 
+    @Test
+    public void testCombineBrokenUnpickDefinitions() {
+        Path output = outputsDir.resolve("broken-combined-definitions.unpick");
+        Collection<File> input = List.of(brokenUnpickDefinitions.toFile().listFiles());
+        assertThrows(UnpickSyntaxException.class, () -> CombineUnpickDefinitionsTask.combineUnpickDefinitions(input, output));
+    }
+
     @Test
     @Order(7)
     public void testRemapUnpickDefinitions() throws Exception {

diff --git a/buildSrc/src/test/java/quilt/internal/TestUtil.java b/buildSrc/src/test/java/quilt/internal/TestUtil.java
@@ -42,19 +42,19 @@ private static void writeTree(Path path, MappingTree tree, MappingFormat format)
     }
 
     public static MemoryMappingTree readTinyV2(Path path) throws IOException {
-        return readTree(path, MappingFormat.TINY_2);
+        return readTree(path, MappingFormat.TINY_2_FILE);
     }
 
     public static void writeTinyV2(Path path, MappingTree tree) throws IOException {
-        writeTree(path, tree, MappingFormat.TINY_2);
+        writeTree(path, tree, MappingFormat.TINY_2_FILE);
     }
 
     public static MemoryMappingTree readEnigma(Path path) throws IOException {
-        return readTree(path, MappingFormat.ENIGMA);
+        return readTree(path, MappingFormat.ENIGMA_DIR);
     }
 
     public static void writeEnigma(Path path, MappingTree tree) throws IOException {
-        writeTree(path, tree, MappingFormat.ENIGMA);
+        writeTree(path, tree, MappingFormat.ENIGMA_DIR);
     }
 
     public static UnpickFile readUnpickFile(Path path, Path jar) throws Exception {

diff --git a/buildSrc/src/test/resources/testProject/broken-unpick-definitions/no_header.unpick b/buildSrc/src/test/resources/testProject/broken-unpick-definitions/no_header.unpick
@@ -0,0 +1,5 @@
+flag f_flags com/example/FEnum FLAG_LEFT
+flag f_flags com/example/FEnum FLAG_RIGHT
+
+target_method com/example/FEnum <init> (Ljava/lang/String;II)V
+	param 0 f_flags
diff --git a/buildSrc/src/test/resources/testProject/broken-unpick-definitions/working.unpick b/buildSrc/src/test/resources/testProject/broken-unpick-definitions/working.unpick
@@ -0,0 +1,10 @@
+v2
+
+flag e_flags com/example/EClass FLAG_A
+flag e_flags com/example/EClass FLAG_B
+flag e_flags com/example/EClass FLAG_C
+flag e_flags com/example/EClass FLAG_D
+
+# Test comment
+target_method com/example/EClass m1 (I)V
+	param 0 e_flags
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ enigma = "2.5.2"
 enigma_plugin = "2.3.1"
 tiny_remapper = "0.7.2"
 stitch = "0.6.1"
-unpick = "3.0.8"
+unpick = "3.0.10"
 mapping_io = "0.6.1"
 javadoc_draftsman = "1.2.3"
 

diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping
@@ -60,6 +60,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 		ARG 4 context
 	METHOD m_fsimvkxt getCullingShape (Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_zscvhwbd;
 		ARG 1 state
+	METHOD m_fwpxnldx getInsideCollisionShape (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zscvhwbd;
 	METHOD m_gzvkqagj createScreenHandlerFactory (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_soxpxdhu;
 		ARG 1 state
 		ARG 2 world
@@ -340,6 +341,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 			ARG 1 block
 				COMMENT the block instance to match
 		METHOD m_geunkiif hasModelOffset ()Z
+		METHOD m_hhjvgbvf getInsideCollisionShape (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zscvhwbd;
 		METHOD m_hndkckmc spawnsDustParticles ()Z
 		METHOD m_hnwtgjio streamTags ()Ljava/util/stream/Stream;
 			COMMENT {@return a stream of tag keys this block is in}

diff --git a/mappings/net/minecraft/client/input/Input.mapping b/mappings/net/minecraft/client/input/Input.mapping
@@ -1,3 +1,4 @@
 CLASS net/minecraft/unmapped/C_graemaps net/minecraft/client/input/Input
+	FIELD f_bltkqzwh empty Lnet/minecraft/unmapped/C_graemaps;
 	FIELD f_henmwcos pressingLeft Z
 	FIELD f_vrmirqod pressingRight Z
diff --git a/mappings/net/minecraft/component/type/EquippableComponent.mapping b/mappings/net/minecraft/component/type/EquippableComponent.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/unmapped/C_duiqsjgf net/minecraft/component/type/EquippableComponent
diff --git a/mappings/net/minecraft/component/type/UnbreakableComponent.mapping b/mappings/net/minecraft/component/type/UnbreakableComponent.mapping
@@ -2,7 +2,7 @@ CLASS net/minecraft/unmapped/C_drqhpkfg net/minecraft/component/type/Unbreakable
 	FIELD f_iaeyiyom TOOLTIP Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_ivwonplx shownInTooltip Z
 	METHOD m_nnvtyjlt shownInTooltip ()Z
-	METHOD m_nrzkdjww create (Z)Lnet/minecraft/unmapped/C_drqhpkfg;
+	METHOD m_nrzkdjww withShownInTooltip (Z)Lnet/minecraft/unmapped/C_drqhpkfg;
 		ARG 1 shownInTooltip
 	METHOD m_sksdhjpx (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
diff --git a/mappings/net/minecraft/component/type/UseCooldownComponent.mapping b/mappings/net/minecraft/component/type/UseCooldownComponent.mapping
@@ -0,0 +1,3 @@
+CLASS net/minecraft/unmapped/C_elkynmne net/minecraft/component/type/UseCooldownComponent
+	METHOD m_bozsonlt getTicks ()I
+	METHOD m_vpoqolhn apply (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_usxaxydn;)V
diff --git a/mappings/net/minecraft/component/type/UseRemainderComponent.mapping b/mappings/net/minecraft/component/type/UseRemainderComponent.mapping
@@ -0,0 +1,6 @@
+CLASS net/minecraft/unmapped/C_jugjlqvm net/minecraft/component/type/UseRemainderComponent
+	METHOD m_rupthpty convert (Lnet/minecraft/unmapped/C_sddaxwyk;IZLnet/minecraft/unmapped/C_jugjlqvm$C_otiqgudp;)Lnet/minecraft/unmapped/C_sddaxwyk;
+		ARG 2 oldCount
+		ARG 3 creative
+		ARG 4 returner
+	CLASS C_otiqgudp StackReturner
diff --git a/mappings/net/minecraft/data/server/LootTablesProvider.mapping b/mappings/net/minecraft/data/server/LootTablesProvider.mapping
@@ -8,7 +8,7 @@ CLASS net/minecraft/unmapped/C_rriyyrek net/minecraft/data/server/LootTablesProv
 		ARG 1 dataPackOutput
 	METHOD m_cvuljxmh (Lnet/minecraft/unmapped/C_temnquoh;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 writer
-		ARG 2 lookupProvider
+		ARG 2 registries
 	METHOD m_iccnzkqh (Lnet/minecraft/unmapped/C_temnquoh;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Ljava/util/concurrent/CompletionStage;
 		ARG 2 provider
 	METHOD m_pkqhglxx (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Ljava/util/Map;Lnet/minecraft/unmapped/C_eexxncvi;Lnet/minecraft/unmapped/C_rriyyrek$C_ujsjtlmo;)V

diff --git a/mappings/net/minecraft/data/server/loot_table/EntityLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loot_table/EntityLootTableGenerator.mapping
@@ -1,7 +1,10 @@
 CLASS net/minecraft/unmapped/C_egeqzyvk net/minecraft/data/server/loot_table/EntityLootTableGenerator
 	FIELD f_lyzsfsde lootTables Ljava/util/Map;
 	FIELD f_pordewqu allowedFeatures Lnet/minecraft/unmapped/C_czxxrbcp;
+	FIELD f_qjcpnzik registries Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;
 	FIELD f_xwhijief requiredFeatures Lnet/minecraft/unmapped/C_czxxrbcp;
+	METHOD <init> (Lnet/minecraft/unmapped/C_czxxrbcp;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V
+		ARG 1 requiredFeatures
 	METHOD m_dmtatuce frogDamageSource (Lnet/minecraft/unmapped/C_pzdchrcy;)Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;
 	METHOD m_ltaoqnev generate ()V
 	METHOD m_nxkzkqkr putLootTable (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_inwsuliy$C_daaljsfu;)V

diff --git a/mappings/net/minecraft/entity/AnimationState.mapping b/mappings/net/minecraft/entity/AnimationState.mapping
@@ -1,12 +1,17 @@
 CLASS net/minecraft/unmapped/C_kxntavoz net/minecraft/entity/AnimationState
-	FIELD f_mynxnfft INVALID_TIME I
+	FIELD f_mynxnfft STOPPED I
+	FIELD f_slrycntl startTick I
 	METHOD m_cpvhojvm fastForward (IF)V
 		ARG 1 seconds
 		ARG 2 speedMultiplier
 	METHOD m_drcnbqst isAnimating ()Z
 	METHOD m_eyncnhvh animateIf (ZI)V
 		ARG 1 condition
 		ARG 2 start
+	METHOD m_fjeaaddd copyFrom (Lnet/minecraft/unmapped/C_kxntavoz;)V
+		ARG 1 state
+	METHOD m_hbqomwtk getTimeMillis (F)J
+		ARG 1 ticks
 	METHOD m_ipvmrdzh stop ()V
 	METHOD m_nbtuouwc restart (I)V
 		ARG 1 start

diff --git a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping
@@ -26,6 +26,7 @@ CLASS net/minecraft/unmapped/C_dtsrsfye net/minecraft/entity/AreaEffectCloudEnti
 		ARG 6 z
 	METHOD m_bfrkvfja setRadiusGrowth (F)V
 		ARG 1 growth
+	METHOD m_dplbdkym tickClient ()V
 	METHOD m_eqkyeibg getRadiusOnUse ()F
 	METHOD m_ereonukk setDurationOnUse (I)V
 		ARG 1 durationOnUse
@@ -55,3 +56,4 @@ CLASS net/minecraft/unmapped/C_dtsrsfye net/minecraft/entity/AreaEffectCloudEnti
 		ARG 1 waiting
 	METHOD m_volshxzg isWaiting ()Z
 	METHOD m_wqpyilil getDuration ()I
+	METHOD m_xulccvfs tickServer (Lnet/minecraft/unmapped/C_bdwnwhiu;)V
diff --git a/mappings/net/minecraft/entity/ElytraAnimationState.mapping b/mappings/net/minecraft/entity/ElytraAnimationState.mapping
@@ -0,0 +1,13 @@
+CLASS net/minecraft/unmapped/C_raqyxzkb net/minecraft/entity/ElytraAnimationState
+	FIELD f_abffbhoa yaw F
+	FIELD f_cqtoagfd DEFAULT_PITCH F
+	FIELD f_euxkgdhp roll F
+	FIELD f_gtjjiatm lastRoll F
+	FIELD f_mqktoujp lastPitch F
+	FIELD f_ondamjfd lastYaw F
+	FIELD f_tvmvorkj DEFAULT_ROLL F
+	FIELD f_yerwbabc pitch F
+	METHOD m_hbtboris getRoll (F)F
+	METHOD m_krukcnbc getYaw (F)F
+	METHOD m_srnvybfn getPitch (F)F
+	METHOD m_vqxiufsb tick ()V