aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2016-10-08 20:35:41 +0200
committerBlood-Asp <bloodasphendrik@gmail.com>2016-10-08 20:35:41 +0200
commit64e495e32c42083e0d929ba0426289bae90ee3af (patch)
treef4c7d9d708d8e14e7a593e58229fb3ea10ab094f /src
parent104bcf62d8052d88f6ccb6ef7c95f0b43fadd09f (diff)
downloadGT5-Unofficial-64e495e32c42083e0d929ba0426289bae90ee3af.tar.gz
GT5-Unofficial-64e495e32c42083e0d929ba0426289bae90ee3af.tar.bz2
GT5-Unofficial-64e495e32c42083e0d929ba0426289bae90ee3af.zip
Auto enable subitems when parser enables items.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/GT_Mod.java31
1 files changed, 29 insertions, 2 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index 6ab68dbde9..01ef1f9ae2 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -361,7 +361,9 @@ public class GT_Mod implements IGT_Mod {
for(String test : oreTags){
if(StringUtils.startsWithAny(test, preS)){
mMTTags.add(test);
- System.out.println("oretag: "+test);}}
+ if(GT_Values.D1)
+ System.out.println("oretag: "+test);
+ }}
System.out.println("reenableMetaItems");
for(String reEnable : mMTTags){
@@ -370,7 +372,32 @@ public class GT_Mod implements IGT_Mod {
Materials tName = Materials.get(reEnable.replaceFirst(tPrefix.toString(), ""));
if(tName!=null){
tPrefix.mDisabledItems.remove(tName);
- tPrefix.mGeneratedItems.add(tName);}else{System.out.println("noMaterial "+reEnable);}
+ tPrefix.mGeneratedItems.add(tName);
+ if(tPrefix == OrePrefixes.screw){
+ OrePrefixes.bolt.mDisabledItems.remove(tName);
+ OrePrefixes.bolt.mGeneratedItems.add(tName);
+ OrePrefixes.stick.mDisabledItems.remove(tName);
+ OrePrefixes.stick.mGeneratedItems.add(tName);
+ }
+ if(tPrefix == OrePrefixes.round){
+ OrePrefixes.nugget.mDisabledItems.remove(tName);
+ OrePrefixes.nugget.mGeneratedItems.add(tName);
+ }
+ if(tPrefix == OrePrefixes.spring){
+ OrePrefixes.stickLong.mDisabledItems.remove(tName);
+ OrePrefixes.stickLong.mGeneratedItems.add(tName);
+ OrePrefixes.stick.mDisabledItems.remove(tName);
+ OrePrefixes.stick.mGeneratedItems.add(tName);
+ }
+ if(tPrefix == OrePrefixes.springSmall){
+ OrePrefixes.stick.mDisabledItems.remove(tName);
+ OrePrefixes.stick.mGeneratedItems.add(tName);
+ }
+ if(tPrefix == OrePrefixes.stickLong){
+ OrePrefixes.stick.mDisabledItems.remove(tName);
+ OrePrefixes.stick.mGeneratedItems.add(tName);
+ }
+ }else{System.out.println("noMaterial "+reEnable);}
}else{System.out.println("noPrefix "+reEnable);}}
new Enchantment_EnderDamage();