aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSphyix <masifede2@gmail.com>2021-07-26 02:44:36 +0200
committerSphyix <masifede2@gmail.com>2021-07-26 02:44:36 +0200
commit047277e7c499cab16529545bb82a27e2ced32c0e (patch)
tree1a8ff8427901247b66ca3f0d47bdbed3b8fc138c
parent775f859b55835791cbebc422e0addf8fabd3dc2f (diff)
downloadGT5-Unofficial-047277e7c499cab16529545bb82a27e2ced32c0e.tar.gz
GT5-Unofficial-047277e7c499cab16529545bb82a27e2ced32c0e.tar.bz2
GT5-Unofficial-047277e7c499cab16529545bb82a27e2ced32c0e.zip
clean, fixed nano
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java31
1 files changed, 8 insertions, 23 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index 39102b6b46..e35661a617 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -560,8 +560,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
addFullHazmatToIC2Item("hazmatBoots");
addFullHazmatToIC2Item("nanoHelmet");
addFullHazmatToIC2Item("nanoBoots");
- addFullHazmatToIC2Item("nanoLegs");
- addFullHazmatToIC2Item("nanoChestplate");
+ addFullHazmatToIC2Item("nanoLeggings");
+ addFullHazmatToIC2Item("nanoBodyarmor");
addFullHazmatToIC2Item("quantumHelmet");
addFullHazmatToIC2Item("quantumBodyarmor");
addFullHazmatToIC2Item("quantumLeggings");
@@ -605,15 +605,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
addFullHazmatToGeneralItem("TaintedMagic", "ItemVoidFortressChestplate", 1L);
addFullHazmatToGeneralItem("TaintedMagic", "ItemVoidFortressLeggings", 1L);
addFullHazmatToGeneralItem("TaintedMagic", "ItemVoidmetalGoggles", 1L);
- //TaintedMagic Hazmat
- addFullHazmatToGeneralItem("TaintedMagic", "ItemVoidwalkerBoots", 1L, 0);
- addFullHazmatToGeneralItem("TaintedMagic", "ItemShadowFortressHelmet", 1L, 0);
- addFullHazmatToGeneralItem("TaintedMagic", "ItemShadowFortressChestplate", 1L, 0);
- addFullHazmatToGeneralItem("TaintedMagic", "ItemShadowFortressLeggings", 1L, 0);
- addFullHazmatToGeneralItem("TaintedMagic", "ItemVoidFortressHelmet", 1L, 0);
- addFullHazmatToGeneralItem("TaintedMagic", "ItemVoidFortressChestplate", 1L, 0);
- addFullHazmatToGeneralItem("TaintedMagic", "ItemVoidFortressLeggings", 1L, 0);
- addFullHazmatToGeneralItem("TaintedMagic", "ItemVoidmetalGoggles", 1L, 0);
//WitchingGadgets Hazmat
addFullHazmatToGeneralItem("WitchingGadgets", "item.WG_PrimordialHelm", 1L);
@@ -2097,26 +2088,20 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
public static void addFullHazmatToGeneralItem(String aModID, String aItem, long aAmount, int aMeta){
ItemStack item = GT_ModHandler.getModItem(aModID, aItem, aAmount, aMeta);
- GregTech_API.sGasHazmatList.add(item);
- GregTech_API.sBioHazmatList.add(item);
- GregTech_API.sFrostHazmatList.add(item);
- GregTech_API.sHeatHazmatList.add(item);
- GregTech_API.sRadioHazmatList.add(item);
- GregTech_API.sElectroHazmatList.add(item);
+ addItemToHazmatLists(item);
}
public static void addFullHazmatToGeneralItem(String aModID, String aItem, long aAmount){
ItemStack item = GT_ModHandler.getModItem(aModID, aItem, aAmount, W);
- GregTech_API.sGasHazmatList.add(item);
- GregTech_API.sBioHazmatList.add(item);
- GregTech_API.sFrostHazmatList.add(item);
- GregTech_API.sHeatHazmatList.add(item);
- GregTech_API.sRadioHazmatList.add(item);
- GregTech_API.sElectroHazmatList.add(item);
+ addItemToHazmatLists(item);
}
public static void addFullHazmatToIC2Item(String aItem){
ItemStack item = GT_ModHandler.getIC2Item(aItem, 1L, W);
+ addItemToHazmatLists(item);
+ }
+
+ private static void addItemToHazmatLists(ItemStack item){
GregTech_API.sGasHazmatList.add(item);
GregTech_API.sBioHazmatList.add(item);
GregTech_API.sFrostHazmatList.add(item);