Merge branch 'SteamProductionImprovement' into unstable
This commit is contained in:
commit
a3de198ba0
69 changed files with 118 additions and 109 deletions
|
@ -29,7 +29,7 @@ public class GT_MetaTileEntity_E_Furnace extends GT_MetaTileEntity_BasicMachine
|
|||
|
||||
@Override
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_E_Furnace(mName, mTier, mDescription, mTextures, mGUIName, mNEIName);
|
||||
return new GT_MetaTileEntity_E_Furnace(mName, mTier, mDescriptionArray, mTextures, mGUIName, mNEIName);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -43,9 +43,9 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
|
|||
|
||||
@Override
|
||||
public String[] getDescription() {
|
||||
String[] desc = new String[mDescription.length + 1];
|
||||
System.arraycopy(mDescription, 0, desc, 0, mDescription.length);
|
||||
desc[mDescription.length] = mInventory.length + " Slots";
|
||||
String[] desc = new String[mDescriptionArray.length + 1];
|
||||
System.arraycopy(mDescriptionArray, 0, desc, 0, mDescriptionArray.length);
|
||||
desc[mDescriptionArray.length] = mInventory.length + " Slots";
|
||||
return desc;
|
||||
}
|
||||
|
||||
|
@ -66,7 +66,7 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
|
|||
|
||||
@Override
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_BasicBatteryBuffer(mName, mTier, mDescription, mTextures, mInventory.length);
|
||||
return new GT_MetaTileEntity_BasicBatteryBuffer(mName, mTier, mDescriptionArray, mTextures, mInventory.length);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -59,9 +59,9 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity
|
|||
|
||||
@Override
|
||||
public String[] getDescription() {
|
||||
String[] desc = new String[mDescription.length + 1];
|
||||
System.arraycopy(mDescription, 0, desc, 0, mDescription.length);
|
||||
desc[mDescription.length] = "Fuel Efficiency: " + getEfficiency() + "%";
|
||||
String[] desc = new String[mDescriptionArray.length + 1];
|
||||
System.arraycopy(mDescriptionArray, 0, desc, 0, mDescriptionArray.length);
|
||||
desc[mDescriptionArray.length] = "Fuel Efficiency: " + getEfficiency() + "%";
|
||||
return desc;
|
||||
}
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ public class GT_MetaTileEntity_BasicHull extends GT_MetaTileEntity_BasicTank {
|
|||
|
||||
@Override
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_BasicHull(mName, mTier, mInventory.length, mDescription, mTextures);
|
||||
return new GT_MetaTileEntity_BasicHull(mName, mTier, mInventory.length, mDescriptionArray, mTextures);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -621,7 +621,7 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
|
|||
|
||||
@Override
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_BasicMachine_GT_Recipe(mName, mTier, mDescription, mRecipes, mInputSlotCount, mOutputItems == null ? 0 : mOutputItems.length, mTankCapacity, mAmperage, mGUIParameterA, mGUIParameterB, mTextures, mGUIName, mNEIName, mSound, mSharedTank, mRequiresFluidForFiltering, mSpecialEffect);
|
||||
return new GT_MetaTileEntity_BasicMachine_GT_Recipe(mName, mTier, mDescriptionArray, mRecipes, mInputSlotCount, mOutputItems == null ? 0 : mOutputItems.length, mTankCapacity, mAmperage, mGUIParameterA, mGUIParameterB, mTextures, mGUIName, mNEIName, mSound, mSharedTank, mRequiresFluidForFiltering, mSpecialEffect);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -79,7 +79,7 @@ public class GT_MetaTileEntity_Hatch_Dynamo extends GT_MetaTileEntity_Hatch {
|
|||
|
||||
@Override
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Hatch_Dynamo(mName, mTier, mDescription, mTextures);
|
||||
return new GT_MetaTileEntity_Hatch_Dynamo(mName, mTier, mDescriptionArray, mTextures);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -84,7 +84,7 @@ public class GT_MetaTileEntity_Hatch_Energy extends GT_MetaTileEntity_Hatch {
|
|||
|
||||
@Override
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Hatch_Energy(mName, mTier, mDescription, mTextures);
|
||||
return new GT_MetaTileEntity_Hatch_Energy(mName, mTier, mDescriptionArray, mTextures);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -53,7 +53,7 @@ public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch {
|
|||
|
||||
@Override
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Hatch_Input(mName, mTier, mDescription, mTextures);
|
||||
return new GT_MetaTileEntity_Hatch_Input(mName, mTier, mDescriptionArray, mTextures);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -59,7 +59,7 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch {
|
|||
|
||||
@Override
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Hatch_InputBus(mName, mTier, mDescription, mTextures);
|
||||
return new GT_MetaTileEntity_Hatch_InputBus(mName, mTier, mDescriptionArray, mTextures);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -54,16 +54,16 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
|
|||
@Override
|
||||
public String[] getDescription() {
|
||||
if (mAuto) {
|
||||
String[] desc = new String[mDescription.length + 3];
|
||||
System.arraycopy(mDescription, 0, desc, 0, mDescription.length);
|
||||
desc[mDescription.length] = "4 Ducttape, 2 Lubricant Cells";
|
||||
desc[mDescription.length + 1] = "4 Steel Screws, 2 Adv Circuits";
|
||||
desc[mDescription.length + 2] = "For each autorepair";
|
||||
String[] desc = new String[mDescriptionArray.length + 3];
|
||||
System.arraycopy(mDescriptionArray, 0, desc, 0, mDescriptionArray.length);
|
||||
desc[mDescriptionArray.length] = "4 Ducttape, 2 Lubricant Cells";
|
||||
desc[mDescriptionArray.length + 1] = "4 Steel Screws, 2 Adv Circuits";
|
||||
desc[mDescriptionArray.length + 2] = "For each autorepair";
|
||||
return desc;
|
||||
} else {
|
||||
String[] desc = new String[mDescription.length + 1];
|
||||
System.arraycopy(mDescription, 0, desc, 0, mDescription.length);
|
||||
desc[mDescription.length] = "Cannot be shared between Multiblocks!";
|
||||
String[] desc = new String[mDescriptionArray.length + 1];
|
||||
System.arraycopy(mDescriptionArray, 0, desc, 0, mDescriptionArray.length);
|
||||
desc[mDescriptionArray.length] = "Cannot be shared between Multiblocks!";
|
||||
return desc;
|
||||
}
|
||||
}
|
||||
|
@ -105,8 +105,8 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
|
|||
|
||||
@Override
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
if(aTileEntity.getMetaTileID()==111) return new GT_MetaTileEntity_Hatch_Maintenance(mName, mTier, mDescription, mTextures, true);
|
||||
return new GT_MetaTileEntity_Hatch_Maintenance(mName, mTier, mDescription, mTextures, false);
|
||||
if(aTileEntity.getMetaTileID()==111) return new GT_MetaTileEntity_Hatch_Maintenance(mName, mTier, mDescriptionArray, mTextures, true);
|
||||
return new GT_MetaTileEntity_Hatch_Maintenance(mName, mTier, mDescriptionArray, mTextures, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -25,10 +25,10 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch {
|
|||
|
||||
@Override
|
||||
public String[] getDescription() {
|
||||
String[] desc = new String[mDescription.length + 2];
|
||||
System.arraycopy(mDescription, 0, desc, 0, mDescription.length);
|
||||
desc[mDescription.length] = "DO NOT OBSTRUCT THE OUTPUT!";
|
||||
desc[mDescription.length + 1] = "Reduces Pollution to "+calculatePollutionReduction(100)+"%";
|
||||
String[] desc = new String[mDescriptionArray.length + 2];
|
||||
System.arraycopy(mDescriptionArray, 0, desc, 0, mDescriptionArray.length);
|
||||
desc[mDescriptionArray.length] = "DO NOT OBSTRUCT THE OUTPUT!";
|
||||
desc[mDescriptionArray.length + 1] = "Reduces Pollution to "+calculatePollutionReduction(100)+"%";
|
||||
return desc;
|
||||
}
|
||||
|
||||
|
@ -64,7 +64,7 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch {
|
|||
|
||||
@Override
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Hatch_Muffler(mName, mTier, mDescription, mTextures);
|
||||
return new GT_MetaTileEntity_Hatch_Muffler(mName, mTier, mDescriptionArray, mTextures);
|
||||
}
|
||||
|
||||
public boolean polluteEnvironment() {
|
||||
|
|
|
@ -60,7 +60,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch {
|
|||
|
||||
@Override
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Hatch_Output(mName, mTier, mDescription, mTextures);
|
||||
return new GT_MetaTileEntity_Hatch_Output(mName, mTier, mDescriptionArray, mTextures);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -55,7 +55,7 @@ public class GT_MetaTileEntity_Hatch_OutputBus extends GT_MetaTileEntity_Hatch {
|
|||
|
||||
@Override
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Hatch_OutputBus(mName, mTier, mDescription, mTextures);
|
||||
return new GT_MetaTileEntity_Hatch_OutputBus(mName, mTier, mDescriptionArray, mTextures);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -11,10 +11,13 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
|
|||
*/
|
||||
public final byte mTier;
|
||||
|
||||
@Deprecated
|
||||
public final String mDescription;
|
||||
|
||||
/**
|
||||
* A simple Description.
|
||||
*/
|
||||
public final String[] mDescription;
|
||||
public final String[] mDescriptionArray;
|
||||
|
||||
/**
|
||||
* Contains all Textures used by this Block.
|
||||
|
@ -24,8 +27,8 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
|
|||
public GT_MetaTileEntity_TieredMachineBlock(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription, ITexture... aTextures) {
|
||||
super(aID, aName, aNameRegional, aInvSlotCount);
|
||||
mTier = (byte) Math.max(0, Math.min(aTier, 9));
|
||||
mDescription = aDescription == null ? new String[0] : new String[]{aDescription};
|
||||
|
||||
mDescriptionArray = aDescription == null ? new String[0] : new String[]{aDescription};
|
||||
mDescription = mDescriptionArray.length > 0 ? mDescriptionArray[0] : "";
|
||||
// must always be the last call!
|
||||
if (GT.isClientSide()) mTextures = getTextureSet(aTextures);
|
||||
else mTextures = null;
|
||||
|
@ -34,7 +37,8 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
|
|||
public GT_MetaTileEntity_TieredMachineBlock(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String[] aDescription, ITexture... aTextures) {
|
||||
super(aID, aName, aNameRegional, aInvSlotCount);
|
||||
mTier = (byte) Math.max(0, Math.min(aTier, 9));
|
||||
mDescription = aDescription == null ? new String[0] : aDescription;
|
||||
mDescriptionArray = aDescription == null ? new String[0] : aDescription;
|
||||
mDescription = mDescriptionArray.length > 0 ? mDescriptionArray[0] : "";
|
||||
|
||||
// must always be the last call!
|
||||
if (GT.isClientSide()) mTextures = getTextureSet(aTextures);
|
||||
|
@ -44,14 +48,16 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
|
|||
public GT_MetaTileEntity_TieredMachineBlock(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
|
||||
super(aName, aInvSlotCount);
|
||||
mTier = (byte) aTier;
|
||||
mDescription = aDescription == null ? new String[0] : new String[]{aDescription};
|
||||
mDescriptionArray = aDescription == null ? new String[0] : new String[]{aDescription};
|
||||
mDescription = mDescriptionArray.length > 0 ? mDescriptionArray[0] : "";
|
||||
mTextures = aTextures;
|
||||
}
|
||||
|
||||
public GT_MetaTileEntity_TieredMachineBlock(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
|
||||
super(aName, aInvSlotCount);
|
||||
mTier = (byte) aTier;
|
||||
mDescription = aDescription == null ? new String[0] : aDescription;
|
||||
mDescriptionArray = aDescription == null ? new String[0] : aDescription;
|
||||
mDescription = mDescriptionArray.length > 0 ? mDescriptionArray[0] : "";
|
||||
mTextures = aTextures;
|
||||
}
|
||||
|
||||
|
@ -72,7 +78,7 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
|
|||
|
||||
@Override
|
||||
public String[] getDescription() {
|
||||
return mDescription;
|
||||
return mDescriptionArray;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -67,7 +67,7 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi
|
|||
|
||||
@Override
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Transformer(mName, mTier, mDescription, mTextures);
|
||||
return new GT_MetaTileEntity_Transformer(mName, mTier, mDescriptionArray, mTextures);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -1406,17 +1406,11 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
|
|||
|
||||
private GT_Recipe addRecipe(GT_Recipe recipe, double baseBurnTime){
|
||||
recipe = new GT_Recipe(recipe);
|
||||
//Some recipes will have a burn time like 15.9999999 and % always rounds down
|
||||
double floatErrorCorrection = 0.0001;
|
||||
|
||||
double bronzeBurnTime = baseBurnTime * 2 + floatErrorCorrection;
|
||||
bronzeBurnTime -= bronzeBurnTime % 0.05;
|
||||
double steelBurnTime = baseBurnTime * 1.5 + floatErrorCorrection;
|
||||
steelBurnTime -= steelBurnTime % 0.05;
|
||||
double titaniumBurnTime = baseBurnTime * 1.3 + floatErrorCorrection;
|
||||
titaniumBurnTime -= titaniumBurnTime % 0.05;
|
||||
double tungstensteelBurnTime = baseBurnTime * 1.2 + floatErrorCorrection;
|
||||
tungstensteelBurnTime -= tungstensteelBurnTime % 0.05;
|
||||
double bronzeBurnTime = baseBurnTime * 2;
|
||||
double steelBurnTime = baseBurnTime * 1.5;
|
||||
double titaniumBurnTime = baseBurnTime * 1.3;
|
||||
double tungstensteelBurnTime = baseBurnTime * 1.2;
|
||||
|
||||
recipe.setNeiDesc("Burn time in seconds:",
|
||||
String.format("Bronze Boiler: %.2f", bronzeBurnTime),
|
||||
|
|
|
@ -30,7 +30,7 @@ public class GT_MetaTileEntity_ChestBuffer
|
|||
}
|
||||
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_ChestBuffer(this.mName, this.mTier, this.mInventory.length, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_ChestBuffer(this.mName, this.mTier, this.mInventory.length, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public ITexture getOverlayIcon() {
|
||||
|
|
|
@ -31,7 +31,7 @@ public class GT_MetaTileEntity_Filter
|
|||
}
|
||||
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Filter(this.mName, this.mTier, this.mInventory.length, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_Filter(this.mName, this.mTier, this.mInventory.length, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public ITexture getOverlayIcon() {
|
||||
|
|
|
@ -33,7 +33,7 @@ public class GT_MetaTileEntity_Regulator
|
|||
}
|
||||
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Regulator(this.mName, this.mTier, this.mInventory.length, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_Regulator(this.mName, this.mTier, this.mInventory.length, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public ITexture getOverlayIcon() {
|
||||
|
|
|
@ -24,7 +24,7 @@ public class GT_MetaTileEntity_SuperBuffer
|
|||
}
|
||||
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_SuperBuffer(this.mName, this.mTier, this.mInventory.length, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_SuperBuffer(this.mName, this.mTier, this.mInventory.length, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public ITexture getOverlayIcon() {
|
||||
|
|
|
@ -36,7 +36,7 @@ public class GT_MetaTileEntity_TypeFilter
|
|||
}
|
||||
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_TypeFilter(this.mName, this.mTier, this.mInventory.length, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_TypeFilter(this.mName, this.mTier, this.mInventory.length, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public ITexture getOverlayIcon() {
|
||||
|
|
|
@ -60,7 +60,7 @@ public class GT_MetaTileEntity_Boiler_Bronze
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Boiler_Bronze(this.mName, this.mTier, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_Boiler_Bronze(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
|
||||
|
|
|
@ -61,7 +61,7 @@ public class GT_MetaTileEntity_Boiler_Lava
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Boiler_Lava(this.mName, this.mTier, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_Boiler_Lava(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
|
||||
|
|
|
@ -66,7 +66,7 @@ public class GT_MetaTileEntity_Boiler_Solar
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Boiler_Solar(this.mName, this.mTier, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_Boiler_Solar(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
private int mRunTime = 0;
|
||||
|
|
|
@ -66,7 +66,7 @@ public class GT_MetaTileEntity_Boiler_Steel
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Boiler_Steel(this.mName, this.mTier, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_Boiler_Steel(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
|
||||
|
|
|
@ -45,7 +45,7 @@ public class GT_MetaTileEntity_DieselGenerator
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_DieselGenerator(this.mName, this.mTier, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_DieselGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public GT_Recipe.GT_Recipe_Map getRecipes() {
|
||||
|
|
|
@ -35,7 +35,7 @@ public class GT_MetaTileEntity_FluidNaquadahReactor
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_FluidNaquadahReactor(this.mName, this.mTier, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_FluidNaquadahReactor(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public GT_Recipe.GT_Recipe_Map getRecipes() {
|
||||
|
|
|
@ -40,7 +40,7 @@ public class GT_MetaTileEntity_GasTurbine
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_GasTurbine(this.mName, this.mTier, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_GasTurbine(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public GT_Recipe.GT_Recipe_Map getRecipes() {
|
||||
|
|
|
@ -38,7 +38,7 @@ public class GT_MetaTileEntity_LightningRod extends GT_MetaTileEntity_TieredMach
|
|||
}
|
||||
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_LightningRod(this.mName, this.mTier, this.mInventory.length, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_LightningRod(this.mName, this.mTier, this.mInventory.length, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -35,7 +35,7 @@ public class GT_MetaTileEntity_MagicEnergyConverter
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_MagicEnergyConverter(this.mName, this.mTier, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_MagicEnergyConverter(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public GT_Recipe.GT_Recipe_Map getRecipes() {
|
||||
|
|
|
@ -64,7 +64,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_MagicalEnergyAbsorber(this.mName, this.mTier, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_MagicalEnergyAbsorber(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public GT_Recipe.GT_Recipe_Map getRecipes() {
|
||||
|
|
|
@ -35,7 +35,7 @@ public class GT_MetaTileEntity_PlasmaGenerator
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_PlasmaGenerator(this.mName, this.mTier, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_PlasmaGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public GT_Recipe.GT_Recipe_Map getRecipes() {
|
||||
|
|
|
@ -34,7 +34,7 @@ public class GT_MetaTileEntity_SolidNaquadahReactor
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_SolidNaquadahReactor(this.mName, this.mTier, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_SolidNaquadahReactor(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public GT_Recipe.GT_Recipe_Map getRecipes() {
|
||||
|
|
|
@ -38,7 +38,7 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_SteamTurbine(this.mName, this.mTier, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_SteamTurbine(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public GT_Recipe.GT_Recipe_Map getRecipes() {
|
||||
|
@ -47,10 +47,10 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener
|
|||
|
||||
@Override
|
||||
public String[] getDescription() {
|
||||
String[] desc = new String[mDescription.length + 2];
|
||||
System.arraycopy(mDescription, 0, desc, 0, mDescription.length);
|
||||
desc[mDescription.length] = "Fuel Efficiency: " + (600 / getEfficiency()) + "%";
|
||||
desc[mDescription.length + 1] = String.format("Consumes up to %sL of Steam per second",
|
||||
String[] desc = new String[mDescriptionArray.length + 2];
|
||||
System.arraycopy(mDescriptionArray, 0, desc, 0, mDescriptionArray.length);
|
||||
desc[mDescriptionArray.length] = "Fuel Efficiency: " + (600 / getEfficiency()) + "%";
|
||||
desc[mDescriptionArray.length + 1] = String.format("Consumes up to %sL of Steam per second",
|
||||
(int) (4000 * (8 * Math.pow(4, mTier) + Math.pow(2, mTier)) / (600 / getEfficiency())));
|
||||
return desc;
|
||||
}
|
||||
|
|
|
@ -23,7 +23,7 @@ public class GT_MetaTileEntity_BasicHull_Bronze
|
|||
}
|
||||
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_BasicHull_Bronze(this.mName, this.mTier, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_BasicHull_Bronze(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public ITexture[][][] getTextureSet(ITexture[] aTextures) {
|
||||
|
|
|
@ -23,7 +23,7 @@ public class GT_MetaTileEntity_BasicHull_BronzeBricks
|
|||
}
|
||||
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_BasicHull_BronzeBricks(this.mName, this.mTier, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_BasicHull_BronzeBricks(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public ITexture[][][] getTextureSet(ITexture[] aTextures) {
|
||||
|
|
|
@ -23,7 +23,7 @@ public class GT_MetaTileEntity_BasicHull_Steel
|
|||
}
|
||||
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_BasicHull_Steel(this.mName, this.mTier, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_BasicHull_Steel(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public ITexture[][][] getTextureSet(ITexture[] aTextures) {
|
||||
|
|
|
@ -23,7 +23,7 @@ public class GT_MetaTileEntity_BasicHull_SteelBricks
|
|||
}
|
||||
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_BasicHull_SteelBricks(this.mName, this.mTier, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_BasicHull_SteelBricks(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public ITexture[][][] getTextureSet(ITexture[] aTextures) {
|
||||
|
|
|
@ -85,7 +85,7 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_AdvSeismicProspector(this.mName, this.mTier, this.mDescription, this.mTextures,
|
||||
return new GT_MetaTileEntity_AdvSeismicProspector(this.mName, this.mTier, this.mDescriptionArray, this.mTextures,
|
||||
this.mGUIName, this.mNEIName, this.near, this.middle, this.radius, this.step);
|
||||
}
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ public class GT_MetaTileEntity_Boxinator
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Boxinator(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
|
||||
return new GT_MetaTileEntity_Boxinator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, this.mGUIName, this.mNEIName);
|
||||
}
|
||||
|
||||
public GT_Recipe.GT_Recipe_Map getRecipeList() {
|
||||
|
|
|
@ -26,7 +26,7 @@ public class GT_MetaTileEntity_Charger extends GT_MetaTileEntity_BasicBatteryBuf
|
|||
|
||||
@Override
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Charger(mName, mTier, mDescription, mTextures, mInventory.length);
|
||||
return new GT_MetaTileEntity_Charger(mName, mTier, mDescriptionArray, mTextures, mInventory.length);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -34,7 +34,7 @@ public class GT_MetaTileEntity_CuringOven
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_CuringOven(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
|
||||
return new GT_MetaTileEntity_CuringOven(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, this.mGUIName, this.mNEIName);
|
||||
}
|
||||
|
||||
public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
|
||||
|
|
|
@ -27,7 +27,7 @@ public class GT_MetaTileEntity_Disassembler
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Disassembler(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
|
||||
return new GT_MetaTileEntity_Disassembler(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, this.mGUIName, this.mNEIName);
|
||||
}
|
||||
|
||||
public int checkRecipe() {
|
||||
|
|
|
@ -35,7 +35,7 @@ public class GT_MetaTileEntity_Massfabricator
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Massfabricator(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
|
||||
return new GT_MetaTileEntity_Massfabricator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, this.mGUIName, this.mNEIName);
|
||||
}
|
||||
|
||||
public void onConfigLoad(GT_Config aConfig) {
|
||||
|
|
|
@ -74,7 +74,7 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt
|
|||
|
||||
@Override
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_MicrowaveEnergyTransmitter(this.mName, this.mTier, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_MicrowaveEnergyTransmitter(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public String[] getInfoData() {
|
||||
|
|
|
@ -29,7 +29,7 @@ public class GT_MetaTileEntity_MonsterRepellent extends GT_MetaTileEntity_Tiered
|
|||
}
|
||||
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_MonsterRepellent(this.mName, this.mTier, this.mInventory.length, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_MonsterRepellent(this.mName, this.mTier, this.mInventory.length, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -31,7 +31,7 @@ public class GT_MetaTileEntity_PotionBrewer
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_PotionBrewer(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
|
||||
return new GT_MetaTileEntity_PotionBrewer(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, this.mGUIName, this.mNEIName);
|
||||
}
|
||||
|
||||
public GT_Recipe.GT_Recipe_Map getRecipeList() {
|
||||
|
|
|
@ -47,7 +47,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch {
|
|||
|
||||
@Override
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Pump(this.mName, this.mTier, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_Pump(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public void saveNBTData(NBTTagCompound aNBT) {
|
||||
|
|
|
@ -34,7 +34,7 @@ public class GT_MetaTileEntity_Replicator
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Replicator(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
|
||||
return new GT_MetaTileEntity_Replicator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, this.mGUIName, this.mNEIName);
|
||||
}
|
||||
|
||||
public int checkRecipe() {
|
||||
|
|
|
@ -29,7 +29,7 @@ public class GT_MetaTileEntity_RockBreaker
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_RockBreaker(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
|
||||
return new GT_MetaTileEntity_RockBreaker(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, this.mGUIName, this.mNEIName);
|
||||
}
|
||||
|
||||
public GT_Recipe.GT_Recipe_Map getRecipeList() {
|
||||
|
|
|
@ -39,7 +39,7 @@ public class GT_MetaTileEntity_Scanner
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Scanner(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
|
||||
return new GT_MetaTileEntity_Scanner(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, this.mGUIName, this.mNEIName);
|
||||
}
|
||||
|
||||
public int checkRecipe() {
|
||||
|
|
|
@ -43,7 +43,7 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_SeismicProspector(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
|
||||
return new GT_MetaTileEntity_SeismicProspector(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, this.mGUIName, this.mNEIName);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -162,7 +162,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank {
|
|||
|
||||
@Override
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Teleporter(this.mName, this.mTier, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_Teleporter(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -24,6 +24,8 @@ public abstract class GT_MetaTileEntity_LargeBoiler
|
|||
private boolean firstRun = true;
|
||||
private int mSuperEfficencyIncrease = 0;
|
||||
private int integratedCircuitConfig = 0; //Steam output is reduced by 1000L per config
|
||||
private int excessFuel = 0; //Eliminate rounding errors for fuels that burn half items
|
||||
private int excessProjectedEU = 0; //Eliminate rounding errors from throttling the boiler
|
||||
|
||||
public GT_MetaTileEntity_LargeBoiler(int aID, String aName, String aNameRegional) {
|
||||
super(aID, aName, aNameRegional);
|
||||
|
@ -133,6 +135,9 @@ public abstract class GT_MetaTileEntity_LargeBoiler
|
|||
if (!tInputList.isEmpty()) {
|
||||
for (ItemStack tInput : tInputList) {
|
||||
if ((GT_Utility.getFluidForFilledItem(tInput, true) == null) && ((this.mMaxProgresstime = runtimeBoost(GT_ModHandler.getFuelValue(tInput) / 80)) > 0)) {
|
||||
this.excessFuel += GT_ModHandler.getFuelValue(tInput) % 80;
|
||||
this.mMaxProgresstime += this.excessFuel / 80;
|
||||
this.excessFuel %= 80;
|
||||
this.mMaxProgresstime = adjustBurnTimeForConfig(this.mMaxProgresstime);
|
||||
this.mEUt = adjustEUtForConfig(getEUt());
|
||||
this.mEfficiencyIncrease = (this.mMaxProgresstime * getEfficiencyIncrease());
|
||||
|
@ -264,6 +269,10 @@ public abstract class GT_MetaTileEntity_LargeBoiler
|
|||
return rawBurnTime;
|
||||
}
|
||||
int adjustedEUt = Math.max(25, getEUt() - 25 * integratedCircuitConfig);
|
||||
return rawBurnTime * getEUt() / adjustedEUt;
|
||||
int adjustedBurnTime = rawBurnTime * getEUt() / adjustedEUt;
|
||||
this.excessProjectedEU += (getEUt() * rawBurnTime) - (adjustedEUt * adjustedBurnTime);
|
||||
adjustedBurnTime += this.excessProjectedEU / adjustedEUt;
|
||||
this.excessProjectedEU %= adjustedEUt;
|
||||
return adjustedBurnTime;
|
||||
}
|
||||
}
|
|
@ -27,7 +27,7 @@ public class GT_MetaTileEntity_AlloySmelter_Bronze
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_AlloySmelter_Bronze(this.mName, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_AlloySmelter_Bronze(this.mName, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
|
||||
|
|
|
@ -27,7 +27,7 @@ public class GT_MetaTileEntity_AlloySmelter_Steel
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_AlloySmelter_Steel(this.mName, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_AlloySmelter_Steel(this.mName, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
|
||||
|
|
|
@ -33,7 +33,7 @@ public class GT_MetaTileEntity_Compressor_Bronze
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Compressor_Bronze(this.mName, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_Compressor_Bronze(this.mName, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public int checkRecipe() {
|
||||
|
|
|
@ -33,7 +33,7 @@ public class GT_MetaTileEntity_Compressor_Steel
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Compressor_Steel(this.mName, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_Compressor_Steel(this.mName, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public int checkRecipe() {
|
||||
|
|
|
@ -33,7 +33,7 @@ public class GT_MetaTileEntity_Extractor_Bronze
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Extractor_Bronze(this.mName, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_Extractor_Bronze(this.mName, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public int checkRecipe() {
|
||||
|
|
|
@ -33,7 +33,7 @@ public class GT_MetaTileEntity_Extractor_Steel
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Extractor_Steel(this.mName, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_Extractor_Steel(this.mName, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public int checkRecipe() {
|
||||
|
|
|
@ -27,7 +27,7 @@ public class GT_MetaTileEntity_ForgeHammer_Bronze
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_ForgeHammer_Bronze(this.mName, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_ForgeHammer_Bronze(this.mName, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
|
||||
|
|
|
@ -27,7 +27,7 @@ public class GT_MetaTileEntity_ForgeHammer_Steel
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_ForgeHammer_Steel(this.mName, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_ForgeHammer_Steel(this.mName, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
|
||||
|
|
|
@ -32,7 +32,7 @@ public class GT_MetaTileEntity_Furnace_Bronze
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Furnace_Bronze(this.mName, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_Furnace_Bronze(this.mName, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public int checkRecipe() {
|
||||
|
|
|
@ -32,7 +32,7 @@ public class GT_MetaTileEntity_Furnace_Steel
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Furnace_Steel(this.mName, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_Furnace_Steel(this.mName, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public int checkRecipe() {
|
||||
|
|
|
@ -38,7 +38,7 @@ public class GT_MetaTileEntity_Macerator_Bronze
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Macerator_Bronze(this.mName, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_Macerator_Bronze(this.mName, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
|
||||
|
|
|
@ -38,7 +38,7 @@ public class GT_MetaTileEntity_Macerator_Steel
|
|||
}
|
||||
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Macerator_Steel(this.mName, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_Macerator_Steel(this.mName, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
|
||||
|
|
|
@ -30,9 +30,9 @@ public class GT_MetaTileEntity_Locker
|
|||
}
|
||||
|
||||
public String[] getDescription() {
|
||||
String[] desc = new String[mDescription.length + 1];
|
||||
System.arraycopy(mDescription, 0, desc, 0, mDescription.length);
|
||||
desc[mDescription.length] = "Click with Screwdriver to change Style";
|
||||
String[] desc = new String[mDescriptionArray.length + 1];
|
||||
System.arraycopy(mDescriptionArray, 0, desc, 0, mDescriptionArray.length);
|
||||
desc[mDescriptionArray.length] = "Click with Screwdriver to change Style";
|
||||
return desc;
|
||||
}
|
||||
|
||||
|
@ -57,7 +57,7 @@ public class GT_MetaTileEntity_Locker
|
|||
}
|
||||
|
||||
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_Locker(this.mName, this.mTier, this.mDescription, this.mTextures);
|
||||
return new GT_MetaTileEntity_Locker(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
|
||||
}
|
||||
|
||||
public boolean isSimpleMachine() {
|
||||
|
|
|
@ -51,7 +51,7 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach
|
|||
|
||||
@Override
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_QuantumChest(mName, mTier, mDescription, mTextures);
|
||||
return new GT_MetaTileEntity_QuantumChest(mName, mTier, mDescriptionArray, mTextures);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -126,7 +126,7 @@ public class GT_MetaTileEntity_QuantumTank
|
|||
|
||||
@Override
|
||||
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
|
||||
return new GT_MetaTileEntity_QuantumTank(mName, mTier, mDescription, mTextures);
|
||||
return new GT_MetaTileEntity_QuantumTank(mName, mTier, mDescriptionArray, mTextures);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Reference in a new issue