From 921e45a6d686faf8f3ea11aa04c68fea05704d43 Mon Sep 17 00:00:00 2001 From: Abigail Moore Date: Thu, 7 Oct 2021 15:23:03 -0600 Subject: [PATCH] Fixed slate gen --- changelog.txt | 5 +++++ minecraft/net/minecraft/src/BTABiomeDecorator.java | 3 +++ minecraft/net/minecraft/src/BTAEnumVersionCompat.java | 3 ++- minecraft/net/minecraft/src/BTAMod.java | 2 +- minecraft_server/net/minecraft/src/BTABiomeDecorator.java | 3 +++ minecraft_server/net/minecraft/src/BTAEnumVersionCompat.java | 3 ++- minecraft_server/net/minecraft/src/BTAMod.java | 2 +- 7 files changed, 17 insertions(+), 4 deletions(-) diff --git a/changelog.txt b/changelog.txt index 652e5d9..eac725f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -13,6 +13,11 @@ Version 2.1.0 [*]Changed black stone to be able to spawn nether mobs. [/list] +Version 2.0.2 +[list] +[*]Fixed an issue where the last release caused slate to stop generating. +[/list] + Version 2.0.1 [list] [*]Fixed an issue where simplex noise surface decorators were creating artifacts along chunk boundaries. This was most noticeable in outback but affected several other biomes. diff --git a/minecraft/net/minecraft/src/BTABiomeDecorator.java b/minecraft/net/minecraft/src/BTABiomeDecorator.java index 3206d1c..765c99f 100644 --- a/minecraft/net/minecraft/src/BTABiomeDecorator.java +++ b/minecraft/net/minecraft/src/BTABiomeDecorator.java @@ -144,6 +144,7 @@ public class BTABiomeDecorator protected WorldGenerator graniteGen; protected WorldGenerator andesiteGen; protected WorldGenerator dioriteGen; + protected WorldGenerator slateGen; protected WorldGenerator melonGen; public int oasesPerChunk; @@ -212,6 +213,7 @@ public BTABiomeDecorator(BiomeGenBase par1BiomeGenBase) graniteGen = new BTAWorldGenMinable(BTADecoIntegration.stoneTypes.blockID, 0, 32, Block.stone.blockID); andesiteGen = new BTAWorldGenMinable(BTADecoIntegration.stoneTypes.blockID, 1, 32, Block.stone.blockID); dioriteGen = new BTAWorldGenMinable(BTADecoIntegration.stoneTypes.blockID, 2, 32, Block.stone.blockID); + slateGen = new BTAWorldGenMinable(Block.stone.blockID, 3, 32, Block.stone.blockID); } oasesPerChunk = 0; @@ -601,6 +603,7 @@ protected void generateOres() this.genStandardOre1(12, this.graniteGen, 0, 128); this.genStandardOre1(12, this.andesiteGen, 0, 128); this.genStandardOre1(12, this.dioriteGen, 0, 128); + this.genStandardOre1(12, this.slateGen, 0, this.currentWorld.provider.terrainType.getStrataLevels()[1]); } } } diff --git a/minecraft/net/minecraft/src/BTAEnumVersionCompat.java b/minecraft/net/minecraft/src/BTAEnumVersionCompat.java index 32cf7ae..6dab964 100644 --- a/minecraft/net/minecraft/src/BTAEnumVersionCompat.java +++ b/minecraft/net/minecraft/src/BTAEnumVersionCompat.java @@ -15,7 +15,8 @@ public enum BTAEnumVersionCompat { V1_4_3(1, 4, 3), V1_4_4(1, 4, 4), V2_0_0(2, 0, 0), - V2_0_1(2, 0, 1); + V2_0_1(2, 0, 1), + V2_0_2(2, 0, 2); private final int major; private final int minor; diff --git a/minecraft/net/minecraft/src/BTAMod.java b/minecraft/net/minecraft/src/BTAMod.java index 75469da..26ec64b 100644 --- a/minecraft/net/minecraft/src/BTAMod.java +++ b/minecraft/net/minecraft/src/BTAMod.java @@ -19,7 +19,7 @@ public class BTAMod extends FCAddOn { public static Material netherSand; private BTAMod() { - super("Better Terrain", "2.0.1", "BTA"); + super("Better Terrain", "2.0.2", "BTA"); this.currentVersion = BTAEnumVersionCompat.fromString(this.getVersionString()); } diff --git a/minecraft_server/net/minecraft/src/BTABiomeDecorator.java b/minecraft_server/net/minecraft/src/BTABiomeDecorator.java index 3206d1c..765c99f 100644 --- a/minecraft_server/net/minecraft/src/BTABiomeDecorator.java +++ b/minecraft_server/net/minecraft/src/BTABiomeDecorator.java @@ -144,6 +144,7 @@ public class BTABiomeDecorator protected WorldGenerator graniteGen; protected WorldGenerator andesiteGen; protected WorldGenerator dioriteGen; + protected WorldGenerator slateGen; protected WorldGenerator melonGen; public int oasesPerChunk; @@ -212,6 +213,7 @@ public BTABiomeDecorator(BiomeGenBase par1BiomeGenBase) graniteGen = new BTAWorldGenMinable(BTADecoIntegration.stoneTypes.blockID, 0, 32, Block.stone.blockID); andesiteGen = new BTAWorldGenMinable(BTADecoIntegration.stoneTypes.blockID, 1, 32, Block.stone.blockID); dioriteGen = new BTAWorldGenMinable(BTADecoIntegration.stoneTypes.blockID, 2, 32, Block.stone.blockID); + slateGen = new BTAWorldGenMinable(Block.stone.blockID, 3, 32, Block.stone.blockID); } oasesPerChunk = 0; @@ -601,6 +603,7 @@ protected void generateOres() this.genStandardOre1(12, this.graniteGen, 0, 128); this.genStandardOre1(12, this.andesiteGen, 0, 128); this.genStandardOre1(12, this.dioriteGen, 0, 128); + this.genStandardOre1(12, this.slateGen, 0, this.currentWorld.provider.terrainType.getStrataLevels()[1]); } } } diff --git a/minecraft_server/net/minecraft/src/BTAEnumVersionCompat.java b/minecraft_server/net/minecraft/src/BTAEnumVersionCompat.java index 32cf7ae..6dab964 100644 --- a/minecraft_server/net/minecraft/src/BTAEnumVersionCompat.java +++ b/minecraft_server/net/minecraft/src/BTAEnumVersionCompat.java @@ -15,7 +15,8 @@ public enum BTAEnumVersionCompat { V1_4_3(1, 4, 3), V1_4_4(1, 4, 4), V2_0_0(2, 0, 0), - V2_0_1(2, 0, 1); + V2_0_1(2, 0, 1), + V2_0_2(2, 0, 2); private final int major; private final int minor; diff --git a/minecraft_server/net/minecraft/src/BTAMod.java b/minecraft_server/net/minecraft/src/BTAMod.java index ee7ed33..930e99a 100644 --- a/minecraft_server/net/minecraft/src/BTAMod.java +++ b/minecraft_server/net/minecraft/src/BTAMod.java @@ -19,7 +19,7 @@ public class BTAMod extends FCAddOn { public static Material netherSand; private BTAMod() { - super("Better Terrain", "2.0.1", "BTA"); + super("Better Terrain", "2.0.2", "BTA"); this.currentVersion = BTAEnumVersionCompat.fromString(this.getVersionString()); }