Merge branch 'teaconmc:dev' into dev

LocusAzzurro · Jan 1, 2025 · e41bd78 · e41bd78
2 parents ce12447 + 668c550
commit e41bd78
Show file tree

Hide file tree

Showing 20 changed files with 160 additions and 40 deletions.
diff --git a/jiachen/data/bsf/recipe/compacted_snowball_set_1.json b/jiachen/data/bsf/recipe/compacted_snowball_set_1.json
@@ -1,7 +1,17 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "pattern": null,
-  "key": null,
+  "group": "compacted_snowball_set",
+  "ingredients": [
+    {
+      "item": "bsf:smooth_snowball"
+    },
+    {
+      "item": "bsf:smooth_snowball"
+    },
+    {
+      "item": "bsf:smooth_snowball"
+    }
+  ],
   "result": {
     "id": "bsf:compacted_snowball_set",
     "count": 0,

diff --git a/jiachen/data/bsf/recipe/compacted_snowball_set_2.json b/jiachen/data/bsf/recipe/compacted_snowball_set_2.json
@@ -1,7 +1,17 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "pattern": null,
-  "key": null,
+  "group": "compacted_snowball_set",
+  "ingredients": [
+    {
+      "item": "bsf:compacted_snowball"
+    },
+    {
+      "item": "bsf:smooth_snowball"
+    },
+    {
+      "item": "bsf:smooth_snowball"
+    }
+  ],
   "result": {
     "id": "bsf:compacted_snowball_set",
     "count": 0,

diff --git a/jiachen/data/bsf/recipe/compacted_snowball_set_3.json b/jiachen/data/bsf/recipe/compacted_snowball_set_3.json
@@ -1,7 +1,17 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "pattern": null,
-  "key": null,
+  "group": "compacted_snowball_set",
+  "ingredients": [
+    {
+      "item": "bsf:compacted_snowball"
+    },
+    {
+      "item": "bsf:compacted_snowball"
+    },
+    {
+      "item": "bsf:smooth_snowball"
+    }
+  ],
   "result": {
     "id": "bsf:compacted_snowball_set",
     "count": 0,

diff --git a/jiachen/data/bsf/recipe/compacted_snowball_set_4.json b/jiachen/data/bsf/recipe/compacted_snowball_set_4.json
@@ -1,7 +1,17 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "pattern": null,
-  "key": null,
+  "group": "compacted_snowball_set",
+  "ingredients": [
+    {
+      "item": "bsf:compacted_snowball"
+    },
+    {
+      "item": "bsf:compacted_snowball"
+    },
+    {
+      "item": "bsf:compacted_snowball"
+    }
+  ],
   "result": {
     "id": "bsf:compacted_snowball_set",
     "count": 0,

diff --git a/jiachen/data/bsf/recipe/explosive_monster_tracking_snowball_2.json b/jiachen/data/bsf/recipe/explosive_monster_tracking_snowball_2.json
@@ -1,7 +1,10 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "pattern": null,
-  "key": null,
+  "ingredients": [
+    {
+      "item": "bsf:explosive_player_tracking_snowball"
+    }
+  ],
   "result": {
     "id": "bsf:explosive_monster_tracking_snowball",
     "count": 0,

diff --git a/jiachen/data/bsf/recipe/explosive_player_tracking_snowball_1.json b/jiachen/data/bsf/recipe/explosive_player_tracking_snowball_1.json
@@ -1,7 +1,10 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "pattern": null,
-  "key": null,
+  "ingredients": [
+    {
+      "item": "bsf:explosive_monster_tracking_snowball"
+    }
+  ],
   "result": {
     "id": "bsf:explosive_player_tracking_snowball",
     "count": 0,

diff --git a/jiachen/data/bsf/recipe/freezing_snowball_cannon.json b/jiachen/data/bsf/recipe/freezing_snowball_cannon.json
@@ -1,7 +1,14 @@
 {
   "type": "minecraft:smithing_transform",
-  "pattern": null,
-  "key": null,
+  "addition": {
+    "item": "bsf:super_frozen_core"
+  },
+  "base": {
+    "item": "bsf:snowball_cannon"
+  },
+  "template": {
+    "item": "bsf:snowball_cannon_upgrade_smithing_template"
+  },
   "result": {
     "id": "bsf:freezing_snowball_cannon",
     "count": 0,

diff --git a/jiachen/data/bsf/recipe/heavy_monster_tracking_snowball_2.json b/jiachen/data/bsf/recipe/heavy_monster_tracking_snowball_2.json
@@ -1,7 +1,10 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "pattern": null,
-  "key": null,
+  "ingredients": [
+    {
+      "item": "bsf:heavy_player_tracking_snowball"
+    }
+  ],
   "result": {
     "id": "bsf:heavy_monster_tracking_snowball",
     "count": 0,

diff --git a/jiachen/data/bsf/recipe/heavy_player_tracking_snowball_1.json b/jiachen/data/bsf/recipe/heavy_player_tracking_snowball_1.json
@@ -1,7 +1,10 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "pattern": null,
-  "key": null,
+  "ingredients": [
+    {
+      "item": "bsf:heavy_monster_tracking_snowball"
+    }
+  ],
   "result": {
     "id": "bsf:heavy_player_tracking_snowball",
     "count": 0,

diff --git a/jiachen/data/bsf/recipe/impulse_snowball.json b/jiachen/data/bsf/recipe/impulse_snowball.json
@@ -1,7 +1,10 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "pattern": null,
-  "key": null,
+  "ingredients": [
+    {
+      "item": "bsf:thrust_snowball"
+    }
+  ],
   "result": {
     "id": "bsf:impulse_snowball",
     "count": 0,

diff --git a/jiachen/data/bsf/recipe/light_monster_tracking_snowball_3.json b/jiachen/data/bsf/recipe/light_monster_tracking_snowball_3.json
@@ -1,7 +1,10 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "pattern": null,
-  "key": null,
+  "ingredients": [
+    {
+      "item": "bsf:light_player_tracking_snowball"
+    }
+  ],
   "result": {
     "id": "bsf:light_monster_tracking_snowball",
     "count": 0,

diff --git a/jiachen/data/bsf/recipe/light_player_tracking_snowball_1.json b/jiachen/data/bsf/recipe/light_player_tracking_snowball_1.json
@@ -1,7 +1,11 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "pattern": null,
-  "key": null,
+  "group": "monster_tracking_snowball",
+  "ingredients": [
+    {
+      "item": "bsf:light_monster_tracking_snowball"
+    }
+  ],
   "result": {
     "id": "bsf:light_player_tracking_snowball",
     "count": 0,

diff --git a/jiachen/data/bsf/recipe/milk_popsicle.json b/jiachen/data/bsf/recipe/milk_popsicle.json
@@ -1,7 +1,23 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "pattern": null,
-  "key": null,
+  "group": "milk_popsicle",
+  "ingredients": [
+    {
+      "item": "bsf:popsicle"
+    },
+    {
+      "item": "bsf:popsicle"
+    },
+    {
+      "item": "bsf:popsicle"
+    },
+    {
+      "item": "bsf:popsicle"
+    },
+    {
+      "item": "minecraft:milk_bucket"
+    }
+  ],
   "result": {
     "id": "bsf:milk_popsicle",
     "count": 4,

diff --git a/jiachen/data/bsf/recipe/monster_gravity_snowball_3.json b/jiachen/data/bsf/recipe/monster_gravity_snowball_3.json
@@ -1,7 +1,10 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "pattern": null,
-  "key": null,
+  "ingredients": [
+    {
+      "item": "bsf:projectile_gravity_snowball"
+    }
+  ],
   "result": {
     "id": "bsf:monster_gravity_snowball",
     "count": 0,

diff --git a/jiachen/data/bsf/recipe/monster_repulsion_snowball_3.json b/jiachen/data/bsf/recipe/monster_repulsion_snowball_3.json
@@ -1,7 +1,10 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "pattern": null,
-  "key": null,
+  "ingredients": [
+    {
+      "item": "bsf:projectile_repulsion_snowball"
+    }
+  ],
   "result": {
     "id": "bsf:monster_repulsion_snowball",
     "count": 0,

diff --git a/jiachen/data/bsf/recipe/netherite_snowball_clamp.json b/jiachen/data/bsf/recipe/netherite_snowball_clamp.json
@@ -1,7 +1,14 @@
 {
   "type": "minecraft:smithing_transform",
-  "pattern": null,
-  "key": null,
+  "addition": {
+    "item": "minecraft:netherite_ingot"
+  },
+  "base": {
+    "item": "bsf:diamond_snowball_clamp"
+  },
+  "template": {
+    "item": "minecraft:netherite_upgrade_smithing_template"
+  },
   "result": {
     "id": "bsf:netherite_snowball_clamp",
     "count": 0,

diff --git a/jiachen/data/bsf/recipe/powerful_snowball_cannon.json b/jiachen/data/bsf/recipe/powerful_snowball_cannon.json
@@ -1,7 +1,14 @@
 {
   "type": "minecraft:smithing_transform",
-  "pattern": null,
-  "key": null,
+  "addition": {
+    "item": "bsf:super_power_core"
+  },
+  "base": {
+    "item": "bsf:snowball_cannon"
+  },
+  "template": {
+    "item": "bsf:snowball_cannon_upgrade_smithing_template"
+  },
   "result": {
     "id": "bsf:powerful_snowball_cannon",
     "count": 0,

diff --git a/jiachen/data/bsf/recipe/projectile_gravity_snowball_1.json b/jiachen/data/bsf/recipe/projectile_gravity_snowball_1.json
@@ -1,7 +1,10 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "pattern": null,
-  "key": null,
+  "ingredients": [
+    {
+      "item": "bsf:monster_gravity_snowball"
+    }
+  ],
   "result": {
     "id": "bsf:projectile_gravity_snowball",
     "count": 0,

diff --git a/jiachen/data/bsf/recipe/projectile_repulsion_snowball_1.json b/jiachen/data/bsf/recipe/projectile_repulsion_snowball_1.json
@@ -1,7 +1,10 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "pattern": null,
-  "key": null,
+  "ingredients": [
+    {
+      "item": "bsf:monster_repulsion_snowball"
+    }
+  ],
   "result": {
     "id": "bsf:projectile_repulsion_snowball",
     "count": 0,

diff --git a/jiachen/data/bsf/recipe/vodka.json b/jiachen/data/bsf/recipe/vodka.json
@@ -1,7 +1,16 @@
 {
   "type": "minecraft:crafting_shapeless",
-  "pattern": null,
-  "key": null,
+  "ingredients": [
+    {
+      "item": "minecraft:potato"
+    },
+    {
+      "item": "minecraft:sugar"
+    },
+    {
+      "item": "minecraft:potion"
+    }
+  ],
   "result": {
     "id": "bsf:vodka",
     "count": 0,