prep for next release

CHANGELOG.md

@@ -1,8 +1,13 @@
 
+0.0.2.b:
+- fix Dyson Sphere Casing recipe
+- fix lang issues
+- add Atomic Casing recipe
+
 0.0.2.a:
 - fix fabric
 - make dyson sphere able to collapse if left without maintenance
-- add dyson sphe
+- add dyson sphere maintenance logic
 - remove rocket launch keybind
 
 

common/src/main/java/argent_matter/gcys/common/data/GCySMachines.java

@@ -36,6 +36,7 @@
 
 import static argent_matter.gcys.api.registries.GcysRegistries.REGISTRATE;
 import static argent_matter.gcys.common.data.GCySBlocks.*;
+import static com.gregtechceu.gtceu.api.GTValues.VNF;
 import static com.gregtechceu.gtceu.api.pattern.Predicates.*;
 import static com.gregtechceu.gtceu.common.data.GCyMBlocks.CASING_ATOMIC;
 import static com.gregtechceu.gtceu.common.data.GTBlocks.*;
@@ -48,6 +49,7 @@ public class GCySMachines {
 
     public final static MachineDefinition[] OXYGEN_SPREADER = registerTieredMachines("oxygen_spreader", OxygenSpreaderMachine::new,
             (tier, builder) -> builder
+                    .langValue("%s Oxygen Spreader".formatted(VNF[tier]))
                     .rotationState(RotationState.NON_Y_AXIS)
                     .hasTESR(true)
                     .renderer(() -> new TieredHullMachineRenderer(tier, GCyS.id("block/machine/oxygen_spreader_machine")))

common/src/main/java/argent_matter/gcys/common/data/GCySMaterials.java

@@ -1,7 +1,9 @@
 package argent_matter.gcys.common.data;
 
+import com.gregtechceu.gtceu.api.GTValues;
 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.api.data.chemical.material.properties.ToolProperty;
 import com.gregtechceu.gtceu.api.fluids.FluidBuilder;
@@ -19,6 +21,7 @@ public class GCySMaterials {
     public static void init() {
         // Add flags to base GT materials
         IronMagnetic.addFlags(GENERATE_FOIL);
+        TitaniumTungstenCarbide.addFlags(GENERATE_ROD);
     }
 
 
@@ -41,7 +44,7 @@ public static void init() {
             .components(Potassium, 1, Oxygen, 1, Hydrogen, 1)
             .buildAndRegister();
 
-    public static final Material Bisalloy400 = new Material.Builder("bisalloy_500")
+    public static final Material Bisalloy400 = new Material.Builder("bisalloy_400")
             .ingot(5).fluid()
             .color(0x0ca819)
             .components(Carbon, 4, Phosphorus, 2, Manganese, 15, Silicon, 7, Sulfur, 1, Chromium, 12, Molybdenum, 5, Boron, 1)
@@ -51,15 +54,22 @@ public static void init() {
             .buildAndRegister();
 
     public static final Material ChromicAcid = new Material.Builder("chromic_acid")
-            .fluid()
+            .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().attribute(FluidAttributes.ACID))
             .color(0xE5D8F2)
             .components(Hydrogen, 2, Chromium, 1, Oxygen, 4)
             .buildAndRegister();
 
+    public static Material Trinaquadalloy = new Material.Builder("trinaquadalloy")
+            .ingot().fluid()
+            .color(0x281832).iconSet(MaterialIconSet.BRIGHT)
+            .flags(GENERATE_PLATE)
+            .components(Trinium, 6, Naquadah, 2, Carbon, 1)
+            .blastTemp(8747, BlastProperty.GasTier.HIGHER, GTValues.VA[GTValues.ZPM], 1200)
+            .buildAndRegister();
 
     //endregion
 
-    //region first degree mats
+    //region second degree mats
 
     public static final Material FiberGlass = new Material.Builder("fiberglass")
             .polymer(1)
@@ -152,7 +162,7 @@ public static void init() {
             .buildAndRegister();
 
     public static final Material TerephthalicAcid = new Material.Builder("therephthalic_acid")
-            .fluid()
+            .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().attribute(FluidAttributes.ACID))
             .color(0xDB9374)
             .components(Carbon, 6, Hydrogen, 4, CarbonDioxide, 2, Hydrogen, 2)
             .buildAndRegister()

common/src/main/java/argent_matter/gcys/data/lang/LangHandler.java

@@ -1,9 +1,46 @@
 package argent_matter.gcys.data.lang;
 
+import argent_matter.gcys.common.data.GCySMaterials;
+import com.gregtechceu.gtceu.api.data.chemical.material.Material;
 import com.tterrag.registrate.providers.RegistrateLangProvider;
 
+import java.util.Set;
+
+import static com.gregtechceu.gtceu.utils.FormattingUtil.toEnglishName;
+
 public class LangHandler extends com.gregtechceu.gtceu.data.lang.LangHandler {
+
+    // add materials in here as new ones are added
+    private static final Set<Material> MATERIALS = Set.of(
+            GCySMaterials.PotassiumChloride,
+            GCySMaterials.PotassiumCarbonate,
+            GCySMaterials.PotassiumHydroxide,
+            GCySMaterials.ChromicAcid,
+            GCySMaterials.Trinaquadalloy,
+            GCySMaterials.FiberGlass,
+            GCySMaterials.ChloroNitrobenzene,
+            GCySMaterials.PyromelliticDianhydride,
+            GCySMaterials.Durene,
+            GCySMaterials.Dimethylformamide,
+            GCySMaterials.Oxydianiline,
+            GCySMaterials.OxydianilineSludge,
+            GCySMaterials.AminoPhenol,
+            GCySMaterials.KaptonK,
+            GCySMaterials.Cuminaldehyde,
+            GCySMaterials.Cuminol,
+            GCySMaterials.TerephthalicAcid,
+            GCySMaterials.TerephthaloylChloride
+    );
+
     public static void init(RegistrateLangProvider provider) {
+        // materials
+        for (Material material : MATERIALS) {
+            provider.add(material.getUnlocalizedName(), toEnglishName(material.getName()));
+        }
+        provider.add(GCySMaterials.Bisalloy400.getUnlocalizedName(), "Bisalloy-400");
+        provider.add(GCySMaterials.ParaPhenylenediamine.getUnlocalizedName(), "Para-Phenylenediamine");
+        provider.add(GCySMaterials.ParaAramid.getUnlocalizedName(), "Para-Aramid");
+
         // blocks
         replace(provider, "block.gcys.aerospace_aluminium_casing", "Aerospace-grade Aluminium Machine Casing");
 
@@ -13,9 +50,6 @@ public static void init(RegistrateLangProvider provider) {
         provider.add("gcys.multiblock.rocket.unbuild", "Destroy Rocket");
 
         // items
-        provider.add("metaitem.id_circuit.id", "Circuit ID: %d");
-        provider.add("metaitem.id_circuit.position", "Station Position: [x=%d,z=%d]");
-
         provider.add("metaitem.planet_id_circuit.id", "Currently selected planet: ");
         provider.add("metaitem.planet_id_circuit.station", "To in-orbit space station (ID: %s)");
 

common/src/main/java/argent_matter/gcys/data/recipe/MiscRecipes.java

@@ -2,7 +2,9 @@
 
 import argent_matter.gcys.GCyS;
 import argent_matter.gcys.common.data.GCySItems;
+import argent_matter.gcys.common.data.GCySMaterials;
 import com.gregtechceu.gtceu.api.data.chemical.material.stack.UnificationEntry;
+import com.gregtechceu.gtceu.api.data.tag.TagPrefix;
 import com.gregtechceu.gtceu.common.data.*;
 import com.gregtechceu.gtceu.data.recipe.CustomTags;
 import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper;
@@ -17,13 +19,25 @@
 
 public class MiscRecipes {
     public static void init(Consumer<FinishedRecipe> provider) {
+        VanillaRecipeHelper.addShapedRecipe(provider, true, GCyS.id("casing_atomic"),
+                GCyMBlocks.CASING_ATOMIC.asStack(2),
+                "PhP", "PFP", "PwP",
+                'P', new UnificationEntry(TagPrefix.plateDouble, GCySMaterials.Trinaquadalloy),
+                'F', new UnificationEntry(TagPrefix.frameGt, GTMaterials.NaquadahAlloy));
 
-        VanillaRecipeHelper.addShapelessRecipe(provider, "gcys_id_chip", GCySItems.ID_CHIP.asStack(),
+        GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder(GCyS.id("casing_atomic"))
+                .inputItems(TagPrefix.plateDouble, GCySMaterials.Trinaquadalloy, 6)
+                .inputItems(TagPrefix.frameGt, GTMaterials.NaquadahAlloy)
+                .circuitMeta(6)
+                .outputItems(GCyMBlocks.CASING_ATOMIC.asStack(2))
+                .duration(50).EUt(16).save(provider);
+
+        VanillaRecipeHelper.addShapelessRecipe(provider, GCyS.id("id_chip"), GCySItems.ID_CHIP.asStack(),
                 new UnificationEntry(foil, IronMagnetic),
                 new UnificationEntry(plate, Polyethylene)
         );
 
-        VanillaRecipeHelper.addShapedRecipe(provider, "gcys_photovoltaic_cell", GCySItems.PHOTOVOLTAIC_CELL.asStack(),
+        VanillaRecipeHelper.addShapedRecipe(provider, GCyS.id("photovoltaic_cell"), GCySItems.PHOTOVOLTAIC_CELL.asStack(),
                 "WVW", "VGV", "CVC",
                 'W', GTItems.NAQUADAH_WAFER.asStack(), 'G', GTBlocks.CASING_TEMPERED_GLASS.asStack(), 'C', CustomTags.LuV_CIRCUITS, 'V', new UnificationEntry(wireFine, Gold)
         );
@@ -42,22 +56,22 @@ public static void init(Consumer<FinishedRecipe> provider) {
                 .outputItems(GCySItems.SPACE_FABRIC.asStack(1))
                 .duration(100).EUt(VA[HV]).save(provider);
 
-        VanillaRecipeHelper.addShapedRecipe(provider, "gcys_space_helmet", GCySItems.SPACE_SUIT_HELMET.asStack(),
+        VanillaRecipeHelper.addShapedRecipe(provider, GCyS.id("space_helmet"), GCySItems.SPACE_SUIT_HELMET.asStack(),
                 "SFS", "FFF", "SCS",
                 'S', GCySItems.SPACE_FABRIC.asStack(), 'F', new UnificationEntry(foil, Gold), 'C', CustomTags.EV_CIRCUITS
         );
 
-        VanillaRecipeHelper.addShapedRecipe(provider, "gcys_space_chest", GCySItems.SPACE_SUIT_CHEST.asStack(),
+        VanillaRecipeHelper.addShapedRecipe(provider, GCyS.id("space_chest"), GCySItems.SPACE_SUIT_CHEST.asStack(),
                 "STS", "SCS", "SCS",
                 'S', GCySItems.SPACE_FABRIC.asStack(), 'T', GTItems.FLUID_CELL_LARGE_TUNGSTEN_STEEL.asStack(), 'C', CustomTags.EV_CIRCUITS
         );
 
-        VanillaRecipeHelper.addShapedRecipe(provider, "gcys_space_legs", GCySItems.SPACE_SUIT_LEGS.asStack(),
+        VanillaRecipeHelper.addShapedRecipe(provider, GCyS.id("space_legs"), GCySItems.SPACE_SUIT_LEGS.asStack(),
                 "SCS", "S S", "S S",
                 'S', GCySItems.SPACE_FABRIC.asStack(), 'C', CustomTags.EV_CIRCUITS
         );
 
-        VanillaRecipeHelper.addShapedRecipe(provider, "gcys_space_boots", GCySItems.SPACE_SUIT_BOOTS.asStack(),
+        VanillaRecipeHelper.addShapedRecipe(provider, GCyS.id("space_boots"), GCySItems.SPACE_SUIT_BOOTS.asStack(),
                 "S S", "S S",
                 'S', GCySItems.SPACE_FABRIC.asStack()
         );

fabric/src/generated/resources/assets/gcys/lang/en_ud.json

@@ -9,19 +9,19 @@
   "block.gcys.dyson_sphere_maintenance_port": "ʇɹoԀ ǝɔuɐuǝʇuıɐW ǝɹǝɥdS uosʎᗡ",
   "block.gcys.dyson_system_controller": "ɹǝןןoɹʇuoƆ ɯǝʇsʎS uosʎᗡ",
   "block.gcys.fuel_tank": "ʞuɐ⟘ ןǝnℲ",
-  "block.gcys.iv_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO ʌI",
+  "block.gcys.iv_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO ΛIƖ§",
   "block.gcys.launch_pad": "pɐԀ ɥɔunɐꞀ",
-  "block.gcys.luv_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO ʌnꞀ",
+  "block.gcys.luv_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO ΛnꞀp§",
   "block.gcys.moon_sand": "puɐS uooW",
   "block.gcys.moon_stone": "ǝuoʇS uooW",
   "block.gcys.rocket_motor": "ɹoʇoW ʇǝʞɔoᴚ",
   "block.gcys.rocket_scanner": "ɹǝuuɐɔS ʇǝʞɔoᴚ",
   "block.gcys.seat": "ʇɐǝS",
   "block.gcys.space_elevator": "ɹoʇɐʌǝןƎ ǝɔɐdS",
   "block.gcys.space_elevator_support": "ʇɹoddnS ɹoʇɐʌǝןƎ ǝɔɐdS",
-  "block.gcys.uhv_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO ʌɥ∩",
-  "block.gcys.uv_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO ʌ∩",
-  "block.gcys.zpm_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO ɯdZ",
+  "block.gcys.uhv_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO ΛH∩ㄣ§",
+  "block.gcys.uv_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO Λ∩Ɛ§",
+  "block.gcys.zpm_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO WԀZɔ§",
   "entity.gcys.rocket": "ʇǝʞɔoᴚ",
   "gcys.condition.requires_dyson_sphere.false": "ǝʌıʇɔɐ ǝq oʇ ǝɹǝɥdS uosʎᗡ ou sǝɹınbǝᴚ",
   "gcys.condition.requires_dyson_sphere.true": "ǝɹǝɥdS uosʎᗡ ǝʌıʇɔɐ sǝɹınbǝᴚ",
@@ -52,6 +52,27 @@
   "item.gcys.space_leggings": "sbuıbbǝꞀ ǝɔɐdS",
   "key.categories.gcys": "ǝɔɐdS ʎʇıןɐɔıbǝɹ⅁",
   "key.startRocket": "ʎʇıʇuƎʇǝʞɔoᴚ ʇɹɐʇS",
+  "material.aminophenol": "ןouǝɥdouıɯⱯ",
+  "material.bisalloy_500": "00ϛ ʎoןןɐsıᗺ",
+  "material.chloronitrobenzene": "ǝuǝzuǝqoɹʇıuoɹoןɥƆ",
+  "material.chromic_acid": "pıɔⱯ ɔıɯoɹɥƆ",
+  "material.cuminaldehyde": "ǝpʎɥǝpןɐuıɯnƆ",
+  "material.cuminol": "ןouıɯnƆ",
+  "material.dimethylformamide": "ǝpıɯɐɯɹoɟןʎɥʇǝɯıᗡ",
+  "material.durene": "ǝuǝɹnᗡ",
+  "material.fiberglass": "ssɐןbɹǝqıℲ",
+  "material.kapton_k": "ʞ uoʇdɐʞ",
+  "material.oxydianiline": "ǝuıןıuɐıpʎxO",
+  "material.oxydianiline_sludge": "ǝbpnןS ǝuıןıuɐıpʎxO",
+  "material.para_aramid": "pıɯɐɹⱯ ɐɹɐԀ",
+  "material.para_phenylenediamine": "ǝuıɯɐıpǝuǝןʎuǝɥԀ ɐɹɐԀ",
+  "material.potassium_carbonate": "ǝʇɐuoqɹɐƆ ɯnıssɐʇoԀ",
+  "material.potassium_chloride": "ǝpıɹoןɥƆ ɯnıssɐʇoԀ",
+  "material.potassium_hydroxide": "ǝpıxoɹpʎH ɯnıssɐʇoԀ",
+  "material.pyrometillic_dianhydride": "ǝpıɹpʎɥuɐıᗡ ɔıןןıʇǝɯoɹʎԀ",
+  "material.terephthaloyl_chloride": "ǝpıɹoןɥƆ ןʎoןɐɥʇɥdǝɹǝ⟘",
+  "material.therephthalic_acid": "pıɔⱯ ɔıןɐɥʇɥdǝɹǝɥ⟘",
+  "material.trinaquadalloy": "ʎoןןɐpɐnbɐuıɹ⟘",
   "menu.gcys.back": "ʞɔɐᗺ",
   "menu.gcys.catalog": "boןɐʇɐƆ",
   "menu.gcys.category": "ʎɹobǝʇɐƆ",
@@ -76,8 +97,6 @@
   "menu.gcys.type": "ǝdʎ⟘",
   "message.gcys.no_fuel": "˙dıɥƆ ᗡI ʇǝuɐןԀ pıןɐʌ ɐ ǝʌɐɥ puɐ 'ʎןןnɟ pǝןǝnɟ ǝq ʇsnɯ ʇǝʞɔoɹ ǝɥ⟘",
   "message.gcys.notice_id_changed": "¡ʇǝbɹɐʇ ʍǝu ɐ buıʇʇǝs ǝɹoɟǝq ɐʇɐp ʍǝu ǝɥʇ ɥʇıʍ dıɥɔ uoıʇɐuıʇsǝp ןɐuosɹǝd ǝɥʇ ǝʇıɹʍǝɹ oʇ ɹǝqɯǝɯǝᴚ ˙pǝbuɐɥɔ ǝʌɐɥ ʇɥbıɯ dıɥɔ ᗡI uoıʇɐʇS ǝɔɐdS ɹnoʎ ɟo uoıʇɐuıʇsǝp ǝɥ⟘",
-  "metaitem.id_circuit.id": "%d :ᗡI ʇınɔɹıƆ",
-  "metaitem.id_circuit.position": "]%d=z'%d=x[ :uoıʇısoԀ uoıʇɐʇS",
   "metaitem.planet_id_circuit.id": " :ʇǝuɐןd pǝʇɔǝןǝs ʎןʇuǝɹɹnƆ",
   "metaitem.planet_id_circuit.station": ")%s :ᗡI( uoıʇɐʇs ǝɔɐds ʇıqɹo-uı o⟘"
 }

fabric/src/generated/resources/assets/gcys/lang/en_us.json

@@ -9,19 +9,19 @@
   "block.gcys.dyson_sphere_maintenance_port": "Dyson Sphere Maintenance Port",
   "block.gcys.dyson_system_controller": "Dyson System Controller",
   "block.gcys.fuel_tank": "Fuel Tank",
-  "block.gcys.iv_oxygen_spreader": "Iv Oxygen Spreader",
+  "block.gcys.iv_oxygen_spreader": "§1IV Oxygen Spreader",
   "block.gcys.launch_pad": "Launch Pad",
-  "block.gcys.luv_oxygen_spreader": "Luv Oxygen Spreader",
+  "block.gcys.luv_oxygen_spreader": "§dLuV Oxygen Spreader",
   "block.gcys.moon_sand": "Moon Sand",
   "block.gcys.moon_stone": "Moon Stone",
   "block.gcys.rocket_motor": "Rocket Motor",
   "block.gcys.rocket_scanner": "Rocket Scanner",
   "block.gcys.seat": "Seat",
   "block.gcys.space_elevator": "Space Elevator",
   "block.gcys.space_elevator_support": "Space Elevator Support",
-  "block.gcys.uhv_oxygen_spreader": "Uhv Oxygen Spreader",
-  "block.gcys.uv_oxygen_spreader": "Uv Oxygen Spreader",
-  "block.gcys.zpm_oxygen_spreader": "Zpm Oxygen Spreader",
+  "block.gcys.uhv_oxygen_spreader": "§4UHV Oxygen Spreader",
+  "block.gcys.uv_oxygen_spreader": "§3UV Oxygen Spreader",
+  "block.gcys.zpm_oxygen_spreader": "§cZPM Oxygen Spreader",
   "entity.gcys.rocket": "Rocket",
   "gcys.condition.requires_dyson_sphere.false": "Requires no Dyson Sphere to be active",
   "gcys.condition.requires_dyson_sphere.true": "Requires active Dyson Sphere",
@@ -52,6 +52,27 @@
   "item.gcys.space_leggings": "Space Leggings",
   "key.categories.gcys": "Gregicality Space",
   "key.startRocket": "Start RocketEntity",
+  "material.aminophenol": "Aminophenol",
+  "material.bisalloy_500": "Bisalloy 500",
+  "material.chloronitrobenzene": "Chloronitrobenzene",
+  "material.chromic_acid": "Chromic Acid",
+  "material.cuminaldehyde": "Cuminaldehyde",
+  "material.cuminol": "Cuminol",
+  "material.dimethylformamide": "Dimethylformamide",
+  "material.durene": "Durene",
+  "material.fiberglass": "Fiberglass",
+  "material.kapton_k": "Kapton K",
+  "material.oxydianiline": "Oxydianiline",
+  "material.oxydianiline_sludge": "Oxydianiline Sludge",
+  "material.para_aramid": "Para Aramid",
+  "material.para_phenylenediamine": "Para Phenylenediamine",
+  "material.potassium_carbonate": "Potassium Carbonate",
+  "material.potassium_chloride": "Potassium Chloride",
+  "material.potassium_hydroxide": "Potassium Hydroxide",
+  "material.pyrometillic_dianhydride": "Pyrometillic Dianhydride",
+  "material.terephthaloyl_chloride": "Terephthaloyl Chloride",
+  "material.therephthalic_acid": "Therephthalic Acid",
+  "material.trinaquadalloy": "Trinaquadalloy",
   "menu.gcys.back": "Back",
   "menu.gcys.catalog": "Catalog",
   "menu.gcys.category": "Category",
@@ -76,8 +97,6 @@
   "menu.gcys.type": "Type",
   "message.gcys.no_fuel": "The rocket must be fueled fully, and have a valid Planet ID Chip.",
   "message.gcys.notice_id_changed": "The destination of your Space Station ID chip might have changed. Remember to rewrite the personal destination chip with the new data before setting a new target!",
-  "metaitem.id_circuit.id": "Circuit ID: %d",
-  "metaitem.id_circuit.position": "Station Position: [x=%d,z=%d]",
   "metaitem.planet_id_circuit.id": "Currently selected planet: ",
   "metaitem.planet_id_circuit.station": "To in-orbit space station (ID: %s)"
 }