Merge pull request #3 from daenvil/1.20.5-dev

v1.3 - update for MC1.20.5

README.txt

@@ -1,4 +1,4 @@
-# More Compostable Items (v1.2.1, for Minecraft 1.20+)
+# More Compostable Items (v1.3, for Minecraft 1.20.5)
 
 A datapack that adds composting mechanics to all vanilla items which *should* be compostable, being as close as possible to vanilla mechanics. Fully customizable.
 
@@ -7,9 +7,7 @@ A datapack that adds composting mechanics to all vanilla items which *should* be
   - On PlanetMinecraft: https://www.planetminecraft.com/data-pack/more-compostable-items/
   - On my website: https://daenvil.github.io/MCDatapacks/more_compostable_items.html
 
-- If you like my datapacks, please consider leaving a tip at my ko-fi: https://ko-fi.com/daenvilmc
-
-- This version was published on the 6th of June 2023. Check the webpages above for possible updates.
+- This version was published on the 26th of April 2024. Check the webpages above for possible updates.
 
 ## Installation
 

data/dnv.compost/advancements/placed_composter.json

@@ -0,0 +1,18 @@
+{
+    "criteria": {
+        "placed_composter": {
+            "trigger": "minecraft:placed_block",
+            "conditions": {
+                "location": [
+                    {
+                        "condition": "block_state_property",
+                        "block": "composter"
+                    }
+                ]
+            }
+        }
+    },
+    "rewards": {
+        "function": "zz.dnv.compost:on_placed_composter"
+    }
+}

data/dnv.compost/functions/dropping_toggle.mcfunction

@@ -6,3 +6,6 @@ execute if score dnv.dummy dnv.comp.drop_on matches 2 run scoreboard players set
 
 execute if score dnv.dummy dnv.comp.drop_on matches 1 run tellraw @s {"text":"[Daenvil's More Compostable Items]: compost-by-dropping enabled.","color":"green"}
 execute if score dnv.dummy dnv.comp.drop_on matches 0 run tellraw @s {"text":"[Daenvil's More Compostable Items]: compost-by-dropping disabled.","color":"red"}
+
+execute if score dnv.dummy dnv.comp.drop_on matches 1 run schedule function zz.dnv.compost:drop-composting/update 3t replace
+execute if score dnv.dummy dnv.comp.drop_on matches 0 run schedule clear zz.dnv.compost:drop-composting/update

data/dnv.compost/functions/uninstall.mcfunction

@@ -4,11 +4,11 @@ kill @e[tag=dnv.composter_marker]
 
 scoreboard objectives remove dnv.comp.debug
 scoreboard objectives remove dnv.comp.drop_on
-scoreboard objectives remove dnv.cm_present
-scoreboard objectives remove dnv.no_composter
-scoreboard objectives remove dnv.comp_found
-scoreboard objectives remove dnv.c_item_found
-scoreboard objectives remove dnv.hopper_slot
-scoreboard objectives remove dnv.c_item_count
-scoreboard objectives remove dnv.hopper_cd
-scoreboard objectives remove dnv.comp_success
+scoreboard objectives remove dnv.comp.has_marker
+scoreboard objectives remove dnv.comp.deletion_timer
+scoreboard objectives remove dnv.comp.found
+scoreboard objectives remove dnv.comp.item_found
+scoreboard objectives remove dnv.comp.hopper_slot
+scoreboard objectives remove dnv.comp.item_count
+scoreboard objectives remove dnv.comp.hopper_cd
+scoreboard objectives remove dnv.comp.success

data/dnv.compost/tags/items/all_compostable_items.json

@@ -0,0 +1,10 @@
+{
+    "values":[
+        "#dnv.compost:compostable_items_10pc",
+        "#dnv.compost:compostable_items_30pc",
+        "#dnv.compost:compostable_items_50pc",
+        "#dnv.compost:compostable_items_65pc",
+        "#dnv.compost:compostable_items_85pc",
+        "#dnv.compost:compostable_items_100pc"
+    ]
+}

data/dnv.compost/tags/items/compostable_items_100pc.json

@@ -0,0 +1,11 @@
+{
+    "values":[
+        "#dnv.compost:vanilla-compostable_100pc",
+        "mycelium",
+        "sculk",
+        "sculk_catalyst",
+        "sculk_shrieker",
+        "sculk_sensor",
+        "calibrated_sculk_sensor"
+    ]
+}

data/dnv.compost/tags/items/compostable_items_10pc.json

@@ -0,0 +1,37 @@
+{
+    "values":[
+        "sugar",
+        "honeycomb",
+        "spider_eye",
+        "fermented_spider_eye",
+        "phantom_membrane",
+        "turtle_scute",
+        "rabbit_hide",
+        "bamboo",
+        "string",
+        "feather",
+        "slime_ball",
+        "magma_cream",
+        "ink_sac",
+        "glow_ink_sac",
+        "black_dye",
+        "red_dye",
+        "green_dye",
+        "brown_dye",
+        "blue_dye",
+        "purple_dye",
+        "cyan_dye",
+        "light_gray_dye",
+        "gray_dye",
+        "pink_dye",
+        "lime_dye",
+        "yellow_dye",
+        "light_blue_dye",
+        "magenta_dye",
+        "orange_dye",
+        "white_dye",
+        "stick",
+        "#wool_carpets",
+        "armadillo_scute"
+    ]
+}

data/dnv.compost/tags/items/compostable_items_30pc.json

@@ -0,0 +1,25 @@
+{
+    "values":[
+        "#dnv.compost:vanilla-compostable_30pc",
+        "chorus_fruit",
+        "popped_chorus_fruit",
+        "chorus_flower",
+        "honey_block",
+        "honeycomb_block",
+        "rotten_flesh",
+        "egg",
+        "turtle_egg",
+        "leather",
+        "dead_bush",
+        "charcoal",
+        "#wool",
+        "slime_block",
+        "nautilus_shell",
+        "paper",
+        "cobweb",
+        "goat_horn",
+        "mangrove_roots",
+        "muddy_mangrove_roots",
+        "mangrove_leaves"
+    ]
+}

data/dnv.compost/tags/items/compostable_items_50pc.json

@@ -0,0 +1,14 @@
+{
+    "values":[
+        "#dnv.compost:vanilla-compostable_50pc",
+        "cooked_chicken",
+        "cooked_cod",
+        "cooked_mutton",
+        "cooked_porkchop",
+        "cooked_rabbit",
+        "cooked_salmon",
+        "cooked_beef",
+        "crimson_nylium",
+        "warped_nylium"
+    ]
+}

data/dnv.compost/tags/items/compostable_items_65pc.json

@@ -0,0 +1,26 @@
+{
+    "values":[
+        "#dnv.compost:vanilla-compostable_65pc",
+        "poisonous_potato",
+        "tube_coral",
+        "brain_coral",
+        "bubble_coral",
+        "fire_coral",
+        "horn_coral",
+        "tube_coral_fan",
+        "brain_coral_fan",
+        "bubble_coral_fan",
+        "fire_coral_fan",
+        "horn_coral_fan",
+        "dead_tube_coral",
+        "dead_brain_coral",
+        "dead_bubble_coral",
+        "dead_fire_coral",
+        "dead_horn_coral",
+        "dead_tube_coral_fan",
+        "dead_brain_coral_fan",
+        "dead_bubble_coral_fan",
+        "dead_fire_coral_fan",
+        "dead_horn_coral_fan"
+    ]
+}

data/dnv.compost/tags/items/compostable_items_85pc.json

@@ -0,0 +1,20 @@
+{
+    "values":[
+        "#dnv.compost:vanilla-compostable_85pc",
+        "beetroot_soup",
+        "mushroom_stew",
+        "rabbit_stew",
+        "suspicious_stew",
+        "tube_coral_block",
+        "brain_coral_block",
+        "bubble_coral_block",
+        "fire_coral_block",
+        "horn_coral_block",
+        "dead_tube_coral_block",
+        "dead_brain_coral_block",
+        "dead_bubble_coral_block",
+        "dead_fire_coral_block",
+        "dead_horn_coral_block",
+        "sculk_vein"
+    ]
+}

data/dnv.compost/tags/items/vanilla-compostable.json

@@ -0,0 +1,10 @@
+{
+    "_comment_": "Contains all items which are compostable in vanilla",
+    "values":[
+        "#dnv.compost:vanilla-compostable_30pc",
+        "#dnv.compost:vanilla-compostable_50pc",
+        "#dnv.compost:vanilla-compostable_65pc",
+        "#dnv.compost:vanilla-compostable_85pc",
+        "#dnv.compost:vanilla-compostable_100pc"
+    ]
+}

data/dnv.compost/tags/items/vanilla-compostable_100pc.json

@@ -0,0 +1,7 @@
+{
+	"_comment_": "Contains all items which are compostable in vanilla with 100% chance",
+	"values": [
+		"cake",
+        "pumpkin_pie"
+	]
+}

data/dnv.compost/tags/items/vanilla-compostable_30pc.json

@@ -0,0 +1,24 @@
+{
+	"_comment_": "Contains all items which are compostable in vanilla with 30% chance",
+	"values": [
+		"beetroot_seeds",
+		"dried_kelp",
+		"glow_berries",
+		"hanging_roots",
+		"#saplings",
+		"mangrove_roots",
+		"kelp",
+		"#leaves",
+		"melon_seeds",
+		"moss_carpet",
+		"pink_petals",
+		"pitcher_pod",
+		"pumpkin_seeds",
+		"seagrass",
+		"short_grass",
+		"small_dripleaf",
+		"sweet_berries",
+		"torchflower_seeds",
+		"wheat_seeds"
+	]
+}

data/dnv.compost/tags/items/vanilla-compostable_50pc.json

@@ -0,0 +1,15 @@
+{
+	"_comment_": "Contains all items which are compostable in vanilla with 50% chance",
+	"values": [
+		"cactus",
+        "dried_kelp_block",
+        "glow_lichen",
+        "melon_slice",
+        "nether_sprouts",
+        "sugar_cane",
+        "tall_grass",
+        "twisting_vines",
+        "vine",
+        "weeping_vines"
+	]
+}

data/dnv.compost/tags/items/vanilla-compostable_65pc.json

@@ -0,0 +1,33 @@
+{
+	"_comment_": "Contains all items which are compostable in vanilla with 65% chance",
+	"values": [
+		"apple",
+        "azalea",
+        "beetroot",
+        "big_dripleaf",
+        "carrot",
+        "cocoa_beans",
+        "fern",
+        "#small_flowers",
+        "#tall_flowers",
+        "crimson_fungus",
+        "warped_fungus",
+        "large_fern",
+        "lily_pad",
+        "melon",
+        "moss_block",
+        "red_mushroom",
+        "brown_mushroom",
+        "mushroom_stem",
+        "nether_wart",
+        "potato",
+        "pumpkin",
+        "carved_pumpkin",
+        "crimson_roots",
+        "warped_roots",
+        "sea_pickle",
+        "shroomlight",
+        "spore_blossom",
+        "wheat"
+	]
+}

data/dnv.compost/tags/items/vanilla-compostable_85pc.json

@@ -0,0 +1,16 @@
+{
+	"_comment_": "Contains all items which are compostable in vanilla with 85% chance",
+	"values": [
+		"baked_potato",
+        "bread",
+        "cookie",
+        "flowering_azalea",
+        "hay_block",
+        "red_mushroom_block",
+        "brown_mushroom_block",
+        "nether_wart_block",
+        "pitcher_plant",
+        "torchflower",
+        "warped_wart_block"
+	]
+}