Airlock overhaul using new machine lib api

build.gradle.kts

@@ -49,6 +49,7 @@ val wthitVersion             = project.property("wthit.version").toString()
 val architecturyVersion      = project.property("architectury.version").toString()
 val appleskinVersion         = project.property("appleskin.version").toString()
 val objVersion               = project.property("obj.version").toString()
+val glassworkVersion         = project.property("glasswork.version").toString()
 
 plugins {
     java
@@ -202,6 +203,11 @@ repositories {
             includeGroup("squeek.appleskin")
         }
     }
+    maven("https://maven.teamgalacticraft.org/") {
+        content {
+            includeGroup("dev.maximus")
+        }
+    }
 }
 
 configurations {
@@ -234,6 +240,7 @@ dependencies {
 
     "core"("dev.galacticraft:dynamicdimensions-fabric:$dynamicdimensionsVersion")
     "core"("dev.galacticraft:MachineLib:$machineLibVersion")
+    "core"("dev.maximus:glasswork:$glassworkVersion")
     "core"("lol.bai:badpackets:fabric-$badpacketsVersion")
 
     // Optional Dependencies

gradle.properties

@@ -24,3 +24,4 @@ wthit.version=12.5.4
 obj.version=0.4.0
 appleskin.version=mc1.21-3.0.5
 architectury.version=13.0.6
+glasswork.version=1.5.1

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

@@ -1,7 +1,7 @@
 {
   "variants": {
     "": {
-      "model": "galacticraft:block/air_lock_controller"
+      "model": "galacticraft:machine/air_lock_controller"
     }
   }
 }

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

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "galacticraft:machine/bubble_air_lock_controller"
+    }
+  }
+}

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

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "galacticraft:machine/reinforced_air_lock_controller"
+    }
+  }
+}

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

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "galacticraft:block/reinforced_air_lock_frame"
+    }
+  }
+}

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

@@ -122,6 +122,7 @@
   "block.galacticraft.bronze_decoration_wall": "Bronze Decoration Wall",
   "block.galacticraft.brown_candle_moon_cheese_wheel": "Moon Cheese Wheel with Brown Candle",
   "block.galacticraft.brown_glass_fluid_pipe": "Brown Stained Glass Fluid Pipe",
+  "block.galacticraft.bubble_air_lock_controller": "Bubble Airlock Controller",
   "block.galacticraft.candle_moon_cheese_wheel": "Moon Cheese Wheel with Candle",
   "block.galacticraft.canned_food": "Canned Food",
   "block.galacticraft.cavernous_vines": "Cavernous Vines",
@@ -344,6 +345,8 @@
   "block.galacticraft.red_glass_fluid_pipe": "Red Stained Glass Fluid Pipe",
   "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.",
+  "block.galacticraft.reinforced_air_lock_controller": "Reinforced Airlock Controller",
+  "block.galacticraft.reinforced_air_lock_frame": "Reinforced Airlock Frame",
   "block.galacticraft.rich_olivine_basalt": "Rich Olivine Basalt",
   "block.galacticraft.rocket_launch_pad": "Rocket Launch Pad",
   "block.galacticraft.rocket_workbench": "Rocket Workbench",
@@ -882,8 +885,12 @@
   "tooltip.galacticraft.standard_wrench": "Most Galacticraft machines can be rotated by right-clicking with the Standard Wrench.",
   "tooltip.galacticraft.time_until_cool": "Time Until Cool: %s",
   "tooltip.galacticraft.waila_oxygen_tank": "O₂ Tank %s",
-  "ui.galacticraft.airlock.owner": "%s's Airlock Controller",
-  "ui.galacticraft.airlock.redstone_signal": "Opens on Redstone Signal",
+  "ui.galacticraft.airlock.default_name": "Airlock Controller",
+  "ui.galacticraft.airlock.disabled": "Airlock Disabled",
+  "ui.galacticraft.airlock.enabled": "Airlock Enabled",
+  "ui.galacticraft.airlock.open_when_near": "Airlock opens near player",
+  "ui.galacticraft.airlock.partial": "Airlock Partially Enabled",
+  "ui.galacticraft.airlock_proximity_label": "Airlock Proximity:",
   "ui.galacticraft.alpha_warning.content1": "Galacticraft is currently in ALPHA.",
   "ui.galacticraft.alpha_warning.content2": "Please report all issues you find.",
   "ui.galacticraft.alpha_warning.content3": "Press [ESC] or click to continue.",

src/main/generated/assets/galacticraft/models/block/reinforced_air_lock_frame.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "galacticraft:block/reinforced_air_lock_frame"
+  }
+}

src/main/generated/assets/galacticraft/models/item/reinforced_air_lock_frame.json

@@ -0,0 +1,3 @@
+{
+  "parent": "galacticraft:block/reinforced_air_lock_frame"
+}

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

@@ -0,0 +1,12 @@
+{
+  "data": {
+    "back": "galacticraft:block/air_lock_controller",
+    "bottom": "galacticraft:block/air_lock_frame",
+    "front": "galacticraft:block/air_lock_controller",
+    "left": "galacticraft:block/air_lock_controller",
+    "particle": "galacticraft:block/air_lock_controller",
+    "right": "galacticraft:block/air_lock_controller",
+    "top": "galacticraft:block/air_lock_frame"
+  },
+  "machinelib:type": "machine"
+}

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

@@ -0,0 +1,12 @@
+{
+  "data": {
+    "back": "galacticraft:block/air_lock_controller",
+    "bottom": "galacticraft:block/air_lock_frame",
+    "front": "galacticraft:block/air_lock_controller",
+    "left": "galacticraft:block/air_lock_controller",
+    "particle": "galacticraft:block/air_lock_controller",
+    "right": "galacticraft:block/air_lock_controller",
+    "top": "galacticraft:block/air_lock_frame"
+  },
+  "machinelib:type": "machine"
+}

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

@@ -0,0 +1,12 @@
+{
+  "data": {
+    "back": "galacticraft:block/reinforced_air_lock_controller",
+    "bottom": "galacticraft:block/reinforced_air_lock_frame",
+    "front": "galacticraft:block/reinforced_air_lock_controller",
+    "left": "galacticraft:block/reinforced_air_lock_controller",
+    "particle": "galacticraft:block/reinforced_air_lock_controller",
+    "right": "galacticraft:block/reinforced_air_lock_controller",
+    "top": "galacticraft:block/reinforced_air_lock_frame"
+  },
+  "machinelib:type": "machine"
+}

src/main/generated/data/galacticraft/advancement/recipes/decorations/reinforced_air_lock_controller.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_compressed_meteoric_iron": {
+      "conditions": {
+        "items": [
+          {
+            "items": "galacticraft:compressed_meteoric_iron"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "galacticraft:reinforced_air_lock_controller"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_compressed_meteoric_iron"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "galacticraft:reinforced_air_lock_controller"
+    ]
+  }
+}

src/main/generated/data/galacticraft/advancement/recipes/decorations/reinforced_air_lock_frame.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_oxygen_concentrator": {
+      "conditions": {
+        "items": [
+          {
+            "items": "galacticraft:oxygen_concentrator"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "galacticraft:reinforced_air_lock_frame"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_oxygen_concentrator"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "galacticraft:reinforced_air_lock_frame"
+    ]
+  }
+}

src/main/generated/data/galacticraft/loot_table/blocks/bubble_air_lock_controller.json

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

src/main/generated/data/galacticraft/loot_table/blocks/reinforced_air_lock_controller.json

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

src/main/generated/data/galacticraft/loot_table/blocks/reinforced_air_lock_frame.json

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

src/main/generated/data/galacticraft/recipe/reinforced_air_lock_controller.json

@@ -0,0 +1,27 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "M": {
+      "item": "galacticraft:compressed_meteoric_iron"
+    },
+    "O": {
+      "item": "minecraft:obsidian"
+    },
+    "S": {
+      "item": "galacticraft:compressed_steel"
+    },
+    "W": {
+      "item": "galacticraft:basic_wafer"
+    }
+  },
+  "pattern": [
+    "OSO",
+    "MWM",
+    "OSO"
+  ],
+  "result": {
+    "count": 1,
+    "id": "galacticraft:reinforced_air_lock_controller"
+  }
+}

src/main/generated/data/galacticraft/recipe/reinforced_air_lock_frame.json

@@ -0,0 +1,24 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "C": {
+      "item": "galacticraft:oxygen_concentrator"
+    },
+    "O": {
+      "item": "minecraft:obsidian"
+    },
+    "S": {
+      "item": "galacticraft:compressed_steel"
+    }
+  },
+  "pattern": [
+    "OOO",
+    "SCS",
+    "OOO"
+  ],
+  "result": {
+    "count": 4,
+    "id": "galacticraft:reinforced_air_lock_frame"
+  }
+}

src/main/generated/data/galacticraft/tags/block/airlock_blocks.json

@@ -0,0 +1,9 @@
+{
+  "values": [
+    "galacticraft:air_lock_frame",
+    "galacticraft:air_lock_controller",
+    "galacticraft:reinforced_air_lock_frame",
+    "galacticraft:reinforced_air_lock_controller",
+    "galacticraft:bubble_air_lock_controller"
+  ]
+}

src/main/generated/data/galacticraft/tags/block/machines.json

@@ -18,6 +18,7 @@
     "galacticraft:oxygen_compressor",
     "galacticraft:oxygen_storage_module",
     "galacticraft:food_canner",
-    "galacticraft:rocket_workbench"
+    "galacticraft:rocket_workbench",
+    "galacticraft:bubble_air_lock_controller"
   ]
 }

src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json

@@ -96,7 +96,9 @@
     "galacticraft:cryogenic_chamber_part",
     "galacticraft:solar_panel_part",
     "galacticraft:air_lock_frame",
+    "galacticraft:reinforced_air_lock_frame",
     "galacticraft:air_lock_controller",
+    "galacticraft:reinforced_air_lock_controller",
     "galacticraft:sealable_aluminum_wire",
     "galacticraft:heavy_sealable_aluminum_wire",
     "galacticraft:silicon_block",