From 9c8be6f0a5f890f733b6a9e5557738231276c485 Mon Sep 17 00:00:00 2001 From: asie Date: Fri, 26 Oct 2018 08:58:08 +0200 Subject: [PATCH] map out most property stuff, move block.property to state.property --- mappings/bmu.mapping | 2 - mappings/bmv.mapping | 2 - mappings/bmz.mapping | 2 - mappings/bnd.mapping | 2 - mappings/bnf.mapping | 3 + mappings/bnh.mapping | 2 - mappings/bni.mapping | 2 - mappings/bnl.mapping | 2 - mappings/bnm.mapping | 2 - mappings/bnn.mapping | 2 - mappings/bno.mapping | 2 - .../block/{state => }/BlockState.mapping | 2 +- .../minecraft/block/BlockWallMounted.mapping} | 2 +- .../block/enum/EnumBambooLeaves.mapping | 6 ++ .../enum/EnumBedPart.mapping} | 2 +- .../block/enum/EnumChestType.mapping | 3 + .../enum/EnumComparatorMode.mapping} | 2 +- .../minecraft/block/enum/EnumDoorHalf.mapping | 4 + .../enum/EnumDoorHinge.mapping} | 2 +- .../block/enum/EnumInstrument.mapping | 17 ++++ .../block/enum/EnumPistonType.mapping | 5 ++ .../enum/EnumRailShape.mapping} | 2 +- .../minecraft/block/enum/EnumSlabType.mapping | 6 ++ .../block/enum/EnumStairShape.mapping | 8 ++ .../block/enum/EnumStructureMode.mapping | 7 ++ .../block/enum/EnumWallMountLocation.mapping | 6 ++ .../block/enum/EnumWireConnection.mapping | 6 ++ .../property/BlockPropertyFacing.mapping | 7 -- .../reference/BlockProperties.mapping | 1 - .../minecraft/reference/Properties.mapping | 77 +++++++++++++++++++ .../property/IProperty.mapping} | 2 +- .../property/PropertyBase.mapping} | 4 +- .../property/PropertyBoolean.mapping} | 3 +- .../property/PropertyEnum.mapping} | 3 +- .../state/property/PropertyFacing.mapping | 13 ++++ .../property/PropertyInteger.mapping} | 3 +- 36 files changed, 177 insertions(+), 39 deletions(-) delete mode 100644 mappings/bmu.mapping delete mode 100644 mappings/bmv.mapping delete mode 100644 mappings/bmz.mapping delete mode 100644 mappings/bnd.mapping delete mode 100644 mappings/bnh.mapping delete mode 100644 mappings/bni.mapping delete mode 100644 mappings/bnl.mapping delete mode 100644 mappings/bnm.mapping delete mode 100644 mappings/bnn.mapping delete mode 100644 mappings/bno.mapping rename mappings/net/minecraft/block/{state => }/BlockState.mapping (96%) rename mappings/{bfq.mapping => net/minecraft/block/BlockWallMounted.mapping} (80%) create mode 100644 mappings/net/minecraft/block/enum/EnumBambooLeaves.mapping rename mappings/net/minecraft/{sortme/Part.mapping => block/enum/EnumBedPart.mapping} (70%) create mode 100644 mappings/net/minecraft/block/enum/EnumChestType.mapping rename mappings/net/minecraft/{sortme/Mode.mapping => block/enum/EnumComparatorMode.mapping} (68%) create mode 100644 mappings/net/minecraft/block/enum/EnumDoorHalf.mapping rename mappings/net/minecraft/{sortme/Hinge.mapping => block/enum/EnumDoorHinge.mapping} (62%) create mode 100644 mappings/net/minecraft/block/enum/EnumInstrument.mapping create mode 100644 mappings/net/minecraft/block/enum/EnumPistonType.mapping rename mappings/net/minecraft/{sortme/Shape.mapping => block/enum/EnumRailShape.mapping} (89%) create mode 100644 mappings/net/minecraft/block/enum/EnumSlabType.mapping create mode 100644 mappings/net/minecraft/block/enum/EnumStairShape.mapping create mode 100644 mappings/net/minecraft/block/enum/EnumStructureMode.mapping create mode 100644 mappings/net/minecraft/block/enum/EnumWallMountLocation.mapping create mode 100644 mappings/net/minecraft/block/enum/EnumWireConnection.mapping delete mode 100644 mappings/net/minecraft/block/property/BlockPropertyFacing.mapping delete mode 100644 mappings/net/minecraft/reference/BlockProperties.mapping create mode 100644 mappings/net/minecraft/reference/Properties.mapping rename mappings/net/minecraft/{block/state/IBlockProperty.mapping => state/property/IProperty.mapping} (84%) rename mappings/net/minecraft/{block/property/BlockPropertyBase.mapping => state/property/PropertyBase.mapping} (69%) rename mappings/net/minecraft/{block/property/BlockPropertyBoolean.mapping => state/property/PropertyBoolean.mapping} (85%) rename mappings/net/minecraft/{block/property/BlockPropertyEnum.mapping => state/property/PropertyEnum.mapping} (91%) create mode 100644 mappings/net/minecraft/state/property/PropertyFacing.mapping rename mappings/net/minecraft/{block/property/BlockPropertyInteger.mapping => state/property/PropertyInteger.mapping} (86%) diff --git a/mappings/bmu.mapping b/mappings/bmu.mapping deleted file mode 100644 index 131bdb99ee..0000000000 --- a/mappings/bmu.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS bmu - METHOD m asString ()Ljava/lang/String; diff --git a/mappings/bmv.mapping b/mappings/bmv.mapping deleted file mode 100644 index 41cdceac84..0000000000 --- a/mappings/bmv.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS bmv - METHOD m asString ()Ljava/lang/String; diff --git a/mappings/bmz.mapping b/mappings/bmz.mapping deleted file mode 100644 index 2e23f21fc7..0000000000 --- a/mappings/bmz.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS bmz - METHOD m asString ()Ljava/lang/String; diff --git a/mappings/bnd.mapping b/mappings/bnd.mapping deleted file mode 100644 index d5f0cf956b..0000000000 --- a/mappings/bnd.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS bnd - METHOD m asString ()Ljava/lang/String; diff --git a/mappings/bnf.mapping b/mappings/bnf.mapping index e426e25048..b216862743 100644 --- a/mappings/bnf.mapping +++ b/mappings/bnf.mapping @@ -1,2 +1,5 @@ CLASS bnf + FIELD a TOP Lbnf; + FIELD b BOTTOM Lbnf; + FIELD c name Ljava/lang/String; METHOD m asString ()Ljava/lang/String; diff --git a/mappings/bnh.mapping b/mappings/bnh.mapping deleted file mode 100644 index d3129d4ccd..0000000000 --- a/mappings/bnh.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS bnh - METHOD m asString ()Ljava/lang/String; diff --git a/mappings/bni.mapping b/mappings/bni.mapping deleted file mode 100644 index 11ce15a74b..0000000000 --- a/mappings/bni.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS bni - METHOD m asString ()Ljava/lang/String; diff --git a/mappings/bnl.mapping b/mappings/bnl.mapping deleted file mode 100644 index 39bf337cdd..0000000000 --- a/mappings/bnl.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS bnl - METHOD m asString ()Ljava/lang/String; diff --git a/mappings/bnm.mapping b/mappings/bnm.mapping deleted file mode 100644 index 29a974db63..0000000000 --- a/mappings/bnm.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS bnm - METHOD m asString ()Ljava/lang/String; diff --git a/mappings/bnn.mapping b/mappings/bnn.mapping deleted file mode 100644 index dd05fcf0a0..0000000000 --- a/mappings/bnn.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS bnn - METHOD m asString ()Ljava/lang/String; diff --git a/mappings/bno.mapping b/mappings/bno.mapping deleted file mode 100644 index 087cb6d5ca..0000000000 --- a/mappings/bno.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS bno - METHOD m asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/block/state/BlockState.mapping b/mappings/net/minecraft/block/BlockState.mapping similarity index 96% rename from mappings/net/minecraft/block/state/BlockState.mapping rename to mappings/net/minecraft/block/BlockState.mapping index 9c1ba067e3..e4f48df935 100644 --- a/mappings/net/minecraft/block/state/BlockState.mapping +++ b/mappings/net/minecraft/block/BlockState.mapping @@ -1,4 +1,4 @@ -CLASS blz net/minecraft/block/state/BlockState +CLASS blz net/minecraft/block/BlockState CLASS blz$b METHOD a getBlockState (III)Lblz; ARG 0 x diff --git a/mappings/bfq.mapping b/mappings/net/minecraft/block/BlockWallMounted.mapping similarity index 80% rename from mappings/bfq.mapping rename to mappings/net/minecraft/block/BlockWallMounted.mapping index ec3a1d779b..9a74c8d66b 100644 --- a/mappings/bfq.mapping +++ b/mappings/net/minecraft/block/BlockWallMounted.mapping @@ -1,4 +1,4 @@ -CLASS bfq +CLASS bfq net/minecraft/block/BlockWallMounted METHOD (Lbdx$c;)V ARG 0 builder METHOD a canPlaceAt (Lblz;Laze;Leq;)Z diff --git a/mappings/net/minecraft/block/enum/EnumBambooLeaves.mapping b/mappings/net/minecraft/block/enum/EnumBambooLeaves.mapping new file mode 100644 index 0000000000..2ab0171e1f --- /dev/null +++ b/mappings/net/minecraft/block/enum/EnumBambooLeaves.mapping @@ -0,0 +1,6 @@ +CLASS bmv net/minecraft/block/enum/EnumBambooLeaves + FIELD a NONE Lbmv; + FIELD b SMALL Lbmv; + FIELD c LARGE Lbmv; + FIELD d name Ljava/lang/String; + METHOD m asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/sortme/Part.mapping b/mappings/net/minecraft/block/enum/EnumBedPart.mapping similarity index 70% rename from mappings/net/minecraft/sortme/Part.mapping rename to mappings/net/minecraft/block/enum/EnumBedPart.mapping index adc6d292af..6a780c01ab 100644 --- a/mappings/net/minecraft/sortme/Part.mapping +++ b/mappings/net/minecraft/block/enum/EnumBedPart.mapping @@ -1,4 +1,4 @@ -CLASS bmw net/minecraft/sortme/Part +CLASS bmw net/minecraft/block/enum/EnumBedPart FIELD a HEAD Lbmw; FIELD b FOOT Lbmw; FIELD c name Ljava/lang/String; diff --git a/mappings/net/minecraft/block/enum/EnumChestType.mapping b/mappings/net/minecraft/block/enum/EnumChestType.mapping new file mode 100644 index 0000000000..72f2cb393c --- /dev/null +++ b/mappings/net/minecraft/block/enum/EnumChestType.mapping @@ -0,0 +1,3 @@ +CLASS bmz net/minecraft/block/enum/EnumChestType + FIELD e name Ljava/lang/String; + METHOD m asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/sortme/Mode.mapping b/mappings/net/minecraft/block/enum/EnumComparatorMode.mapping similarity index 68% rename from mappings/net/minecraft/sortme/Mode.mapping rename to mappings/net/minecraft/block/enum/EnumComparatorMode.mapping index 828456e9bd..9d7b9454fb 100644 --- a/mappings/net/minecraft/sortme/Mode.mapping +++ b/mappings/net/minecraft/block/enum/EnumComparatorMode.mapping @@ -1,4 +1,4 @@ -CLASS bna net/minecraft/sortme/Mode +CLASS bna net/minecraft/block/enum/EnumComparatorMode FIELD a COMPARE Lbna; FIELD b SUBTRACT Lbna; FIELD c name Ljava/lang/String; diff --git a/mappings/net/minecraft/block/enum/EnumDoorHalf.mapping b/mappings/net/minecraft/block/enum/EnumDoorHalf.mapping new file mode 100644 index 0000000000..d326eeb709 --- /dev/null +++ b/mappings/net/minecraft/block/enum/EnumDoorHalf.mapping @@ -0,0 +1,4 @@ +CLASS bnd net/minecraft/block/enum/EnumDoorHalf + FIELD a UPPER Lbnd; + FIELD b LOWER Lbnd; + METHOD m asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/sortme/Hinge.mapping b/mappings/net/minecraft/block/enum/EnumDoorHinge.mapping similarity index 62% rename from mappings/net/minecraft/sortme/Hinge.mapping rename to mappings/net/minecraft/block/enum/EnumDoorHinge.mapping index 97e3189940..b57a2a3634 100644 --- a/mappings/net/minecraft/sortme/Hinge.mapping +++ b/mappings/net/minecraft/block/enum/EnumDoorHinge.mapping @@ -1,4 +1,4 @@ -CLASS bnc net/minecraft/sortme/Hinge +CLASS bnc net/minecraft/block/enum/EnumDoorHinge FIELD a LEFT Lbnc; FIELD b RIGHT Lbnc; METHOD m asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/block/enum/EnumInstrument.mapping b/mappings/net/minecraft/block/enum/EnumInstrument.mapping new file mode 100644 index 0000000000..cee1e12ae3 --- /dev/null +++ b/mappings/net/minecraft/block/enum/EnumInstrument.mapping @@ -0,0 +1,17 @@ +CLASS bnh net/minecraft/block/enum/EnumInstrument + FIELD a HARP Lbnh; + FIELD b BASEDRUM Lbnh; + FIELD c SNARE Lbnh; + FIELD d HAT Lbnh; + FIELD e BAS Lbnh; + FIELD f FLUTE Lbnh; + FIELD g BELL Lbnh; + FIELD h GUITAR Lbnh; + FIELD i CHIME Lbnh; + FIELD j XYLOPHONE Lbnh; + FIELD k name Ljava/lang/String; + FIELD l sound Lwv; + METHOD a getSound ()Lwv; + METHOD a fromBlockState (Lblz;)Lbnh; + ARG 0 state + METHOD m asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/block/enum/EnumPistonType.mapping b/mappings/net/minecraft/block/enum/EnumPistonType.mapping new file mode 100644 index 0000000000..57c3306611 --- /dev/null +++ b/mappings/net/minecraft/block/enum/EnumPistonType.mapping @@ -0,0 +1,5 @@ +CLASS bni net/minecraft/block/enum/EnumPistonType + FIELD a NORMAL Lbni; + FIELD b STICKY Lbni; + FIELD c name Ljava/lang/String; + METHOD m asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/sortme/Shape.mapping b/mappings/net/minecraft/block/enum/EnumRailShape.mapping similarity index 89% rename from mappings/net/minecraft/sortme/Shape.mapping rename to mappings/net/minecraft/block/enum/EnumRailShape.mapping index 307269f64c..c732463f24 100644 --- a/mappings/net/minecraft/sortme/Shape.mapping +++ b/mappings/net/minecraft/block/enum/EnumRailShape.mapping @@ -1,4 +1,4 @@ -CLASS bnk net/minecraft/sortme/Shape +CLASS bnk net/minecraft/block/enum/EnumRailShape FIELD a NORTH_SOUTH Lbnk; FIELD b EAST_WEST Lbnk; FIELD c ASCENDING_EAST Lbnk; diff --git a/mappings/net/minecraft/block/enum/EnumSlabType.mapping b/mappings/net/minecraft/block/enum/EnumSlabType.mapping new file mode 100644 index 0000000000..7d914a3de6 --- /dev/null +++ b/mappings/net/minecraft/block/enum/EnumSlabType.mapping @@ -0,0 +1,6 @@ +CLASS bnm net/minecraft/block/enum/EnumSlabType + FIELD a TOP Lbnm; + FIELD b BOTTOM Lbnm; + FIELD c DOUBLE Lbnm; + FIELD d name Ljava/lang/String; + METHOD m asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/block/enum/EnumStairShape.mapping b/mappings/net/minecraft/block/enum/EnumStairShape.mapping new file mode 100644 index 0000000000..06ef5e35d6 --- /dev/null +++ b/mappings/net/minecraft/block/enum/EnumStairShape.mapping @@ -0,0 +1,8 @@ +CLASS bnn net/minecraft/block/enum/EnumStairShape + FIELD a STRAIGHT Lbnn; + FIELD b INNER_LEFT Lbnn; + FIELD c INNER_RIGHT Lbnn; + FIELD d OUTER_LEFT Lbnn; + FIELD e OUTER_RIGHT Lbnn; + FIELD f name Ljava/lang/String; + METHOD m asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/block/enum/EnumStructureMode.mapping b/mappings/net/minecraft/block/enum/EnumStructureMode.mapping new file mode 100644 index 0000000000..11e6dbc258 --- /dev/null +++ b/mappings/net/minecraft/block/enum/EnumStructureMode.mapping @@ -0,0 +1,7 @@ +CLASS bno net/minecraft/block/enum/EnumStructureMode + FIELD a SAVE Lbno; + FIELD b LOAD Lbno; + FIELD c CORNER Lbno; + FIELD d DATA Lbno; + FIELD e name Ljava/lang/String; + METHOD m asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/block/enum/EnumWallMountLocation.mapping b/mappings/net/minecraft/block/enum/EnumWallMountLocation.mapping new file mode 100644 index 0000000000..954fbbd74a --- /dev/null +++ b/mappings/net/minecraft/block/enum/EnumWallMountLocation.mapping @@ -0,0 +1,6 @@ +CLASS bmu net/minecraft/block/enum/EnumWallMountLocation + FIELD a FLOOR Lbmu; + FIELD b WALL Lbmu; + FIELD c CEILING Lbmu; + FIELD d name Ljava/lang/String; + METHOD m asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/block/enum/EnumWireConnection.mapping b/mappings/net/minecraft/block/enum/EnumWireConnection.mapping new file mode 100644 index 0000000000..efdd59d5bf --- /dev/null +++ b/mappings/net/minecraft/block/enum/EnumWireConnection.mapping @@ -0,0 +1,6 @@ +CLASS bnl net/minecraft/block/enum/EnumWireConnection + FIELD a UP Lbnl; + FIELD b SIDE Lbnl; + FIELD c NONE Lbnl; + FIELD d name Ljava/lang/String; + METHOD m asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/block/property/BlockPropertyFacing.mapping b/mappings/net/minecraft/block/property/BlockPropertyFacing.mapping deleted file mode 100644 index 3a8ad6e284..0000000000 --- a/mappings/net/minecraft/block/property/BlockPropertyFacing.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS bnb net/minecraft/block/property/BlockPropertyFacing - METHOD (Ljava/lang/String;Ljava/util/Collection;)V - ARG 0 name - ARG 1 validValues - METHOD a create (Ljava/lang/String;Ljava/util/Collection;)Lbnb; - ARG 0 name - ARG 1 validValues diff --git a/mappings/net/minecraft/reference/BlockProperties.mapping b/mappings/net/minecraft/reference/BlockProperties.mapping deleted file mode 100644 index bfbee7e4a8..0000000000 --- a/mappings/net/minecraft/reference/BlockProperties.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS bmx net/minecraft/reference/BlockProperties diff --git a/mappings/net/minecraft/reference/Properties.mapping b/mappings/net/minecraft/reference/Properties.mapping new file mode 100644 index 0000000000..614d3c802f --- /dev/null +++ b/mappings/net/minecraft/reference/Properties.mapping @@ -0,0 +1,77 @@ +CLASS bmx net/minecraft/reference/Properties + FIELD A AXIS_XYZ Lbne; + FIELD B UP_BOOL Lbmy; + FIELD C DOWN_BOOL Lbmy; + FIELD D NORTH_BOOL Lbmy; + FIELD E EAST_BOOL Lbmy; + FIELD F SOUTH_BOOL Lbmy; + FIELD G WEST_BOOL Lbmy; + FIELD H FACING Lbnb; + FIELD I FACING_HOPPER Lbnb; + FIELD J FACING_HORIZONTAL Lbnb; + FIELD K WALL_MOUNT_LOCAITON Lbne; + FIELD L WIRE_CONNECTION_EAST Lbne; + FIELD M WIRE_CONNECTION_NORTH Lbne; + FIELD N WIRE_CONNECTION_SOUTH Lbne; + FIELD O WIRE_CONNECTION_WEST Lbne; + FIELD P DOOR_HALF Lbne; + FIELD R RAIL_SHAPE Lbne; + FIELD S RAIL_SHAPE_STRAIGHT Lbne; + FIELD T AGE_1 Lbng; + FIELD U AGE_2 Lbng; + FIELD V AGE_3 Lbng; + FIELD W AGE_5 Lbng; + FIELD X AGE_7 Lbng; + FIELD Y AGE_15 Lbng; + FIELD Z AGE_25 Lbng; + FIELD a ATTACHED Lbmy; + FIELD aa BITES Lbng; + FIELD ab DELAY Lbng; + FIELD ac DISTANCE Lbng; + FIELD ad EGGS Lbng; + FIELD ae HATCH Lbng; + FIELD af LAYERS Lbng; + FIELD ag CAULDRON_LEVEL Lbng; + FIELD ah BLOCK_LEVEL Lbng; + FIELD ai FLUID_BLOCK_LEVEL Lbng; + FIELD aj MOISTURE Lbng; + FIELD ak NOTE Lbng; + FIELD al PICKLES Lbng; + FIELD am POWER Lbng; + FIELD an SAPLING_STAGE Lbng; + FIELD ao ROTATION_16 Lbng; + FIELD ap BED_PART Lbne; + FIELD aq CHEST_TYPE Lbne; + FIELD ar COMPARATOR_MODE Lbne; + FIELD as DOOR_HINGE Lbne; + FIELD at INSTRUMENT Lbne; + FIELD au PISTON_TYPE Lbne; + FIELD av SLAB_TYPE Lbne; + FIELD aw STAIR_SHAPE Lbne; + FIELD ax STRUCTURE_MODE Lbne; + FIELD ay BAMBOO_LEAVES Lbne; + FIELD b CONDITIONAL Lbmy; + FIELD c DISARMED Lbmy; + FIELD d DRAG Lbmy; + FIELD e ENABLED Lbmy; + FIELD f EXTENDED Lbmy; + FIELD g EYE Lbmy; + FIELD h FALLING Lbmy; + FIELD i HAS_BOTTLE_0 Lbmy; + FIELD j HAS_BOTTLE_1 Lbmy; + FIELD k HAS_BOTTLE_2 Lbmy; + FIELD l HAS_RECORD Lbmy; + FIELD m INVERTED Lbmy; + FIELD n IN_WALL Lbmy; + FIELD o LIT Lbmy; + FIELD p LOCKED Lbmy; + FIELD q OCCUPIED Lbmy; + FIELD r OPEN Lbmy; + FIELD s PERSISTENT Lbmy; + FIELD t POWERED Lbmy; + FIELD u SHORT Lbmy; + FIELD v SNOWY Lbmy; + FIELD w TRIGGERED Lbmy; + FIELD x UNSTABLE Lbmy; + FIELD y WATERLOGGED Lbmy; + FIELD z AXIS_XZ Lbne; diff --git a/mappings/net/minecraft/block/state/IBlockProperty.mapping b/mappings/net/minecraft/state/property/IProperty.mapping similarity index 84% rename from mappings/net/minecraft/block/state/IBlockProperty.mapping rename to mappings/net/minecraft/state/property/IProperty.mapping index bb63322509..ebdb62b6bb 100644 --- a/mappings/net/minecraft/block/state/IBlockProperty.mapping +++ b/mappings/net/minecraft/state/property/IProperty.mapping @@ -1,4 +1,4 @@ -CLASS bnj net/minecraft/block/state/IBlockProperty +CLASS bnj net/minecraft/state/property/IProperty METHOD a getName ()Ljava/lang/String; METHOD a getValueAsString (Ljava/lang/Comparable;)Ljava/lang/String; ARG 0 value diff --git a/mappings/net/minecraft/block/property/BlockPropertyBase.mapping b/mappings/net/minecraft/state/property/PropertyBase.mapping similarity index 69% rename from mappings/net/minecraft/block/property/BlockPropertyBase.mapping rename to mappings/net/minecraft/state/property/PropertyBase.mapping index 6d7fffa742..a1f800e6b5 100644 --- a/mappings/net/minecraft/block/property/BlockPropertyBase.mapping +++ b/mappings/net/minecraft/state/property/PropertyBase.mapping @@ -1,10 +1,12 @@ -CLASS bmt net/minecraft/block/property/BlockPropertyBase +CLASS bmt net/minecraft/state/property/PropertyBase FIELD a valueClass Ljava/lang/Class; FIELD b name Ljava/lang/String; + FIELD c computedHashCode Ljava/lang/Integer; METHOD (Ljava/lang/String;Ljava/lang/Class;)V ARG 0 name ARG 1 valueClass METHOD a getName ()Ljava/lang/String; METHOD b getValueClass ()Ljava/lang/Class; + METHOD c computeHashCode ()I METHOD equals (Ljava/lang/Object;)Z ARG 0 object diff --git a/mappings/net/minecraft/block/property/BlockPropertyBoolean.mapping b/mappings/net/minecraft/state/property/PropertyBoolean.mapping similarity index 85% rename from mappings/net/minecraft/block/property/BlockPropertyBoolean.mapping rename to mappings/net/minecraft/state/property/PropertyBoolean.mapping index 5881f2e1a0..8e7b2cc24e 100644 --- a/mappings/net/minecraft/block/property/BlockPropertyBoolean.mapping +++ b/mappings/net/minecraft/state/property/PropertyBoolean.mapping @@ -1,4 +1,4 @@ -CLASS bmy net/minecraft/block/property/BlockPropertyBoolean +CLASS bmy net/minecraft/state/property/PropertyBoolean FIELD a values Lcom/google/common/collect/ImmutableSet; METHOD (Ljava/lang/String;)V ARG 0 name @@ -10,6 +10,7 @@ CLASS bmy net/minecraft/block/property/BlockPropertyBoolean ARG 0 name METHOD b getValue (Ljava/lang/String;)Ljava/util/Optional; ARG 0 name + METHOD c computeHashCode ()I METHOD d getValues ()Ljava/util/Collection; METHOD equals (Ljava/lang/Object;)Z ARG 0 object diff --git a/mappings/net/minecraft/block/property/BlockPropertyEnum.mapping b/mappings/net/minecraft/state/property/PropertyEnum.mapping similarity index 91% rename from mappings/net/minecraft/block/property/BlockPropertyEnum.mapping rename to mappings/net/minecraft/state/property/PropertyEnum.mapping index 24c3d9fd90..2b1a84990f 100644 --- a/mappings/net/minecraft/block/property/BlockPropertyEnum.mapping +++ b/mappings/net/minecraft/state/property/PropertyEnum.mapping @@ -1,4 +1,4 @@ -CLASS bne net/minecraft/block/property/BlockPropertyEnum +CLASS bne net/minecraft/state/property/PropertyEnum FIELD a validValues Lcom/google/common/collect/ImmutableSet; FIELD b nameValueMap Ljava/util/Map; METHOD (Ljava/lang/String;Ljava/lang/Class;Ljava/util/Collection;)V @@ -20,6 +20,7 @@ CLASS bne net/minecraft/block/property/BlockPropertyEnum ARG 2 validValues METHOD b getValue (Ljava/lang/String;)Ljava/util/Optional; ARG 0 name + METHOD c computeHashCode ()I METHOD d getValues ()Ljava/util/Collection; METHOD equals (Ljava/lang/Object;)Z ARG 0 object diff --git a/mappings/net/minecraft/state/property/PropertyFacing.mapping b/mappings/net/minecraft/state/property/PropertyFacing.mapping new file mode 100644 index 0000000000..d2b31c08db --- /dev/null +++ b/mappings/net/minecraft/state/property/PropertyFacing.mapping @@ -0,0 +1,13 @@ +CLASS bnb net/minecraft/state/property/PropertyFacing + METHOD (Ljava/lang/String;Ljava/util/Collection;)V + ARG 0 name + ARG 1 validValues + METHOD a create (Ljava/lang/String;Ljava/util/Collection;)Lbnb; + ARG 0 name + ARG 1 validValues + METHOD a create (Ljava/lang/String;Ljava/util/function/Predicate;)Lbnb; + ARG 0 name + ARG 1 valuePredicate + METHOD a create (Ljava/lang/String;[Lev;)Lbnb; + ARG 0 name + ARG 1 validValues diff --git a/mappings/net/minecraft/block/property/BlockPropertyInteger.mapping b/mappings/net/minecraft/state/property/PropertyInteger.mapping similarity index 86% rename from mappings/net/minecraft/block/property/BlockPropertyInteger.mapping rename to mappings/net/minecraft/state/property/PropertyInteger.mapping index fcd84f7612..27fc2484d0 100644 --- a/mappings/net/minecraft/block/property/BlockPropertyInteger.mapping +++ b/mappings/net/minecraft/state/property/PropertyInteger.mapping @@ -1,4 +1,4 @@ -CLASS bng net/minecraft/block/property/BlockPropertyInteger +CLASS bng net/minecraft/state/property/PropertyInteger FIELD a validValues Lcom/google/common/collect/ImmutableSet; METHOD (Ljava/lang/String;II)V ARG 0 name @@ -14,6 +14,7 @@ CLASS bng net/minecraft/block/property/BlockPropertyInteger ARG 2 max METHOD b getValue (Ljava/lang/String;)Ljava/util/Optional; ARG 0 name + METHOD c computeHashCode ()I METHOD d getValues ()Ljava/util/Collection; METHOD equals (Ljava/lang/Object;)Z ARG 0 object