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 <doublecraft.official@gmail.com>

* Simplify the name of the AbstractBlock.testIfInTag method

Co-authored-by: YanisBft <doublecraft.official@gmail.com>

* Rename the AbstractBlock.Settings.materialColor method to match the new class name

Co-authored-by: YanisBft <doublecraft.official@gmail.com>

Co-authored-by: YanisBft <doublecraft.official@gmail.com>
This commit is contained in:
haykam821 2020-11-08 09:36:09 -05:00 committed by GitHub
parent bbf3086597
commit 3465a11323
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 66 additions and 1 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 <init> (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

View File

@ -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

View File

@ -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;