Modernize (and Boltify) Liquid Tanks

gm4_cement_mixers/beet.yaml

@@ -5,14 +5,17 @@ version: 1.4.X
 data_pack:
   load: .
 
+require:
+  - bolt
+
 pipeline:
   - gm4.plugins.extend.module
 
 meta:
   gm4:
     versioning:
       required:
-        gm4_liquid_tanks: 2.3.0
+        gm4_liquid_tanks: 2.7.0
     website:
       description: Allows Liquid Tanks to convert Concrete Powder items into Concrete, at the cost of ⅓ of a Bucket of Water per Concrete Powder.
       recommended: []

gm4_cement_mixers/data/gm4_cement_mixers/function/water_concrete.mcfunction

@@ -1,22 +1,34 @@
 # 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
+
+for variant in ("", "coarse_", "rooted_"):
+    execute if items block ~ ~ ~ container.0 f"minecraft:{variant}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,22 @@
+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 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=armor_stand,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_tanks/beet.yaml

@@ -1,19 +1,26 @@
 id: gm4_liquid_tanks
 name: Liquid Tanks
-version: 2.6.X
+version: 2.7.X
 
 data_pack:
   load: .
 
 resource_pack:
   load: .
 
+require:
+  - bolt
+
 pipeline:
+  - override_formatting
   - gm4.plugins.extend.module
   - gm4.plugins.include.lib_machines
   - gm4.plugins.include.lib_custom_crafters
 
 meta:
+  bolt:
+    entrypoint:
+      - gm4_standard_liquids:main
   gm4:
     versioning:
       required:

gm4_liquid_tanks/bolt_liquid_wrappers.py

@@ -0,0 +1,9 @@
+# beet plugin to add the liquid_wrappers.bolt module to other gm4 datapacks more easily
+from beet import Context
+from bolt import Module
+from pathlib import Path
+
+
+def beet_default(ctx: Context):
+    print(Path.cwd())
+    ctx.data[Module]['gm4_liquid_tanks:liquid_wrappers'] = Module(source_path=Path("gm4_liquid_tanks/data/gm4_liquid_tanks/modules/liquid_wrappers.bolt"))

gm4_liquid_tanks/data/gm4_liquid_tanks/function/apply_output.mcfunction

@@ -2,8 +2,17 @@
 # @s = processing tank
 
 # merge count from input and set to tank
-data modify storage gm4_liquid_tanks:temp/tank output.count set from storage gm4_liquid_tanks:temp/tank input_slot.count
-data modify block ~ ~ ~ Items[{Slot:0b}] set from storage gm4_liquid_tanks:temp/tank output
+item_modifier gm4_liquid_tanks:apply_output_count:
+    function: "minecraft:set_count"
+    count:
+        type: "minecraft:score"
+        target: 
+            type: "minecraft:fixed"
+            name: "$stack_size"
+        score: "gm4_lt_value"
+
+item replace block ~ ~ ~ container.0 from entity 344d47-4-4-4-f04ce104d weapon.mainhand gm4_liquid_tanks:apply_output_count
+item replace entity 344d47-4-4-4-f04ce104d weapon.mainhand with air
 
 # apply value delta
 scoreboard players operation @s gm4_lt_value += $stack_value gm4_lt_value

gm4_liquid_tanks/data/gm4_liquid_tanks/function/empty.mcfunction

@@ -2,7 +2,7 @@
 #run from liquid_tanks:liquid_value_update
 
 scoreboard players set @s gm4_lt_value 0
-execute positioned ~ ~-0.5 ~ run kill @e[type=armor_stand,tag=gm4_liquid_tank_display,distance=..0.5]
+execute positioned ~ ~ ~ run kill @e[type=item_display,tag=gm4_liquid_tank_liquid_display,distance=..0.5]
 data merge block ~ ~ ~ {CustomName:'{"translate":"gm4.second","fallback":"%1$s","with":[{"translate":"container.gm4.liquid_tank.empty","fallback":"Empty Tank"},[{"translate":"gui.gm4.liquid_tank","fallback":"","font":"gm4:container_gui","color":"white"},{"translate":"container.gm4.liquid_tank.empty","fallback":"Empty Tank","font":"gm4:default","color":"#404040"}]]}'}
 data modify entity @s data.gm4_liquid_tanks.liquid_tag set value "empty"
 function #gm4_liquid_tanks:remove_liquid_tags

gm4_liquid_tanks/data/gm4_liquid_tanks/function/init.mcfunction

@@ -3,7 +3,7 @@ scoreboard objectives add gm4_lt_max dummy
 scoreboard objectives add gm4_lt_prior_val dummy
 scoreboard objectives add gm4_lt_disp_val dummy
 scoreboard objectives add gm4_lt_util dummy
-#declare storage gm4_liquid_tanks:temp/tank
+#declare storage gm4_liquid_tanks:temp
 
 execute unless score liquid_tanks gm4_modules matches 1 run data modify storage gm4:log queue append value {type:"install",module:"Liquid Tanks"}
 execute unless score liquid_tanks gm4_earliest_version < liquid_tanks gm4_modules run scoreboard players operation liquid_tanks gm4_earliest_version = liquid_tanks gm4_modules