Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'remotes/JohannesGaessler/SteamProductionImprovement' into unstable

Browse source
This commit is contained in:
Techlone 2017-04-25 03:32:59 +05:00
commit 92674ba0dd
5 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java
View file

@ -43,7 +43,7 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier
@Override @Override
public String[] getDescription() { public String[] getDescription() {
String[] desc = new String[mDescription.length]; String[] desc = new String[mDescription.length + 1];
System.arraycopy(mDescription, 0, desc, 0, mDescription.length); System.arraycopy(mDescription, 0, desc, 0, mDescription.length);
desc[mDescription.length] = mInventory.length + " Slots"; desc[mDescription.length] = mInventory.length + " Slots";
return desc; return desc;

2
src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
View file

@ -57,7 +57,7 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch
String[] desc = new String[mDescription.length + 3]; String[] desc = new String[mDescription.length + 3];
System.arraycopy(mDescription, 0, desc, 0, mDescription.length); System.arraycopy(mDescription, 0, desc, 0, mDescription.length);
desc[mDescription.length] = "4 Ducttape, 2 Lubricant Cells"; desc[mDescription.length] = "4 Ducttape, 2 Lubricant Cells";
desc[mDescription.length + 1] = "4 Ducttape, 2 Lubricant Cells"; desc[mDescription.length + 1] = "4 Steel Screws, 2 Adv Circuits";
desc[mDescription.length + 2] = "For each autorepair"; desc[mDescription.length + 2] = "For each autorepair";
return desc; return desc;
} else { } else {

8
src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java
View file

@ -24,7 +24,7 @@ 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) { public GT_MetaTileEntity_TieredMachineBlock(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription, ITexture... aTextures) {
super(aID, aName, aNameRegional, aInvSlotCount); super(aID, aName, aNameRegional, aInvSlotCount);
mTier = (byte) Math.max(0, Math.min(aTier, 9)); mTier = (byte) Math.max(0, Math.min(aTier, 9));
mDescription = new String[]{aDescription}; mDescription = aDescription == null ? new String[0] : new String[]{aDescription};
// must always be the last call! // must always be the last call!
if (GT.isClientSide()) mTextures = getTextureSet(aTextures); if (GT.isClientSide()) mTextures = getTextureSet(aTextures);
@ -34,7 +34,7 @@ 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) { public GT_MetaTileEntity_TieredMachineBlock(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String[] aDescription, ITexture... aTextures) {
super(aID, aName, aNameRegional, aInvSlotCount); super(aID, aName, aNameRegional, aInvSlotCount);
mTier = (byte) Math.max(0, Math.min(aTier, 9)); mTier = (byte) Math.max(0, Math.min(aTier, 9));
mDescription = aDescription; mDescription = aDescription == null ? new String[0] : aDescription;
// must always be the last call! // must always be the last call!
if (GT.isClientSide()) mTextures = getTextureSet(aTextures); if (GT.isClientSide()) mTextures = getTextureSet(aTextures);
@ -44,14 +44,14 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit
public GT_MetaTileEntity_TieredMachineBlock(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) { public GT_MetaTileEntity_TieredMachineBlock(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
super(aName, aInvSlotCount); super(aName, aInvSlotCount);
mTier = (byte) aTier; mTier = (byte) aTier;
mDescription = new String[]{aDescription}; mDescription = aDescription == null ? new String[0] : new String[]{aDescription};
mTextures = aTextures; mTextures = aTextures;
} }
public GT_MetaTileEntity_TieredMachineBlock(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) { public GT_MetaTileEntity_TieredMachineBlock(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) {
super(aName, aInvSlotCount); super(aName, aInvSlotCount);
mTier = (byte) aTier; mTier = (byte) aTier;
mDescription = aDescription; mDescription = aDescription == null ? new String[0] : aDescription;
mTextures = aTextures; mTextures = aTextures;
} }

3
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java
View file

@ -48,7 +48,8 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlock
"1x Muffler Hatch (top middle back, next to the rear Gear Box)", "1x Muffler Hatch (top middle back, next to the rear Gear Box)",
"1x Dynamo Hatch (back centered)", "1x Dynamo Hatch (back centered)",
"Engine Intake Casings not obstructed in front (only air blocks)", "Engine Intake Casings not obstructed in front (only air blocks)",
"Supply Diesel Fuel and Lubricant to run. Supply Oxygen to boost output (optional).", "Supply Diesel Fuel and 1000L of Lubricant per hour to run.",
"Supply 40L of Oxygen per second to boost output (optional).",
"Default: Produces 2048EU/t at 100% efficiency", "Default: Produces 2048EU/t at 100% efficiency",
"Boosted: Produces 6144EU/t at 150% efficiency", "Boosted: Produces 6144EU/t at 150% efficiency",
"Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"}; "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"};

3
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
View file

@ -45,6 +45,9 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
"1x Maintenance Hatch (Any bottom layer casing)", "1x Maintenance Hatch (Any bottom layer casing)",
"1x Muffler Hatch (Top middle)", "1x Muffler Hatch (Top middle)",
"Heat Proof Machine Casings for the rest", "Heat Proof Machine Casings for the rest",
"Each 900K over the min. Heat Capacity grants 5% speedup (multiplicatively)",
"Each 1800K over the min. Heat Capacity allows for one upgraded overclock",
"Upgraded overclocks reduce recipe time to 25% and increase EU/t to 400%",
"Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"}; "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"};
} }