From 970d06a0c059a3fc6c2332f26233dc03281c6be0 Mon Sep 17 00:00:00 2001 From: Maxim Date: Sun, 26 Feb 2023 18:26:37 +0100 Subject: Implemented enhanced multiblock GUI (#555) * Implemented enhanced multiblock GUI * Rename method to fit super * Added getter to see if flotation cell is locked * Update dependencies.gradle --------- Co-authored-by: Martin Robertz --- .../base/GregtechMeta_MultiBlockBase.java | 43 ++++++++++++++-------- ...gtechMetaTileEntity_IndustrialAlloySmelter.java | 4 +- .../GregtechMetaTileEntity_IndustrialChisel.java | 4 +- ...regtechMetaTileEntity_IndustrialDehydrator.java | 4 +- .../GregtechMetaTileEntity_IndustrialMixer.java | 34 +++++++++-------- ...gtechMetaTileEntity_IndustrialMultiMachine.java | 4 +- .../GregtechMetaTileEntity_IndustrialWireMill.java | 24 ++++++------ .../advanced/GregtechMetaTileEntity_Adv_EBF.java | 26 ++++++------- .../GregtechMTE_ElementalDuplicator.java | 4 +- .../production/GregtechMTE_FrothFlotationCell.java | 5 +++ .../production/GregtechMetaTileEntityTreeFarm.java | 4 +- ...egtechMetaTileEntity_IndustrialFishingPond.java | 4 +- ...egtechMetaTileEntity_IndustrialRockBreaker.java | 4 +- .../GregtechMetaTileEntity_MassFabricator.java | 8 ++-- ...techMetaTileEntity_QuantumForceTransformer.java | 32 +++++++++------- .../algae/GregtechMTE_AlgaePondBase.java | 4 +- .../chemplant/GregtechMTE_ChemicalPlant.java | 4 +- ...egTechMetaTileEntity_MegaAlloyBlastSmelter.java | 19 ++++++---- 18 files changed, 131 insertions(+), 100 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index b557082d9a..d3b50f48fc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -92,7 +92,6 @@ public abstract class GregtechMeta_MultiBlockBase mControlCoreBus = new ArrayList<>(); /** @@ -110,10 +109,12 @@ public abstract class GregtechMeta_MultiBlockBase mToolStacks = new ConcurrentHashMap<>(); + @Override + protected boolean isVoidExcessButtonEnabled() { + return true; + } + + @Override + protected boolean isBatchModeButtonEnabled() { + return true; + } + protected void addNoPlayerInventoryUI(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setPos(3, 4).setSize(152, 159)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java index 839e324ce2..0710a2bb77 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java @@ -231,11 +231,11 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs) .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes) .enableConsumption().enableOutputCalculation().setEUtModifier(aEUPercent / 100.0f); - if (!mVoidExcess) { + if (!voidExcess) { helper.enableVoidProtection(this); } - if (mUseMultiparallelMode) { + if (batchMode) { helper.enableBatchMode(128); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java index a56df28c74..97646cbd1b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java @@ -251,11 +251,11 @@ public class GregtechMetaTileEntity_IndustrialChisel GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs) .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes) .enableConsumption().enableOutputCalculation().setEUtModifier(aEUPercent / 100.0f); - if (!mVoidExcess) { + if (!voidExcess) { helper.enableVoidProtection(this); } - if (mUseMultiparallelMode) { + if (batchMode) { helper.enableBatchMode(128); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java index b933c7c122..259a92e108 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java @@ -203,11 +203,11 @@ public class GregtechMetaTileEntity_IndustrialDehydrator extends GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs) .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes) .enableConsumption().enableOutputCalculation().setEUtModifier(aEUPercent / 100.0f); - if (!mVoidExcess) { + if (!voidExcess) { helper.enableVoidProtection(this); } - if (mUseMultiparallelMode) { + if (batchMode) { helper.enableBatchMode(128); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java index b31ba8c0cb..a268027067 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java @@ -40,34 +40,31 @@ public class GregtechMetaTileEntity_IndustrialMixer public static String mCasingName = "Multi-Use Casing"; public static String mCasingName2 = "Titanium Turbine Casing"; private int mCasing; - private boolean isBussesSeparate = true; private static IStructureDefinition STRUCTURE_DEFINITION = null; public GregtechMetaTileEntity_IndustrialMixer(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 2); + inputSeparation = true; } public GregtechMetaTileEntity_IndustrialMixer(final String aName) { super(aName); CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 2); - } - - @Override - public void saveNBTData(NBTTagCompound aNBT) { - super.saveNBTData(aNBT); - aNBT.setBoolean("isBussesSeparate", isBussesSeparate); + inputSeparation = true; } @Override public void loadNBTData(final NBTTagCompound aNBT) { super.loadNBTData(aNBT); - if (aNBT.hasKey("isBussesSeparate")) { - isBussesSeparate = aNBT.getBoolean("isBussesSeparate"); - } - // Fallback for existing mixers - else { - isBussesSeparate = true; + if (!aNBT.hasKey(INPUT_SEPARATION_NBT_KEY)) { + if (aNBT.hasKey("isBussesSeparate")) { + inputSeparation = aNBT.getBoolean("isBussesSeparate"); + } + // Fallback for existing mixers + else { + inputSeparation = true; + } } } @@ -159,7 +156,7 @@ public class GregtechMetaTileEntity_IndustrialMixer @Override public boolean checkRecipe(final ItemStack aStack) { - if (isBussesSeparate) { + if (inputSeparation) { for (GT_MetaTileEntity_Hatch_InputBus tBus : mInputBusses) { ArrayList rList = new ArrayList<>(); for (int i = tBus.getBaseMetaTileEntity().getSizeInventory() - 1; i >= 0; i--) { @@ -223,10 +220,10 @@ public class GregtechMetaTileEntity_IndustrialMixer @Override public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { - isBussesSeparate = !isBussesSeparate; + inputSeparation = !inputSeparation; GT_Utility.sendChatToPlayer( aPlayer, - StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + isBussesSeparate); + StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation); } @Override @@ -238,4 +235,9 @@ public class GregtechMetaTileEntity_IndustrialMixer public boolean explodesOnComponentBreak(final ItemStack aStack) { return false; } + + @Override + protected boolean isInputSeparationButtonEnabled() { + return true; + } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java index 88034f2b71..6a5d4480e4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java @@ -348,11 +348,11 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs) .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes) .enableConsumption().enableOutputCalculation().setEUtModifier(aEUPercent / 100.0f); - if (!mVoidExcess) { + if (!voidExcess) { helper.enableVoidProtection(this); } - if (mUseMultiparallelMode) { + if (batchMode) { helper.enableBatchMode(128); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java index 8d40344124..da2193e47a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java @@ -40,14 +40,15 @@ public class GregtechMetaTileEntity_IndustrialWireMill extends private int mCasing; private static IStructureDefinition STRUCTURE_DEFINITION = null; - private boolean isBussesSeparate = true; public GregtechMetaTileEntity_IndustrialWireMill(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); + inputSeparation = true; } public GregtechMetaTileEntity_IndustrialWireMill(final String aName) { super(aName); + inputSeparation = true; } @Override @@ -144,7 +145,7 @@ public class GregtechMetaTileEntity_IndustrialWireMill extends @Override public boolean checkRecipeGeneric(int aMaxParallelRecipes, long aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll) { - if (!isBussesSeparate) + if (!inputSeparation) return super.checkRecipeGeneric(aMaxParallelRecipes, aEUPercent, aSpeedBonusPercent, aOutputChanceRoll); List buffer = new ArrayList<>(16); FluidStack[] tFluidInputs = getStoredFluids().toArray(new FluidStack[0]); @@ -169,23 +170,19 @@ public class GregtechMetaTileEntity_IndustrialWireMill extends @Override public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { - isBussesSeparate = !isBussesSeparate; + inputSeparation = !inputSeparation; aPlayer.addChatMessage( new ChatComponentTranslation( - isBussesSeparate ? "interaction.separateBusses.enabled" + inputSeparation ? "interaction.separateBusses.enabled" : "interaction.separateBusses.disabled")); } - @Override - public void saveNBTData(NBTTagCompound aNBT) { - aNBT.setBoolean("isBussesSeparate", isBussesSeparate); - super.saveNBTData(aNBT); - } - @Override public void loadNBTData(NBTTagCompound aNBT) { - isBussesSeparate = aNBT.getBoolean("isBussesSeparate"); super.loadNBTData(aNBT); + if (!aNBT.hasKey(INPUT_SEPARATION_NBT_KEY)) { + inputSeparation = aNBT.getBoolean("isBussesSeparate"); + } } @Override @@ -229,4 +226,9 @@ public class GregtechMetaTileEntity_IndustrialWireMill extends public byte getCasingTextureIndex() { return (byte) TAE.GTPP_INDEX(6); } + + @Override + protected boolean isInputSeparationButtonEnabled() { + return true; + } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java index 6b1eff341e..e4bec9f824 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java @@ -50,7 +50,6 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase< private final ArrayList mPyrotheumHatches = new ArrayList<>(); private HeatingCoilLevel mHeatingCapacity; - private boolean isBussesSeparate = false; public GregtechMetaTileEntity_Adv_EBF(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -205,7 +204,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase< @Override public boolean checkRecipe(ItemStack aStack) { - if (isBussesSeparate) { + if (inputSeparation) { FluidStack[] tFluids = getStoredFluids().toArray(new FluidStack[0]); for (GT_MetaTileEntity_Hatch_InputBus tBus : mInputBusses) { ArrayList tInputs = new ArrayList<>(); @@ -276,11 +275,11 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase< GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs) .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes) .enableConsumption().enableOutputCalculation().setEUtModifier(aEUPercent / 100.0f); - if (!mVoidExcess) { + if (!voidExcess) { helper.enableVoidProtection(this); } - if (mUseMultiparallelMode) { + if (batchMode) { helper.enableBatchMode(128); } @@ -345,23 +344,19 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase< @Override public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { - isBussesSeparate = !isBussesSeparate; + inputSeparation = !inputSeparation; aPlayer.addChatMessage( new ChatComponentTranslation( - isBussesSeparate ? "interaction.separateBusses.enabled" + inputSeparation ? "interaction.separateBusses.enabled" : "interaction.separateBusses.disabled")); } - @Override - public void saveNBTData(NBTTagCompound aNBT) { - aNBT.setBoolean("isBussesSeparate", isBussesSeparate); - super.saveNBTData(aNBT); - } - @Override public void loadNBTData(NBTTagCompound aNBT) { - isBussesSeparate = aNBT.getBoolean("isBussesSeparate"); super.loadNBTData(aNBT); + if (!aNBT.hasKey(INPUT_SEPARATION_NBT_KEY)) { + inputSeparation = aNBT.getBoolean("isBussesSeparate"); + } } public HeatingCoilLevel getCoilLevel() { @@ -371,4 +366,9 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase< public void setCoilLevel(HeatingCoilLevel aCoilLevel) { mHeatingCapacity = aCoilLevel; } + + @Override + protected boolean isInputSeparationButtonEnabled() { + return true; + } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java index c9704c4d5d..516230ae6b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java @@ -322,11 +322,11 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs) .setFluidInputs(aFluidInputs).setAvailableEUt(tVoltage).setMaxParallel(aMaxParallelRecipes) .enableConsumption().enableOutputCalculation().setEUtModifier(aEUPercent / 100.0f); - if (!mVoidExcess) { + if (!voidExcess) { helper.enableVoidProtection(this); } - if (mUseMultiparallelMode) { + if (batchMode) { helper.enableBatchMode(128); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java index f5d85aa485..b86c677db4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java @@ -286,4 +286,9 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase< public String[] getExtraInfoData() { return new String[] { "Locked material: " + lockedMaterialName }; } + + @Override + protected boolean isRecipeLockingEnabled() { + return lockedMaterialName != null && !lockedMaterialName.equals(""); + } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java index d369f243b2..7ab091fd74 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java @@ -180,11 +180,11 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< GT_Recipe tRecipe = new GT_Recipe(null, toOutput, null, null, null, null, 0, 0, 0); GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setAvailableEUt(tVoltage); - if (!mVoidExcess) { + if (!voidExcess) { helper.enableVoidProtection(this); } - if (mUseMultiparallelMode) { + if (batchMode) { helper.enableBatchMode(128); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java index d055e3e446..5ab08331f8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java @@ -487,11 +487,11 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(g).setItemInputs(aItemInputs) .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes) .enableConsumption().enableOutputCalculation().setEUtModifier(aEUPercent / 100.0f); - if (!mVoidExcess) { + if (!voidExcess) { helper.enableVoidProtection(this); } - if (mUseMultiparallelMode) { + if (batchMode) { helper.enableBatchMode(128); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java index 4a2f8f70aa..8d4bef3922 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java @@ -306,11 +306,11 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs) .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes) .enableConsumption().enableOutputCalculation().setEUtModifier(aEUPercent / 100.0f); - if (!mVoidExcess) { + if (!voidExcess) { helper.enableVoidProtection(this); } - if (mUseMultiparallelMode) { + if (batchMode) { helper.enableBatchMode(128); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java index 25bcf3d65c..a06c85f096 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java @@ -285,11 +285,11 @@ public class GregtechMetaTileEntity_MassFabricator GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs) .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes) .enableConsumption().enableOutputCalculation(); - if (!mVoidExcess) { + if (!voidExcess) { helper.enableVoidProtection(this); } - if (mUseMultiparallelMode) { + if (batchMode) { helper.enableBatchMode(128); } @@ -347,11 +347,11 @@ public class GregtechMetaTileEntity_MassFabricator GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs) .setFluidInputs(aFluidInputs).setAvailableEUt(tEnergy).setMaxParallel(aMaxParallelRecipes) .enableConsumption().enableOutputCalculation().setEUtModifier(aEUPercent / 100.0f); - if (!mVoidExcess) { + if (!voidExcess) { helper.enableVoidProtection(this); } - if (mUseMultiparallelMode) { + if (batchMode) { helper.enableBatchMode(128); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java index 7f03d4dfcb..af9d3d5c22 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java @@ -59,8 +59,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer private int mCasing; protected int mCraftingTier = 0; protected int mFocusingTier = 0; - private boolean mSeparateInputBusses = false; - private boolean mFluidMode = false, doFermium = false, doNeptunium = false, mBatchMode; + private boolean mFluidMode = false, doFermium = false, doNeptunium = false; private static final Fluid mNeptunium = ELEMENT.getInstance().NEPTUNIUM.getPlasma(); private static final Fluid mFermium = ELEMENT.getInstance().FERMIUM.getPlasma(); private static final String MAIN_PIECE = "main"; @@ -421,7 +420,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer doFermium = false; doNeptunium = false; FluidStack[] tFluidList = getStoredFluids().toArray(new FluidStack[0]); - if (mSeparateInputBusses) { + if (inputSeparation) { ArrayList tInputList = new ArrayList<>(); for (GT_MetaTileEntity_Hatch_InputBus tBus : mInputBusses) { for (int i = tBus.getSizeInventory() - 1; i >= 0; i--) { @@ -491,7 +490,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer .setFluidInputs(aFluidInputs).setAvailableEUt(getMaxInputAmps() * getAverageInputVoltage()) .setMaxParallel(mCurrentMaxParallel).enableConsumption(); - if (mBatchMode) { + if (batchMode) { helper.enableBatchMode(128); } @@ -725,18 +724,18 @@ public class GregtechMetaTileEntity_QuantumForceTransformer public boolean onWireCutterRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (aPlayer.isSneaking()) { - mBatchMode = !mBatchMode; - if (mBatchMode) { + batchMode = !batchMode; + if (batchMode) { GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOn")); } else { GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOff")); } return true; } - mSeparateInputBusses = !mSeparateInputBusses; + inputSeparation = !inputSeparation; GT_Utility.sendChatToPlayer( aPlayer, - StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + mSeparateInputBusses); + StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation); return true; } @@ -784,22 +783,24 @@ public class GregtechMetaTileEntity_QuantumForceTransformer @Override public void saveNBTData(NBTTagCompound aNBT) { - aNBT.setBoolean("mSeparateInputBusses", mSeparateInputBusses); aNBT.setBoolean("mFluidMode", mFluidMode); aNBT.setBoolean("doFermium", doFermium); aNBT.setBoolean("doNeptunium", doNeptunium); - aNBT.setBoolean("mBatchMode", mBatchMode); super.saveNBTData(aNBT); } @Override public void loadNBTData(NBTTagCompound aNBT) { - mSeparateInputBusses = aNBT.getBoolean("mSeparateInputBusses"); + super.loadNBTData(aNBT); + if (!aNBT.hasKey(INPUT_SEPARATION_NBT_KEY)) { + inputSeparation = aNBT.getBoolean("mSeparateInputBusses"); + } + if (!aNBT.hasKey(BATCH_MODE_NBT_KEY)) { + batchMode = aNBT.getBoolean("mBatchMode"); + } mFluidMode = aNBT.getBoolean("mFluidMode"); doFermium = aNBT.getBoolean("doFermium"); doNeptunium = aNBT.getBoolean("doNeptunium"); - mBatchMode = aNBT.getBoolean("mBatchMode"); - super.loadNBTData(aNBT); } @Override @@ -952,4 +953,9 @@ public class GregtechMetaTileEntity_QuantumForceTransformer return false; //spotless:on } + + @Override + protected boolean isInputSeparationButtonEnabled() { + return true; + } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java index f8d9ca8963..b389f71da8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java @@ -343,11 +343,11 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase tInputList = new ArrayList<>(); for (GT_MetaTileEntity_Hatch_InputBus tHatch : mInputBusses) { IGregTechTileEntity tInputBus = tHatch.getBaseMetaTileEntity(); @@ -415,10 +414,10 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter // Lock to single recipe super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ); } else { - separateBusses = !separateBusses; + inputSeparation = !inputSeparation; GT_Utility.sendChatToPlayer( aPlayer, - StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + separateBusses); + StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation); } } @@ -434,15 +433,21 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter @Override public void loadNBTData(NBTTagCompound aNBT) { - this.glassTier = aNBT.getByte("glassTier"); - this.separateBusses = aNBT.getBoolean("separateBusses"); super.loadNBTData(aNBT); + this.glassTier = aNBT.getByte("glassTier"); + if (!aNBT.hasKey(INPUT_SEPARATION_NBT_KEY)) { + inputSeparation = aNBT.getBoolean("separateBusses"); + } } @Override public void saveNBTData(NBTTagCompound aNBT) { aNBT.setByte("glassTier", glassTier); - aNBT.setBoolean("separateBusses", separateBusses); super.saveNBTData(aNBT); } + + @Override + protected boolean isInputSeparationButtonEnabled() { + return true; + } } -- cgit