From 152a1e1f63851929e6efddd2098fdc775b8ff64f Mon Sep 17 00:00:00 2001 From: Tom Dickson Date: Wed, 24 Nov 2021 18:35:28 -0600 Subject: fix /GTNewHorizons/GT-New-Horizons-Modpack#6308 --- .../nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java | 7 ------- .../multi/production/chemplant/GregtechMTE_ChemicalPlant.java | 3 ++- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java index d1ce55d3f2..b1bad97f0b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java @@ -40,13 +40,6 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE mAllowDuplicateUsageTypes = aAllowDuplicateTypes; } - public GT_MetaTileEntity_Hatch_NbtConsumable(String aName, int aTier, int aInputSlots, String[] aDescription, boolean aAllowDuplicateTypes, ITexture[][][] aTextures) { - super(aName, aTier, aInputSlots*2, aDescription[0], aTextures); - mInputslotCount = getInputSlotCount(); - mTotalSlotCount = getInputSlotCount()*2; - mAllowDuplicateUsageTypes = aAllowDuplicateTypes; - } - @Override public abstract ITexture[] getTexturesActive(ITexture aBaseTexture); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java index 4a2747a3db..65470e0981 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java @@ -766,6 +766,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { this.mOutputItems = tOutputItems; this.mOutputFluids = tOutputFluids; updateSlots(); + for (GT_MetaTileEntity_Hatch_Catalysts h : mCatalystBuses) h.updateSlots(); // Play sounds (GT++ addition - GT multiblocks play no sounds) startProcess(); @@ -960,7 +961,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { if (damage >= getMaxCatalystDurability()) { log("consume catalyst"); addOutput(CI.getEmptyCatalyst(1)); - aStack = null; + aStack.stackSize -= 1; } else { log("damaging catalyst"); -- cgit From 93067011c8289efbff8b9a223021b4e3107235f8 Mon Sep 17 00:00:00 2001 From: Tom Dickson Date: Wed, 24 Nov 2021 20:16:05 -0600 Subject: actually load in a new catalyst if available --- .../nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java index b1bad97f0b..151b5a1735 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java @@ -120,7 +120,8 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE if (i <= getSlotID_LastInput()) { fillStacksIntoFirstSlots(); } - } + } + tryFillUsageSlots(); } // Only moves items in the first four slots -- cgit From af441c7a5f5ceab909c00dd794b7ce25d8925c49 Mon Sep 17 00:00:00 2001 From: Tom Dickson Date: Thu, 25 Nov 2021 06:30:32 -0600 Subject: correct style --- .../multi/production/chemplant/GregtechMTE_ChemicalPlant.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java index 65470e0981..8d778d4e67 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java @@ -766,7 +766,9 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { this.mOutputItems = tOutputItems; this.mOutputFluids = tOutputFluids; updateSlots(); - for (GT_MetaTileEntity_Hatch_Catalysts h : mCatalystBuses) h.updateSlots(); + for (GT_MetaTileEntity_Hatch_Catalysts h : mCatalystBuses) { + h.updateSlots(); + } // Play sounds (GT++ addition - GT multiblocks play no sounds) startProcess(); -- cgit From 2b42cb27f84b23a38c154469575c108da29307b4 Mon Sep 17 00:00:00 2001 From: Tom Dickson Date: Thu, 25 Nov 2021 06:44:21 -0600 Subject: readd constructor --- .../nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java index 151b5a1735..7c857ac0bf 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java @@ -40,6 +40,13 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE mAllowDuplicateUsageTypes = aAllowDuplicateTypes; } + public GT_MetaTileEntity_Hatch_NbtConsumable(String aName, int aTier, int aInputSlots, String[] aDescription, boolean aAllowDuplicateTypes, ITexture[][][] aTextures) { + super(aName, aTier, aInputSlots*2, aDescription, aTextures); + mInputslotCount = getInputSlotCount(); + mTotalSlotCount = getInputSlotCount()*2; + mAllowDuplicateUsageTypes = aAllowDuplicateTypes; + } + @Override public abstract ITexture[] getTexturesActive(ITexture aBaseTexture); -- cgit From 0cf66de644598ef44ec662a46eeacb1dffbfd7a8 Mon Sep 17 00:00:00 2001 From: bombcar Date: Fri, 26 Nov 2021 08:32:53 -0600 Subject: turn tryfill public --- .../nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java | 3 +-- .../machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java index 7c857ac0bf..56dff1b1e3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java @@ -128,7 +128,6 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE fillStacksIntoFirstSlots(); } } - tryFillUsageSlots(); } // Only moves items in the first four slots @@ -142,7 +141,7 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE } } - private final void tryFillUsageSlots() { + public final void tryFillUsageSlots() { int aSlotSpace = (mInputslotCount - getContentUsageSlots().size()); if (aSlotSpace > 0) { Logger.INFO("We have empty usage slots. "+aSlotSpace); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java index 8d778d4e67..8c0af73282 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java @@ -768,6 +768,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { updateSlots(); for (GT_MetaTileEntity_Hatch_Catalysts h : mCatalystBuses) { h.updateSlots(); + h.tryFillUsageSlots(); } // Play sounds (GT++ addition - GT multiblocks play no sounds) -- cgit From f19ff7aa5c13c6e4d4e26e5d3f825f30d80c8f9d Mon Sep 17 00:00:00 2001 From: bombcar Date: Fri, 26 Nov 2021 08:57:46 -0600 Subject: Revert "turn tryfill public" This reverts commit 0cf66de644598ef44ec662a46eeacb1dffbfd7a8. --- .../nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java | 3 ++- .../machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java index 56dff1b1e3..7c857ac0bf 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java @@ -128,6 +128,7 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE fillStacksIntoFirstSlots(); } } + tryFillUsageSlots(); } // Only moves items in the first four slots @@ -141,7 +142,7 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE } } - public final void tryFillUsageSlots() { + private final void tryFillUsageSlots() { int aSlotSpace = (mInputslotCount - getContentUsageSlots().size()); if (aSlotSpace > 0) { Logger.INFO("We have empty usage slots. "+aSlotSpace); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java index 8c0af73282..8d778d4e67 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java @@ -768,7 +768,6 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { updateSlots(); for (GT_MetaTileEntity_Hatch_Catalysts h : mCatalystBuses) { h.updateSlots(); - h.tryFillUsageSlots(); } // Play sounds (GT++ addition - GT multiblocks play no sounds) -- cgit From 8744c2c9664d157bb80895ca6d2956931401f1e2 Mon Sep 17 00:00:00 2001 From: bombcar Date: Fri, 26 Nov 2021 09:00:23 -0600 Subject: Revert "Revert "turn tryfill public"" This reverts commit f19ff7aa5c13c6e4d4e26e5d3f825f30d80c8f9d. --- .../nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java | 3 +-- .../machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java index 7c857ac0bf..56dff1b1e3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java @@ -128,7 +128,6 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE fillStacksIntoFirstSlots(); } } - tryFillUsageSlots(); } // Only moves items in the first four slots @@ -142,7 +141,7 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE } } - private final void tryFillUsageSlots() { + public final void tryFillUsageSlots() { int aSlotSpace = (mInputslotCount - getContentUsageSlots().size()); if (aSlotSpace > 0) { Logger.INFO("We have empty usage slots. "+aSlotSpace); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java index 8d778d4e67..8c0af73282 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java @@ -768,6 +768,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { updateSlots(); for (GT_MetaTileEntity_Hatch_Catalysts h : mCatalystBuses) { h.updateSlots(); + h.tryFillUsageSlots(); } // Play sounds (GT++ addition - GT multiblocks play no sounds) -- cgit