diff options
| author | Dream-Master <dream-master@gmx.net> | 2018-10-22 11:31:34 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2018-10-22 11:31:34 +0200 |
| commit | 810e74afc8d0e44f55b2db584789b67ccf001c0b (patch) | |
| tree | 4a139e83aa9d8cd79e6cf07f86c90bc08421849e /src/main | |
| parent | c0a624b65a4355ca056aaada3b0006b26b70dc22 (diff) | |
| download | GT5-Unofficial-810e74afc8d0e44f55b2db584789b67ccf001c0b.tar.gz GT5-Unofficial-810e74afc8d0e44f55b2db584789b67ccf001c0b.tar.bz2 GT5-Unofficial-810e74afc8d0e44f55b2db584789b67ccf001c0b.zip | |
oredict itemcasings from ic2
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/gregtech/api/enums/OrePrefixes.java | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 0799081a86..c32a101bca 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -652,6 +652,7 @@ public enum OrePrefixes { boolean enableUnusedRods = GregTech_API.sMaterialComponents.get("globalcomponents", "enableUnusedRods", false);
boolean enableUnusedLongRods = GregTech_API.sMaterialComponents.get("globalcomponents", "enableUnusedLongRods", false);
boolean enableUnusedGems = GregTech_API.sMaterialComponents.get("globalcomponents", "enableUnusedGems", false);
+ boolean enableUnusedItemCasing = GregTech_API.sMaterialComponents.get("globalcomponents", "enableUnusedItemCasing", false);
//TODO possibly use OrePrefix mNotGeneratedItems/mGeneratedItems instead of a static List for every material instance?
//TODO Make sure stuff like gem plates / standard plates / paper plates all generate with the current condition
@@ -764,15 +765,28 @@ public enum OrePrefixes { aMaterial == Materials.TungstenSteel))
stickLong.mDisabledItems.add(aMaterial);
- if (!enableUnusedGems && ((aMaterial.mTypes & 0x04) == 0)) {
+ if (!enableUnusedGems && ((aMaterial.mTypes & 0x04) == 0))
gem.mDisabledItems.add(aMaterial);
gemChipped.mDisabledItems.add(aMaterial);
gemFlawless.mDisabledItems.add(aMaterial);
gemFlawed.mDisabledItems.add(aMaterial);
gemExquisite.mDisabledItems.add(aMaterial);
+
+ //itemCasing
+ if (!enableUnusedItemCasing && ((aMaterial.mTypes & 0x40) == 0) && !(aMaterial == Materials.Titanium || aMaterial == Materials.Chrome || aMaterial == Materials.Iron ||
+ aMaterial == Materials.Tin || aMaterial == Materials.Osmium || aMaterial == Materials.Iridium || aMaterial == Materials.Neutronium ||
+ aMaterial == Materials.Bronze || aMaterial == Materials.WroughtIron || aMaterial == Materials.Steel || aMaterial == Materials.StainlessSteel ||
+ aMaterial == Materials.PigIron || aMaterial == Materials.TungstenSteel || aMaterial == Materials.HSSE || aMaterial == Materials.HSSG ||
+ aMaterial == Materials.Aluminium || aMaterial == Materials.Copper || aMaterial == Materials.Neodymium || aMaterial == Materials.Europium ||
+ aMaterial == Materials.Platinum || aMaterial == Materials.Gold || aMaterial == Materials.Uranium235 || aMaterial == Materials.Plutonium241 ||
+ aMaterial == Materials.Americium || aMaterial == Materials.Neutronium || aMaterial == Materials.Bronze || aMaterial == Materials.Brass ||
+ aMaterial == Materials.Electrum || aMaterial == Materials.NaquadahEnriched || aMaterial == Materials.CobaltBrass || aMaterial == Materials.IronMagnetic ||
+ aMaterial == Materials.SteelMagnetic || aMaterial == Materials.NeodymiumMagnetic || aMaterial == Materials.Samarium || aMaterial == Materials.SamariumMagnetic || aMaterial == Materials.VanadiumGallium || aMaterial == Materials.Diamond ||
+ aMaterial == Materials.Wood || aMaterial == Materials.Plastic || aMaterial == Materials.Lead || aMaterial == Materials.SolderingAlloy || aMaterial == Materials.Lapis ||
+ aMaterial == Materials.Lazurite || aMaterial == Materials.Sodalite|| aMaterial == Materials.PolyvinylChloride))
+ itemCasing.mDisabledItems.add(aMaterial);
}
}
- }
for (IMaterialHandler aRegistrator : Materials.mMaterialHandlers) {
aRegistrator.onComponentInit();
}
|