Modernize (and Boltify) Liquid Tanks

gm4_cement_mixers/beet.yaml

@@ -5,6 +5,9 @@ version: 1.5.X
 data_pack:
   load: .
 
+require:
+  - bolt
+
 pipeline:
   - gm4.plugins.extend.module
 

gm4_cement_mixers/data/gm4_cement_mixers/function/water_concrete.mcfunction

@@ -1,22 +1,40 @@
 # run from item_fill
 # @s = liquid tank at @s
 
-execute if data storage gm4_liquid_tanks:temp/tank {input_slot:{id:"minecraft:black_concrete_powder"}} run function gm4_cement_mixers:item_fill/black_concrete
-execute if data storage gm4_liquid_tanks:temp/tank {input_slot:{id:"minecraft:blue_concrete_powder"}} run function gm4_cement_mixers:item_fill/blue_concrete
-execute if data storage gm4_liquid_tanks:temp/tank {input_slot:{id:"minecraft:brown_concrete_powder"}} run function gm4_cement_mixers:item_fill/brown_concrete
-execute if data storage gm4_liquid_tanks:temp/tank {input_slot:{id:"minecraft:cyan_concrete_powder"}} run function gm4_cement_mixers:item_fill/cyan_concrete
-execute if data storage gm4_liquid_tanks:temp/tank {input_slot:{id:"minecraft:gray_concrete_powder"}} run function gm4_cement_mixers:item_fill/gray_concrete
-execute if data storage gm4_liquid_tanks:temp/tank {input_slot:{id:"minecraft:green_concrete_powder"}} run function gm4_cement_mixers:item_fill/green_concrete
-execute if data storage gm4_liquid_tanks:temp/tank {input_slot:{id:"minecraft:light_blue_concrete_powder"}} run function gm4_cement_mixers:item_fill/light_blue_concrete
-execute if data storage gm4_liquid_tanks:temp/tank {input_slot:{id:"minecraft:light_gray_concrete_powder"}} run function gm4_cement_mixers:item_fill/light_gray_concrete
-execute if data storage gm4_liquid_tanks:temp/tank {input_slot:{id:"minecraft:lime_concrete_powder"}} run function gm4_cement_mixers:item_fill/lime_concrete
-execute if data storage gm4_liquid_tanks:temp/tank {input_slot:{id:"minecraft:magenta_concrete_powder"}} run function gm4_cement_mixers:item_fill/magenta_concrete
-execute if data storage gm4_liquid_tanks:temp/tank {input_slot:{id:"minecraft:orange_concrete_powder"}} run function gm4_cement_mixers:item_fill/orange_concrete
-execute if data storage gm4_liquid_tanks:temp/tank {input_slot:{id:"minecraft:pink_concrete_powder"}} run function gm4_cement_mixers:item_fill/pink_concrete
-execute if data storage gm4_liquid_tanks:temp/tank {input_slot:{id:"minecraft:purple_concrete_powder"}} run function gm4_cement_mixers:item_fill/purple_concrete
-execute if data storage gm4_liquid_tanks:temp/tank {input_slot:{id:"minecraft:red_concrete_powder"}} run function gm4_cement_mixers:item_fill/red_concrete
-execute if data storage gm4_liquid_tanks:temp/tank {input_slot:{id:"minecraft:white_concrete_powder"}} run function gm4_cement_mixers:item_fill/white_concrete
-execute if data storage gm4_liquid_tanks:temp/tank {input_slot:{id:"minecraft:yellow_concrete_powder"}} run function gm4_cement_mixers:item_fill/yellow_concrete
-execute if data storage gm4_liquid_tanks:temp/tank {input_slot:{id:"minecraft:dirt"}} run function gm4_cement_mixers:item_fill/mud
-execute if data storage gm4_liquid_tanks:temp/tank {input_slot:{id:"minecraft:coarse_dirt"}} run function gm4_cement_mixers:item_fill/mud
-execute if data storage gm4_liquid_tanks:temp/tank {input_slot:{id:"minecraft:rooted_dirt"}} run function gm4_cement_mixers:item_fill/mud
+concretes_colors = (
+    "black",
+    "blue",
+    "brown",
+    "cyan",
+    "gray",
+    "green",
+    "light_blue",
+    "light_gray",
+    "lime",
+    "magenta",
+    "orange",
+    "pink",
+    "purple",
+    "red",
+    "white",
+    "yellow"
+)
+for color in concretes_colors:
+    execute if items block ~ ~ ~ container.0 f"minecraft:{color}_concrete_powder" run function f"gm4_cement_mixers:item_fill/{color}_concrete":
+        scoreboard players set $item_value gm4_lt_value -1
+        item replace entity 00344d47-0004-0004-0004-000f04ce104d weapon.mainhand with f"minecraft:{color}_concrete"
+        function gm4_liquid_tanks:smart_item_fill
+        tag @s add gm4_lt_fill
+
+item_tag gm4_cement_mixers:dirt {
+    "values": [
+        "minecraft:dirt",
+        "minecraft:coarse_dirt",
+        "minecraft:rooted_dirt"
+    ]
+}
+execute if items block ~ ~ ~ container.0 #gm4_cement_mixers:dirt run function gm4_cement_mixers:item_fill/mud:
+    scoreboard players set $item_value gm4_lt_value -1
+    item replace entity 00344d47-0004-0004-0004-000f04ce104d weapon.mainhand with minecraft:mud
+    function gm4_liquid_tanks:smart_item_fill
+    tag @s add gm4_lt_fill

gm4_lightning_in_a_bottle/assets/translations.csv

@@ -3,7 +3,7 @@ advancement.gm4.lightning_in_a_bottle.lightning_drink.description,Drink a Bottle
 advancement.gm4.lightning_in_a_bottle.lightning_drink.title,Shocking!
 advancement.gm4.lightning_in_a_bottle.lightning_shulker.description,Strike a Purpur Block with lightning to create a Shulker
 advancement.gm4.lightning_in_a_bottle.lightning_shulker.title,It's Alive!
-container.gm4.liquid_tank.lightning,Lightning Tank
+container.gm4.liquid_tank.liab_lightning,Lightning Tank
 effect.gm4.lightning_in_a_bottle.lightning,Lightning
 item.gm4.bottle.effect.lightning,Bottle of Lightning
 item.gm4.lingering_bottle.effect.lightning,Lingering Bottle of Lightning

gm4_lightning_in_a_bottle/beet.yaml

@@ -8,12 +8,19 @@ data_pack:
 resource_pack:
   load: .
 
+require:
+  - bolt
+
 pipeline:
+  - gm4_liquid_tanks.bolt_liquid_wrappers
   - gm4.plugins.extend.module
   - gm4.plugins.include.lib_brewing
   - gm4.plugins.include.lib_potion_tracking
 
 meta:
+  bolt:
+    entrypoint:
+      gm4_lightning_in_a_bottle:liquid_tanks/liquid_features
   gm4:
     versioning:
       required:

gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/modules/liquid_tanks/liquid_features.bolt

@@ -0,0 +1,25 @@
+from gm4_liquid_tanks:liquid_wrappers import liquid
+
+@liquid
+class BottledLightning:
+    id = 'liab_lightning'
+    name = "Lightning"
+    capacity = 300
+    skin = 'lightning_liquid'
+
+    liquid.init()
+
+    @liquid.item_fill("glass_bottle", "potion[custom_data~{gm4_lightning_in_a_bottle:1b}]", 1)
+    def fill_bottle():
+        loot replace entity 344d47-4-4-4-f04ce104d weapon.mainhand loot gm4_lightning_in_a_bottle:items/bottle_of_lightning
+
+    @liquid.util_below
+    def lightning_strike():
+        execute as @e[team=!invalid_team,type=!armor_stand,tag=!smithed.strict,limit=1,dx=0]
+            unless entity @s[gamemode=spectator]
+            unless entity @s[predicate=gm4_lightning_in_a_bottle:on_fire]
+            run function gm4_lightning_in_a_bottle:liquid_tanks/util/lightning:
+                execute at @s run summon lightning_bolt ~ ~ ~
+                scoreboard players remove @e[type=marker,tag=gm4_liquid_tank,tag=gm4_processing_tank,distance=..8] gm4_lt_value 1
+                playsound entity.firework_rocket.twinkle block @a[distance=..8] ~ ~ ~ 2 1.5
+                advancement grant @s only gm4:lightning_in_a_bottle_drink

gm4_liquid_minecarts/beet.yaml

@@ -1,6 +1,6 @@
 id: gm4_liquid_minecarts
 name: Liquid Minecarts
-version: 1.7.X
+version: 1.8.X
 
 data_pack:
   load: .
@@ -16,7 +16,7 @@ meta:
   gm4:
     versioning:
       required:
-        gm4_liquid_tanks: 2.7.0
+        gm4_liquid_tanks: 2.8.0
         lib_machines: 1.4.0
       schedule_loops: [main]
     model_data:

gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/compare_load_liquid.mcfunction

@@ -2,6 +2,6 @@
 #run from try_to_load
 
 data modify storage gm4_liquid_minecarts:compare liquid set from entity @e[type=marker,limit=1,sort=nearest,distance=..1,tag=gm4_liquid_tank] data.gm4_liquid_tanks.liquid_tag
-execute store success score @s gm4_lm_data run data modify storage gm4_liquid_minecarts:compare liquid set from entity @s Passengers[0].equipment.feet.components."minecraft:custom_data".gm4_liquid_minecarts.liquid_tag
+execute store success score @s gm4_lm_data run data modify storage gm4_liquid_minecarts:compare liquid set from entity @s Passengers[0].item.components."minecraft:custom_data".gm4_liquid_minecarts.liquid_tag
 
 execute if score @s gm4_lm_data matches 0 run function gm4_liquid_minecarts:load_liquid

gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/compare_unload_liquid.mcfunction

@@ -2,6 +2,6 @@
 #run from try_to_unload
 
 data modify storage gm4_liquid_minecarts:compare liquid set from entity @e[type=marker,limit=1,sort=nearest,distance=..0.1,tag=gm4_liquid_tank] data.gm4_liquid_tanks.liquid_tag
-execute store success score @s gm4_lm_data run data modify storage gm4_liquid_minecarts:compare liquid set from entity @s Passengers[0].equipment.feet.components."minecraft:custom_data".gm4_liquid_minecarts.liquid_tag
+execute store success score @s gm4_lm_data run data modify storage gm4_liquid_minecarts:compare liquid set from entity @s Passengers[0].item.components."minecraft:custom_data".gm4_liquid_minecarts.liquid_tag
 
 execute if score @s gm4_lm_data matches 0 run function gm4_liquid_minecarts:unload_liquid

gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/copy_tank_data.mcfunction

@@ -1,6 +1,6 @@
-#@s = gm4_liquid_minecart_stand copying tank data to it's armor items, at location of tank
+#@s = gm4_liquid_minecart_display copying tank data to it's item, at location of tank
 #run from init_liquid
 
-data modify entity @s equipment.feet.components."minecraft:custom_data".gm4_liquid_minecarts.liquid_tag set from entity @e[type=marker,limit=1,tag=gm4_liquid_tank,sort=nearest] data.gm4_liquid_tanks.liquid_tag
-data modify entity @s equipment.feet.components."minecraft:custom_data".gm4_liquid_minecarts.tank.texture set from entity @e[type=armor_stand,tag=gm4_liquid_tank_display,limit=1,sort=nearest] equipment.head
-data modify entity @s equipment.feet.components."minecraft:custom_data".gm4_liquid_minecarts.tank.CustomName set from block ~ ~ ~ CustomName
+data modify entity @s item.components."minecraft:custom_data".gm4_liquid_minecarts.liquid_tag set from entity @e[type=marker,limit=1,tag=gm4_liquid_tank,sort=nearest,distance=..2] data.gm4_liquid_tanks.liquid_tag
+data modify entity @s item.components."minecraft:custom_data".gm4_liquid_minecarts.tank.texture set from entity @e[type=item_display,tag=gm4_liquid_tank_liquid_display,limit=1,sort=nearest,distance=..2] item
+data modify entity @s item.components."minecraft:custom_data".gm4_liquid_minecarts.tank.CustomName set from block ~ ~ ~ CustomName