Assorted 1.21 porting in game behaviors

LoveTropics · Jul 14, 2024 · 5f4df4a · 5f4df4a
1 parent 3dd41b3
commit 5f4df4a
Show file tree

Hide file tree

Showing 69 changed files with 517 additions and 604 deletions.
diff --git a/data/lt/behaviors/biodiversity_blitz/crops/beetroot.json b/data/lt/behaviors/biodiversity_blitz/crops/beetroot.json
@@ -5,14 +5,11 @@
     "places": "beetroot",
     "item": {
       "id": "minecraft:beetroot_seeds",
-      "Count": 1,
-      "tag": {
-        "display": {
-          "Lore": [
-            "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.beetroot.tooltip\",\"color\": \"aqua\"}",
-            "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.provides_currency\",\"color\": \"purple\",\"italic\": true}"
-          ]
-        }
+      "components": {
+        "lore": [
+          "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.beetroot.tooltip\",\"color\": \"aqua\"}",
+          "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.provides_currency\",\"color\": \"purple\",\"italic\": true}"
+        ]
       }
     }
   },

diff --git a/data/lt/behaviors/biodiversity_blitz/crops/carrot.json b/data/lt/behaviors/biodiversity_blitz/crops/carrot.json
@@ -5,18 +5,15 @@
     "places": "carrot",
     "item": {
       "id": "ltminigames:carrot_seeds",
-      "Count": 1,
-      "tag": {
-        "display": {
-          "Lore": [
-            "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.nutrition\",\"color\": \"aqua\"}",
-            "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.provides_currency\",\"color\": \"purple\",\"italic\": true}"
-          ],
-          "ShiftLore": [
-            "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.carrot.tooltip.extra\",\"color\": \"gold\",\"italic\": true}",
-            "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.tradeable_points\",\"color\": \"gold\",\"italic\": true}"
-          ]
-        }
+      "components": {
+        "lore": [
+          "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.nutrition\",\"color\": \"aqua\"}",
+          "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.provides_currency\",\"color\": \"purple\",\"italic\": true}"
+        ],
+        "ltminigames:shift_lore": [
+          "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.carrot.tooltip.extra\",\"color\": \"gold\",\"italic\": true}",
+          "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.tradeable_points\",\"color\": \"gold\",\"italic\": true}"
+        ]
       }
     }
   },

diff --git a/data/lt/behaviors/biodiversity_blitz/crops/potato.json b/data/lt/behaviors/biodiversity_blitz/crops/potato.json
@@ -5,18 +5,15 @@
     "places": "potato",
     "item": {
       "id": "ltminigames:potato_seeds",
-      "Count": 1,
-      "tag": {
-        "display": {
-          "Lore": [
-            "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.nutrition\",\"color\": \"aqua\"}",
-            "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.provides_currency\",\"color\": \"purple\",\"italic\": true}"
-          ],
-          "ShiftLore": [
-            "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.potato.tooltip.extra1\",\"color\": \"gold\",\"italic\": true}",
-            "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.potato.tooltip.extra1\",\"color\": \"gold\",\"italic\": true}"
-          ]
-        }
+      "components": {
+        "lore": [
+          "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.nutrition\",\"color\": \"aqua\"}",
+          "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.provides_currency\",\"color\": \"purple\",\"italic\": true}"
+        ],
+        "ltminigames:shift_lore": [
+          "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.potato.tooltip.extra1\",\"color\": \"gold\",\"italic\": true}",
+          "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.potato.tooltip.extra1\",\"color\": \"gold\",\"italic\": true}"
+        ]
       }
     }
   },

diff --git a/data/lt/behaviors/biodiversity_blitz/crops/wheat.json b/data/lt/behaviors/biodiversity_blitz/crops/wheat.json
@@ -5,18 +5,15 @@
     "places": "wheat",
     "item": {
       "id": "minecraft:wheat_seeds",
-      "Count": 1,
-      "tag": {
-        "display": {
-          "Lore": [
-            "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.staple\",\"color\": \"aqua\"}",
-            "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.provides_currency\",\"color\": \"purple\",\"italic\": true}"
-          ],
-          "ShiftLore": [
-            "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.wheat.tooltip.extra1\",\"color\": \"gold\",\"italic\": true}",
-            "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.wheat.tooltip.extra2\",\"color\": \"gold\",\"italic\": true}"
-          ]
-        }
+      "components": {
+        "lore": [
+          "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.staple\",\"color\": \"aqua\"}",
+          "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.provides_currency\",\"color\": \"purple\",\"italic\": true}"
+        ],
+        "ltminigames:shift_lore": [
+          "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.wheat.tooltip.extra1\",\"color\": \"gold\",\"italic\": true}",
+          "{\"translate\": \"ltminigames.minigame.biodiversity_blitz.plant.wheat.tooltip.extra2\",\"color\": \"gold\",\"italic\": true}"
+        ]
       }
     }
   },

diff --git a/data/lt/behaviors/biodiversity_blitz/merchant.json b/data/lt/behaviors/biodiversity_blitz/merchant.json
@@ -6,60 +6,60 @@
     "name": {"translate": "ltminigames.minigame.biodiversity_blitz.shop"},
     "offers": [
       {
-        "input": {"id": "minecraft:wheat", "Count": 4},
-        "output": {"id": "ltminigames:osa_point", "Count": 3}
+        "input": {"id": "minecraft:wheat", "count": 4},
+        "output": {"id": "ltminigames:osa_point", "count": 3}
       },
       {
-        "input": {"id": "minecraft:carrot", "Count": 6},
-        "output": {"id": "ltminigames:osa_point", "Count": 3}
+        "input": {"id": "minecraft:carrot", "count": 6},
+        "output": {"id": "ltminigames:osa_point", "count": 3}
       },
       {
-        "input": {"id": "minecraft:potato", "Count": 6},
-        "output": {"id": "ltminigames:osa_point", "Count": 3}
+        "input": {"id": "minecraft:potato", "count": 6},
+        "output": {"id": "ltminigames:osa_point", "count": 3}
       },
       {
-        "input": {"id": "minecraft:sweet_berries", "Count": 2},
-        "output": {"id": "ltminigames:osa_point", "Count": 3}
+        "input": {"id": "minecraft:sweet_berries", "count": 2},
+        "output": {"id": "ltminigames:osa_point", "count": 3}
       },
       {
-        "input": {"id": "tropicraft:pianguas", "Count": 1},
-        "output": {"id": "ltminigames:osa_point", "Count": 4}
+        "input": {"id": "tropicraft:pianguas", "count": 1},
+        "output": {"id": "ltminigames:osa_point", "count": 4}
       },
       {
-        "input": {"id": "minecraft:beetroot", "Count": 4},
-        "output": {"id": "ltminigames:osa_point", "Count": 6}
+        "input": {"id": "minecraft:beetroot", "count": 4},
+        "output": {"id": "ltminigames:osa_point", "count": 6}
       },
       {
-        "input": {"id": "minecraft:wheat", "Count": 2},
-        "output": {"id": "minecraft:bread", "Count": 1}
+        "input": {"id": "minecraft:wheat", "count": 2},
+        "output": {"id": "minecraft:bread", "count": 1}
       },
       {
-        "input": {"id": "minecraft:potato", "Count": 2},
-        "output": {"id": "minecraft:baked_potato", "Count": 1}
+        "input": {"id": "minecraft:potato", "count": 2},
+        "output": {"id": "minecraft:baked_potato", "count": 1}
       },
       {
-        "input": {"id": "ltminigames:osa_point", "Count": 16},
+        "input": {"id": "ltminigames:osa_point", "count": 16},
         "output": "minecraft:iron_sword"
       },
       {
-        "input": {"id": "ltminigames:osa_point", "Count": 24},
+        "input": {"id": "ltminigames:osa_point", "count": 24},
         "output": "minecraft:bow"
       },
       {
-        "input": {"id": "ltminigames:osa_point", "Count": 6},
-        "output": {"id": "minecraft:arrow", "Count": 4}
+        "input": {"id": "ltminigames:osa_point", "count": 6},
+        "output": {"id": "minecraft:arrow", "count": 4}
       },
       {
-        "input": {"id": "ltminigames:osa_point", "Count": 10},
-        "output": {"id": "ltminigames:acid_repellent_umbrella", "Count": 1}
+        "input": {"id": "ltminigames:osa_point", "count": 10},
+        "output": {"id": "ltminigames:acid_repellent_umbrella", "count": 1}
       },
 
       {
-        "input": {"id": "ltminigames:osa_point", "Count": 48},
+        "input": {"id": "ltminigames:osa_point", "count": 48},
         "output": "minecraft:anvil"
       },
       {
-        "input": {"id": "ltminigames:osa_point", "Count": 4},
+        "input": {"id": "ltminigames:osa_point", "count": 4},
         "output": "minecraft:paper"
       }
     ]

diff --git a/data/lt/behaviors/biodiversity_blitz/mob_merchant.json b/data/lt/behaviors/biodiversity_blitz/mob_merchant.json
@@ -10,17 +10,15 @@
       {
         "input": {
           "id": "ltminigames:osa_point",
-          "Count": 4
+          "count": 4
         },
         "output": {
           "id": "minecraft:rotten_flesh",
-          "Count": 1,
-          "tag": {
-            "display": {
-              "Lore": [
-                "{\"text\": \"Send a husk to the other side!\",\"color\":\"red\"}"
-              ]
-            },
+          "count": 1,
+          "components": {
+            "lore": [
+              "{\"text\": \"Send a husk to the other side!\",\"color\":\"red\"}"
+            ],
             "ltminigames:bb_mobs_to_send_to_enemies": {
               "husk": 1
             }
@@ -30,17 +28,15 @@
       {
         "input": {
           "id": "ltminigames:osa_point",
-          "Count": 8
+          "count": 8
         },
         "output": {
           "id": "minecraft:iron_nugget",
-          "Count": 1,
-          "tag": {
-            "display": {
-              "Lore": [
-                "{\"text\": \"Send a pillager to the other side!\",\"color\":\"red\"}"
-              ]
-            },
+          "count": 1,
+          "components": {
+            "lore": [
+              "{\"text\": \"Send a pillager to the other side!\",\"color\":\"red\"}"
+            ],
             "ltminigames:bb_mobs_to_send_to_enemies": {
               "pillager": 1
             }
@@ -50,17 +46,15 @@
 	  {
         "input": {
           "id": "ltminigames:osa_point",
-          "Count": 14
+          "count": 14
         },
         "output": {
           "id": "minecraft:gold_nugget",
-          "Count": 1,
+          "count": 1,
           "tag": {
-            "display": {
-              "Lore": [
-                "{\"text\": \"Send a zombified piglin to the other side!\",\"color\":\"red\"}"
-              ]
-            },
+            "components": [
+              "{\"text\": \"Send a zombified piglin to the other side!\",\"color\":\"red\"}"
+            ],
             "ltminigames:bb_mobs_to_send_to_enemies": {
               "pigman": 1
             }
@@ -70,17 +64,15 @@
 	  {
         "input": {
           "id": "ltminigames:osa_point",
-          "Count": 20
+          "count": 20
         },
         "output": {
           "id": "minecraft:iron_axe",
-          "Count": 1,
-          "tag": {
-            "display": {
-              "Lore": [
-                "{\"text\": \"Send a vindicator to the other side!\",\"color\":\"red\"}"
-              ]
-            },
+          "count": 1,
+          "components": {
+            "lore": [
+              "{\"text\": \"Send a vindicator to the other side!\",\"color\":\"red\"}"
+            ],
             "ltminigames:bb_mobs_to_send_to_enemies": {
               "vindicator": 1
             }
@@ -90,17 +82,15 @@
 	  {
         "input": {
           "id": "ltminigames:osa_point",
-          "Count": 28
+          "count": 28
         },
         "output": {
           "id": "minecraft:carrot_on_a_stick",
-          "Count": 1,
-          "tag": {
-            "display": {
-              "Lore": [
-                "{\"text\": \"Send a zoglin to the other side!\",\"color\":\"red\"}"
-              ]
-            },
+          "count": 1,
+          "components": {
+            "lore": [
+              "{\"text\": \"Send a zoglin to the other side!\",\"color\":\"red\"}"
+            ],
             "ltminigames:bb_mobs_to_send_to_enemies": {
               "zoglin": 1
             }
@@ -110,17 +100,15 @@
       {
         "input": {
           "id": "ltminigames:osa_point",
-          "Count": 32
+          "count": 32
         },
         "output": {
           "id": "minecraft:gunpowder",
-          "Count": 1,
-          "tag": {
-            "display": {
-              "Lore": [
-                "{\"text\": \"Send a creeper to the other side!\",\"color\":\"red\"}"
-              ]
-            },
+          "count": 1,
+          "components": {
+            "lore": [
+              "{\"text\": \"Send a creeper to the other side!\",\"color\":\"red\"}"
+            ],
             "ltminigames:bb_mobs_to_send_to_enemies": {
               "creeper": 1
             }
@@ -129,4 +117,4 @@
       }
     ]
   }
-]
+]