two new materials and wire

7 files changed, 124 insertions, 6 deletions

diff --git a/src/main/java/goodgenerator/items/MyMaterial.java b/src/main/java/goodgenerator/items/MyMaterial.java
index f73247dd18..4b1e1cdfa2 100644
--- a/src/main/java/goodgenerator/items/MyMaterial.java
+++ b/src/main/java/goodgenerator/items/MyMaterial.java
@@ -605,7 +605,7 @@ public class MyMaterial implements Runnable {
             subscriptNumbers("ZnTh"),
             new Werkstoff.Stats(),
             Werkstoff.Types.COMPOUND,
-            new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems().addMultipleIngotMetalWorkingItems(),
+            new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(),
             OffsetID + 52,
             TextureSet.SET_SHINY,
             new Pair<>(Zinc, 1),
@@ -954,7 +954,7 @@ public class MyMaterial implements Runnable {
             subscriptNumbers("Zr34Sn5Fe2Cr"),
             new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(2800),
             Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems().addMultipleIngotMetalWorkingItems().addMixerRecipes((short) 4),
+            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addMixerRecipes((short) 4),
             OffsetID + 81,
             TextureSet.SET_METALLIC,
             new Pair<>(WerkstoffLoader.Zirconium, 34),
@@ -969,7 +969,7 @@ public class MyMaterial implements Runnable {
             subscriptNumbers("Zr34Sn4FeCrNi"),
             new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(2800),
             Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems().addMultipleIngotMetalWorkingItems().addMixerRecipes((short) 2),
+            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addMixerRecipes((short) 2),
             OffsetID + 82,
             TextureSet.SET_METALLIC,
             new Pair<>(WerkstoffLoader.Zirconium, 34),
@@ -985,7 +985,7 @@ public class MyMaterial implements Runnable {
             subscriptNumbers("Fe12Ni10Co8Ti4Mo2Al"),
             new Werkstoff.Stats().setCentrifuge(true).setBlastFurnace(true).setMeltingPoint(3700),
             Werkstoff.Types.MIXTURE,
-            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems().addMultipleIngotMetalWorkingItems().addMixerRecipes((short) 6),
+            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems().addSimpleMetalWorkingItems().addMixerRecipes((short) 6),
             OffsetID + 83,
             TextureSet.SET_METALLIC,
             new Pair<>(Iron, 12),
@@ -1155,6 +1155,43 @@ public class MyMaterial implements Runnable {
             new Pair<>(Chlorine, 1)
     );
 
+    public static final Werkstoff signalium = new Werkstoff(
+            new short[]{0xd4,0x40,0x00},
+            "Signalium",
+            new Werkstoff.Stats().setBlastFurnace(true).setMeltingPoint(4000),
+            Werkstoff.Types.MIXTURE,
+            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems(),
+            OffsetID + 98,
+            TextureSet.SET_SHINY,
+            new Pair<>(AnnealedCopper, 4),
+            new Pair<>(Ardite, 2),
+            new Pair<>(RedAlloy, 2)
+    );
+
+    public static final Werkstoff lumiinessence = new Werkstoff(
+            new short[]{0xe8,0xf2,0x24},
+            "Lumiinessence",
+            subscriptNumbers("(Al??)2(PO4)4"),
+            new Werkstoff.Stats(),
+            Werkstoff.Types.MIXTURE,
+            new Werkstoff.GenerationFeatures().onlyDust(),
+            OffsetID + 99,
+            TextureSet.SET_DULL
+    );
+
+    public static final Werkstoff lumiium = new Werkstoff(
+            new short[]{0xe8,0xf2,0x24},
+            "Lumiium",
+            new Werkstoff.Stats().setBlastFurnace(true).setMeltingPoint(4000),
+            Werkstoff.Types.MIXTURE,
+            new Werkstoff.GenerationFeatures().onlyDust().addMolten().addMetalItems().addCraftingMetalWorkingItems(),
+            OffsetID + 100,
+            TextureSet.SET_SHINY,
+            new Pair<>(TinAlloy, 4),
+            new Pair<>(SterlingSilver, 2),
+            new Pair<>(lumiinessence, 2)
+    );
+
     @Override
     public void run() { }
 }
diff --git a/src/main/java/goodgenerator/loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java
index f88cfdd4cf..568ce43fe8 100644
--- a/src/main/java/goodgenerator/loader/Loaders.java
+++ b/src/main/java/goodgenerator/loader/Loaders.java
@@ -66,6 +66,7 @@ public class Loaders {
     public static final Item advancedFuelRod = new MyItems("advancedFuelRod", GoodGenerator.GG);
     public static final Item fluidCore = new MyItems("fluidCore", GoodGenerator.GG, new String[]{GoodGenerator.MOD_ID+":fluidCore/1", GoodGenerator.MOD_ID+":fluidCore/2", GoodGenerator.MOD_ID+":fluidCore/3", GoodGenerator.MOD_ID+":fluidCore/4", GoodGenerator.MOD_ID+":fluidCore/5", GoodGenerator.MOD_ID+":fluidCore/6"});
     public static final Item upgradeEssentia = new MyItems("upgradeEssentia", GoodGenerator.GG, new String[]{GoodGenerator.MOD_ID+":upgradeEssentia/null", GoodGenerator.MOD_ID+":upgradeEssentia/air", GoodGenerator.MOD_ID+":upgradeEssentia/thermal", GoodGenerator.MOD_ID+":upgradeEssentia/unstable", GoodGenerator.MOD_ID+":upgradeEssentia/victus", GoodGenerator.MOD_ID+":upgradeEssentia/tainted", GoodGenerator.MOD_ID+":upgradeEssentia/mechanics", GoodGenerator.MOD_ID+":upgradeEssentia/spirit", GoodGenerator.MOD_ID+":upgradeEssentia/radiation", GoodGenerator.MOD_ID+":upgradeEssentia/electric"});
+    public static final Item highEnergyMixture = new MyItems("highEnergyMixture", GoodGenerator.GG, new String[]{GoodGenerator.MOD_ID+":highEnergyMixture"});
 
     public static final Block MAR_Casing = new Casing("MAR_Casing", new String[]{GoodGenerator.MOD_ID+":MAR_Casing"});
     public static final Block FRF_Casings = new Casing("FRF_Casing", new String[]{"gregtech:iconsets/MACHINE_CASING_MINING_BLACKPLUTONIUM"});
@@ -103,7 +104,7 @@ public class Loaders {
 
     //public static Item Isotope = new NuclearMetaItemGenerator();
 
-    public static void GTMetaTileRegister(){
+    public static void GTMetaTileRegister() {
         Loaders.MAR = new MultiNqGenerator(12732, "NaG", "Large Naquadah Reactor").getStackForm(1L);
         Loaders.FRF = new FuelRefineFactory(16999, "FRF", "Naquadah Fuel Refinery").getStackForm(1L);
         Loaders.UCFE = new UniversalChemicalFuelEngine(IDOffset, "UniversalChemicalFuelEngine", "Universal Chemical Fuel Engine").getStackForm(1L);
@@ -119,6 +120,8 @@ public class Loaders {
         Loaders.Generator_Diesel[0] = new DieselGenerator(1113, "basicgenerator.diesel.tier.04", "Turbo Supercharging Combustion Generator", 4).getStackForm(1L);
         Loaders.Generator_Diesel[1] = new DieselGenerator(1114, "basicgenerator.diesel.tier.05", "Ultimate Chemical Energy Releaser", 5).getStackForm(1L);
         CrackRecipeAdder.registerPipe(30995, MyMaterial.incoloy903, 15000, 8000, true);
+        CrackRecipeAdder.registerWire(32749, MyMaterial.signalium, 12, 131072, 16, true);
+        CrackRecipeAdder.registerWire(32737, MyMaterial.lumiium, 8, 524288, 64, true);
     }
 
     public static void Register() {
@@ -167,6 +170,7 @@ public class Loaders {
         GameRegistry.registerItem(naquadriaMass, "naquadriaMass", GoodGenerator.MOD_ID);
         GameRegistry.registerItem(advancedFuelRod, "advancedFuelRod", GoodGenerator.MOD_ID);
         GameRegistry.registerItem(fluidCore, "fluidCore", GoodGenerator.MOD_ID);
+        GameRegistry.registerItem(highEnergyMixture, "highEnergyMixture", GoodGenerator.MOD_ID);
     }
 
     public static void compactMod() {
@@ -205,7 +209,7 @@ public class Loaders {
         LoadedList.init();
     }
 
-    public static void initLoad(){
+    public static void initLoad() {
         new BlockRenderHandler();
         GTMetaTileRegister();
         initLoadRecipes();
diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
index 18adc9d157..ac710a6396 100644
--- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
@@ -43,6 +43,8 @@ public class RecipeLoader_02 {
         CrackRecipeAdder.reAddBlastRecipe(MyMaterial.adamantiumAlloy, 2500, 1920, 5500, true);
         CrackRecipeAdder.reAddBlastRecipe(MyMaterial.marM200, 200, 7680, 5000, true);
         CrackRecipeAdder.reAddBlastRecipe(MyMaterial.marM200, 220, 7680, 5000, false);
+        CrackRecipeAdder.reAddBlastRecipe(MyMaterial.signalium, 1600, 30720, 4000, true);
+        CrackRecipeAdder.reAddBlastRecipe(MyMaterial.lumiium, 1600, 30720, 4000, true);
 
         GT_Values.RA.addAssemblerRecipe(
                 new ItemStack[] {
@@ -1169,6 +1171,50 @@ public class RecipeLoader_02 {
                 200,
                 7680
         );
+
+        GT_Values.RA.addMixerRecipe(
+                Materials.Glowstone.getDust(4),
+                Materials.Redstone.getDust(2),
+                Materials.Aluminium.getDust(1),
+                GT_Utility.getIntegratedCircuit(3),
+                null,
+                null,
+                ItemRefer.High_Energy_Mixture.get(4),
+                240,
+                120
+        );
+
+        GT_Values.RA.addFluidSolidifierRecipe(
+                ItemRefer.High_Energy_Mixture.get(2),
+                Materials.PhosphoricAcid.getFluid(4000),
+                MyMaterial.lumiinessence.get(OrePrefixes.dust, 1),
+                600,
+                240
+        );
+
+        GT_Values.RA.addMixerRecipe(
+                Materials.AnnealedCopper.getDust(4),
+                Materials.Ardite.getDust(2),
+                Materials.RedAlloy.getDust(2),
+                GT_Utility.getIntegratedCircuit(4),
+                Materials.Redstone.getMolten(288),
+                null,
+                MyMaterial.signalium.get(OrePrefixes.dust, 1),
+                240,
+                120
+        );
+
+        GT_Values.RA.addMixerRecipe(
+                Materials.TinAlloy.getDust(4),
+                Materials.SterlingSilver.getDust(2),
+                MyMaterial.lumiinessence.get(OrePrefixes.dust, 2),
+                GT_Utility.getIntegratedCircuit(4),
+                Materials.Glowstone.getMolten(288),
+                null,
+                MyMaterial.lumiium.get(OrePrefixes.dust, 1),
+                240,
+                120
+        );
     }
 
     public static void FinishLoadRecipe() {
diff --git a/src/main/java/goodgenerator/util/CrackRecipeAdder.java b/src/main/java/goodgenerator/util/CrackRecipeAdder.java
index bae288af32..ea4158eb4d 100644
--- a/src/main/java/goodgenerator/util/CrackRecipeAdder.java
+++ b/src/main/java/goodgenerator/util/CrackRecipeAdder.java
@@ -5,6 +5,7 @@ import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
+import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;
 import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
@@ -98,4 +99,32 @@ public class CrackRecipeAdder {
         GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Pipe_Large.get(0), material.getMolten(864), material.get(OrePrefixes.pipeLarge, 1), (int) material.getStats().getMass() * 12, 30);
         GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Pipe_Huge.get(0), material.getMolten(1728), material.get(OrePrefixes.pipeHuge, 1), (int) material.getStats().getMass() * 24, 30);
     }
+
+    public static void registerWire(int ID, Werkstoff material, int aAmperage, int aVoltage, int aLoss, boolean cover) {
+        String unName = material.getDefaultName().replace(" ", "_").toLowerCase();
+        String Name = material.getDefaultName();
+        String aTextWire1 = "wire.";
+        String aTextCable1 = "cable.";
+        String aTextWire2 = " Wire";
+        String aTextCable2 = " Cable";
+        int aLossInsulated = aLoss / 4;
+        GT_OreDictUnificator.registerOre(OrePrefixes.wireGt01, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable(ID + 0, aTextWire1 + unName + ".01", "1x " + Name + aTextWire2, 0.125F, material.getBridgeMaterial(), aLoss, 1L * aAmperage, aVoltage, false, true).getStackForm(1L));
+        GT_OreDictUnificator.registerOre(OrePrefixes.wireGt02, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable(ID + 1, aTextWire1 + unName + ".02", "2x " + Name + aTextWire2, 0.25F, material.getBridgeMaterial(), aLoss, 2L * aAmperage, aVoltage, false, true).getStackForm(1L));
+        GT_OreDictUnificator.registerOre(OrePrefixes.wireGt04, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable(ID + 2, aTextWire1 + unName + ".04", "4x " + Name + aTextWire2, 0.375F, material.getBridgeMaterial(), aLoss, 4L * aAmperage, aVoltage, false, true).getStackForm(1L));
+        GT_OreDictUnificator.registerOre(OrePrefixes.wireGt08, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable(ID + 3, aTextWire1 + unName + ".08", "8x " + Name + aTextWire2, 0.5F, material.getBridgeMaterial(), aLoss, 8L * aAmperage, aVoltage, false, true).getStackForm(1L));
+        GT_OreDictUnificator.registerOre(OrePrefixes.wireGt12, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable(ID + 4, aTextWire1 + unName + ".12", "12x " + Name + aTextWire2, 0.625F, material.getBridgeMaterial(), aLoss, 12L * aAmperage, aVoltage, false, true).getStackForm(1L));
+        GT_OreDictUnificator.registerOre(OrePrefixes.wireGt16, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable(ID + 5, aTextWire1 + unName + ".16", "16x " + Name + aTextWire2, 0.75F, material.getBridgeMaterial(), aLoss, 16L * aAmperage, aVoltage, false, true).getStackForm(1L));
+        if (cover) {
+            GT_OreDictUnificator.registerOre(OrePrefixes.cableGt01, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable(ID + 6, aTextCable1 + unName + ".01", "1x " + Name + aTextCable2, 0.25F, material.getBridgeMaterial(), aLossInsulated, 1L * aAmperage, aVoltage, true, false).getStackForm(1L));
+            GT_OreDictUnificator.registerOre(OrePrefixes.cableGt02, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable(ID + 7, aTextCable1 + unName + ".02", "2x " + Name + aTextCable2, 0.375F, material.getBridgeMaterial(), aLossInsulated, 2L * aAmperage, aVoltage, true, false).getStackForm(1L));
+            GT_OreDictUnificator.registerOre(OrePrefixes.cableGt04, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable(ID + 8, aTextCable1 + unName + ".04", "4x " + Name + aTextCable2, 0.5F, material.getBridgeMaterial(), aLossInsulated, 4L * aAmperage, aVoltage, true, false).getStackForm(1L));
+            GT_OreDictUnificator.registerOre(OrePrefixes.cableGt08, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable(ID + 9, aTextCable1 + unName + ".08", "8x " + Name + aTextCable2, 0.625F, material.getBridgeMaterial(), aLossInsulated, 8L * aAmperage, aVoltage, true, false).getStackForm(1L));
+            GT_OreDictUnificator.registerOre(OrePrefixes.cableGt12, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable(ID + 10, aTextCable1 + unName + ".12", "12x " + Name + aTextCable2, 0.75F, material.getBridgeMaterial(), aLossInsulated, 12L * aAmperage, aVoltage, true, false).getStackForm(1L));
+            GT_OreDictUnificator.registerOre(OrePrefixes.cableGt16, material.getBridgeMaterial(), new GT_MetaPipeEntity_Cable(ID + 11, aTextCable1 + unName + ".16", "16x " + Name + aTextCable2, 0.875F, material.getBridgeMaterial(), aLossInsulated, 16L * aAmperage, aVoltage, true, false).getStackForm(1L));
+        }
+        GT_Values.RA.addWiremillRecipe(material.get(OrePrefixes.ingot, 1), material.get(OrePrefixes.wireGt01, 2), (int) material.getStats().getMass() * 4, 90);
+        GT_Values.RA.addWiremillRecipe(material.get(OrePrefixes.stick, 1), material.get(OrePrefixes.wireGt01, 1), (int) material.getStats().getMass(), 90);
+        GT_Values.RA.addWiremillRecipe(material.get(OrePrefixes.wireGt01, 1), material.get(OrePrefixes.wireFine, 4), (int) material.getStats().getMass() * 4, 7);
+        GT_Values.RA.addExtruderRecipe(material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Wire.get(0), material.get(OrePrefixes.wireGt01, 2), (int) material.getStats().getMass() * 8, 480);
+    }
 }
diff --git a/src/main/java/goodgenerator/util/ItemRefer.java b/src/main/java/goodgenerator/util/ItemRefer.java
index d16d8c0153..640ae1eb98 100644
--- a/src/main/java/goodgenerator/util/ItemRefer.java
+++ b/src/main/java/goodgenerator/util/ItemRefer.java
@@ -79,6 +79,7 @@ public final class ItemRefer {
     public static ItemRefer Essentia_Upgrade_Spirit = getItemStack(upgradeEssentia, 7);
     public static ItemRefer Essentia_Upgrade_Radiation = getItemStack(upgradeEssentia, 8);
     public static ItemRefer Essentia_Upgrade_Electric = getItemStack(upgradeEssentia, 9);
+    public static ItemRefer High_Energy_Mixture = getItemStack(highEnergyMixture);
 
     public static ItemRefer Field_Restriction_Casing = getItemStack(MAR_Casing);
     public static ItemRefer Naquadah_Fuel_Refinery_Casing = getItemStack(FRF_Casings);
diff --git a/src/main/resources/assets/goodgenerator/lang/en_US.lang b/src/main/resources/assets/goodgenerator/lang/en_US.lang
index 2cf4a65f21..5063d5a640 100644
--- a/src/main/resources/assets/goodgenerator/lang/en_US.lang
+++ b/src/main/resources/assets/goodgenerator/lang/en_US.lang
@@ -99,6 +99,7 @@ item.upgradeEssentia.6.name=§bEssentia Generator: Mechanics§r
 item.upgradeEssentia.7.name=§6Essentia Generator: Spirit§r
 item.upgradeEssentia.8.name=§aEssentia Generator: Radiation§r
 item.upgradeEssentia.9.name=§3Essentia Generator: Electric§r
+item.highEnergyMixture.0.name=High Energy Mixture
 
 #Tooltip
 inverter.tooltip.0=Turn DC into AC.
diff --git a/src/main/resources/assets/goodgenerator/textures/items/highEnergyMixture.png b/src/main/resources/assets/goodgenerator/textures/items/highEnergyMixture.png
new file mode 100644
index 0000000000..c8932c8a27
--- /dev/null
+++ b/src/main/resources/assets/goodgenerator/textures/items/highEnergyMixture.png