diff options
Diffstat (limited to 'src/main/java/gregtech')
| -rw-r--r-- | src/main/java/gregtech/api/enums/Materials.java | 7 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java | 125 |
2 files changed, 132 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index f2fcc9aebd..72820cba2e 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -220,6 +220,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials Carmot = new Materials( 962, TextureSet.SET_METALLIC , 16.0F, 128, 1, 1|2 |8 |64 , 217, 205, 140, 0, "Carmot" , "Carmot" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL ); public static Materials Celenegil = new Materials( 964, TextureSet.SET_METALLIC , 10.0F, 4096, 2, 1|2 |8 |64 , 148, 204, 72, 0, "Celenegil" , "Celenegil" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes._NULL ); public static Materials CertusQuartz = new Materials( 516, TextureSet.SET_QUARTZ , 5.0F, 32, 1, 1 |4|8 |64 , 210, 210, 230, 0, "CertusQuartz" , "Certus Quartz" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeLightGray , Arrays.asList(new TC_AspectStack(TC_Aspects.POTENTIA, 1), new TC_AspectStack(TC_Aspects.VITREUS, 1))); + public static Materials CertusQuartzCharged = new Materials( 517, TextureSet.SET_QUARTZ , 5.0F, 32, 1, 8 , 221, 221, 236, 0, "CertusQuartzCharged" , "Charged Certus Quartz" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeLightGray , Arrays.asList(new TC_AspectStack(TC_Aspects.POTENTIA, 1), new TC_AspectStack(TC_Aspects.VITREUS, 1), new TC_AspectStack(TC_Aspects.ELECTRUM, 1))); public static Materials Ceruclase = new Materials( 952, TextureSet.SET_METALLIC , 32.0F, 1280, 2, 1|2 |8 |64|128 , 140, 189, 208, 0, "Ceruclase" , "Ceruclase" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlue ).disableAutoGeneratedBlastFurnaceRecipes().setTurbineMultipliers(1, 22, 1); public static Materials Citrine = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Citrine" , "Citrine" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes._NULL ); public static Materials CobaltHexahydrate = new Materials( 853, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1 |16 , 80, 80, 250, 0, "CobaltHexahydrate" , "Cobalt Hexahydrate" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlue ); @@ -1470,6 +1471,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { .setSmeltingMultiplier(2); CertusQuartz.setOreMultiplier(2) .setSmeltingMultiplier(2); + CertusQuartzCharged.setOreMultiplier(2) + .setSmeltingMultiplier(2); TricalciumPhosphate.setOreMultiplier(3) .setSmeltingMultiplier(3); Saltpeter.setOreMultiplier(4) @@ -1694,6 +1697,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Pyrochlore.addOreByProducts(Apatite, Calcite, Niobium); Quartzite.addOreByProducts(CertusQuartz, Barite); CertusQuartz.addOreByProducts(Quartzite, Barite); + CertusQuartzCharged.addOreByProducts(CertusQuartz, Quartzite, Barite); BrownLimonite.addOreByProducts(Malachite, YellowLimonite); Neodymium.addOreByProducts(Monazite, RareEarth); Bastnasite.addOreByProducts(Neodymium, RareEarth); @@ -1875,6 +1879,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { NetherQuartz.mChemicalFormula = "SiO\u2082"; Quartzite.mChemicalFormula = "SiO\u2082"; CertusQuartz.mChemicalFormula = "SiO\u2082"; + CertusQuartzCharged.mChemicalFormula = "SiO\u2082"; MaterialsUEVplus.SpaceTime.mChemicalFormula = "Reality itself distilled into physical form"; MaterialsUEVplus.Universium.mChemicalFormula = "A tear into the space beyond space"; Longasssuperconductornameforuvwire.mChemicalFormula = "Nq*\u2084(Ir\u2083Os)\u2083EuSm"; @@ -2309,6 +2314,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Dilithium.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); NetherQuartz.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); CertusQuartz.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); + CertusQuartzCharged + .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); Fluix.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); TricalciumPhosphate .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE, SubTag.EXPLOSIVE); diff --git a/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java b/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java index b486f9d6c7..8213013bfc 100644 --- a/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java +++ b/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java @@ -1145,6 +1145,26 @@ public class GT_Worldgenloader implements Runnable { false, false, Materials.DeepIron); + new GT_Worldgen_GT_Ore_SmallPieces( + "ore.small.redgarnet", + true, + 5, + 35, + 2, + false, + false, + false, + Materials.GarnetRed); + new GT_Worldgen_GT_Ore_SmallPieces( + "ore.small.chargedcertus", + true, + 5, + 115, + 4, + false, + false, + false, + Materials.CertusQuartzCharged); // GT Default Veins @@ -2236,6 +2256,111 @@ public class GT_Worldgenloader implements Runnable { Materials.Apatite, Materials.Tantalite, Materials.Pyrochlore); + new GT_Worldgen_GT_Ore_Layer( + "ore.mix.certusquartz", + true, + 40, + 80, + 60, + 5, + 32, + false, + false, + false, + Materials.CertusQuartz, + Materials.CertusQuartz, + Materials.CertusQuartzCharged, + Materials.QuartzSand); + new GT_Worldgen_GT_Ore_Layer( + "ore.mix.infinitycatalyst", + true, + 5, + 20, + 15, + 2, + 16, + false, + false, + false, + Materials.Neutronium, + Materials.Adamantium, + Materials.InfinityCatalyst, + Materials.Bedrockium); + new GT_Worldgen_GT_Ore_Layer( + "ore.mix.cosmicneutronium", + true, + 5, + 20, + 15, + 2, + 16, + false, + false, + false, + Materials.Neutronium, + Materials.CosmicNeutronium, + Materials.BlackPlutonium, + Materials.Bedrockium); + new GT_Worldgen_GT_Ore_Layer( + "ore.mix.dilithium", + true, + 30, + 100, + 30, + 3, + 24, + false, + false, + false, + Materials.Dilithium, + Materials.Dilithium, + Materials.MysteriousCrystal, + Materials.Vinteum); + new GT_Worldgen_GT_Ore_Layer( + "ore.mix.naquadria", + true, + 10, + 90, + 40, + 4, + 24, + false, + false, + false, + Materials.Naquadah, + Materials.NaquadahEnriched, + Materials.Naquadria, + Materials.Trinium); + new GT_Worldgen_GT_Ore_Layer( + "ore.mix.awakeneddraconium", + true, + 20, + 40, + 20, + 3, + 16, + false, + false, + false, + Materials.Draconium, + Materials.Draconium, + Materials.DraconiumAwakened, + Materials.NetherStar); + new GT_Worldgen_GT_Ore_Layer( + "ore.mix.tengam", + true, + 30, + 180, + 80, + 2, + 32, + false, + false, + false, + Materials.TengamRaw, + Materials.TengamRaw, + Materials.Electrotine, + Materials.Samarium); // DO NOT DELETE V THIS V - this is needed so that gregtech generates its Ore Layer's first (the ones up there), // which can then be transformed into "GT_Worldgen_GT_Ore_Layer_Space". Also, Reflexion is slow. |