1.2.2 update

acacia_gum/1_21_1/data/zz.dnv.vegancraft/function/find_acacia_bark.mcfunction

@@ -0,0 +1,7 @@
+execute store result score @s dnv.acacia_gum.raycast_range run attribute @s player.block_interaction_range get -10
+scoreboard players operation @s dnv.acacia_gum.raycast_range_doubled = @s dnv.acacia_gum.raycast_range
+scoreboard players operation @s dnv.acacia_gum.raycast_range_doubled *= #dnv dnv.2
+scoreboard players set @s dnv.acacia_gum.found_acacia 0
+execute anchored eyes positioned ^ ^ ^ anchored feet run function zz.dnv.vegancraft:find_acacia_bark_line
+execute if score @s dnv.acacia_gum.found_acacia < @s dnv.acacia_gum.raycast_range anchored eyes positioned ^ ^ ^1 anchored feet run function zz.dnv.vegancraft:find_acacia_bark_wide
+execute if score @s dnv.acacia_gum.found_acacia < @s dnv.acacia_gum.raycast_range_doubled run function zz.dnv.vegancraft:summon_acacia_gum_ball

acacia_gum/README.txt

@@ -1,4 +1,4 @@
-# Acacia Gum (v1.2.1, for Minecraft 1.21+)
+# Acacia Gum (v1.2.2, for Minecraft 1.21+)
 
 This datapack adds the item "Acacia Gumball" (a retextured Slimeball), which is obtained by stripping acacia logs.
 
@@ -7,7 +7,7 @@ This datapack adds the item "Acacia Gumball" (a retextured Slimeball), which is
   - On PlanetMinecraft: https://www.planetminecraft.com/data-pack/acacia-gum-slime-from-stripping-acacias/
   - On my website: https://daenvil.github.io/MCDatapacks/acacia_gum.html
 
-- This version was published on the 19th of June 2024. Check the webpages above for possible updates.
+- This version was published on the 8th of November 2024. Check the webpages above for possible updates.
 
 ## Installation
 

acacia_gum/data/global/advancement/dnv.acacia_gum.json

@@ -6,7 +6,7 @@
 			"italic": false
 		},
 		"description": {
-			"text": "Daenvil's Acacia Gum 1.2.1 (for MC1.21+)",
+			"text": "Daenvil's Acacia Gum 1.2.2 (for MC1.21+)",
 			"italic": false
 		},
 		"icon": {

acacia_gum/data/zz.dnv.vegancraft/function/find_acacia_bark.mcfunction

@@ -1,4 +1,4 @@
-execute store result score @s dnv.acacia_gum.raycast_range run attribute @s player.block_interaction_range get -10
+execute store result score @s dnv.acacia_gum.raycast_range run attribute @s block_interaction_range get -10
 scoreboard players operation @s dnv.acacia_gum.raycast_range_doubled = @s dnv.acacia_gum.raycast_range
 scoreboard players operation @s dnv.acacia_gum.raycast_range_doubled *= #dnv dnv.2
 scoreboard players set @s dnv.acacia_gum.found_acacia 0

acacia_gum/pack.mcmeta

@@ -15,18 +15,26 @@
 					"underlined": true
 				},
 				{
-					"text": "\nv1.2.1, for MC1.21+",
+					"text": "\nv1.2.2, for MC1.21+",
 					"color": "gray",
 					"italic": false
 				}
 			],
 			"color": "green",
 			"italic": false
 		},
-		"pack_format": 46,
+		"pack_format": 57,
 		"supported_formats": {
-			"min_inclusive": 46,
-			"max_inclusive": 48
+			"min_inclusive": 47,
+			"max_inclusive": 58
 		}
-	}
+	},
+    "overlays": {
+        "entries": [
+            {
+                "directory": "1_21_1",
+                "formats": { "min_inclusive": 47, "max_inclusive": 48 }
+            }
+        ]
+    }
 }

ethical_textiles/README.txt

@@ -1,4 +1,4 @@
-# Ethical Textiles (v2.0.2, for Minecraft 1.21+)
+# Ethical Textiles (v2.0.3, for Minecraft 1.21.2+)
 
 A datapack that adds plant-based alternatives to leather, string, wool, and feathers.
 
@@ -7,7 +7,7 @@ A datapack that adds plant-based alternatives to leather, string, wool, and feat
   - On PlanetMinecraft: https://www.planetminecraft.com/data-pack/ethical-textiles-plant-string-and-leather/
   - On my website: https://daenvil.github.io/MCDatapacks/ethical_textiles.html
 
-- This version was published on the 27th of August 2024. Check the webpages above for possible updates.
+- This version was published on the 8th of November 2024. Check the webpages above for possible updates.
 
 ## Installation
 

ethical_textiles/data/dnv.ethical_textiles/recipe/armor_scale.json

@@ -2,15 +2,9 @@
 	"type": "crafting_shaped",
 	"category": "misc",
 	"key": {
-		"S": {
-			"item": "string"
-		},
-		"#": {
-			"item": "slime_ball"
-		},
-		"D": {
-			"item": "diamond"
-		}
+		"S": "string",
+		"#": "slime_ball",
+		"D": "diamond"
 	},
 	"pattern": [
 		"S#",

ethical_textiles/data/dnv.ethical_textiles/recipe/brush_string.json

@@ -2,15 +2,9 @@
 	"type": "crafting_shaped",
 	"category": "equipment",
 	"key": {
-		"S": {
-			"item": "string"
-		},
-		"C": {
-			"item": "copper_ingot"
-		},
-		"#": {
-			"item": "stick"
-		}
+		"S": "string",
+		"C": "copper_ingot",
+		"#": "stick"
 	},
 	"pattern": [
 		"S S",

ethical_textiles/data/dnv.ethical_textiles/recipe/faux_feather.json

@@ -2,15 +2,9 @@
 	"type": "crafting_shaped",
 	"category": "misc",
 	"key": {
-		"S": {
-			"item": "string"
-		},
-		"L": {
-			"tag": "leaves"
-		},
-		"#": {
-			"item": "stick"
-		}
+		"S": "string",
+		"L": "#leaves",
+		"#": "stick"
 	},
 	"pattern": [
 		"SL",

ethical_textiles/data/dnv.ethical_textiles/recipe/faux_leather_3to1.json

@@ -2,12 +2,8 @@
 	"type": "crafting_shaped",
 	"category": "misc",
 	"key": {
-		"L": {
-			"tag": "dnv.ethical_textiles:leather_producing_plants_3to1"
-		},
-		"S": {
-			"item": "slime_ball"
-		}
+		"L": "#dnv.ethical_textiles:leather_producing_plants_3to1",
+		"S": "slime_ball"
 	},
 	"pattern": [
 		"LLL",

ethical_textiles/data/dnv.ethical_textiles/recipe/faux_leather_6to1.json

@@ -2,12 +2,8 @@
 	"type": "crafting_shaped",
 	"category": "misc",
 	"key": {
-		"L": {
-			"tag": "dnv.ethical_textiles:leather_producing_plants_6to1"
-		},
-		"S": {
-			"item": "slime_ball"
-		}
+		"L": "#dnv.ethical_textiles:leather_producing_plants_6to1",
+		"S": "slime_ball"
 	},
 	"pattern": [
 		"LLL",

ethical_textiles/data/dnv.ethical_textiles/recipe/grass_bed.json

@@ -2,12 +2,8 @@
 	"type": "crafting_shaped",
 	"category": "misc",
 	"key": {
-		"G": {
-			"tag": "zz.dnv.core:grass"
-		},
-		"P": {
-			"tag": "planks"
-		}
+		"G": "#zz.dnv.core:grass",
+		"P": "#planks"
 	},
 	"pattern": [
 		"GGG",

ethical_textiles/data/dnv.ethical_textiles/recipe/hay_bed.json

@@ -2,12 +2,8 @@
 	"type": "crafting_shaped",
 	"category": "misc",
 	"key": {
-		"H": {
-			"item": "hay_block"
-		},
-		"P": {
-			"tag": "planks"
-		}
+		"H": "hay_block",
+		"P": "#planks"
 	},
 	"pattern": [
 		"HHH",

ethical_textiles/data/dnv.ethical_textiles/recipe/item_frame_paper.json

@@ -2,12 +2,8 @@
 	"type": "crafting_shaped",
 	"category": "misc",
 	"key": {
-		"S": {
-			"item": "stick"
-		},
-		"P": {
-			"item": "paper"
-		}
+		"S": "stick",
+		"P": "paper"
 	},
 	"pattern": [
 		"SSS",

ethical_textiles/data/dnv.ethical_textiles/recipe/jungle_bed.json

@@ -2,12 +2,8 @@
 	"type": "crafting_shaped",
 	"category": "misc",
 	"key": {
-		"J": {
-			"item": "jungle_leaves"
-		},
-		"P": {
-			"tag": "planks"
-		}
+		"J": "jungle_leaves",
+		"P": "#planks"
 	},
 	"pattern": [
 		"JJJ",

ethical_textiles/data/dnv.ethical_textiles/recipe/plant_string_sugar_cane.json

@@ -2,9 +2,7 @@
 	"type": "crafting_shaped",
 	"category": "misc",
 	"key": {
-		"S": {
-			"item": "sugar_cane"
-		}
+		"S": "sugar_cane"
 	},
 	"pattern": [
 		"S ",

ethical_textiles/data/dnv.ethical_textiles/recipe/plant_string_vines.json

@@ -2,9 +2,7 @@
 	"type": "crafting_shaped",
 	"category": "misc",
 	"key": {
-		"S": {
-			"tag": "dnv.ethical_textiles:string_producing_vines"
-		}
+		"S": "#dnv.ethical_textiles:string_producing_vines"
 	},
 	"pattern": [
 		"S ",

ethical_textiles/data/dnv.ethical_textiles/recipe/synthetic_cobweb.json

@@ -2,12 +2,8 @@
 	"type": "crafting_shaped",
 	"category": "misc",
 	"key": {
-		"S": {
-			"item": "string"
-		},
-		"#": {
-			"item": "slime_ball"
-		}
+		"S": "string",
+		"#": "slime_ball"
 	},
 	"pattern": [
 		"SSS",

ethical_textiles/data/global/advancement/dnv.ethical_textiles.json

@@ -6,7 +6,7 @@
 			"italic": false
 		},
 		"description": {
-			"text": "Daenvil's Ethical Textiles 2.0.2 (for MC1.21+)",
+			"text": "Daenvil's Ethical Textiles 2.0.3 (for MC1.21.2+)",
 			"italic": false
 		},
 		"icon": {

ethical_textiles/data/zz.dnv.vegancraft/function/load_ethical_textiles.mcfunction

@@ -1 +1,4 @@
-scoreboard objectives add dnv.success dummy
+scoreboard objectives add dnv.count.crafted_faux_leather_3to1 dummy
+scoreboard objectives add dnv.success dummy
+scoreboard objectives add dnv.count.crafted_faux_leather_6to1 dummy
+scoreboard objectives add dnv.count.crafted_synthetic_cobweb dummy

ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1.mcfunction

@@ -1,3 +1,4 @@
 advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_faux_leather_3to1
 tag @s add dnv.subject.crafted_faux_leather_3to1
-schedule function zz.dnv.vegancraft:slots/on_crafted_faux_leather_3to1_delayed 1t replace
+scoreboard players add @s dnv.count.crafted_faux_leather_3to1 3
+schedule function zz.dnv.vegancraft:slots/on_crafted_faux_leather_3to1_delayed 1t append

ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_delayed_player.mcfunction

@@ -1,8 +1,11 @@
 tag @s remove dnv.subject.crafted_faux_leather_3to1
 execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan
+execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_faux_leather_3to1 0
 execute if score @s dnv.success matches 1 run return 0
 execute if items entity @s player.cursor leather run scoreboard players set @s dnv.success 1
 execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261006,"item_name":"{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"]}}
+execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_faux_leather_3to1 0
 execute unless score @s dnv.success matches 0 run return 0
-execute store success score @s dnv.success run clear @s leather[custom_data~{dnv.vegan:true}] 3
-execute unless score @s dnv.success matches 0 run give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261006,custom_data={"dnv.vegan":false}] 3
+execute store result storage dnv.vegancraft:craft_count faux_leather_3to1.count int 1 run scoreboard players get @s dnv.count.crafted_faux_leather_3to1
+function zz.dnv.vegancraft:slots/on_crafted_faux_leather_3to1_replace_output with storage dnv.vegancraft:craft_count faux_leather_3to1
+scoreboard players set @s dnv.count.crafted_faux_leather_3to1 0

ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_replace_output.mcfunction

@@ -0,0 +1,2 @@
+$execute store success score @s dnv.success run clear @s leather[custom_data~{dnv.vegan:true}] $(count)
+$execute unless score @s dnv.success matches 0 run give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261006,custom_data={"dnv.vegan":false}] $(count)

ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_3to1_vegan.mcfunction

@@ -1,2 +1,3 @@
 advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_faux_leather_3to1_vegan
+
 tag @s add dnv.crafted_vegan

ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1.mcfunction

@@ -1,3 +1,4 @@
 advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_faux_leather_6to1
 tag @s add dnv.subject.crafted_faux_leather_6to1
-schedule function zz.dnv.vegancraft:slots/on_crafted_faux_leather_6to1_delayed 1t replace
+scoreboard players add @s dnv.count.crafted_faux_leather_6to1 3
+schedule function zz.dnv.vegancraft:slots/on_crafted_faux_leather_6to1_delayed 1t append

ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_delayed_player.mcfunction

@@ -1,8 +1,11 @@
 tag @s remove dnv.subject.crafted_faux_leather_6to1
 execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan
+execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_faux_leather_6to1 0
 execute if score @s dnv.success matches 1 run return 0
 execute if items entity @s player.cursor leather run scoreboard players set @s dnv.success 1
 execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"custom_model_data":9261006,"item_name":"{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"]}}
+execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_faux_leather_6to1 0
 execute unless score @s dnv.success matches 0 run return 0
-execute store success score @s dnv.success run clear @s leather[custom_data~{dnv.vegan:true}] 3
-execute unless score @s dnv.success matches 0 run give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261006,custom_data={"dnv.vegan":false}] 3
+execute store result storage dnv.vegancraft:craft_count faux_leather_6to1.count int 1 run scoreboard players get @s dnv.count.crafted_faux_leather_6to1
+function zz.dnv.vegancraft:slots/on_crafted_faux_leather_6to1_replace_output with storage dnv.vegancraft:craft_count faux_leather_6to1
+scoreboard players set @s dnv.count.crafted_faux_leather_6to1 0

ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_replace_output.mcfunction

@@ -0,0 +1,2 @@
+$execute store success score @s dnv.success run clear @s leather[custom_data~{dnv.vegan:true}] $(count)
+$execute unless score @s dnv.success matches 0 run give @s leather[item_name="{\"translate\":\"dnv.ethical_textiles.item.faux_leather\",\"fallback\":\"Faux Leather\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_model_data=9261006,custom_data={"dnv.vegan":false}] $(count)

ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_faux_leather_6to1_vegan.mcfunction

@@ -1,2 +1,3 @@
 advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_faux_leather_6to1_vegan
+
 tag @s add dnv.crafted_vegan

ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb.mcfunction

@@ -1,3 +1,4 @@
 advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_synthetic_cobweb
 tag @s add dnv.subject.crafted_synthetic_cobweb
-schedule function zz.dnv.vegancraft:slots/on_crafted_synthetic_cobweb_delayed 1t replace
+scoreboard players add @s dnv.count.crafted_synthetic_cobweb 2
+schedule function zz.dnv.vegancraft:slots/on_crafted_synthetic_cobweb_delayed 1t append

ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_delayed_player.mcfunction

@@ -1,8 +1,11 @@
 tag @s remove dnv.subject.crafted_synthetic_cobweb
 execute store success score @s dnv.success run tag @s remove dnv.crafted_vegan
+execute if score @s dnv.success matches 1 run scoreboard players set @s dnv.count.crafted_synthetic_cobweb 0
 execute if score @s dnv.success matches 1 run return 0
 execute if items entity @s player.cursor cobweb run scoreboard players set @s dnv.success 1
 execute unless score @s dnv.success matches 0 run item modify entity @s player.cursor {"function":"set_components","components":{"custom_data":{"dnv.vegan":false},"item_name":"{\"translate\":\"dnv.ethical_textiles.item.synthetic_cobweb\",\"fallback\":\"Synthetic Cobweb\",\"italic\":false}","lore":["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"]}}
+execute unless score @s dnv.success matches 0 run scoreboard players set @s dnv.count.crafted_synthetic_cobweb 0
 execute unless score @s dnv.success matches 0 run return 0
-execute store success score @s dnv.success run clear @s cobweb[custom_data~{dnv.vegan:true}] 2
-execute unless score @s dnv.success matches 0 run give @s cobweb[item_name="{\"translate\":\"dnv.ethical_textiles.item.synthetic_cobweb\",\"fallback\":\"Synthetic Cobweb\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_data={"dnv.vegan":false}] 2
+execute store result storage dnv.vegancraft:craft_count synthetic_cobweb.count int 1 run scoreboard players get @s dnv.count.crafted_synthetic_cobweb
+function zz.dnv.vegancraft:slots/on_crafted_synthetic_cobweb_replace_output with storage dnv.vegancraft:craft_count synthetic_cobweb
+scoreboard players set @s dnv.count.crafted_synthetic_cobweb 0

ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_replace_output.mcfunction

@@ -0,0 +1,2 @@
+$execute store success score @s dnv.success run clear @s cobweb[custom_data~{dnv.vegan:true}] $(count)
+$execute unless score @s dnv.success matches 0 run give @s cobweb[item_name="{\"translate\":\"dnv.ethical_textiles.item.synthetic_cobweb\",\"fallback\":\"Synthetic Cobweb\",\"italic\":false}",lore=["{\"translate\":\"dnv.vegancraft.contains_animal_products\",\"fallback\":\"(Contains animal products)\",\"color\":\"red\",\"italic\":false}","{\"text\":\"Daenvil's Ethical Textiles\",\"color\":\"#954535\",\"italic\":true}"],custom_data={"dnv.vegan":false}] $(count)

ethical_textiles/data/zz.dnv.vegancraft/function/slots/on_crafted_synthetic_cobweb_vegan.mcfunction

@@ -1,2 +1,3 @@
 advancement revoke @s only zz.dnv.vegancraft:triggers/crafted_synthetic_cobweb_vegan
+
 tag @s add dnv.crafted_vegan