From 0fd75419b849b5939a947f90be57a8f3415e0c5b Mon Sep 17 00:00:00 2001 From: haykam821 <24855774+haykam821@users.noreply.github.com> Date: Thu, 14 Sep 2023 07:56:09 -0400 Subject: [PATCH] Map changes to dispensers in 1.20.2 pre-release 4 (#3665) --- mappings/net/minecraft/block/DispenserBlock.mapping | 3 +++ mappings/net/minecraft/block/DropperBlock.mapping | 1 + .../net/minecraft/block/dispenser/DispenserBehavior.mapping | 1 + mappings/net/minecraft/world/WorldEvents.mapping | 4 ++-- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/block/DispenserBlock.mapping b/mappings/net/minecraft/block/DispenserBlock.mapping index 9362903060..e69a41d125 100644 --- a/mappings/net/minecraft/block/DispenserBlock.mapping +++ b/mappings/net/minecraft/block/DispenserBlock.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_2315 net/minecraft/block/DispenserBlock FIELD field_10919 BEHAVIORS Ljava/util/Map; FIELD field_10920 TRIGGERED Lnet/minecraft/class_2746; FIELD field_31082 SCHEDULED_TICK_DELAY I + FIELD field_46212 LOGGER Lorg/slf4j/Logger; METHOD method_10008 (Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;)V ARG 0 map METHOD method_10009 registerBehavior (Lnet/minecraft/class_1935;Lnet/minecraft/class_2357;)V @@ -14,3 +15,5 @@ CLASS net/minecraft/class_2315 net/minecraft/block/DispenserBlock ARG 1 stack METHOD method_10012 dispense (Lnet/minecraft/class_3218;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)V ARG 1 world + ARG 2 state + ARG 3 pos diff --git a/mappings/net/minecraft/block/DropperBlock.mapping b/mappings/net/minecraft/block/DropperBlock.mapping index 730a3ce05e..583b5a9ff9 100644 --- a/mappings/net/minecraft/block/DropperBlock.mapping +++ b/mappings/net/minecraft/block/DropperBlock.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_2325 net/minecraft/block/DropperBlock FIELD field_10949 BEHAVIOR Lnet/minecraft/class_2357; + FIELD field_46213 LOGGER Lorg/slf4j/Logger; diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping index 39c1473a71..a8b047221f 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior METHOD method_18346 registerDefaults ()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 entityType ARG 2 direction CLASS 3 METHOD method_27159 (Lnet/minecraft/class_1309;)Z diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping index 5d43b17af6..3f65c76496 100644 --- a/mappings/net/minecraft/world/WorldEvents.mapping +++ b/mappings/net/minecraft/world/WorldEvents.mapping @@ -223,8 +223,8 @@ CLASS net/minecraft/class_6088 net/minecraft/world/WorldEvents FIELD field_31159 DISPENSER_FAILS I COMMENT A dispenser fails to dispense an item. COMMENT
Plays the dispenser fail sound event. - COMMENT

Called by {@link net.minecraft.block.DispenserBlock#dispense(net.minecraft.server.world.ServerWorld, net.minecraft.util.math.BlockPos) DispenserBlock#dispense}, - COMMENT {@link net.minecraft.block.DropperBlock#dispense(net.minecraft.server.world.ServerWorld, net.minecraft.util.math.BlockPos) DropperBlock#dispense}, + COMMENT

Called by {@link net.minecraft.block.DispenserBlock#dispense(net.minecraft.server.world.ServerWorld, net.minecraft.block.BlockState, net.minecraft.util.math.BlockPos) DispenserBlock#dispense}, + COMMENT {@link net.minecraft.block.DropperBlock#dispense(net.minecraft.server.world.ServerWorld, net.minecraft.block.BlockState, net.minecraft.util.math.BlockPos) DropperBlock#dispense}, COMMENT and {@link net.minecraft.block.dispenser.FallibleItemDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) FallibleItemDispenserBehavior#playSound} FIELD field_31160 DISPENSER_LAUNCHES_PROJECTILE I COMMENT A dispenser launches a projectile.