aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
diff options
context:
space:
mode:
authorJohannes Gäßler <updrn@student.kit.edu>2017-07-26 23:54:00 +0200
committerJohannes Gäßler <updrn@student.kit.edu>2017-07-26 23:54:00 +0200
commitbfea3e8e9985168c28ad727019b18acb2b703314 (patch)
tree6f5cf38c2ac9dd0fb5cd6b1f6fb0407c26759e1d /src/main/java/gregtech/api/enums
parent1763f60b3638286cfa7b0f17f6aff72e744c8a1d (diff)
downloadGT5-Unofficial-bfea3e8e9985168c28ad727019b18acb2b703314.tar.gz
GT5-Unofficial-bfea3e8e9985168c28ad727019b18acb2b703314.tar.bz2
GT5-Unofficial-bfea3e8e9985168c28ad727019b18acb2b703314.zip
Increased output chance for Silver from washing with Mercury to 99%
Diffstat (limited to 'src/main/java/gregtech/api/enums')
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java3
-rw-r--r--src/main/java/gregtech/api/enums/SubTag.java7
2 files changed, 8 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 871bbfd01a..7e596089fb 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -1192,7 +1192,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
SubTag.ELECTROMAGNETIC_SEPERATION_IRON.addTo(YellowLimonite, BrownLimonite, Pyrite, BandedIron, Nickel, Vermiculite, Glauconite, GlauconiteSand, Pentlandite, Tin, Antimony, Ilmenite, Manganese, Chrome, Chromite, Andradite);
SubTag.BLASTFURNACE_CALCITE_DOUBLE.addTo(Pyrite, BrownLimonite, YellowLimonite, BasalticMineralSand, GraniticMineralSand, Magnetite);
SubTag.BLASTFURNACE_CALCITE_TRIPLE.addTo(Iron, PigIron, DeepIron, ShadowIron, WroughtIron, MeteoricIron);
- SubTag.WASHING_MERCURY.addTo(Gold, Silver, Osmium, Mithril, Platinum, Midasium, Cooperite, AstralSilver);
+ SubTag.WASHING_MERCURY.addTo(Gold, Osmium, Mithril, Platinum, Midasium, Cooperite, AstralSilver);
+ SubTag.WASHING_MERCURY_99_PERCENT.addTo(Silver);
SubTag.WASHING_SODIUMPERSULFATE.addTo(Zinc, Nickel, Copper, Cobalt, Cobaltite, Tetrahedrite);
SubTag.METAL.addTo(AnyIron, AnyCopper, AnyBronze, Metal, Aluminium, Americium, Antimony, Beryllium, Bismuth, Caesium, Cerium, Chrome, Cobalt, Copper, Dysprosium, Erbium, Europium, Gadolinium, Gallium, Gold,
Holmium, Indium, Iridium, Iron, Lanthanum, Lead, Lutetium, Magnesium, Manganese, Mercury, Niobium, Molybdenum, Neodymium, Neutronium, Nickel, Osmium, Palladium, Platinum, Plutonium, Plutonium241,
diff --git a/src/main/java/gregtech/api/enums/SubTag.java b/src/main/java/gregtech/api/enums/SubTag.java
index e202aeaf77..76d1a5a31c 100644
--- a/src/main/java/gregtech/api/enums/SubTag.java
+++ b/src/main/java/gregtech/api/enums/SubTag.java
@@ -47,10 +47,15 @@ public final class SubTag implements ICondition<ISubTagContainer> {
public static final SubTag WASHING_SODIUMPERSULFATE = getNewSubTag("WASHING_SODIUMPERSULFATE");
/**
* Add this to your Material if you want to have its Ore Mercury washed. Already listed are:
- * Gold, Silver, Osmium, Mithril, Platinum, Midasium, Cooperite and AstralSilver.
+ * Gold, Osmium, Mithril, Platinum, Midasium, Cooperite and AstralSilver.
*/
public static final SubTag WASHING_MERCURY = getNewSubTag("WASHING_MERCURY");
/**
+ * Add this to your Material if you want to have its Ore Mercury washed with 99% output chance. Already listed are:
+ * Silver
+ */
+ public static final SubTag WASHING_MERCURY_99_PERCENT = getNewSubTag("WASHING_MERCURY_99_PERCENT");
+ /**
* Add this to your Material if you want to have its Ore electromagnetically separated to give Gold.
*/
public static final SubTag ELECTROMAGNETIC_SEPERATION_GOLD = getNewSubTag("ELECTROMAGNETIC_SEPERATION_GOLD");