Gamemode4Dev · SpecialBuilder32 · Nov 15, 2022 · Mar 6, 2024 · Mar 6, 2024 · Mar 7, 2024
diff --git a/gm4/skin_cache.json b/gm4/skin_cache.json
diff --git a/gm4_cement_mixers/beet.yaml b/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: []

diff --git a/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/black_concrete.mcfunction b/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/black_concrete.mcfunction
diff --git a/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/blue_concrete.mcfunction b/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/blue_concrete.mcfunction
diff --git a/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/brown_concrete.mcfunction b/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/brown_concrete.mcfunction
diff --git a/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/cyan_concrete.mcfunction b/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/cyan_concrete.mcfunction
diff --git a/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/gray_concrete.mcfunction b/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/gray_concrete.mcfunction
diff --git a/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/green_concrete.mcfunction b/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/green_concrete.mcfunction
diff --git a/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/light_blue_concrete.mcfunction b/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/light_blue_concrete.mcfunction
diff --git a/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/light_gray_concrete.mcfunction b/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/light_gray_concrete.mcfunction
diff --git a/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/lime_concrete.mcfunction b/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/lime_concrete.mcfunction
diff --git a/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/magenta_concrete.mcfunction b/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/magenta_concrete.mcfunction
diff --git a/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/mud.mcfunction b/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/mud.mcfunction
diff --git a/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/orange_concrete.mcfunction b/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/orange_concrete.mcfunction
diff --git a/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/pink_concrete.mcfunction b/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/pink_concrete.mcfunction
diff --git a/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/purple_concrete.mcfunction b/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/purple_concrete.mcfunction
diff --git a/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/red_concrete.mcfunction b/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/red_concrete.mcfunction
diff --git a/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/white_concrete.mcfunction b/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/white_concrete.mcfunction
diff --git a/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/yellow_concrete.mcfunction b/gm4_cement_mixers/data/gm4_cement_mixers/function/item_fill/yellow_concrete.mcfunction
diff --git a/gm4_cement_mixers/data/gm4_cement_mixers/function/water_concrete.mcfunction b/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
diff --git a/gm4_lightning_in_a_bottle/assets/translations.csv b/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

diff --git a/gm4_lightning_in_a_bottle/beet.yaml b/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:

diff --git a/...ng_in_a_bottle/data/gm4_lightning_in_a_bottle/function/liquid_tanks/item_drain.mcfunction b/...ng_in_a_bottle/data/gm4_lightning_in_a_bottle/function/liquid_tanks/item_drain.mcfunction
diff --git a/...ing_in_a_bottle/data/gm4_lightning_in_a_bottle/function/liquid_tanks/item_fill.mcfunction b/...ing_in_a_bottle/data/gm4_lightning_in_a_bottle/function/liquid_tanks/item_fill.mcfunction
diff --git a/...ata/gm4_lightning_in_a_bottle/function/liquid_tanks/item_fill/lightning_bottle.mcfunction b/...ata/gm4_lightning_in_a_bottle/function/liquid_tanks/item_fill/lightning_bottle.mcfunction
diff --git a/...tle/data/gm4_lightning_in_a_bottle/function/liquid_tanks/liquid_init/lightning.mcfunction b/...tle/data/gm4_lightning_in_a_bottle/function/liquid_tanks/liquid_init/lightning.mcfunction
diff --git a/...bottle/data/gm4_lightning_in_a_bottle/function/liquid_tanks/remove_liquid_tags.mcfunction b/...bottle/data/gm4_lightning_in_a_bottle/function/liquid_tanks/remove_liquid_tags.mcfunction
diff --git a/...ing_in_a_bottle/data/gm4_lightning_in_a_bottle/function/liquid_tanks/tank_init.mcfunction b/...ing_in_a_bottle/data/gm4_lightning_in_a_bottle/function/liquid_tanks/tank_init.mcfunction
diff --git a/...n_a_bottle/data/gm4_lightning_in_a_bottle/function/liquid_tanks/util/lightning.mcfunction b/...n_a_bottle/data/gm4_lightning_in_a_bottle/function/liquid_tanks/util/lightning.mcfunction
diff --git a/...ng_in_a_bottle/data/gm4_lightning_in_a_bottle/function/liquid_tanks/util_below.mcfunction b/...ng_in_a_bottle/data/gm4_lightning_in_a_bottle/function/liquid_tanks/util_below.mcfunction
diff --git a/...ning_in_a_bottle/data/gm4_lightning_in_a_bottle/modules/liquid_tanks/liquid_features.bolt b/...ning_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
diff --git a/gm4_lightning_in_a_bottle/data/gm4_liquid_tanks/tags/function/item_drain.json b/gm4_lightning_in_a_bottle/data/gm4_liquid_tanks/tags/function/item_drain.json
diff --git a/gm4_lightning_in_a_bottle/data/gm4_liquid_tanks/tags/function/item_fill.json b/gm4_lightning_in_a_bottle/data/gm4_liquid_tanks/tags/function/item_fill.json
diff --git a/gm4_lightning_in_a_bottle/data/gm4_liquid_tanks/tags/function/remove_liquid_tags.json b/gm4_lightning_in_a_bottle/data/gm4_liquid_tanks/tags/function/remove_liquid_tags.json
diff --git a/gm4_lightning_in_a_bottle/data/gm4_liquid_tanks/tags/function/tank_init.json b/gm4_lightning_in_a_bottle/data/gm4_liquid_tanks/tags/function/tank_init.json
diff --git a/gm4_lightning_in_a_bottle/data/gm4_liquid_tanks/tags/function/util_below.json b/gm4_lightning_in_a_bottle/data/gm4_liquid_tanks/tags/function/util_below.json
diff --git a/gm4_liquid_tanks/beet.yaml b/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: