Cable Tweaks

Fix furnace/alloysmelter same recipe

Author: Houstonruss

src/main/java/gregtech/api/enums/Materials.java

@@ -1864,11 +1864,12 @@ private static void initSubTags() {
         RoseGold.add(SubTag.YES_TOOLS);
         BlackBronze.add(SubTag.YES_TOOLS);
         StainlessSteel.add(SubTag.YES_TOOLS);
-        Aluminium.add(SubTag.YES_TOOLS);
+        Aluminium.add(SubTag.YES_TOOLS, SubTag.YES_CABLES);
         Titanium.add(SubTag.YES_TOOLS, SubTag.YES_CABLES, SubTag.GOOD_CABLES);
         TungstenSteel.add(SubTag.YES_TOOLS);
         Iridium.add(SubTag.YES_TOOLS);
         VanadiumSteel.add(SubTag.YES_TOOLS);
+        Graphene.add(SubTag.YES_CABLES, SubTag.GOOD_CABLES);
 
         Gold.add(SubTag.MORTAR_GRINDABLE, SubTag.YES_CABLES, SubTag.GOOD_CABLES);
         Silver.add(SubTag.MORTAR_GRINDABLE);

src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java

@@ -455,7 +455,7 @@ public void run() {
 
         GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.PolyvinylChloride,1),ItemList.Paper_Printed_Pages.get(1L),Materials.Glue.getFluid(20L), new ItemStack(Items.written_book,1,0), 32, 8);
         GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.PolyvinylChloride,1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3), Materials.Glue.getFluid(20L), new ItemStack(Items.book,1,0),20,16);
-        GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 8), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicon, 1), Materials.Glue.getFluid(250L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphene, 1), 480, 240);
+        GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 8), GT_OreDictUnificator.get(plate, Materials.Silicon, 1), Materials.Glue.getFluid(50), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphene, 1), 20, 480);
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Electric_Pump_LV.get(1L), GT_OreDictUnificator.get(circuitLogic.get(LOGIC_LV), 1L),  GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.FluidRegulator_LV.get(1L), 400, 30);
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Electric_Pump_MV.get(1L),  GT_OreDictUnificator.get(circuitLogic.get(LOGIC_MV), 1L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.FluidRegulator_MV.get(1L), 350, 120);
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Electric_Pump_HV.get(1L),  GT_OreDictUnificator.get(circuitLogic.get(LOGIC_HV), 1L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.FluidRegulator_HV.get(1L), 300, 480);

src/main/java/gregtech/loaders/preload/metatileentity/BasicMachineLoader.java

@@ -61,8 +61,8 @@ public static void load() {
         Machine_EV_Cutter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(254, "basicmachine.cutter.tier.04", "Advanced Cutting Machine III", 4, "Slice'N Dice", sCutterRecipes, 2, 2, 64000, 0, 1, "Cutter2.png", "", false, false, 0, "CUTTER", new Object[0]).getStackForm(1L));
         Machine_IV_Cutter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(255, "basicmachine.cutter.tier.05", "Advanced Cutting Machine IV", 5, "Slice'N Dice", sCutterRecipes, 2, 2, 96000, 0, 1, "Cutter2.png", "", false, false, 0, "CUTTER", new Object[0]).getStackForm(1L));
 
-        Machine_LV_E_Furnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(261, "basicmachine.e_furnace.tier.01", "Basic Electric Furnace", 1, "Not like using a Commodore 64", sFurnaceRecipes, 1, 1, 0, 0, 1, "E_Furnace.png", sSoundList.get(Integer.valueOf(223)), false, false, 0, "ELECTRIC_FURNACE", new Object[]{"ECE", "CMC", "WCW", 'M', HULL, 'E',  circuitPower.get(PWR_LV), 'W', WIRE, 'C', COIL_HEATING}).getStackForm(1L));
-        Machine_MV_E_Furnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(262, "basicmachine.e_furnace.tier.02", "Advanced Electric Furnace", 2, "Not like using a Commodore 64", sFurnaceRecipes, 1, 1, 0, 0, 1, "E_Furnace.png", sSoundList.get(Integer.valueOf(223)), false, false, 0, "ELECTRIC_FURNACE", new Object[]{"ECE", "CMC", "WCW", 'M', HULL, 'E',  circuitPower.get(PWR_MV), 'W', WIRE, 'C', COIL_HEATING}).getStackForm(1L));
+        Machine_LV_E_Furnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(261, "basicmachine.e_furnace.tier.01", "Basic Electric Furnace", 1, "Not like using a Commodore 64", sFurnaceRecipes, 1, 1, 0, 0, 1, "E_Furnace.png", sSoundList.get(Integer.valueOf(223)), false, false, 0, "ELECTRIC_FURNACE", new Object[]{"WCW", "CMC", "ECE", 'M', HULL, 'E',  circuitPower.get(PWR_LV), 'W', WIRE, 'C', COIL_HEATING}).getStackForm(1L));
+        Machine_MV_E_Furnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(262, "basicmachine.e_furnace.tier.02", "Advanced Electric Furnace", 2, "Not like using a Commodore 64", sFurnaceRecipes, 1, 1, 0, 0, 1, "E_Furnace.png", sSoundList.get(Integer.valueOf(223)), false, false, 0, "ELECTRIC_FURNACE", new Object[]{"WCW", "CMC", "ECE", 'M', HULL, 'E',  circuitPower.get(PWR_MV), 'W', WIRE, 'C', COIL_HEATING}).getStackForm(1L));
         Machine_HV_E_Furnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(263, "basicmachine.e_furnace.tier.03", "Advanced Electric Furnace II", 3, "Not like using a Commodore 64", sFurnaceRecipes, 1, 1, 0, 0, 1, "E_Furnace.png", sSoundList.get(Integer.valueOf(223)), false, false, 0, "ELECTRIC_FURNACE", new Object[0]).getStackForm(1L));
         Machine_EV_E_Furnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(264, "basicmachine.e_furnace.tier.04", "Advanced Electric Furnace III", 4, "Not like using a Commodore 64", sFurnaceRecipes, 1, 1, 0, 0, 1, "E_Furnace.png", sSoundList.get(Integer.valueOf(223)), false, false, 0, "ELECTRIC_FURNACE", new Object[0]).getStackForm(1L));
         Machine_IV_E_Furnace.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(265, "basicmachine.e_furnace.tier.05", "Advanced Electric Furnace IV", 5, "Not like using a Commodore 64", sFurnaceRecipes, 1, 1, 0, 0, 1, "E_Furnace.png", sSoundList.get(Integer.valueOf(223)), false, false, 0, "ELECTRIC_FURNACE", new Object[0]).getStackForm(1L));

src/main/java/gregtech/loaders/preload/metatileentity/CableLoader.java

@@ -48,18 +48,18 @@ public static void load() {
         makeWires(Copper, 1360, 2,128, 16L, V[2], true, false);
         makeWires(AnnealedCopper, 1380, 1,128, 16L, V[2], true, false);
 
-        makeWires(Gold, 1420, 3,512, 32L, V[3], true, false);
+        makeWires(Gold, 1420, 2,512, 32L, V[3], true, false);
         makeWires(Electrum, 1440, 2,512, 16L, V[3], true, false);
         makeWires(BlueAlloy, 1480, 1,512, 16L, V[3], true, false);
         makeWires(Nichrome, 1500, 4,512, 1L, V[3], true, false);
-        makeWires(Aluminium, 1580, 4,512, 16L, V[3], true, false);
 
+        makeWires(Aluminium, 1580, 3,512, 16L, V[4], true, false);
         makeWires(Kanthal, 1400, 3,2048, 1L, V[4], true, false);
         makeWires(Steel, 1520, 5,2048, 8L, V[4], true, false);
         makeWires(BlackSteel, 1540, 2048,2048, 3L, V[4], true, false);
-        makeWires(Titanium, 1560, 3,2048, 32L, V[4], true, false);
-        makeWires(Graphene, 1600, 1,2048, 16L, V[4], false, true);
+        makeWires(Titanium, 1560, 2,2048, 32L, V[4], true, false);
 
+        makeWires(Graphene, 1600, 1,2048, 64L, V[5], true, false);
         makeWires(Osmium, 1620, 8192, 8192, 14L, V[5], true, false);
         makeWires(Platinum, 1640, 4, 8, 14L, V[5], true, false);
         makeWires(TungstenSteel, 1660, 8192, 8192, 6L, V[5], true, false);