diff options
author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2018-09-08 00:39:04 +0200 |
---|---|---|
committer | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2018-09-08 00:39:04 +0200 |
commit | b7c66bf2094dd2f03d92919c18fec9dfb04264e6 (patch) | |
tree | a767c60069d7a517b09833c896cc2de849e46498 /src/main/java/gregtech/common/items | |
parent | 65d3cf01f28a275d186d34f5771e2ec72ccd975d (diff) | |
download | GT5-Unofficial-b7c66bf2094dd2f03d92919c18fec9dfb04264e6.tar.gz GT5-Unofficial-b7c66bf2094dd2f03d92919c18fec9dfb04264e6.tar.bz2 GT5-Unofficial-b7c66bf2094dd2f03d92919c18fec9dfb04264e6.zip |
Various fixes
+Added GT-FML-Log
+Added an Exception if a Nq reactor without recipe map is created
+Added the ability to add ReinforcedGlass in the CleanroomWalls (https://github.com/GTNewHorizons/NewHorizons/issues/3584)
+Added a config option for changing the ReinforcedGlass percentage
+Renamed Materials2 -> GTNH_ExtraMaterials and fixed it
Diffstat (limited to 'src/main/java/gregtech/common/items')
-rw-r--r-- | src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java | 6 | ||||
-rw-r--r-- | src/main/java/gregtech/common/items/armor/ArmorData.java | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java index bb11224f13..10658125bf 100644 --- a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java +++ b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java @@ -18,6 +18,8 @@ import net.minecraft.item.ItemStack; import java.util.List;
+import static gregtech.GT_Mod.GT_FML_LOGGER;
+
public class GT_IntegratedCircuit_Item extends GT_Generic_Item {
private final static String aTextEmptyRow = " ";
public GT_IntegratedCircuit_Item() {
@@ -96,7 +98,7 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item { super.registerIcons(aIconRegister);
if (GregTech_API.sPostloadFinished) {
GT_Log.out.println("GT_Mod: Starting Item Icon Load Phase");
- System.out.println("GT_Mod: Starting Item Icon Load Phase");
+ GT_FML_LOGGER.info("GT_Mod: Starting Item Icon Load Phase");
GregTech_API.sItemIcons = aIconRegister;
try {
for (Runnable tRunnable : GregTech_API.sGTItemIconload) {
@@ -104,7 +106,7 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item { }
} catch (Throwable e) {e.printStackTrace(GT_Log.err);}
GT_Log.out.println("GT_Mod: Finished Item Icon Load Phase");
- System.out.println("GT_Mod: Finished Item Icon Load Phase");
+ GT_FML_LOGGER.info("GT_Mod: Finished Item Icon Load Phase");
}
}
}
diff --git a/src/main/java/gregtech/common/items/armor/ArmorData.java b/src/main/java/gregtech/common/items/armor/ArmorData.java index 52265a2b33..c8061db988 100644 --- a/src/main/java/gregtech/common/items/armor/ArmorData.java +++ b/src/main/java/gregtech/common/items/armor/ArmorData.java @@ -16,6 +16,8 @@ import java.text.DecimalFormatSymbols; import java.text.NumberFormat; import java.util.*; +import static gregtech.GT_Mod.GT_FML_LOGGER; + public class ArmorData { public int type; // 0 = helmet; 1 = chestplate; 2 = leggings; 3 = boots; @@ -385,7 +387,8 @@ public class ArmorData { public void change(Map aMap, StatType aType, float aChange){ float tChange = 0; - if(aMap==null)System.out.println("changeMapnull"); + if(aMap==null) + GT_FML_LOGGER.info("changeMapnull"); if(aMap.containsKey(aType)){ Object value = aMap.get(aType); tChange = value != null ? (float) aMap.get(aType) : 0.0f; |