From 9d3f7a2cb279dcdc02fc4f403e383a31536b9d8f Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sun, 22 Jan 2023 16:37:41 +0100 Subject: Add EV Dynamo and Energy Hatches 4 amp 16 amp and 64 amp --- .../dreamcraft/DreamCraftRecipeLoader.java | 68 +++++++++++++++++++++- .../tectech/loader/thing/MachineLoader.java | 18 ++++++ .../technus/tectech/thing/CustomItemList.java | 6 ++ 3 files changed, 89 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index 850c31ae94..64669f8655 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -497,7 +497,38 @@ public class DreamCraftRecipeLoader { // region hatches - // Dynamo Hatches IV-UMV + // Dynamo Hatches EV-UMV + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { + ItemList.Hatch_Dynamo_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2) + }, + Materials.Silver.getMolten(144), + CustomItemList.eM_dynamoMulti4_EV.get(1), + 100, + 480); + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { + CustomItemList.eM_dynamoMulti4_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4) + }, + Materials.Electrum.getMolten(144), + CustomItemList.eM_dynamoMulti16_EV.get(1), + 200, + 480); + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { + CustomItemList.eM_dynamoMulti16_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6) + }, + Materials.Tungsten.getMolten(144), + CustomItemList.eM_dynamoMulti64_EV.get(1), + 400, + 480); + GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Hatch_Dynamo_IV.get(1), @@ -661,7 +692,7 @@ public class DreamCraftRecipeLoader { Materials.Tungsten.getMolten(2304), CustomItemList.eM_dynamoMulti64_UHV.get(1), 400, - 500000); + 2000000); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { @@ -762,7 +793,38 @@ public class DreamCraftRecipeLoader { 400, 32000000); - // Energy Hatches IV-UIV + // Energy Hatches EV-UIV + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { + ItemList.Hatch_Energy_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2) + }, + Materials.Silver.getMolten(144), + CustomItemList.eM_energyMulti4_EV.get(1), + 100, + 480); + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { + CustomItemList.eM_energyMulti4_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4) + }, + Materials.Electrum.getMolten(144), + CustomItemList.eM_energyMulti16_EV.get(1), + 200, + 480); + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { + CustomItemList.eM_energyMulti16_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6) + }, + Materials.Tungsten.getMolten(144), + CustomItemList.eM_energyMulti64_EV.get(1), + 400, + 480); + GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Hatch_Energy_IV.get(1), diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java index 436c806da2..467b714a06 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java @@ -175,6 +175,15 @@ public class MachineLoader implements Runnable { // =================================================================================================== // Multi AMP Power INPUTS // =================================================================================================== + eM_energyMulti4_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( + 15109, "hatch.energymulti04.tier.04", "EV 4A Energy Hatch", 4, 4) + .getStackForm(1L)); + eM_energyMulti16_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( + 15119, "hatch.energymulti16.tier.04", "EV 16A Energy Hatch", 4, 16) + .getStackForm(1L)); + eM_energyMulti64_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( + 15129, "hatch.energymulti64.tier.04", "EV 64A Energy Hatch", 4, 64) + .getStackForm(1L)); eM_energyMulti4_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( 15100, "hatch.energymulti04.tier.05", "IV 4A Energy Hatch", 5, 4) @@ -474,6 +483,15 @@ public class MachineLoader implements Runnable { // =================================================================================================== // Multi AMP Power OUTPUTS // =================================================================================================== + eM_dynamoMulti4_EV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( + 15209, "hatch.dynamomulti04.tier.04", "EV 4A Dynamo Hatch", 4, 4) + .getStackForm(1L)); + eM_dynamoMulti16_EV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( + 15219, "hatch.dynamomulti16.tier.04", "EV 16A Dynamo Hatch", 4, 16) + .getStackForm(1L)); + eM_dynamoMulti64_EV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( + 15229, "hatch.dynamomulti64.tier.04", "EV 64A Dynamo Hatch", 4, 64) + .getStackForm(1L)); eM_dynamoMulti4_IV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( 15200, "hatch.dynamomulti04.tier.05", "IV 4A Dynamo Hatch", 5, 4) diff --git a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java index d75cbadea3..bce4017805 100644 --- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java +++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java @@ -71,6 +71,9 @@ public enum CustomItemList implements IItemContainer { holder_Hatch, capacitor_Hatch, + eM_dynamoMulti4_EV, + eM_dynamoMulti16_EV, + eM_dynamoMulti64_EV, eM_dynamoMulti4_IV, eM_dynamoMulti16_IV, eM_dynamoMulti64_IV, @@ -163,6 +166,9 @@ public enum CustomItemList implements IItemContainer { eM_dynamoTunnel7_UXV, eM_dynamoTunnel9001, + eM_energyMulti4_EV, + eM_energyMulti16_EV, + eM_energyMulti64_EV, eM_energyMulti4_IV, eM_energyMulti16_IV, eM_energyMulti64_IV, -- cgit From 487176a819e860dd9727610c50cf5fced905aa16 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sun, 22 Jan 2023 16:38:23 +0100 Subject: SA --- .../dreamcraft/DreamCraftRecipeLoader.java | 36 +++++++++++----------- .../tectech/loader/thing/MachineLoader.java | 12 ++++---- 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index 64669f8655..7da6749a8a 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -500,9 +500,9 @@ public class DreamCraftRecipeLoader { // Dynamo Hatches EV-UMV GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - ItemList.Hatch_Dynamo_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2) + ItemList.Hatch_Dynamo_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2) }, Materials.Silver.getMolten(144), CustomItemList.eM_dynamoMulti4_EV.get(1), @@ -510,9 +510,9 @@ public class DreamCraftRecipeLoader { 480); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - CustomItemList.eM_dynamoMulti4_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Aluminium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4) + CustomItemList.eM_dynamoMulti4_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4) }, Materials.Electrum.getMolten(144), CustomItemList.eM_dynamoMulti16_EV.get(1), @@ -520,9 +520,9 @@ public class DreamCraftRecipeLoader { 480); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - CustomItemList.eM_dynamoMulti16_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Aluminium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6) + CustomItemList.eM_dynamoMulti16_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6) }, Materials.Tungsten.getMolten(144), CustomItemList.eM_dynamoMulti64_EV.get(1), @@ -796,9 +796,9 @@ public class DreamCraftRecipeLoader { // Energy Hatches EV-UIV GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - ItemList.Hatch_Energy_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2) + ItemList.Hatch_Energy_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2) }, Materials.Silver.getMolten(144), CustomItemList.eM_energyMulti4_EV.get(1), @@ -806,9 +806,9 @@ public class DreamCraftRecipeLoader { 480); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - CustomItemList.eM_energyMulti4_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Aluminium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4) + CustomItemList.eM_energyMulti4_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4) }, Materials.Electrum.getMolten(144), CustomItemList.eM_energyMulti16_EV.get(1), @@ -816,9 +816,9 @@ public class DreamCraftRecipeLoader { 480); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - CustomItemList.eM_energyMulti16_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Aluminium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6) + CustomItemList.eM_energyMulti16_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6) }, Materials.Tungsten.getMolten(144), CustomItemList.eM_energyMulti64_EV.get(1), diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java index 467b714a06..166616d76e 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java @@ -176,13 +176,13 @@ public class MachineLoader implements Runnable { // Multi AMP Power INPUTS // =================================================================================================== eM_energyMulti4_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15109, "hatch.energymulti04.tier.04", "EV 4A Energy Hatch", 4, 4) + 15109, "hatch.energymulti04.tier.04", "EV 4A Energy Hatch", 4, 4) .getStackForm(1L)); eM_energyMulti16_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15119, "hatch.energymulti16.tier.04", "EV 16A Energy Hatch", 4, 16) + 15119, "hatch.energymulti16.tier.04", "EV 16A Energy Hatch", 4, 16) .getStackForm(1L)); eM_energyMulti64_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( - 15129, "hatch.energymulti64.tier.04", "EV 64A Energy Hatch", 4, 64) + 15129, "hatch.energymulti64.tier.04", "EV 64A Energy Hatch", 4, 64) .getStackForm(1L)); eM_energyMulti4_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( @@ -484,13 +484,13 @@ public class MachineLoader implements Runnable { // Multi AMP Power OUTPUTS // =================================================================================================== eM_dynamoMulti4_EV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15209, "hatch.dynamomulti04.tier.04", "EV 4A Dynamo Hatch", 4, 4) + 15209, "hatch.dynamomulti04.tier.04", "EV 4A Dynamo Hatch", 4, 4) .getStackForm(1L)); eM_dynamoMulti16_EV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15219, "hatch.dynamomulti16.tier.04", "EV 16A Dynamo Hatch", 4, 16) + 15219, "hatch.dynamomulti16.tier.04", "EV 16A Dynamo Hatch", 4, 16) .getStackForm(1L)); eM_dynamoMulti64_EV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( - 15229, "hatch.dynamomulti64.tier.04", "EV 64A Dynamo Hatch", 4, 64) + 15229, "hatch.dynamomulti64.tier.04", "EV 64A Dynamo Hatch", 4, 64) .getStackForm(1L)); eM_dynamoMulti4_IV.set(new GT_MetaTileEntity_Hatch_DynamoMulti( -- cgit From 06a4656b29a2fad63d7fc4a960950c3d8527a1d1 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Sun, 22 Jan 2023 16:13:51 +0000 Subject: fix --- .../java/com/github/technus/tectech/loader/thing/MachineLoader.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java index 166616d76e..0bdc96b901 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java @@ -175,13 +175,13 @@ public class MachineLoader implements Runnable { // =================================================================================================== // Multi AMP Power INPUTS // =================================================================================================== - eM_energyMulti4_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( + eM_energyMulti4_EV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( 15109, "hatch.energymulti04.tier.04", "EV 4A Energy Hatch", 4, 4) .getStackForm(1L)); - eM_energyMulti16_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( + eM_energyMulti16_EV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( 15119, "hatch.energymulti16.tier.04", "EV 16A Energy Hatch", 4, 16) .getStackForm(1L)); - eM_energyMulti64_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( + eM_energyMulti64_EV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( 15129, "hatch.energymulti64.tier.04", "EV 64A Energy Hatch", 4, 64) .getStackForm(1L)); -- cgit