diff --git a/src/main/java/io/github/cpearl0/ctnhcore/registry/material/CTNHMaterials.java b/src/main/java/io/github/cpearl0/ctnhcore/registry/material/CTNHMaterials.java index 431661a7..c4a7439c 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/registry/material/CTNHMaterials.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/registry/material/CTNHMaterials.java @@ -256,7 +256,6 @@ public static void init() { .cnlang("神圣石") .dust() .color(0xababab).secondaryColor(0x757575).iconSet(ROUGH) - .flags(DECOMPOSITION_BY_CENTRIFUGING) .buildAndRegister(); Zanite = REGISTRATE.material(CTNHCore.id("zanite")) @@ -820,7 +819,7 @@ public static void init() { .buildAndRegister(); MeteoricTroilite = REGISTRATE.material(CTNHCore.id("meteoric_troilite")) .cnlang("陨硫铁镍") - .ore() + .dust().ore() .color(0x696969).secondaryColor(0x2F4F4F) .iconSet(METALLIC) .flags(DECOMPOSITION_BY_ELECTROLYZING) @@ -846,7 +845,7 @@ public static void init() { .buildAndRegister(); Cerite = REGISTRATE.material(CTNHCore.id("cerite")) .cnlang("铈硅石") - .ore() + .dust().ore() .color(0xE6D8AD).secondaryColor(0xC9B37E) .iconSet(ROUGH) .flags(DECOMPOSITION_BY_CENTRIFUGING) @@ -864,7 +863,7 @@ public static void init() { .buildAndRegister(); GadoliniteSm = REGISTRATE.material(CTNHCore.id("gadolinite_sm")) .cnlang("钐硅铍钇") - .ore() + .dust().ore() .color(0x2F4F4F).secondaryColor(0x1E3D3D) .iconSet(DULL) .components(Samarium, 1, Iron, 1, Beryllium, 1, Silicon, 2, Oxygen, 8) @@ -872,7 +871,7 @@ public static void init() { .buildAndRegister(); Sperrylite = REGISTRATE.material(CTNHCore.id("sperrylite")) .cnlang("砷铂") - .ore() + .dust().ore() .color(0x8B8B83).secondaryColor(0x696969) .iconSet(SHINY) .components(Platinum, 1, Arsenic, 2) @@ -880,7 +879,7 @@ public static void init() { .buildAndRegister(); Wolframite = REGISTRATE.material(CTNHCore.id("wolframite")) .cnlang("黑钨") - .ore() + .dust().ore() .color(0x4B3A26).secondaryColor(0x2F1B0C) .iconSet(DULL) .components(Iron, 1, Manganese, 1, Tungsten, 1, Oxygen, 4) @@ -889,7 +888,7 @@ public static void init() { .buildAndRegister(); Germanite = REGISTRATE.material(CTNHCore.id("germanite")) .cnlang("锗镓") - .ore() + .dust().ore() .color(0x708090).secondaryColor(0x2F4F4F) .iconSet(METALLIC) .components(Copper, 3, Germanium, 1, Gallium, 1, Sulfur, 4) @@ -897,7 +896,7 @@ public static void init() { .buildAndRegister(); Bismuthinite = REGISTRATE.material(CTNHCore.id("bismuthinite")) .cnlang("辉铋") - .ore() + .dust().ore() .color(0x9C9C9C).secondaryColor(0x7A7A7A) .iconSet(METALLIC) .components(Bismuth, 2, Sulfur, 3) @@ -905,7 +904,7 @@ public static void init() { .buildAndRegister(); Yttrofluorite = REGISTRATE.material(CTNHCore.id("yttrofluorite")) .cnlang("钇萤石") - .ore() + .dust().ore() .color(0x77DD77).secondaryColor(0x50C878) .iconSet(OPAL) .components(Calcium, 1, Yttrium, 1, Fluorine, 4) @@ -913,7 +912,7 @@ public static void init() { .buildAndRegister(); Tarkianite = REGISTRATE.material(CTNHCore.id("tarkianite")) .cnlang("铼钼") - .ore() + .dust().ore() .color(0x4682B4).secondaryColor(0x1E90FF) .iconSet(SHINY) .components(Rhenium, 1, Molybdenum, 1, Sulfur, 4) @@ -922,7 +921,7 @@ public static void init() { .buildAndRegister(); Crocoite = REGISTRATE.material(CTNHCore.id("crocoite")) .cnlang("红铬铅") - .ore() + .dust().ore() .color(0xD22B2B).secondaryColor(0x8B0000) .iconSet(RUBY) .components(Lead, 1, Chromium, 1, Oxygen, 4) @@ -930,7 +929,7 @@ public static void init() { .buildAndRegister(); Smithsonite = REGISTRATE.material(CTNHCore.id("smithsonite")) .cnlang("菱锌") - .ore() + .dust().ore() .color(0x7FFFD4).secondaryColor(0x66CDAA) .iconSet(OPAL) .components(Zinc, 1, Carbon, 1, Oxygen, 3) @@ -938,7 +937,7 @@ public static void init() { .buildAndRegister(); Roquesite = REGISTRATE.material(CTNHCore.id("roquesite")) .cnlang("铜铟") - .ore() + .dust().ore() .color(0x9370DB).secondaryColor(0x8A2BE2) .iconSet(SHINY) .components(Copper, 1, Indium, 1, Sulfur, 2) @@ -946,7 +945,7 @@ public static void init() { .buildAndRegister(); Rheniite = REGISTRATE.material(CTNHCore.id("rheniite")) .cnlang("辉铼") - .ore() + .dust().ore() .color(0xA9A9A9).secondaryColor(0x808080) .iconSet(METALLIC) .components(Rhenium, 1, Sulfur, 2) diff --git a/src/main/java/io/github/cpearl0/ctnhcore/registry/material/GTMaterialAddon.java b/src/main/java/io/github/cpearl0/ctnhcore/registry/material/GTMaterialAddon.java index 725e3d40..1721ad95 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/registry/material/GTMaterialAddon.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/registry/material/GTMaterialAddon.java @@ -51,7 +51,6 @@ public static void init() { Dubnium.addFlags(GENERATE_FINE_WIRE); Rhenium.setProperty(PropertyKey.INGOT, new IngotProperty()); Rhenium.addFlags(GENERATE_PLATE); - Calcium.setProperty(PropertyKey.INGOT, new IngotProperty()); Gadolinium.setProperty(PropertyKey.DUST, new DustProperty()); CTNHMaterials.addDust(Praseodymium); CTNHMaterials.addDust(Terbium); diff --git a/src/main/java/io/github/cpearl0/ctnhcore/registry/ores/AdAstraOres.java b/src/main/java/io/github/cpearl0/ctnhcore/registry/ores/AdAstraOres.java index c125b942..6418be5f 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/registry/ores/AdAstraOres.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/registry/ores/AdAstraOres.java @@ -29,8 +29,7 @@ public class AdAstraOres { .dimensions(MOON) .layeredVeinGenerator(generator -> generator .buildLayerPattern(pattern -> pattern - .layer(l -> l.weight(3).mat(GTMaterials.Bornite).size(2, 4)) - .layer(l -> l.weight(2).mat(GTMaterials.Cooperite).size(1, 1)) + .layer(l -> l.weight(3).mat(GTMaterials.Cooperite).size(2, 4)) .layer(l -> l.weight(2).mat(PlatinumLineMaterials.PlatinumOre).size(1, 1)) .layer(l -> l.weight(1).mat(PlatinumLineMaterials.PalladiumOre).size(1, 1)))) .surfaceIndicatorGenerator(indicator -> indicator diff --git a/src/main/java/io/github/cpearl0/ctnhcore/registry/ores/TwilightForestOres.java b/src/main/java/io/github/cpearl0/ctnhcore/registry/ores/TwilightForestOres.java index 3cc4de3d..279b67d5 100644 --- a/src/main/java/io/github/cpearl0/ctnhcore/registry/ores/TwilightForestOres.java +++ b/src/main/java/io/github/cpearl0/ctnhcore/registry/ores/TwilightForestOres.java @@ -49,7 +49,7 @@ public class TwilightForestOres { .heightRangeUniform(-30, 20) .layeredVeinGenerator(generator -> generator .buildLayerPattern(pattern -> pattern - // .layer(l -> l.weight(2).mat(CTNHMaterials.SteelLeaf).size(2, 4)) + .layer(l -> l.weight(2).mat(CTNHMaterials.SteelLeaf).size(2, 4)) .layer(l -> l.weight(1).mat(GTMaterials.Apatite).size(2, 4)) .layer(l -> l.weight(1).mat(GTMaterials.Pyrochlore).size(2, 4)))) .surfaceIndicatorGenerator(indicator -> indicator @@ -71,8 +71,8 @@ public class TwilightForestOres { .buildLayerPattern(pattern -> pattern .layer(l -> l.weight(2).mat(GTMaterials.Apatite).size(2, 4)) .layer(l -> l.weight(2).mat(GTMaterials.Coal).size(2, 4)) - .layer(l -> l.weight(1).mat(GTMaterials.Graphite)))) - // .layer(l -> l.weight(1).mat(CTNHMaterials.SpiritAsh).size(1, 1)) + .layer(l -> l.weight(1).mat(GTMaterials.Graphite)) + .layer(l -> l.weight(1).mat(CTNHMaterials.SpiritAsh).size(1, 1)))) .surfaceIndicatorGenerator(indicator -> indicator .surfaceRock(GTMaterials.Apatite))); @@ -91,8 +91,8 @@ public class TwilightForestOres { .buildLayerPattern(pattern -> pattern .layer(l -> l.weight(3).mat(GTMaterials.Cinnabar).size(2, 4)) .layer(l -> l.weight(2).mat(GTMaterials.Galena)) - .layer(l -> l.weight(1).mat(GTMaterials.Saltpeter)))) - // .layer(l -> l.weight(1).mat(CTNHMaterials.ToxicSwampAmber).size(1, 1)) + .layer(l -> l.weight(1).mat(GTMaterials.Saltpeter)) + .layer(l -> l.weight(1).mat(CTNHMaterials.ToxicSwampAmber).size(1, 1)))) .surfaceIndicatorGenerator(indicator -> indicator .surfaceRock(GTMaterials.Cinnabar))); @@ -112,8 +112,8 @@ public class TwilightForestOres { .buildLayerPattern(pattern -> pattern .layer(l -> l.weight(2).mat(GTMaterials.Pyrite).size(2, 4)) .layer(l -> l.weight(2).mat(GTMaterials.VanadiumMagnetite).size(2, 4)) - .layer(l -> l.weight(2).mat(GTMaterials.Tantalite).size(2, 4)))) - // .layer(l -> l.weight(1).mat(CTNHMaterials.IllusionIron).size(1, 1)) + .layer(l -> l.weight(2).mat(GTMaterials.Tantalite).size(2, 4)) + .layer(l -> l.weight(1).mat(CTNHMaterials.IllusionIron).size(1, 1)))) .surfaceIndicatorGenerator(indicator -> indicator .surfaceRock(GTMaterials.VanadiumMagnetite))); @@ -132,8 +132,8 @@ public class TwilightForestOres { .layeredVeinGenerator(generator -> generator .buildLayerPattern(pattern -> pattern .layer(l -> l.weight(2).mat(GTMaterials.Electrotine).size(2, 4)) - .layer(l -> l.weight(1).mat(GTMaterials.Lapis)))) - // .layer(l -> l.weight(1).mat(CTNHMaterials.PolarIceCore).size(1, 1)) + .layer(l -> l.weight(1).mat(GTMaterials.Lapis)) + .layer(l -> l.weight(1).mat(CTNHMaterials.PolarIceCore).size(1, 1)))) .surfaceIndicatorGenerator(indicator -> indicator .surfaceRock(GTMaterials.Lapis))); @@ -153,8 +153,8 @@ public class TwilightForestOres { .buildLayerPattern(pattern -> pattern .layer(l -> l.weight(2).mat(GTMaterials.Hematite).size(2, 4)) .layer(l -> l.weight(1).mat(GTMaterials.Ruby)) - .layer(l -> l.weight(1).mat(GTMaterials.Pyrochlore)))) - // .layer(l -> l.weight(1).mat(CTNHMaterials.Dragonflame).size(1, 1)) + .layer(l -> l.weight(1).mat(GTMaterials.Pyrochlore)) + .layer(l -> l.weight(1).mat(CTNHMaterials.Dragonflame).size(1, 1)))) .surfaceIndicatorGenerator(indicator -> indicator .surfaceRock(GTMaterials.Ruby))); @@ -174,8 +174,8 @@ public class TwilightForestOres { .buildLayerPattern(pattern -> pattern .layer(l -> l.weight(3).mat(GTMaterials.Stibnite).size(2, 4)) .layer(l -> l.weight(2).mat(GTMaterials.Antimony)) - .layer(l -> l.weight(1).mat(GTMaterials.Silver)))) - // .layer(l -> l.weight(1).mat(CTNHMaterials.EclipseShadow).size(1, 1)) + .layer(l -> l.weight(1).mat(GTMaterials.Silver)) + .layer(l -> l.weight(1).mat(CTNHMaterials.EclipseShadow).size(1, 1)))) .surfaceIndicatorGenerator(indicator -> indicator .surfaceRock(GTMaterials.Stibnite))); @@ -194,9 +194,8 @@ public class TwilightForestOres { .layeredVeinGenerator(generator -> generator .buildLayerPattern(pattern -> pattern .layer(l -> l.weight(2).mat(GTMaterials.Gold).size(2, 4)) - .layer(l -> l.weight(2).mat(GTMaterials.Diamond).size(2, 4)))) - // .layer(l -> l.weight(1).mat(CTNHMaterials.EclipseShadow).size(1, 1)) - // .layer(l -> l.weight(1).mat(CTNHMaterials.LightningPattern).size(1, 1)) + .layer(l -> l.weight(2).mat(GTMaterials.Diamond).size(2, 4)) + .layer(l -> l.weight(1).mat(CTNHMaterials.LightningPattern).size(1, 1)))) .surfaceIndicatorGenerator(indicator -> indicator .surfaceRock(GTMaterials.Diamond)));