From c1471bce86e4c778caec89b37b57158061eeef3d Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 13 Sep 2023 17:07:40 +0100 Subject: [PATCH] 1.20.2-pre4 --- build.gradle | 2 +- mappings/net/minecraft/block/DispenserBlock.mapping | 3 +-- .../block/dispenser/DispenserBehavior.mapping | 3 +-- .../entity/effect/StatusEffectInstance.mapping | 4 ---- .../net/minecraft/util/math/BlockPointer.mapping | 12 ++++++++---- .../net/minecraft/util/math/BlockPointerImpl.mapping | 6 ------ .../net/minecraft/util/math/PositionImpl.mapping | 8 -------- 7 files changed, 11 insertions(+), 27 deletions(-) delete mode 100644 mappings/net/minecraft/util/math/BlockPointerImpl.mapping delete mode 100644 mappings/net/minecraft/util/math/PositionImpl.mapping diff --git a/build.gradle b/build.gradle index efbb683931..3e7736fef3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "1.20.2-pre3" +def minecraft_version = "1.20.2-pre4" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/DispenserBlock.mapping b/mappings/net/minecraft/block/DispenserBlock.mapping index 5575410f3c..9362903060 100644 --- a/mappings/net/minecraft/block/DispenserBlock.mapping +++ b/mappings/net/minecraft/block/DispenserBlock.mapping @@ -12,6 +12,5 @@ CLASS net/minecraft/class_2315 net/minecraft/block/DispenserBlock ARG 0 pointer METHOD method_10011 getBehaviorForItem (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2357; ARG 1 stack - METHOD method_10012 dispense (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V + METHOD method_10012 dispense (Lnet/minecraft/class_3218;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)V ARG 1 world - ARG 2 pos diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping index 2c2764c920..39c1473a71 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping @@ -8,9 +8,8 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior ARG 0 pointer ARG 1 stack METHOD method_18346 registerDefaults ()V - METHOD method_27042 setEntityPosition (Lnet/minecraft/class_2342;Lnet/minecraft/class_1297;Lnet/minecraft/class_2350;)V + METHOD method_27042 setEntityPosition (Lnet/minecraft/class_2342;Lnet/minecraft/class_1299;Lnet/minecraft/class_2350;)Lnet/minecraft/class_243; ARG 0 pointer - ARG 1 entity ARG 2 direction CLASS 3 METHOD method_27159 (Lnet/minecraft/class_1309;)Z diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index a6b1f7a584..0668962d64 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -22,8 +22,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance FIELD field_5895 duration I FIELD field_5896 type Lnet/minecraft/class_1291; FIELD field_5897 LOGGER Lorg/slf4j/Logger; - METHOD (Lnet/minecraft/class_1291;)V - ARG 1 type METHOD (Lnet/minecraft/class_1291;I)V ARG 1 type ARG 2 duration @@ -53,8 +51,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 6 showIcon ARG 7 hiddenEffect ARG 8 factorCalculationData - METHOD (Lnet/minecraft/class_1293;)V - ARG 1 instance METHOD compareTo (Ljava/lang/Object;)I ARG 1 that METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/util/math/BlockPointer.mapping b/mappings/net/minecraft/util/math/BlockPointer.mapping index 6fbb5d556a..ce059d7109 100644 --- a/mappings/net/minecraft/util/math/BlockPointer.mapping +++ b/mappings/net/minecraft/util/math/BlockPointer.mapping @@ -1,5 +1,9 @@ CLASS net/minecraft/class_2342 net/minecraft/util/math/BlockPointer - METHOD method_10120 getBlockState ()Lnet/minecraft/class_2680; - METHOD method_10121 getBlockEntity ()Lnet/minecraft/class_2586; - METHOD method_10122 getPos ()Lnet/minecraft/class_2338; - METHOD method_10207 getWorld ()Lnet/minecraft/class_3218; + FIELD comp_1967 getWorld Lnet/minecraft/class_3218; + FIELD comp_1968 getPos Lnet/minecraft/class_2338; + FIELD comp_1969 getBlockState Lnet/minecraft/class_2680; + FIELD comp_1970 getBlockEntity Lnet/minecraft/class_2601; + METHOD comp_1967 getWorld ()Lnet/minecraft/class_3218; + METHOD comp_1968 getPos ()Lnet/minecraft/class_2338; + METHOD comp_1969 getBlockState ()Lnet/minecraft/class_2680; + METHOD comp_1970 getBlockEntity ()Lnet/minecraft/class_2601; diff --git a/mappings/net/minecraft/util/math/BlockPointerImpl.mapping b/mappings/net/minecraft/util/math/BlockPointerImpl.mapping deleted file mode 100644 index dbddf432e8..0000000000 --- a/mappings/net/minecraft/util/math/BlockPointerImpl.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_2345 net/minecraft/util/math/BlockPointerImpl - FIELD field_11011 world Lnet/minecraft/class_3218; - FIELD field_11012 pos Lnet/minecraft/class_2338; - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V - ARG 1 world - ARG 2 pos diff --git a/mappings/net/minecraft/util/math/PositionImpl.mapping b/mappings/net/minecraft/util/math/PositionImpl.mapping deleted file mode 100644 index 5b86eb2523..0000000000 --- a/mappings/net/minecraft/util/math/PositionImpl.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_2376 net/minecraft/util/math/PositionImpl - FIELD field_11117 z D - FIELD field_11118 y D - FIELD field_11119 x D - METHOD (DDD)V - ARG 1 x - ARG 3 y - ARG 5 z