From 1ecd1031fa032834a75b65af3869d3e4c2a494af Mon Sep 17 00:00:00 2001 From: i509VCB Date: Thu, 30 Apr 2020 11:20:20 +0000 Subject: [PATCH] Map some blocks, fluids and block entities (#1309) * Map some block, fluid and block entities * Flowing -> Flowable * oops * Update mappings/net/minecraft/block/entity/CommandBlockBlockEntity.mapping Co-Authored-By: Juuxel <6596629+Juuxel@users.noreply.github.com> Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com> --- mappings/net/minecraft/block/BedBlock.mapping | 10 ++++++++++ mappings/net/minecraft/block/BeehiveBlock.mapping | 1 + .../net/minecraft/block/ConcretePowderBlock.mapping | 4 ++++ mappings/net/minecraft/block/FallingBlock.mapping | 6 ++++++ mappings/net/minecraft/block/InfestedBlock.mapping | 8 +++++++- mappings/net/minecraft/block/ShapeContext.mapping | 3 +++ mappings/net/minecraft/block/SoulFireBlock.mapping | 2 ++ mappings/net/minecraft/block/StairsBlock.mapping | 2 +- .../block/entity/AbstractFurnaceBlockEntity.mapping | 6 ++++++ .../minecraft/block/entity/BellBlockEntity.mapping | 8 ++++++++ .../block/entity/CommandBlockBlockEntity.mapping | 2 ++ .../minecraft/block/entity/PistonBlockEntity.mapping | 2 ++ .../net/minecraft/block/enums/WireConnection.mapping | 1 + .../net/minecraft/block/pattern/BlockPattern.mapping | 11 +++++++++++ .../block/pattern/BlockPatternBuilder.mapping | 3 ++- .../client/block/ChestAnimationProgress.mapping | 1 + .../{BaseFluid.mapping => FlowableFluid.mapping} | 3 ++- mappings/net/minecraft/fluid/FluidStateImpl.mapping | 1 + 18 files changed, 70 insertions(+), 4 deletions(-) rename mappings/net/minecraft/fluid/{BaseFluid.mapping => FlowableFluid.mapping} (97%) diff --git a/mappings/net/minecraft/block/BedBlock.mapping b/mappings/net/minecraft/block/BedBlock.mapping index 935a1bb02a..b5d25247cb 100644 --- a/mappings/net/minecraft/block/BedBlock.mapping +++ b/mappings/net/minecraft/block/BedBlock.mapping @@ -17,16 +17,26 @@ CLASS net/minecraft/class_2244 net/minecraft/block/BedBlock METHOD method_18476 getDirection (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2350; ARG 0 world ARG 1 pos + METHOD method_21838 bounceEntity (Lnet/minecraft/class_1297;)V + ARG 1 entity METHOD method_22357 isFree (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos METHOD method_24163 getOppositePartDirection (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2350; + ARG 0 state + METHOD method_24164 getBedPart (Lnet/minecraft/class_2680;)Lnet/minecraft/class_4732$class_4733; + ARG 0 state + METHOD method_27352 isOverworld (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z + ARG 0 world + ARG 1 pos METHOD method_9484 findWakeUpPosition (Lnet/minecraft/class_1299;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;I)Ljava/util/Optional; ARG 0 type + ARG 1 world ARG 2 pos ARG 3 index METHOD method_9486 canWakeUpAt (Lnet/minecraft/class_1299;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Ljava/util/Optional; ARG 0 type + ARG 1 world ARG 2 pos METHOD method_9487 getColor ()Lnet/minecraft/class_1767; METHOD method_9488 getDirectionTowardsOtherPart (Lnet/minecraft/class_2742;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350; diff --git a/mappings/net/minecraft/block/BeehiveBlock.mapping b/mappings/net/minecraft/block/BeehiveBlock.mapping index 760d8573fe..c87c3380f9 100644 --- a/mappings/net/minecraft/block/BeehiveBlock.mapping +++ b/mappings/net/minecraft/block/BeehiveBlock.mapping @@ -38,3 +38,4 @@ CLASS net/minecraft/class_4481 net/minecraft/block/BeehiveBlock METHOD method_23894 hasBees (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos + METHOD method_26978 getRandomGenerationDirection (Ljava/util/Random;)Lnet/minecraft/class_2350; diff --git a/mappings/net/minecraft/block/ConcretePowderBlock.mapping b/mappings/net/minecraft/block/ConcretePowderBlock.mapping index 41e3cfc20f..60112537d6 100644 --- a/mappings/net/minecraft/block/ConcretePowderBlock.mapping +++ b/mappings/net/minecraft/block/ConcretePowderBlock.mapping @@ -3,6 +3,10 @@ CLASS net/minecraft/class_2292 net/minecraft/block/ConcretePowderBlock METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_4970$class_2251;)V ARG 1 hardened ARG 2 settings + METHOD method_24279 shouldHarden (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z + ARG 0 world + ARG 1 pos + ARG 2 state METHOD method_9798 hardensOnAnySide (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/FallingBlock.mapping b/mappings/net/minecraft/block/FallingBlock.mapping index b7f3768eb1..a24cd0078e 100644 --- a/mappings/net/minecraft/block/FallingBlock.mapping +++ b/mappings/net/minecraft/block/FallingBlock.mapping @@ -4,12 +4,18 @@ CLASS net/minecraft/class_2346 net/minecraft/block/FallingBlock ARG 2 pos ARG 3 fallingBlockState ARG 4 currentStateInPos + ARG 5 fallingBlockEntity METHOD method_10128 canFallThrough (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_10129 onDestroyedOnLanding (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1540;)V ARG 1 world ARG 2 pos + ARG 3 fallingBlockEntity METHOD method_10130 getColor (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)I ARG 1 state + ARG 2 world + ARG 3 pos METHOD method_10132 configureFallingBlockEntity (Lnet/minecraft/class_1540;)V ARG 1 entity + METHOD method_26154 getFallDelay ()I + COMMENT Gets the amount of time in ticks this block will wait before attempting to start falling. diff --git a/mappings/net/minecraft/block/InfestedBlock.mapping b/mappings/net/minecraft/block/InfestedBlock.mapping index e76cd52eb8..84671a6b17 100644 --- a/mappings/net/minecraft/block/InfestedBlock.mapping +++ b/mappings/net/minecraft/block/InfestedBlock.mapping @@ -1,11 +1,17 @@ CLASS net/minecraft/class_2384 net/minecraft/block/InfestedBlock FIELD field_11178 regularBlock Lnet/minecraft/class_2248; FIELD field_11179 REGULAR_TO_INFESTED Ljava/util/Map; - METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_4970$class_2251;)V + METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_4970$class_2251;)V + COMMENT Creates an infested block ARG 1 regularBlock + COMMENT the block this infested block should mimic ARG 2 settings + COMMENT block settings METHOD method_10269 isInfestable (Lnet/minecraft/class_2680;)Z ARG 0 block METHOD method_10270 fromRegularBlock (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2680; ARG 0 regularBlock METHOD method_10271 getRegularBlock ()Lnet/minecraft/class_2248; + METHOD method_24797 spawnSilverfish (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/block/ShapeContext.mapping b/mappings/net/minecraft/block/ShapeContext.mapping index 0ef471dd6a..78fed65a56 100644 --- a/mappings/net/minecraft/block/ShapeContext.mapping +++ b/mappings/net/minecraft/block/ShapeContext.mapping @@ -9,3 +9,6 @@ CLASS net/minecraft/class_3726 net/minecraft/block/ShapeContext ARG 0 entity METHOD method_17785 isHolding (Lnet/minecraft/class_1792;)Z ARG 1 item + METHOD method_27866 (Lnet/minecraft/class_3610;Lnet/minecraft/class_3609;)Z + ARG 1 state + ARG 2 fluid diff --git a/mappings/net/minecraft/block/SoulFireBlock.mapping b/mappings/net/minecraft/block/SoulFireBlock.mapping index 7c1818c24d..a009a53361 100644 --- a/mappings/net/minecraft/block/SoulFireBlock.mapping +++ b/mappings/net/minecraft/block/SoulFireBlock.mapping @@ -1 +1,3 @@ CLASS net/minecraft/class_4775 net/minecraft/block/SoulFireBlock + METHOD method_26158 isSoulBase (Lnet/minecraft/class_2248;)Z + ARG 0 block diff --git a/mappings/net/minecraft/block/StairsBlock.mapping b/mappings/net/minecraft/block/StairsBlock.mapping index 4a4e280395..5a878160bb 100644 --- a/mappings/net/minecraft/block/StairsBlock.mapping +++ b/mappings/net/minecraft/block/StairsBlock.mapping @@ -38,7 +38,7 @@ CLASS net/minecraft/class_2510 net/minecraft/block/StairsBlock ARG 1 state METHOD method_10674 (Lnet/minecraft/class_265;Lnet/minecraft/class_265;Lnet/minecraft/class_265;Lnet/minecraft/class_265;Lnet/minecraft/class_265;I)Lnet/minecraft/class_265; ARG 5 i - METHOD method_10675 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2778; + METHOD method_10675 getStairShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2778; ARG 0 state ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping index d7124e55a1..4ee6d0f207 100644 --- a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping @@ -10,6 +10,9 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn FIELD field_11989 cookTime I FIELD field_17374 propertyDelegate Lnet/minecraft/class_3913; FIELD field_17582 recipeType Lnet/minecraft/class_3956; + METHOD (Lnet/minecraft/class_2591;Lnet/minecraft/class_3956;)V + ARG 1 blockEntityType + ARG 2 recipeType METHOD method_11192 canAcceptRecipeOutput (Lnet/minecraft/class_1860;)Z ARG 1 recipe METHOD method_11194 addFuel (Ljava/util/Map;Lnet/minecraft/class_3494;I)V @@ -23,6 +26,7 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn ARG 1 fuel METHOD method_11201 isBurning ()Z METHOD method_11202 addFuel (Ljava/util/Map;Lnet/minecraft/class_1935;I)V + ARG 1 item ARG 2 fuelTime METHOD method_11203 craftRecipe (Lnet/minecraft/class_1860;)V ARG 1 recipe @@ -30,3 +34,5 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn METHOD method_17760 dropExperience (Lnet/minecraft/class_1937;Lnet/minecraft/class_243;IF)V METHOD method_17763 dropExperience (Lnet/minecraft/class_1657;)V ARG 1 player + METHOD method_26395 isFlammableWood (Lnet/minecraft/class_1792;)Z + ARG 0 item diff --git a/mappings/net/minecraft/block/entity/BellBlockEntity.mapping b/mappings/net/minecraft/block/entity/BellBlockEntity.mapping index b4973aafca..54a66c60e6 100644 --- a/mappings/net/minecraft/block/entity/BellBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BellBlockEntity.mapping @@ -2,10 +2,18 @@ CLASS net/minecraft/class_3721 net/minecraft/block/entity/BellBlockEntity FIELD field_17095 ringTicks I FIELD field_17096 ringing Z FIELD field_17097 lastSideHit Lnet/minecraft/class_2350; + FIELD field_19155 lastRingTime J + FIELD field_19156 hearingEntities Ljava/util/List; + FIELD field_19157 resonating Z METHOD method_17031 activate (Lnet/minecraft/class_2350;)V ARG 1 direction + METHOD method_20218 applyParticlesToRaiders (Lnet/minecraft/class_1937;)V + ARG 1 world + METHOD method_20219 notifyMemoriesOfBell ()V METHOD method_20518 isRaiderEntity (Lnet/minecraft/class_1309;)Z ARG 1 entity METHOD method_20520 glowEntity (Lnet/minecraft/class_1309;)V ARG 1 entity + METHOD method_20521 applyGlowToRaiders (Lnet/minecraft/class_1937;)V + ARG 1 world METHOD method_20522 playResonateSound ()V diff --git a/mappings/net/minecraft/block/entity/CommandBlockBlockEntity.mapping b/mappings/net/minecraft/block/entity/CommandBlockBlockEntity.mapping index c054cc16ad..7438203bdf 100644 --- a/mappings/net/minecraft/block/entity/CommandBlockBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/CommandBlockBlockEntity.mapping @@ -8,9 +8,11 @@ CLASS net/minecraft/class_2593 net/minecraft/block/entity/CommandBlockBlockEntit METHOD method_11037 setNeedsUpdatePacket (Z)V ARG 1 needsUpdatePacket METHOD method_11038 setPowered (Z)V + ARG 1 powered METHOD method_11039 getCommandBlockType ()Lnet/minecraft/class_2593$class_2594; METHOD method_11040 getCommandExecutor ()Lnet/minecraft/class_1918; METHOD method_11041 setAuto (Z)V + ARG 1 auto METHOD method_11042 isAuto ()Z METHOD method_11043 isPowered ()Z METHOD method_11044 isConditionMet ()Z diff --git a/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping b/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping index 10760e3be0..293c57024b 100644 --- a/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/PistonBlockEntity.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_2669 net/minecraft/block/entity/PistonBlockEntity + COMMENT A piston block entity represents the block being pushed by a piston. FIELD field_12201 facing Lnet/minecraft/class_2350; FIELD field_12202 source Z FIELD field_12203 extending Z @@ -41,3 +42,4 @@ CLASS net/minecraft/class_2669 net/minecraft/block/entity/PistonBlockEntity ARG 2 direction ARG 3 amount METHOD method_11515 isSource ()Z + METHOD method_23364 isPushingHoneyBlock ()Z diff --git a/mappings/net/minecraft/block/enums/WireConnection.mapping b/mappings/net/minecraft/block/enums/WireConnection.mapping index 53d57a2b2f..a639693f60 100644 --- a/mappings/net/minecraft/block/enums/WireConnection.mapping +++ b/mappings/net/minecraft/block/enums/WireConnection.mapping @@ -2,3 +2,4 @@ CLASS net/minecraft/class_2773 net/minecraft/block/enums/WireConnection FIELD field_12685 name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name + METHOD method_27855 isConnected ()Z diff --git a/mappings/net/minecraft/block/pattern/BlockPattern.mapping b/mappings/net/minecraft/block/pattern/BlockPattern.mapping index 22d45c673b..21db78326e 100644 --- a/mappings/net/minecraft/block/pattern/BlockPattern.mapping +++ b/mappings/net/minecraft/block/pattern/BlockPattern.mapping @@ -13,17 +13,27 @@ CLASS net/minecraft/class_2700 net/minecraft/block/pattern/BlockPattern ARG 4 offsetDown ARG 5 offsetForwards METHOD method_11708 searchAround (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2700$class_2702; + ARG 1 world + ARG 2 pos METHOD method_11709 makeCache (Lnet/minecraft/class_4538;Z)Lcom/google/common/cache/LoadingCache; + ARG 0 world + ARG 1 forceLoad METHOD method_11710 getWidth ()I METHOD method_11711 testTransform (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;Lcom/google/common/cache/LoadingCache;)Lnet/minecraft/class_2700$class_2702; ARG 1 frontTopLeft ARG 2 forwards ARG 3 up + ARG 4 cache METHOD method_11712 getDepth ()I METHOD method_11713 getHeight ()I CLASS class_2701 BlockStateCacheLoader FIELD field_12359 world Lnet/minecraft/class_4538; FIELD field_12360 forceLoad Z + METHOD (Lnet/minecraft/class_4538;Z)V + ARG 1 world + ARG 2 forceLoad + METHOD load (Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 pos CLASS class_2702 Result FIELD field_12361 depth I FIELD field_12362 height I @@ -36,6 +46,7 @@ CLASS net/minecraft/class_2700 net/minecraft/block/pattern/BlockPattern ARG 1 frontTopLeft ARG 2 forwards ARG 3 up + ARG 4 cache ARG 5 width ARG 6 height ARG 7 depth diff --git a/mappings/net/minecraft/block/pattern/BlockPatternBuilder.mapping b/mappings/net/minecraft/block/pattern/BlockPatternBuilder.mapping index 077e45823c..30a121189c 100644 --- a/mappings/net/minecraft/block/pattern/BlockPatternBuilder.mapping +++ b/mappings/net/minecraft/block/pattern/BlockPatternBuilder.mapping @@ -5,9 +5,10 @@ CLASS net/minecraft/class_2697 net/minecraft/block/pattern/BlockPatternBuilder FIELD field_12343 charMap Ljava/util/Map; FIELD field_12344 aisles Ljava/util/List; METHOD method_11700 where (CLjava/util/function/Predicate;)Lnet/minecraft/class_2697; - ARG 1 c + ARG 1 key METHOD method_11701 start ()Lnet/minecraft/class_2697; METHOD method_11702 aisle ([Ljava/lang/String;)Lnet/minecraft/class_2697; + ARG 1 pattern METHOD method_11703 bakePredicates ()[[[Ljava/util/function/Predicate; METHOD method_11704 build ()Lnet/minecraft/class_2700; METHOD method_11705 validate ()V diff --git a/mappings/net/minecraft/client/block/ChestAnimationProgress.mapping b/mappings/net/minecraft/client/block/ChestAnimationProgress.mapping index 636029ab86..85d24526c5 100644 --- a/mappings/net/minecraft/client/block/ChestAnimationProgress.mapping +++ b/mappings/net/minecraft/client/block/ChestAnimationProgress.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_2618 net/minecraft/client/block/ChestAnimationProgress METHOD method_11274 getAnimationProgress (F)F + ARG 1 tickDelta diff --git a/mappings/net/minecraft/fluid/BaseFluid.mapping b/mappings/net/minecraft/fluid/FlowableFluid.mapping similarity index 97% rename from mappings/net/minecraft/fluid/BaseFluid.mapping rename to mappings/net/minecraft/fluid/FlowableFluid.mapping index bee4048c8b..37ae5e4175 100644 --- a/mappings/net/minecraft/fluid/BaseFluid.mapping +++ b/mappings/net/minecraft/fluid/FlowableFluid.mapping @@ -1,4 +1,5 @@ -CLASS net/minecraft/class_3609 net/minecraft/fluid/BaseFluid +CLASS net/minecraft/class_3609 net/minecraft/fluid/FlowableFluid + COMMENT Represents a fluid which can flow. FIELD field_15900 LEVEL Lnet/minecraft/class_2758; FIELD field_15902 FALLING Lnet/minecraft/class_2746; FIELD field_17587 shapeCache Ljava/util/Map; diff --git a/mappings/net/minecraft/fluid/FluidStateImpl.mapping b/mappings/net/minecraft/fluid/FluidStateImpl.mapping index 7b756ece8f..12ff3054ee 100644 --- a/mappings/net/minecraft/fluid/FluidStateImpl.mapping +++ b/mappings/net/minecraft/fluid/FluidStateImpl.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_3613 net/minecraft/fluid/FluidStateImpl METHOD (Lnet/minecraft/class_3611;Lcom/google/common/collect/ImmutableMap;)V ARG 1 fluid + ARG 2 properties