diff options
| author | chochem <40274384+chochem@users.noreply.github.com> | 2023-12-21 17:41:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-21 18:41:25 +0100 |
| commit | 61e647085358777df718d36a927009774506637c (patch) | |
| tree | cc2d41bb66369a5b7d0d82f128c35093ddcba535 /src | |
| parent | b0653f6fe838aa4207b5ecf083f5d80e8790d9ac (diff) | |
| download | GT5-Unofficial-61e647085358777df718d36a927009774506637c.tar.gz GT5-Unofficial-61e647085358777df718d36a927009774506637c.tar.bz2 GT5-Unofficial-61e647085358777df718d36a927009774506637c.zip | |
Fix superbus UHV recipes and localization (#812)
fix superbus UHV recipes and localization
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 26 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java | 6 |
2 files changed, 17 insertions, 15 deletions
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index c3e426a248..3d8a15a652 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -3008,24 +3008,26 @@ public class RECIPES_Machines { GregtechItemList.Hatch_SuperBus_Output_EV.get(1), }; // Input Buses - for (int i = 1; i < mSuperBusesInput.length; i++) { + for (int tier = 1; tier < mSuperBusesInput.length + 1; tier++) { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { CI.getNumberedCircuit(17), mInputHatch[i], CI.getElectricMotor(i, 2), - CI.getConveyor(i, 5), CI.getBolt(i, 16), CI.getTieredComponent(OrePrefixes.circuit, i, 2) }, - CI.getAlternativeTieredFluid(i, 144 * 8), - mSuperBusesInput[i - 1].get(1), + new ItemStack[] { CI.getNumberedCircuit(17), mInputHatch[tier - 1], CI.getElectricMotor(tier, 2), + CI.getConveyor(tier, 5), CI.getBolt(tier, 16), + CI.getTieredComponent(OrePrefixes.circuit, tier, 2) }, + CI.getAlternativeTieredFluid(tier, 144 * 8), + mSuperBusesInput[tier - 1].get(1), 20 * 30 * 2, - (int) GT_Values.V[i]); + (int) GT_Values.V[tier]); } // Output Buses - for (int i = 1; i < mSuperBusesOutput.length; i++) { + for (int tier = 1; tier < mSuperBusesOutput.length + 1; tier++) { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { CI.getNumberedCircuit(18), mOutputHatch[i], CI.getElectricPiston(i, 2), - CI.getConveyor(i, 5), CI.getGear(i, 3), CI.getTieredComponent(OrePrefixes.circuit, i, 2) }, - CI.getTertiaryTieredFluid(i, 144 * 8), - mSuperBusesOutput[i - 1].get(1), + new ItemStack[] { CI.getNumberedCircuit(18), mOutputHatch[tier - 1], CI.getElectricPiston(tier, 2), + CI.getConveyor(tier, 5), CI.getGear(tier, 3), + CI.getTieredComponent(OrePrefixes.circuit, tier, 2) }, + CI.getTertiaryTieredFluid(tier, 144 * 8), + mSuperBusesOutput[tier - 1].get(1), 20 * 30 * 2, - (int) GT_Values.V[i]); + (int) GT_Values.V[tier]); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java index 38dab07284..c20546fa28 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java @@ -154,7 +154,7 @@ public class GregtechCustomHatches { (new GT_MetaTileEntity_Hatch_Muffler_Adv( 30009, "hatch.muffler.adv.tier.09", - "Advanced Muffler Hatch (MAX)", + "Advanced Muffler Hatch (UHV)", 9)).getStackForm(1L)); } @@ -190,7 +190,7 @@ public class GregtechCustomHatches { ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.08", "Super Bus (I) (UV)", 8)) .getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_MAX.set( - ((IMetaTileEntity) makeInputBus(aStartID, "hatch.superbus.input.tier.09", "Super Bus (I) (MAX)", 9)) + ((IMetaTileEntity) makeInputBus(aStartID, "hatch.superbus.input.tier.09", "Super Bus (I) (UHV)", 9)) .getStackForm(1L)); /* @@ -222,7 +222,7 @@ public class GregtechCustomHatches { ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.08", "Super Bus (O) (UV)", 8)) .getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Output_MAX.set( - ((IMetaTileEntity) makeOutputBus(aStartID, "hatch.superbus.output.tier.09", "Super Bus (O) (MAX)", 9)) + ((IMetaTileEntity) makeOutputBus(aStartID, "hatch.superbus.output.tier.09", "Super Bus (O) (UHV)", 9)) .getStackForm(1L)); } |