diff options
Diffstat (limited to 'src/Java')
4 files changed, 261 insertions, 58 deletions
diff --git a/src/Java/gtPlusPlus/core/material/ORES.java b/src/Java/gtPlusPlus/core/material/ORES.java index 39c86e1bfa..75d6da07fe 100644 --- a/src/Java/gtPlusPlus/core/material/ORES.java +++ b/src/Java/gtPlusPlus/core/material/ORES.java @@ -587,8 +587,215 @@ public final class ORES { new MaterialStack(ELEMENT.getInstance().FLUORINE, 6) }); - - + //Iodine Source + public static final Material LAUTARITE = new Material( + "Lautarite", //Material Name + MaterialState.ORE, //State + TextureSet.SET_FINE, //Texture Set + new short[]{165, 105, 205, 0}, //Material Colour + 500, + 1500, + 50, + 75, + 0, //Radiation + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), + new MaterialStack(ELEMENT.getInstance().IODINE, 2), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 6) + }); + + // Tl(Cl,Br) + public static final Material LAFOSSAITE = new Material( + "Lafossaite", //Material Name + MaterialState.ORE, //State + TextureSet.SET_METALLIC, //Texture Set + new short[]{165, 105, 205, 0}, //Material Colour + 500, + 1500, + 50, + 75, + 0, //Radiation + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().CHLORINE, 1), + new MaterialStack(ELEMENT.getInstance().BROMINE, 1), + new MaterialStack(ELEMENT.getInstance().THALLIUM, 1) + }); + + //Demicheleite-(Br) + // BiSBr + public static final Material DEMICHELEITE_BR = new Material( + "Demicheleite (Br)", //Material Name + MaterialState.ORE, //State + TextureSet.SET_SHINY, //Texture Set + new short[]{165, 75, 75, 0}, //Material Colour + 500, + 1500, + 50, + 75, + 0, //Radiation + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().BISMUTH, 13), + new MaterialStack(ELEMENT.getInstance().SULFUR, 11), + new MaterialStack(ELEMENT.getInstance().BROMINE, 1) + }); + + //Comancheite + //Hg55N24(NH2,OH)4(Cl,Br)34 + public static final Material COMANCHEITE = new Material( + "Comancheite", //Material Name + MaterialState.ORE, //State + TextureSet.SET_FINE, //Texture Set + new short[]{65, 205, 105, 0}, //Material Colour + 500, + 1500, + 50, + 75, + 0, //Radiation + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().MERCURY, 54/4), + new MaterialStack(ELEMENT.getInstance().NITROGEN, 28/4), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12/4), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 8/4), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 34/4), + new MaterialStack(ELEMENT.getInstance().BROMINE, 34/4) + }); + + //Perroudite + //Hg5Ag4S5(I,Br)2Cl2 + public static final Material PERROUDITE = new Material( + "Perroudite", //Material Name + MaterialState.ORE, //State + TextureSet.SET_METALLIC, //Texture Set + new short[]{77, 165, 174, 0}, //Material Colour + 500, + 1500, + 50, + 75, + 0, //Radiation + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().SULFUR, 5), + new MaterialStack(ELEMENT.getInstance().SILVER, 4), + new MaterialStack(ELEMENT.getInstance().IODINE, 2), + new MaterialStack(ELEMENT.getInstance().MERCURY, 5), + new MaterialStack(ELEMENT.getInstance().BROMINE, 2), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 2) + }); + + //Honeaite + //Au3TlTe2 + public static final Material HONEAITE = new Material( + "Honeaite", //Material Name + MaterialState.ORE, //State + TextureSet.SET_FINE, //Texture Set + new short[]{165, 165, 5, 0}, //Material Colour + 500, + 1500, + 50, + 75, + 0, //Radiation + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().GOLD, 3), + new MaterialStack(ELEMENT.getInstance().THALLIUM, 1), + new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2) + }); + + //Alburnite + //Ag8GeTe2S4 + public static final Material ALBURNITE = new Material( + "Alburnite", //Material Name + MaterialState.ORE, //State + TextureSet.SET_METALLIC, //Texture Set + new short[]{16, 5, 105, 0}, //Material Colour + 500, + 1500, + 50, + 75, + 0, //Radiation + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().GOLD, 8), + new MaterialStack(ELEMENT.getInstance().GERMANIUM, 1), + new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2), + new MaterialStack(ELEMENT.getInstance().SULFUR, 4) + }); + + //Miessiite + //Pd11Te2Se2 + public static final Material MIESSIITE = new Material( + "Miessiite", //Material Name + MaterialState.ORE, //State + TextureSet.SET_FINE, //Texture Set + new short[]{75, 75, 75, 0}, //Material Colour + 500, + 1500, + 50, + 75, + 0, //Radiation + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().PALLADIUM, 11), + new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2), + new MaterialStack(ELEMENT.getInstance().SELENIUM, 2) + }); + + //Kashinite + //(Ir,Rh)2S3 + public static final Material KASHINITE = new Material( + "Kashinite", //Material Name + MaterialState.ORE, //State + TextureSet.SET_SHINY, //Texture Set + new short[]{75, 105, 75, 0}, //Material Colour + 500, + 1500, + 50, + 75, + 0, //Radiation + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().IRIDIUM, 2), + new MaterialStack(ELEMENT.getInstance().RHODIUM, 2), + new MaterialStack(ELEMENT.getInstance().SULFUR, 3) + }); + + //Irarsite + //(Ir,Ru,Rh,Pt)AsS + public static final Material IRARSITE = new Material( + "Irarsite", //Material Name + MaterialState.ORE, //State + TextureSet.SET_FIERY, //Texture Set + new short[]{125, 105, 105, 0}, //Material Colour + 500, + 1500, + 50, + 75, + 0, //Radiation + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().IRIDIUM, 1), + new MaterialStack(ELEMENT.getInstance().RUTHENIUM, 1), + new MaterialStack(ELEMENT.getInstance().RHODIUM, 1), + new MaterialStack(ELEMENT.getInstance().PLATINUM, 1), + new MaterialStack(ELEMENT.getInstance().ARSENIC, 1), + new MaterialStack(ELEMENT.getInstance().SULFUR, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 1) + }); + + //Radiobarite + //Radium, Barium, Barite? + public static final Material RADIOBARITE = new Material( + "Barite (Rd)", //Material Name + MaterialState.ORE, //State + TextureSet.SET_FLINT, //Texture Set + new short[]{205, 205, 205, 0}, //Material Colour + 500, + 1500, + 50, + 75, + 0, //Radiation + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().BARIUM, 32), + new MaterialStack(ELEMENT.getInstance().RADIUM, 1), + new MaterialStack(ELEMENT.getInstance().SULFUR, 16), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 15) + }); + + diff --git a/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java b/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java index 501c29400a..031533f026 100644 --- a/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java +++ b/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java @@ -105,6 +105,18 @@ public class GTplusplus_Everglades implements ActionListener { MaterialGenerator.generateOreMaterial(ORES.FLORENCITE); MaterialGenerator.generateOreMaterial(ORES.CRYOLITE); + MaterialGenerator.generateOreMaterial(ORES.LAUTARITE); + MaterialGenerator.generateOreMaterial(ORES.LAFOSSAITE); + MaterialGenerator.generateOreMaterial(ORES.DEMICHELEITE_BR); + MaterialGenerator.generateOreMaterial(ORES.COMANCHEITE); + MaterialGenerator.generateOreMaterial(ORES.PERROUDITE); + MaterialGenerator.generateOreMaterial(ORES.HONEAITE); + MaterialGenerator.generateOreMaterial(ORES.ALBURNITE); + MaterialGenerator.generateOreMaterial(ORES.MIESSIITE); + MaterialGenerator.generateOreMaterial(ORES.KASHINITE); + MaterialGenerator.generateOreMaterial(ORES.IRARSITE); + MaterialGenerator.generateOreMaterial(ORES.RADIOBARITE); + //Custom Ores if (LoadedMods.Big_Reactors) { MaterialGenerator.generateOreMaterial(ELEMENT.getInstance().YELLORIUM, false, false, true, new short[] {255, 242, 10}); @@ -118,6 +130,9 @@ public class GTplusplus_Everglades implements ActionListener { false, ELEMENT.getInstance().TRINIUM_REFINED.getRGBA()); } + + + } protected synchronized void setVars(FMLPreInitializationEvent event){ @@ -133,8 +148,8 @@ public class GTplusplus_Everglades implements ActionListener { */ WorldGen_Ores.generateValidOreVeins(); WorldGen_GT_Base.oreveinPercentage = 64; - WorldGen_GT_Base.oreveinAttempts = 32; - WorldGen_GT_Base.oreveinMaxPlacementAttempts = 6; + WorldGen_GT_Base.oreveinAttempts = 16; + WorldGen_GT_Base.oreveinMaxPlacementAttempts = 4; if (CORE.DEBUG || CORE.DEVENV){ WorldGen_GT_Base.debugWorldGen = true; } diff --git a/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java b/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java index 3a9329c4c3..f1d62cf58e 100644 --- a/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java +++ b/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java @@ -55,7 +55,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { // This is probably not going to work. Trying to create a fake orevein to // put into hashtable when there will be no ores in a vein. public static WorldGen_GT_Ore_Layer noOresInVein = new WorldGen_GT_Ore_Layer("vein0", 0, 255, 0, 0, - 0, ELEMENT.getInstance().ALUMINIUM, ELEMENT.getInstance().ALUMINIUM, ELEMENT.getInstance().ALUMINIUM, ELEMENT.getInstance().ALUMINIUM); + 0, ELEMENT.getInstance().IRON, ELEMENT.getInstance().IRON, ELEMENT.getInstance().IRON, ELEMENT.getInstance().IRON); public static Hashtable<Long, WorldGen_GT_Ore_Layer> validOreveins = new Hashtable<Long, WorldGen_GT_Ore_Layer>( 1024); diff --git a/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java b/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java index 3b9108149a..978deb1d25 100644 --- a/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java +++ b/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java @@ -53,26 +53,7 @@ public class WorldGen_Ores { public static volatile Pair<Block, Integer> Cryolite; // Na3AlF6 //public static volatile Pair<Block, Integer> Pyroxene; // - private static final Material PYRITE = MaterialUtils.generateMaterialFromGtENUM(Materials.Pyrite); - private static final Material PYROPE = MaterialUtils.generateMaterialFromGtENUM(Materials.Pyrope); - private static final Material ALMANDINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Almandine); - private static final Material RUBY = MaterialUtils.generateMaterialFromGtENUM(Materials.Ruby); - private static final Material CHALCOPYRITE = MaterialUtils.generateMaterialFromGtENUM(Materials.Chalcopyrite); - private static final Material PLATINUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Platinum); - private static final Material TOPAZ = MaterialUtils.generateMaterialFromGtENUM(Materials.Topaz); - private static final Material SAPPHIRE_GREEN = MaterialUtils.generateMaterialFromGtENUM(Materials.GreenSapphire); - private static final Material SAPPHIRE_BLUE = MaterialUtils.generateMaterialFromGtENUM(Materials.Sapphire); - private static final Material BAUXITE = MaterialUtils.generateMaterialFromGtENUM(Materials.Bauxite); - - private static final Material NAQPLUS = MaterialUtils.generateMaterialFromGtENUM(Materials.NaquadahEnriched); - private static final Material NAQUADRIA = MaterialUtils.generateMaterialFromGtENUM(Materials.Naquadria); - private static final Material OSMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Osmium); - private static final Material AMETHYST = MaterialUtils.generateMaterialFromGtENUM(Materials.Amethyst); - private static final Material BISMUTH = MaterialUtils.generateMaterialFromGtENUM(Materials.Bismuth); - private static final Material PLUTONIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Plutonium); - private static final Material URNAIUM235 = MaterialUtils.generateMaterialFromGtENUM(Materials.Uranium235); - private static final Material INFUSEDGOLD = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedGold); - + public static WorldGen_GT_Ore_Layer BaseVein = new WorldGen_GT_Ore_Layer( @@ -81,10 +62,10 @@ public class WorldGen_Ores { 1, 8, 128, - ELEMENT.getInstance().ALUMINIUM, - ELEMENT.getInstance().SILICON, - ELEMENT.getInstance().COPPER, - ELEMENT.getInstance().LEAD); + ELEMENT.getInstance().IRON, + ELEMENT.getInstance().IRON, + ELEMENT.getInstance().IRON, + ELEMENT.getInstance().IRON); @@ -100,8 +81,8 @@ public class WorldGen_Ores { 16, ORES.AGARDITE_CD, ORES.AGARDITE_LA, - ELEMENT.getInstance().SILICON, - ELEMENT.getInstance().BERYLLIUM); + ORES.DEMICHELEITE_BR, + ORES.IRARSITE); public static WorldGen_GT_Ore_Layer Vein2 = new WorldGen_GT_Ore_Layer( "vein2", @@ -111,7 +92,7 @@ public class WorldGen_Ores { 16, ORES.AGARDITE_ND, ORES.AGARDITE_Y, - PYRITE, + ORES.KASHINITE, ORES.CERITE); public static WorldGen_GT_Ore_Layer Vein3 = new WorldGen_GT_Ore_Layer( @@ -122,7 +103,7 @@ public class WorldGen_Ores { 32, ORES.CERITE, ORES.NICHROMITE, - PYROPE, + ORES.XENOTIME, ORES.HIBONITE); public static WorldGen_GT_Ore_Layer Vein4 = new WorldGen_GT_Ore_Layer( @@ -134,7 +115,7 @@ public class WorldGen_Ores { ORES.GEIKIELITE, ORES.CRYOLITE, ORES.GADOLINITE_CE, - RUBY); + ORES.AGARDITE_ND); @@ -143,7 +124,7 @@ public class WorldGen_Ores { 30, 128, 20, 8, - 64, + 48, ORES.HIBONITE, ORES.YTTRIALITE, ORES.ZIRCONILITE, @@ -153,19 +134,19 @@ public class WorldGen_Ores { 0, 40, 20, 8, - 64, + 48, ORES.XENOTIME, ORES.ZIRKELITE, ORES.CROCROITE, - ALMANDINE); + ORES.IRARSITE); public static WorldGen_GT_Ore_Layer Vein7 = new WorldGen_GT_Ore_Layer( "vein7", 40, 128, 20, 8, - 64, - RUBY, - TOPAZ, + 48, + ORES.HONEAITE, + ORES.MIESSIITE, ORES.SAMARSKITE_Y, ORES.SAMARSKITE_YB); public static WorldGen_GT_Ore_Layer Vein8 = new WorldGen_GT_Ore_Layer( @@ -173,7 +154,7 @@ public class WorldGen_Ores { 0, 40, 20, 8, - 64, + 48, ORES.TITANITE, ORES.ZIMBABWEITE, ORES.ZIRCON, @@ -187,10 +168,10 @@ public class WorldGen_Ores { 10, 30, 20, 4, - 64, + 48, ORES.LANTHANITE_CE, FLUORIDES.FLUORITE, - PLATINUM, + ORES.LAFOSSAITE, ORES.FLORENCITE); public static WorldGen_GT_Ore_Layer Vein10 = new WorldGen_GT_Ore_Layer( "vein10", @@ -201,15 +182,15 @@ public class WorldGen_Ores { ORES.GEIKIELITE, ORES.YTTROCERITE, ORES.LANTHANITE_LA, - BAUXITE); + ORES.RADIOBARITE); public static WorldGen_GT_Ore_Layer Vein11 = new WorldGen_GT_Ore_Layer( "vein11", 30, 70, 20, 5, - 64, + 48, FLUORIDES.FLUORITE, - SAPPHIRE_BLUE, + ORES.KASHINITE, ORES.ZIRCON, ORES.CRYOLITE); public static WorldGen_GT_Ore_Layer Vein12 = new WorldGen_GT_Ore_Layer( @@ -219,8 +200,8 @@ public class WorldGen_Ores { 8, 32, ORES.CERITE, - SAPPHIRE_GREEN, - CHALCOPYRITE, + ORES.ALBURNITE, + ORES.MIESSIITE, ORES.HIBONITE); /** @@ -234,8 +215,8 @@ public class WorldGen_Ores { 5, 16, ORES.CRYOLITE, - NAQPLUS, - NAQUADRIA, + ORES.RADIOBARITE, + ORES.HONEAITE, ORES.FLORENCITE); public static WorldGen_GT_Ore_Layer Vein14 = new WorldGen_GT_Ore_Layer( @@ -244,10 +225,10 @@ public class WorldGen_Ores { 8, 3, 16, - URNAIUM235, - PLUTONIUM, - OSMIUM, - AMETHYST); + ORES.DEMICHELEITE_BR, + ORES.PERROUDITE, + ORES.IRARSITE, + ORES.RADIOBARITE); public static WorldGen_GT_Ore_Layer Vein15 = new WorldGen_GT_Ore_Layer( "vein15", @@ -256,7 +237,7 @@ public class WorldGen_Ores { 6, 24, ORES.FLUORCAPHITE, - BISMUTH, + ORES.LAFOSSAITE, ORES.GADOLINITE_CE, ORES.GADOLINITE_Y); @@ -268,7 +249,7 @@ public class WorldGen_Ores { 32, ORES.YTTROCERITE, ORES.LEPERSONNITE, - INFUSEDGOLD, + ORES.LAUTARITE, FLUORIDES.FLUORITE); public static WorldGen_GT_Ore_Layer Vein17 = new WorldGen_GT_Ore_Layer( @@ -278,7 +259,7 @@ public class WorldGen_Ores { 5, 32, ORES.FLORENCITE, - URNAIUM235, + ORES.LAUTARITE, ORES.SAMARSKITE_YB, ORES.POLYCRASE); public static WorldGen_GT_Ore_Layer Vein18 = new WorldGen_GT_Ore_Layer( @@ -286,7 +267,7 @@ public class WorldGen_Ores { 15, 40, 4, 4, - 64, + 48, ORES.GADOLINITE_CE, ORES.GADOLINITE_Y, ORES.AGARDITE_LA, |