update to 1.21

TheThanathor · Sep 12, 2024 · c964215 · c964215
1 parent 8ba9f79
commit c964215
Show file tree

Hide file tree

Showing 207 changed files with 14,607 additions and 281 deletions.
diff --git a/gm4/modeldata_registry.json b/gm4/modeldata_registry.json
@@ -225,7 +225,11 @@
       "gm4_metallurgy:shamir/infinitas": 100
     },
     "command_block": {
-      "gm4:gui/advancement/root": 1
+      "gm4:gui/advancement/root": 1,
+      "gm4_furniture:item/furniture/set_tool/cloth_set": 2,
+      "gm4_furniture:item/furniture/set_tool/metal_set": 3,
+      "gm4_furniture:item/furniture/set_tool/stone_set": 4,
+      "gm4_furniture:item/furniture/set_tool/wood_set": 5
     },
     "compass": {
       "gm4_metallurgy:shamir/sensus": 101,
@@ -968,6 +972,32 @@
       "gm4_metallurgy:shamir/defuse": 106,
       "gm4_animi_shamir:shamir/animi": 124
     },
+    "leather_horse_armor": {
+      "gm4_furniture:item/furniture/paintbrush": 1,
+      "gm4_furniture:block/furniture/cloth_set/paper_lantern_1": 11,
+      "gm4_furniture:block/furniture/cloth_set/horizontal_flag_1": 16,
+      "gm4_furniture:block/furniture/metal_set/iron/3_candelabra_1": 18,
+      "gm4_furniture:block/furniture/metal_set/gold/3_candelabra_1": 30,
+      "gm4_furniture:block/furniture/metal_set/gold/skull_1": 31,
+      "gm4_furniture:block/furniture/stone_set/statues/frog": 32,
+      "gm4_furniture:block/furniture/stone_set/statues/bee": 33,
+      "gm4_furniture:block/furniture/stone_set/statues/pufferfish": 34,
+      "gm4_furniture:block/furniture/stone_set/statues/axolotl": 35,
+      "gm4_furniture:block/furniture/stone_set/statues/allay": 36,
+      "gm4_furniture:block/furniture/wood_set/plain/1x1_table_1": 37,
+      "gm4_furniture:block/furniture/wood_set/plain/2x2_table_1": 38,
+      "gm4_furniture:block/furniture/wood_set/plain/bench_1": 39,
+      "gm4_furniture:block/furniture/wood_set/plain/chair_1": 52,
+      "gm4_furniture:block/furniture/wood_set/plain/stool_1": 53,
+      "gm4_furniture:block/furniture/wood_set/plain/light_1": 59,
+      "gm4_furniture:block/furniture/wood_set/fancy/1x1_table_1": 60,
+      "gm4_furniture:block/furniture/wood_set/fancy/2x2_table_1": 62,
+      "gm4_furniture:block/furniture/wood_set/fancy/bench_1": 63,
+      "gm4_furniture:block/furniture/wood_set/fancy/chair_1": 64,
+      "gm4_furniture:block/furniture/wood_set/fancy/stool_1": 65,
+      "gm4_furniture:block/furniture/wood_set/fancy/light_1": 66,
+      "gm4_furniture:block/furniture/furniture_station": 67
+    },
     "leather_leggings": {
       "gm4_washing_tanks:guidebook_icon/washing_tanks": 1,
       "gm4_weighted_armour:shamir/helious": 103,
@@ -1254,11 +1284,14 @@
       "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_furniture:block/furniture/cloth_set/paper_lantern_1": 11,
       "gm4_zauber_cauldrons:item/crystal/speed": 12,
       "gm4_zauber_cauldrons:item/crystal/regeneration": 13,
       "gm4_end_fishing:item/enderpuff": 14,
       "gm4_tinkering_compressors:gui/advancement/tinkering_compressors": 15,
+      "gm4_furniture:block/furniture/cloth_set/horizontal_flag_1": 16,
       "gm4_metallurgy:item/lump/bismutite": 17,
+      "gm4_furniture:block/furniture/metal_set/iron/3_candelabra_1": 18,
       "gm4_metallurgy:item/lump/baryte": 19,
       "gm4_metallurgy:item/lump/thorianite": 20,
       "gm4_metallurgy:item/lump/bauxite": 21,
@@ -1270,6 +1303,16 @@
       "gm4_relocators:item/relocator_empty": 27,
       "gm4_ender_hoppers:block/ender_hopper_side": 28,
       "gm4_ender_hoppers:block/ender_hopper_minecart": 29,
+      "gm4_furniture:block/furniture/metal_set/gold/3_candelabra_1": 30,
+      "gm4_furniture:block/furniture/metal_set/gold/skull_1": 31,
+      "gm4_furniture:block/furniture/stone_set/statues/frog": 32,
+      "gm4_furniture:block/furniture/stone_set/statues/bee": 33,
+      "gm4_furniture:block/furniture/stone_set/statues/pufferfish": 34,
+      "gm4_furniture:block/furniture/stone_set/statues/axolotl": 35,
+      "gm4_furniture:block/furniture/stone_set/statues/allay": 36,
+      "gm4_furniture:block/furniture/wood_set/plain/1x1_table_1": 37,
+      "gm4_furniture:block/furniture/wood_set/plain/2x2_table_1": 38,
+      "gm4_furniture:block/furniture/wood_set/plain/bench_1": 39,
       "gm4_tnt_landmines:item/tnt_landmine": 40,
       "gm4_tnt_landmines:item/tnt_landmine_grass": 41,
       "gm4_tnt_landmines:item/tnt_landmine_dirt": 42,
@@ -1282,12 +1325,22 @@
       "gm4_metallurgy:gui/advancement/metallurgy_blast_ore": 49,
       "gm4_metallurgy:gui/advancement/metallurgy_cast": 50,
       "gm4_relocators:gui/advancement/relocators": 51,
+      "gm4_furniture:block/furniture/wood_set/plain/chair_1": 52,
+      "gm4_furniture:block/furniture/wood_set/plain/stool_1": 53,
       "gm4_zauber_cauldrons:item/crystal/instant_damage": 54,
       "gm4_zauber_cauldrons:item/crystal/instant_health": 55,
       "gm4_zauber_cauldrons:item/crystal/jump_boost": 56,
       "gm4_zauber_cauldrons:item/crystal/poison": 57,
       "gm4_zauber_cauldrons:item/crystal/strength": 58,
+      "gm4_furniture:block/furniture/wood_set/plain/light_1": 59,
+      "gm4_furniture:block/furniture/wood_set/fancy/1x1_table_1": 60,
       "gm4_relocators:item/relocator_full": 61,
+      "gm4_furniture:block/furniture/wood_set/fancy/2x2_table_1": 62,
+      "gm4_furniture:block/furniture/wood_set/fancy/bench_1": 63,
+      "gm4_furniture:block/furniture/wood_set/fancy/chair_1": 64,
+      "gm4_furniture:block/furniture/wood_set/fancy/stool_1": 65,
+      "gm4_furniture:block/furniture/wood_set/fancy/light_1": 66,
+      "gm4_furniture:block/furniture/furniture_station": 67,
       "gm4_metallurgy:shamir/infinitas": 100,
       "gm4_metallurgy:shamir/sensus": 101,
       "gm4_weighted_armour:shamir/helious": 103,

diff --git a/gm4_furniture/assets/gm4/font/container_gui.json b/gm4_furniture/assets/gm4/font/container_gui.json
@@ -0,0 +1,14 @@
+{
+    "providers": [
+        {
+            "type": "space",
+            "advances": {
+                "\u8100": -1,
+                "\u8020": -224,
+                "\u8021": -128,
+                "\u8022": 39
+
+            }
+        }
+    ]
+}
diff --git a/gm4_furniture/assets/gm4/lang/en_us.json b/gm4_furniture/assets/gm4/lang/en_us.json
@@ -0,0 +1,5 @@
+{
+   "OLDgui.gm4.furniture_station": "\u9021\u9020\u9100\u9022\u9023",
+   "OLDgui.gm4.furniture_station.offset": "\u9024",
+   "gui.gm4.furniture_station.offset": "\u8022"
+}
diff --git a/gm4_furniture/assets/gm4_furniture/font/container_gui.json b/gm4_furniture/assets/gm4_furniture/font/container_gui.json
@@ -0,0 +1,14 @@
+{
+    "providers": [
+        {
+            "type": "space",
+            "advances": {
+                "\u8100": -1,
+                "\u8020": -224,
+                "\u8021": -128,
+                "\u8022": 39
+
+            }
+        }
+    ]
+}