aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums/Materials.java
diff options
context:
space:
mode:
authorMuramasa <haydenkilloh@gmail.com>2016-08-31 04:57:16 +0100
committerMuramasa <haydenkilloh@gmail.com>2016-08-31 04:57:16 +0100
commitac013d92c789ae5a17723c6a6de9ae9fb8d3dd38 (patch)
treeecb9c5b7bcec890fbb3e8edbbd837dab02f78052 /src/main/java/gregtech/api/enums/Materials.java
parentadca5141f903515c3107698953a27f6497893743 (diff)
downloadGT5-Unofficial-ac013d92c789ae5a17723c6a6de9ae9fb8d3dd38.tar.gz
GT5-Unofficial-ac013d92c789ae5a17723c6a6de9ae9fb8d3dd38.tar.bz2
GT5-Unofficial-ac013d92c789ae5a17723c6a6de9ae9fb8d3dd38.zip
Actually, probably better to just exclude these
Diffstat (limited to 'src/main/java/gregtech/api/enums/Materials.java')
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index f88baa6ba2..7d2b4c534e 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -1385,15 +1385,18 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
if (!enableAllRounds && (aMaterial != Materials.HSSE || aMaterial == Materials.Neutronium || aMaterial == Materials.HSSG)) aMaterial.mComponents.remove(OrePrefixes.round);
//if (!enableAllFrameBoxes) aMaterial.mComponents.remove(OrePrefixes.frameGt);
if (!enableAllCrates) {
- aMaterial.mComponents.remove(OrePrefixes.crateGtDust);
+ if (!(aMaterial == DamascusSteel || aMaterial == Steel || aMaterial == Bronze || aMaterial == Materials.Manganese))
+ aMaterial.mComponents.remove(OrePrefixes.crateGtIngot);
+ if (!(aMaterial == Materials.Neodymium || aMaterial == Materials.Chrome))
+ aMaterial.mComponents.remove(OrePrefixes.crateGtDust);
aMaterial.mComponents.remove(OrePrefixes.crateGtGem);
- aMaterial.mComponents.remove(OrePrefixes.crateGtIngot);
aMaterial.mComponents.remove(OrePrefixes.crateGtPlate);
}
if (!enableAllArrows) {
aMaterial.mComponents.remove(OrePrefixes.toolHeadArrow);
- aMaterial.mComponents.remove(OrePrefixes.arrowGtWood);
aMaterial.mComponents.remove(OrePrefixes.arrowGtPlastic);
+ if (!(aMaterial == Materials.DamascusSteel || aMaterial == Materials.SterlingSilver))
+ aMaterial.mComponents.remove(OrePrefixes.arrowGtWood);
}
if (!enableAllPlates && (((aMaterial.mTypes & 0x40) == 0) || (((aMaterial.mTypes & 0x04) == 0) && aMaterial.mTransparent)) && !(aMaterial == Materials.Silicon || aMaterial == Materials.Zinc || aMaterial == Materials.Europium ||
aMaterial == Materials.Americium || aMaterial == Materials.RedAlloy || aMaterial == Materials.SolderingAlloy || aMaterial == Materials.BatteryAlloy ||