Refactor properties (#716)

This commit is contained in:
Chloe Dawn 2019-06-03 17:42:57 +01:00 committed by Adrian Siekierka
parent bb90607728
commit 4e34f949a4
8 changed files with 62 additions and 51 deletions

View File

@ -1,9 +1,10 @@
CLASS bvw net/minecraft/state/property/AbstractProperty CLASS bvw net/minecraft/state/property/AbstractProperty
FIELD a valueClass Ljava/lang/Class; FIELD a type Ljava/lang/Class;
FIELD b name Ljava/lang/String; FIELD b name Ljava/lang/String;
FIELD c computedHashCode Ljava/lang/Integer; FIELD c computedHashCode Ljava/lang/Integer;
METHOD <init> (Ljava/lang/String;Ljava/lang/Class;)V METHOD <init> (Ljava/lang/String;Ljava/lang/Class;)V
ARG 1 name ARG 1 name
ARG 2 type
METHOD c computeHashCode ()I METHOD c computeHashCode ()I
METHOD equals (Ljava/lang/Object;)Z METHOD equals (Ljava/lang/Object;)Z
ARG 1 o ARG 1 obj

View File

@ -1,6 +1,8 @@
CLASS bwc net/minecraft/state/property/BooleanProperty CLASS bwc net/minecraft/state/property/BooleanProperty
FIELD a values Lcom/google/common/collect/ImmutableSet; FIELD a values Lcom/google/common/collect/ImmutableSet;
METHOD a create (Ljava/lang/String;)Lbwc; METHOD <init> (Ljava/lang/String;)V
ARG 1 name
METHOD a of (Ljava/lang/String;)Lbwc;
ARG 0 name ARG 0 name
METHOD equals (Ljava/lang/Object;)Z METHOD equals (Ljava/lang/Object;)Z
ARG 1 o ARG 1 o

View File

@ -2,12 +2,12 @@ CLASS bwf net/minecraft/state/property/DirectionProperty
METHOD <init> (Ljava/lang/String;Ljava/util/Collection;)V METHOD <init> (Ljava/lang/String;Ljava/util/Collection;)V
ARG 1 name ARG 1 name
ARG 2 values ARG 2 values
METHOD a create (Ljava/lang/String;Ljava/util/Collection;)Lbwf; METHOD a of (Ljava/lang/String;Ljava/util/Collection;)Lbwf;
ARG 0 name ARG 0 name
ARG 1 values ARG 1 values
METHOD a create (Ljava/lang/String;Ljava/util/function/Predicate;)Lbwf; METHOD a of (Ljava/lang/String;Ljava/util/function/Predicate;)Lbwf;
ARG 0 name ARG 0 name
ARG 1 predicate ARG 1 filter
METHOD a create (Ljava/lang/String;[Lfa;)Lbwf; METHOD a of (Ljava/lang/String;[Lfa;)Lbwf;
ARG 0 name ARG 0 name
ARG 1 values ARG 1 values

View File

@ -1,23 +1,24 @@
CLASS bwi net/minecraft/state/property/EnumProperty CLASS bwi net/minecraft/state/property/EnumProperty
FIELD a values Lcom/google/common/collect/ImmutableSet; FIELD a values Lcom/google/common/collect/ImmutableSet;
FIELD b valuesByName Ljava/util/Map; FIELD b byName Ljava/util/Map;
METHOD <init> (Ljava/lang/String;Ljava/lang/Class;Ljava/util/Collection;)V METHOD <init> (Ljava/lang/String;Ljava/lang/Class;Ljava/util/Collection;)V
ARG 2 valueClass ARG 1 name
ARG 2 type
ARG 3 values ARG 3 values
METHOD a create (Ljava/lang/String;Ljava/lang/Class;)Lbwi; METHOD a of (Ljava/lang/String;Ljava/lang/Class;)Lbwi;
ARG 0 name ARG 0 name
ARG 1 valueClass ARG 1 type
METHOD a create (Ljava/lang/String;Ljava/lang/Class;Ljava/util/Collection;)Lbwi; METHOD a of (Ljava/lang/String;Ljava/lang/Class;Ljava/util/Collection;)Lbwi;
ARG 0 name ARG 0 name
ARG 1 valueClass ARG 1 type
ARG 2 validValues ARG 2 values
METHOD a create (Ljava/lang/String;Ljava/lang/Class;Ljava/util/function/Predicate;)Lbwi; METHOD a of (Ljava/lang/String;Ljava/lang/Class;Ljava/util/function/Predicate;)Lbwi;
ARG 0 name ARG 0 name
ARG 1 valueClass ARG 1 type
ARG 2 predicate ARG 2 filter
METHOD a create (Ljava/lang/String;Ljava/lang/Class;[Ljava/lang/Enum;)Lbwi; METHOD a of (Ljava/lang/String;Ljava/lang/Class;[Ljava/lang/Enum;)Lbwi;
ARG 0 name ARG 0 name
ARG 1 valueClass ARG 1 type
ARG 2 values ARG 2 values
METHOD equals (Ljava/lang/Object;)Z METHOD equals (Ljava/lang/Object;)Z
ARG 1 o ARG 1 o

View File

@ -0,0 +1,12 @@
CLASS bwk net/minecraft/state/property/IntProperty
FIELD a values Lcom/google/common/collect/ImmutableSet;
METHOD <init> (Ljava/lang/String;II)V
ARG 1 name
ARG 2 min
ARG 3 max
METHOD a of (Ljava/lang/String;II)Lbwk;
ARG 0 name
ARG 1 min
ARG 2 max
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o

View File

@ -1,11 +0,0 @@
CLASS bwk net/minecraft/state/property/IntegerProperty
FIELD a validValues Lcom/google/common/collect/ImmutableSet;
METHOD <init> (Ljava/lang/String;II)V
ARG 1 name
ARG 2 min
METHOD a create (Ljava/lang/String;II)Lbwk;
ARG 0 name
ARG 1 min
ARG 2 max
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o

View File

@ -2,23 +2,23 @@ CLASS bwb net/minecraft/state/property/Properties
FIELD A TRIGGERED Lbwc; FIELD A TRIGGERED Lbwc;
FIELD B UNSTABLE Lbwc; FIELD B UNSTABLE Lbwc;
FIELD C WATERLOGGED Lbwc; FIELD C WATERLOGGED Lbwc;
FIELD D AXIS_XZ Lbwi; FIELD D HORIZONTAL_AXIS Lbwi;
FIELD E AXIS_XYZ Lbwi; FIELD E AXIS Lbwi;
FIELD F UP_BOOL Lbwc; FIELD F UP Lbwc;
FIELD G DOWN_BOOL Lbwc; FIELD G DOWN Lbwc;
FIELD H NORTH_BOOL Lbwc; FIELD H NORTH Lbwc;
FIELD I EAST_BOOL Lbwc; FIELD I EAST Lbwc;
FIELD J SOUTH_BOOL Lbwc; FIELD J SOUTH Lbwc;
FIELD K WEST_BOOL Lbwc; FIELD K WEST Lbwc;
FIELD L FACING Lbwf; FIELD L FACING Lbwf;
FIELD M HOPPER_FACING Lbwf; FIELD M HOPPER_FACING Lbwf;
FIELD N FACING_HORIZONTAL Lbwf; FIELD N HORIZONTAL_FACING Lbwf;
FIELD O WALL_MOUNT_LOCATION Lbwi; FIELD O WALL_MOUNT_LOCATION Lbwi;
FIELD P ATTACHMENT Lbwi; FIELD P ATTACHMENT Lbwi;
FIELD Q WIRE_CONNECTION_EAST Lbwi; FIELD Q EAST_WIRE_CONNECTION Lbwi;
FIELD R WIRE_CONNECTION_NORTH Lbwi; FIELD R NORTH_WIRE_CONNECTION Lbwi;
FIELD S WIRE_CONNECTION_SOUTH Lbwi; FIELD S SOUTH_WIRE_CONNECTION Lbwi;
FIELD T WIRE_CONNECTION_WEST Lbwi; FIELD T WEST_WIRE_CONNECTION Lbwi;
FIELD U DOUBLE_BLOCK_HALF Lbwi; FIELD U DOUBLE_BLOCK_HALF Lbwi;
FIELD V BLOCK_HALF Lbwi; FIELD V BLOCK_HALF Lbwi;
FIELD W RAIL_SHAPE Lbwi; FIELD W RAIL_SHAPE Lbwi;
@ -43,17 +43,17 @@ CLASS bwb net/minecraft/state/property/Properties
FIELD ai EGGS Lbwk; FIELD ai EGGS Lbwk;
FIELD aj HATCH Lbwk; FIELD aj HATCH Lbwk;
FIELD ak LAYERS Lbwk; FIELD ak LAYERS Lbwk;
FIELD al CAULDRON_LEVEL Lbwk; FIELD al LEVEL_3 Lbwk;
FIELD am COMPOSTER_LEVEL Lbwk; FIELD am LEVEL_8 Lbwk;
FIELD an FLUID_LEVEL Lbwk; FIELD an LEVEL_1_8 Lbwk;
FIELD ao FLUID_BLOCK_LEVEL Lbwk; FIELD ao LEVEL_15 Lbwk;
FIELD ap MOISTURE Lbwk; FIELD ap MOISTURE Lbwk;
FIELD aq NOTE Lbwk; FIELD aq NOTE Lbwk;
FIELD ar PICKLES Lbwk; FIELD ar PICKLES Lbwk;
FIELD as POWER Lbwk; FIELD as POWER Lbwk;
FIELD at SAPLING_STAGE Lbwk; FIELD at STAGE Lbwk;
FIELD au DISTANCE_0_7 Lbwk; FIELD au DISTANCE_0_7 Lbwk;
FIELD av ROTATION_16 Lbwk; FIELD av ROTATION Lbwk;
FIELD aw BED_PART Lbwi; FIELD aw BED_PART Lbwi;
FIELD ax CHEST_TYPE Lbwi; FIELD ax CHEST_TYPE Lbwi;
FIELD ay COMPARATOR_MODE Lbwi; FIELD ay COMPARATOR_MODE Lbwi;
@ -83,3 +83,7 @@ CLASS bwb net/minecraft/state/property/Properties
FIELD x SHORT Lbwc; FIELD x SHORT Lbwc;
FIELD y SIGNAL_FIRE Lbwc; FIELD y SIGNAL_FIRE Lbwc;
FIELD z SNOWY Lbwc; FIELD z SNOWY Lbwc;
METHOD a (Lbwo;)Z
ARG 0 shape
METHOD a (Lfa;)Z
ARG 0 facing

View File

@ -1,6 +1,8 @@
CLASS bwn net/minecraft/state/property/Property CLASS bwn net/minecraft/state/property/Property
METHOD a getName ()Ljava/lang/String; METHOD a getName ()Ljava/lang/String;
METHOD a getValueAsString (Ljava/lang/Comparable;)Ljava/lang/String; METHOD a getName (Ljava/lang/Comparable;)Ljava/lang/String;
METHOD b getValueClass ()Ljava/lang/Class; ARG 1 value
METHOD b getValueType ()Ljava/lang/Class;
METHOD b getValue (Ljava/lang/String;)Ljava/util/Optional; METHOD b getValue (Ljava/lang/String;)Ljava/util/Optional;
ARG 1 name
METHOD d getValues ()Ljava/util/Collection; METHOD d getValues ()Ljava/util/Collection;