From b4a8c9d8c10d9aceb50dac99a0747c0c8fb5ceb8 Mon Sep 17 00:00:00 2001 From: frqnny <45723631+frqnny@users.noreply.github.com> Date: Fri, 6 May 2022 09:45:42 -0400 Subject: [PATCH] Small amount of Block Mappings + Game Events (#3139) * Small amount of Block Mappings * Supersede mappings to Shnup's pr * Oh? * Update mappings/net/minecraft/block/PropaguleBlock.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> * Update mappings/net/minecraft/block/entity/EnchantingTableBlockEntity.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> * Update mappings/net/minecraft/block/entity/EnchantingTableBlockEntity.mapping Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- .../net/minecraft/block/CandleBlock.mapping | 1 + mappings/net/minecraft/block/Material.mapping | 1 + .../net/minecraft/block/PropaguleBlock.mapping | 2 ++ .../minecraft/block/SculkSpreadable.mapping | 4 ++++ .../entity/EnchantingTableBlockEntity.mapping | 5 +++++ .../net/minecraft/world/WorldAccess.mapping | 2 +- .../minecraft/world/event/GameEvent.mapping | 18 ++++++++++++++++++ .../event/listener/GameEventDispatcher.mapping | 1 + .../event/listener/GameEventListener.mapping | 1 + .../listener/SimpleGameEventDispatcher.mapping | 2 ++ .../event/listener/VibrationListener.mapping | 1 + 11 files changed, 37 insertions(+), 1 deletion(-) diff --git a/mappings/net/minecraft/block/CandleBlock.mapping b/mappings/net/minecraft/block/CandleBlock.mapping index 514ae7c9ce..66f2d10491 100644 --- a/mappings/net/minecraft/block/CandleBlock.mapping +++ b/mappings/net/minecraft/block/CandleBlock.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_5544 net/minecraft/block/CandleBlock FIELD field_27180 TWO_CANDLES_SHAPE Lnet/minecraft/class_265; FIELD field_27181 THREE_CANDLES_SHAPE Lnet/minecraft/class_265; FIELD field_27182 FOUR_CANDLES_SHAPE Lnet/minecraft/class_265; + FIELD field_31051 MAX_CANDLE_AMOUNT I METHOD method_31628 (Lnet/minecraft/class_4970$class_4971;)Z ARG 0 state METHOD method_31630 canBeLit (Lnet/minecraft/class_2680;)Z diff --git a/mappings/net/minecraft/block/Material.mapping b/mappings/net/minecraft/block/Material.mapping index 3e99a228db..fd8ab44dfb 100644 --- a/mappings/net/minecraft/block/Material.mapping +++ b/mappings/net/minecraft/block/Material.mapping @@ -79,6 +79,7 @@ CLASS net/minecraft/class_3614 net/minecraft/block/Material FIELD field_27890 POWDER_SNOW Lnet/minecraft/class_3614; FIELD field_28242 SCULK Lnet/minecraft/class_3614; FIELD field_37828 FROGSPAWN Lnet/minecraft/class_3614; + FIELD field_38977 FROGLIGHT Lnet/minecraft/class_3614; METHOD (Lnet/minecraft/class_3620;ZZZZZZLnet/minecraft/class_3619;)V ARG 1 color ARG 2 liquid diff --git a/mappings/net/minecraft/block/PropaguleBlock.mapping b/mappings/net/minecraft/block/PropaguleBlock.mapping index e75052f8f2..2515090782 100644 --- a/mappings/net/minecraft/block/PropaguleBlock.mapping +++ b/mappings/net/minecraft/block/PropaguleBlock.mapping @@ -8,3 +8,5 @@ CLASS net/minecraft/class_7115 net/minecraft/block/PropaguleBlock ARG 0 state METHOD method_41436 isFullyGrown (Lnet/minecraft/class_2680;)Z ARG 0 state + METHOD method_43130 getHangingState (I)Lnet/minecraft/class_2680; + ARG 0 age diff --git a/mappings/net/minecraft/block/SculkSpreadable.mapping b/mappings/net/minecraft/block/SculkSpreadable.mapping index 3a4224668c..4ffa0ff30f 100644 --- a/mappings/net/minecraft/block/SculkSpreadable.mapping +++ b/mappings/net/minecraft/block/SculkSpreadable.mapping @@ -12,6 +12,10 @@ CLASS net/minecraft/class_7124 net/minecraft/block/SculkSpreadable ARG 3 state ARG 4 directions ARG 5 markForPostProcessing + METHOD method_41470 (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z + ARG 1 world + ARG 2 pos + ARG 3 random METHOD method_41471 spread (Lnet/minecraft/class_7128$class_7129;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;Lnet/minecraft/class_7128;Z)I ARG 1 cursor ARG 2 world diff --git a/mappings/net/minecraft/block/entity/EnchantingTableBlockEntity.mapping b/mappings/net/minecraft/block/entity/EnchantingTableBlockEntity.mapping index 4663b2154e..4b429977e5 100644 --- a/mappings/net/minecraft/block/entity/EnchantingTableBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/EnchantingTableBlockEntity.mapping @@ -3,9 +3,14 @@ CLASS net/minecraft/class_2605 net/minecraft/block/entity/EnchantingTableBlockEn FIELD field_11959 customName Lnet/minecraft/class_2561; FIELD field_11960 pageAngle F FIELD field_11961 ticks I + FIELD field_11962 targetBookRotation F + FIELD field_11963 lastBookRotation F + FIELD field_11964 bookRotation F FIELD field_11965 pageTurningSpeed F FIELD field_11966 nextPageTurningSpeed F + FIELD field_11967 flipTurn F FIELD field_11968 RANDOM Lnet/minecraft/class_5819; + FIELD field_11969 flipRandom F METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state diff --git a/mappings/net/minecraft/world/WorldAccess.mapping b/mappings/net/minecraft/world/WorldAccess.mapping index abb14bc334..e80855cd5e 100644 --- a/mappings/net/minecraft/world/WorldAccess.mapping +++ b/mappings/net/minecraft/world/WorldAccess.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess METHOD method_32888 emitGameEvent (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;)V COMMENT Emits an game event. ARG 1 event - ARG 2 pos + ARG 2 emitterPos ARG 3 emitter METHOD method_33596 emitGameEvent (Lnet/minecraft/class_1297;Lnet/minecraft/class_5712;Lnet/minecraft/class_2338;)V ARG 1 entity diff --git a/mappings/net/minecraft/world/event/GameEvent.mapping b/mappings/net/minecraft/world/event/GameEvent.mapping index 97619ea15e..fee27036d3 100644 --- a/mappings/net/minecraft/world/event/GameEvent.mapping +++ b/mappings/net/minecraft/world/event/GameEvent.mapping @@ -24,3 +24,21 @@ CLASS net/minecraft/class_5712 net/minecraft/world/event/GameEvent ARG 1 affectedState METHOD method_43287 of (Lnet/minecraft/class_2680;)Lnet/minecraft/class_5712$class_7397; ARG 0 affectedState + CLASS class_7447 Info + FIELD field_39177 gameEvent Lnet/minecraft/class_5712; + FIELD field_39178 emitterPos Lnet/minecraft/class_243; + FIELD field_39179 emitter Lnet/minecraft/class_5712$class_7397; + FIELD field_39180 listener Lnet/minecraft/class_5714; + FIELD field_39181 listenerPos D + METHOD (Lnet/minecraft/class_5712;Lnet/minecraft/class_243;Lnet/minecraft/class_5712$class_7397;Lnet/minecraft/class_5714;Lnet/minecraft/class_243;)V + ARG 1 gameEvent + ARG 2 emitterPos + ARG 3 emitter + ARG 4 listener + ARG 5 listenerPos + METHOD compareTo (Ljava/lang/Object;)I + ARG 1 info + METHOD method_43724 getGameEvent ()Lnet/minecraft/class_5712; + METHOD method_43726 getEmitterPos ()Lnet/minecraft/class_243; + METHOD method_43727 getEmitter ()Lnet/minecraft/class_5712$class_7397; + METHOD method_43728 getListener ()Lnet/minecraft/class_5714; diff --git a/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping b/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping index 345ab64320..1a2123daaa 100644 --- a/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping +++ b/mappings/net/minecraft/world/event/listener/GameEventDispatcher.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_5713 net/minecraft/world/event/listener/GameEventDispa COMMENT the event ARG 2 pos ARG 3 emitter + ARG 4 onListenerAccept METHOD method_32944 addListener (Lnet/minecraft/class_5714;)V COMMENT Adds a listener to this dispatcher. ARG 1 listener diff --git a/mappings/net/minecraft/world/event/listener/GameEventListener.mapping b/mappings/net/minecraft/world/event/listener/GameEventListener.mapping index 1989f9ea53..a2fbeb4079 100644 --- a/mappings/net/minecraft/world/event/listener/GameEventListener.mapping +++ b/mappings/net/minecraft/world/event/listener/GameEventListener.mapping @@ -7,5 +7,6 @@ CLASS net/minecraft/class_5714 net/minecraft/world/event/listener/GameEventListe COMMENT COMMENT @return {@code true} if the game event has been accepted by this listener ARG 1 world + ARG 2 info METHOD method_32948 getRange ()I COMMENT Returns the range, in blocks, of the listener. diff --git a/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping b/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping index 9d3ed35261..aba72e3183 100644 --- a/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping +++ b/mappings/net/minecraft/world/event/listener/SimpleGameEventDispatcher.mapping @@ -12,3 +12,5 @@ CLASS net/minecraft/class_5711 net/minecraft/world/event/listener/SimpleGameEven ARG 1 world METHOD method_32936 dispatchTo (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_5714;)Ljava/util/Optional; ARG 0 world + ARG 1 listenerPos + ARG 2 listener diff --git a/mappings/net/minecraft/world/event/listener/VibrationListener.mapping b/mappings/net/minecraft/world/event/listener/VibrationListener.mapping index 8fe7a44341..22c7e5152e 100644 --- a/mappings/net/minecraft/world/event/listener/VibrationListener.mapping +++ b/mappings/net/minecraft/world/event/listener/VibrationListener.mapping @@ -68,6 +68,7 @@ CLASS net/minecraft/class_5718 net/minecraft/world/event/listener/VibrationListe ARG 1 gameEvent ARG 2 emitter METHOD method_42672 onListen ()V + METHOD method_43695 canAvoidVibrations ()Z CLASS class_7269 Vibration FIELD field_38245 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5712;ILnet/minecraft/class_243;Ljava/util/UUID;Ljava/util/UUID;)V