Anvilcraft/GregTech4
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small fixes

Browse source 
Fixed Fusion reactor recipe logic & display names for digital chest
This commit is contained in:
TheDarkDnKTv 2021-03-27 11:29:48 +02:00
parent 75294bb35f
commit 1f00832ceb
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/gregtechmod/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
View file

@ -580,15 +580,16 @@ public class GT_MetaTileEntity_FusionComputer extends MetaTileEntity implements
GT_MetaTileEntity_FusionComputer machine = (GT_MetaTileEntity_FusionComputer)getMachine(); GT_MetaTileEntity_FusionComputer machine = (GT_MetaTileEntity_FusionComputer)getMachine();
overclockersCount = base.getOverclockerUpgradeCount(); 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 (progressTime == 0) {
if (machine.hasInventoryBeenModified() || base.hasWorkJustBeenEnabled() || success || base.getTimer() % 600 == 0 || wasNoEnergy) { if (machine.hasInventoryBeenModified() || base.hasWorkJustBeenEnabled() || success || base.getTimer() % 600 == 0 || wasNoEnergy) {
if (machine.getStoredEU() >= machine.getMinimumStoredEU() - 100) { if (machine.getStoredEU() >= machine.getMinimumStoredEU() - 100) {
@ -603,7 +604,7 @@ public class GT_MetaTileEntity_FusionComputer extends MetaTileEntity implements
previousRecipe = null; previousRecipe = null;
} }
} }
} } else if (success) stop();
return success; return success;
} }
@ -672,6 +673,7 @@ public class GT_MetaTileEntity_FusionComputer extends MetaTileEntity implements
super.stop(); super.stop();
getMachine().getBaseMetaTileEntity().disableWorking(); getMachine().getBaseMetaTileEntity().disableWorking();
triggerMachine(false); triggerMachine(false);
previousRecipe = null;
firstStart = true; firstStart = true;
} }

4
src/main/java/gregtechmod/common/tileentities/storage/GT_MetaTileEntity_DigitalChest.java
View file

@ -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 { } else {
if(isDigitalChest && GT_OreDictUnificator.isItemStackInstanceOf(tPlayerItem, "craftingQuantumChestUpgrade")) { if(isDigitalChest && GT_OreDictUnificator.isItemStackInstanceOf(tPlayerItem, "craftingQuantumChestUpgrade")) {
@ -134,7 +134,7 @@ public class GT_MetaTileEntity_DigitalChest extends MetaTileEntity {
} }
} else { } 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()));
} }
} }