From 15618622ab1678e47830dca5ffe05f655c60fdbe Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Tue, 27 Aug 2024 23:41:50 +0700 Subject: [PATCH] Update a bunch of models to use neoforge constructs --- .../models/block/android_charger_base.json | 2 +- .../models/block/android_charger_middle.json | 2 +- .../models/block/android_charger_top.json | 4 ++-- .../models/block/android_station_working.json | 10 +++++----- .../models/block/battery/battery0.json | 2 +- .../models/block/battery/battery1.json | 2 +- .../models/block/battery/battery10.json | 2 +- .../models/block/battery/battery11.json | 2 +- .../models/block/battery/battery2.json | 2 +- .../models/block/battery/battery3.json | 2 +- .../models/block/battery/battery4.json | 2 +- .../models/block/battery/battery5.json | 2 +- .../models/block/battery/battery6.json | 2 +- .../models/block/battery/battery7.json | 2 +- .../models/block/battery/battery8.json | 2 +- .../models/block/battery/battery9.json | 2 +- .../models/block/essence_storage_filled.json | 2 +- .../models/block/holo_sign.json | 12 +++++------ .../models/block/matter_decomposer_error.json | 4 ++-- .../models/block/matter_decomposer_idle.json | 4 ++-- .../block/matter_decomposer_working.json | 4 ++-- .../models/block/matter_reconstructor.json | 4 ++-- .../models/block/matter_replicator.json | 4 ++-- .../models/block/painter.json | 2 +- .../block/powered_blast_furnace_error.json | 20 +++++++++---------- .../block/powered_blast_furnace_working.json | 20 +++++++++---------- .../models/block/powered_furnace_working.json | 2 +- .../models/item/android_charger.json | 8 ++++---- .../models/item/energy_sword.json | 2 +- .../models/item/energy_sword_powered.json | 4 ++-- .../models/item/explosive_hammer.json | 2 +- .../item/explosive_hammer_charging.json | 2 +- .../models/item/explosive_hammer_primed.json | 2 +- .../models/item/fluid_capsule.json | 2 +- .../models/item/plasma_rifle.json | 2 +- 35 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/android_charger_base.json b/src/main/resources/assets/overdrive_that_matters/models/block/android_charger_base.json index e38c6c3ac..b3046b86f 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/android_charger_base.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/android_charger_base.json @@ -94,7 +94,7 @@ "south": {"uv": [8, 9, 12, 10.25], "texture": "#0"}, "west": {"uv": [8, 9, 12, 10.25], "texture": "#0"} }, - "forge_data": { + "neoforge_data": { "block_light": 15 } }, diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/android_charger_middle.json b/src/main/resources/assets/overdrive_that_matters/models/block/android_charger_middle.json index 4faec05de..dbd749c1f 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/android_charger_middle.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/android_charger_middle.json @@ -17,7 +17,7 @@ "south": {"uv": [8, 9, 12, 13], "texture": "#0"}, "west": {"uv": [8, 9, 12, 13], "texture": "#0"} }, - "forge_data": { + "neoforge_data": { "block_light": 15 } }, diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/android_charger_top.json b/src/main/resources/assets/overdrive_that_matters/models/block/android_charger_top.json index c93c5609f..d12902524 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/android_charger_top.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/android_charger_top.json @@ -14,7 +14,7 @@ "faces": { "north": {"uv": [11, 2.25, 12.5, 4.75], "rotation": 90, "texture": "#0"} }, - "forge_data": { + "neoforge_data": { "block_light": 15 } }, @@ -72,7 +72,7 @@ "south": {"uv": [8, 11.75, 12, 13], "texture": "#0"}, "west": {"uv": [8, 11.75, 12, 13], "texture": "#0"} }, - "forge_data": { + "neoforge_data": { "block_light": 15 } }, diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json index a261046ba..6ddc62d23 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json @@ -34,7 +34,7 @@ "up": {"uv": [8, 0, 16, 4], "texture": "#1"}, "down": {"uv": [8, 4.5, 16, 8.5], "texture": "#1"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "base", @@ -72,7 +72,7 @@ "up": {"uv": [9, 5, 15, 8], "texture": "#1"}, "down": {"uv": [9, 5, 15, 8], "texture": "#1"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "frame", @@ -126,7 +126,7 @@ "up": {"uv": [0, 9.5, 8, 13.5], "texture": "#1"}, "down": {"uv": [0, 9.5, 8, 13.5], "texture": "#1"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "hologram", @@ -136,7 +136,7 @@ "up": {"uv": [11, 11, 13, 12], "texture": "#1"}, "down": {"uv": [11, 11, 13, 12], "texture": "#1"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "holotext", @@ -147,7 +147,7 @@ "north": {"uv": [2.5, 7.25, 5.5, 8.25], "texture": "#1"}, "south": {"uv": [5.5, 7.25, 2.5, 8.25], "texture": "#1"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "holotext", diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery0.json b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery0.json index c605a9108..169c5ed3a 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery0.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery0.json @@ -23,7 +23,7 @@ "from": [11, 2, 1], "to": [13, 7, 1], "faces": { - "north": {"uv": [1.5, 3, 2.5, 8], "texture": "#1", "forge_data": {"block_light": 15}}, + "north": {"uv": [1.5, 3, 2.5, 8], "texture": "#1", "neoforge_data": {"block_light": 15}}, "east": {"uv": [0, 0, 0, 5], "texture": "#missing"}, "south": {"uv": [0, 0, 1, 5], "texture": "#missing"}, "west": {"uv": [0, 0, 0, 5], "texture": "#missing"}, diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery1.json b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery1.json index cf73f222b..66bc9cf68 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery1.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery1.json @@ -92,7 +92,7 @@ ] }, "north": { - "forge_data": { + "neoforge_data": { "block_light": 15 }, "texture": "#1", diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery10.json b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery10.json index 61036c0e1..ad6e8ce80 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery10.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery10.json @@ -101,7 +101,7 @@ ] }, "south": { - "forge_data": { + "neoforge_data": { "block_light": 15 }, "texture": "#1", diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery11.json b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery11.json index 8ef46e816..d0918cce6 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery11.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery11.json @@ -101,7 +101,7 @@ ] }, "south": { - "forge_data": { + "neoforge_data": { "block_light": 15 }, "texture": "#1", diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery2.json b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery2.json index bd0876bd3..94eb0833c 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery2.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery2.json @@ -92,7 +92,7 @@ ] }, "north": { - "forge_data": { + "neoforge_data": { "block_light": 15 }, "texture": "#1", diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery3.json b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery3.json index e194b47fa..a6bd37855 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery3.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery3.json @@ -92,7 +92,7 @@ ] }, "north": { - "forge_data": { + "neoforge_data": { "block_light": 15 }, "texture": "#1", diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery4.json b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery4.json index 6e2a355e3..daae35f71 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery4.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery4.json @@ -92,7 +92,7 @@ ] }, "north": { - "forge_data": { + "neoforge_data": { "block_light": 15 }, "texture": "#1", diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery5.json b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery5.json index 55c80c12c..72b36e8dd 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery5.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery5.json @@ -92,7 +92,7 @@ ] }, "north": { - "forge_data": { + "neoforge_data": { "block_light": 15 }, "texture": "#1", diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery6.json b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery6.json index dbadc1c35..21711c67a 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery6.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery6.json @@ -26,7 +26,7 @@ "faces": { "north": {"uv": [0, 0, 1, 5], "texture": "#missing"}, "east": {"uv": [0, 0, 0, 5], "texture": "#missing"}, - "south": {"uv": [2, 3, 3, 8], "texture": "#1", "forge_data": {"block_light": 15}}, + "south": {"uv": [2, 3, 3, 8], "texture": "#1", "neoforge_data": {"block_light": 15}}, "west": {"uv": [0, 0, 0, 5], "texture": "#missing"}, "up": {"uv": [0, 0, 1, 0], "texture": "#missing"}, "down": {"uv": [0, 0, 1, 0], "texture": "#missing"} diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery7.json b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery7.json index f39d18793..2b2fd0ad7 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery7.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery7.json @@ -101,7 +101,7 @@ ] }, "south": { - "forge_data": { + "neoforge_data": { "block_light": 15 }, "texture": "#1", diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery8.json b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery8.json index 44587c83e..0dbff6351 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery8.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery8.json @@ -101,7 +101,7 @@ ] }, "south": { - "forge_data": { + "neoforge_data": { "block_light": 15 }, "texture": "#1", diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery9.json b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery9.json index 6749cd43a..e59a3c631 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery9.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/battery/battery9.json @@ -101,7 +101,7 @@ ] }, "south": { - "forge_data": { + "neoforge_data": { "block_light": 15 }, "texture": "#1", diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage_filled.json b/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage_filled.json index f9420d560..5cdc8d452 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage_filled.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage_filled.json @@ -99,7 +99,7 @@ "north": {"uv": [7.5, 3, 14.5, 11], "texture": "#1"}, "west": {"uv": [1.5, 3, 8.5, 11], "texture": "#1"} }, - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 } diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json b/src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json index 87e56f308..5acde94e0 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json @@ -77,7 +77,7 @@ "from": [14, 14, 9.99], "to": [15, 15, 9.99], "faces": { - "north": {"uv": [8.5, 8.5, 9, 9], "texture": "#0", "forge_data": {"block_light": 15}, "tintindex": 0} + "north": {"uv": [8.5, 8.5, 9, 9], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0} } }, { @@ -85,7 +85,7 @@ "from": [1, 14, 9.99], "to": [2, 15, 9.99], "faces": { - "north": {"uv": [15, 8.5, 15.5, 9], "texture": "#0", "forge_data": {"block_light": 15}, "tintindex": 0} + "north": {"uv": [15, 8.5, 15.5, 9], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0} } }, { @@ -93,7 +93,7 @@ "from": [1, 1, 9.99], "to": [2, 2, 9.99], "faces": { - "north": {"uv": [15, 15, 15.5, 15.5], "texture": "#0", "forge_data": {"block_light": 15}, "tintindex": 0} + "north": {"uv": [15, 15, 15.5, 15.5], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0} } }, { @@ -101,7 +101,7 @@ "from": [14, 1, 9.99], "to": [15, 2, 9.99], "faces": { - "north": {"uv": [8.5, 15, 9, 15.5], "texture": "#0", "forge_data": {"block_light": 15}, "tintindex": 0} + "north": {"uv": [8.5, 15, 9, 15.5], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0} } }, { @@ -109,7 +109,7 @@ "from": [2.01, 6, 9], "to": [2.01, 10, 10], "faces": { - "east": {"uv": [1.5, 13, 2, 15], "texture": "#0", "forge_data": {"block_light": 15}, "tintindex": 0} + "east": {"uv": [1.5, 13, 2, 15], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0} } }, { @@ -117,7 +117,7 @@ "from": [13.99, 6, 9], "to": [13.99, 10, 10], "faces": { - "west": {"uv": [1.5, 13, 2, 15], "texture": "#0", "forge_data": {"block_light": 15}, "tintindex": 0} + "west": {"uv": [1.5, 13, 2, 15], "texture": "#0", "neoforge_data": {"block_light": 15}, "tintindex": 0} } } ], diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_error.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_error.json index 6ba86b60e..5c1bdea57 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_error.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_error.json @@ -42,7 +42,7 @@ "up": {"uv": [0, 0, 0, 0], "texture": "#texture"}, "down": {"uv": [0, 0, 0, 0], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "from": [1, 3, 9], @@ -80,7 +80,7 @@ "up": {"uv": [0, 0, 0, 0], "texture": "#texture"}, "down": {"uv": [0, 0, 0, 0], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "from": [1, 12, 1], diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_idle.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_idle.json index 64954b86b..b6c9107c5 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_idle.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_idle.json @@ -51,7 +51,7 @@ "south": {"uv": [0, 5, 1.5, 6.75], "texture": "#texture"}, "west": {"uv": [0, 5, 1.5, 6.75], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "from": [1, 3, 1], @@ -83,7 +83,7 @@ "south": {"uv": [0, 5, 1.5, 6.75], "texture": "#texture"}, "west": {"uv": [0, 5, 1.5, 6.75], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "from": [1, 12, 9], diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_working.json index 9d6fe8781..54ff6bf79 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_working.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_working.json @@ -42,7 +42,7 @@ "up": {"uv": [0, 0, 0, 0], "texture": "#texture"}, "down": {"uv": [0, 0, 0, 0], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "from": [1, 3, 9], @@ -80,7 +80,7 @@ "up": {"uv": [0, 0, 0, 0], "texture": "#texture"}, "down": {"uv": [0, 0, 0, 0], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "from": [1, 12, 1], diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_reconstructor.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_reconstructor.json index 94d03904b..c25e32b41 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_reconstructor.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_reconstructor.json @@ -131,7 +131,7 @@ "south": {"uv": [8.25, 2, 11, 4], "texture": "#0"}, "down": {"uv": [8.25, 2, 11, 4], "texture": "#0"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "manipulator", @@ -169,7 +169,7 @@ "west": {"uv": [9.25, 4.5, 9.5, 5], "texture": "#0"}, "down": {"uv": [9.5, 4.5, 9.75, 5], "texture": "#0"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "manipulator", diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json index c0608c9c9..82ebae20d 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json @@ -67,7 +67,7 @@ "south": {"uv": [11, 0, 15.5, 2], "texture": "#texture"}, "up": {"uv": [11, 0, 15.5, 2], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "canister", @@ -111,7 +111,7 @@ "up": {"uv": [11, 0, 15.5, 2], "texture": "#texture"}, "down": {"uv": [0, 0, 6, 1], "texture": "#missing"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "canister", diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/painter.json b/src/main/resources/assets/overdrive_that_matters/models/block/painter.json index eda781060..336b32f0b 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/painter.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/painter.json @@ -107,7 +107,7 @@ "faces": { "north": {"uv": [4, 0, 5, 2], "texture": "#0"} }, - "forge_data": { + "neoforge_data": { "block_light": 15 } }, diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/powered_blast_furnace_error.json b/src/main/resources/assets/overdrive_that_matters/models/block/powered_blast_furnace_error.json index f0e4d8e45..062c87241 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/powered_blast_furnace_error.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/powered_blast_furnace_error.json @@ -17,7 +17,7 @@ "up": {"uv": [0, 0, 7, 1], "texture": "#texture"}, "down": {"uv": [0, 0, 7, 1], "rotation": 180, "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "heatsink", @@ -30,7 +30,7 @@ "up": {"uv": [0, 0, 7, 1], "texture": "#texture"}, "down": {"uv": [0, 0, 7, 1], "rotation": 180, "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "heatsink", @@ -43,7 +43,7 @@ "up": {"uv": [0, 0, 7, 1], "texture": "#texture"}, "down": {"uv": [0, 0, 7, 1], "rotation": 180, "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "base", @@ -163,7 +163,7 @@ "east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}, "west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "light", @@ -173,7 +173,7 @@ "east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}, "west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "light", @@ -183,7 +183,7 @@ "east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}, "west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "light", @@ -193,7 +193,7 @@ "east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}, "west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "light", @@ -203,7 +203,7 @@ "east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}, "west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "light", @@ -213,7 +213,7 @@ "east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}, "west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "light", @@ -222,7 +222,7 @@ "faces": { "up": {"uv": [12.5, 1.5, 15.5, 1.75], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } } ], "display": { diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/powered_blast_furnace_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/powered_blast_furnace_working.json index 800bcd44f..ab17863d8 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/powered_blast_furnace_working.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/powered_blast_furnace_working.json @@ -18,7 +18,7 @@ "up": {"uv": [0, 0, 7, 1], "texture": "#texture"}, "down": {"uv": [0, 0, 7, 1], "rotation": 180, "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "heatsink", @@ -31,7 +31,7 @@ "up": {"uv": [0, 0, 7, 1], "texture": "#texture"}, "down": {"uv": [0, 0, 7, 1], "rotation": 180, "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "heatsink", @@ -44,7 +44,7 @@ "up": {"uv": [0, 0, 7, 1], "texture": "#texture"}, "down": {"uv": [0, 0, 7, 1], "rotation": 180, "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "base", @@ -164,7 +164,7 @@ "east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}, "west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "light", @@ -174,7 +174,7 @@ "east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}, "west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "light", @@ -184,7 +184,7 @@ "east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}, "west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "light", @@ -194,7 +194,7 @@ "east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}, "west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "light", @@ -204,7 +204,7 @@ "east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}, "west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "light", @@ -214,7 +214,7 @@ "east": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"}, "west": {"uv": [12.5, 1, 14, 1.25], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "light", @@ -223,7 +223,7 @@ "faces": { "up": {"uv": [12.5, 1.5, 15.5, 1.75], "texture": "#texture"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } } ], "display": { diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/powered_furnace_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/powered_furnace_working.json index a019fc0b4..14e25c93a 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/powered_furnace_working.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/powered_furnace_working.json @@ -317,7 +317,7 @@ "faces": { "north": {"uv": [4.25, 10, 7.75, 13], "texture": "#0"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } } ], "display": { diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/android_charger.json b/src/main/resources/assets/overdrive_that_matters/models/item/android_charger.json index fa38f4ae2..7f0731ddc 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/item/android_charger.json +++ b/src/main/resources/assets/overdrive_that_matters/models/item/android_charger.json @@ -94,7 +94,7 @@ "south": {"uv": [8, 9, 12, 10.25], "texture": "#0"}, "west": {"uv": [8, 9, 12, 10.25], "texture": "#0"} }, - "forge_data": { + "neoforge_data": { "block_light": 15 } }, @@ -151,7 +151,7 @@ "south": {"uv": [8, 9, 12, 13], "texture": "#0"}, "west": {"uv": [8, 9, 12, 13], "texture": "#0"} }, - "forge_data": { + "neoforge_data": { "block_light": 15 } }, @@ -260,7 +260,7 @@ "faces": { "north": {"uv": [11, 2.25, 12.5, 4.75], "rotation": 90, "texture": "#0"} }, - "forge_data": { + "neoforge_data": { "block_light": 15 } }, @@ -318,7 +318,7 @@ "south": {"uv": [8, 11.75, 12, 13], "texture": "#0"}, "west": {"uv": [8, 11.75, 12, 13], "texture": "#0"} }, - "forge_data": { + "neoforge_data": { "block_light": 15 } }, diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json index 67cdb563b..acef5244d 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json +++ b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_powered.json b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_powered.json index 54f7f965a..e757d492c 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_powered.json +++ b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_powered.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { @@ -267,7 +267,7 @@ "up": {"uv": [3.5, 0, 6, 1], "rotation": 90, "texture": "#1"}, "down": {"uv": [0, 0, 1, 2.5], "texture": "#missing"} }, - "forge_data": { "block_light": 15, "sky_light": 15 } + "neoforge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "capacitor", diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/explosive_hammer.json b/src/main/resources/assets/overdrive_that_matters/models/item/explosive_hammer.json index 87f5ba7c0..698dd0ce0 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/item/explosive_hammer.json +++ b/src/main/resources/assets/overdrive_that_matters/models/item/explosive_hammer.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/explosive_hammer_charging.json b/src/main/resources/assets/overdrive_that_matters/models/item/explosive_hammer_charging.json index f1ab82056..0948d3dcf 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/item/explosive_hammer_charging.json +++ b/src/main/resources/assets/overdrive_that_matters/models/item/explosive_hammer_charging.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/explosive_hammer_primed.json b/src/main/resources/assets/overdrive_that_matters/models/item/explosive_hammer_primed.json index 426e784cd..c09ce05a8 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/item/explosive_hammer_primed.json +++ b/src/main/resources/assets/overdrive_that_matters/models/item/explosive_hammer_primed.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/fluid_capsule.json b/src/main/resources/assets/overdrive_that_matters/models/item/fluid_capsule.json index 312408e50..3f2ad9ff9 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/item/fluid_capsule.json +++ b/src/main/resources/assets/overdrive_that_matters/models/item/fluid_capsule.json @@ -1,6 +1,6 @@ { "parent": "forge:item/default", - "loader": "forge:fluid_container", + "loader": "neoforge:fluid_container", "fluid": "minecraft:empty", "textures": { "base": "overdrive_that_matters:item/fluid_capsule", diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/plasma_rifle.json b/src/main/resources/assets/overdrive_that_matters/models/item/plasma_rifle.json index bd0def089..16c161948 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/item/plasma_rifle.json +++ b/src/main/resources/assets/overdrive_that_matters/models/item/plasma_rifle.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "minecraft:item/handheld",