Remove Australia dimension and associated world gen, mobs etc. (#516)

Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>

3 files changed, 2 insertions, 68 deletions

diff --git a/src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java b/src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java
index fcfcbc0b68..39ee41f45a 100644
--- a/src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java
+++ b/src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java
@@ -3,10 +3,6 @@ package gtPlusPlus.core.entity;
 import cpw.mods.fml.common.registry.EntityRegistry;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.australia.entity.type.EntityAustralianSpiderBase;
-import gtPlusPlus.australia.entity.type.EntityBoar;
-import gtPlusPlus.australia.entity.type.EntityDingo;
-import gtPlusPlus.australia.entity.type.EntityOctopus;
 import gtPlusPlus.core.entity.monster.EntityBatKing;
 import gtPlusPlus.core.entity.monster.EntityGiantChickenBase;
 import gtPlusPlus.core.entity.monster.EntitySickBlaze;
@@ -96,35 +92,5 @@ public class InternalEntityRegistry {
                 EntityBatKing.class, "batKing", mEntityID++, GTplusplus.instance, 64, 20, true);
         ItemCustomSpawnEgg.registerEntityForSpawnEgg(
                 3, "batKing", Utils.rgbtoHexValue(175, 175, 0), Utils.rgbtoHexValue(0, 175, 175));
-        // EntityRegistry.registerModEntity(EntityGiantChickenBase.class, "bigChickenFriendly", mEntityID++,
-        // GTplusplus.instance, 64, 20, true);
-
-        // Australia
-        EntityRegistry.registerModEntity(
-                EntityAustralianSpiderBase.class, "AusSpider", mEntityID++, GTplusplus.instance, 64, 20, true);
-        ItemCustomSpawnEgg.registerEntityForSpawnEgg(
-                30, "AusSpider", Utils.rgbtoHexValue(125, 0, 125), Utils.rgbtoHexValue(175, 175, 175));
-        EntityRegistry.registerModEntity(EntityBoar.class, "AusBoar", mEntityID++, GTplusplus.instance, 64, 20, true);
-        ItemCustomSpawnEgg.registerEntityForSpawnEgg(
-                31, "AusBoar", Utils.rgbtoHexValue(75, 75, 0), Utils.rgbtoHexValue(175, 175, 75));
-        EntityRegistry.registerModEntity(EntityDingo.class, "AusDingo", mEntityID++, GTplusplus.instance, 64, 20, true);
-        ItemCustomSpawnEgg.registerEntityForSpawnEgg(
-                32, "AusDingo", Utils.rgbtoHexValue(175, 125, 0), Utils.rgbtoHexValue(175, 75, 175));
-        EntityRegistry.registerModEntity(
-                EntityOctopus.class, "AusOctopus", mEntityID++, GTplusplus.instance, 32, 20, true);
-        ItemCustomSpawnEgg.registerEntityForSpawnEgg(
-                33, "AusOctopus", Utils.rgbtoHexValue(150, 50, 150), Utils.rgbtoHexValue(75, 175, 175));
-        // EntityRegistry.registerGlobalEntityID(EntityAustralianSpiderBase.class, "AusSpider",
-        // EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(255, 0, 0), Utils.rgbtoHexValue(175, 175,
-        // 175));
-        // EntityRegistry.registerGlobalEntityID(EntityBoar.class, "AusBoar", EntityRegistry.findGlobalUniqueEntityId(),
-        // Utils.rgbtoHexValue(255, 0, 0), Utils.rgbtoHexValue(175, 175, 175));
-        // EntityRegistry.registerGlobalEntityID(EntityDingo.class, "AusDingo",
-        // EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(255, 0, 0), Utils.rgbtoHexValue(175, 175,
-        // 175));
-        // EntityRegistry.registerGlobalEntityID(EntityOctopus.class, "AusOctopus",
-        // EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(255, 0, 0), Utils.rgbtoHexValue(175, 175,
-        // 175));
-
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java
index 306377f4f9..ce3ca22a37 100644
--- a/src/main/java/gtPlusPlus/core/lib/CORE.java
+++ b/src/main/java/gtPlusPlus/core/lib/CORE.java
@@ -54,14 +54,6 @@ public class CORE {
     // Tweakables
     public static int EVERGLADES_ID = 227;
     public static int EVERGLADESBIOME_ID = 238;
-    public static int AUSTRALIA_ID = 228;
-    public static int AUSTRALIA_BIOME_DESERT_1_ID = 239;
-    public static int AUSTRALIA_BIOME_DESERT_2_ID = 240;
-    public static int AUSTRALIA_BIOME_DESERT_3_ID = 241;
-    public static int AUSTRALIA_BIOME_PLAINS_ID = 242;
-    public static int AUSTRALIA_BIOME_OUTBACK_ID = 243;
-    public static int AUSTRALIA_BIOME_OCEAN_ID = 244;
-    public static int AUSTRALIA_BIOME_FOREST_ID = 245;
 
     // GT Vars;
     public static final int GREG_FIRST_ID = 760;
@@ -98,9 +90,9 @@ public class CORE {
 
     // TesseractMaps
     public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> sTesseractGeneratorOwnershipMap =
-            new HashMap<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>>();
+            new HashMap<>();
     public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> sTesseractTerminalOwnershipMap =
-            new HashMap<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>>();
+            new HashMap<>();
 
     // BookMap
     public static final Map<String, ItemStack> sBookList = new ConcurrentHashMap<String, ItemStack>();
@@ -302,12 +294,6 @@ public class CORE {
         public static final String VERSION = "GRADLETOKEN_VERSION";
     }
 
-    public static class Australia {
-        public static final String MODID = "Australia";
-        public static final String NAME = "GT++ Australia";
-        public static final String VERSION = "GRADLETOKEN_VERSION";
-    }
-
     public static final void crash() {
         crash("Generic Crash");
     }
diff --git a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
index 2c7f4a64bc..2385d426b9 100644
--- a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
+++ b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
@@ -12,9 +12,6 @@ import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.Pair;
-import gtPlusPlus.australia.entity.model.*;
-import gtPlusPlus.australia.entity.render.*;
-import gtPlusPlus.australia.entity.type.*;
 import gtPlusPlus.core.client.model.ModelGiantChicken;
 import gtPlusPlus.core.client.renderer.*;
 import gtPlusPlus.core.common.CommonProxy;
@@ -144,21 +141,6 @@ public class ClientProxy extends CommonProxy implements Runnable {
         Logger.INFO("Registering Custom Renderer for the Lead Lined Chest.");
         ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecayablesChest.class, new RenderDecayChest());
         Logger.INFO("Registering Custom Renderer for the Egg Box.");
-        // ClientRegistry.bindTileEntitySpecialRenderer(TileEntityEggBox.class, ModelEggBox.getRenderer());
-
-        // GT++ Australia
-
-        /**
-         * Entities
-         */
-        RenderingRegistry.registerEntityRenderingHandler(
-                EntityAustralianSpiderBase.class, new RenderAustralianSpider());
-        RenderingRegistry.registerEntityRenderingHandler(
-                EntityBoar.class, new RenderBoar(new ModelBoar(), new ModelBoar(0.5F), 0.7F));
-        RenderingRegistry.registerEntityRenderingHandler(
-                EntityDingo.class, new RenderDingo(new ModelDingo(), new ModelDingo(), 0.5F));
-        RenderingRegistry.registerEntityRenderingHandler(
-                EntityOctopus.class, new RenderOctopus(new ModelOctopus(), 0.7F));
 
         /**
          * Items