Merge pull request #25 from bartimaeusnek/0.4.X

+added World Generation feature for Ross128b

Former-commit-id: e3ffd8de1f4ab9fed3fe6cb8821e43e52be80e48

23 files changed, 1022 insertions, 209 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/ASM/BWCoreTransformer.java b/src/main/java/com/github/bartimaeusnek/ASM/BWCoreTransformer.java
index 6a9850e4fe..e56fd65c51 100644
--- a/src/main/java/com/github/bartimaeusnek/ASM/BWCoreTransformer.java
+++ b/src/main/java/com/github/bartimaeusnek/ASM/BWCoreTransformer.java
@@ -143,11 +143,11 @@ public class BWCoreTransformer implements IClassTransformer {
                                     nu.add(new VarInsnNode(ALOAD, 0));
                                     nu.add(new FieldInsnNode(GETFIELD, "net/minecraft/client/renderer/RenderGlobal", useSrc ? theWorld_src : "theWorld", "Lnet/minecraft/client/multiplayer/WorldClient;"));
                                     nu.add(new FieldInsnNode(GETFIELD, "net/minecraft/client/multiplayer/WorldClient", useSrc ? provider_src : "provider", "Lnet/minecraft/world/WorldProvider;"));
-                                    nu.add(new TypeInsnNode(INSTANCEOF, "com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128/world/worldprovider/WorldProviderRoss128b"));
+                                    nu.add(new TypeInsnNode(INSTANCEOF, "com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128b/WorldProviderRoss128b"));
                                     nu.add(new JumpInsnNode(IFEQ, LabelNodes[0]));
                                     nu.add(new VarInsnNode(ALOAD, 0));
                                     nu.add(new FieldInsnNode(GETFIELD, "net/minecraft/client/renderer/RenderGlobal", useSrc ? renderEngine_src : "renderEngine", "Lnet/minecraft/client/renderer/texture/TextureManager;"));
-                                    nu.add(new FieldInsnNode(GETSTATIC, "com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128/world/worldprovider/SkyProviderRoss128b", "sunTex", "Lnet/minecraft/util/ResourceLocation;"));
+                                    nu.add(new FieldInsnNode(GETSTATIC, "com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128b/SkyProviderRoss128b", "sunTex", "Lnet/minecraft/util/ResourceLocation;"));
                                     nu.add(new MethodInsnNode(INVOKEVIRTUAL, "net/minecraft/client/renderer/texture/TextureManager", useSrc ? bindTexture_src : "bindTexture", "(Lnet/minecraft/util/ResourceLocation;)V", false));
                                     nu.add(new JumpInsnNode(GOTO, LabelNodes[1]));
                                     nu.add(LabelNodes[0]);
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/SummonRuin.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/SummonRuin.java
new file mode 100644
index 0000000000..f569d62abe
--- /dev/null
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/SummonRuin.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2019 bartimaeusnek
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.github.bartimaeusnek.bartworks.common.commands;
+
+import com.github.bartimaeusnek.bartworks.system.worldgen.MapGenRuins;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+
+public class SummonRuin extends CommandBase {
+
+    @Override
+    public String getCommandName() {
+        return "SummonRuin";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender p_71518_1_) {
+        return "SummonRuin x z";
+    }
+
+    @Override
+    public void processCommand(ICommandSender iCommandSender, String[] p_71515_2_) {
+        try {
+            new MapGenRuins.RuinsBase().generate(
+                    iCommandSender.getEntityWorld(),
+                    iCommandSender.getEntityWorld().rand,
+                    Integer.parseInt(p_71515_2_[0]),
+                    256,
+                    Integer.parseInt(p_71515_2_[1])
+            );
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java
index 3f27a5adcf..6676b242aa 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java
@@ -38,7 +38,8 @@ public class ConfigHandler {
     public static boolean DEHPDirectSteam;
     public static int megaMachinesMax = 256;
     public static int mbWaterperSec = 150;
-    public static int ross128ID = -64;
+    public static int ross128BID = -64;
+    public static int ross128BAID = -63;
     public static boolean Ross128Enabled = true;
     public static boolean debugLog;
     public static boolean experimentalThreadedLoader;
@@ -68,7 +69,9 @@ public class ConfigHandler {
             BWCoreTransformer.shouldTransform[i] = ConfigHandler.c.get("ASM fixes", BWCoreTransformer.DESCRIPTIONFORCONFIG[i] + " in class: " + BWCoreTransformer.CLASSESBEEINGTRANSFORMED[i], true).getBoolean(true);
         }
 
-        ConfigHandler.ross128ID = ConfigHandler.c.get("CrossMod Interactions", "DimID - Ross128b", -64, "The Dim ID for Ross128b").getInt(-64);
+        ConfigHandler.ross128BID = ConfigHandler.c.get("CrossMod Interactions", "DimID - Ross128b", -64, "The Dim ID for Ross128b").getInt(-64);
+        ConfigHandler.ross128BAID = ConfigHandler.c.get("CrossMod Interactions", "DimID - Ross128ba", -63, "The Dim ID for Ross128ba (Ross128b's Moon)").getInt(-63);
+
         ConfigHandler.Ross128Enabled = ConfigHandler.c.get("CrossMod Interactions", "Galacticraft - Activate Ross128 System", true, "If the Ross128 System should be activated").getBoolean(true);
 
         ConfigHandler.setUpComments();
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_OreHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_OreHandler.java
index 5360268200..1012cffc01 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_OreHandler.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_OreHandler.java
@@ -29,10 +29,9 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
 import com.github.bartimaeusnek.bartworks.MainMod;
 import com.github.bartimaeusnek.bartworks.system.material.BW_MetaGenerated_Ores;
 import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
 import com.github.bartimaeusnek.bartworks.util.ChatColorHelper;
-import com.github.bartimaeusnek.crossmod.galacticraft.planets.ross128.world.oregen.BW_OreLayer;
-import com.github.bartimaeusnek.crossmod.galacticraft.planets.ross128.world.oregen.BW_WorldGenRoss128;
+import com.github.bartimaeusnek.bartworks.system.oregen.BW_OreLayer;
+import com.github.bartimaeusnek.bartworks.system.oregen.BW_WorldGenRoss128b;
 import cpw.mods.fml.common.event.FMLInterModComms;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.OrePrefixes;
@@ -91,9 +90,9 @@ public class BW_NEI_OreHandler extends TemplateRecipeHandler {
                         public List<PositionedStack> getOtherStacks() {
                             ArrayList<PositionedStack> ret = new ArrayList<>();
                             for (int i = 0; i < BW_OreLayer.sList.size(); i++) {
-                                if (BW_OreLayer.sList.get(i) instanceof BW_WorldGenRoss128) {
+                                if (BW_OreLayer.sList.get(i) instanceof BW_WorldGenRoss128b) {
                                     int baseMeta = result.getItemDamage();
-                                    BW_WorldGenRoss128 worldGen = ((BW_WorldGenRoss128) BW_OreLayer.sList.get(i));
+                                    BW_WorldGenRoss128b worldGen = ((BW_WorldGenRoss128b) BW_OreLayer.sList.get(i));
                                     if (worldGen.mPrimaryMeta == baseMeta || worldGen.mSecondaryMeta == baseMeta || worldGen.mBetweenMeta == baseMeta || worldGen.mSporadicMeta == baseMeta) {
                                         ItemStack other;
                                         other = result.copy().setStackDisplayName(result.getDisplayName().replaceAll("Ore", "Vein"));
@@ -187,9 +186,9 @@ public class BW_NEI_OreHandler extends TemplateRecipeHandler {
                 public List<PositionedStack> getOtherStacks() {
                     ArrayList<PositionedStack> ret = new ArrayList<>();
                     for (int i = 0; i < BW_OreLayer.sList.size(); i++) {
-                        if (BW_OreLayer.sList.get(i) instanceof BW_WorldGenRoss128) {
+                        if (BW_OreLayer.sList.get(i) instanceof BW_WorldGenRoss128b) {
                             int baseMeta = result.getItemDamage();
-                            BW_WorldGenRoss128 worldGen = ((BW_WorldGenRoss128) BW_OreLayer.sList.get(i));
+                            BW_WorldGenRoss128b worldGen = ((BW_WorldGenRoss128b) BW_OreLayer.sList.get(i));
                             if (worldGen.mPrimaryMeta == baseMeta || worldGen.mSecondaryMeta == baseMeta || worldGen.mBetweenMeta == baseMeta || worldGen.mSporadicMeta == baseMeta) {
                                 ItemStack other;
                                 other = result.copy().setStackDisplayName(result.getDisplayName().replaceAll("Ore", "Vein"));
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java
index 72db71e58d..d50081c9e9 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java
@@ -76,28 +76,30 @@ public class BW_MetaGenerated_Items extends GT_MetaGenerated_Item {
     }
 
     public boolean onEntityItemUpdate(EntityItem aItemEntity) {
-        int aDamage = aItemEntity.getEntityItem().getItemDamage();
-        if ((aDamage >= 0) && (!aItemEntity.worldObj.isRemote)) {
-            Werkstoff aMaterial = werkstoffHashMap.get((short) aDamage);
-            if ((aMaterial != null) && (aMaterial != Werkstoff.default_null_Werkstoff)) {
-                int tX = MathHelper.floor_double(aItemEntity.posX);
-                int tY = MathHelper.floor_double(aItemEntity.posY);
-                int tZ = MathHelper.floor_double(aItemEntity.posZ);
-                if ((orePrefixes == OrePrefixes.dustImpure) || (orePrefixes == OrePrefixes.dustPure)) {
-                    Block tBlock = aItemEntity.worldObj.getBlock(tX, tY, tZ);
-                    byte tMetaData = (byte) aItemEntity.worldObj.getBlockMetadata(tX, tY, tZ);
-                    if ((tBlock == Blocks.cauldron) && (tMetaData > 0)) {
-                        aItemEntity.setEntityItemStack(WerkstoffLoader.getCorresopndingItemStack(OrePrefixes.dust, aMaterial, aItemEntity.getEntityItem().stackSize));
-                        aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3);
-                        return true;
-                    }
-                } else if (orePrefixes == OrePrefixes.crushed) {
-                    Block tBlock = aItemEntity.worldObj.getBlock(tX, tY, tZ);
-                    byte tMetaData = (byte) aItemEntity.worldObj.getBlockMetadata(tX, tY, tZ);
-                    if ((tBlock == Blocks.cauldron) && (tMetaData > 0)) {
-                        aItemEntity.setEntityItemStack(WerkstoffLoader.getCorresopndingItemStack(OrePrefixes.crushedPurified, aMaterial, aItemEntity.getEntityItem().stackSize));
-                        aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3);
-                        return true;
+        if (orePrefixes == OrePrefixes.dustImpure || orePrefixes == OrePrefixes.dustPure || orePrefixes == OrePrefixes.crushed) {
+            int aDamage = aItemEntity.getEntityItem().getItemDamage();
+            if ((aDamage >= 0) && (!aItemEntity.worldObj.isRemote)) {
+                Werkstoff aMaterial = werkstoffHashMap.get((short) aDamage);
+                if ((aMaterial != null) && (aMaterial != Werkstoff.default_null_Werkstoff)) {
+                    int tX = MathHelper.floor_double(aItemEntity.posX);
+                    int tY = MathHelper.floor_double(aItemEntity.posY);
+                    int tZ = MathHelper.floor_double(aItemEntity.posZ);
+                    if ((orePrefixes == OrePrefixes.dustImpure) || (orePrefixes == OrePrefixes.dustPure)) {
+                        Block tBlock = aItemEntity.worldObj.getBlock(tX, tY, tZ);
+                        byte tMetaData = (byte) aItemEntity.worldObj.getBlockMetadata(tX, tY, tZ);
+                        if ((tBlock == Blocks.cauldron) && (tMetaData > 0)) {
+                            aItemEntity.setEntityItemStack(WerkstoffLoader.getCorresopndingItemStack(OrePrefixes.dust, aMaterial, aItemEntity.getEntityItem().stackSize));
+                            aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3);
+                            return true;
+                        }
+                    } else if (orePrefixes == OrePrefixes.crushed) {
+                        Block tBlock = aItemEntity.worldObj.getBlock(tX, tY, tZ);
+                        byte tMetaData = (byte) aItemEntity.worldObj.getBlockMetadata(tX, tY, tZ);
+                        if ((tBlock == Blocks.cauldron) && (tMetaData > 0)) {
+                            aItemEntity.setEntityItemStack(WerkstoffLoader.getCorresopndingItemStack(OrePrefixes.crushedPurified, aMaterial, aItemEntity.getEntityItem().stackSize));
+                            aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3);
+                            return true;
+                        }
                     }
                 }
             }
@@ -113,6 +115,8 @@ public class BW_MetaGenerated_Items extends GT_MetaGenerated_Item {
         if (orePrefixes == OrePrefixes.dustImpure || orePrefixes == OrePrefixes.dustPure) {
             aList.add(GT_LanguageManager.getTranslation("metaitem.01.tooltip.purify"));
         }
+        if (orePrefixes == OrePrefixes.crushed)
+            aList.add(GT_LanguageManager.getTranslation("metaitem.01.tooltip.purify.2"));
         aList.add(StatCollector.translateToLocal("tooltip.bw.0.name") + ChatColorHelper.DARKGREEN + " BartWorks");
     }
 
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Ores.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Ores.java
index fd8e39ebcb..ba03007669 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Ores.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Ores.java
@@ -65,7 +65,7 @@ public class BW_MetaGenerated_Ores extends BW_TileEntityContainer {
         }
     }
 
-    public static boolean setOreBlock(World aWorld, int aX, int aY, int aZ, int aMetaData, boolean air) {
+    public static boolean setOreBlock(World aWorld, int aX, int aY, int aZ, int aMetaData, boolean air, Block block) {
         if (!air) {
             aY = Math.min(aWorld.getActualHeight(), Math.max(aY, 1));
         }
@@ -76,7 +76,7 @@ public class BW_MetaGenerated_Ores extends BW_TileEntityContainer {
             return false;
         } else {
 
-            if (!tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone)) {
+            if (!tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, block)) {
                 return false;
             }
 
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java
index c1bd80e0ea..a681a86270 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java
@@ -28,6 +28,7 @@ import com.github.bartimaeusnek.bartworks.util.Pair;
 import gregtech.api.enums.*;
 import gregtech.api.interfaces.IColorModulationContainer;
 import gregtech.api.interfaces.ISubTagContainer;
+import gregtech.api.objects.GT_Fluid;
 import gregtech.api.util.GT_OreDictUnificator;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
@@ -135,6 +136,12 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
         this.stats = stats.setMass(tmpmass);
 
         this.texSet = texSet;
+
+        if (this.getStats().meltingPoint > 0) {
+            this.fluid = new GT_Fluid("molten" + this.getDefaultName().replaceAll(" ", ""), "molten.autogenerated", this.getRGBA());
+            this.getGenerationFeatures().toGenerate |= 16;
+        }
+
         Werkstoff.werkstoffHashSet.add(this);
         Werkstoff.werkstoffHashMap.put(this.mID, this);
     }
@@ -310,6 +317,7 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
         metal 10
         gem 100
         ore 1000
+        cell 1000
          */
         public byte toGenerate = 0b0001001;
         public byte blacklist;
@@ -392,6 +400,8 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
 
     public static class Stats {
 
+        public static final int NULL_KELVIN = 0;
+
         int boilingPoint;
         int meltingPoint;
         long protons;
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
index 824435461d..7256b12a43 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
@@ -42,6 +42,7 @@ import gregtech.api.enums.*;
 import gregtech.api.interfaces.ISubTagContainer;
 import gregtech.api.objects.GT_MultiTexture;
 import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;
@@ -74,9 +75,9 @@ public class WerkstoffLoader implements Runnable {
             1,
             TextureSet.SET_FLINT,
             Arrays.asList(Materials.Bismuth),
-            new Pair<ISubTagContainer, Integer>(Materials.Bismuth, 2),
-            new Pair<ISubTagContainer, Integer>(Materials.Oxygen, 2),
-            new Pair<ISubTagContainer, Integer>(Materials.CarbonDioxide, 2)
+            new Pair<>(Materials.Bismuth, 2),
+            new Pair<>(Materials.Oxygen, 2),
+            new Pair<>(Materials.CarbonDioxide, 2)
     );
     public static final Werkstoff Bismuthinit = new Werkstoff(
             new short[]{192, 192, 192, 0},
@@ -86,8 +87,8 @@ public class WerkstoffLoader implements Runnable {
             2,
             TextureSet.SET_METALLIC,
             Arrays.asList(Materials.Bismuth, Materials.Sulfur),
-            new Pair<ISubTagContainer, Integer>(Materials.Bismuth, 2),
-            new Pair<ISubTagContainer, Integer>(Materials.Sulfur, 3)
+            new Pair<>(Materials.Bismuth, 2),
+            new Pair<>(Materials.Sulfur, 3)
     );
     public static final Werkstoff Zirconium = new Werkstoff(
             new short[]{175, 175, 175, 0},
@@ -108,8 +109,8 @@ public class WerkstoffLoader implements Runnable {
             4,
             TextureSet.SET_DIAMOND,
             Arrays.asList(Zirconium),
-            new Pair<ISubTagContainer, Integer>(Zirconium, 1),
-            new Pair<ISubTagContainer, Integer>(Materials.Oxygen, 2)
+            new Pair<>(Zirconium, 1),
+            new Pair<>(Materials.Oxygen, 2)
     );
     public static final Werkstoff FluorBuergerit = new Werkstoff(
             new short[]{0x20, 0x20, 0x20, 0},
@@ -120,13 +121,13 @@ public class WerkstoffLoader implements Runnable {
             5,
             TextureSet.SET_RUBY,
             Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon),
-            new Pair<ISubTagContainer, Integer>(Materials.Sodium, 1),
-            new Pair<ISubTagContainer, Integer>(Materials.Iron, 3),
-            new Pair<ISubTagContainer, Integer>(Materials.Aluminium, 6),
-            new Pair<ISubTagContainer, Integer>(Materials.Silicon, 6),
-            new Pair<ISubTagContainer, Integer>(Materials.Boron, 3),
-            new Pair<ISubTagContainer, Integer>(Materials.Oxygen, 30),
-            new Pair<ISubTagContainer, Integer>(Materials.Fluorine, 1)
+            new Pair<>(Materials.Sodium, 1),
+            new Pair<>(Materials.Iron, 3),
+            new Pair<>(Materials.Aluminium, 6),
+            new Pair<>(Materials.Silicon, 6),
+            new Pair<>(Materials.Boron, 3),
+            new Pair<>(Materials.Oxygen, 30),
+            new Pair<>(Materials.Fluorine, 1)
     );
     public static final Werkstoff YttriumOxide = new Werkstoff(
             new short[]{255,255,255,0},
@@ -135,8 +136,8 @@ public class WerkstoffLoader implements Runnable {
             new Werkstoff.GenerationFeatures().onlyDust(), //No autoadd here to gate this material by hand
             6,
             TextureSet.SET_DULL,
-            new Pair<ISubTagContainer, Integer>(Materials.Yttrium, 2),
-            new Pair<ISubTagContainer, Integer>(Materials.Oxygen, 3)
+            new Pair<>(Materials.Yttrium, 2),
+            new Pair<>(Materials.Oxygen, 3)
     );
     public static final Werkstoff ChromoAluminoPovondrait = new Werkstoff(
             new short[]{0, 0x79, 0x6A, 0},
@@ -148,13 +149,13 @@ public class WerkstoffLoader implements Runnable {
             7,
             TextureSet.SET_RUBY,
             Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon),
-            new Pair<ISubTagContainer, Integer>(Materials.Sodium, 1),
-            new Pair<ISubTagContainer, Integer>(Materials.Chrome, 3),
-            new Pair<ISubTagContainer, Integer>(Materials.Magnalium, 6),
-            new Pair<ISubTagContainer, Integer>(Materials.Silicon, 6),
-            new Pair<ISubTagContainer, Integer>(Materials.Boron, 3),
-            new Pair<ISubTagContainer, Integer>(Materials.Oxygen, 31),
-            new Pair<ISubTagContainer, Integer>(Materials.Hydrogen, 3)
+            new Pair<>(Materials.Sodium, 1),
+            new Pair<>(Materials.Chrome, 3),
+            new Pair<>(Materials.Magnalium, 6),
+            new Pair<>(Materials.Silicon, 6),
+            new Pair<>(Materials.Boron, 3),
+            new Pair<>(Materials.Oxygen, 31),
+            new Pair<>(Materials.Hydrogen, 3)
     );
     public static final Werkstoff VanadioOxyDravit = new Werkstoff(
             new short[]{0x60, 0xA0, 0xA0, 0},
@@ -166,13 +167,13 @@ public class WerkstoffLoader implements Runnable {
             8,
             TextureSet.SET_RUBY,
             Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon),
-            new Pair<ISubTagContainer, Integer>(Materials.Sodium, 1),
-            new Pair<ISubTagContainer, Integer>(Materials.Vanadium, 3),
-            new Pair<ISubTagContainer, Integer>(Materials.Magnalium, 6),
-            new Pair<ISubTagContainer, Integer>(Materials.Silicon, 6),
-            new Pair<ISubTagContainer, Integer>(Materials.Boron, 3),
-            new Pair<ISubTagContainer, Integer>(Materials.Oxygen, 31),
-            new Pair<ISubTagContainer, Integer>(Materials.Hydrogen, 3)
+            new Pair<>(Materials.Sodium, 1),
+            new Pair<>(Materials.Vanadium, 3),
+            new Pair<>(Materials.Magnalium, 6),
+            new Pair<>(Materials.Silicon, 6),
+            new Pair<>(Materials.Boron, 3),
+            new Pair<>(Materials.Oxygen, 31),
+            new Pair<>(Materials.Hydrogen, 3)
     );
     public static final Werkstoff Olenit = new Werkstoff(
             new short[]{210, 210, 210, 0},
@@ -184,12 +185,12 @@ public class WerkstoffLoader implements Runnable {
             9,
             TextureSet.SET_RUBY,
             Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon),
-            new Pair<ISubTagContainer, Integer>(Materials.Sodium, 1),
-            new Pair<ISubTagContainer, Integer>(Materials.Aluminium, 9),
-            new Pair<ISubTagContainer, Integer>(Materials.Silicon, 6),
-            new Pair<ISubTagContainer, Integer>(Materials.Boron, 3),
-            new Pair<ISubTagContainer, Integer>(Materials.Oxygen, 31),
-            new Pair<ISubTagContainer, Integer>(Materials.Hydrogen, 1)
+            new Pair<>(Materials.Sodium, 1),
+            new Pair<>(Materials.Aluminium, 9),
+            new Pair<>(Materials.Silicon, 6),
+            new Pair<>(Materials.Boron, 3),
+            new Pair<>(Materials.Oxygen, 31),
+            new Pair<>(Materials.Hydrogen, 1)
     );
     public static final Werkstoff Arsenopyrite = new Werkstoff(
             new short[]{0xB0, 0xB0, 0xB0, 0},
@@ -199,9 +200,9 @@ public class WerkstoffLoader implements Runnable {
             10,
             TextureSet.SET_METALLIC,
             Arrays.asList(Materials.Sulfur, Materials.Arsenic, Materials.Iron),
-            new Pair<ISubTagContainer, Integer>(Materials.Iron, 1),
-            new Pair<ISubTagContainer, Integer>(Materials.Arsenic, 1),
-            new Pair<ISubTagContainer, Integer>(Materials.Sulfur, 1)
+            new Pair<>(Materials.Iron, 1),
+            new Pair<>(Materials.Arsenic, 1),
+            new Pair<>(Materials.Sulfur, 1)
     );
     public static final Werkstoff Ferberite = new Werkstoff(
             new short[]{0xB0, 0xB0, 0xB0, 0},
@@ -211,9 +212,9 @@ public class WerkstoffLoader implements Runnable {
             11,
             TextureSet.SET_METALLIC,
             Arrays.asList(Materials.Iron, Materials.Tungsten),
-            new Pair<ISubTagContainer, Integer>(Materials.Iron, 1),
-            new Pair<ISubTagContainer, Integer>(Materials.Tungsten, 1),
-            new Pair<ISubTagContainer, Integer>(Materials.Oxygen, 3)
+            new Pair<>(Materials.Iron, 1),
+            new Pair<>(Materials.Tungsten, 1),
+            new Pair<>(Materials.Oxygen, 3)
     );
     public static final Werkstoff Loellingit = new Werkstoff(
             new short[]{0xD0, 0xD0, 0xD0, 0},
@@ -223,8 +224,8 @@ public class WerkstoffLoader implements Runnable {
             12,
             TextureSet.SET_METALLIC,
             Arrays.asList(Materials.Iron, Materials.Arsenic),
-            new Pair<ISubTagContainer, Integer>(Materials.Iron, 1),
-            new Pair<ISubTagContainer, Integer>(Materials.Arsenic, 2)
+            new Pair<>(Materials.Iron, 1),
+            new Pair<>(Materials.Arsenic, 2)
     );
     public static final Werkstoff Roquesit = new Werkstoff(
             new short[]{0xA0, 0xA0, 0xA0, 0},
@@ -234,9 +235,9 @@ public class WerkstoffLoader implements Runnable {
             13,
             TextureSet.SET_METALLIC,
             Arrays.asList(Materials.Copper, Materials.Sulfur),
-            new Pair<ISubTagContainer, Integer>(Materials.Copper, 1),
-            new Pair<ISubTagContainer, Integer>(Materials.Indium, 1),
-            new Pair<ISubTagContainer, Integer>(Materials.Sulfur, 2)
+            new Pair<>(Materials.Copper, 1),
+            new Pair<>(Materials.Indium, 1),
+            new Pair<>(Materials.Sulfur, 2)
     );
     public static final Werkstoff Bornite = new Werkstoff(
             new short[]{0x97, 0x66, 0x2B, 0},
@@ -246,9 +247,9 @@ public class WerkstoffLoader implements Runnable {
             14,
             TextureSet.SET_METALLIC,
             Arrays.asList(Materials.Copper, Materials.Iron, Materials.Sulfur),
-            new Pair<ISubTagContainer, Integer>(Materials.Copper, 5),
-            new Pair<ISubTagContainer, Integer>(Materials.Iron, 1),
-            new Pair<ISubTagContainer, Integer>(Materials.Sulfur, 4)
+            new Pair<>(Materials.Copper, 5),
+            new Pair<>(Materials.Iron, 1),
+            new Pair<>(Materials.Sulfur, 4)
     );
     public static final Werkstoff Wittichenit = new Werkstoff(
             Materials.Copper.mRGBa,
@@ -258,9 +259,9 @@ public class WerkstoffLoader implements Runnable {
             15,
             TextureSet.SET_METALLIC,
             Arrays.asList(Materials.Copper, Materials.Bismuth, Materials.Sulfur),
-            new Pair<ISubTagContainer, Integer>(Materials.Copper, 5),
-            new Pair<ISubTagContainer, Integer>(Materials.Bismuth, 1),
-            new Pair<ISubTagContainer, Integer>(Materials.Sulfur, 4)
+            new Pair<>(Materials.Copper, 5),
+            new Pair<>(Materials.Bismuth, 1),
+            new Pair<>(Materials.Sulfur, 4)
     );
     public static final Werkstoff Djurleit = new Werkstoff(
             new short[]{0x60, 0x60, 0x60, 0},
@@ -270,8 +271,8 @@ public class WerkstoffLoader implements Runnable {
             16,
             TextureSet.SET_METALLIC,
             Arrays.asList(Materials.Copper, Materials.Copper, Materials.Sulfur),
-            new Pair<ISubTagContainer, Integer>(Materials.Copper, 31),
-            new Pair<ISubTagContainer, Integer>(Materials.Sulfur, 16)
+            new Pair<>(Materials.Copper, 31),
+            new Pair<>(Materials.Sulfur, 16)
     );
     public static final Werkstoff Huebnerit = new Werkstoff(
             new short[]{0x80, 0x60, 0x60, 0},
@@ -281,9 +282,9 @@ public class WerkstoffLoader implem