From c9e95bacd6e679bcad361111a6f7301cf9471aef Mon Sep 17 00:00:00 2001 From: daveningfr Date: Sat, 13 Dec 2025 22:29:06 +0800 Subject: [PATCH 1/4] 0.1.0 13/12/2025 Davening added the botania mats to core mod and setIgnored --- .../assets/astrogreg/lang/en_ud.json | 8 +- .../assets/astrogreg/lang/en_us.json | 8 +- src/main/java/com/astro/core/AstroCore.java | 2 +- .../java/com/astro/core/AstroGregGTAddon.java | 5 +- .../common/data/materials/AstroElements.java | 3 + .../common/data/materials/AstroMaterials.java | 82 ++++++++++++++++++- .../common/data/materials/AstroPolymers.java | 5 +- .../generated/AstroWireRecipeHandler.java | 4 +- 8 files changed, 104 insertions(+), 13 deletions(-) diff --git a/src/generated/resources/assets/astrogreg/lang/en_ud.json b/src/generated/resources/assets/astrogreg/lang/en_ud.json index c62332f3..5e64f216 100644 --- a/src/generated/resources/assets/astrogreg/lang/en_ud.json +++ b/src/generated/resources/assets/astrogreg/lang/en_ud.json @@ -17,14 +17,18 @@ "material.astrogreg.calorite": "ǝʇıɹoןɐƆ", "material.astrogreg.desh": "ɥsǝᗡ", "material.astrogreg.electrolyte": "ǝʇʎןoɹʇɔǝןƎ", + "material.astrogreg.elementium": "ɯnıʇuǝɯǝןƎ", "material.astrogreg.energized_steel": "ןǝǝʇS pǝzıbɹǝuƎ", "material.astrogreg.etrium": "ɯnıɹʇƎ", "material.astrogreg.futura_alloy": "ןǝǝʇS ɐɹnʇnℲ", + "material.astrogreg.gaiasteel": "ןǝǝʇsɐıɐ⅁", "material.astrogreg.jovite": "ǝʇıʌoſ", "material.astrogreg.juperium": "ɯnıɹǝdnſ", "material.astrogreg.kronalium": "ɯnıןɐuoɹʞ", + "material.astrogreg.manasteel": "ןǝǝʇsɐuɐW", "material.astrogreg.ostrum": "ɯnɹʇsO", - "material.astrogreg.polyamide_imide": "ǝpıɯI-pıɯɐʎןoԀ", + "material.astrogreg.polyamide_imide": "ǝpıɯI-ǝpıɯɐʎןoԀ", "material.astrogreg.saturlyte": "ǝʇʎןɹnʇɐS", - "material.astrogreg.sky_stone": "ǝuoʇS ʎʞS" + "material.astrogreg.sky_stone": "ǝuoʇS ʎʞS", + "material.astrogreg.terrasteel": "ןǝǝʇsɐɹɹǝ⟘" } \ No newline at end of file diff --git a/src/generated/resources/assets/astrogreg/lang/en_us.json b/src/generated/resources/assets/astrogreg/lang/en_us.json index a0aadfd3..911f642a 100644 --- a/src/generated/resources/assets/astrogreg/lang/en_us.json +++ b/src/generated/resources/assets/astrogreg/lang/en_us.json @@ -17,14 +17,18 @@ "material.astrogreg.calorite": "Calorite", "material.astrogreg.desh": "Desh", "material.astrogreg.electrolyte": "Electrolyte", + "material.astrogreg.elementium": "Elementium", "material.astrogreg.energized_steel": "Energized Steel", "material.astrogreg.etrium": "Etrium", "material.astrogreg.futura_alloy": "Futura Steel", + "material.astrogreg.gaiasteel": "Gaiasteel", "material.astrogreg.jovite": "Jovite", "material.astrogreg.juperium": "Juperium", "material.astrogreg.kronalium": "Kronalium", + "material.astrogreg.manasteel": "Manasteel", "material.astrogreg.ostrum": "Ostrum", - "material.astrogreg.polyamide_imide": "Polyamid-Imide", + "material.astrogreg.polyamide_imide": "Polyamide-Imide", "material.astrogreg.saturlyte": "Saturlyte", - "material.astrogreg.sky_stone": "Sky Stone" + "material.astrogreg.sky_stone": "Sky Stone", + "material.astrogreg.terrasteel": "Terrasteel" } \ No newline at end of file diff --git a/src/main/java/com/astro/core/AstroCore.java b/src/main/java/com/astro/core/AstroCore.java index 3221d5cb..855f8325 100644 --- a/src/main/java/com/astro/core/AstroCore.java +++ b/src/main/java/com/astro/core/AstroCore.java @@ -1,6 +1,5 @@ package com.astro.core; -import com.astro.core.common.data.materials.AstroPolymers; import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.data.chemical.material.event.MaterialEvent; import com.gregtechceu.gtceu.api.data.chemical.material.event.MaterialRegistryEvent; @@ -28,6 +27,7 @@ import com.astro.core.common.data.materials.AstroMaterialFlagAddition; import com.astro.core.common.data.materials.AstroMaterialFlags; import com.astro.core.common.data.materials.AstroMaterials; +import com.astro.core.common.data.materials.AstroPolymers; import com.astro.core.common.machine.multiblock.generator.AetherEngine; import com.astro.core.common.machine.multiblock.generator.ManaBoilers; import com.astro.core.datagen.AstroDatagen; diff --git a/src/main/java/com/astro/core/AstroGregGTAddon.java b/src/main/java/com/astro/core/AstroGregGTAddon.java index 884b8720..dc8ca529 100644 --- a/src/main/java/com/astro/core/AstroGregGTAddon.java +++ b/src/main/java/com/astro/core/AstroGregGTAddon.java @@ -1,7 +1,5 @@ package com.astro.core; -import com.astro.core.common.data.recipe.generated.AstroWireRecipeHandler; -import com.astro.core.common.data.recipe.run.AstroWireRecipeRunner; import com.gregtechceu.gtceu.api.addon.GTAddon; import com.gregtechceu.gtceu.api.addon.IGTAddon; import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate; @@ -11,6 +9,7 @@ import com.astro.core.common.data.AstroMachineRecipes; import com.astro.core.common.data.block.AstroBlocks; import com.astro.core.common.data.materials.AstroElements; +//import com.astro.core.common.data.recipe.run.AstroWireRecipeRunner; import com.astro.core.common.registry.AstroRegistry; import java.util.function.Consumer; @@ -42,7 +41,7 @@ public void registerTagPrefixes() {} @Override public void addRecipes(Consumer provider) { AstroMachineRecipes.init(provider); - AstroWireRecipeRunner.init(provider); +// AstroWireRecipeRunner.init(provider); } @Override diff --git a/src/main/java/com/astro/core/common/data/materials/AstroElements.java b/src/main/java/com/astro/core/common/data/materials/AstroElements.java index 5806023c..8c5d0f0a 100644 --- a/src/main/java/com/astro/core/common/data/materials/AstroElements.java +++ b/src/main/java/com/astro/core/common/data/materials/AstroElements.java @@ -13,6 +13,9 @@ public class AstroElements { public static final Element E = createAndRegister(-1, -1, -1, null, "electrolyte", "⚡", false); public static final Element SS = createAndRegister(-1, -1, -1, null, "sky_stone", "✨", false); public static final Element MN = createAndRegister(-1, -1, -1, null, "mana", "✨", false); + public static final Element TR = createAndRegister(-1, -1, -1, null, "terra", "✨", false); + public static final Element EL = createAndRegister(-1, -1, -1, null, "elementium", "✨", false); + public static final Element GA = createAndRegister(-1, -1, -1, null, "gaia", "✨", false); public static Element createAndRegister(long protons, long neutrons, long halfLifeSeconds, String decayTo, String name, String symbol, boolean isIsotope) { diff --git a/src/main/java/com/astro/core/common/data/materials/AstroMaterials.java b/src/main/java/com/astro/core/common/data/materials/AstroMaterials.java index 2b1baa7f..8b20442a 100644 --- a/src/main/java/com/astro/core/common/data/materials/AstroMaterials.java +++ b/src/main/java/com/astro/core/common/data/materials/AstroMaterials.java @@ -12,6 +12,8 @@ import earth.terrarium.adastra.common.registry.ModItems; import owmii.powah.block.Blcks; import owmii.powah.item.Itms; +import vazkii.botania.common.item.BotaniaItems; +import org.zeith.botanicadds.init.ItemsBA; import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; @@ -29,9 +31,12 @@ public class AstroMaterials { public static Material ENERGIZED_STEEL; public static Material SKY_STONE; public static Material FUTURA_ALLOY; + public static Material MANASTEEL; + public static Material TERRASTEEL; + public static Material ELEMENTIUM; + public static Material GAIASTEEL; public static void register() { - // Ad Astra/Extendra Materials DESH = new Material.Builder( AstroCore.id("desh")) @@ -169,9 +174,64 @@ public static void register() { .buildAndRegister(); // Botania + MANASTEEL = new Material.Builder( + AstroCore.id("manasteel")) + .langValue("Manasteel") + .dust() + .ingot() + .fluid() + .blastTemp(1000, BlastProperty.GasTier.LOW, 120, 400) + .flags(MaterialFlags.GENERATE_FRAME, MaterialFlags.GENERATE_DENSE, + MaterialFlags.GENERATE_PLATE, MaterialFlags.GENERATE_ROD, MaterialFlags.MORTAR_GRINDABLE) + .color(0x228cc9).secondaryColor(0x000000).iconSet(MaterialIconSet.SHINY) + .element(AstroElements.MN) + .formula("*Fe*") + .buildAndRegister(); + + TERRASTEEL = new Material.Builder( + AstroCore.id("terrasteel")) + .langValue("Terrasteel") + .dust() + .ingot() + .fluid() + .blastTemp(1700, BlastProperty.GasTier.LOW, 120, 800) + .flags(MaterialFlags.GENERATE_FRAME, MaterialFlags.GENERATE_DENSE, + MaterialFlags.GENERATE_PLATE, MaterialFlags.GENERATE_ROD, MaterialFlags.MORTAR_GRINDABLE) + .color(0x159e1e).secondaryColor(0x000000).iconSet(MaterialIconSet.SHINY) + .element(AstroElements.TR) + .formula("**Fe**") + .buildAndRegister(); + ELEMENTIUM = new Material.Builder( + AstroCore.id("elementium")) + .langValue("Elementium") + .dust() + .ingot() + .fluid() + .blastTemp(3500, BlastProperty.GasTier.MID, 120, 1600) + .flags(MaterialFlags.GENERATE_FRAME, MaterialFlags.GENERATE_DENSE, + MaterialFlags.GENERATE_PLATE, MaterialFlags.GENERATE_ROD, MaterialFlags.MORTAR_GRINDABLE) + .color(0xed64d4).secondaryColor(0x000000).iconSet(MaterialIconSet.SHINY) + .element(AstroElements.EL) + .formula("EL") + .buildAndRegister(); + GAIASTEEL = new Material.Builder( + AstroCore.id("gaiasteel")) + .langValue("Gaiasteel") + .dust() + .ingot() + .fluid() + .blastTemp(7100, BlastProperty.GasTier.HIGH, 120, 2400) + .flags(MaterialFlags.GENERATE_FRAME, MaterialFlags.GENERATE_DENSE, + MaterialFlags.GENERATE_PLATE, MaterialFlags.GENERATE_ROD, MaterialFlags.MORTAR_GRINDABLE) + .color(0x8c2929).secondaryColor(0x000000).iconSet(MaterialIconSet.SHINY) + .element(AstroElements.GA) + .formula("***Fe***") + .buildAndRegister(); } - public static void init() { + + +public static void init() { rawOre.setIgnored(AstroMaterials.DESH, ModItems.RAW_DESH); rawOreBlock.setIgnored(AstroMaterials.DESH, ModItems.RAW_DESH_BLOCK); block.setIgnored(AstroMaterials.DESH, ModItems.DESH_BLOCK); @@ -204,5 +264,23 @@ public static void init() { block.setIgnored(AstroMaterials.ENERGIZED_STEEL, Blcks.ENERGIZED_STEEL); dust.setIgnored(AstroMaterials.SKY_STONE, AEItems.SKY_DUST); + + ingot.setIgnored(AstroMaterials.MANASTEEL, () -> BotaniaItems.manaSteel); + dust.setIgnored(AstroMaterials.MANASTEEL, () -> BotaniaItems.manaPowder); + + ingot.setIgnored(AstroMaterials.TERRASTEEL, () -> BotaniaItems.terrasteel); + nugget.setIgnored(AstroMaterials.TERRASTEEL,() -> BotaniaItems.terrasteelNugget); + + ingot.setIgnored(AstroMaterials.ELEMENTIUM, () -> BotaniaItems.elementium); + nugget.setIgnored(AstroMaterials.ELEMENTIUM, () -> BotaniaItems.elementium); + + ingot.setIgnored(AstroMaterials.GAIASTEEL, ItemsBA.GAIASTEEL_INGOT); + + nugget.setIgnored(AstroMaterials.GAIASTEEL, () -> BotaniaItems.gaiaIngot); + + + + + } } diff --git a/src/main/java/com/astro/core/common/data/materials/AstroPolymers.java b/src/main/java/com/astro/core/common/data/materials/AstroPolymers.java index 9e614c9a..a95a0179 100644 --- a/src/main/java/com/astro/core/common/data/materials/AstroPolymers.java +++ b/src/main/java/com/astro/core/common/data/materials/AstroPolymers.java @@ -1,12 +1,14 @@ package com.astro.core.common.data.materials; -import com.astro.core.AstroCore; import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet; +import com.astro.core.AstroCore; + public class AstroPolymers { public static Material POLYAMIDE_IMIDE; + public static void register() { // GT Progression POLYAMIDE_IMIDE = new Material.Builder( @@ -20,5 +22,6 @@ public static void register() { // .components().formula() .buildAndRegister(); } + public static void init() {} } diff --git a/src/main/java/com/astro/core/common/data/recipe/generated/AstroWireRecipeHandler.java b/src/main/java/com/astro/core/common/data/recipe/generated/AstroWireRecipeHandler.java index a5530f7c..d19630e6 100644 --- a/src/main/java/com/astro/core/common/data/recipe/generated/AstroWireRecipeHandler.java +++ b/src/main/java/com/astro/core/common/data/recipe/generated/AstroWireRecipeHandler.java @@ -26,7 +26,8 @@ * Guide to Astro Core Cable Processing. *
* Cable Covering Fluids: - * - Polyamide-Imide: This can be used for any cable tier, saving the amount of fluid needed. However, at UV (?), it will be required. + * - Polyamide-Imide: This can be used for any cable tier, saving the amount of fluid needed. However, at UV (?), it + * will be required. *
* Extra Materials for Cable Covering: * - Polyphenylene Sulfide (PPS): At LuV, this foil is required to cover cables. Lower tiers will not use it. @@ -61,7 +62,6 @@ public static void run(@NotNull Consumer provider, @NotNull Mate generateCableCovering(provider, property, wireGtHex, material); } - private static void generateCableCovering(@NotNull Consumer provider, @NotNull WireProperties property, @NotNull TagPrefix prefix, @NotNull Material material) { From ab84510156361bcfd6a7a8f410d509877ab2e251 Mon Sep 17 00:00:00 2001 From: daveningfr Date: Sat, 13 Dec 2025 22:36:13 +0800 Subject: [PATCH 2/4] 0.1.0 13/12/2025 Davening added wire recipes that was previously gitignored --- .gitignore | 3 +++ .../java/com/astro/core/AstroGregGTAddon.java | 4 ++-- .../data/recipe/run/AstroWireRecipeRunner.java | 17 +++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/astro/core/common/data/recipe/run/AstroWireRecipeRunner.java diff --git a/.gitignore b/.gitignore index 365f4fd3..e5993572 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ # run run/* +#include run in src +!src/main/java/com/astro/core/common/data/recipe/run/ +!src/main/java/com/astro/core/common/data/recipe/run/** # gradle .gradle/ diff --git a/src/main/java/com/astro/core/AstroGregGTAddon.java b/src/main/java/com/astro/core/AstroGregGTAddon.java index dc8ca529..ac35cc42 100644 --- a/src/main/java/com/astro/core/AstroGregGTAddon.java +++ b/src/main/java/com/astro/core/AstroGregGTAddon.java @@ -9,7 +9,7 @@ import com.astro.core.common.data.AstroMachineRecipes; import com.astro.core.common.data.block.AstroBlocks; import com.astro.core.common.data.materials.AstroElements; -//import com.astro.core.common.data.recipe.run.AstroWireRecipeRunner; +import com.astro.core.common.data.recipe.run.AstroWireRecipeRunner; import com.astro.core.common.registry.AstroRegistry; import java.util.function.Consumer; @@ -41,7 +41,7 @@ public void registerTagPrefixes() {} @Override public void addRecipes(Consumer provider) { AstroMachineRecipes.init(provider); -// AstroWireRecipeRunner.init(provider); + AstroWireRecipeRunner.init(provider); } @Override diff --git a/src/main/java/com/astro/core/common/data/recipe/run/AstroWireRecipeRunner.java b/src/main/java/com/astro/core/common/data/recipe/run/AstroWireRecipeRunner.java new file mode 100644 index 00000000..d3267901 --- /dev/null +++ b/src/main/java/com/astro/core/common/data/recipe/run/AstroWireRecipeRunner.java @@ -0,0 +1,17 @@ +package com.astro.core.common.data.recipe.run; + +import com.astro.core.common.data.recipe.generated.AstroWireRecipeHandler; +import com.gregtechceu.gtceu.api.GTCEuAPI; +import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import net.minecraft.data.recipes.FinishedRecipe; +import org.jetbrains.annotations.NotNull; + +import java.util.function.Consumer; + +public class AstroWireRecipeRunner { + public static void init(@NotNull Consumer provider) { + for (Material material : GTCEuAPI.materialManager.getRegisteredMaterials()) { + AstroWireRecipeHandler.run(provider, material); + } + } +} From a7dcc3f7a8f5c85abd9cc4bd85f28a0d529fd549 Mon Sep 17 00:00:00 2001 From: daveningfr Date: Sat, 13 Dec 2025 23:00:11 +0800 Subject: [PATCH 3/4] 0.1.0 13/12/2025 Davening added Global GT values in java and added them to botania mats --- .../java/com/astro/core/common/GTVoltage.java | 63 +++++++++++++++++++ .../common/data/materials/AstroMaterials.java | 9 ++- 2 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/astro/core/common/GTVoltage.java diff --git a/src/main/java/com/astro/core/common/GTVoltage.java b/src/main/java/com/astro/core/common/GTVoltage.java new file mode 100644 index 00000000..2f205161 --- /dev/null +++ b/src/main/java/com/astro/core/common/GTVoltage.java @@ -0,0 +1,63 @@ +package com.astro.core.common; + +import com.gregtechceu.gtceu.api.GTValues; + +public final class GTVoltage { + + private GTVoltage() {} + + + public static final class V { + public static final long ULV = GTValues.V[GTValues.ULV]; + public static final long LV = GTValues.V[GTValues.LV]; + public static final long MV = GTValues.V[GTValues.MV]; + public static final long HV = GTValues.V[GTValues.HV]; + public static final long EV = GTValues.V[GTValues.EV]; + public static final long IV = GTValues.V[GTValues.IV]; + public static final long LuV = GTValues.V[GTValues.LuV]; + public static final long ZPM = GTValues.V[GTValues.ZPM]; + public static final long UV = GTValues.V[GTValues.UV]; + public static final long UHV = GTValues.V[GTValues.UHV]; + } + + + public static final class VA { + public static final long ULV = GTValues.VA[GTValues.ULV]; + public static final long LV = GTValues.VA[GTValues.LV]; + public static final long MV = GTValues.VA[GTValues.MV]; + public static final long HV = GTValues.VA[GTValues.HV]; + public static final long EV = GTValues.VA[GTValues.EV]; + public static final long IV = GTValues.VA[GTValues.IV]; + public static final long LuV = GTValues.VA[GTValues.LuV]; + public static final long ZPM = GTValues.VA[GTValues.ZPM]; + public static final long UV = GTValues.VA[GTValues.UV]; + public static final long UHV = GTValues.VA[GTValues.UHV]; + } + + + public static final class VH { + public static final long ULV = GTValues.VH[GTValues.ULV]; + public static final long LV = GTValues.VH[GTValues.LV]; + public static final long MV = GTValues.VH[GTValues.MV]; + public static final long HV = GTValues.VH[GTValues.HV]; + public static final long EV = GTValues.VH[GTValues.EV]; + public static final long IV = GTValues.VH[GTValues.IV]; + public static final long LuV = GTValues.VH[GTValues.LuV]; + public static final long ZPM = GTValues.VH[GTValues.ZPM]; + public static final long UV = GTValues.VH[GTValues.UV]; + public static final long UHV = GTValues.VH[GTValues.UHV]; + } + + public static final class VHA { + public static final long ULV = GTValues.VHA[GTValues.ULV]; + public static final long LV = GTValues.VHA[GTValues.LV]; + public static final long MV = GTValues.VHA[GTValues.MV]; + public static final long HV = GTValues.VHA[GTValues.HV]; + public static final long EV = GTValues.VHA[GTValues.EV]; + public static final long IV = GTValues.VHA[GTValues.IV]; + public static final long LuV = GTValues.VHA[GTValues.LuV]; + public static final long ZPM = GTValues.VHA[GTValues.ZPM]; + public static final long UV = GTValues.VHA[GTValues.UV]; + public static final long UHV = GTValues.VHA[GTValues.UHV]; + } +} diff --git a/src/main/java/com/astro/core/common/data/materials/AstroMaterials.java b/src/main/java/com/astro/core/common/data/materials/AstroMaterials.java index 8b20442a..261584b9 100644 --- a/src/main/java/com/astro/core/common/data/materials/AstroMaterials.java +++ b/src/main/java/com/astro/core/common/data/materials/AstroMaterials.java @@ -1,11 +1,14 @@ package com.astro.core.common.data.materials; +import com.astro.core.common.GTVoltage; import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags; import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet; import com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty; import com.gregtechceu.gtceu.common.data.GTMaterials; + + import appeng.core.definitions.AEItems; import com.astro.core.AstroCore; import com.drd.ad_extendra.common.registry.ModBlocks; @@ -194,7 +197,7 @@ public static void register() { .dust() .ingot() .fluid() - .blastTemp(1700, BlastProperty.GasTier.LOW, 120, 800) + .blastTemp(1700, BlastProperty.GasTier.LOW, (int)GTVoltage.VA.MV, 800) .flags(MaterialFlags.GENERATE_FRAME, MaterialFlags.GENERATE_DENSE, MaterialFlags.GENERATE_PLATE, MaterialFlags.GENERATE_ROD, MaterialFlags.MORTAR_GRINDABLE) .color(0x159e1e).secondaryColor(0x000000).iconSet(MaterialIconSet.SHINY) @@ -207,7 +210,7 @@ public static void register() { .dust() .ingot() .fluid() - .blastTemp(3500, BlastProperty.GasTier.MID, 120, 1600) + .blastTemp(3500, BlastProperty.GasTier.MID, (int)GTVoltage.VA.IV, 1600) .flags(MaterialFlags.GENERATE_FRAME, MaterialFlags.GENERATE_DENSE, MaterialFlags.GENERATE_PLATE, MaterialFlags.GENERATE_ROD, MaterialFlags.MORTAR_GRINDABLE) .color(0xed64d4).secondaryColor(0x000000).iconSet(MaterialIconSet.SHINY) @@ -220,7 +223,7 @@ public static void register() { .dust() .ingot() .fluid() - .blastTemp(7100, BlastProperty.GasTier.HIGH, 120, 2400) + .blastTemp(7100, BlastProperty.GasTier.HIGH, (int)GTVoltage.VA.ZPM, 2400) .flags(MaterialFlags.GENERATE_FRAME, MaterialFlags.GENERATE_DENSE, MaterialFlags.GENERATE_PLATE, MaterialFlags.GENERATE_ROD, MaterialFlags.MORTAR_GRINDABLE) .color(0x8c2929).secondaryColor(0x000000).iconSet(MaterialIconSet.SHINY) From 4cae184fd2cf9fab9e42dee658988f8b25aa1a52 Mon Sep 17 00:00:00 2001 From: daveningfr Date: Sat, 13 Dec 2025 23:22:32 +0800 Subject: [PATCH 4/4] 0.1.013/12/2025 Davening removed elements and commented out formula --- .../java/com/astro/core/common/GTVoltage.java | 55 ++++++++++--------- .../common/data/materials/AstroElements.java | 3 - .../common/data/materials/AstroMaterials.java | 51 +++++++---------- .../recipe/run/AstroWireRecipeRunner.java | 5 +- 4 files changed, 51 insertions(+), 63 deletions(-) diff --git a/src/main/java/com/astro/core/common/GTVoltage.java b/src/main/java/com/astro/core/common/GTVoltage.java index 2f205161..7bf5f30c 100644 --- a/src/main/java/com/astro/core/common/GTVoltage.java +++ b/src/main/java/com/astro/core/common/GTVoltage.java @@ -6,58 +6,59 @@ public final class GTVoltage { private GTVoltage() {} - public static final class V { + public static final long ULV = GTValues.V[GTValues.ULV]; - public static final long LV = GTValues.V[GTValues.LV]; - public static final long MV = GTValues.V[GTValues.MV]; - public static final long HV = GTValues.V[GTValues.HV]; - public static final long EV = GTValues.V[GTValues.EV]; - public static final long IV = GTValues.V[GTValues.IV]; + public static final long LV = GTValues.V[GTValues.LV]; + public static final long MV = GTValues.V[GTValues.MV]; + public static final long HV = GTValues.V[GTValues.HV]; + public static final long EV = GTValues.V[GTValues.EV]; + public static final long IV = GTValues.V[GTValues.IV]; public static final long LuV = GTValues.V[GTValues.LuV]; public static final long ZPM = GTValues.V[GTValues.ZPM]; - public static final long UV = GTValues.V[GTValues.UV]; + public static final long UV = GTValues.V[GTValues.UV]; public static final long UHV = GTValues.V[GTValues.UHV]; } - public static final class VA { + public static final long ULV = GTValues.VA[GTValues.ULV]; - public static final long LV = GTValues.VA[GTValues.LV]; - public static final long MV = GTValues.VA[GTValues.MV]; - public static final long HV = GTValues.VA[GTValues.HV]; - public static final long EV = GTValues.VA[GTValues.EV]; - public static final long IV = GTValues.VA[GTValues.IV]; + public static final long LV = GTValues.VA[GTValues.LV]; + public static final long MV = GTValues.VA[GTValues.MV]; + public static final long HV = GTValues.VA[GTValues.HV]; + public static final long EV = GTValues.VA[GTValues.EV]; + public static final long IV = GTValues.VA[GTValues.IV]; public static final long LuV = GTValues.VA[GTValues.LuV]; public static final long ZPM = GTValues.VA[GTValues.ZPM]; - public static final long UV = GTValues.VA[GTValues.UV]; + public static final long UV = GTValues.VA[GTValues.UV]; public static final long UHV = GTValues.VA[GTValues.UHV]; } - public static final class VH { + public static final long ULV = GTValues.VH[GTValues.ULV]; - public static final long LV = GTValues.VH[GTValues.LV]; - public static final long MV = GTValues.VH[GTValues.MV]; - public static final long HV = GTValues.VH[GTValues.HV]; - public static final long EV = GTValues.VH[GTValues.EV]; - public static final long IV = GTValues.VH[GTValues.IV]; + public static final long LV = GTValues.VH[GTValues.LV]; + public static final long MV = GTValues.VH[GTValues.MV]; + public static final long HV = GTValues.VH[GTValues.HV]; + public static final long EV = GTValues.VH[GTValues.EV]; + public static final long IV = GTValues.VH[GTValues.IV]; public static final long LuV = GTValues.VH[GTValues.LuV]; public static final long ZPM = GTValues.VH[GTValues.ZPM]; - public static final long UV = GTValues.VH[GTValues.UV]; + public static final long UV = GTValues.VH[GTValues.UV]; public static final long UHV = GTValues.VH[GTValues.UHV]; } public static final class VHA { + public static final long ULV = GTValues.VHA[GTValues.ULV]; - public static final long LV = GTValues.VHA[GTValues.LV]; - public static final long MV = GTValues.VHA[GTValues.MV]; - public static final long HV = GTValues.VHA[GTValues.HV]; - public static final long EV = GTValues.VHA[GTValues.EV]; - public static final long IV = GTValues.VHA[GTValues.IV]; + public static final long LV = GTValues.VHA[GTValues.LV]; + public static final long MV = GTValues.VHA[GTValues.MV]; + public static final long HV = GTValues.VHA[GTValues.HV]; + public static final long EV = GTValues.VHA[GTValues.EV]; + public static final long IV = GTValues.VHA[GTValues.IV]; public static final long LuV = GTValues.VHA[GTValues.LuV]; public static final long ZPM = GTValues.VHA[GTValues.ZPM]; - public static final long UV = GTValues.VHA[GTValues.UV]; + public static final long UV = GTValues.VHA[GTValues.UV]; public static final long UHV = GTValues.VHA[GTValues.UHV]; } } diff --git a/src/main/java/com/astro/core/common/data/materials/AstroElements.java b/src/main/java/com/astro/core/common/data/materials/AstroElements.java index 8c5d0f0a..5806023c 100644 --- a/src/main/java/com/astro/core/common/data/materials/AstroElements.java +++ b/src/main/java/com/astro/core/common/data/materials/AstroElements.java @@ -13,9 +13,6 @@ public class AstroElements { public static final Element E = createAndRegister(-1, -1, -1, null, "electrolyte", "⚡", false); public static final Element SS = createAndRegister(-1, -1, -1, null, "sky_stone", "✨", false); public static final Element MN = createAndRegister(-1, -1, -1, null, "mana", "✨", false); - public static final Element TR = createAndRegister(-1, -1, -1, null, "terra", "✨", false); - public static final Element EL = createAndRegister(-1, -1, -1, null, "elementium", "✨", false); - public static final Element GA = createAndRegister(-1, -1, -1, null, "gaia", "✨", false); public static Element createAndRegister(long protons, long neutrons, long halfLifeSeconds, String decayTo, String name, String symbol, boolean isIsotope) { diff --git a/src/main/java/com/astro/core/common/data/materials/AstroMaterials.java b/src/main/java/com/astro/core/common/data/materials/AstroMaterials.java index 261584b9..d072f592 100644 --- a/src/main/java/com/astro/core/common/data/materials/AstroMaterials.java +++ b/src/main/java/com/astro/core/common/data/materials/AstroMaterials.java @@ -1,22 +1,20 @@ package com.astro.core.common.data.materials; -import com.astro.core.common.GTVoltage; import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags; import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconSet; import com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty; import com.gregtechceu.gtceu.common.data.GTMaterials; - - import appeng.core.definitions.AEItems; import com.astro.core.AstroCore; +import com.astro.core.common.GTVoltage; import com.drd.ad_extendra.common.registry.ModBlocks; import earth.terrarium.adastra.common.registry.ModItems; +import org.zeith.botanicadds.init.ItemsBA; import owmii.powah.block.Blcks; import owmii.powah.item.Itms; import vazkii.botania.common.item.BotaniaItems; -import org.zeith.botanicadds.init.ItemsBA; import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; @@ -187,35 +185,32 @@ public static void register() { .flags(MaterialFlags.GENERATE_FRAME, MaterialFlags.GENERATE_DENSE, MaterialFlags.GENERATE_PLATE, MaterialFlags.GENERATE_ROD, MaterialFlags.MORTAR_GRINDABLE) .color(0x228cc9).secondaryColor(0x000000).iconSet(MaterialIconSet.SHINY) - .element(AstroElements.MN) - .formula("*Fe*") +// .formula("*Fe*") .buildAndRegister(); TERRASTEEL = new Material.Builder( AstroCore.id("terrasteel")) .langValue("Terrasteel") - .dust() - .ingot() - .fluid() - .blastTemp(1700, BlastProperty.GasTier.LOW, (int)GTVoltage.VA.MV, 800) - .flags(MaterialFlags.GENERATE_FRAME, MaterialFlags.GENERATE_DENSE, - MaterialFlags.GENERATE_PLATE, MaterialFlags.GENERATE_ROD, MaterialFlags.MORTAR_GRINDABLE) - .color(0x159e1e).secondaryColor(0x000000).iconSet(MaterialIconSet.SHINY) - .element(AstroElements.TR) - .formula("**Fe**") - .buildAndRegister(); + .dust() + .ingot() + .fluid() + .blastTemp(1700, BlastProperty.GasTier.LOW, (int) GTVoltage.VA.MV, 800) + .flags(MaterialFlags.GENERATE_FRAME, MaterialFlags.GENERATE_DENSE, + MaterialFlags.GENERATE_PLATE, MaterialFlags.GENERATE_ROD, MaterialFlags.MORTAR_GRINDABLE) + .color(0x159e1e).secondaryColor(0x000000).iconSet(MaterialIconSet.SHINY) +// .formula("**Fe**") + .buildAndRegister(); ELEMENTIUM = new Material.Builder( AstroCore.id("elementium")) .langValue("Elementium") .dust() .ingot() .fluid() - .blastTemp(3500, BlastProperty.GasTier.MID, (int)GTVoltage.VA.IV, 1600) + .blastTemp(3500, BlastProperty.GasTier.MID, (int) GTVoltage.VA.IV, 1600) .flags(MaterialFlags.GENERATE_FRAME, MaterialFlags.GENERATE_DENSE, MaterialFlags.GENERATE_PLATE, MaterialFlags.GENERATE_ROD, MaterialFlags.MORTAR_GRINDABLE) .color(0xed64d4).secondaryColor(0x000000).iconSet(MaterialIconSet.SHINY) - .element(AstroElements.EL) - .formula("EL") +// .formula("El") .buildAndRegister(); GAIASTEEL = new Material.Builder( AstroCore.id("gaiasteel")) @@ -223,18 +218,15 @@ public static void register() { .dust() .ingot() .fluid() - .blastTemp(7100, BlastProperty.GasTier.HIGH, (int)GTVoltage.VA.ZPM, 2400) + .blastTemp(7100, BlastProperty.GasTier.HIGH, (int) GTVoltage.VA.ZPM, 2400) .flags(MaterialFlags.GENERATE_FRAME, MaterialFlags.GENERATE_DENSE, MaterialFlags.GENERATE_PLATE, MaterialFlags.GENERATE_ROD, MaterialFlags.MORTAR_GRINDABLE) .color(0x8c2929).secondaryColor(0x000000).iconSet(MaterialIconSet.SHINY) - .element(AstroElements.GA) - .formula("***Fe***") +// .formula("***Fe***") .buildAndRegister(); } - - -public static void init() { + public static void init() { rawOre.setIgnored(AstroMaterials.DESH, ModItems.RAW_DESH); rawOreBlock.setIgnored(AstroMaterials.DESH, ModItems.RAW_DESH_BLOCK); block.setIgnored(AstroMaterials.DESH, ModItems.DESH_BLOCK); @@ -272,18 +264,13 @@ public static void init() { dust.setIgnored(AstroMaterials.MANASTEEL, () -> BotaniaItems.manaPowder); ingot.setIgnored(AstroMaterials.TERRASTEEL, () -> BotaniaItems.terrasteel); - nugget.setIgnored(AstroMaterials.TERRASTEEL,() -> BotaniaItems.terrasteelNugget); + nugget.setIgnored(AstroMaterials.TERRASTEEL, () -> BotaniaItems.terrasteelNugget); ingot.setIgnored(AstroMaterials.ELEMENTIUM, () -> BotaniaItems.elementium); nugget.setIgnored(AstroMaterials.ELEMENTIUM, () -> BotaniaItems.elementium); - ingot.setIgnored(AstroMaterials.GAIASTEEL, ItemsBA.GAIASTEEL_INGOT); + ingot.setIgnored(AstroMaterials.GAIASTEEL, () -> BotaniaItems.gaiaIngot); nugget.setIgnored(AstroMaterials.GAIASTEEL, () -> BotaniaItems.gaiaIngot); - - - - - } } diff --git a/src/main/java/com/astro/core/common/data/recipe/run/AstroWireRecipeRunner.java b/src/main/java/com/astro/core/common/data/recipe/run/AstroWireRecipeRunner.java index d3267901..837004c9 100644 --- a/src/main/java/com/astro/core/common/data/recipe/run/AstroWireRecipeRunner.java +++ b/src/main/java/com/astro/core/common/data/recipe/run/AstroWireRecipeRunner.java @@ -1,14 +1,17 @@ package com.astro.core.common.data.recipe.run; -import com.astro.core.common.data.recipe.generated.AstroWireRecipeHandler; import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.data.chemical.material.Material; + import net.minecraft.data.recipes.FinishedRecipe; + +import com.astro.core.common.data.recipe.generated.AstroWireRecipeHandler; import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; public class AstroWireRecipeRunner { + public static void init(@NotNull Consumer provider) { for (Material material : GTCEuAPI.materialManager.getRegisteredMaterials()) { AstroWireRecipeHandler.run(provider, material);