chore: run data

src/generated/resources/assets/gcyr/blockstates/prb_underground_mushroom.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "gcyr:block/prb_underground_mushroom"
+    }
+  }
+}

src/generated/resources/assets/gcyr/lang/en_ud.json

@@ -14,14 +14,15 @@
   "block.gcyr.dyson_system_controller": "ɹǝןןoɹʇuoƆ ɯǝʇsʎS uosʎᗡ",
   "block.gcyr.elite_fuel_tank": "ʞuɐ⟘ ןǝnℲ ǝʇıןƎ",
   "block.gcyr.elite_rocket_motor": "ɹoʇoW ʇǝʞɔoᴚ ǝʇıןƎ",
-  "block.gcyr.iv_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO ΛIƖ§",
+  "block.gcyr.iv_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO ΛI6§",
   "block.gcyr.launch_pad": "pɐԀ ɥɔunɐꞀ",
   "block.gcyr.luv_oxygen_spreader": "ɹǝpɐǝɹdS uǝbʎxO ΛnꞀp§",
   "block.gcyr.mars_regolith": "ɥʇıןobǝᴚ sɹɐW",
   "block.gcyr.martian_rock": "ʞɔoᴚ uɐıʇɹɐW",
   "block.gcyr.mercury_rock": "ʞɔoᴚ ʎɹnɔɹǝW",
   "block.gcyr.moon_sand": "puɐS uooW",
   "block.gcyr.moon_stone": "ǝuoʇS uooW",
+  "block.gcyr.prb_underground_mushroom": "ɯooɹɥsnW punoɹbɹǝpu∩ qɹԀ",
   "block.gcyr.rocket_scanner": "ɹǝuuɐɔS ʇǝʞɔoᴚ",
   "block.gcyr.seat": "ʇɐǝS",
   "block.gcyr.space_elevator": "ɹoʇɐʌǝןƎ ǝɔɐdS",
@@ -63,38 +64,37 @@
   "item.gcyr.space_helmet": "ʇǝɯןǝH ǝɔɐdS",
   "item.gcyr.space_leggings": "sbuıbbǝꞀ ǝɔɐdS",
   "item.gcyr.space_station_package": "ǝbɐʞɔɐԀ uoıʇɐʇS ǝɔɐdS",
-  "itemGroup.gcyr.gcyr": "ɹʎɔ⅁",
   "key.categories.gcyr": "ʎɹʇǝʞɔoᴚ ʎʇıןɐɔıbǝɹ⅁",
   "key.startRocket": "ʎʇıʇuƎʇǝʞɔoᴚ ʇɹɐʇS",
-  "material.aminophenol": "ןouǝɥdouıɯⱯ",
-  "material.bis_trichloromethyl_benzene": "ǝuǝzuǝq)ןʎɥʇǝɯoɹoןɥɔıɹʇ(sıᗺ",
-  "material.bisalloy_400": "00ㄣ-ʎoןןɐsıᗺ",
-  "material.chromic_acid": "pıɔⱯ ɔıɯoɹɥƆ",
-  "material.co_mn_br_catalyst": "ʇsʎןɐʇɐƆ ɹᗺ-uW-oƆ",
-  "material.cobalt_bromide": "ǝpıɯoɹᗺ ʇןɐqoƆ",
-  "material.dimethylformamide": "ǝpıɯɐɯɹoɟןʎɥʇǝɯıᗡ",
-  "material.durene": "ǝuǝɹnᗡ",
-  "material.fiberglass": "ssɐןbɹǝqıℲ",
-  "material.fluorite": "ǝʇıɹonןℲ",
-  "material.hydrobromic_acid": "pıɔⱯ ɔıɯoɹqoɹpʎH",
-  "material.iron_oxide": "ǝpıxO uoɹI",
-  "material.kapton_k": "ʞ uoʇdɐʞ",
-  "material.manganese_acetate": "ǝʇɐʇǝɔⱯ ǝsǝuɐbuɐW",
-  "material.manganese_bromide": "ǝpıɯoɹᗺ ǝsǝuɐbuɐW",
-  "material.martian_rock_dust": "ʇsnᗡ ʞɔoᴚ uɐıʇɹɐW",
-  "material.nitroaniline": "ǝuıןıuɐoɹʇıN",
-  "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.para_xylene": "ǝuǝןʎX-ɐɹɐԀ",
-  "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ıɹ⟘",
+  "material.gcyr.aminophenol": "ןouǝɥdouıɯⱯ",
+  "material.gcyr.bis_trichloromethyl_benzene": "ǝuǝzuǝq)ןʎɥʇǝɯoɹoןɥɔıɹʇ(sıᗺ",
+  "material.gcyr.bisalloy_400": "00ㄣ-ʎoןןɐsıᗺ",
+  "material.gcyr.chromic_acid": "pıɔⱯ ɔıɯoɹɥƆ",
+  "material.gcyr.co_mn_br_catalyst": "ʇsʎןɐʇɐƆ ɹᗺ-uW-oƆ",
+  "material.gcyr.cobalt_bromide": "ǝpıɯoɹᗺ ʇןɐqoƆ",
+  "material.gcyr.dimethylformamide": "ǝpıɯɐɯɹoɟןʎɥʇǝɯıᗡ",
+  "material.gcyr.durene": "ǝuǝɹnᗡ",
+  "material.gcyr.fiberglass": "ssɐןbɹǝqıℲ",
+  "material.gcyr.fluorite": "ǝʇıɹonןℲ",
+  "material.gcyr.hydrobromic_acid": "pıɔⱯ ɔıɯoɹqoɹpʎH",
+  "material.gcyr.iron_oxide": "ǝpıxO uoɹI",
+  "material.gcyr.kapton_k": "ʞ uoʇdɐʞ",
+  "material.gcyr.manganese_acetate": "ǝʇɐʇǝɔⱯ ǝsǝuɐbuɐW",
+  "material.gcyr.manganese_bromide": "ǝpıɯoɹᗺ ǝsǝuɐbuɐW",
+  "material.gcyr.martian_rock_dust": "ʇsnᗡ ʞɔoᴚ uɐıʇɹɐW",
+  "material.gcyr.nitroaniline": "ǝuıןıuɐoɹʇıN",
+  "material.gcyr.oxydianiline": "ǝuıןıuɐıpʎxO",
+  "material.gcyr.oxydianiline_sludge": "ǝbpnןS ǝuıןıuɐıpʎxO",
+  "material.gcyr.para_aramid": "pıɯɐɹⱯ-ɐɹɐԀ",
+  "material.gcyr.para_phenylenediamine": "ǝuıɯɐıpǝuǝןʎuǝɥԀ-ɐɹɐԀ",
+  "material.gcyr.para_xylene": "ǝuǝןʎX-ɐɹɐԀ",
+  "material.gcyr.potassium_carbonate": "ǝʇɐuoqɹɐƆ ɯnıssɐʇoԀ",
+  "material.gcyr.potassium_chloride": "ǝpıɹoןɥƆ ɯnıssɐʇoԀ",
+  "material.gcyr.potassium_hydroxide": "ǝpıxoɹpʎH ɯnıssɐʇoԀ",
+  "material.gcyr.pyrometillic_dianhydride": "ǝpıɹpʎɥuɐıᗡ ɔıןןıʇǝɯoɹʎԀ",
+  "material.gcyr.terephthaloyl_chloride": "ǝpıɹoןɥƆ ןʎoןɐɥʇɥdǝɹǝ⟘",
+  "material.gcyr.therephthalic_acid": "pıɔⱯ ɔıןɐɥʇɥdǝɹǝɥ⟘",
+  "material.gcyr.trinaquadalloy": "ʎoןןɐpɐnbɐuıɹ⟘",
   "menu.gcyr.back": "ʞɔɐᗺ",
   "menu.gcyr.catalog": "boןɐʇɐƆ",
   "menu.gcyr.category": "ʎɹobǝʇɐƆ",

src/generated/resources/assets/gcyr/lang/en_us.json

@@ -14,14 +14,15 @@
   "block.gcyr.dyson_system_controller": "Dyson System Controller",
   "block.gcyr.elite_fuel_tank": "Elite Fuel Tank",
   "block.gcyr.elite_rocket_motor": "Elite Rocket Motor",
-  "block.gcyr.iv_oxygen_spreader": "§1IV Oxygen Spreader",
+  "block.gcyr.iv_oxygen_spreader": "§9IV Oxygen Spreader",
   "block.gcyr.launch_pad": "Launch Pad",
   "block.gcyr.luv_oxygen_spreader": "§dLuV Oxygen Spreader",
   "block.gcyr.mars_regolith": "Mars Regolith",
   "block.gcyr.martian_rock": "Martian Rock",
   "block.gcyr.mercury_rock": "Mercury Rock",
   "block.gcyr.moon_sand": "Moon Sand",
   "block.gcyr.moon_stone": "Moon Stone",
+  "block.gcyr.prb_underground_mushroom": "Prb Underground Mushroom",
   "block.gcyr.rocket_scanner": "Rocket Scanner",
   "block.gcyr.seat": "Seat",
   "block.gcyr.space_elevator": "Space Elevator",
@@ -63,38 +64,37 @@
   "item.gcyr.space_helmet": "Space Helmet",
   "item.gcyr.space_leggings": "Space Leggings",
   "item.gcyr.space_station_package": "Space Station Package",
-  "itemGroup.gcyr.gcyr": "Gcyr",
   "key.categories.gcyr": "Gregicality Rocketry",
   "key.startRocket": "Start RocketEntity",
-  "material.aminophenol": "Aminophenol",
-  "material.bis_trichloromethyl_benzene": "Bis(trichloromethyl)benzene",
-  "material.bisalloy_400": "Bisalloy-400",
-  "material.chromic_acid": "Chromic Acid",
-  "material.co_mn_br_catalyst": "Co-Mn-Br Catalyst",
-  "material.cobalt_bromide": "Cobalt Bromide",
-  "material.dimethylformamide": "Dimethylformamide",
-  "material.durene": "Durene",
-  "material.fiberglass": "Fiberglass",
-  "material.fluorite": "Fluorite",
-  "material.hydrobromic_acid": "Hydrobromic Acid",
-  "material.iron_oxide": "Iron Oxide",
-  "material.kapton_k": "Kapton K",
-  "material.manganese_acetate": "Manganese Acetate",
-  "material.manganese_bromide": "Manganese Bromide",
-  "material.martian_rock_dust": "Martian Rock Dust",
-  "material.nitroaniline": "Nitroaniline",
-  "material.oxydianiline": "Oxydianiline",
-  "material.oxydianiline_sludge": "Oxydianiline Sludge",
-  "material.para_aramid": "Para-Aramid",
-  "material.para_phenylenediamine": "Para-Phenylenediamine",
-  "material.para_xylene": "Para-Xylene",
-  "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",
+  "material.gcyr.aminophenol": "Aminophenol",
+  "material.gcyr.bis_trichloromethyl_benzene": "Bis(trichloromethyl)benzene",
+  "material.gcyr.bisalloy_400": "Bisalloy-400",
+  "material.gcyr.chromic_acid": "Chromic Acid",
+  "material.gcyr.co_mn_br_catalyst": "Co-Mn-Br Catalyst",
+  "material.gcyr.cobalt_bromide": "Cobalt Bromide",
+  "material.gcyr.dimethylformamide": "Dimethylformamide",
+  "material.gcyr.durene": "Durene",
+  "material.gcyr.fiberglass": "Fiberglass",
+  "material.gcyr.fluorite": "Fluorite",
+  "material.gcyr.hydrobromic_acid": "Hydrobromic Acid",
+  "material.gcyr.iron_oxide": "Iron Oxide",
+  "material.gcyr.kapton_k": "Kapton K",
+  "material.gcyr.manganese_acetate": "Manganese Acetate",
+  "material.gcyr.manganese_bromide": "Manganese Bromide",
+  "material.gcyr.martian_rock_dust": "Martian Rock Dust",
+  "material.gcyr.nitroaniline": "Nitroaniline",
+  "material.gcyr.oxydianiline": "Oxydianiline",
+  "material.gcyr.oxydianiline_sludge": "Oxydianiline Sludge",
+  "material.gcyr.para_aramid": "Para-Aramid",
+  "material.gcyr.para_phenylenediamine": "Para-Phenylenediamine",
+  "material.gcyr.para_xylene": "Para-Xylene",
+  "material.gcyr.potassium_carbonate": "Potassium Carbonate",
+  "material.gcyr.potassium_chloride": "Potassium Chloride",
+  "material.gcyr.potassium_hydroxide": "Potassium Hydroxide",
+  "material.gcyr.pyrometillic_dianhydride": "Pyrometillic Dianhydride",
+  "material.gcyr.terephthaloyl_chloride": "Terephthaloyl Chloride",
+  "material.gcyr.therephthalic_acid": "Therephthalic Acid",
+  "material.gcyr.trinaquadalloy": "Trinaquadalloy",
   "menu.gcyr.back": "Back",
   "menu.gcyr.catalog": "Catalog",
   "menu.gcyr.category": "Category",

src/generated/resources/assets/gcyr/models/block/prb_underground_mushroom.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "gcyr:block/prb_underground_mushroom"
+  }
+}

src/generated/resources/assets/gcyr/models/item/prb_underground_mushroom.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "gcyr:block/prb_underground_mushroom"
+  }
+}

src/generated/resources/data/gcyr/loot_tables/blocks/prb_underground_mushroom.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "gcyr:prb_underground_mushroom"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "gcyr:blocks/prb_underground_mushroom"
+}

src/generated/resources/data/gcyr/tags/blocks/passes_flood_fill.json

@@ -1,10 +1,5 @@
 {
   "values": [
-    "gcyr:iv_oxygen_spreader",
-    "gcyr:luv_oxygen_spreader",
-    "gcyr:zpm_oxygen_spreader",
-    "gcyr:uv_oxygen_spreader",
-    "gcyr:uhv_oxygen_spreader",
     {
       "id": "#minecraft:fences",
       "required": false
@@ -16,6 +11,11 @@
     {
       "id": "minecraft:tnt",
       "required": false
-    }
+    },
+    "gcyr:iv_oxygen_spreader",
+    "gcyr:luv_oxygen_spreader",
+    "gcyr:zpm_oxygen_spreader",
+    "gcyr:uv_oxygen_spreader",
+    "gcyr:uhv_oxygen_spreader"
   ]
 }

src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -6,14 +6,8 @@
     "gcyr:dyson_sphere_casing",
     "gcyr:dyson_solar_cell",
     "gcyr:dyson_sphere_maintenance_port",
-    "gcyr:basic_rocket_motor",
-    "gcyr:advanced_rocket_motor",
-    "gcyr:elite_rocket_motor",
     "gcyr:airlock_door",
     "gcyr:launch_pad",
-    "gcyr:seat",
-    "gcyr:basic_fuel_tank",
-    "gcyr:advanced_fuel_tank",
-    "gcyr:elite_fuel_tank"
+    "gcyr:seat"
   ]
 }

src/main/java/argent_matter/gcyr/data/lang/LangHandler.java

@@ -11,51 +11,19 @@
 
 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(
-            GCyRMaterials.PotassiumChloride,
-            GCyRMaterials.PotassiumCarbonate,
-            GCyRMaterials.PotassiumHydroxide,
-            GCyRMaterials.ChromicAcid,
-            GCyRMaterials.Trinaquadalloy,
-            GCyRMaterials.Fluorite,
-            GCyRMaterials.CobaltBromide,
-            GCyRMaterials.ManganeseBromide,
-            GCyRMaterials.ManganeseAcetate,
-            GCyRMaterials.HydrobromicAcid,
-            GCyRMaterials.FiberGlass,
-            GCyRMaterials.PyromelliticDianhydride,
-            GCyRMaterials.Durene,
-            GCyRMaterials.Dimethylformamide,
-            GCyRMaterials.Oxydianiline,
-            GCyRMaterials.OxydianilineSludge,
-            GCyRMaterials.AminoPhenol,
-            GCyRMaterials.KaptonK,
-            GCyRMaterials.TerephthalicAcid,
-            GCyRMaterials.TerephthaloylChloride,
-            GCyRMaterials.Nitroaniline,
-            GCyRMaterials.MartianRockDust,
-            GCyRMaterials.IronOxide
-
-    );
-
     public static void init(RegistrateLangProvider provider) {
-        // materials
-        for (Material material : MATERIALS) {
-            provider.add(material.getUnlocalizedName(), toEnglishName(material.getName()));
-        }
         // tag prefixes
         provider.add("tagprefix.moon", TagPrefix.get("moon").langValue());
         provider.add("tagprefix.mars", TagPrefix.get("mars").langValue());
         provider.add("tagprefix.venus", TagPrefix.get("venus").langValue());
         provider.add("tagprefix.mercury", TagPrefix.get("mercury").langValue());
 
-        provider.add(GCyRMaterials.Bisalloy400.getUnlocalizedName(), "Bisalloy-400");
-        provider.add(GCyRMaterials.CoMnBrCatalyst.getUnlocalizedName(), "Co-Mn-Br Catalyst");
-        provider.add(GCyRMaterials.ParaPhenylenediamine.getUnlocalizedName(), "Para-Phenylenediamine");
-        provider.add(GCyRMaterials.ParaAramid.getUnlocalizedName(), "Para-Aramid");
-        provider.add(GCyRMaterials.ParaXylene.getUnlocalizedName(), "Para-Xylene");
-        provider.add(GCyRMaterials.BisTrichloromethylBenzene.getUnlocalizedName(), "Bis(trichloromethyl)benzene");
+        replace(provider, GCyRMaterials.Bisalloy400.getUnlocalizedName(), "Bisalloy-400");
+        replace(provider, GCyRMaterials.CoMnBrCatalyst.getUnlocalizedName(), "Co-Mn-Br Catalyst");
+        replace(provider, GCyRMaterials.ParaPhenylenediamine.getUnlocalizedName(), "Para-Phenylenediamine");
+        replace(provider, GCyRMaterials.ParaAramid.getUnlocalizedName(), "Para-Aramid");
+        replace(provider, GCyRMaterials.ParaXylene.getUnlocalizedName(), "Para-Xylene");
+        replace(provider, GCyRMaterials.BisTrichloromethylBenzene.getUnlocalizedName(), "Bis(trichloromethyl)benzene");
 
         // blocks
         replace(provider, "block.gcyr.aerospace_aluminium_casing", "Aerospace-grade Aluminium Machine Casing");