bunch of textures n stuff

Porting-Dead-Mods · Sep 9, 2024 · 35f5da4 · 35f5da4
1 parent 766c7d9
commit 35f5da4
Show file tree

Hide file tree

Showing 40 changed files with 167 additions and 39 deletions.
diff --git a/src/generated/resources/.cache/5db5b310cf1abc4c7f33d2d565e2a2290a7f6c4d b/src/generated/resources/.cache/5db5b310cf1abc4c7f33d2d565e2a2290a7f6c4d
@@ -1,4 +1,4 @@
-// 1.21.1	2024-09-09T14:03:58.044427722	Item Models: modjam
+// 1.21.1	2024-09-09T17:27:09.269854152	Item Models: modjam
 51765874ad3111adf69684269ad9a422bfbaac4a assets/modjam/models/item/aquarine_steel_block.json
 e674d6859446f65b4ee805ed6e9f47d6cde82515 assets/modjam/models/item/aquarine_steel_ingot.json
 098a336dd0b210f2b650174de2346a665b921edd assets/modjam/models/item/aquarine_steel_wrench.json
@@ -11,5 +11,7 @@ a6585e714ae7922fe5d8319e566b7acc247e2cd1 assets/modjam/models/item/crowbar.json
 4d48047a9639345841262719f87f57c3494e4a55 assets/modjam/models/item/deep_sea_drain.json
 945ba48b672ffdee7c76e0939012a2b60ce471a6 assets/modjam/models/item/eas_bucket.json
 5b6b9e8621c065cb4167e4b6dfdfaecb0fd7186d assets/modjam/models/item/eas_vial.json
+054c0dfda629903fcf6880f0db40241af562a1a8 assets/modjam/models/item/gear.json
 f0f9891cd57b3a66f7440a71b925348bb8ea745b assets/modjam/models/item/glass_vial.json
 dab337d602d93b0a4930b69e652b1155300c6502 assets/modjam/models/item/prism_monocle.json
+3a80dac2ed65f9c211115988d17e81af34d02e3d assets/modjam/models/item/rusty_gear.json
diff --git a/src/generated/resources/.cache/7383b985a2cdbb3a068dc5fd3ae4ba545545c370 b/src/generated/resources/.cache/7383b985a2cdbb3a068dc5fd3ae4ba545545c370
@@ -1,10 +1,10 @@
-// 1.21.1	2024-09-09T14:03:58.046449552	Block States: modjam
+// 1.21.1	2024-09-09T16:28:40.662678864	Block States: modjam
 af3ef9c17c60ced537516e8aa1215fcb76e3683e assets/modjam/blockstates/aquarine_steel_block.json
 865a45a4d022b56bc54dc32dae4b666af2df7d6f assets/modjam/blockstates/aquatic_catalyst.json
 6e42254717fc67a953282f50517eb06c02193129 assets/modjam/blockstates/chiseled_dark_prismarine.json
 3f474de85f7cf428f3ecd383cde71be56c940ecd assets/modjam/blockstates/crate.json
 791da2d01b6b33bb1ce175d5c9c1fa5b737c9dfc assets/modjam/blockstates/dark_prismarine_pillar.json
-81a19158e82814c2a6cabea6ace048a6662cd753 assets/modjam/blockstates/deep_sea_drain.json
+ff480f6623e46679671977b783f08e28c536578d assets/modjam/blockstates/deep_sea_drain.json
 74a08c3614f8cf6dace6f155476015776d839ce1 assets/modjam/blockstates/deep_sea_drain_part.json
 5ca1917566d04d2f7fefbfa648958c06d3238f67 assets/modjam/models/block/aquarine_steel_block.json
 4d2484ce030aeac9f86e39b1dffd193afb69271f assets/modjam/models/block/aquatic_catalyst.json
@@ -17,24 +17,25 @@ af3ef9c17c60ced537516e8aa1215fcb76e3683e assets/modjam/blockstates/aquarine_stee
 d195e7fac58d30252394633078e3b283847c384d assets/modjam/models/block/chiseled_dark_prismarine.json
 b6b3bf2f98df9f895638d69f1cf04dba1857ee0f assets/modjam/models/block/dark_prismarine_pillar.json
 ab7fa2e5661f50dd875326f2a48bea18e8e8563b assets/modjam/models/block/dark_prismarine_pillar_horizontal.json
-229a84489c5c75185f23047daa02bb2e88bb629c assets/modjam/models/block/deep_sea_drain.json
-fa5bdbfc78d2fc92af71c3dc60be4fac60dd7e6a assets/modjam/models/block/deep_sea_drain_part_0.json
-fa5bdbfc78d2fc92af71c3dc60be4fac60dd7e6a assets/modjam/models/block/deep_sea_drain_part_0_open.json
-67b322ac6de88740ee5e4dfb3fdf8cca66db5f1b assets/modjam/models/block/deep_sea_drain_part_1.json
-723d1070567117b01740b5fef825ead83ae71e1a assets/modjam/models/block/deep_sea_drain_part_1_open.json
-14a2615ae2c61bfa812929502f17038309ec6aec assets/modjam/models/block/deep_sea_drain_part_2.json
-14a2615ae2c61bfa812929502f17038309ec6aec assets/modjam/models/block/deep_sea_drain_part_2_open.json
-51af7b5f4afa576c001798043ccff9125930420d assets/modjam/models/block/deep_sea_drain_part_3.json
-62f934bbb84fcde12d170bdc8c26862dc3443923 assets/modjam/models/block/deep_sea_drain_part_3_open.json
-229a84489c5c75185f23047daa02bb2e88bb629c assets/modjam/models/block/deep_sea_drain_part_4.json
-229a84489c5c75185f23047daa02bb2e88bb629c assets/modjam/models/block/deep_sea_drain_part_4_open.json
-01f2a0382651e3606db21359a5b448d3d6e339f6 assets/modjam/models/block/deep_sea_drain_part_5.json
-016323403a6c062beba13dfdc7a8384682aa12a4 assets/modjam/models/block/deep_sea_drain_part_5_open.json
-e62c525fbab24ea430735bd81bf71581eceed9c9 assets/modjam/models/block/deep_sea_drain_part_6.json
-e62c525fbab24ea430735bd81bf71581eceed9c9 assets/modjam/models/block/deep_sea_drain_part_6_open.json
-c6666b1b7a9b97708afc337463d65c098bcd0c38 assets/modjam/models/block/deep_sea_drain_part_7.json
-8149cf16f075d4a3e9ccb4f224376ed7011e3db9 assets/modjam/models/block/deep_sea_drain_part_7_open.json
-c726d4f7c530beadc3bb9035ea46017faba9f4f2 assets/modjam/models/block/deep_sea_drain_part_8.json
-c726d4f7c530beadc3bb9035ea46017faba9f4f2 assets/modjam/models/block/deep_sea_drain_part_8_open.json
+288e0dd8275caa16b1debf82fb87d5b6b9c2175e assets/modjam/models/block/deep_sea_drain.json
+32cb4d59ede1d49cf7a318d433dd0ee72eeffb05 assets/modjam/models/block/deep_sea_drain_formed.json
+e4fd8bf4276d4c0da47e06644ea61cc0c9d1bdca assets/modjam/models/block/deep_sea_drain_part_0.json
+e4fd8bf4276d4c0da47e06644ea61cc0c9d1bdca assets/modjam/models/block/deep_sea_drain_part_0_open.json
+883fda918f9898a3f20c6cd55405311fc67a62a8 assets/modjam/models/block/deep_sea_drain_part_1.json
+51e24c02d98ac1e9928c89c2eab8c979a0934f05 assets/modjam/models/block/deep_sea_drain_part_1_open.json
+1d2ce3ebd7f662200dcc74b1d4c3b64748384192 assets/modjam/models/block/deep_sea_drain_part_2.json
+1d2ce3ebd7f662200dcc74b1d4c3b64748384192 assets/modjam/models/block/deep_sea_drain_part_2_open.json
+44082e5455cd6bbfe8ae9418b5c44613e77c5fc6 assets/modjam/models/block/deep_sea_drain_part_3.json
+38c8ce2be3ed63128be928a5dd83e4fcd08cb4e8 assets/modjam/models/block/deep_sea_drain_part_3_open.json
+aa489c5924d0650a9fa4d356733607ede7ccc5f2 assets/modjam/models/block/deep_sea_drain_part_4.json
+aa489c5924d0650a9fa4d356733607ede7ccc5f2 assets/modjam/models/block/deep_sea_drain_part_4_open.json
+c03d789c3ef0909ff022ddeb32bf0c63c81ca393 assets/modjam/models/block/deep_sea_drain_part_5.json
+d42eaa1900eba7c984d8db8ffc31720dfd177ebb assets/modjam/models/block/deep_sea_drain_part_5_open.json
+c8637f48439a1ac02569133cefb5384679d960d1 assets/modjam/models/block/deep_sea_drain_part_6.json
+c8637f48439a1ac02569133cefb5384679d960d1 assets/modjam/models/block/deep_sea_drain_part_6_open.json
+dc03f74fefb762e78ba124ce40cb95e0458605cf assets/modjam/models/block/deep_sea_drain_part_7.json
+8f50b14d4cba9562f637420552572abc77a2de39 assets/modjam/models/block/deep_sea_drain_part_7_open.json
+0b1a1d1db1b9b846cafcbb80457f2580666e32c4 assets/modjam/models/block/deep_sea_drain_part_8.json
+0b1a1d1db1b9b846cafcbb80457f2580666e32c4 assets/modjam/models/block/deep_sea_drain_part_8_open.json
 944f8a549bbc7f13a4b7022e63d680f6d533d68b assets/modjam/models/block/rusty_crate.json
 e9266445328047f5d61b4e0d111da3842d005fa8 assets/modjam/models/block/rusty_crate_open.json
diff --git a/src/generated/resources/assets/modjam/blockstates/deep_sea_drain.json b/src/generated/resources/assets/modjam/blockstates/deep_sea_drain.json
@@ -1,7 +1,10 @@
 {
   "variants": {
-    "": {
+    "formed=false": {
       "model": "modjam:block/deep_sea_drain"
+    },
+    "formed=true": {
+      "model": "modjam:block/deep_sea_drain_formed"
     }
   }
 }
diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain.json
@@ -1,10 +1,11 @@
 {
   "parent": "minecraft:block/cube",
   "textures": {
-    "east": "modjam:block/multiblock/drain/side_1",
-    "north": "modjam:block/multiblock/drain/side_1",
-    "south": "modjam:block/multiblock/drain/side_1",
-    "up": "modjam:block/multiblock/drain/top_4",
-    "west": "modjam:block/multiblock/drain/side_1"
+    "down": "modjam:block/multiblock/drain/drain_bottom_unformed",
+    "east": "modjam:block/multiblock/drain/drain_side_unformed",
+    "north": "modjam:block/multiblock/drain/drain_side_unformed",
+    "south": "modjam:block/multiblock/drain/drain_side_unformed",
+    "up": "modjam:block/multiblock/drain/drain_top_unformed",
+    "west": "modjam:block/multiblock/drain/drain_side_unformed"
   }
 }
diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_0.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_0.json
@@ -1,6 +1,7 @@
 {
   "parent": "minecraft:block/cube",
   "textures": {
+    "down": "modjam:block/multiblock/drain/bottom_0",
     "east": "modjam:block/multiblock/drain/side_0",
     "north": "modjam:block/multiblock/drain/side_2",
     "south": "modjam:block/multiblock/drain/side_2",

diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_0_open.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_0_open.json
@@ -1,6 +1,7 @@
 {
   "parent": "minecraft:block/cube",
   "textures": {
+    "down": "modjam:block/multiblock/drain/bottom_0",
     "east": "modjam:block/multiblock/drain/side_0",
     "north": "modjam:block/multiblock/drain/side_2",
     "south": "modjam:block/multiblock/drain/side_2",

diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_1.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_1.json
@@ -1,6 +1,7 @@
 {
   "parent": "minecraft:block/cube",
   "textures": {
+    "down": "modjam:block/multiblock/drain/bottom_1",
     "east": "modjam:block/multiblock/drain/side_1",
     "north": "modjam:block/multiblock/drain/side_1",
     "south": "modjam:block/multiblock/drain/side_1",

diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_1_open.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_1_open.json
@@ -1,6 +1,7 @@
 {
   "parent": "minecraft:block/cube",
   "textures": {
+    "down": "modjam:block/multiblock/drain/bottom_1",
     "east": "modjam:block/multiblock/drain/side_1_open",
     "north": "modjam:block/multiblock/drain/side_1_open",
     "south": "modjam:block/multiblock/drain/side_1_open",

diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_2.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_2.json
@@ -1,6 +1,7 @@
 {
   "parent": "minecraft:block/cube",
   "textures": {
+    "down": "modjam:block/multiblock/drain/bottom_2",
     "east": "modjam:block/multiblock/drain/side_2",
     "north": "modjam:block/multiblock/drain/side_0",
     "south": "modjam:block/multiblock/drain/side_0",

diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_2_open.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_2_open.json
@@ -1,6 +1,7 @@
 {
   "parent": "minecraft:block/cube",
   "textures": {
+    "down": "modjam:block/multiblock/drain/bottom_2",
     "east": "modjam:block/multiblock/drain/side_2",
     "north": "modjam:block/multiblock/drain/side_0",
     "south": "modjam:block/multiblock/drain/side_0",

diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_3.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_3.json
@@ -1,6 +1,7 @@
 {
   "parent": "minecraft:block/cube",
   "textures": {
+    "down": "modjam:block/multiblock/drain/bottom_3",
     "east": "modjam:block/multiblock/drain/side_1",
     "north": "modjam:block/multiblock/drain/side_1",
     "south": "modjam:block/multiblock/drain/side_1",

diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_3_open.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_3_open.json
@@ -1,6 +1,7 @@
 {
   "parent": "minecraft:block/cube",
   "textures": {
+    "down": "modjam:block/multiblock/drain/bottom_3",
     "east": "modjam:block/multiblock/drain/side_1_open",
     "north": "modjam:block/multiblock/drain/side_1_open",
     "south": "modjam:block/multiblock/drain/side_1_open",

diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_4.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_4.json
@@ -1,6 +1,7 @@
 {
   "parent": "minecraft:block/cube",
   "textures": {
+    "down": "modjam:block/multiblock/drain/bottom_4",
     "east": "modjam:block/multiblock/drain/side_1",
     "north": "modjam:block/multiblock/drain/side_1",
     "south": "modjam:block/multiblock/drain/side_1",

diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_4_open.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_4_open.json
@@ -1,6 +1,7 @@
 {
   "parent": "minecraft:block/cube",
   "textures": {
+    "down": "modjam:block/multiblock/drain/bottom_4",
     "east": "modjam:block/multiblock/drain/side_1",
     "north": "modjam:block/multiblock/drain/side_1",
     "south": "modjam:block/multiblock/drain/side_1",

diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_5.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_5.json
@@ -1,6 +1,7 @@
 {
   "parent": "minecraft:block/cube",
   "textures": {
+    "down": "modjam:block/multiblock/drain/bottom_5",
     "east": "modjam:block/multiblock/drain/side_1",
     "north": "modjam:block/multiblock/drain/side_1",
     "south": "modjam:block/multiblock/drain/side_1",

diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_5_open.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_5_open.json
@@ -1,6 +1,7 @@
 {
   "parent": "minecraft:block/cube",
   "textures": {
+    "down": "modjam:block/multiblock/drain/bottom_5",
     "east": "modjam:block/multiblock/drain/side_1_open",
     "north": "modjam:block/multiblock/drain/side_1_open",
     "south": "modjam:block/multiblock/drain/side_1_open",

diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_6.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_6.json
@@ -1,6 +1,7 @@
 {
   "parent": "minecraft:block/cube",
   "textures": {
+    "down": "modjam:block/multiblock/drain/bottom_6",
     "east": "modjam:block/multiblock/drain/side_2",
     "north": "modjam:block/multiblock/drain/side_0",
     "south": "modjam:block/multiblock/drain/side_0",

diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_6_open.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_6_open.json
@@ -1,6 +1,7 @@
 {
   "parent": "minecraft:block/cube",
   "textures": {
+    "down": "modjam:block/multiblock/drain/bottom_6",
     "east": "modjam:block/multiblock/drain/side_2",
     "north": "modjam:block/multiblock/drain/side_0",
     "south": "modjam:block/multiblock/drain/side_0",

diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_7.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_7.json
@@ -1,6 +1,7 @@
 {
   "parent": "minecraft:block/cube",
   "textures": {
+    "down": "modjam:block/multiblock/drain/bottom_7",
     "east": "modjam:block/multiblock/drain/side_1",
     "north": "modjam:block/multiblock/drain/side_1",
     "south": "modjam:block/multiblock/drain/side_1",

diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_7_open.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_7_open.json
@@ -1,6 +1,7 @@
 {
   "parent": "minecraft:block/cube",
   "textures": {
+    "down": "modjam:block/multiblock/drain/bottom_7",
     "east": "modjam:block/multiblock/drain/side_1_open",
     "north": "modjam:block/multiblock/drain/side_1_open",
     "south": "modjam:block/multiblock/drain/side_1_open",

diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_8.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_8.json
@@ -1,6 +1,7 @@
 {
   "parent": "minecraft:block/cube",
   "textures": {
+    "down": "modjam:block/multiblock/drain/bottom_8",
     "east": "modjam:block/multiblock/drain/side_0",
     "north": "modjam:block/multiblock/drain/side_2",
     "south": "modjam:block/multiblock/drain/side_2",

diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_8_open.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_8_open.json
@@ -1,6 +1,7 @@
 {
   "parent": "minecraft:block/cube",
   "textures": {
+    "down": "modjam:block/multiblock/drain/bottom_8",
     "east": "modjam:block/multiblock/drain/side_0",
     "north": "modjam:block/multiblock/drain/side_2",
     "south": "modjam:block/multiblock/drain/side_2",

diff --git a/src/main/java/com/portingdeadmods/modjam/datagen/BlockModelProvider.java b/src/main/java/com/portingdeadmods/modjam/datagen/BlockModelProvider.java
@@ -18,6 +18,7 @@
 import net.neoforged.neoforge.client.model.generators.*;
 import net.neoforged.neoforge.common.data.ExistingFileHelper;
 import org.apache.commons.lang3.IntegerRange;
+import org.jetbrains.annotations.NotNull;
 
 public class BlockModelProvider extends BlockStateProvider {
     public BlockModelProvider(PackOutput output, ExistingFileHelper existingFileHelper) {
@@ -57,13 +58,23 @@ private ModelFile rustedCrateModel(CrateBlock block,boolean open) {
 
     private void drainController(Block drainController) {
         Multiblock multiblock = MJMultiblocks.DRAIN.get();
-        BlockModelBuilder builder = models().withExistingParent(name(drainController), "cube");
-        builder.texture("up", multiblockTexture(multiblock, "top_4"))
-                .texture("north", multiblockTexture(multiblock, "side_1"))
-                .texture("east", multiblockTexture(multiblock, "side_1"))
-                .texture("south", multiblockTexture(multiblock, "side_1"))
-                .texture("west", multiblockTexture(multiblock, "side_1"));
-        simpleBlock(drainController, builder);
+        ModelFile unformedModel = drainControllerModel(drainController, multiblock, false);
+        getVariantBuilder(drainController).partialState().with(DrainMultiblock.FORMED, false)
+                .modelForState().modelFile(unformedModel).addModel();
+        ModelFile formedModel = drainControllerModel(drainController, multiblock, true);
+        getVariantBuilder(drainController).partialState().with(DrainMultiblock.FORMED, true)
+                .modelForState().modelFile(formedModel).addModel();
+    }
+
+    private @NotNull BlockModelBuilder drainControllerModel(Block drainController, Multiblock multiblock, boolean formed) {
+        BlockModelBuilder builder = models().withExistingParent(name(drainController) + (formed ? "_formed" : ""), "cube");
+        builder.texture("up", multiblockTexture(multiblock, formed ? "top_4" : "drain_top_unformed"))
+                .texture("down", multiblockTexture(multiblock, formed ? "bottom_4" : "drain_bottom_unformed"))
+                .texture("north", multiblockTexture(multiblock, "drain_side_unformed"))
+                .texture("east", multiblockTexture(multiblock, "drain_side_unformed"))
+                .texture("south", multiblockTexture(multiblock, "drain_side_unformed"))
+                .texture("west", multiblockTexture(multiblock, "drain_side_unformed"));
+        return builder;
     }
 
     private void drainPart(Block drainPartBlock, IntegerRange range) {
@@ -85,18 +96,21 @@ private ModelFile drainPartModel(Block drainPartBlock, int index, boolean laserP
         // TODO: Clean up
         if (index % 2 != 0) {
             builder.texture("up", multiblockTexture(multiblock, "top_" + index))
+                    .texture("down", multiblockTexture(multiblock, "bottom_" + index))
                     .texture("north", multiblockTexture(multiblock, "side_1" + postfix))
                     .texture("east", multiblockTexture(multiblock, "side_1" + postfix))
                     .texture("south", multiblockTexture(multiblock, "side_1" + postfix))
                     .texture("west", multiblockTexture(multiblock, "side_1" + postfix));
         } else if (index == 0 || index == 2) {
             builder.texture("up", multiblockTexture(multiblock, "top_" + index))
+                    .texture("down", multiblockTexture(multiblock, "bottom_" + index))
                     .texture("north", multiblockTexture(multiblock, "side_" + (2 - index % 3)))
                     .texture("east", multiblockTexture(multiblock, "side_" + index % 3))
                     .texture("south", multiblockTexture(multiblock, "side_" + (2 - index % 3)))
                     .texture("west", multiblockTexture(multiblock, "side_" + index % 3));
         } else {
             builder.texture("up", multiblockTexture(multiblock, "top_" + index))
+                    .texture("down", multiblockTexture(multiblock, "bottom_" + index))
                     .texture("north", multiblockTexture(multiblock, "side_" + index % 3))
                     .texture("east", multiblockTexture(multiblock, "side_" + (2 - index % 3)))
                     .texture("south", multiblockTexture(multiblock, "side_" + index % 3))

diff --git a/src/main/java/com/portingdeadmods/modjam/datagen/ItemModelProvider.java b/src/main/java/com/portingdeadmods/modjam/datagen/ItemModelProvider.java
@@ -25,6 +25,9 @@ protected void registerModels() {
         basicItem(MJItems.AQUARINE_STEEL_INGOT.get());
         basicItem(MJItems.ATLANTIC_GOLD_INGOT.get());
 
+        basicItem(MJItems.RUSTY_GEAR.get());
+        basicItem(MJItems.GEAR.get());
+
         basicItem(MJItems.GLASS_VIAL.get());
         basicItem(MJItems.ELECTROLYTE_ALGAE_SERUM_VIAL.get());
 

diff --git a/src/main/java/com/portingdeadmods/modjam/registries/MJAugments.java b/src/main/java/com/portingdeadmods/modjam/registries/MJAugments.java
@@ -13,7 +13,7 @@
 public final class MJAugments {
     public static final DeferredRegister<StaticAugment> AUGMENTS = DeferredRegister.create(MJRegistries.AUGMENT, ModJam.MODID);
 
-    public static final Supplier<DisallowBreakingAugment> DISALLOW_BREAKING = AUGMENTS.register("disallow_breaking", DisallowBreakingAugment::new);
     public static final Supplier<GiveDiamondAugment> GIVE_DIAMOND = AUGMENTS.register("give_diamond", GiveDiamondAugment::new);
+    public static final Supplier<DisallowBreakingAugment> DISALLOW_BREAKING = AUGMENTS.register("disallow_breaking", DisallowBreakingAugment::new);
     public static final Supplier<ThrowSnowballAugment> THROW_SNOWBALL = AUGMENTS.register("throw_snowball", ThrowSnowballAugment::new);
 }
diff --git a/src/main/java/com/portingdeadmods/modjam/registries/MJBlocks.java b/src/main/java/com/portingdeadmods/modjam/registries/MJBlocks.java
@@ -21,6 +21,8 @@
 public final class MJBlocks {
     public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(ModJam.MODID);
 
+    public static final DeferredBlock<CrateBlock> CRATE = registerBlockAndItem("crate", CrateBlock::new,
+            BlockBehaviour.Properties.ofFullCopy(Blocks.BARREL));
     public static final DeferredBlock<RotatedPillarBlock> DARK_PRISMARINE_PILLAR = registerBlockAndItem("dark_prismarine_pillar", RotatedPillarBlock::new,
             BlockBehaviour.Properties.ofFullCopy(Blocks.DARK_PRISMARINE));
     public static final DeferredBlock<Block> CHISELED_DARK_PRISMARINE = registerBlockAndItem("chiseled_dark_prismarine", Block::new,
@@ -29,9 +31,8 @@ public final class MJBlocks {
             BlockBehaviour.Properties.ofFullCopy(Blocks.IRON_BLOCK));
     public static final DeferredBlock<AquaticCatalystBlock> AQUATIC_CATALYST = registerBlockAndItem("aquatic_catalyst", AquaticCatalystBlock::new,
             BlockBehaviour.Properties.ofFullCopy(Blocks.DARK_PRISMARINE).lightLevel(state -> state.getValue(AquaticCatalystBlock.CORE_ACTIVE) ? 12 : 0));
-    public static final DeferredBlock<CrateBlock> CRATE = registerBlockAndItem("crate", CrateBlock::new,
-            BlockBehaviour.Properties.ofFullCopy(Blocks.BARREL));
-
+    public static final DeferredBlock<RotatedPillarBlock> PRISMARINE_RELAY = registerBlockAndItem("prismarine_relay", RotatedPillarBlock::new,
+            BlockBehaviour.Properties.ofFullCopy(Blocks.DARK_PRISMARINE));
 
     // MULTIBLOCKS
     public static final DeferredBlock<DrainBlock> DRAIN = registerBlockAndItem("deep_sea_drain", DrainBlock::new,