From 1940420e62249eca5f778ec9021838458afedfad Mon Sep 17 00:00:00 2001
From: Mike Ammerlaan <mammerla@users.noreply.github.com>
Date: Tue, 11 Feb 2025 04:17:28 -0800
Subject: [PATCH] Small fixes that use 1.21.60 features

---
 .../mikeamm_gwve/blocks/fabricator.block.json |  22 +++++++-
 .../items/axe_turret_kit.item.json            |   2 +-
 .../items/bow_turret_kit.item.json            |   2 +-
 .../items/crossbow_turret_kit.item.json       |   2 +-
 .../items/depleted_gray_shard.item.json       |   2 +-
 .../items/gray_wave_generator_kit.item.json   |   2 +-
 .../items/shbullet_turret_kit.item.json       |   2 +-
 .../items/smfireball_turret_kit.item.json     |   2 +-
 .../models/blocks/fabricator_in_hand.geo.json |  51 ++++++++++++++++++
 .../gray_wave/blocks/fabricator_in_hand.png   | Bin 0 -> 1892 bytes
 .../textures/terrain_texture.json             |   3 ++
 custom_blocks/.vscode/launch.json             |  11 ++--
 custom_blocks/.vscode/tasks.json              |  16 +++---
 .../blocks/blue_bubble_fish.json              |   3 +-
 .../resource_packs/custom_blocks/blocks.json  |   2 +-
 15 files changed, 97 insertions(+), 25 deletions(-)
 create mode 100644 casual_creator/gray_wave/resource_packs/mikeamm_gwve/models/blocks/fabricator_in_hand.geo.json
 create mode 100644 casual_creator/gray_wave/resource_packs/mikeamm_gwve/textures/mikeamm/gray_wave/blocks/fabricator_in_hand.png

diff --git a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/blocks/fabricator.block.json b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/blocks/fabricator.block.json
index 29fa48e..47665a3 100644
--- a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/blocks/fabricator.block.json
+++ b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/blocks/fabricator.block.json
@@ -1,5 +1,5 @@
 {
-  "format_version": "1.21.50",
+  "format_version": "1.21.60",
   "minecraft:block": {
     "description": {
       "identifier": "mikeamm_gwve:fabricator",
@@ -31,10 +31,28 @@
         "catch_chance_modifier": 5
       },
       "minecraft:geometry": "geometry.mikeamm_gwve_fabricator",
+      "minecraft:liquid_detection": {
+        "detection_rules": [
+          {
+            "liquid_type": "water",
+            "on_liquid_touches": "broken"
+          }
+        ]
+      },
+      "minecraft:item_visual": {
+        "geometry": "geometry.mikeamm_gwve_fabricator_in_hand",
+        "material_instances": {
+          "*": {
+            "texture": "mikeamm_gwve_fabricator_in_hand",
+            "render_method": "alpha_test"
+          }
+        }
+      },
       "minecraft:material_instances": {
         "*": {
           "texture": "mikeamm_gwve_fabricator",
-          "render_method": "alpha_test"
+          "render_method": "alpha_test",
+          "ambient_occlusion": 1
         }
       },
       "minecraft:light_emission": 7,
diff --git a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/axe_turret_kit.item.json b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/axe_turret_kit.item.json
index 0a9c848..b936813 100644
--- a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/axe_turret_kit.item.json
+++ b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/axe_turret_kit.item.json
@@ -4,7 +4,7 @@
     "description": {
       "identifier": "mikeamm_gwve:axe_turret_kit",
       "menu_category": {
-        "category": "items"
+        "category": "equipment"
       }
     },
     "components": {
diff --git a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/bow_turret_kit.item.json b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/bow_turret_kit.item.json
index b85aae0..00fafef 100644
--- a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/bow_turret_kit.item.json
+++ b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/bow_turret_kit.item.json
@@ -4,7 +4,7 @@
     "description": {
       "identifier": "mikeamm_gwve:bow_turret_kit",
       "menu_category": {
-        "category": "items"
+        "category": "equipment"
       }
     },
     "components": {
diff --git a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/crossbow_turret_kit.item.json b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/crossbow_turret_kit.item.json
index 174eaa9..cf3aeb7 100644
--- a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/crossbow_turret_kit.item.json
+++ b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/crossbow_turret_kit.item.json
@@ -4,7 +4,7 @@
     "description": {
       "identifier": "mikeamm_gwve:crossbow_turret_kit",
       "menu_category": {
-        "category": "items"
+        "category": "equipment"
       }
     },
     "components": {
diff --git a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/depleted_gray_shard.item.json b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/depleted_gray_shard.item.json
index b925d64..d6fcb42 100644
--- a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/depleted_gray_shard.item.json
+++ b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/depleted_gray_shard.item.json
@@ -4,7 +4,7 @@
     "description": {
       "identifier": "mikeamm_gwve:depleted_gray_shard",
       "menu_category": {
-        "category": "items"
+        "category": "equipment"
       }
     },
     "components": {
diff --git a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/gray_wave_generator_kit.item.json b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/gray_wave_generator_kit.item.json
index 37302f5..8ff20cc 100644
--- a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/gray_wave_generator_kit.item.json
+++ b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/gray_wave_generator_kit.item.json
@@ -4,7 +4,7 @@
     "description": {
       "identifier": "mikeamm_gwve:gray_wave_generator_kit",
       "menu_category": {
-        "category": "items"
+        "category": "equipment"
       }
     },
     "components": {
diff --git a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/shbullet_turret_kit.item.json b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/shbullet_turret_kit.item.json
index 176f1ec..dccf855 100644
--- a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/shbullet_turret_kit.item.json
+++ b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/shbullet_turret_kit.item.json
@@ -4,7 +4,7 @@
     "description": {
       "identifier": "mikeamm_gwve:shbullet_turret_kit",
       "menu_category": {
-        "category": "items"
+        "category": "equipment"
       }
     },
     "components": {
diff --git a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/smfireball_turret_kit.item.json b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/smfireball_turret_kit.item.json
index 6b4010f..4955ec8 100644
--- a/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/smfireball_turret_kit.item.json
+++ b/casual_creator/gray_wave/behavior_packs/mikeamm_gwve/items/smfireball_turret_kit.item.json
@@ -4,7 +4,7 @@
     "description": {
       "identifier": "mikeamm_gwve:smfireball_turret_kit",
       "menu_category": {
-        "category": "items"
+        "category": "equipment"
       }
     },
     "components": {
diff --git a/casual_creator/gray_wave/resource_packs/mikeamm_gwve/models/blocks/fabricator_in_hand.geo.json b/casual_creator/gray_wave/resource_packs/mikeamm_gwve/models/blocks/fabricator_in_hand.geo.json
new file mode 100644
index 0000000..df4f7ac
--- /dev/null
+++ b/casual_creator/gray_wave/resource_packs/mikeamm_gwve/models/blocks/fabricator_in_hand.geo.json
@@ -0,0 +1,51 @@
+{
+	"format_version": "1.19.0",
+	"minecraft:geometry": [
+		{
+			"description": {
+				"identifier": "geometry.mikeamm_gwve_fabricator_in_hand",
+				"texture_width": 64,
+				"texture_height": 64,
+				"visible_bounds_width": 4,
+				"visible_bounds_height": 2.5,
+				"visible_bounds_offset": [0, 0.75, 0]
+			},
+			"bones": [
+				{
+					"name": "bone",
+					"pivot": [8, 0, -8],
+					"cubes": [
+						{
+							"origin": [-8, 0, -8],
+							"size": [16, 2, 16],
+							"uv": {
+								"north": {"uv": [0, 32], "uv_size": [16, 2]},
+								"east": {"uv": [0, 34], "uv_size": [16, 2]},
+								"south": {"uv": [0, 36], "uv_size": [16, 2]},
+								"west": {"uv": [0, 38], "uv_size": [16, 2]},
+								"up": {"uv": [0, 0], "uv_size": [16, 16]},
+								"down": {"uv": [0, 32], "uv_size": [16, -16]}
+							}
+						},
+						{"origin": [5, 2, -7], "size": [2, 13, 2], "uv": [0, 0]},
+						{"origin": [-7, 2, -7], "size": [2, 13, 2], "uv": [0, 0]},
+						{"origin": [-7, 2, 5], "size": [2, 13, 2], "uv": [0, 0]},
+						{"origin": [5, 2, 5], "size": [2, 13, 2], "uv": [2, 9]},
+						{
+							"origin": [-8, 15, -8],
+							"size": [16, 2, 16],
+							"uv": {
+								"north": {"uv": [0, 32], "uv_size": [16, 2]},
+								"east": {"uv": [0, 34], "uv_size": [16, 2]},
+								"south": {"uv": [0, 36], "uv_size": [16, 2]},
+								"west": {"uv": [0, 38], "uv_size": [16, 2]},
+								"up": {"uv": [0, 0], "uv_size": [16, 16]},
+								"down": {"uv": [0, 32], "uv_size": [16, -16]}
+							}
+						}
+					]
+				}
+			]
+		}
+	]
+}
\ No newline at end of file
diff --git a/casual_creator/gray_wave/resource_packs/mikeamm_gwve/textures/mikeamm/gray_wave/blocks/fabricator_in_hand.png b/casual_creator/gray_wave/resource_packs/mikeamm_gwve/textures/mikeamm/gray_wave/blocks/fabricator_in_hand.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bc6754052ce0f2402c23df738985952e0375aae
GIT binary patch
literal 1892
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
ZCN%2VtCys>byM&*0Y^KOZ5;xe{135wkFNj#

literal 0
HcmV?d00001

diff --git a/casual_creator/gray_wave/resource_packs/mikeamm_gwve/textures/terrain_texture.json b/casual_creator/gray_wave/resource_packs/mikeamm_gwve/textures/terrain_texture.json
index 0eb3d73..72d4cb3 100644
--- a/casual_creator/gray_wave/resource_packs/mikeamm_gwve/textures/terrain_texture.json
+++ b/casual_creator/gray_wave/resource_packs/mikeamm_gwve/textures/terrain_texture.json
@@ -7,6 +7,9 @@
     "mikeamm_gwve_fabricator": {
       "textures": "textures/mikeamm/gray_wave/blocks/fabricator.png"
     },
+    "mikeamm_gwve_fabricator_in_hand": {
+      "textures": "textures/mikeamm/gray_wave/blocks/fabricator_in_hand.png"
+    },
     "mikeamm_gwve_gray_ore": {
       "textures": "textures/mikeamm/gray_wave/blocks/gray_ore.png"
     }
diff --git a/custom_blocks/.vscode/launch.json b/custom_blocks/.vscode/launch.json
index 7805a7d..929d7ea 100644
--- a/custom_blocks/.vscode/launch.json
+++ b/custom_blocks/.vscode/launch.json
@@ -1,15 +1,14 @@
 {
-    "version": "0.2.0",
+    "version": "0.3.0",
     "configurations": [
       {
         "type": "minecraft-js",
-        "request": "attach",
-        "name": "Debug with Minecraft",
+        "port": 19144,
         "mode": "listen",
-        "preLaunchTask": "build",
+        "name": "Debug with Minecraft",
+        "preLaunchTask": "buildandeploy",
         "sourceMapRoot": "${workspaceFolder}/dist/debug/",
-        "generatedSourceRoot": "${workspaceFolder}/dist/scripts/",
-        "port": 19144
+        "generatedSourceRoot": "${workspaceFolder}/dist/scripts/"
       }
     ]
   }
\ No newline at end of file
diff --git a/custom_blocks/.vscode/tasks.json b/custom_blocks/.vscode/tasks.json
index a75ea4e..6e7a14c 100644
--- a/custom_blocks/.vscode/tasks.json
+++ b/custom_blocks/.vscode/tasks.json
@@ -1,12 +1,12 @@
 {
   "version": "2.0.0",
-  "tasks": [     
-      {
-        "label": "build",
-        "dependsOrder": "sequence",
-        "dependsOn": [
-            "gulp: default"
-        ]
+  "tasks": [
+    {
+      "type": "npm",
+      "label": "buildandeploy",
+      "group": "build",
+      "script": "local-deploy",
+      "dependsOrder": "sequence"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/custom_blocks/behavior_packs/custom_blocks/blocks/blue_bubble_fish.json b/custom_blocks/behavior_packs/custom_blocks/blocks/blue_bubble_fish.json
index 97cd91b..1c04947 100644
--- a/custom_blocks/behavior_packs/custom_blocks/blocks/blue_bubble_fish.json
+++ b/custom_blocks/behavior_packs/custom_blocks/blocks/blue_bubble_fish.json
@@ -90,7 +90,8 @@
         "*": {
           "texture": "bubble_fish_blue",
           "render_method": "blend",
-          "face_dimming": true
+          "face_dimming": true,
+          "ambient_occlusion": 1
         }
       }
     }
diff --git a/custom_blocks/resource_packs/custom_blocks/blocks.json b/custom_blocks/resource_packs/custom_blocks/blocks.json
index 1b4a7fc..67fb816 100644
--- a/custom_blocks/resource_packs/custom_blocks/blocks.json
+++ b/custom_blocks/resource_packs/custom_blocks/blocks.json
@@ -11,7 +11,7 @@
     },
     "carried_textures": "die_red",
     "isotropic": true,
-    "brightness_gamma": 1,
+    "ambient_occlusion_exponent": 1,
     "sound": "stone"
   },
   "demo:tuna_roll": {