From 6413d1a8d56d9eb1ab9a8b63aa9bb5e8474ee6be Mon Sep 17 00:00:00 2001
From: ForestOfLight <briancassriel@gmail.com>
Date: Tue, 22 Oct 2024 15:28:23 -0700
Subject: [PATCH] bump to MC 1.21.41

---
 Canopy [BP]/manifest.json                              | 10 +++++-----
 .../scripts/src/rules/cauldronConcreteConversion.js    |  6 +++---
 Canopy [RP]/manifest.json                              |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Canopy [BP]/manifest.json b/Canopy [BP]/manifest.json
index 49ba903..5627327 100644
--- a/Canopy [BP]/manifest.json	
+++ b/Canopy [BP]/manifest.json	
@@ -1,11 +1,11 @@
 {
 	"format_version": 2,
 	"header": {
-		"name": "Canopy [BP] v1.3.4",
+		"name": "Canopy [BP] v1.3.5",
 		"description": "Technical informatics & features addon by §aForestOfLight§r.",
 		"uuid": "7f6b23df-a583-476b-b0e4-87457e65f7c0",
 		"min_engine_version": [1, 21, 30],
-		"version": [1, 3, 4]
+		"version": [1, 3, 5]
 	},
 	"modules": [
 		{
@@ -26,11 +26,11 @@
 	"dependencies": [
 		{
 			"module_name": "@minecraft/server",
-			"version": "1.15.0-beta"
+			"version": "1.16.0-beta"
 		},
 		{
-			"uuid": "bcf34368-ed0c-4cf7-938e-582cccf9950d",
-			"version": [1, 0, 0]
+			"uuid": "bcf34368-ed0c-4cf7-938e-582cccf9950d", // Canopy [RP]
+			"version": [1, 0, 1]
 		}
 	]
 }
diff --git a/Canopy [BP]/scripts/src/rules/cauldronConcreteConversion.js b/Canopy [BP]/scripts/src/rules/cauldronConcreteConversion.js
index 815b2b5..756b238 100644
--- a/Canopy [BP]/scripts/src/rules/cauldronConcreteConversion.js	
+++ b/Canopy [BP]/scripts/src/rules/cauldronConcreteConversion.js	
@@ -1,5 +1,5 @@
 import { Rule } from "lib/canopy/Canopy";
-import { system, world, DimensionTypes, ItemStack } from "@minecraft/server";
+import { system, world, DimensionTypes, ItemStack, FluidType } from "@minecraft/server";
 
 const CONVERSION_TIME = 20*7;
 const CURRENT_CONVERSIONS = {};
@@ -41,8 +41,8 @@ function isInWaterCauldron(dimension, itemEntity) {
     const block = dimension.getBlock(itemEntity.location);
     if (block?.typeId !== 'minecraft:cauldron') 
         return false;
-    const waterContainerComponent = block.getComponent('minecraft:waterContainer');
-    if (waterContainerComponent?.fillLevel === 6)
+    const fluidContainerComponent = block.getComponent('fluidContainer');
+    if (fluidContainerComponent.getFluidType() === FluidType.Water && fluidContainerComponent?.fillLevel === 6)
         return true;
 }
 
diff --git a/Canopy [RP]/manifest.json b/Canopy [RP]/manifest.json
index 91a755b..c4b126a 100644
--- a/Canopy [RP]/manifest.json	
+++ b/Canopy [RP]/manifest.json	
@@ -1,10 +1,10 @@
 {
   "format_version": 2,
   "header": {
-    "name": "Canopy [RP] v1.3.4",
+    "name": "Canopy [RP] v1.3.5",
     "description": "Technical informatics & features addon by §aForestOfLight§r.",
     "uuid": "bcf34368-ed0c-4cf7-938e-582cccf9950d",
-    "version": [1, 0, 0],
+    "version": [1, 0, 1],
     "min_engine_version": [1,17,0]
   },
   "modules": [
@@ -16,8 +16,8 @@
   ],
   "dependencies": [
     {
-      "uuid": "7f6b23df-a583-476b-b0e4-87457e65f7c0",
-      "version": [1, 3, 4]
+      "uuid": "7f6b23df-a583-476b-b0e4-87457e65f7c0", // Canopy [BP]
+      "version": [1, 3, 5]
     }
   ]
 }
\ No newline at end of file