From c8421edf9e783f0ab749e538691f35b4c02aa388 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Sat, 7 Jul 2018 01:26:12 +1000
Subject: $ Further improvements to Australia.

---
 .../australia/block/AustraliaContentLoader.java    | 31 ++++++++++++++++------
 .../australia/block/BlockAustraliaSand.java        |  4 +--
 .../australia/block/BlockAustraliaTopSoil.java     |  4 +--
 3 files changed, 27 insertions(+), 12 deletions(-)

(limited to 'src/Java/gtPlusPlus/australia/block')

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
-- 
cgit