Remove lib trades, refactor apple trees and balloon animals

Author: misode

gm4_apple_trees/beet.yaml

@@ -13,14 +13,12 @@ resource_pack:
 
 pipeline:
   - gm4.plugins.extend.module
-  - gm4.plugins.include.lib_trades
   - gm4.plugins.include.lib_trees
 
 meta:
   gm4:
     versioning:
       required:
-        lib_trades: 1.6.0
         lib_trees: 1.3.0
       schedule_loops:
         - main

gm4_apple_trees/data/gm4_apple_trees/function/wandering_trader/register_trade.mcfunction

@@ -0,0 +1,19 @@
+{
+  "wants": {
+    "id": "minecraft:emerald",
+    "count": 5
+  },
+  "gives": {
+    "id": "minecraft:oak_sapling",
+    "components": {
+      "minecraft:custom_data": "{gm4_trees:{item:{id:'sapling',type:'apple'}},gm4_podzol_rooting_soil:{id:'apple_tree_sapling'}}",
+      "minecraft:custom_model_data": {"strings":["gm4_apple_trees:item/apple_tree_sapling"]},
+      "minecraft:item_name": {
+        "translate": "item.gm4.apple_tree_sapling",
+        "fallback": "Apple Tree Sapling"
+      }
+    }
+  },
+  "max_uses": 8,
+  "xp": 1
+}

gm4_apple_trees/data/gm4_apple_trees/villager_trade/emerald_apple_tree_sapling.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "gm4_apple_trees:emerald_apple_tree_sapling"
+  ]
+}

gm4_apple_trees/data/gm4_trades/tags/function/register_trades.json

@@ -8,16 +8,13 @@ data_pack:
 pipeline:
   - gm4_balloon_animals.generate
   - gm4.plugins.extend.module
-  - gm4.plugins.include.lib_trades
 
 require:
   - bolt
 
 meta:
   gm4:
     versioning:
-      required:
-        lib_trades: 1.6.0
       schedule_loops: [main]
     website:
       description: Looking for exotic animals? This module makes some Wandering Traders sell cute baby animals!

gm4_apple_trees/data/minecraft/tags/villager_trade/wandering_trader/common.json

@@ -1,4 +1,6 @@
 
+execute as @e[type=minecraft:wandering_trader,tag=!gm4_balloon_animal_eligible_ignore,tag=!smithed.entity] at @s run function gm4_balloon_animals:wandering_trader/check_eligibility
+
 execute as @e[type=#gm4_balloon_animals:balloon_animal,tag=gm4_balloon_animal,tag=!gm4_balloon_animal_purchased] run function gm4_balloon_animals:balloon/check_leashed
 
 schedule function gm4_balloon_animals:main 4s

gm4_balloon_animals/beet.yaml

@@ -1,24 +1,19 @@
 # @s = a wandering trader
 # at @s
-# run from #gm4_trades:register_trades
+# run from gm4_balloon_animals:main
 
-scoreboard players set $valid_trader gm4_balloon_animals_data 1
+# ensure that this wandering trader is not checked again
+tag @s add gm4_balloon_animal_eligible_ignore
 
-# check tags
-execute if entity @s[tag=gm4_balloon_animal_eligible_ignore] run scoreboard players set $valid_trader gm4_balloon_animals_data 0
-execute if entity @s[tag=gm4_calling_bell_trader] run scoreboard players set $valid_trader gm4_balloon_animals_data 0
-
-data modify storage gm4_balloon_animals:temp trader.uuid set from entity @s UUID
-tag @s add gm4_balloon_animal_trader_eligible_check
+execute unless predicate gm4_balloon_animals:balloon_trader_chance run return 0
 
 # must have 2 llamas leashed
 scoreboard players set $trader_llama_count gm4_balloon_animals_data 0
+tag @s add gm4_balloon_animal_trader_eligible_check
 execute as @e[type=trader_llama,tag=!smithed.entity,distance=..6] on leasher if entity @s[tag=gm4_balloon_animal_trader_eligible_check] run scoreboard players add $trader_llama_count gm4_balloon_animals_data 1
-execute unless score $trader_llama_count gm4_balloon_animals_data matches 2 run scoreboard players set $valid_trader gm4_balloon_animals_data 0
-
-tag @s add gm4_balloon_animal_eligible_ignore
 tag @s remove gm4_balloon_animal_trader_eligible_check
-execute if score $valid_trader gm4_balloon_animals_data matches 1 if predicate gm4_balloon_animals:balloon_trader_chance run function gm4_balloon_animals:wandering_trader/init_trader
-
-# clean up
+execute unless score $trader_llama_count gm4_balloon_animals_data matches 2 run return 0
 scoreboard players reset $trader_llama_count gm4_balloon_animals_data
+
+data modify storage gm4_balloon_animals:temp trader.uuid set from entity @s UUID
+function gm4_balloon_animals:wandering_trader/init_trader

gm4_balloon_animals/data/gm4_balloon_animals/function/main.mcfunction

@@ -1,20 +1,14 @@
 # @s = a wandering trader with exactly 2 trader llamas
 # at @s
-# run from wandering_trader/check_eligibility via #gm4_trades:register_trades
+# run from wandering_trader/check_eligibility
 
+# mark that this trader was modified
 tag @s add gm4_balloon_animal_trader
-tag @s add gm4_balloon_animal_trader_new
-
-scoreboard players set $llamas_replaced gm4_balloon_animals_data 0
 
 # find leashed llamas
+tag @s add gm4_balloon_animal_trader_new
 execute as @e[type=trader_llama,tag=!smithed.entity,distance=..6] run function gm4_balloon_animals:wandering_trader/llama/check_leasher
+tag @s remove gm4_balloon_animal_trader_new
 
 # pick two animals and set up trades
 function gm4_balloon_animals:wandering_trader/pick_two_animals
-
-
-# clean up
-scoreboard players reset $trader_llama_check gm4_balloon_animals_data
-
-tag @s remove gm4_balloon_animal_trader_new

gm4_balloon_animals/data/gm4_balloon_animals/function/wandering_trader/check_eligibility.mcfunction

@@ -1,7 +1,8 @@
 # Checks that this trader llama is attached to the wandering trader that is being checked
-# @s = a llama within 5 blocks of the wandering trader being checked
+# @s = a llama within 6 blocks of the wandering trader being checked
 # at @s
 # run from wandering_trader/init_trader
 
 execute store result score $trader_llama_check gm4_balloon_animals_data on leasher if entity @s[tag=gm4_balloon_animal_trader_new]
 execute if score $trader_llama_check gm4_balloon_animals_data matches 1 run function gm4_balloon_animals:wandering_trader/llama/kill
+scoreboard players reset $trader_llama_check gm4_balloon_animals_data