fix upload things

.github/workflows/auto_publish.yml

@@ -60,9 +60,9 @@ jobs:
         name: Get Version
         id: var
         run: |
-          MESSAGE=$(ls fabric/build/libs/* | grep sources.jar -v | grep shadow.jar -v | awk -F 'gtceu-fabric-|.jar' '{print $2}')
+          MESSAGE=$(ls fabric/build/libs/* | grep sources.jar -v | grep shadow.jar -v | awk -F 'gcys-fabric-|.jar' '{print $2}')
           echo fabric_version=$MESSAGE >> $GITHUB_OUTPUT
-          MESSAGE=$(ls forge/build/libs/* | grep sources.jar -v | grep shadow.jar -v | awk -F 'gtceu-forge-|.jar' '{print $2}')
+          MESSAGE=$(ls forge/build/libs/* | grep sources.jar -v | grep shadow.jar -v | awk -F 'gcys-forge-|.jar' '{print $2}')
           echo forge_version=$MESSAGE >> $GITHUB_OUTPUT
 
       - if: ${{ inputs.publishCurseForgeAndModrinth }}
@@ -83,7 +83,7 @@ jobs:
             fabric/build/libs/!(*-@(dev|sources|javadoc|dev-shadow)).jar
             fabric/build/libs/*-@(dev|sources|javadoc|dev-shadow).jar
 
-          name: GregTechCEu ${{ steps.var.outputs.fabric_version }}-fabric
+          name: GCyS ${{ steps.var.outputs.fabric_version }}-fabric
           version: mc${{ steps.var.outputs.fabric_version }}-fabric
           version-type: ${{ inputs.releaseType }}
           changelog-file: CHANGELOG.*
@@ -119,7 +119,7 @@ jobs:
             forge/build/libs/!(*-@(dev|sources|javadoc|dev-shadow)).jar
             forge/build/libs/*-@(dev|sources|javadoc|dev-shadow).jar
 
-          name: GregTechCEu ${{ steps.var.outputs.forge_version }}-forge
+          name: GCyS ${{ steps.var.outputs.forge_version }}-forge
           version: mc${{ steps.var.outputs.forge_version }}-forge
           version-type: ${{ inputs.releaseType }}
           changelog-file: CHANGELOG.*

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

@@ -1,22 +1,22 @@
 {
   "behaviour.satellite.type": " :ǝdʎ⟘ ǝʇıןןǝʇɐS",
+  "block.gcys.aerospace_aluminium_casing": "buısɐƆ ǝuıɥɔɐW ɯnıuıɯnןⱯ ǝpɐɹb-ǝɔɐdsoɹǝⱯ",
   "block.gcys.airlock_door": "ɹooᗡ ʞɔoןɹıⱯ",
-  "block.gcys.aluminium_aerospace": "buısɐƆ ǝuıɥɔɐW ɯnıuıɯnןⱯ ǝpɐɹb-ǝɔɐdsoɹǝⱯ",
-  "block.gcys.drone_hangar": "ɹɐbuɐH ǝuoɹᗡ",
+  "block.gcys.beam_receiver": "ɹǝʌıǝɔǝᴚ ɯɐǝᗺ",
+  "block.gcys.dyson_solar_cell": "ןןǝƆ ɹɐןoS uosʎᗡ",
+  "block.gcys.dyson_sphere_casing": "buısɐƆ ǝɹǝɥdS uosʎᗡ",
+  "block.gcys.dyson_sphere_maintenance_port": "ʇɹoԀ ǝɔuɐuǝʇuıɐW ǝɹǝɥdS uosʎᗡ",
   "block.gcys.fuel_tank": "ʞuɐ⟘ ןǝnℲ",
-  "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.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_shuttle": "ǝןʇʇnɥS ǝɔɐ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.space_elevator_support": "ʇɹoddnS ɹoʇɐʌǝןƎ ǝɔɐdS",
+  "block.minecraft.air": "ɹıⱯ",
   "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ǝᴚ",
   "gcys.machine.satellite_jammer.jammed": "%s pǝɯɯɐſ",
   "gcys.machine.satellite_jammer.position": "%s ʇⱯ",
   "gcys.multiblock.rocket.build": "ʇǝʞɔoᴚ uɐɔS",
@@ -27,29 +27,29 @@
   "gcys.satellite.empty": "ǝʇıןןǝʇɐS ʎʇdɯƎ",
   "gcys.satellite.gps": "ǝʇıןןǝʇɐS SԀ⅁",
   "gcys.satellite.laser": "ǝʇıןןǝʇɐS ᴚƎSⱯꞀ",
+  "item.gcys.dyson_construction_drone": "ǝuoɹᗡ uoıʇɔnɹʇsuoƆ uosʎᗡ",
   "item.gcys.dyson_swarm_satellite": "ǝʇıןןǝʇɐS ɯɹɐʍS uosʎᗡ",
   "item.gcys.empty_satellite": "ǝʇıןןǝʇɐS ʎʇdɯƎ",
   "item.gcys.gps_satellite": "ǝʇıןןǝʇɐS sd⅁",
   "item.gcys.gps_tracker": "ɹǝʞɔɐɹ⟘ SԀ⅁",
   "item.gcys.id_chip": "dıɥƆ uoıʇɐɔıɟıʇuǝpI dıɹʇs-ʇǝubɐW",
   "item.gcys.keycard": "dıɥƆ buıʞɔoꞀ ɔıɹʇɔǝןƎ pǝɔuɐʌpⱯ",
   "item.gcys.laser_satellite": "ǝʇıןןǝʇɐS ɹǝsɐꞀ",
-  "item.gcys.manned_rocket": "ʇǝʞɔoᴚ pǝuuɐW",
   "item.gcys.ore_finder_satellite": "ǝʇıןןǝʇɐS ɹǝpuıℲ ǝɹO",
-  "item.gcys.satellite_rocket": "ʇǝʞɔoᴚ ǝʇıןןǝʇɐS",
+  "item.gcys.photovoltaic_cell": "ןןǝƆ ɔıɐʇןoʌoʇoɥԀ",
   "item.gcys.space_boots": "sʇooᗺ ǝɔɐdS",
   "item.gcys.space_chestplate": "ǝʇɐןdʇsǝɥƆ ǝɔɐdS",
   "item.gcys.space_fabric": "ɔıɹqɐℲ ǝɔɐdS",
   "item.gcys.space_helmet": "ʇǝɯןǝH ǝɔɐdS",
   "item.gcys.space_leggings": "sbuıbbǝꞀ ǝɔɐdS",
   "key.categories.gcys": "ǝɔɐdS ʎʇıןɐɔıbǝɹ⅁",
   "key.startRocket": "ʎʇıʇuƎʇǝʞɔoᴚ ʇɹɐʇS",
-  "material.poly_oxydiphenylene_pyromellitimide": ")ǝpıɯıʇıןןǝɯoɹʎԀ-ǝuǝןʎuǝɥdıpʎxO-,ㄣ'ㄣ(ʎןoԀ",
   "menu.gcys.back": "ʞɔɐᗺ",
   "menu.gcys.catalog": "boןɐʇɐƆ",
   "menu.gcys.category": "ʎɹobǝʇɐƆ",
   "menu.gcys.galaxy": "ʎxɐןɐ⅁",
   "menu.gcys.gravity": "ʎʇıʌɐɹ⅁",
+  "menu.gcys.launch": "HƆN∩ⱯꞀ",
   "menu.gcys.moon": "uooW",
   "menu.gcys.no_gravity": "ʎʇıʌɐɹ⅁ oN",
   "menu.gcys.orbit": "ʇıqɹO",
@@ -62,7 +62,10 @@
   "menu.gcys.space_station": "uoıʇɐʇS ǝɔɐdS",
   "menu.gcys.temperature": "ǝɹnʇɐɹǝdɯǝ⟘",
   "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ɐןԀ pǝʇɔǝןǝS ʎןʇuǝɹɹnƆ"
+  "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

@@ -1,22 +1,22 @@
 {
   "behaviour.satellite.type": "Satellite Type: ",
+  "block.gcys.aerospace_aluminium_casing": "Aerospace-grade Aluminium Machine Casing",
   "block.gcys.airlock_door": "Airlock Door",
-  "block.gcys.aluminium_aerospace": "Aerospace-grade Aluminium Machine Casing",
-  "block.gcys.drone_hangar": "Drone Hangar",
+  "block.gcys.beam_receiver": "Beam Receiver",
+  "block.gcys.dyson_solar_cell": "Dyson Solar Cell",
+  "block.gcys.dyson_sphere_casing": "Dyson Sphere Casing",
+  "block.gcys.dyson_sphere_maintenance_port": "Dyson Sphere Maintenance Port",
   "block.gcys.fuel_tank": "Fuel Tank",
-  "block.gcys.iv_oxygen_spreader": "Iv Oxygen Spreader",
   "block.gcys.launch_pad": "Launch Pad",
-  "block.gcys.luv_oxygen_spreader": "Luv 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_shuttle": "Space Shuttle",
-  "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.space_elevator_support": "Space Elevator Support",
+  "block.minecraft.air": "Air",
   "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",
   "gcys.machine.satellite_jammer.jammed": "Jammed %s",
   "gcys.machine.satellite_jammer.position": "At %s",
   "gcys.multiblock.rocket.build": "Scan Rocket",
@@ -27,29 +27,29 @@
   "gcys.satellite.empty": "Empty Satellite",
   "gcys.satellite.gps": "GPS Satellite",
   "gcys.satellite.laser": "LASER Satellite",
+  "item.gcys.dyson_construction_drone": "Dyson Construction Drone",
   "item.gcys.dyson_swarm_satellite": "Dyson Swarm Satellite",
   "item.gcys.empty_satellite": "Empty Satellite",
   "item.gcys.gps_satellite": "Gps Satellite",
   "item.gcys.gps_tracker": "GPS Tracker",
   "item.gcys.id_chip": "Magnet-strip Identification Chip",
   "item.gcys.keycard": "Advanced Electric Locking Chip",
   "item.gcys.laser_satellite": "Laser Satellite",
-  "item.gcys.manned_rocket": "Manned Rocket",
   "item.gcys.ore_finder_satellite": "Ore Finder Satellite",
-  "item.gcys.satellite_rocket": "Satellite Rocket",
+  "item.gcys.photovoltaic_cell": "Photovoltaic Cell",
   "item.gcys.space_boots": "Space Boots",
   "item.gcys.space_chestplate": "Space Chestplate",
   "item.gcys.space_fabric": "Space Fabric",
   "item.gcys.space_helmet": "Space Helmet",
   "item.gcys.space_leggings": "Space Leggings",
   "key.categories.gcys": "Gregicality Space",
   "key.startRocket": "Start RocketEntity",
-  "material.poly_oxydiphenylene_pyromellitimide": "Poly(4,4'-Oxydiphenylene-Pyromellitimide)",
   "menu.gcys.back": "Back",
   "menu.gcys.catalog": "Catalog",
   "menu.gcys.category": "Category",
   "menu.gcys.galaxy": "Galaxy",
   "menu.gcys.gravity": "Gravity",
+  "menu.gcys.launch": "LAUNCH",
   "menu.gcys.moon": "Moon",
   "menu.gcys.no_gravity": "No Gravity",
   "menu.gcys.orbit": "Orbit",
@@ -62,7 +62,10 @@
   "menu.gcys.space_station": "Space Station",
   "menu.gcys.temperature": "Temperature",
   "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.id": "Currently selected planet: ",
+  "metaitem.planet_id_circuit.station": "To in-orbit space station (ID: %s)"
 }

forge/src/generated/resources/assets/gcys/models/item/satellite_rocket.json → fabric/src/generated/resources/assets/gcys/models/item/dyson_construction_drone.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "gcys:item/satellite_rocket"
+    "layer0": "gcys:item/dyson_construction_drone"
   }
 }

fabric/src/generated/resources/assets/gcys/models/item/manned_rocket.json → fabric/src/generated/resources/assets/gcys/models/item/photovoltaic_cell.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "gcys:item/manned_rocket"
+    "layer0": "gcys:item/photovoltaic_cell"
   }
 }

fabric/src/generated/resources/data/fabric/tags/blocks/mineable/wrench.json

@@ -1,7 +1,12 @@
 {
   "replace": false,
   "values": [
-    "gcys:aluminium_aerospace",
+    "gcys:aerospace_aluminium_casing",
+    "gcys:beam_receiver",
+    "gcys:space_elevator_support",
+    "gcys:dyson_sphere_casing",
+    "gcys:dyson_solar_cell",
+    "gcys:dyson_sphere_maintenance_port",
     "gcys:rocket_motor",
     "gcys:airlock_door",
     "gcys:launch_pad",

fabric/src/generated/resources/data/gcys/loot_tables/blocks/aerospace_aluminium_casing.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "gcys:aerospace_aluminium_casing"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

forge/src/generated/resources/data/gcys/loot_tables/blocks/aluminium_aerospace.json → fabric/src/generated/resources/data/gcys/loot_tables/blocks/beam_receiver.json

@@ -11,7 +11,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "gcys:aluminium_aerospace"
+          "name": "gcys:beam_receiver"
         }
       ],
       "rolls": 1.0

fabric/src/generated/resources/data/gcys/loot_tables/blocks/aluminium_aerospace.json → fabric/src/generated/resources/data/gcys/loot_tables/blocks/dyson_solar_cell.json

@@ -11,7 +11,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "gcys:aluminium_aerospace"
+          "name": "gcys:dyson_solar_cell"
         }
       ],
       "rolls": 1.0

fabric/src/generated/resources/data/gcys/loot_tables/blocks/dyson_sphere_casing.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "gcys:dyson_sphere_casing"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

fabric/src/generated/resources/data/gcys/loot_tables/blocks/dyson_sphere_maintenance_port.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "gcys:dyson_sphere_maintenance_port"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

fabric/src/generated/resources/data/gcys/loot_tables/blocks/space_elevator_support.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "gcys:space_elevator_support"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

fabric/src/generated/resources/data/gcys/tags/blocks/passes_flood_fill.json

@@ -1,16 +1,16 @@
 {
   "replace": false,
   "values": [
-    "gcys:iv_oxygen_spreader",
-    "gcys:luv_oxygen_spreader",
-    "gcys:zpm_oxygen_spreader",
-    "gcys:uv_oxygen_spreader",
-    "gcys:uhv_oxygen_spreader",
     {
       "id": "#minecraft:fences",
       "required": false
     },
     "minecraft:iron_bars",
-    "minecraft:tnt"
+    "minecraft:tnt",
+    "minecraft:air",
+    "minecraft:air",
+    "minecraft:air",
+    "minecraft:air",
+    "minecraft:air"
   ]
 }

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

@@ -1,7 +1,12 @@
 {
   "replace": false,
   "values": [
-    "gcys:aluminium_aerospace",
+    "gcys:aerospace_aluminium_casing",
+    "gcys:beam_receiver",
+    "gcys:space_elevator_support",
+    "gcys:dyson_sphere_casing",
+    "gcys:dyson_solar_cell",
+    "gcys:dyson_sphere_maintenance_port",
     "gcys:rocket_motor",
     "gcys:airlock_door",
     "gcys:launch_pad",