From 3465a113235df96a696675bf1e3b010c90b54d5a Mon Sep 17 00:00:00 2001 From: haykam821 <24855774+haykam821@users.noreply.github.com> Date: Sun, 8 Nov 2020 09:36:09 -0500 Subject: [PATCH] Map classes relating to candles (#1844) * Map classes relating to candles * Use the same names for property fields in AbstractCandleBlock subclasses Co-authored-by: YanisBft * Simplify the name of the AbstractBlock.testIfInTag method Co-authored-by: YanisBft * Rename the AbstractBlock.Settings.materialColor method to match the new class name Co-authored-by: YanisBft Co-authored-by: YanisBft --- .../net/minecraft/block/AbstractBlock.mapping | 4 ++++ .../block/AbstractCandleBlock.mapping | 19 +++++++++++++++++++ .../net/minecraft/block/CakeBlock.mapping | 7 +++++++ .../net/minecraft/block/CandleBlock.mapping | 16 ++++++++++++++++ .../minecraft/block/CandleCakeBlock.mapping | 18 ++++++++++++++++++ .../minecraft/block/SeaPickleBlock.mapping | 1 + mappings/net/minecraft/item/ItemStack.mapping | 2 +- 7 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 mappings/net/minecraft/block/AbstractCandleBlock.mapping create mode 100644 mappings/net/minecraft/block/CandleBlock.mapping create mode 100644 mappings/net/minecraft/block/CandleCakeBlock.mapping diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index e309cb4a20..25743310c2 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -296,6 +296,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 predicate METHOD method_26250 air ()Lnet/minecraft/class_4970$class_2251; METHOD method_29292 requiresTool ()Lnet/minecraft/class_4970$class_2251; + METHOD method_31710 mapColor (Lnet/minecraft/class_3620;)Lnet/minecraft/class_4970$class_2251; METHOD method_9617 of (Lnet/minecraft/class_3614;Lnet/minecraft/class_1767;)Lnet/minecraft/class_4970$class_2251; ARG 0 material ARG 1 color @@ -559,6 +560,9 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock METHOD method_26234 isFullCube (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos + METHOD method_27851 isIn (Lnet/minecraft/class_3494;Ljava/util/function/Predicate;)Z + ARG 1 tag + ARG 2 predicate METHOD method_27852 isOf (Lnet/minecraft/class_2248;)Z ARG 1 block METHOD method_29291 isToolRequired ()Z diff --git a/mappings/net/minecraft/block/AbstractCandleBlock.mapping b/mappings/net/minecraft/block/AbstractCandleBlock.mapping new file mode 100644 index 0000000000..9c573e5ab0 --- /dev/null +++ b/mappings/net/minecraft/block/AbstractCandleBlock.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_5540 net/minecraft/block/AbstractCandleBlock + FIELD field_27083 LIT Lnet/minecraft/class_2746; + METHOD method_31610 spawnCandleParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_243;Ljava/util/Random;)V + ARG 0 world + ARG 1 vec3d + ARG 2 random + METHOD method_31611 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;Lnet/minecraft/class_243;)V + ARG 3 offset + METHOD method_31612 setLit (Lnet/minecraft/class_1936;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Z)V + ARG 0 world + ARG 1 state + ARG 2 pos + ARG 3 lit + METHOD method_31613 getParticleOffsets (Lnet/minecraft/class_2680;)Ljava/lang/Iterable; + ARG 1 state + METHOD method_31614 extinguish (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V + ARG 0 state + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/block/CakeBlock.mapping b/mappings/net/minecraft/block/CakeBlock.mapping index a4bf1071eb..fa97392aa7 100644 --- a/mappings/net/minecraft/block/CakeBlock.mapping +++ b/mappings/net/minecraft/block/CakeBlock.mapping @@ -1,4 +1,11 @@ CLASS net/minecraft/class_2272 net/minecraft/block/CakeBlock FIELD field_10738 BITES_TO_SHAPE [Lnet/minecraft/class_265; FIELD field_10739 BITES Lnet/minecraft/class_2758; + FIELD field_27173 DEFAULT_COMPARATOR_OUTPUT I + METHOD method_31627 getComparatorOutput (I)I + ARG 0 bites METHOD method_9719 tryEat (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1269; + ARG 0 world + ARG 1 pos + ARG 2 state + ARG 3 player diff --git a/mappings/net/minecraft/block/CandleBlock.mapping b/mappings/net/minecraft/block/CandleBlock.mapping new file mode 100644 index 0000000000..514ae7c9ce --- /dev/null +++ b/mappings/net/minecraft/block/CandleBlock.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_5544 net/minecraft/block/CandleBlock + FIELD field_27174 CANDLES Lnet/minecraft/class_2758; + FIELD field_27175 LIT Lnet/minecraft/class_2746; + FIELD field_27176 WATERLOGGED Lnet/minecraft/class_2746; + FIELD field_27177 STATE_TO_LUMINANCE Ljava/util/function/ToIntFunction; + FIELD field_27178 CANDLES_TO_PARTICLE_OFFSETS Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + FIELD field_27179 ONE_CANDLE_SHAPE Lnet/minecraft/class_265; + 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; + METHOD method_31628 (Lnet/minecraft/class_4970$class_4971;)Z + ARG 0 state + METHOD method_31630 canBeLit (Lnet/minecraft/class_2680;)Z + ARG 0 state + METHOD method_31631 (Lnet/minecraft/class_2680;)I + ARG 0 state diff --git a/mappings/net/minecraft/block/CandleCakeBlock.mapping b/mappings/net/minecraft/block/CandleCakeBlock.mapping new file mode 100644 index 0000000000..d2f406b3fd --- /dev/null +++ b/mappings/net/minecraft/block/CandleCakeBlock.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_5545 net/minecraft/block/CandleCakeBlock + FIELD field_27183 LIT Lnet/minecraft/class_2746; + FIELD field_27184 CAKE_SHAPE Lnet/minecraft/class_265; + FIELD field_27185 CANDLE_SHAPE Lnet/minecraft/class_265; + FIELD field_27186 SHAPE Lnet/minecraft/class_265; + FIELD field_27187 CANDLES_TO_CANDLE_CAKES Ljava/util/Map; + FIELD field_27188 PARTICLE_OFFSETS Ljava/lang/Iterable; + METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_4970$class_2251;)V + ARG 1 candle + ARG 2 settings + METHOD method_31632 getCandleCakeFromCandle (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2680; + ARG 0 candle + METHOD method_31633 (Lnet/minecraft/class_2680;Lnet/minecraft/class_4970$class_4971;)Z + ARG 1 state + METHOD method_31634 (Lnet/minecraft/class_3965;)Z + ARG 0 hitResult + METHOD method_31635 canBeLit (Lnet/minecraft/class_2680;)Z + ARG 0 state diff --git a/mappings/net/minecraft/block/SeaPickleBlock.mapping b/mappings/net/minecraft/block/SeaPickleBlock.mapping index 4361e1f2cb..f7cb9116dc 100644 --- a/mappings/net/minecraft/block/SeaPickleBlock.mapping +++ b/mappings/net/minecraft/block/SeaPickleBlock.mapping @@ -6,3 +6,4 @@ CLASS net/minecraft/class_2472 net/minecraft/block/SeaPickleBlock FIELD field_11474 FOUR_PICKLES_SHAPE Lnet/minecraft/class_265; FIELD field_11475 WATERLOGGED Lnet/minecraft/class_2746; METHOD method_10506 isDry (Lnet/minecraft/class_2680;)Z + ARG 0 state diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 8924575acd..4dd92e4e38 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -45,7 +45,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD method_31580 getItemBarColor ()I METHOD method_31573 isIn (Lnet/minecraft/class_3494;)Z ARG 1 tag - METHOD method_31574 itemMatches (Lnet/minecraft/class_1792;)Z + METHOD method_31574 isOf (Lnet/minecraft/class_1792;)Z ARG 1 item METHOD method_7909 getItem ()Lnet/minecraft/class_1792; METHOD method_7910 finishUsing (Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1799;