From 5ff045ecacd87a1443c71b4ce9edca9e04635f13 Mon Sep 17 00:00:00 2001
From: Blaster <blaster@git.harting.dev>
Date: Wed, 11 Dec 2019 20:07:32 +0100
Subject: [PATCH] Upload files to 'src/main/java/com/sosnitzka/taiga/world'

---
 .../com/sosnitzka/taiga/world/WorldGen.java   | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/sosnitzka/taiga/world/WorldGen.java b/src/main/java/com/sosnitzka/taiga/world/WorldGen.java
index 51e5bef..e417c28 100644
--- a/src/main/java/com/sosnitzka/taiga/world/WorldGen.java
+++ b/src/main/java/com/sosnitzka/taiga/world/WorldGen.java
@@ -108,7 +108,7 @@ public class WorldGen implements IWorldGenerator {
                     world, IRON_VAL, 0, 32, 2, 8);
         }
     }
-
+    
     private void end(Random random, int x, int z, World world) {
         Generator.generateCube(true, uruOre.getDefaultState(), blockObsidiorite.getDefaultState(), random, x, z,
                 world, URU_VAL, 2, 0, 96, 3);
@@ -122,6 +122,28 @@ public class WorldGen implements IWorldGenerator {
         Generator.generateOreBottom(Blocks.END_STONE.getDefaultState(), abyssumOre.getDefaultState(), random, x, z,
                 world, ABYSSUM_VAL, 4, 64);
     }
+    //Spawns nether/end ores in the Overworld if the server has allow-nether set to 0 WIP: needs alternate textures
+    private void worldextra(Random random, int x, int z, World world) {
+        Generator.generateCube(true, uruOre.getDefaultState(), blockObsidiorite.getDefaultState(), random, x, z,
+                world, URU_VAL, 2, 0, 96, 3);
+        //if (endGen) //What does this do? Might interfere with this generator hack
+            //Generator.generateOre(Blocks.AIR.getDefaultState(), Blocks.END_STONE.getDefaultState(), null, null,
+                    //random, x, z, world, 1, 100, 3, 64, 3, 8, null);
+        Generator.generateOre(auroriumOre.getDefaultState(), BlockStone.EnumType.DIORITE, random, x, z, world,
+                AURORIUM_VAL, 8, 48, 2, 4);
+        Generator.generateOre(palladiumOre.getDefaultState(), BlockStone.EnumType.DIORITE, random, x, z,
+                world, PALLADIUM_VAL, 12, 64, 2, 4);
+        Generator.generateOreDescending(newArrayList(Blocks.BEDROCK.getDefaultState()), abyssumOre.getDefaultState(), random, x, z,
+                world, ABYSSUM_VAL, 4, 6);
+        Generator.generateOre(tiberiumOre.getDefaultState(), BlockStone.EnumType.GRANITE, random, x, z,
+                world, TIBERIUM_VAL, 16, 128, 10, 35);
+        Generator.generateOre(prometheumOre.getDefaultState(), BlockStone.EnumType.GRANITE, random, x, z,
+                world, PROMETHEUM_VAL, 0, 32, 2, 4);
+        Generator.generateOre(valyriumOre.getDefaultState(), BlockStone.EnumType.GRANITE, random, x, z,
+                world, VALYRIUM_VAL, 0, 128, 2, 4);
+        Generator.generateOre(newArrayList(Blocks.LAVA.getDefaultState(), Blocks.FLOWING_LAVA.getDefaultState()), 
+        		osramOre.getDefaultState(), random, x, z, world, OSRAM_VAL, 0, 64, 15); //Why is this switched around?
+    }
 
     @Override
     public void generate(Random random, int chunkX, int chunkZ, World world, IChunkGenerator chunkGenerator,
@@ -134,6 +156,9 @@ public class WorldGen implements IWorldGenerator {
                 break;
             case 0:
                 world(random, x, z, world);
+                if(net.minecraft.server.MinecraftServer.getAllowNether() == FALSE)
+                	worldextra(random, x, z, world); //worldextra generates nether/end ores in overworld
+                }
                 break;
             case 1:
                 end(random, x, z, world);