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

Fixed fusion recipes

Browse source 
Closes #31
This commit is contained in:
TheDarkDnKTv 2020-08-19 16:22:34 +03:00
parent addec91f9c
commit 97e42b3392
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/gregtechmod/api/util/GT_Utility.java
View file

@ -651,7 +651,9 @@ public class GT_Utility {
if (aStack.getItem() instanceof IFluidContainerItem) {
return FluidStack.areFluidStackTagsEqual(aFluid, ((IFluidContainerItem)aStack.getItem()).getFluid(aStack = copyAmount(1, aStack)));
}
return FluidContainerRegistry.containsFluid(aStack, aFluid);
FluidStack tFluid = FluidContainerRegistry.getFluidForFilledItem(aStack);
return tFluid != null && tFluid.amount <= aFluid.amount && tFluid.isFluidEqual(aFluid);
}
public static FluidStack getFluidForFilledItem(ItemStack aStack) {

7
src/main/java/gregtechmod/common/GT_FluidRegistry.java
View file

@ -1,6 +1,9 @@
package gregtechmod.common;
import gregtechmod.api.enums.Materials;
import gregtechmod.api.enums.OrePrefixes;
import gregtechmod.api.util.GT_OreDictUnificator;
import java.util.ArrayList;
import net.minecraft.item.ItemStack;
@ -38,4 +41,8 @@ public class GT_FluidRegistry {
if (aFullContainer != null && aEmptyContainer != null) FluidContainerRegistry.registerFluidContainer(new FluidStack(tFluid, 1000), aFullContainer, aEmptyContainer);
}
public static void addFluid(String aName, String aLocalized, Materials aMaterial, OrePrefixes aPrefix, int aState, ItemStack aEmptyContainer) {
addFluid(aName, aLocalized, aMaterial, aState, GT_OreDictUnificator.get(aPrefix, aMaterial, 1), aEmptyContainer);
}
}

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

@ -38,7 +38,7 @@ public class GT_MetaTileEntity_FusionComputer extends MetaTileEntity {
@Override public boolean isValidSlot(int aIndex) {return false;}
@Override public boolean isFacingValid(byte aFacing) {return aFacing > 1;}
@Override public int getInvSize() {return 1;}
@Override public int maxEUStore() {return 160000000;}
@Override public int maxEUStore() {return mEnergyInjectors.size() * 10000000;}
@Override public int getEUVar() {return getStoredEU();}
@Override public void onRightclick(EntityPlayer aPlayer) {getBaseMetaTileEntity().openGUI(aPlayer, 143);}
@Override public boolean isAccessAllowed(EntityPlayer aPlayer) {return true;}