From 9af7f8cc672868a3a7cefd1261df0f989d8b43d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20G=C3=A4=C3=9Fler?= Date: Sun, 16 Apr 2017 10:33:36 +0200 Subject: [PATCH 1/6] Made Diesel Engine Tooltip more descriptive --- .../machines/multi/GT_MetaTileEntity_DieselEngine.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java index b423ef92..55c83d1c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java @@ -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 Dynamo Hatch (back centered)", "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", "Boosted: Produces 6144EU/t at 150% efficiency", "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"}; From f1ab33d996152af643599a7ce75617b6ac4c4fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20G=C3=A4=C3=9Fler?= Date: Sun, 23 Apr 2017 10:39:25 +0200 Subject: [PATCH 2/6] Added information on how Heat Capacity surplus influences recipe time --- .../machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java index 5a596bf0..1b9ca3ce 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java @@ -45,6 +45,9 @@ public class GT_MetaTileEntity_ElectricBlastFurnace "1x Maintenance Hatch (Any bottom layer casing)", "1x Muffler Hatch (Top middle)", "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 grants an upgraded overclock", + "Upgraded overclocks reduce recipe time to 25% and increase EU/t to 400%", "Causes " + 20 * getPollutionPerTick(null) + " Pollution per second"}; } From 2ca81b2828d6324c4790d4c7f9849a5012d1b15e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20G=C3=A4=C3=9Fler?= Date: Sun, 23 Apr 2017 10:45:07 +0200 Subject: [PATCH 3/6] Changed the wording on heating capacity to make the effects more clear. --- .../machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java index 1b9ca3ce..e82fa34f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java @@ -46,7 +46,7 @@ public class GT_MetaTileEntity_ElectricBlastFurnace "1x Muffler Hatch (Top middle)", "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 grants an upgraded overclock", + "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"}; } From c2c9fad1204880aaf87e8c41e98eae2dc983b567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20G=C3=A4=C3=9Fler?= Date: Mon, 24 Apr 2017 20:50:08 +0200 Subject: [PATCH 4/6] Fixed a bug that caused Battery Buffers to not have a tooltip --- .../implementations/GT_MetaTileEntity_BasicBatteryBuffer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java index 2fd30f1c..a6b7e7c9 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java @@ -43,7 +43,7 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier @Override public String[] getDescription() { - String[] desc = new String[mDescription.length]; + String[] desc = new String[mDescription.length + 1]; System.arraycopy(mDescription, 0, desc, 0, mDescription.length); desc[mDescription.length] = mInventory.length + " Slots"; return desc; From 1c75968fad51f87f3c04605a34536dca8f0f9afc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20G=C3=A4=C3=9Fler?= Date: Mon, 24 Apr 2017 23:40:24 +0200 Subject: [PATCH 5/6] Fixed the GTLog spam, ty Techlone --- .../GT_MetaTileEntity_TieredMachineBlock.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java index 8da8fdf6..ee033fe6 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java @@ -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) { super(aID, aName, aNameRegional, aInvSlotCount); 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! 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) { super(aID, aName, aNameRegional, aInvSlotCount); mTier = (byte) Math.max(0, Math.min(aTier, 9)); - mDescription = aDescription; + mDescription = aDescription == null ? new String[0] : aDescription; // must always be the last call! 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) { super(aName, aInvSlotCount); mTier = (byte) aTier; - mDescription = new String[]{aDescription}; + mDescription = aDescription == null ? new String[0] : new String[]{aDescription}; mTextures = aTextures; } public GT_MetaTileEntity_TieredMachineBlock(String aName, int aTier, int aInvSlotCount, String[] aDescription, ITexture[][][] aTextures) { super(aName, aInvSlotCount); mTier = (byte) aTier; - mDescription = aDescription; + mDescription = aDescription == null ? new String[0] : aDescription; mTextures = aTextures; } From 878738a75c86c9034e1226857b1858e6fbbf9ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20G=C3=A4=C3=9Fler?= Date: Mon, 24 Apr 2017 23:55:42 +0200 Subject: [PATCH 6/6] Corrected the Maintenance Hatch tooltip --- .../implementations/GT_MetaTileEntity_Hatch_Maintenance.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java index 8e1f052d..1e1a7c78 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java @@ -57,7 +57,7 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch 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 Ducttape, 2 Lubricant Cells"; + desc[mDescription.length + 1] = "4 Steel Screws, 2 Adv Circuits"; desc[mDescription.length + 2] = "For each autorepair"; return desc; } else {