diff options
author | chochem <40274384+chochem@users.noreply.github.com> | 2023-12-09 16:15:14 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-09 17:15:14 +0100 |
commit | 1f1ce2d996095fc4e5b259c0c7f64874e2e4686e (patch) | |
tree | 8dbbb2bf8d6706cdb2cec96c5565c737e04547ca /src/main/java/gtPlusPlus/core | |
parent | c2b50ac86fd775ecd4375de8cc0ed35b73836866 (diff) | |
download | GT5-Unofficial-1f1ce2d996095fc4e5b259c0c7f64874e2e4686e.tar.gz GT5-Unofficial-1f1ce2d996095fc4e5b259c0c7f64874e2e4686e.tar.bz2 GT5-Unofficial-1f1ce2d996095fc4e5b259c0c7f64874e2e4686e.zip |
Fixes for overflow valve, wireless charger, and transmission components recipes and ids (#794)
* Fix all the tiers in recipes including for wireless charger and overflow valve
* fix transmission components
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
-rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 24 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/common/CI.java | 4 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index ae0f591e59..c3e426a248 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -753,14 +753,14 @@ public class RECIPES_Machines { GregtechItemList.Cover_Overflow_MV.get(1L), GregtechItemList.Cover_Overflow_HV.get(1L), GregtechItemList.Cover_Overflow_EV.get(1L), GregtechItemList.Cover_Overflow_IV.get(1L), }; - for (int i = 1; i < aOutputs.length; i++) { + for (int tier = 1; tier < aOutputs.length + 1; tier++) { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { CI.getNumberedBioCircuit(19), CI.getElectricPump(i, 2), CI.getElectricMotor(i, 2), - CI.getPlate(i, 4) }, - Materials.SolderingAlloy.getFluid(i * (144)), - aOutputs[i].copy(), + new ItemStack[] { CI.getNumberedBioCircuit(19), CI.getElectricPump(tier, 2), + CI.getElectricMotor(tier, 2), CI.getPlate(tier, 4) }, + Materials.SolderingAlloy.getFluid(tier * (144)), + aOutputs[tier - 1].copy(), 20 * 20, - MaterialUtils.getVoltageForTier(i)); + MaterialUtils.getVoltageForTier(tier)); } } @@ -2715,17 +2715,17 @@ public class RECIPES_Machines { GregtechItemList.Charger_LuV.get(1), GregtechItemList.Charger_ZPM.get(1), GregtechItemList.Charger_UV.get(1), GregtechItemList.Charger_UHV.get(1) }; - for (int tier = 1; tier < aChargers.length; tier++) { + for (int tier = 1; tier < aChargers.length + 1; tier++) { ItemStack[] aInputs = new ItemStack[] { CI.getTieredMachineHull(tier, 1), CI.getTransmissionComponent(tier, 2), CI.getFieldGenerator(tier, 1), - CI.getTieredComponent(OrePrefixes.plate, tier, 4), - CI.getTieredComponent(OrePrefixes.circuit, tier, 2), }; + CI.getTieredComponent(OrePrefixes.plate, tier + 1, 4), + CI.getTieredComponent(OrePrefixes.circuit, tier + 1, 2), }; CORE.RA.addSixSlotAssemblingRecipe( aInputs, - CI.getAlternativeTieredFluid(tier, (144 * 2 * tier)), // Input Fluid - aChargers[tier], - 45 * 10 * (tier), + CI.getAlternativeTieredFluid(tier, (144 * 2 * (tier + 1))), // Input Fluid + aChargers[tier - 1], + 45 * 10 * (tier + 1), MaterialUtils.getVoltageForTier(tier)); } } diff --git a/src/main/java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java index 5e19eaed59..54c7046e13 100644 --- a/src/main/java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java @@ -881,7 +881,7 @@ public class CI { public static ItemStack getFieldGenerator(int aTier, int aSize) { ItemStack aType; - int aLazyTier = 0; + int aLazyTier = 1; if (aTier == aLazyTier++) { aType = CI.fieldGenerator_LV; } else if (aTier == aLazyTier++) { @@ -963,7 +963,7 @@ public class CI { } public static ItemStack getTransmissionComponent(int aTier, int aAmount) { - GregtechItemList[] aTransParts = new GregtechItemList[] { GregtechItemList.TransmissionComponent_LV, + GregtechItemList[] aTransParts = new GregtechItemList[] { null, GregtechItemList.TransmissionComponent_LV, GregtechItemList.TransmissionComponent_MV, GregtechItemList.TransmissionComponent_HV, GregtechItemList.TransmissionComponent_EV, GregtechItemList.TransmissionComponent_IV, GregtechItemList.TransmissionComponent_LuV, GregtechItemList.TransmissionComponent_ZPM, |