From ff74e3d54f697c4b31210238582631901be49b0c Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 4 Dec 2018 06:12:19 +1100 Subject: [PATCH] map colour -> material colour (#233) --- mappings/net/minecraft/block/BedBlock.mapping | 2 +- mappings/net/minecraft/block/Block.mapping | 15 ++++++++++----- mappings/net/minecraft/block/BlockState.mapping | 2 +- mappings/net/minecraft/block/LogBlock.mapping | 2 +- mappings/net/minecraft/block/Material.mapping | 8 +++++--- .../MaterialColor.mapping} | 2 +- mappings/net/minecraft/util/DyeColor.mapping | 5 +++-- 7 files changed, 22 insertions(+), 14 deletions(-) rename mappings/net/minecraft/{util/MapColor.mapping => block/MaterialColor.mapping} (96%) diff --git a/mappings/net/minecraft/block/BedBlock.mapping b/mappings/net/minecraft/block/BedBlock.mapping index c2fa616268..ffc75f8ddc 100644 --- a/mappings/net/minecraft/block/BedBlock.mapping +++ b/mappings/net/minecraft/block/BedBlock.mapping @@ -54,5 +54,5 @@ CLASS bfn net/minecraft/block/BedBlock METHOD b getRenderType (Lboj;)Lbjx; METHOD c getRenderLayer ()Lbad; METHOD d getColor ()Lauo; - METHOD e getMapColor (Lboj;Lbac;Let;)Lcdv; + METHOD e getMaterialColor (Lboj;Lbac;Let;)Lcdv; METHOD h getPistonBehavior (Lboj;)Lcdw; diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 5ad5174773..42a9b32814 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -8,7 +8,7 @@ CLASS bfr net/minecraft/block/Block FIELD c XYZ Lbfr$b; CLASS bfr$c Builder FIELD a material Lcdu; - FIELD b mapColor Lcdv; + FIELD b materialColor Lcdv; FIELD c collidable Z FIELD d soundGroup Lbks; FIELD e luminance I @@ -18,8 +18,8 @@ CLASS bfr net/minecraft/block/Block FIELD i friction F FIELD j dropTableId Lpy; METHOD (Lcdu;Lcdv;)V - ARG 0 material - ARG 1 mapColor + ARG 1 material + ARG 2 materialColor METHOD a noCollision ()Lbfr$c; METHOD a setFrictionCoefficient (F)Lbfr$c; METHOD a setStrength (FF)Lbfr$c; @@ -28,8 +28,13 @@ CLASS bfr net/minecraft/block/Block METHOD a copy (Lbfr;)Lbfr$c; METHOD a setSoundGroup (Lbks;)Lbfr$c; METHOD a create (Lcdu;)Lbfr$c; + ARG 0 material METHOD a create (Lcdu;Lauo;)Lbfr$c; + ARG 0 material + ARG 1 color METHOD a create (Lcdu;Lcdv;)Lbfr$c; + ARG 0 material + ARG 1 color METHOD b breakInstantly ()Lbfr$c; METHOD b setStrength (F)Lbfr$c; METHOD b copyDropTable (Lbfr;)Lbfr$c; @@ -47,7 +52,7 @@ CLASS bfr net/minecraft/block/Block FIELD q randomTicks Z FIELD r soundGroup Lbks; FIELD s material Lcdu; - FIELD t mapColor Lcdv; + FIELD t materialColor Lcdv; FIELD u stateFactory Lbok; FIELD v collidable Z METHOD (Lbfr$c;)V @@ -213,7 +218,7 @@ CLASS bfr net/minecraft/block/Block METHOD d isAir (Lboj;)Z METHOD d isSimpleFullBlock (Lboj;Lbac;Let;)Z METHOD e isFullBoundsCubeForCulling (Lboj;)Z - METHOD e getMapColor (Lboj;Lbac;Let;)Lcdv; + METHOD e getMaterialColor (Lboj;Lbac;Let;)Lcdv; METHOD f getFluidState (Lboj;)Lcdq; METHOD g hasBlockEntity ()Z METHOD g emitsRedstonePower (Lboj;)Z diff --git a/mappings/net/minecraft/block/BlockState.mapping b/mappings/net/minecraft/block/BlockState.mapping index 9bcdcfde67..a15c905aa0 100644 --- a/mappings/net/minecraft/block/BlockState.mapping +++ b/mappings/net/minecraft/block/BlockState.mapping @@ -31,7 +31,7 @@ CLASS boj net/minecraft/block/BlockState METHOD b randomTick (Lbaq;Let;Ljava/util/Random;)V METHOD c getStrongRedstonePower (Lbac;Let;Ley;)I METHOD d getBlock ()Lbfr; - METHOD d getMapColor (Lbac;Let;)Lcdv; + METHOD d getMaterialColor (Lbac;Let;)Lcdv; METHOD e getMaterial ()Lcdu; METHOD f getAmbientOcclusionLightLevel (Lbac;Let;)F METHOD g getLuminance ()I diff --git a/mappings/net/minecraft/block/LogBlock.mapping b/mappings/net/minecraft/block/LogBlock.mapping index 2df48a614f..8d4795d7d4 100644 --- a/mappings/net/minecraft/block/LogBlock.mapping +++ b/mappings/net/minecraft/block/LogBlock.mapping @@ -1,2 +1,2 @@ CLASS biw net/minecraft/block/LogBlock - METHOD e getMapColor (Lboj;Lbac;Let;)Lcdv; + METHOD e getMaterialColor (Lboj;Lbac;Let;)Lcdv; diff --git a/mappings/net/minecraft/block/Material.mapping b/mappings/net/minecraft/block/Material.mapping index 3caf958765..e1ac018263 100644 --- a/mappings/net/minecraft/block/Material.mapping +++ b/mappings/net/minecraft/block/Material.mapping @@ -1,7 +1,9 @@ CLASS cdu net/minecraft/block/Material CLASS cdu$a Builder FIELD a pistonBehavior Lcdw; - FIELD h mapColor Lcdv; + FIELD h color Lcdv; + METHOD (Lcdv;)V + ARG 1 color METHOD g destroyedByPiston ()Lcdu$a; METHOD h blocksPistons ()Lcdu$a; METHOD i build ()Lcdu; @@ -15,7 +17,7 @@ CLASS cdu net/minecraft/block/Material FIELD J BARRIER Lcdu; FIELD K PISTON Lcdu; FIELD O CAKE Lcdu; - FIELD P mapColor Lcdv; + FIELD P color Lcdv; FIELD Q pistonBehavior Lcdw; FIELD a AIR Lcdu; FIELD b STRUCTURE_VOID Lcdu; @@ -44,4 +46,4 @@ CLASS cdu net/minecraft/block/Material FIELD y BAMBOO Lcdu; FIELD z WOOL Lcdu; METHOD h getPistonBehavior ()Lcdw; - METHOD i getMapColor ()Lcdv; + METHOD i getColor ()Lcdv; diff --git a/mappings/net/minecraft/util/MapColor.mapping b/mappings/net/minecraft/block/MaterialColor.mapping similarity index 96% rename from mappings/net/minecraft/util/MapColor.mapping rename to mappings/net/minecraft/block/MaterialColor.mapping index 1c60f7da2c..5ed847b568 100644 --- a/mappings/net/minecraft/util/MapColor.mapping +++ b/mappings/net/minecraft/block/MaterialColor.mapping @@ -1,4 +1,4 @@ -CLASS cdv net/minecraft/util/MapColor +CLASS cdv net/minecraft/block/MaterialColor FIELD A BLUE Lcdv; FIELD B BROWN Lcdv; FIELD C GREEN Lcdv; diff --git a/mappings/net/minecraft/util/DyeColor.mapping b/mappings/net/minecraft/util/DyeColor.mapping index a524b1cdbc..0edb69cd6b 100644 --- a/mappings/net/minecraft/util/DyeColor.mapping +++ b/mappings/net/minecraft/util/DyeColor.mapping @@ -19,7 +19,7 @@ CLASS auo net/minecraft/util/DyeColor FIELD r BY_FIREWORK_COLOR Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap; FIELD s id I FIELD t name Ljava/lang/String; - FIELD u mapColor Lcdv; + FIELD u materialColor Lcdv; FIELD v color I FIELD w colorSwapped I FIELD x colorComponents [F @@ -28,6 +28,7 @@ CLASS auo net/minecraft/util/DyeColor ARG 3 woolId ARG 4 name ARG 5 color + ARG 6 materialColor METHOD a getId ()I METHOD a byId (I)Lauo; ARG 0 id @@ -36,6 +37,6 @@ CLASS auo net/minecraft/util/DyeColor METHOD b byFireworkColor (I)Lauo; METHOD c getColorSwapped ()I METHOD d getColorComponents ()[F - METHOD e getMapColor ()Lcdv; + METHOD e getMaterialColor ()Lcdv; METHOD f getFireworkColor ()I METHOD m asString ()Ljava/lang/String;