fixed ores not generating in the nether #91

.gitignore

@@ -172,6 +172,7 @@ gradle-app.setting
 # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
 # gradle/wrapper/gradle-wrapper.properties
 
+*.hprof
 
 # Forge
 run/

src/main/java/com/sosnitzka/taiga/Blocks.java

@@ -39,7 +39,7 @@ public class Blocks {
     public static Block eezoOre = new BasicBlock("eezo_ore", Material.ROCK, 50.0f, 50000.0f, COBALT, PREFIX_ORE);
     public static Block abyssumOre = new BasicBlock("abyssum_ore", Material.ROCK, 15.0f, 35.0f, COBALT, PREFIX_ORE);
 
-    // Ore Casts
+    // Ore Castsee
     public static Block tiberiumBlock = new BasicBlock("tiberium_block", Material.ROCK, 10.0f, 15f, STONE, 1f, PREFIX_BLOCK);
     public static Block auroriumBlock = new BasicBlock("aurorium_block", Material.ROCK, 15.0f, 15f, COBALT, PREFIX_BLOCK);
     public static Block prometheumBlock = new BasicBlock("prometheum_block", Material.ROCK, 20.0f, 15f, DURANITE, 0.5f, PREFIX_BLOCK);

src/main/java/com/sosnitzka/taiga/Fluids.java

@@ -16,7 +16,7 @@ public class Fluids {
     public static BasicTinkerFluid basaltFluid = new BasicTinkerFluid("basalt_fluid", 0xFFe4ddc3, 550, 10, 6000);
     public static BasicTinkerFluid tiberiumFluid = new BasicTinkerFluid("tiberium_fluid", 0xFF66f136, 400, 10, 8000);
     public static BasicTinkerFluid auroriumFluid = new BasicTinkerFluid("aurorium_fluid", 0xFFefae94, 750, 10, 10000);
-    public static BasicTinkerFluid prometheumFluid = new BasicTinkerFluid("prometheum_fluid", 0xFF271c29, 850, 10, 10000);
+    public static BasicTinkerFluid prometheumFluid = new BasicTinkerFluid("prometheum_fluid", 0xFF372c49, 850, 10, 10000);
     public static BasicTinkerFluid duraniteFluid = new BasicTinkerFluid("duranite_fluid", 0xFFacddeb, 1400, 10, 10000);
     public static BasicTinkerFluid valyriumFluid = new BasicTinkerFluid("valyrium_fluid", 0xFFe85c31, 1915, 10, 10000);
     public static BasicTinkerFluid vibraniumFluid = new BasicTinkerFluid("vibranium_fluid", 0xFFbad2d9, 3050, 10, 10000);

src/main/java/com/sosnitzka/taiga/MaterialTraits.java

@@ -84,7 +84,7 @@ public class MaterialTraits {
     public static Material ignitz = new Material("ignitz", TextFormatting.RED).addTrait(melting).addTrait(garishly, MaterialTypes.HANDLE);
     public static Material imperomite = new Material("imperomite", TextFormatting.DARK_RED).addTrait(hollow);
     public static Material solarium = new Material("solarium", TextFormatting.YELLOW).addTrait(pulverizing).addTrait(superheavy);
-    public static Material nihilite = new Material("nihilite", TextFormatting.BLACK).addTrait(souleater);
+    public static Material nihilite = new Material("nihilite", TextFormatting.DARK_GRAY).addTrait(souleater);
     /**
      * With Dev
      **/

src/main/java/com/sosnitzka/taiga/TAIGA.java

@@ -5,6 +5,7 @@ import com.sosnitzka.taiga.proxy.CommonProxy;
 import com.sosnitzka.taiga.recipes.CraftingRegistry;
 import com.sosnitzka.taiga.recipes.SmeltingRegistry;
 import com.sosnitzka.taiga.world.WorldGen;
+import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.SidedProxy;
@@ -15,7 +16,6 @@ import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import slimeknights.tconstruct.library.MaterialIntegration;
 import slimeknights.tconstruct.library.materials.BowMaterialStats;
-import slimeknights.tconstruct.tools.TinkerMaterials;
 
 import java.util.List;
 
@@ -58,9 +58,9 @@ public class TAIGA {
         CraftingRegistry.register(); // Registers crafting recipes
 
         // Adds new harvest levels' names
-        harvestLevelNames.put(DURANITE, TinkerMaterials.bone.getTextColor() + "Duranite");
-        harvestLevelNames.put(VALYRIUM, TinkerMaterials.bone.getTextColor() + "Valyrium");
-        harvestLevelNames.put(VIBRANIUM, TinkerMaterials.blueslime.getTextColor() + "Vibranium");
+        harvestLevelNames.put(DURANITE, TextFormatting.DARK_GREEN + "Duranite");
+        harvestLevelNames.put(VALYRIUM, TextFormatting.GOLD + "Valyrium");
+        harvestLevelNames.put(VIBRANIUM, TextFormatting.DARK_PURPLE + "Vibranium");
 
 
         for (MaterialIntegration m : integrateList) {

src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java

@@ -108,16 +108,13 @@ public class TAIGAConfiguration {
         final int PALLADIUM_DEFAULT = 10;
         final int ABYSSUM_DEFAULT = 4;
 
-        final boolean FALSE = false;
-        final boolean TRUE = true;
 
-
-        Property ironSwitch = config.get(CATEGORY_NAME_GENERAL, "Extra Iron Switch", FALSE);
-        ironSwitch.setComment("Switch ore on/off");
+        Property ironSwitch = config.get(CATEGORY_NAME_GENERAL, "Additional Iron", false);
+        ironSwitch.setComment("Switch additional ore on/off");
         ironSwitch.setLanguageKey("gui.taiga_configuration.gen_iron");
 
-        Property endSwitch = config.get(CATEGORY_NAME_GENERAL, "Extra Endstone Switch", TRUE);
-        endSwitch.setComment("Switch extra End on/off");
+        Property endSwitch = config.get(CATEGORY_NAME_GENERAL, "Additional Endstone", true);
+        endSwitch.setComment("Switch additional endstone on/off");
         endSwitch.setLanguageKey("gui.taiga_configuration.gen_end");
 
         /*
@@ -197,8 +194,8 @@ public class TAIGAConfiguration {
 
 
         if (readFieldsFromConfig) {
-            ironGen = ironSwitch.getBoolean(FALSE);
-            endGen = endSwitch.getBoolean(TRUE);
+            ironGen = ironSwitch.getBoolean(false);
+            endGen = endSwitch.getBoolean(true);
             IRON_VAL = ironValueProp.getInt(IRON_DEFAULT);
             if (IRON_VAL > RESFAC_MAX_VALUE || IRON_VAL < RESFAC_MIN_VALUE) {
                 IRON_VAL = IRON_DEFAULT;
@@ -266,6 +263,7 @@ public class TAIGAConfiguration {
         }
 
         ironSwitch.set(ironGen);
+        endSwitch.set(endGen);
         ironValueProp.set(IRON_VAL);
         tiberiumValueProp.set(TIBERIUM_VAL);
         prometheumValueProp.set(PROMETHEUM_VAL);

src/main/java/com/sosnitzka/taiga/TAIGAGuiFactory.java

@@ -43,8 +43,8 @@ public class TAIGAGuiFactory implements IModGuiFactory {
 
         private static List<IConfigElement> getConfigElements() {
             List<IConfigElement> list = new ArrayList<IConfigElement>();
-            list.add(new DummyConfigElement.DummyCategoryElement("Basics configuration", "gui.taiga_configuration.ctgy.general", CategoryEntryGeneral.class));
-            list.add(new DummyConfigElement.DummyCategoryElement("Specific ore generation", "gui.taiga_configuration.ctgy.oregen", CategoryEntryOreGen.class));
+            list.add(new DummyConfigElement.DummyCategoryElement("Basic configuration", "gui.taiga_configuration.ctgy.general", CategoryEntryGeneral.class));
+            list.add(new DummyConfigElement.DummyCategoryElement("Ore specific settings", "gui.taiga_configuration.ctgy.oregen", CategoryEntryOreGen.class));
             return list;
         }
 

src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java

@@ -25,7 +25,7 @@ public class TraitAnalysing extends AbstractTrait {
     @SubscribeEvent
     public void onXpDrop(LivingExperienceDropEvent event) {
         EntityPlayer player = event.getAttackingPlayer();
-        if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) {
+        if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier) && event.getDroppedExperience() >= 0) {
             event.setDroppedExperience(this.getUpdateXP(event.getDroppedExperience()));
         }
 
@@ -34,7 +34,7 @@ public class TraitAnalysing extends AbstractTrait {
     @SubscribeEvent
     public void onBlockBreak(BlockEvent.BreakEvent event) {
         EntityPlayer player = event.getPlayer();
-        if (!event.getWorld().isRemote && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) {
+        if (!event.getWorld().isRemote && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier) && event.getExpToDrop() >= 0) {
             event.setExpToDrop(this.getUpdateXP(event.getExpToDrop()));
         }
 

src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java

@@ -52,7 +52,8 @@ public class TraitCatcher extends AbstractTrait {
                 data.mobClass = target.getClass().getName();
                 data.mobName = target.getName();
                 data.write(tag);
-                TagUtil.setExtraTag(p.getHeldItemMainhand(), tag);
+                if (p.getHeldItemMainhand() != null)
+                    TagUtil.setExtraTag(p.getHeldItemMainhand(), tag);
                 p.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F);
                 target.setDropItemsWhenDead(false);
                 target.setDead();
@@ -70,8 +71,6 @@ public class TraitCatcher extends AbstractTrait {
                 TagUtil.setEnchantEffect(tool, false);
             } else
                 TagUtil.setEnchantEffect(tool, true);
-
-
         }
     }
 

src/main/java/com/sosnitzka/taiga/util/Generator.java

@@ -198,6 +198,10 @@ public class Generator {
                     // we are in mid air, go down
                     while (world.getBlockState(cPos.down()).equals(Blocks.AIR.getDefaultState())) {
                         cPos = cPos.down();
+
+                        // if we are below 0, we might be in a void dim
+                        if (cPos.getY() < 0)
+                            break;
                     }
                 }
                 if (!validSurface.contains(Item.getItemFromBlock(world.getBlockState(cPos.down()).getBlock())))

src/main/java/com/sosnitzka/taiga/world/WorldGen.java

@@ -20,11 +20,10 @@ import static com.sosnitzka.taiga.TAIGAConfiguration.*;
 @SuppressWarnings("unchecked")
 public class WorldGen implements IWorldGenerator {
     private void nether(Random random, int x, int z, World world) {
-        Generator.generateOre(Blocks.NETHERRACK.getDefaultState(), tiberiumOre.getDefaultState(), random, x, z, world, TIBERIUM_VAL, 0, 128, 10, 35);
-        Generator.generateOre(Blocks.NETHERRACK.getDefaultState(), prometheumOre.getDefaultState(), random, x, z, world, PROMETHEUM_VAL, 0, 128, 2, 4);
-        Generator.generateOre(Blocks.NETHERRACK.getDefaultState(), valyriumOre.getDefaultState(), random, x, z, world, VALYRIUM_VAL, 0, 32, 2, 4);
+        Generator.generateOre(tiberiumOre.getDefaultState(), Blocks.NETHERRACK.getDefaultState(), random, x, z, world, TIBERIUM_VAL, 0, 128, 10, 35);
+        Generator.generateOre(prometheumOre.getDefaultState(), Blocks.NETHERRACK.getDefaultState(), random, x, z, world, PROMETHEUM_VAL, 0, 128, 2, 4);
+        Generator.generateOre(valyriumOre.getDefaultState(), Blocks.NETHERRACK.getDefaultState(), random, x, z, world, VALYRIUM_VAL, 0, 32, 2, 4);
         Generator.generateOre(newArrayList(Blocks.LAVA.getDefaultState(), Blocks.FLOWING_LAVA.getDefaultState()), osramOre.getDefaultState(), random, x, z, world, OSRAM_VAL, 0, 64, 15);
-
     }
 
     private void world(Random random, int x, int z, World world) {

src/main/resources/assets/taiga/blockstates/fluid_block.json

@@ -144,13 +144,6 @@
         }
       }
     ],
-    "tiberiumX_fluid": [
-      {
-        "custom": {
-          "fluid": "tiberiumX_fluid"
-        }
-      }
-    ],
     "fractum_fluid": [
       {
         "custom": {

src/main/resources/assets/taiga/lang/en_US.lang

@@ -313,13 +313,13 @@ modifier.heroic.desc=§oUntil you'll die.§r\nWhen the end is near, you grow str
 modifier.hollow.name=Hollow
 modifier.hollow.desc=§oBraindead!§r\nMakes your enemies brainless.
 modifier.instable.name=Unstable
-modifier.instable.desc=§oCan you feel this?§r\nSeriously, this ist completely unstable! Expect explosions!
+modifier.instable.desc=§oCan you feel this?§r\nSeriously, this is completely unstable! Expect explosions!
 modifier.naturebound.name=Naturebound
 modifier.naturebound.desc=§oYou are one with your surrounding!§r\nRepairs the tool on several blocks.
 modifier.pulverizing.name=Pulverizing
 modifier.pulverizing.desc=§oSmash it!§r\nDestroy a lot of your drops.
 modifier.resonance.name=Resonance
-modifier.resonance.desc=§oFeel the vibrations!§r\Enemies propably fly away after a hit!
+modifier.resonance.desc=§oFeel the vibrations!§r\nEnemies propably fly away after a hit!
 modifier.slaughtering.name=Slaughtering
 modifier.slaughtering.desc=§oYum yum!§r\nWho needs EXP if you can have a lot more meat?
 modifier.softy.name=Softy

src/main/resources/assets/taiga/models/item/jauxum_dust.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/jauxum"
+  }
+}

src/main/resources/assets/taiga/models/item/jauxum_ingot.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/jauxum"
+  }
+}

src/main/resources/assets/taiga/models/item/jauxum_nugget.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/jauxum"
+  }
+}

src/main/resources/assets/taiga/models/item/ovium_dust.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/ovium"
+  }
+}

src/main/resources/assets/taiga/models/item/ovium_ingot.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/ovium"
+  }
+}

src/main/resources/assets/taiga/models/item/ovium_nugget.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/ovium"
+  }
+}

src/main/resources/assets/taiga/models/item/terrax_dust.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/terrax"
+  }
+}

src/main/resources/assets/taiga/models/item/terrax_ingot.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/terrax"
+  }
+}

src/main/resources/assets/taiga/models/item/terrax_nugget.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/terrax"
+  }
+}