Fixed a bug where the LCM could have a mMaxProgressTime of zero.
This commit is contained in:
Johannes Gäßler
parent
e304e8f9de
commit
38bfbabd58
1 changed files with 196 additions and 195 deletions
|
|
@ -1,195 +1,196 @@
|
|||
package gregtech.common.tileentities.machines.multi;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
|
||||
import gregtech.api.GregTech_API;
|
||||
import gregtech.api.enums.Textures;
|
||||
import gregtech.api.interfaces.ITexture;
|
||||
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
|
||||
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
|
||||
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
|
||||
import gregtech.api.objects.GT_RenderedTexture;
|
||||
import gregtech.api.util.GT_Log;
|
||||
import gregtech.api.util.GT_Recipe;
|
||||
import gregtech.api.util.GT_Utility;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_MultiBlockBase {
|
||||
|
||||
private static final int CASING_INDEX = 62;
|
||||
|
||||
public GT_MetaTileEntity_LargeChemicalReactor(int aID, String aName, String aNameRegional) {
|
||||
super(aID, aName, aNameRegional);
|
||||
}
|
||||
|
||||
public GT_MetaTileEntity_LargeChemicalReactor(String aName) {
|
||||
super(aName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_LargeChemicalReactor(this.mName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] getDescription() {
|
||||
return new String[] {
|
||||
"Controller block for the Large Chemical Reactor",
|
||||
"Has the same recipes as the Chemical Reactor",
|
||||
"Does not lose efficiency when overclocked",
|
||||
"Accepts fluids instead of fluid cells",
|
||||
"Size(WxHxD): 3x3x3",
|
||||
"3x3x3 of Chemically Inert Machine Casings (hollow, min 24!)",
|
||||
"Controller (Front centered)",
|
||||
"1x Cupronickel Coil Block (Bottom centered)",
|
||||
"1x PTFE Pipe Machine Casing (inside the hollow casings)",
|
||||
"1x Input Bus/Hatch (Any inert casing)",
|
||||
"1x Output Bus/Hatch (Any inert casing)",
|
||||
"1x Maintenance Hatch (Any inert casing)",
|
||||
"1x Energy Hatch (Any inert casing)"};
|
||||
}
|
||||
|
||||
@Override
|
||||
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive,
|
||||
boolean aRedstone) {
|
||||
if (aSide == aFacing) {
|
||||
return new ITexture[] {
|
||||
Textures.BlockIcons.CASING_BLOCKS[CASING_INDEX],
|
||||
new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE
|
||||
: Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR) };
|
||||
}
|
||||
return new ITexture[] { Textures.BlockIcons.CASING_BLOCKS[CASING_INDEX] };
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isCorrectMachinePart(ItemStack aStack) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean checkRecipe(ItemStack aStack) {
|
||||
ArrayList<ItemStack> tInputList = getStoredInputs();
|
||||
int tInputList_sS = tInputList.size();
|
||||
for (int i = 0; i < tInputList_sS - 1; i++) {
|
||||
for (int j = i + 1; j < tInputList_sS; j++) {
|
||||
if (GT_Utility.areStacksEqual((ItemStack) tInputList.get(i), (ItemStack) tInputList.get(j))) {
|
||||
if (((ItemStack) tInputList.get(i)).stackSize >= ((ItemStack) tInputList.get(j)).stackSize) {
|
||||
tInputList.remove(j--);
|
||||
tInputList_sS = tInputList.size();
|
||||
} else {
|
||||
tInputList.remove(i--);
|
||||
tInputList_sS = tInputList.size();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
ItemStack[] inputs = tInputList.toArray(new ItemStack[tInputList.size()]);
|
||||
|
||||
ArrayList<FluidStack> tFluidList = getStoredFluids();
|
||||
int tFluidList_sS = tFluidList.size();
|
||||
for (int i = 0; i < tFluidList_sS - 1; i++) {
|
||||
for (int j = i + 1; j < tFluidList_sS; j++) {
|
||||
if (GT_Utility.areFluidsEqual(tFluidList.get(i), tFluidList.get(j))) {
|
||||
if (tFluidList.get(i).amount >= tFluidList.get(j).amount) {
|
||||
tFluidList.remove(j--);
|
||||
tFluidList_sS = tFluidList.size();
|
||||
} else {
|
||||
tFluidList.remove(i--);
|
||||
tFluidList_sS = tFluidList.size();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
FluidStack[] fluids = tFluidList.toArray(new FluidStack[tFluidList.size()]);
|
||||
|
||||
if (inputs.length > 0 || fluids.length > 0) {
|
||||
long voltage = getMaxInputVoltage();
|
||||
byte tier = (byte) Math.max(1, GT_Utility.getTier(voltage));
|
||||
GT_Recipe recipe = GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.findRecipe(getBaseMetaTileEntity(), false,
|
||||
gregtech.api.enums.GT_Values.V[tier], fluids, inputs);
|
||||
if (recipe != null && recipe.isRecipeInputEqual(true, fluids, inputs)) {
|
||||
this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
|
||||
this.mEfficiencyIncrease = 10000;
|
||||
|
||||
int EUt = recipe.mEUt;
|
||||
int maxProgresstime = recipe.mDuration;
|
||||
|
||||
while (EUt <= gregtech.api.enums.GT_Values.V[tier - 1] && maxProgresstime > 1) {
|
||||
EUt *= 4;
|
||||
maxProgresstime /= 4;
|
||||
}
|
||||
|
||||
this.mEUt = -EUt;
|
||||
this.mMaxProgresstime = maxProgresstime;
|
||||
this.mOutputItems = recipe.mOutputs;
|
||||
this.mOutputFluids = recipe.mFluidOutputs;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
|
||||
int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
|
||||
int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
|
||||
int casingAmount = 0;
|
||||
// x=width, z=depth, y=height
|
||||
for (int x = -1 + xDir; x <= xDir + 1; x++) {
|
||||
for (int z = -1 + zDir; z <= zDir + 1; z++) {
|
||||
for (int y = -1; y <= 1; y++) {
|
||||
IGregTechTileEntity tileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(x, y, z);
|
||||
Block block = aBaseMetaTileEntity.getBlockOffset(x, y, z);
|
||||
if (x == xDir && z == zDir && y <= 0) {
|
||||
if ((y == -1)
|
||||
&& (block != GregTech_API.sBlockCasings5 || aBaseMetaTileEntity.getMetaIDOffset(x, y, z) != 0)) {
|
||||
return false;
|
||||
} else if (y == 0 && (block != GregTech_API.sBlockCasings4 || aBaseMetaTileEntity.getMetaIDOffset(x, y, z) != 15)) {
|
||||
return false;
|
||||
}
|
||||
} else if (x != 0 || y != 0 || z != 0) {
|
||||
if (!addInputToMachineList(tileEntity, CASING_INDEX) && !addOutputToMachineList(tileEntity, CASING_INDEX)
|
||||
&& !addMaintenanceToMachineList(tileEntity, CASING_INDEX)
|
||||
&& !addEnergyInputToMachineList(tileEntity, CASING_INDEX)) {
|
||||
if (block == GregTech_API.sBlockCasings4 && aBaseMetaTileEntity.getMetaIDOffset(x, y, z) == 14) {
|
||||
casingAmount++;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
return casingAmount >= 8;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxEfficiency(ItemStack aStack) {
|
||||
return 10000;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPollutionPerTick(ItemStack aStack) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getDamageToComponent(ItemStack aStack) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean explodesOnComponentBreak(ItemStack aStack) {
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
package gregtech.common.tileentities.machines.multi;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
|
||||
import gregtech.api.GregTech_API;
|
||||
import gregtech.api.enums.Textures;
|
||||
import gregtech.api.interfaces.ITexture;
|
||||
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
|
||||
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
|
||||
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
|
||||
import gregtech.api.objects.GT_RenderedTexture;
|
||||
import gregtech.api.util.GT_Log;
|
||||
import gregtech.api.util.GT_Recipe;
|
||||
import gregtech.api.util.GT_Utility;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_MultiBlockBase {
|
||||
|
||||
private static final int CASING_INDEX = 62;
|
||||
|
||||
public GT_MetaTileEntity_LargeChemicalReactor(int aID, String aName, String aNameRegional) {
|
||||
super(aID, aName, aNameRegional);
|
||||
}
|
||||
|
||||
public GT_MetaTileEntity_LargeChemicalReactor(String aName) {
|
||||
super(aName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_LargeChemicalReactor(this.mName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] getDescription() {
|
||||
return new String[] {
|
||||
"Controller block for the Large Chemical Reactor",
|
||||
"Has the same recipes as the Chemical Reactor",
|
||||
"Does not lose efficiency when overclocked",
|
||||
"Accepts fluids instead of fluid cells",
|
||||
"Size(WxHxD): 3x3x3",
|
||||
"3x3x3 of Chemically Inert Machine Casings (hollow, min 24!)",
|
||||
"Controller (Front centered)",
|
||||
"1x Cupronickel Coil Block (Bottom centered)",
|
||||
"1x PTFE Pipe Machine Casing (inside the hollow casings)",
|
||||
"1x Input Bus/Hatch (Any inert casing)",
|
||||
"1x Output Bus/Hatch (Any inert casing)",
|
||||
"1x Maintenance Hatch (Any inert casing)",
|
||||
"1x Energy Hatch (Any inert casing)"};
|
||||
}
|
||||
|
||||
@Override
|
||||
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive,
|
||||
boolean aRedstone) {
|
||||
if (aSide == aFacing) {
|
||||
return new ITexture[] {
|
||||
Textures.BlockIcons.CASING_BLOCKS[CASING_INDEX],
|
||||
new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR_ACTIVE
|
||||
: Textures.BlockIcons.OVERLAY_FRONT_LARGE_CHEMICAL_REACTOR) };
|
||||
}
|
||||
return new ITexture[] { Textures.BlockIcons.CASING_BLOCKS[CASING_INDEX] };
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isCorrectMachinePart(ItemStack aStack) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean checkRecipe(ItemStack aStack) {
|
||||
ArrayList<ItemStack> tInputList = getStoredInputs();
|
||||
int tInputList_sS = tInputList.size();
|
||||
for (int i = 0; i < tInputList_sS - 1; i++) {
|
||||
for (int j = i + 1; j < tInputList_sS; j++) {
|
||||
if (GT_Utility.areStacksEqual((ItemStack) tInputList.get(i), (ItemStack) tInputList.get(j))) {
|
||||
if (((ItemStack) tInputList.get(i)).stackSize >= ((ItemStack) tInputList.get(j)).stackSize) {
|
||||
tInputList.remove(j--);
|
||||
tInputList_sS = tInputList.size();
|
||||
} else {
|
||||
tInputList.remove(i--);
|
||||
tInputList_sS = tInputList.size();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
ItemStack[] inputs = tInputList.toArray(new ItemStack[tInputList.size()]);
|
||||
|
||||
ArrayList<FluidStack> tFluidList = getStoredFluids();
|
||||
int tFluidList_sS = tFluidList.size();
|
||||
for (int i = 0; i < tFluidList_sS - 1; i++) {
|
||||
for (int j = i + 1; j < tFluidList_sS; j++) {
|
||||
if (GT_Utility.areFluidsEqual(tFluidList.get(i), tFluidList.get(j))) {
|
||||
if (tFluidList.get(i).amount >= tFluidList.get(j).amount) {
|
||||
tFluidList.remove(j--);
|
||||
tFluidList_sS = tFluidList.size();
|
||||
} else {
|
||||
tFluidList.remove(i--);
|
||||
tFluidList_sS = tFluidList.size();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
FluidStack[] fluids = tFluidList.toArray(new FluidStack[tFluidList.size()]);
|
||||
|
||||
if (inputs.length > 0 || fluids.length > 0) {
|
||||
long voltage = getMaxInputVoltage();
|
||||
byte tier = (byte) Math.max(1, GT_Utility.getTier(voltage));
|
||||
GT_Recipe recipe = GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.findRecipe(getBaseMetaTileEntity(), false,
|
||||
gregtech.api.enums.GT_Values.V[tier], fluids, inputs);
|
||||
if (recipe != null && recipe.isRecipeInputEqual(true, fluids, inputs)) {
|
||||
this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
|
||||
this.mEfficiencyIncrease = 10000;
|
||||
|
||||
int EUt = recipe.mEUt;
|
||||
int maxProgresstime = recipe.mDuration;
|
||||
|
||||
while (EUt <= gregtech.api.enums.GT_Values.V[tier - 1] && maxProgresstime > 1) {
|
||||
EUt *= 4;
|
||||
maxProgresstime /= 4;
|
||||
}
|
||||
maxProgresstime = Math.max(maxProgresstime, 1);
|
||||
|
||||
this.mEUt = -EUt;
|
||||
this.mMaxProgresstime = maxProgresstime;
|
||||
this.mOutputItems = recipe.mOutputs;
|
||||
this.mOutputFluids = recipe.mFluidOutputs;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
|
||||
int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
|
||||
int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
|
||||
int casingAmount = 0;
|
||||
// x=width, z=depth, y=height
|
||||
for (int x = -1 + xDir; x <= xDir + 1; x++) {
|
||||
for (int z = -1 + zDir; z <= zDir + 1; z++) {
|
||||
for (int y = -1; y <= 1; y++) {
|
||||
IGregTechTileEntity tileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(x, y, z);
|
||||
Block block = aBaseMetaTileEntity.getBlockOffset(x, y, z);
|
||||
if (x == xDir && z == zDir && y <= 0) {
|
||||
if ((y == -1)
|
||||
&& (block != GregTech_API.sBlockCasings5 || aBaseMetaTileEntity.getMetaIDOffset(x, y, z) != 0)) {
|
||||
return false;
|
||||
} else if (y == 0 && (block != GregTech_API.sBlockCasings4 || aBaseMetaTileEntity.getMetaIDOffset(x, y, z) != 15)) {
|
||||
return false;
|
||||
}
|
||||
} else if (x != 0 || y != 0 || z != 0) {
|
||||
if (!addInputToMachineList(tileEntity, CASING_INDEX) && !addOutputToMachineList(tileEntity, CASING_INDEX)
|
||||
&& !addMaintenanceToMachineList(tileEntity, CASING_INDEX)
|
||||
&& !addEnergyInputToMachineList(tileEntity, CASING_INDEX)) {
|
||||
if (block == GregTech_API.sBlockCasings4 && aBaseMetaTileEntity.getMetaIDOffset(x, y, z) == 14) {
|
||||
casingAmount++;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
return casingAmount >= 8;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxEfficiency(ItemStack aStack) {
|
||||
return 10000;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPollutionPerTick(ItemStack aStack) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getDamageToComponent(ItemStack aStack) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean explodesOnComponentBreak(ItemStack aStack) {
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue