From da0a1f4b4474ce2b34e1f7dc0d5efd652870711b Mon Sep 17 00:00:00 2001 From: valoeghese <46117728+valoeghese@users.noreply.github.com> Date: Thu, 25 Apr 2019 21:37:06 +1200 Subject: [PATCH] layer and noise mappings (#648) --- .../util/math/noise/SimplexNoiseSampler.mapping | 12 ++++++++++++ mappings/net/minecraft/world/biome/Biome.mapping | 4 ++++ .../biome/layer/AddBiomeGroups3And4Layer.mapping | 1 - .../world/biome/layer/AddClimateLayers.mapping | 4 ++++ .../world/biome/layer/AddColdClimatesLayer.mapping | 1 + .../world/biome/layer/BiomeGroupLayer.mapping | 4 ---- ...iomeLayer.mapping => SetBaseBiomesLayer.mapping} | 13 ++++++++----- 7 files changed, 29 insertions(+), 10 deletions(-) delete mode 100644 mappings/net/minecraft/world/biome/layer/AddBiomeGroups3And4Layer.mapping create mode 100644 mappings/net/minecraft/world/biome/layer/AddClimateLayers.mapping create mode 100644 mappings/net/minecraft/world/biome/layer/AddColdClimatesLayer.mapping delete mode 100644 mappings/net/minecraft/world/biome/layer/BiomeGroupLayer.mapping rename mappings/net/minecraft/world/biome/layer/{BiomeGroupToBiomeLayer.mapping => SetBaseBiomesLayer.mapping} (66%) diff --git a/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping index b17d1a3bb5..b2de9931e3 100644 --- a/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/SimplexNoiseSampler.mapping @@ -1 +1,13 @@ CLASS ckf net/minecraft/util/math/noise/SimplexNoiseSampler + FIELD a gradients [[I + FIELD e sqrt3 D + METHOD (Ljava/util/Random;)V + ARG 1 random + METHOD a sample (DD)D + ARG 1 x + ARG 3 y + METHOD a dot ([IDDD)D + ARG 0 gArr + ARG 1 x + ARG 3 y + ARG 5 z diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping index 0494ab7af0..8b8e5152d6 100644 --- a/mappings/net/minecraft/world/biome/Biome.mapping +++ b/mappings/net/minecraft/world/biome/Biome.mapping @@ -52,6 +52,8 @@ CLASS bie net/minecraft/world/biome/Biome FIELD d WARM Lbie$c; FIELD e NAME_MAP Ljava/util/Map; FIELD f name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name METHOD a getName ()Ljava/lang/String; CLASS bie$d Precipitation FIELD a NONE Lbie$d; @@ -137,9 +139,11 @@ CLASS bie net/minecraft/world/biome/Biome ARG 2 chunk ARG 3 x ARG 4 z + ARG 5 worldHeight ARG 6 noise ARG 8 defaultBlock ARG 9 defaultFluid + ARG 10 seaLevel ARG 11 seed METHOD b getPrecipitation ()Lbie$d; METHOD b canSetIce (Lbhk;Lev;)Z diff --git a/mappings/net/minecraft/world/biome/layer/AddBiomeGroups3And4Layer.mapping b/mappings/net/minecraft/world/biome/layer/AddBiomeGroups3And4Layer.mapping deleted file mode 100644 index f1887cd8e0..0000000000 --- a/mappings/net/minecraft/world/biome/layer/AddBiomeGroups3And4Layer.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS clu net/minecraft/world/biome/layer/AddBiomeGroups3And4Layer diff --git a/mappings/net/minecraft/world/biome/layer/AddClimateLayers.mapping b/mappings/net/minecraft/world/biome/layer/AddClimateLayers.mapping new file mode 100644 index 0000000000..8df978c3df --- /dev/null +++ b/mappings/net/minecraft/world/biome/layer/AddClimateLayers.mapping @@ -0,0 +1,4 @@ +CLASS clr net/minecraft/world/biome/layer/AddClimateLayers + CLASS clr$a AddTemperateBiomesLayer + CLASS clr$b AddCoolBiomesLayer + CLASS clr$c AddSpecialBiomesLayer diff --git a/mappings/net/minecraft/world/biome/layer/AddColdClimatesLayer.mapping b/mappings/net/minecraft/world/biome/layer/AddColdClimatesLayer.mapping new file mode 100644 index 0000000000..8785f7f1a4 --- /dev/null +++ b/mappings/net/minecraft/world/biome/layer/AddColdClimatesLayer.mapping @@ -0,0 +1 @@ +CLASS clu net/minecraft/world/biome/layer/AddColdClimatesLayer diff --git a/mappings/net/minecraft/world/biome/layer/BiomeGroupLayer.mapping b/mappings/net/minecraft/world/biome/layer/BiomeGroupLayer.mapping deleted file mode 100644 index 8bcbc10d4e..0000000000 --- a/mappings/net/minecraft/world/biome/layer/BiomeGroupLayer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS clr net/minecraft/world/biome/layer/BiomeGroupLayer - CLASS clr$a AddGroup2Layer - CLASS clr$b AddGroup3Layer - CLASS clr$c AddSpecialBiomesLayer diff --git a/mappings/net/minecraft/world/biome/layer/BiomeGroupToBiomeLayer.mapping b/mappings/net/minecraft/world/biome/layer/SetBaseBiomesLayer.mapping similarity index 66% rename from mappings/net/minecraft/world/biome/layer/BiomeGroupToBiomeLayer.mapping rename to mappings/net/minecraft/world/biome/layer/SetBaseBiomesLayer.mapping index a4b7f29630..9b74432411 100644 --- a/mappings/net/minecraft/world/biome/layer/BiomeGroupToBiomeLayer.mapping +++ b/mappings/net/minecraft/world/biome/layer/SetBaseBiomesLayer.mapping @@ -1,4 +1,4 @@ -CLASS clw net/minecraft/world/biome/layer/BiomeGroupToBiomeLayer +CLASS clw net/minecraft/world/biome/layer/SetBaseBiomesLayer FIELD a BIRCH_FOREST_ID I FIELD b DESERT_ID I FIELD c MOUNTAINS_ID I @@ -16,9 +16,12 @@ CLASS clw net/minecraft/world/biome/layer/BiomeGroupToBiomeLayer FIELD o TAIGA_ID I FIELD p SNOWY_TAIGA_ID I FIELD q OLD_GROUP_1 [I - FIELD r GROUP_1 [I - FIELD s GROUP_2 [I - FIELD t GROUP_3 [I - FIELD u GROUP_4 [I + FIELD r DRY_BIOMES [I + FIELD s TEMPERATE_BIOMES [I + FIELD t COOL_BIOMES [I + FIELD u SNOWY_BIOMES [I FIELD v config Lbyu; FIELD w chosenGroup1 [I + METHOD (Lbho;Lbyu;)V + ARG 1 generatorType + ARG 2 generatorConfig