From 30dc644d22a337a6cbb423cc07b8c577d7564b78 Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Sat, 29 Jun 2019 09:49:26 +0200 Subject: [PATCH] update Enigma, Stitch; drop unnecessary enum mappings --- build.gradle | 8 ++++---- .../mojang/blaze3d/platform/GlStateManager.mapping | 3 --- .../enchantment/EnchantmentTarget.mapping | 14 -------------- .../entity/ai/brain/task/CompositeTask.mapping | 2 -- .../boss/dragon/EnderDragonSpawnState.mapping | 5 ----- .../net/minecraft/network/NetworkState.mapping | 4 ---- .../server/command/AdvancementCommand.mapping | 2 -- mappings/net/minecraft/util/SystemUtil.mapping | 2 -- .../minecraft/util/math/AxisCycleDirection.mapping | 3 --- mappings/net/minecraft/util/math/Direction.mapping | 5 ----- .../minecraft/world/biome/layer/ScaleLayer.mapping | 1 - .../net/minecraft/world/chunk/UpgradeData.mapping | 6 ------ .../loot/function/CopyNbtLootFunction.mapping | 3 --- 13 files changed, 4 insertions(+), 54 deletions(-) diff --git a/build.gradle b/build.gradle index 4843021ff1..e425bdf365 100644 --- a/build.gradle +++ b/build.gradle @@ -8,8 +8,8 @@ buildscript { mavenLocal() } dependencies { - classpath "cuchaz:enigma:0.14.0.127" - classpath "net.fabricmc:stitch:0.2.1.58" + classpath "cuchaz:enigma:0.14.0.128" + classpath "net.fabricmc:stitch:0.2.1.60" classpath "commons-io:commons-io:2.6" classpath "com.google.guava:guava:28.0-jre" classpath 'de.undercouch:gradle-download-task:3.4.3' @@ -49,8 +49,8 @@ configurations { } dependencies { - enigmaRuntime "net.fabricmc:stitch:0.2.1.58" - enigmaRuntime "cuchaz:enigma:0.14.0.127:all" + enigmaRuntime "net.fabricmc:stitch:0.2.1.60" + enigmaRuntime "cuchaz:enigma:0.14.0.128:all" } def setupGroup = "jar setup" diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping index 98cb7f2159..48d8e0a9de 100644 --- a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping @@ -60,9 +60,6 @@ CLASS com/mojang/blaze3d/platform/GlStateManager FIELD field_5123 capFill Lcom/mojang/blaze3d/platform/GlStateManager$class_1018; FIELD field_5124 factor F CLASS class_1032 RenderMode - FIELD field_5125 TRANSPARENT_MODEL Lcom/mojang/blaze3d/platform/GlStateManager$class_1032; - FIELD field_5127 DEFAULT Lcom/mojang/blaze3d/platform/GlStateManager$class_1032; - FIELD field_5128 PLAYER_SKIN Lcom/mojang/blaze3d/platform/GlStateManager$class_1032; METHOD method_4472 begin ()V METHOD method_4473 end ()V CLASS class_1034 StencilSubState diff --git a/mappings/net/minecraft/enchantment/EnchantmentTarget.mapping b/mappings/net/minecraft/enchantment/EnchantmentTarget.mapping index 204288a8fb..5dd5995da4 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentTarget.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentTarget.mapping @@ -1,17 +1,3 @@ CLASS net/minecraft/class_1886 net/minecraft/enchantment/EnchantmentTarget - FIELD field_9068 ARMOR Lnet/minecraft/class_1886; - FIELD field_9069 DIGGER Lnet/minecraft/class_1886; - FIELD field_9070 BOW Lnet/minecraft/class_1886; - FIELD field_9071 ARMOR_CHEST Lnet/minecraft/class_1886; - FIELD field_9072 FISHING_ROD Lnet/minecraft/class_1886; - FIELD field_9073 TRIDENT Lnet/minecraft/class_1886; - FIELD field_9074 WEAPON Lnet/minecraft/class_1886; - FIELD field_9075 ALL Lnet/minecraft/class_1886; - FIELD field_9076 ARMOR_LEGS Lnet/minecraft/class_1886; - FIELD field_9078 WEARABLE Lnet/minecraft/class_1886; - FIELD field_9079 ARMOR_FEET Lnet/minecraft/class_1886; - FIELD field_9080 ARMOR_HEAD Lnet/minecraft/class_1886; - FIELD field_9081 CROSSBOW Lnet/minecraft/class_1886; - FIELD field_9082 BREAKABLE Lnet/minecraft/class_1886; METHOD method_8177 isAcceptableItem (Lnet/minecraft/class_1792;)Z ARG 1 item diff --git a/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping index 1edc150bb5..8ead8fce85 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/CompositeTask.mapping @@ -4,8 +4,6 @@ CLASS net/minecraft/class_4103 net/minecraft/entity/ai/brain/task/CompositeTask METHOD method_18939 apply (Lnet/minecraft/class_4131;)V ARG 1 list CLASS class_4216 RunMode - FIELD field_18855 RUN_ALL Lnet/minecraft/class_4103$class_4216; - FIELD field_18856 TRY_ALL Lnet/minecraft/class_4103$class_4216; FIELD field_18344 memoriesToForgetWhenStopped Ljava/util/Set; FIELD field_18345 order Lnet/minecraft/class_4103$class_4104; FIELD field_18346 runMode Lnet/minecraft/class_4103$class_4216; diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping index 1af21c3d92..72b05f3f67 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonSpawnState.mapping @@ -1,9 +1,4 @@ CLASS net/minecraft/class_2876 net/minecraft/entity/boss/dragon/EnderDragonSpawnState - FIELD field_13094 SUMMONING_PILLARS Lnet/minecraft/class_2876; - FIELD field_13095 PREPARING_TO_SUMMON_PILLARS Lnet/minecraft/class_2876; - FIELD field_13097 START Lnet/minecraft/class_2876; - FIELD field_13098 SUMMONING_DRAGOM Lnet/minecraft/class_2876; - FIELD field_13099 END Lnet/minecraft/class_2876; METHOD method_12507 run (Lnet/minecraft/class_3218;Lnet/minecraft/class_2881;Ljava/util/List;ILnet/minecraft/class_2338;)V ARG 1 world ARG 2 fight diff --git a/mappings/net/minecraft/network/NetworkState.mapping b/mappings/net/minecraft/network/NetworkState.mapping index 1f2cf23734..f7b6ca4621 100644 --- a/mappings/net/minecraft/network/NetworkState.mapping +++ b/mappings/net/minecraft/network/NetworkState.mapping @@ -1,10 +1,6 @@ CLASS net/minecraft/class_2539 net/minecraft/network/NetworkState FIELD field_11686 id I FIELD field_11687 HANDLER_STATE_MAP Ljava/util/Map; - FIELD field_11688 LOGIN Lnet/minecraft/class_2539; - FIELD field_11689 HANDSHAKING Lnet/minecraft/class_2539; - FIELD field_11690 PLAY Lnet/minecraft/class_2539; - FIELD field_11691 STATUS Lnet/minecraft/class_2539; FIELD field_11692 packetHandlerMap Ljava/util/Map; FIELD field_11693 STATES [Lnet/minecraft/class_2539; METHOD method_10781 getPacketId (Lnet/minecraft/class_2598;Lnet/minecraft/class_2596;)Ljava/lang/Integer; diff --git a/mappings/net/minecraft/server/command/AdvancementCommand.mapping b/mappings/net/minecraft/server/command/AdvancementCommand.mapping index 2e4cf19af5..f6f04fee62 100644 --- a/mappings/net/minecraft/server/command/AdvancementCommand.mapping +++ b/mappings/net/minecraft/server/command/AdvancementCommand.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_3008 net/minecraft/server/command/AdvancementCommand CLASS class_3009 Operation FIELD field_13454 commandPrefix Ljava/lang/String; - FIELD field_13456 REVOKE Lnet/minecraft/class_3008$class_3009; - FIELD field_13457 GRANT Lnet/minecraft/class_3008$class_3009; METHOD method_12999 processAll (Lnet/minecraft/class_3222;Ljava/lang/Iterable;)I METHOD method_13000 processEachCriterion (Lnet/minecraft/class_3222;Lnet/minecraft/class_161;Ljava/lang/String;)Z ARG 3 criterion diff --git a/mappings/net/minecraft/util/SystemUtil.mapping b/mappings/net/minecraft/util/SystemUtil.mapping index 844e5e5ed2..be15627b72 100644 --- a/mappings/net/minecraft/util/SystemUtil.mapping +++ b/mappings/net/minecraft/util/SystemUtil.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/SystemUtil CLASS class_157 IdentityHashStrategy CLASS class_158 OperatingSystem - FIELD field_1133 WINDOWS Lnet/minecraft/class_156$class_158; - FIELD field_1137 MAC Lnet/minecraft/class_156$class_158; METHOD method_669 open (Ljava/net/URL;)V METHOD method_670 open (Ljava/lang/String;)V METHOD method_672 open (Ljava/io/File;)V diff --git a/mappings/net/minecraft/util/math/AxisCycleDirection.mapping b/mappings/net/minecraft/util/math/AxisCycleDirection.mapping index 75f00c7430..249f30dbf2 100644 --- a/mappings/net/minecraft/util/math/AxisCycleDirection.mapping +++ b/mappings/net/minecraft/util/math/AxisCycleDirection.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/class_2335 net/minecraft/util/math/AxisCycleDirection FIELD field_10960 VALUES [Lnet/minecraft/class_2335; FIELD field_10961 AXES [Lnet/minecraft/class_2350$class_2351; - FIELD field_10962 NONE Lnet/minecraft/class_2335; - FIELD field_10963 FORWARD Lnet/minecraft/class_2335; - FIELD field_10965 BACKWARD Lnet/minecraft/class_2335; METHOD method_10055 opposite ()Lnet/minecraft/class_2335; METHOD method_10056 choose (IIILnet/minecraft/class_2350$class_2351;)I ARG 4 axis diff --git a/mappings/net/minecraft/util/math/Direction.mapping b/mappings/net/minecraft/util/math/Direction.mapping index 67dc9c78eb..39b7e888d2 100644 --- a/mappings/net/minecraft/util/math/Direction.mapping +++ b/mappings/net/minecraft/util/math/Direction.mapping @@ -9,10 +9,7 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction CLASS 3 METHOD test (Ljava/lang/Object;)Z ARG 1 context - FIELD field_11048 X Lnet/minecraft/class_2350$class_2351; FIELD field_11050 BY_NAME Ljava/util/Map; - FIELD field_11051 Z Lnet/minecraft/class_2350$class_2351; - FIELD field_11052 Y Lnet/minecraft/class_2350$class_2351; FIELD field_11053 name Ljava/lang/String; METHOD a (Ljava/util/Random;)Lfa$a; ARG 0 random @@ -28,10 +25,8 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction METHOD method_10179 isHorizontal ()Z METHOD method_10180 getType ()Lnet/minecraft/class_2350$class_2353; CLASS class_2352 AxisDirection - FIELD field_11056 POSITIVE Lnet/minecraft/class_2350$class_2352; FIELD field_11057 desc Ljava/lang/String; FIELD field_11059 offset I - FIELD field_11060 NEGATIVE Lnet/minecraft/class_2350$class_2352; METHOD method_10181 offset ()I CLASS class_2353 Type FIELD field_11061 facingArray [Lnet/minecraft/class_2350; diff --git a/mappings/net/minecraft/world/biome/layer/ScaleLayer.mapping b/mappings/net/minecraft/world/biome/layer/ScaleLayer.mapping index 72819c1c75..b5e53f5160 100644 --- a/mappings/net/minecraft/world/biome/layer/ScaleLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/ScaleLayer.mapping @@ -1,2 +1 @@ CLASS net/minecraft/class_3656 net/minecraft/world/biome/layer/ScaleLayer - FIELD field_16198 FUZZY Lnet/minecraft/class_3656; diff --git a/mappings/net/minecraft/world/chunk/UpgradeData.mapping b/mappings/net/minecraft/world/chunk/UpgradeData.mapping index 8eb0cf7811..bc56280e2c 100644 --- a/mappings/net/minecraft/world/chunk/UpgradeData.mapping +++ b/mappings/net/minecraft/world/chunk/UpgradeData.mapping @@ -1,10 +1,4 @@ CLASS net/minecraft/class_2843 net/minecraft/world/chunk/UpgradeData - CLASS class_2845 - FIELD field_12957 BLACKLIST Lnet/minecraft/class_2843$class_2845; - FIELD field_12958 STEM_BLOCK Lnet/minecraft/class_2843$class_2845; - FIELD field_12960 CHEST Lnet/minecraft/class_2843$class_2845; - FIELD field_12962 DEFAULT Lnet/minecraft/class_2843$class_2845; - FIELD field_12963 LEAVES Lnet/minecraft/class_2843$class_2845; FIELD field_12950 NO_UPGRADE_DATA Lnet/minecraft/class_2843; FIELD field_12951 sides Ljava/util/EnumSet; FIELD field_12955 indices [[I diff --git a/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping b/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping index 5c924356af..83a3d96236 100644 --- a/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping +++ b/mappings/net/minecraft/world/loot/function/CopyNbtLootFunction.mapping @@ -50,9 +50,6 @@ CLASS net/minecraft/class_3837 net/minecraft/world/loot/function/CopyNbtLootFunc ARG 1 compoundTag METHOD a (Ljava/util/List;Lit;)V ARG 1 foundTag - FIELD field_17032 REPLACE Lnet/minecraft/class_3837$class_3841; - FIELD field_17033 APPEND Lnet/minecraft/class_3837$class_3841; - FIELD field_17034 MERGE Lnet/minecraft/class_3837$class_3841; FIELD field_17035 name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name