diff options
7 files changed, 44 insertions, 15 deletions
diff --git a/src/Java/gtPlusPlus/australia/GTplusplus_Australia.java b/src/Java/gtPlusPlus/australia/GTplusplus_Australia.java index dd40fccf9c..4cccf2c2e6 100644 --- a/src/Java/gtPlusPlus/australia/GTplusplus_Australia.java +++ b/src/Java/gtPlusPlus/australia/GTplusplus_Australia.java @@ -19,7 +19,6 @@ import gtPlusPlus.australia.gen.gt.WorldGen_Australia_Ores; import gtPlusPlus.australia.gen.gt.WorldGen_GT_Australia_Base; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.CORE.Australia; -import gtPlusPlus.xmod.gregtech.HANDLER_GT; import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.config.Configuration; diff --git a/src/Java/gtPlusPlus/australia/biome/Biome_AustralianDesert.java b/src/Java/gtPlusPlus/australia/biome/Biome_AustralianDesert.java index e012fa8590..646c3c804a 100644 --- a/src/Java/gtPlusPlus/australia/biome/Biome_AustralianDesert.java +++ b/src/Java/gtPlusPlus/australia/biome/Biome_AustralianDesert.java @@ -28,6 +28,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.BiomeManager; @@ -167,6 +168,12 @@ public class Biome_AustralianDesert { this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityClass, a, b, c)); return true; } + + @Override + public WorldGenAbstractTree func_150567_a(Random par1Random){ + return (WorldGenAbstractTree)(getRandomWorldGenForTrees(par1Random)); + } + //TODO - DOES THIS WORK? public WorldGenerator getRandomWorldGenForTrees(Random par1Random) diff --git a/src/Java/gtPlusPlus/australia/biome/Biome_AustralianDesert2.java b/src/Java/gtPlusPlus/australia/biome/Biome_AustralianDesert2.java index 6f38fe5cd8..233ca54a72 100644 --- a/src/Java/gtPlusPlus/australia/biome/Biome_AustralianDesert2.java +++ b/src/Java/gtPlusPlus/australia/biome/Biome_AustralianDesert2.java @@ -28,6 +28,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.BiomeManager; @@ -127,7 +128,7 @@ public class Biome_AustralianDesert2 { Field mClone = mInternalBiomeList; mTempList = (BiomeGenBase[]) mInternalBiomeList.get(null); if (mTempList != null){ - mTempList[CORE.AUSTRALIA_BIOME_DESERT_1_ID] = this; + mTempList[CORE.AUSTRALIA_BIOME_DESERT_2_ID] = this; mInternalBiomeList.set(null, mTempList); if (mTempList != mInternalBiomeList.get(null)){ ReflectionUtils.setFinalStatic(mInternalBiomeList, mTempList); @@ -167,6 +168,11 @@ public class Biome_AustralianDesert2 { this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityClass, a, b, c)); return true; } + + @Override + public WorldGenAbstractTree func_150567_a(Random par1Random){ + return (WorldGenAbstractTree)(getRandomWorldGenForTrees(par1Random)); + } //TODO - DOES THIS WORK? public WorldGenerator getRandomWorldGenForTrees(Random par1Random) diff --git a/src/Java/gtPlusPlus/australia/block/AustraliaContentLoader.java b/src/Java/gtPlusPlus/australia/block/AustraliaContentLoader.java index 8571bf5477..e5836a907c 100644 --- a/src/Java/gtPlusPlus/australia/block/AustraliaContentLoader.java +++ b/src/Java/gtPlusPlus/australia/block/AustraliaContentLoader.java @@ -3,14 +3,21 @@ package gtPlusPlus.australia.block; import static gtPlusPlus.australia.dimension.Dimension_Australia.*; import cpw.mods.fml.common.registry.GameRegistry; - +import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.australia.biome.Biome_AustralianDesert; +import gtPlusPlus.australia.biome.Biome_AustralianDesert2; import gtPlusPlus.australia.item.ItemAustraliaPortalTrigger; import gtPlusPlus.australia.item.ItemBlockAustralia; public class AustraliaContentLoader { + private static Block blockAustralianSand; + private static Block blockAustralianTopSoil; + + public static AutoMap<Block> mValidGenerationBlocks = new AutoMap<Block>(); + public synchronized static void run() { initMisc(); initItems(); @@ -32,18 +39,26 @@ public class AustraliaContentLoader { //Create Block Instances portalBlock = new BlockAustraliaPortal(); blockPortalFrame = new BlockDarkWorldPortalFrame(); - - Biome_AustralianDesert.blockFluidLakes = Blocks.water; - Biome_AustralianDesert.blockTopLayer = new BlockAustraliaSand(); - Biome_AustralianDesert.blockSecondLayer = new BlockAustraliaTopSoil(); - + blockAustralianSand = new BlockAustraliaSand(); + blockAustralianTopSoil = new BlockAustraliaTopSoil(); + mValidGenerationBlocks.put(blockAustralianSand); + mValidGenerationBlocks.put(blockAustralianTopSoil); //Registry GameRegistry.registerBlock(portalBlock, ItemBlockAustralia.class, "dimensionAustraliaPortalBlock"); GameRegistry.registerBlock(blockPortalFrame, ItemBlockAustralia.class, "blockAustraliaPortalFrame"); - GameRegistry.registerBlock(Biome_AustralianDesert.blockTopLayer, ItemBlockAustralia.class, "blockAustralianTopSoil"); - GameRegistry.registerBlock(Biome_AustralianDesert.blockSecondLayer, ItemBlockAustralia.class, "blockAustralianSand"); + GameRegistry.registerBlock(blockAustralianSand, ItemBlockAustralia.class, "blockAustralianTopSoil"); + GameRegistry.registerBlock(blockAustralianTopSoil, ItemBlockAustralia.class, "blockAustralianSand"); + + //Set Biome Blocks up + Biome_AustralianDesert.blockFluidLakes = Blocks.water; + Biome_AustralianDesert.blockTopLayer = blockAustralianSand; + Biome_AustralianDesert.blockSecondLayer = blockAustralianTopSoil; + + Biome_AustralianDesert2.blockFluidLakes = Blocks.water; + Biome_AustralianDesert2.blockTopLayer = blockAustralianSand; + Biome_AustralianDesert2.blockSecondLayer = blockAustralianTopSoil; return true; } diff --git a/src/Java/gtPlusPlus/australia/block/BlockAustraliaSand.java b/src/Java/gtPlusPlus/australia/block/BlockAustraliaSand.java index 0eae16f6a0..f4f9c04a3b 100644 --- a/src/Java/gtPlusPlus/australia/block/BlockAustraliaSand.java +++ b/src/Java/gtPlusPlus/australia/block/BlockAustraliaSand.java @@ -13,8 +13,8 @@ public class BlockAustraliaSand extends BlockGrass implements ITileTooltip{ this.setCreativeTab(AddToCreativeTab.tabBlock); this.setBlockName("blockAustralianSand"); this.setHardness(0.1F); - this.setBlockTextureName("minecraft" + ":" + "grass"); - LanguageRegistry.addName(this, "Sandy Soil"); + this.setBlockTextureName("minecraft" + ":" + "red_sand"); + LanguageRegistry.addName(this, "Sandy Earth"); } @Override diff --git a/src/Java/gtPlusPlus/australia/block/BlockAustraliaTopSoil.java b/src/Java/gtPlusPlus/australia/block/BlockAustraliaTopSoil.java index 22f63d48d5..055e3f6372 100644 --- a/src/Java/gtPlusPlus/australia/block/BlockAustraliaTopSoil.java +++ b/src/Java/gtPlusPlus/australia/block/BlockAustraliaTopSoil.java @@ -16,10 +16,10 @@ public class BlockAustraliaTopSoil extends BlockDirt implements ITileTooltip{ public BlockAustraliaTopSoil() { this.setHardness(0.5F); - this.setBlockTextureName("minecraft" + ":" + "dirt"); + this.setBlockTextureName("minecraft" + ":" + "sand"); this.setCreativeTab(CreativeTabs.tabBlock); this.setBlockName("blockAustralianTopSoil"); - LanguageRegistry.addName(this, "Desert Soil"); + LanguageRegistry.addName(this, "Desert Earth"); } @Override diff --git a/src/Java/gtPlusPlus/australia/chunk/ChunkProviderAustralia.java b/src/Java/gtPlusPlus/australia/chunk/ChunkProviderAustralia.java index b491928ac6..e5390d3238 100644 --- a/src/Java/gtPlusPlus/australia/chunk/ChunkProviderAustralia.java +++ b/src/Java/gtPlusPlus/australia/chunk/ChunkProviderAustralia.java @@ -4,6 +4,8 @@ import java.util.List; import java.util.Random; import cpw.mods.fml.common.eventhandler.Event.Result; +import gtPlusPlus.australia.block.AustraliaContentLoader; +import gtPlusPlus.core.util.math.MathUtils; import net.minecraft.block.Block; import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; @@ -309,7 +311,7 @@ public class ChunkProviderAustralia implements IChunkProvider { for (int k3 = 0; k3 < 4; ++k3) if ((d15 += d16) > 0.0D) - par3BlockArray[j3 += short1] = Blocks.stone; + par3BlockArray[j3 += short1] = MathUtils.randInt(0, 10) < 9 ? Blocks.stone : AustraliaContentLoader.mValidGenerationBlocks.get(MathUtils.randInt(0, AustraliaContentLoader.mValidGenerationBlocks.size()-1)); else if (k2 * 8 + l2 < b0) par3BlockArray[j3 += short1] = Blocks.water; else |