Updated to 1.21.4. Fixes #7

Author: BJTMastermind

README.md

@@ -8,10 +8,10 @@ To use the Custom Blocks API simply include it alongside your datapack and ensur
 ### Give Command
 If your pack includes a custom give command this is what the function should look like with this API:
 ```mcfunction
-give @s dropper[item_name='{"text":"A Name"}',\  
+give @s dropper[item_name='{"text":"A Name"}',\
     lore=['{"text":"A Lore","italic":false,"color":"red"}'],\
     custom_model_data=1,\
-    lock="custom_blocks:block",\
+    lock={"minecraft:custom_name": "'custom_blocks:block'"},\
     custom_data={\
         block_properties:{\
             Tags:["some_tag_for_this_block"],\
@@ -29,7 +29,7 @@ To set up your custom blocks with this API simple add the custom models to one o
 
 <hr>
 
-<b>Make Sure To Include</b> the lock component and set its value to <b>"custom_blocks:block"</b><br>
+<b>Make Sure To Include</b> the lock component and set its value to <b>"'custom_blocks:block'"</b><br>
 This tells the API that your block uses this Custom Blocks API system.
 
 Then add your custom block name, an optional lore for the block, and add your custom blocks custom_model_data value.
@@ -40,7 +40,7 @@ For help on how to set these up see the above give command for an example.
 
 ## Minimum Minecraft Version
 
-* 1.21
+* 1.21.4
 
 ## About This Project
 

data/custom_blocks/function/main.mcfunction

@@ -1,4 +1 @@
 execute as @a run function custom_blocks:place/set_storage
-
-# Update old lock "CustomBlocks:Block" to "custom_blocks:block"
-execute as @a if items entity @s weapon.* #custom_blocks:placers[minecraft:lock="CustomBlocks:Block"] run item modify entity @s weapon.mainhand custom_blocks:update_lock

data/custom_blocks/function/place/check_for_block.mcfunction

@@ -1,7 +1,7 @@
 # Detects Custom Block And Places It
-execute at @a run fill ~5 ~6 ~5 ~-5 ~-4 ~-5 command_block[facing=north]{auto:1b,Command:"function custom_blocks:place/place_block with storage custom_blocks:current_block base_block"} replace #custom_blocks:placers[facing=north]{Lock:"custom_blocks:block"}
-execute at @a run fill ~5 ~6 ~5 ~-5 ~-4 ~-5 command_block[facing=south]{auto:1b,Command:"function custom_blocks:place/place_block with storage custom_blocks:current_block base_block"} replace #custom_blocks:placers[facing=south]{Lock:"custom_blocks:block"}
-execute at @a run fill ~5 ~6 ~5 ~-5 ~-4 ~-5 command_block[facing=east]{auto:1b,Command:"function custom_blocks:place/place_block with storage custom_blocks:current_block base_block"} replace #custom_blocks:placers[facing=east]{Lock:"custom_blocks:block"}
-execute at @a run fill ~5 ~6 ~5 ~-5 ~-4 ~-5 command_block[facing=west]{auto:1b,Command:"function custom_blocks:place/place_block with storage custom_blocks:current_block base_block"} replace #custom_blocks:placers[facing=west]{Lock:"custom_blocks:block"}
-execute at @a run fill ~5 ~6 ~5 ~-5 ~-4 ~-5 command_block[facing=up]{auto:1b,Command:"function custom_blocks:place/place_block with storage custom_blocks:current_block base_block"} replace #custom_blocks:placers[facing=up]{Lock:"custom_blocks:block"}
-execute at @a run fill ~5 ~6 ~5 ~-5 ~-4 ~-5 command_block[facing=down]{auto:1b,Command:"function custom_blocks:place/place_block with storage custom_blocks:current_block base_block"} replace #custom_blocks:placers[facing=down]{Lock:"custom_blocks:block"}
+execute at @a run fill ~5 ~6 ~5 ~-5 ~-4 ~-5 command_block[facing=north]{auto:1b,Command:"function custom_blocks:place/place_block with storage custom_blocks:current_block base_block"} replace #custom_blocks:placers[facing=north]{lock:{components:{"minecraft:custom_name":'"custom_blocks:block"'}}}
+execute at @a run fill ~5 ~6 ~5 ~-5 ~-4 ~-5 command_block[facing=south]{auto:1b,Command:"function custom_blocks:place/place_block with storage custom_blocks:current_block base_block"} replace #custom_blocks:placers[facing=south]{lock:{components:{"minecraft:custom_name":'"custom_blocks:block"'}}}
+execute at @a run fill ~5 ~6 ~5 ~-5 ~-4 ~-5 command_block[facing=east]{auto:1b,Command:"function custom_blocks:place/place_block with storage custom_blocks:current_block base_block"} replace #custom_blocks:placers[facing=east]{lock:{components:{"minecraft:custom_name":'"custom_blocks:block"'}}}
+execute at @a run fill ~5 ~6 ~5 ~-5 ~-4 ~-5 command_block[facing=west]{auto:1b,Command:"function custom_blocks:place/place_block with storage custom_blocks:current_block base_block"} replace #custom_blocks:placers[facing=west]{lock:{components:{"minecraft:custom_name":'"custom_blocks:block"'}}}
+execute at @a run fill ~5 ~6 ~5 ~-5 ~-4 ~-5 command_block[facing=up]{auto:1b,Command:"function custom_blocks:place/place_block with storage custom_blocks:current_block base_block"} replace #custom_blocks:placers[facing=up]{lock:{components:{"minecraft:custom_name":'"custom_blocks:block"'}}}
+execute at @a run fill ~5 ~6 ~5 ~-5 ~-4 ~-5 command_block[facing=down]{auto:1b,Command:"function custom_blocks:place/place_block with storage custom_blocks:current_block base_block"} replace #custom_blocks:placers[facing=down]{lock:{components:{"minecraft:custom_name":'"custom_blocks:block"'}}}

data/custom_blocks/function/setup.mcfunction

@@ -1,6 +1,3 @@
 gamerule commandBlockOutput false
 gamerule logAdminCommands false
 
-# Remove old scoreboard objective
-# `scoreboard objectives remove cbCalcModel` is now deprecated and will be removed in a future version
-scoreboard objectives remove cbCalcModel dummy

data/custom_blocks/item_modifier/update_lock.json

@@ -1,6 +1,6 @@
 {
   "pack": {
-    "pack_format": 48,
+    "pack_format": 61,
     "description": "Allows you to add new blocks easily"
   }
 }