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

Fixed UI progress bar glitch

Browse source 
Closes #22
This commit is contained in:
TheDarkDnKTv 2020-08-18 15:37:55 +03:00
parent 7b0661cc37
commit 635ede0d0d
5 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/gregtechmod/common/gui/GT_GUIContainer_AESU_Meta.java
View file

@ -32,7 +32,7 @@ public class GT_GUIContainer_AESU_Meta extends GT_GUIContainerMetaTile_Machine {
drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
if (mContainer != null) {
int tScale = mContainer.mEnergy/Math.max(1, mContainer.mStorage/97);
int tScale = (int) (97 * (mContainer.mEnergy * 1.0D / mContainer.mStorage));
drawTexturedModalRect(x + 8, y + 73, 0, 251, tScale, 5);
}
}

2
src/main/java/gregtechmod/common/gui/GT_GUIContainer_FusionComputer.java
View file

@ -25,7 +25,7 @@ public class GT_GUIContainer_FusionComputer extends GT_GUIContainerMetaTile_Mach
drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
if (mContainer != null) {
int tScale = mContainer.mEnergy/1088435;
int tScale = (int)(147 * (mContainer.mEnergy * 1.0D / mContainer.mStorage));
drawTexturedModalRect(x + 5, y + 156, 0, 251, tScale, 5);
}
}

2
src/main/java/gregtechmod/common/gui/GT_GUIContainer_IDSU_Meta.java
View file

@ -33,7 +33,7 @@ public class GT_GUIContainer_IDSU_Meta extends GT_GUIContainerMetaTile_Machine {
drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
if (mContainer != null) {
int tScale = mContainer.mEnergy/Math.max(1, mContainer.mStorage/116);
int tScale = (int)(116 * (mContainer.mEnergy * 1.0D / mContainer.mStorage));
drawTexturedModalRect(x + 8, y + 73, 0, 251, tScale, 5);
}
}

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

@ -154,7 +154,9 @@ public class GT_MetaTileEntity_FusionComputer extends MetaTileEntity {
private boolean checkRecipe() {
if (!mMachine) return false;
GT_Recipe tRecipe = GT_Recipe.findEqualRecipe(false, false, GT_Recipe.sFusionRecipes, getPrimaryInput(), getSecondaryInput());
ItemStack input1 = getPrimaryInput();
ItemStack input2 = getSecondaryInput();
GT_Recipe tRecipe = GT_Recipe.findEqualRecipe(false, false, GT_Recipe.sFusionRecipes, input1, input2);
if (tRecipe != null && consumeInput(tRecipe.mInputs[0], tRecipe.mInputs[1], getBaseMetaTileEntity().isActive()?0:tRecipe.mStartEU)) {
mMaxProgresstime = tRecipe.mDuration;
mEUt = tRecipe.mEUt;

7
src/main/java/gregtechmod/common/tileentities/machines/multi/GT_MetaTileEntity_FusionInjector.java
View file

@ -1,5 +1,6 @@
package gregtechmod.common.tileentities.machines.multi;
import gregtechmod.api.enums.GT_Items;
import gregtechmod.api.interfaces.IGregTechTileEntity;
import gregtechmod.api.metatileentity.MetaTileEntity;
import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
@ -46,13 +47,13 @@ public class GT_MetaTileEntity_FusionInjector extends GT_MetaTileEntity_BasicTan
}
public ItemStack getMaterial() {
if (mInventory[0] == null) {
ItemStack tStack = GT_Utility.fillFluidContainer(mFluid, GT_ModHandler.getEmptyCell(1));
if (mInventory[getInputSlot()] == null) {
ItemStack tStack = GT_Utility.fillFluidContainer(mFluid, GT_Items.Cell_Empty.get(1));
if (tStack == null) return null;
tStack.stackSize = mFluid.amount / GT_Utility.getFluidForFilledItem(tStack).amount;
return tStack;
}
return mInventory[0];
return mInventory[getInputSlot()];
}
public boolean consumeMaterial(ItemStack aStack) {