PS11 Resource Pack PR merge

gm4/modeldata_registry.json

@@ -715,7 +715,6 @@
       "gm4_animi_shamir:shamir/animi": 124
     },
     "golden_chestplate": {
-      "gm4_scuba_gear:item/scuba_tank": 1,
       "gm4_zauber_cauldrons:item/zauber_armor/health_boost": 2,
       "gm4_zauber_cauldrons:item/zauber_armor/attack_boost": 3,
       "gm4_zauber_cauldrons:item/zauber_armor/speed_boost": 4,
@@ -1025,7 +1024,6 @@
     },
     "leather_boots": {
       "gm4_boots_of_ostara:item/boots_of_ostara": 1,
-      "gm4_scuba_gear:item/flippers": 2,
       "gm4_boots_of_ostara:gui/advancement/boots_of_ostara": 3,
       "gm4_boots_of_ostara:item/flippers_of_ostara": 4,
       "gm4_boots_of_ostara:guidebook_icon/boots_of_ostara": 5,
@@ -1050,6 +1048,7 @@
       "gm4_metallurgy:shamir/defuse": 106,
       "gm4_animi_shamir:shamir/animi": 124
     },
+    "leather_horse_armor": {},
     "leather_leggings": {
       "gm4_washing_tanks:guidebook_icon/washing_tanks": 1,
       "gm4_weighted_armour:shamir/helious": 103,
@@ -1346,7 +1345,6 @@
       "gm4_heart_canisters:gui/advancement/heart_canisters_max": 6,
       "gm4_heart_canisters:item/heart_canister_tier_1": 7,
       "gm4_heart_canisters:item/heart_canister_tier_2": 8,
-      "gm4_scuba_gear:item/scuba_helmet": 9,
       "gm4_heart_canisters:guidebook_icon/heart_canisters": 10,
       "gm4_zauber_cauldrons:item/crystal/speed": 12,
       "gm4_zauber_cauldrons:item/crystal/regeneration": 13,
@@ -1372,7 +1370,6 @@
       "gm4_tnt_landmines:item/tnt_landmine_crafting_table": 45,
       "gm4_tnt_landmines:item/tnt_landmine_netherrack": 46,
       "gm4_tnt_landmines:item/tnt_landmine_invisible": 47,
-      "gm4_scuba_gear:gui/advancement/scuba_gear": 48,
       "gm4_metallurgy:gui/advancement/metallurgy_blast_ore": 49,
       "gm4_metallurgy:gui/advancement/metallurgy_cast": 50,
       "gm4_relocators:gui/advancement/relocators": 51,

gm4_boots_of_ostara/data/gm4_boots_of_ostara/item_modifier/boots_of_ostara.json

@@ -51,47 +51,5 @@
                 "italic": true
             }
         ]
-    },
-    {
-        "function": "minecraft:set_components",
-        "components": {
-            "minecraft:custom_model_data": "gm4_scuba_gear:item/flippers"
-        },
-        "conditions": [
-            {
-                "condition": "minecraft:value_check",
-                "value": {
-                    "type": "minecraft:score",
-                    "target": {
-                        "type": "minecraft:fixed",
-                        "name": "$boa_flippers"
-                    },
-                    "score": "gm4_crafting"
-                },
-                "range": 1
-            }
-        ]
-    },
-    {
-        "function": "minecraft:set_name",
-        "name": {
-            "translate": "item.gm4.flippers_of_ostara",
-            "fallback": "Flippers of Ostara",
-            "italic": false
-        },
-        "conditions": [
-            {
-                "condition": "minecraft:value_check",
-                "value": {
-                    "type": "minecraft:score",
-                    "target": {
-                        "type": "minecraft:fixed",
-                        "name": "$boa_flippers"
-                    },
-                    "score": "gm4_crafting"
-                },
-                "range": 1
-            }
-        ]
     }
 ]

gm4_cement_mixers/beet.yaml

@@ -5,14 +5,17 @@ version: 1.5.X
 data_pack:
   load: .
 
+require:
+  - bolt
+
 pipeline:
   - gm4.plugins.extend.module
 
 meta:
   gm4:
     versioning:
       required:
-        gm4_liquid_tanks: 2.7.0
+        gm4_liquid_tanks: 3.0.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,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_furniture/README.md

@@ -0,0 +1,6 @@
+# Furniture<!--$headerTitle--><!--$pmc:delete-->
+
+Add Furniture TODO: improve this readme! <!--$pmc:headerSize-->
+
+### Features
+- Add Furniture

gm4_furniture/assets/gm4/font/container_gui.json

@@ -0,0 +1,14 @@
+{
+    "providers": [
+        {
+            "type": "space",
+            "advances": {
+                "\u8100": -1,
+                "\u8020": -224,
+                "\u8021": -128,
+                "\u8022": 39
+
+            }
+        }
+    ]
+}

gm4_furniture/assets/gm4_furniture/font/shift_name.json

@@ -0,0 +1,18 @@
+{
+  "providers": [
+      {
+          "type": "space",
+          "advances": {
+              " ": 4,
+              "\u200c": 0
+          }
+      },
+      {
+          "type": "ttf",
+          "file": "gm4_furniture:minecraft.ttf",
+          "shift": [0,7],
+          "size": 8,
+          "oversample": 7
+      }
+  ]
+}

gm4_furniture/assets/gm4_furniture/items/cloth_set/horizontal_flag_1.json

@@ -0,0 +1,12 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "gm4_furniture:block/furniture/cloth_set/horizontal_flag_1",
+    "tints": [
+      {
+        "type": "minecraft:dye",
+        "default": -393217
+      }
+    ]
+  }
+}

gm4_furniture/assets/gm4_furniture/items/cloth_set/paper_lantern_1.json

@@ -0,0 +1,12 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "gm4_furniture:block/furniture/cloth_set/paper_lantern_1",
+    "tints": [
+      {
+        "type": "minecraft:dye",
+        "default": -393217
+      }
+    ]
+  }
+}

gm4_furniture/assets/gm4_furniture/items/furniture_station.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "gm4_furniture:block/furniture/furniture_station"
+  }
+}

gm4_furniture/assets/gm4_furniture/items/metal_set/gold/3_candelabra_1.json

@@ -0,0 +1,12 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "gm4_furniture:block/furniture/metal_set/gold/3_candelabra_1",
+    "tints": [
+      {
+        "type": "minecraft:dye",
+        "default": -393217
+      }
+    ]
+  }
+}