From 1f00832ceb680a7440b2d939d950a594b80be690 Mon Sep 17 00:00:00 2001 From: TheDarkDnKTv Date: Sat, 27 Mar 2021 11:29:48 +0200 Subject: [PATCH] Small fixes Fixed Fusion reactor recipe logic & display names for digital chest --- .../GT_MetaTileEntity_FusionComputer.java | 20 ++++++++++--------- .../GT_MetaTileEntity_DigitalChest.java | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/java/gregtechmod/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/src/main/java/gregtechmod/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java index 63ce50c..9fa5340 100644 --- a/src/main/java/gregtechmod/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java +++ b/src/main/java/gregtechmod/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java @@ -580,15 +580,16 @@ public class GT_MetaTileEntity_FusionComputer extends MetaTileEntity implements GT_MetaTileEntity_FusionComputer machine = (GT_MetaTileEntity_FusionComputer)getMachine(); overclockersCount = base.getOverclockerUpgradeCount(); - if (base.isAllowedToWork()) { - if (progressTime > 0) { - int tmp = progressTime; - success = updateRecipeProgress(); - if (tmp == 0 && !success) { - throw new IllegalStateException(); - } + + if (progressTime > 0) { + int tmp = progressTime; + success = updateRecipeProgress(); + if (tmp == 0 && !success) { + throw new IllegalStateException(); } + } + if (base.isAllowedToWork()) { if (progressTime == 0) { if (machine.hasInventoryBeenModified() || base.hasWorkJustBeenEnabled() || success || base.getTimer() % 600 == 0 || wasNoEnergy) { if (machine.getStoredEU() >= machine.getMinimumStoredEU() - 100) { @@ -603,8 +604,8 @@ public class GT_MetaTileEntity_FusionComputer extends MetaTileEntity implements previousRecipe = null; } } - } - + } else if (success) stop(); + return success; } @@ -672,6 +673,7 @@ public class GT_MetaTileEntity_FusionComputer extends MetaTileEntity implements super.stop(); getMachine().getBaseMetaTileEntity().disableWorking(); triggerMachine(false); + previousRecipe = null; firstStart = true; } diff --git a/src/main/java/gregtechmod/common/tileentities/storage/GT_MetaTileEntity_DigitalChest.java b/src/main/java/gregtechmod/common/tileentities/storage/GT_MetaTileEntity_DigitalChest.java index 030958d..fd164eb 100644 --- a/src/main/java/gregtechmod/common/tileentities/storage/GT_MetaTileEntity_DigitalChest.java +++ b/src/main/java/gregtechmod/common/tileentities/storage/GT_MetaTileEntity_DigitalChest.java @@ -101,7 +101,7 @@ public class GT_MetaTileEntity_DigitalChest extends MetaTileEntity { } } } - GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.GT_Barrel.count_msg", mInventory[0].stackSize, mInventory[0].getUnlocalizedName() + ".name")); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.GT_Barrel.count_msg", mInventory[0].stackSize, mInventory[0].getDisplayName())); } } else { if(isDigitalChest && GT_OreDictUnificator.isItemStackInstanceOf(tPlayerItem, "craftingQuantumChestUpgrade")) { @@ -134,7 +134,7 @@ public class GT_MetaTileEntity_DigitalChest extends MetaTileEntity { } } else { - GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.GT_Barrel.count_msg", mInventory[0].stackSize, mInventory[0].getUnlocalizedName() + ".name")); + GT_Utility.sendChatToPlayer(aPlayer, new ChatComponentTranslation("metatileentity.GT_Barrel.count_msg", mInventory[0].stackSize, mInventory[0].getDisplayName())); } }