feat: machine model datagen

energy and oxygen storage modules now show their contents
temporarily disable generation of aluminum wire and glass fluid pipes (manual model in use)
data generate some manually added resources

gradle.properties

@@ -12,13 +12,13 @@ mod.group=dev.galacticraft
 mod.name=Galacticraft
 
 # Dependencies
-fabric.version=0.105.0+1.21.1
+fabric.version=0.110.0+1.21.1
 cloth.config.version=15.0.130
 modmenu.version=11.0.1
 rei.version=16.0.754
 jei.version=19.8.2.99
 dynamicdimensions.version=0.8.0+24
-machinelib.version=0.7.0+76
+machinelib.version=0.7.0+79
 badpackets.version=0.8.1
 wthit.version=12.3.0
 obj.version=0.4.0

src/main/generated/assets/galacticraft/blockstates/energy_storage_module.json

@@ -1,6 +1,30 @@
 {
   "variants": {
-    "": {
+    "amount=0": {
+      "model": "galacticraft:machine/energy_storage_module_0"
+    },
+    "amount=1": {
+      "model": "galacticraft:machine/energy_storage_module_1"
+    },
+    "amount=2": {
+      "model": "galacticraft:machine/energy_storage_module_2"
+    },
+    "amount=3": {
+      "model": "galacticraft:machine/energy_storage_module_3"
+    },
+    "amount=4": {
+      "model": "galacticraft:machine/energy_storage_module_4"
+    },
+    "amount=5": {
+      "model": "galacticraft:machine/energy_storage_module_5"
+    },
+    "amount=6": {
+      "model": "galacticraft:machine/energy_storage_module_6"
+    },
+    "amount=7": {
+      "model": "galacticraft:machine/energy_storage_module_7"
+    },
+    "amount=8": {
       "model": "galacticraft:machine/energy_storage_module"
     }
   }

src/main/generated/assets/galacticraft/blockstates/oxygen_storage_module.json

@@ -1,6 +1,30 @@
 {
   "variants": {
-    "": {
+    "amount=0": {
+      "model": "galacticraft:machine/oxygen_storage_module_0"
+    },
+    "amount=1": {
+      "model": "galacticraft:machine/oxygen_storage_module_1"
+    },
+    "amount=2": {
+      "model": "galacticraft:machine/oxygen_storage_module_2"
+    },
+    "amount=3": {
+      "model": "galacticraft:machine/oxygen_storage_module_3"
+    },
+    "amount=4": {
+      "model": "galacticraft:machine/oxygen_storage_module_4"
+    },
+    "amount=5": {
+      "model": "galacticraft:machine/oxygen_storage_module_5"
+    },
+    "amount=6": {
+      "model": "galacticraft:machine/oxygen_storage_module_6"
+    },
+    "amount=7": {
+      "model": "galacticraft:machine/oxygen_storage_module_7"
+    },
+    "amount=8": {
       "model": "galacticraft:machine/oxygen_storage_module"
     }
   }

src/main/generated/assets/galacticraft/lang/en_us.json

@@ -14,12 +14,6 @@
   "block.galacticraft.air_lock_controller": "Air Lock Controller",
   "block.galacticraft.air_lock_frame": "Air Lock Frame",
   "block.galacticraft.air_lock_seal": "Air Lock Seal",
-  "block.galacticraft.raw_meteoric_iron_block": "Block of Raw Meteoric Iron",
-  "block.galacticraft.raw_desh_block": "Block of Raw Desh",
-  "block.galacticraft.raw_aluminum_block": "Block of Raw Aluminum",
-  "block.galacticraft.raw_tin_block": "Block of Raw Tin",
-  "block.galacticraft.raw_titanium_block": "Block of Raw Titanium",
-  "block.galacticraft.raw_lead_block": "Block of Raw Lead",
   "block.galacticraft.aluminum_block": "Block of Aluminum",
   "block.galacticraft.aluminum_decoration": "Aluminum Decoration",
   "block.galacticraft.aluminum_decoration_slab": "Aluminum Decoration Slab",
@@ -136,7 +130,6 @@
   "block.galacticraft.glass_fluid_pipe": "Glass Fluid Pipe",
   "block.galacticraft.glowstone_lantern": "Glowstone Lantern",
   "block.galacticraft.glowstone_torch": "Glowstone Torch",
-  "block.galacticraft.iron_grating": "Iron Grating",
   "block.galacticraft.gray_candle_moon_cheese_wheel": "Moon Cheese Wheel with Gray Candle",
   "block.galacticraft.green_candle_moon_cheese_wheel": "Moon Cheese Wheel with Green Candle",
   "block.galacticraft.hard_venus_rock": "Hard Venus Rock",
@@ -146,6 +139,7 @@
   "block.galacticraft.iron_decoration_slab": "Iron Decoration Slab",
   "block.galacticraft.iron_decoration_stairs": "Iron Decoration Stairs",
   "block.galacticraft.iron_decoration_wall": "Iron Decoration Wall",
+  "block.galacticraft.iron_grating": "Iron Grating",
   "block.galacticraft.lead_block": "Block of Lead",
   "block.galacticraft.light_blue_candle_moon_cheese_wheel": "Moon Cheese Wheel with Light Blue Candle",
   "block.galacticraft.light_gray_candle_moon_cheese_wheel": "Moon Cheese Wheel with Light Gray Candle",
@@ -184,7 +178,7 @@
   "block.galacticraft.moon_basalt_stairs": "Moon Basalt Stairs",
   "block.galacticraft.moon_basalt_wall": "Moon Basalt Wall",
   "block.galacticraft.moon_cheese_wheel": "Moon Cheese Wheel",
-  "block.galacticraft.moon_cheese_wheel.description": "Moon Cheese Wheels are created from the cheeses of the Moon, place-able and edible.",
+  "block.galacticraft.moon_cheese_wheel.description": "Cheese Blocks are created from the cheeses of the Moon, place-able and edible.",
   "block.galacticraft.moon_copper_ore": "Moon Copper Ore",
   "block.galacticraft.moon_dirt": "Moon Dirt",
   "block.galacticraft.moon_dirt_path": "Moon Dirt Path",
@@ -223,6 +217,12 @@
   "block.galacticraft.polished_moon_rock_wall": "Polished Moon Rock Wall",
   "block.galacticraft.pumice": "Pumice",
   "block.galacticraft.purple_candle_moon_cheese_wheel": "Moon Cheese Wheel with Purple Candle",
+  "block.galacticraft.raw_aluminum_block": "Block of Raw Aluminum",
+  "block.galacticraft.raw_desh_block": "Block of Raw Desh",
+  "block.galacticraft.raw_lead_block": "Block of Raw Lead",
+  "block.galacticraft.raw_meteoric_iron_block": "Block of Raw Meteoric Iron",
+  "block.galacticraft.raw_tin_block": "Block of Raw Tin",
+  "block.galacticraft.raw_titanium_block": "Block of Raw Titanium",
   "block.galacticraft.red_candle_moon_cheese_wheel": "Moon Cheese Wheel with Red Candle",
   "block.galacticraft.refinery": "Refinery",
   "block.galacticraft.refinery.description": "Refinery will take an input of oil and energy, and output fuel used for rockets and vehicles.",
@@ -331,6 +331,7 @@
   "entity.galacticraft.gazer": "Gazer",
   "entity.galacticraft.grey": "Grey",
   "entity.galacticraft.lander": "Lander",
+  "entity.galacticraft.moon_villager": "Moon Villager",
   "entity.galacticraft.oli_grub": "Oli Grub",
   "entity.galacticraft.parachest": "Parachest",
   "entity.galacticraft.rocket": "Rocket",
@@ -462,7 +463,6 @@
   "item.galacticraft.raw_desh": "Raw Desh",
   "item.galacticraft.raw_lead": "Raw Lead",
   "item.galacticraft.raw_meteoric_iron": "Raw Meteoric Iron",
-  "item.galacticraft.silicon": "Silicon",
   "item.galacticraft.raw_tin": "Raw Tin",
   "item.galacticraft.raw_titanium": "Raw Titanium",
   "item.galacticraft.red_parachute": "Red Parachute",
@@ -472,6 +472,7 @@
   "item.galacticraft.sensor_glasses": "Sensor Glasses",
   "item.galacticraft.sensor_lens": "Sensor Lens",
   "item.galacticraft.shield_controller": "Shield Controller",
+  "item.galacticraft.silicon": "Silicon",
   "item.galacticraft.single_solar_module": "Single Solar Module",
   "item.galacticraft.small_oxygen_tank": "Small Oxygen Tank",
   "item.galacticraft.solar_array_wafer": "Solar Array Wafer",

src/main/generated/assets/galacticraft/models/machine/advanced_solar_panel.json

@@ -0,0 +1,10 @@
+{
+  "data": {
+    "back": "galacticraft:block/machine_side",
+    "front": "galacticraft:block/advanced_solar_panel",
+    "left": "galacticraft:block/machine_side",
+    "right": "galacticraft:block/machine_side",
+    "top": "galacticraft:block/solar_panel"
+  },
+  "machinelib:type": "machine"
+}

src/main/generated/assets/galacticraft/models/machine/base.json

@@ -0,0 +1,24 @@
+{
+  "any": {
+    "both": "galacticraft:block/machine_any_both",
+    "input": "galacticraft:block/machine_any_input",
+    "output": "galacticraft:block/machine_any_output"
+  },
+  "base": "galacticraft:block/machine",
+  "energy": {
+    "both": "galacticraft:block/machine_energy_both",
+    "input": "galacticraft:block/machine_energy_input",
+    "output": "galacticraft:block/machine_energy_output"
+  },
+  "fluid": {
+    "both": "galacticraft:block/machine_fluid_both",
+    "input": "galacticraft:block/machine_fluid_input",
+    "output": "galacticraft:block/machine_fluid_output"
+  },
+  "item": {
+    "both": "galacticraft:block/machine_item_both",
+    "input": "galacticraft:block/machine_item_input",
+    "output": "galacticraft:block/machine_item_output"
+  },
+  "machinelib:type": "base"
+}

src/main/generated/assets/galacticraft/models/machine/basic_solar_panel.json

@@ -0,0 +1,10 @@
+{
+  "data": {
+    "back": "galacticraft:block/machine_side",
+    "front": "galacticraft:block/basic_solar_panel",
+    "left": "galacticraft:block/machine_side",
+    "right": "galacticraft:block/machine_side",
+    "top": "galacticraft:block/solar_panel"
+  },
+  "machinelib:type": "machine"
+}

src/main/generated/assets/galacticraft/models/machine/circuit_fabricator.json

@@ -0,0 +1,9 @@
+{
+  "data": {
+    "back": "galacticraft:block/machine_side",
+    "front": "galacticraft:block/circuit_fabricator",
+    "left": "galacticraft:block/machine_side",
+    "right": "galacticraft:block/machine_side"
+  },
+  "machinelib:type": "machine"
+}

src/main/generated/assets/galacticraft/models/machine/coal_generator.json

@@ -0,0 +1,9 @@
+{
+  "data": {
+    "back": "galacticraft:block/machine_side",
+    "front": "galacticraft:block/coal_generator",
+    "left": "galacticraft:block/machine_side",
+    "right": "galacticraft:block/machine_side"
+  },
+  "machinelib:type": "machine"
+}

src/main/generated/assets/galacticraft/models/machine/compressor.json

@@ -0,0 +1,9 @@
+{
+  "data": {
+    "back": "galacticraft:block/machine_side",
+    "front": "galacticraft:block/compressor",
+    "left": "galacticraft:block/machine_side",
+    "right": "galacticraft:block/machine_side"
+  },
+  "machinelib:type": "machine"
+}

src/main/generated/assets/galacticraft/models/machine/electric_arc_furnace.json

@@ -0,0 +1,9 @@
+{
+  "data": {
+    "back": "galacticraft:block/machine_side",
+    "front": "galacticraft:block/electric_arc_furnace",
+    "left": "galacticraft:block/machine_side",
+    "right": "galacticraft:block/machine_side"
+  },
+  "machinelib:type": "machine"
+}