From 2855aaffb538f5dae1fcbbbd051bfb4e3a5951c8 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Thu, 1 Nov 2018 14:58:08 +0000 Subject: + Added new Radioactive ore. + Added Custom Nuclear Texture Set. % More material work. $ Fixed issue allowing Multiblocks to have > 1 Control Core Hatch. $ Fixed Broken Ore texture for ENRICHED TextureSet. $ Fixed a few fluid recipes broken in the refactor. --- src/Java/gtPlusPlus/core/material/ORES.java | 509 +++++++++++++++++----------- 1 file changed, 307 insertions(+), 202 deletions(-) (limited to 'src/Java/gtPlusPlus/core/material/ORES.java') diff --git a/src/Java/gtPlusPlus/core/material/ORES.java b/src/Java/gtPlusPlus/core/material/ORES.java index a99cdc476d..d8ac82d724 100644 --- a/src/Java/gtPlusPlus/core/material/ORES.java +++ b/src/Java/gtPlusPlus/core/material/ORES.java @@ -11,11 +11,13 @@ public final class ORES { MaterialState.ORE, //State TextureSets.GEM_A.get(), //Texture Set new short[]{187, 193, 204, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 1), new MaterialStack(ELEMENT.getInstance().TITANIUM, 1), @@ -27,11 +29,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_FINE, //Texture Set new short[]{193, 187, 131, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().CALCIUM, 2), new MaterialStack(ELEMENT.getInstance().POTASSIUM, 2), @@ -48,11 +52,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_METALLIC, //Texture Set new short[]{184, 198, 105, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().CALCIUM, 2), new MaterialStack(ELEMENT.getInstance().TITANIUM, 2), @@ -66,11 +72,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_FINE, //Texture Set new short[]{45, 26, 0, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().CALCIUM, 2), new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2), @@ -84,11 +92,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_GEM_VERTICAL, //Texture Set new short[]{255, 143, 84, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().LEAD, 1), new MaterialStack(ELEMENT.getInstance().CHROMIUM, 1), @@ -100,11 +110,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_METALLIC, //Texture Set new short[]{22, 19, 19, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().NICKEL, 1), new MaterialStack(ELEMENT.getInstance().COBALT, 1), @@ -119,11 +131,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_METALLIC, //Texture Set new short[]{255, 143, 84, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), //Y not YT/YB new MaterialStack(ELEMENT.getInstance().OXYGEN, 3) @@ -135,11 +149,13 @@ public final class ORES { MaterialState.ORE, //State TextureSets.ENRICHED.get(), //Texture Set new short[]{65, 163, 164, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 1, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), //Y not YT/YB new MaterialStack(ELEMENT.getInstance().IRON, 10), @@ -155,11 +171,13 @@ public final class ORES { MaterialState.ORE, //State TextureSets.ENRICHED.get(), //Texture Set new short[]{95, 193, 194, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 1, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), //Y not YT/YB new MaterialStack(ELEMENT.getInstance().IRON, 9), @@ -174,11 +192,13 @@ public final class ORES { MaterialState.ORE, //State TextureSets.GEM_A.get(), //Texture Set new short[]{195, 19, 19, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1), new MaterialStack(ELEMENT.getInstance().SILICON, 1), @@ -191,11 +211,13 @@ public final class ORES { MaterialState.ORE, //State TextureSets.REFINED.get(), //Texture Set new short[]{15, 159, 59, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().CERIUM, 4), new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2), @@ -213,11 +235,13 @@ public final class ORES { MaterialState.ORE, //State TextureSets.REFINED.get(), //Texture Set new short[]{35, 189, 99, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().CERIUM, 2), new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2), @@ -234,11 +258,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_EMERALD, //Texture Set new short[]{175, 175, 20, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 1, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 2), @@ -253,11 +279,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_OPAL, //Texture Set new short[]{235, 89, 199, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1), @@ -269,11 +297,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_RUBY, //Texture Set new short[]{35, 189, 99, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), new MaterialStack(ELEMENT.getInstance().THORIUM, 2), @@ -286,11 +316,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_DIAMOND, //Texture Set new short[]{35, 19, 199, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().CERIUM, 1), new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), @@ -303,11 +335,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_ROUGH, //Texture Set new short[]{51, 0, 11, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 1, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), @@ -325,11 +359,13 @@ public final class ORES { MaterialState.ORE, //State TextureSets.REFINED.get(), //Texture Set new short[]{30, 0, 6, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().POTASSIUM, 3), new MaterialStack(ELEMENT.getInstance().SODIUM, 3), @@ -348,11 +384,13 @@ public final class ORES { MaterialState.ORE, //State TextureSets.GEM_A.get(), //Texture Set new short[]{229, 208, 48, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{// (Ca,Th,Ce)Zr(Ti,Nb)2O7 new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), new MaterialStack(ELEMENT.getInstance().THORIUM, 1), @@ -368,11 +406,13 @@ public final class ORES { MaterialState.ORE, //State TextureSets.REFINED.get(), //Texture Set new short[]{219, 160, 214, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{// (La)2(CO3)3·8(H2O) new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2), new MaterialStack(ELEMENT.getInstance().OXYGEN, 3), @@ -386,11 +426,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_METALLIC, //Texture Set new short[]{186, 113, 179, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{// (Ce)2(CO3)3·8(H2O) new MaterialStack(ELEMENT.getInstance().CERIUM, 2), new MaterialStack(ELEMENT.getInstance().OXYGEN, 3), @@ -404,11 +446,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_METALLIC, //Texture Set new short[]{153, 76, 145, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{// (Nd)2(CO3)3·8(H2O) new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2), new MaterialStack(ELEMENT.getInstance().OXYGEN, 3), @@ -422,11 +466,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_METALLIC, //Texture Set new short[]{58, 31, 0, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{// ((Ca,Ce)(Al,Ti,Mg)12O19) new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), new MaterialStack(ELEMENT.getInstance().CERIUM, 1), @@ -441,11 +487,13 @@ public final class ORES { MaterialState.ORE, //State TextureSets.REFINED.get(), //Texture Set new short[]{68, 13, 0, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{// (Ce,La,Ca)9(Mg,Fe+3)(SiO4)6(SiO3OH)(OH)3 new MaterialStack(ELEMENT.getInstance().CERIUM, 9), new MaterialStack(ELEMENT.getInstance().LANTHANUM, 9), @@ -462,11 +510,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_METALLIC, //Texture Set new short[]{210, 232, 44, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{// (YCa)Cu5(As2O4)3(OH)6·3H2O new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), @@ -481,11 +531,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_METALLIC, //Texture Set new short[]{170, 188, 33, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{// (CdCa)Cu7(AsO2)4(O2H)5·3H2O new MaterialStack(ELEMENT.getInstance().CADMIUM, 1), new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), @@ -500,11 +552,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_FINE, //Texture Set new short[]{206, 232, 9, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{// (LaCa)Cu5(AsO6)2(OH)4·3H2O new MaterialStack(ELEMENT.getInstance().LANTHANUM, 1), new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), @@ -519,11 +573,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_METALLIC, //Texture Set new short[]{225, 244, 78, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{// (NdCa)Cu6(As3O3)2(O2H)6·3H2O new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 1), new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), @@ -538,11 +594,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_FINE, //Texture Set new short[]{255, 255, 30, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{// (Ca,Sr,Ce,Na)5(PO4)3F new MaterialStack(ELEMENT.getInstance().CALCIUM, 5), new MaterialStack(ELEMENT.getInstance().STRONTIUM, 5), @@ -558,11 +616,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_METALLIC, //Texture Set new short[]{249, 249, 124, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{// SmAl3(PO4)2(OH)6 new MaterialStack(ELEMENT.getInstance().SAMARIUM, 1), new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 3), @@ -576,11 +636,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_SHINY, //Texture Set new short[]{205, 205, 255, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().SODIUM, 3), new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 1), @@ -593,11 +655,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_FINE, //Texture Set new short[]{165, 105, 205, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), new MaterialStack(ELEMENT.getInstance().IODINE, 2), @@ -610,11 +674,13 @@ public final class ORES { MaterialState.ORE, //State TextureSets.REFINED.get(), //Texture Set new short[]{165, 105, 205, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().CHLORINE, 1), new MaterialStack(ELEMENT.getInstance().BROMINE, 1), @@ -628,11 +694,13 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_SHINY, //Texture Set new short[]{165, 75, 75, 0}, //Material Colour - 500, - 1500, - 50, - 75, - 0, //Radiation + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", + -1, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().BISMUTH, 13), new MaterialStack(ELEMENT.getInstance().SULFUR, 11), @@ -646,10 +714,12 @@ public final class ORES { MaterialState.ORE, //State TextureSets.REFINED.get(), //Texture Set new short[]{65, 205, 105, 0}, //Material Colour - 500, - 1500, - 50, - 75, + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", 0, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().MERCURY, 54/4), @@ -667,10 +737,12 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_METALLIC, //Texture Set new short[]{77, 165, 174, 0}, //Material Colour - 500, - 1500, - 50, - 75, + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", 0, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().SULFUR, 5), @@ -688,10 +760,12 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_FINE, //Texture Set new short[]{165, 165, 5, 0}, //Material Colour - 500, - 1500, - 50, - 75, + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", 0, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().GOLD, 3), @@ -706,10 +780,12 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_METALLIC, //Texture Set new short[]{16, 5, 105, 0}, //Material Colour - 500, - 1500, - 50, - 75, + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", 0, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().GOLD, 8), @@ -725,10 +801,12 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_FINE, //Texture Set new short[]{75, 75, 75, 0}, //Material Colour - 500, - 1500, - 50, - 75, + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", 0, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().PALLADIUM, 11), @@ -743,10 +821,12 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_SHINY, //Texture Set new short[]{75, 105, 75, 0}, //Material Colour - 500, - 1500, - 50, - 75, + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", 0, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().IRIDIUM, 2), @@ -761,10 +841,12 @@ public final class ORES { MaterialState.ORE, //State TextureSets.ENRICHED.get(), //Texture Set new short[]{125, 105, 105, 0}, //Material Colour - 500, - 1500, - 50, - 75, + -1, + -1, + -1, + -1, + false, + "(IrRuRhPt)SAs", 0, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().IRIDIUM, 1), @@ -783,10 +865,10 @@ public final class ORES { MaterialState.ORE, //State TextureSet.SET_FLINT, //Texture Set new short[]{205, 205, 205, 0}, //Material Colour - 500, - 1500, - 50, - 75, + -1, + -1, + -1, + -1, 0, //Radiation new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().BARIUM, 32), @@ -795,6 +877,29 @@ public final class ORES { new MaterialStack(ELEMENT.getInstance().OXYGEN, 15) }); + + public static final Material DEEP_EARTH_REACTOR_FUEL_DEPOSIT = new Material( + "Radioactive Minerial Mix", //Material Name + MaterialState.ORE, //State + TextureSets.NUCLEAR.get(), //Texture Set + null, //Material Colour + -1, + -1, + -1, + -1, + 4, //Radiation + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().RADON, 3), + new MaterialStack(ELEMENT.getInstance().RADIUM, 2), + new MaterialStack(ELEMENT.getInstance().URANIUM235, 1), + new MaterialStack(ELEMENT.getInstance().URANIUM238, 13), + new MaterialStack(ELEMENT.getInstance().THORIUM, 28), + new MaterialStack(ELEMENT.getInstance().THORIUM232, 5), + new MaterialStack(FLUORCAPHITE, 4), + new MaterialStack(SAMARSKITE_Y, 6), + new MaterialStack(TITANITE, 2) + }); + -- cgit