diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index 6bbc1b832..b0d0ff3a8 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,4 +1,4 @@ -// 1.21.1 2025-05-21T23:41:38.5170675 Item Models: superbwarfare +// 1.21.1 2025-05-21T23:42:55.2463928 Item Models: superbwarfare 6c48f5010e7e2b8cd4d3ff85c8de45cf56f53268 assets/superbwarfare/models/item/aa_12.json fb3a995587b2c253571c3160ff02c2ad8c73ecf8 assets/superbwarfare/models/item/aa_12_base.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json @@ -104,7 +104,10 @@ ce9e4fd8ea92cfdbdda158776c1b6e1b482a3f2a assets/superbwarfare/models/item/lead_i f66c351b4843ad4d4e086ccfb7d4d0221227d196 assets/superbwarfare/models/item/legendary_material_pack.json ec76dc1a79f4c0e502fee53be8aa8e04420845fc assets/superbwarfare/models/item/light_armament_module.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m2hb_blueprint.json +1a8874ca579b4fe8aeb3f54c7973df8770f84c80 assets/superbwarfare/models/item/marlin.json +14b7846679a6b84e3a02811d08476e129edc938c assets/superbwarfare/models/item/marlin_base.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/marlin_blueprint.json +c0b07edaf5ead9385390b7d3904bc5196d4b8f32 assets/superbwarfare/models/item/marlin_icon.json 7a0d27d39eefff5d7f69cc0ae21a2681b0aadfd4 assets/superbwarfare/models/item/medium_aerial_bomb.json 0033cd03b0203cd3fa071fb5354c74d33bc1afa8 assets/superbwarfare/models/item/medium_armament_module.json 81699ddddb4270261ae10ff812b00e666649ff7c assets/superbwarfare/models/item/medium_battery_pack.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/marlin.json b/src/generated/resources/assets/superbwarfare/models/item/marlin.json new file mode 100644 index 000000000..da04e4432 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/marlin.json @@ -0,0 +1,28 @@ +{ + "parent": "minecraft:item/generated", + "base": { + "parent": "superbwarfare:item/marlin_base" + }, + "gui_light": "front", + "loader": "neoforge:separate_transforms", + "perspectives": { + "fixed": { + "parent": "superbwarfare:lod/marlin" + }, + "ground": { + "parent": "superbwarfare:lod/marlin" + }, + "gui": { + "parent": "superbwarfare:item/marlin_icon" + }, + "head": { + "parent": "superbwarfare:lod/marlin" + }, + "thirdperson_lefthand": { + "parent": "superbwarfare:lod/marlin" + }, + "thirdperson_righthand": { + "parent": "superbwarfare:lod/marlin" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/marlin_base.json b/src/generated/resources/assets/superbwarfare/models/item/marlin_base.json similarity index 100% rename from src/main/resources/assets/superbwarfare/models/item/marlin_base.json rename to src/generated/resources/assets/superbwarfare/models/item/marlin_base.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/marlin_icon.json b/src/generated/resources/assets/superbwarfare/models/item/marlin_icon.json new file mode 100644 index 000000000..1070fc644 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/marlin_icon.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "superbwarfare:item/marlin_icon" + } +} \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java index 03a1c68bb..712cbebd7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -47,6 +47,7 @@ public class ModItemModelProvider extends ItemModelProvider { gunItem(ModItems.M_1911); gunItem(ModItems.M_870); gunItem(ModItems.M_98B); + gunItem(ModItems.MARLIN); simpleItem(ModItems.EMPTY_PERK, "perk/"); diff --git a/src/main/resources/assets/superbwarfare/models/item/marlin.json b/src/main/resources/assets/superbwarfare/models/item/marlin.json deleted file mode 100644 index 683c78aba..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/marlin.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "loader": "neoforge:separate_transforms", - "gui_light": "front", - "base": { - "parent": "superbwarfare:item/marlin_base" - }, - "perspectives": { - "gui": { - "parent": "superbwarfare:item/marlin_icon" - }, - "thirdperson_righthand": { - "parent": "superbwarfare:item/marlin3d" - }, - "thirdperson_lefthand": { - "parent": "superbwarfare:item/marlin3d" - }, - "ground": { - "parent": "superbwarfare:item/marlin3d" - }, - "fixed": { - "parent": "superbwarfare:item/marlin3d" - }, - "head": { - "parent": "superbwarfare:item/marlin3d" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/marlin3d.json b/src/main/resources/assets/superbwarfare/models/item/marlin3d.json deleted file mode 100644 index ef77bd12b..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/marlin3d.json +++ /dev/null @@ -1,326 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [32, 32], - "textures": { - "0": "superbwarfare:item/ak473d", - "particle": "superbwarfare:item/ak473d" - }, - "elements": [ - { - "from": [7.5, 1.5, 6.5], - "to": [8.5, 4.25, 14.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 7.75]}, - "faces": { - "north": {"uv": [2.5, 9.5, 3, 10.5], "texture": "#0"}, - "east": {"uv": [0, 2, 4, 3], "texture": "#0"}, - "south": {"uv": [9.5, 3, 10, 4], "texture": "#0"}, - "west": {"uv": [0, 3, 4, 4], "texture": "#0"}, - "up": {"uv": [4, 8, 3.5, 4], "texture": "#0"}, - "down": {"uv": [6.5, 5, 6, 9], "texture": "#0"} - } - }, - { - "from": [7.5, 4.25, 10.5], - "to": [8.5, 4.5, 13.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 7.75]}, - "faces": { - "north": {"uv": [8.5, 4, 9, 4.5], "texture": "#0"}, - "east": {"uv": [5, 1.5, 6.5, 2], "texture": "#0"}, - "south": {"uv": [10, 5.5, 10.5, 6], "texture": "#0"}, - "west": {"uv": [8, 6, 9.5, 6.5], "texture": "#0"}, - "up": {"uv": [8, 9.5, 7.5, 8], "texture": "#0"}, - "down": {"uv": [8.5, 8, 8, 9.5], "texture": "#0"} - } - }, - { - "from": [7.75, 0.26924, 12.74672], - "to": [8.25, 0.36924, 14.24672], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 0.26924, 15.49672]}, - "faces": { - "north": {"uv": [10.5, 0, 11, 0.5], "texture": "#0"}, - "east": {"uv": [9.5, 4, 10.5, 4.5], "texture": "#0"}, - "south": {"uv": [10.5, 0.5, 11, 1], "texture": "#0"}, - "west": {"uv": [9.5, 6, 10.5, 6.5], "texture": "#0"}, - "up": {"uv": [10, 8, 9.5, 7], "texture": "#0"}, - "down": {"uv": [8, 9.5, 7.5, 10.5], "texture": "#0"} - } - }, - { - "from": [7.75, -1.05398, 12.84126], - "to": [8.25, -0.95398, 13.44126], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 0.44602, 14.69126]}, - "faces": { - "north": {"uv": [10.5, 0, 11, 0.5], "texture": "#0"}, - "east": {"uv": [9.5, 4, 10.5, 4.5], "texture": "#0"}, - "south": {"uv": [10.5, 0.5, 11, 1], "texture": "#0"}, - "west": {"uv": [9.5, 6, 10.5, 6.5], "texture": "#0"}, - "up": {"uv": [10, 8, 9.5, 7], "texture": "#0"}, - "down": {"uv": [8, 9.5, 7.5, 10.5], "texture": "#0"} - } - }, - { - "from": [7.75, 0.6935, 12.32246], - "to": [8.25, 1.5435, 12.42246], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 0.9935, 12.37246]}, - "faces": { - "north": {"uv": [8, 9.5, 7.5, 10.5], "rotation": 180, "texture": "#0"}, - "east": {"uv": [9.5, 4, 10.5, 4.5], "rotation": 270, "texture": "#0"}, - "south": {"uv": [10, 8, 9.5, 7], "texture": "#0"}, - "west": {"uv": [9.5, 6, 10.5, 6.5], "rotation": 90, "texture": "#0"}, - "up": {"uv": [10.5, 0, 11, 0.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [10.5, 0.5, 11, 1], "texture": "#0"} - } - }, - { - "from": [7.75, 0.81421, 13.96241], - "to": [8.25, 0.91421, 14.56241], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 0.86421, 14.81241]}, - "faces": { - "north": {"uv": [10.5, 0, 11, 0.5], "texture": "#0"}, - "east": {"uv": [9.5, 4, 10.5, 4.5], "texture": "#0"}, - "south": {"uv": [10.5, 0.5, 11, 1], "texture": "#0"}, - "west": {"uv": [9.5, 6, 10.5, 6.5], "texture": "#0"}, - "up": {"uv": [10, 8, 9.5, 7], "texture": "#0"}, - "down": {"uv": [8, 9.5, 7.5, 10.5], "texture": "#0"} - } - }, - { - "from": [7.75, 0.65208, 14.57098], - "to": [8.25, 1.25208, 14.67098], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 1.50208, 14.62098]}, - "faces": { - "north": {"uv": [10, 8, 9.5, 7], "rotation": 180, "texture": "#0"}, - "east": {"uv": [9.5, 4, 10.5, 4.5], "rotation": 90, "texture": "#0"}, - "south": {"uv": [8, 9.5, 7.5, 10.5], "texture": "#0"}, - "west": {"uv": [9.5, 6, 10.5, 6.5], "rotation": 270, "texture": "#0"}, - "up": {"uv": [10.5, 0.5, 11, 1], "texture": "#0"}, - "down": {"uv": [10.5, 0, 11, 0.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [7.75, 0.56924, 13.29672], - "to": [8.25, 1.61924, 13.64672], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 1.09424, 13.57172]}, - "faces": { - "north": {"uv": [3, 10.5, 3.5, 11], "texture": "#0"}, - "east": {"uv": [10.5, 3, 11, 3.5], "texture": "#0"}, - "south": {"uv": [3.5, 10.5, 4, 11], "texture": "#0"}, - "west": {"uv": [10.5, 3.5, 11, 4], "texture": "#0"}, - "up": {"uv": [4.5, 11, 4, 10.5], "texture": "#0"}, - "down": {"uv": [11, 4, 10.5, 4.5], "texture": "#0"} - } - }, - { - "from": [7.5, 1.53911, 18.56023], - "to": [8.5, 3.53911, 27.31023], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 3.03911, 14.81023]}, - "faces": { - "north": {"uv": [5, 2.5, 6, 3.5], "texture": "#0"}, - "east": {"uv": [5, 2.5, 6, 3.5], "texture": "#0"}, - "south": {"uv": [5, 2.5, 6, 3.5], "texture": "#0"}, - "west": {"uv": [5, 2.5, 6, 3.5], "texture": "#0"}, - "up": {"uv": [5, 2.5, 6, 3.5], "texture": "#0"}, - "down": {"uv": [5, 2.5, 6, 3.5], "texture": "#0"} - } - }, - { - "from": [7.5, 1.53911, 14.06023], - "to": [8.5, 3.53911, 18.61023], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 3.03911, 14.81023]}, - "faces": { - "north": {"uv": [8, 9.5, 8.5, 10.5], "texture": "#0"}, - "east": {"uv": [7.5, 7, 8.5, 8], "texture": "#0"}, - "south": {"uv": [8.5, 9.5, 9, 10.5], "texture": "#0"}, - "west": {"uv": [8, 0, 9, 1], "texture": "#0"}, - "up": {"uv": [9.5, 10.5, 9, 9.5], "texture": "#0"}, - "down": {"uv": [10, 9.5, 9.5, 10.5], "texture": "#0"} - } - }, - { - "from": [7.5, 3.69135, 22.79486], - "to": [8.5, 5.69135, 26.54486], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 1.19135, 14.04486]}, - "faces": { - "north": {"uv": [4.5, 3.5, 5.5, 4.5], "texture": "#0"}, - "east": {"uv": [4.5, 3.5, 5.5, 4.5], "texture": "#0"}, - "south": {"uv": [4.5, 3.5, 5.5, 4.5], "texture": "#0"}, - "west": {"uv": [4.5, 3.5, 5.5, 4.5], "texture": "#0"}, - "up": {"uv": [4.5, 3.5, 5.5, 4.5], "texture": "#0"}, - "down": {"uv": [4.5, 3.5, 5.5, 4.5], "texture": "#0"} - } - }, - { - "from": [7.5, 0.05062, 18.26388], - "to": [8.5, 2.05062, 27.01388], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 0.80062, 21.06388]}, - "faces": { - "north": {"uv": [4.5, 3, 5.5, 4], "texture": "#0"}, - "east": {"uv": [4.5, 3, 5.5, 4], "texture": "#0"}, - "south": {"uv": [4.5, 3, 5.5, 4], "texture": "#0"}, - "west": {"uv": [4.5, 3, 5.5, 4], "texture": "#0"}, - "up": {"uv": [4.5, 3, 5.5, 4], "texture": "#0"}, - "down": {"uv": [4.5, 3, 5.5, 4], "texture": "#0"} - } - }, - { - "from": [7.5, -3.19938, 25.51388], - "to": [8.5, 2.05062, 27.51388], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 0.80062, 21.06388]}, - "faces": { - "north": {"uv": [4.5, 3.5, 5.5, 4.5], "texture": "#0"}, - "east": {"uv": [4.5, 3.5, 5.5, 4.5], "texture": "#0"}, - "south": {"uv": [4.5, 3.5, 5.5, 4.5], "texture": "#0"}, - "west": {"uv": [4.5, 3.5, 5.5, 4.5], "texture": "#0"}, - "up": {"uv": [4.5, 3.5, 5.5, 4.5], "texture": "#0"}, - "down": {"uv": [4.5, 3.5, 5.5, 4.5], "texture": "#0"} - } - }, - { - "from": [7.75, -0.44475, 14.08481], - "to": [8.25, -0.29475, 17.58481], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, -0.36975, 15.83481]}, - "faces": { - "north": {"uv": [8, 9.5, 8.5, 10.5], "texture": "#0"}, - "east": {"uv": [7.5, 7, 8.5, 8], "texture": "#0"}, - "south": {"uv": [8.5, 9.5, 9, 10.5], "texture": "#0"}, - "west": {"uv": [8, 0, 9, 1], "texture": "#0"}, - "up": {"uv": [9.5, 10.5, 9, 9.5], "texture": "#0"}, - "down": {"uv": [10, 9.5, 9.5, 10.5], "texture": "#0"} - } - }, - { - "from": [7.75, -0.44475, 17.26098], - "to": [8.25, -0.29475, 17.76098], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, -0.36975, 19.01098]}, - "faces": { - "north": {"uv": [8, 9.5, 8.5, 10.5], "texture": "#0"}, - "east": {"uv": [7.5, 7, 8.5, 8], "texture": "#0"}, - "south": {"uv": [8.5, 9.5, 9, 10.5], "texture": "#0"}, - "west": {"uv": [8, 0, 9, 1], "texture": "#0"}, - "up": {"uv": [9.5, 10.5, 9, 9.5], "texture": "#0"}, - "down": {"uv": [10, 9.5, 9.5, 10.5], "texture": "#0"} - } - }, - { - "from": [7.75, -0.90772, 17.83622], - "to": [8.25, -0.40772, 17.98622], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, -0.65772, 17.91122]}, - "faces": { - "north": {"uv": [9.5, 10.5, 9, 9.5], "rotation": 180, "texture": "#0"}, - "east": {"uv": [7.5, 7, 8.5, 8], "rotation": 90, "texture": "#0"}, - "south": {"uv": [10, 9.5, 9.5, 10.5], "texture": "#0"}, - "west": {"uv": [8, 0, 9, 1], "rotation": 270, "texture": "#0"}, - "up": {"uv": [8.5, 9.5, 9, 10.5], "texture": "#0"}, - "down": {"uv": [8, 9.5, 8.5, 10.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [7.75, -0.50318, 17.83622], - "to": [8.25, -0.00318, 17.98622], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, -0.25318, 17.91122]}, - "faces": { - "north": {"uv": [9.5, 10.5, 9, 9.5], "rotation": 180, "texture": "#0"}, - "east": {"uv": [7.5, 7, 8.5, 8], "rotation": 90, "texture": "#0"}, - "south": {"uv": [10, 9.5, 9.5, 10.5], "texture": "#0"}, - "west": {"uv": [8, 0, 9, 1], "rotation": 270, "texture": "#0"}, - "up": {"uv": [8.5, 9.5, 9, 10.5], "texture": "#0"}, - "down": {"uv": [8, 9.5, 8.5, 10.5], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [7.6, 3.25, -10], - "to": [8.4, 4.05, 7], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 1.75]}, - "faces": { - "north": {"uv": [10.5, 6, 11, 6.5], "texture": "#0"}, - "east": {"uv": [6.5, 5, 10, 5.5], "texture": "#0"}, - "south": {"uv": [6.5, 10.5, 7, 11], "texture": "#0"}, - "west": {"uv": [6.5, 5.5, 10, 6], "texture": "#0"}, - "up": {"uv": [1.5, 10, 1, 6.5], "texture": "#0"}, - "down": {"uv": [2, 6.5, 1.5, 10], "texture": "#0"} - } - }, - { - "from": [7.6, 3.05, -8.3], - "to": [8.4, 3.25, -8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 1.75]}, - "faces": { - "north": {"uv": [10.5, 6, 11, 6.5], "texture": "#0"}, - "east": {"uv": [6.5, 5, 10, 5.5], "texture": "#0"}, - "south": {"uv": [6.5, 10.5, 7, 11], "texture": "#0"}, - "west": {"uv": [6.5, 5.5, 10, 6], "texture": "#0"}, - "up": {"uv": [1.5, 10, 1, 6.5], "texture": "#0"}, - "down": {"uv": [2, 6.5, 1.5, 10], "texture": "#0"} - } - }, - { - "from": [7.6, 2.25, -8.75], - "to": [8.4, 3.05, 7], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 1.75]}, - "faces": { - "north": {"uv": [10.5, 6, 11, 6.5], "texture": "#0"}, - "east": {"uv": [6.5, 5, 10, 5.5], "texture": "#0"}, - "south": {"uv": [6.5, 10.5, 7, 11], "texture": "#0"}, - "west": {"uv": [6.5, 5.5, 10, 6], "texture": "#0"}, - "up": {"uv": [1.5, 10, 1, 6.5], "texture": "#0"}, - "down": {"uv": [2, 6.5, 1.5, 10], "texture": "#0"} - } - }, - { - "from": [7.5, 1.75, -2.45], - "to": [8.5, 3.85, 6.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 1.75]}, - "faces": { - "north": {"uv": [4.5, 3, 8, 3.5], "texture": "#0"}, - "east": {"uv": [4.5, 3, 8, 3.5], "texture": "#0"}, - "south": {"uv": [4.5, 3, 8, 3.5], "texture": "#0"}, - "west": {"uv": [4.5, 3, 8, 3.5], "texture": "#0"}, - "up": {"uv": [4.5, 3, 8, 3.5], "texture": "#0"}, - "down": {"uv": [4.5, 3, 8, 3.5], "texture": "#0"} - } - }, - { - "from": [7.9, 4.05, -9.75], - "to": [8.1, 4.6, -9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 1.75]}, - "faces": { - "north": {"uv": [10, 1, 10.5, 2], "texture": "#0"}, - "east": {"uv": [1.5, 10, 2, 11], "texture": "#0"}, - "south": {"uv": [10, 2, 10.5, 3], "texture": "#0"}, - "west": {"uv": [10, 3, 10.5, 4], "texture": "#0"}, - "up": {"uv": [11, 7, 10.5, 6.5], "texture": "#0"}, - "down": {"uv": [7.5, 10.5, 7, 11], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [-1.5, 4.25, -2.75], - "scale": [0.7, 0.7, 0.7] - }, - "thirdperson_lefthand": { - "translation": [-1.5, 4.25, -2.75], - "scale": [0.7, 0.7, 0.7] - }, - "ground": { - "translation": [0, 9, 0], - "scale": [0.7, 0.7, 0.7] - }, - "head": { - "translation": [0, 18.75, 0] - }, - "fixed": { - "rotation": [90, -45, 90], - "translation": [-2.5, 4.25, 0], - "scale": [0.75, 0.75, 0.75] - } - }, - "groups": [ - { - "name": "group", - "origin": [8, 3.25, 7.75], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/marlin_icon.json b/src/main/resources/assets/superbwarfare/models/item/marlin_icon.json deleted file mode 100644 index 661f48888..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/marlin_icon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "superbwarfare:item/marlinicon" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/lod/marlin.json b/src/main/resources/assets/superbwarfare/models/lod/marlin.json new file mode 100644 index 000000000..b4c8c7e54 --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/lod/marlin.json @@ -0,0 +1,1804 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [ + 32, + 32 + ], + "textures": { + "2": "superbwarfare:item/lod/marlin", + "particle": "superbwarfare:item/lod/marlin" + }, + "elements": [ + { + "from": [ + 7.5, + 1.5, + 6.5 + ], + "to": [ + 8.5, + 4.25, + 14.5 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 3.25, + 7.75 + ] + }, + "faces": { + "north": { + "uv": [ + 4, + 1, + 4.5, + 2.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 0, + 4, + 1.5 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4.5, + 1, + 5, + 2.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 1.5, + 4, + 3 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 4, + 8, + 3.5, + 4 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 4.5, + 4, + 4, + 8 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.5, + 4.25, + 10.5 + ], + "to": [ + 8.5, + 4.5, + 13.25 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 3.25, + 7.75 + ] + }, + "faces": { + "north": { + "uv": [ + 5.5, + 2.5, + 6, + 3 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 4, + 2.5, + 5.5, + 3 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 6, + 2.5, + 6.5, + 3 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 5, + 1, + 6.5, + 1.5 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 2, + 6.5, + 1.5, + 5 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 2.5, + 5, + 2, + 6.5 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.75, + 0.26924, + 12.74672 + ], + "to": [ + 8.25, + 0.36924, + 14.24672 + ], + "rotation": { + "angle": 0, + "axis": "x", + "origin": [ + 8, + 0.26924, + 15.49672 + ] + }, + "faces": { + "north": { + "uv": [ + 3, + 6, + 3.5, + 6.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 5, + 1.5, + 6, + 2 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 6, + 4, + 6.5, + 4.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 5, + 2, + 6, + 2.5 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 3, + 6, + 2.5, + 5 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 3.5, + 5, + 3, + 6 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.75, + -1.05398, + 12.84126 + ], + "to": [ + 8.25, + -0.95398, + 13.44126 + ], + "rotation": { + "angle": 45, + "axis": "x", + "origin": [ + 8, + 0.44602, + 14.69126 + ] + }, + "faces": { + "north": { + "uv": [ + 3, + 6, + 3.5, + 6.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 5, + 1.5, + 6, + 2 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 6, + 4, + 6.5, + 4.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 5, + 2, + 6, + 2.5 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 2.5, + 5, + 3, + 6 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 3, + 5, + 3.5, + 6 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.75, + 0.6935, + 12.32246 + ], + "to": [ + 8.25, + 1.5435, + 12.42246 + ], + "rotation": { + "angle": 0, + "axis": "x", + "origin": [ + 8, + 0.9935, + 12.37246 + ] + }, + "faces": { + "north": { + "uv": [ + 3.5, + 5, + 3, + 6 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 5, + 1.5, + 6, + 2 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 3, + 6, + 2.5, + 5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 5, + 2, + 6, + 2.5 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 3.5, + 6.5, + 3, + 6 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 6.5, + 4, + 6, + 4.5 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.75, + 0.81421, + 13.96241 + ], + "to": [ + 8.25, + 0.91421, + 14.56241 + ], + "rotation": { + "angle": -45, + "axis": "x", + "origin": [ + 8, + 0.86421, + 14.81241 + ] + }, + "faces": { + "north": { + "uv": [ + 3, + 6, + 3.5, + 6.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 5, + 1.5, + 6, + 2 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 6, + 4, + 6.5, + 4.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 5, + 2, + 6, + 2.5 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 2.5, + 5, + 3, + 6 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 3, + 5, + 3.5, + 6 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.75, + 0.65208, + 14.57098 + ], + "to": [ + 8.25, + 1.25208, + 14.67098 + ], + "rotation": { + "angle": 0, + "axis": "x", + "origin": [ + 8, + 1.50208, + 14.62098 + ] + }, + "faces": { + "north": { + "uv": [ + 3, + 6, + 2.5, + 5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 5, + 1.5, + 6, + 2 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 3.5, + 5, + 3, + 6 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 5, + 2, + 6, + 2.5 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 6.5, + 4.5, + 6, + 4 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 3.5, + 6, + 3, + 6.5 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.75, + 0.56924, + 13.29672 + ], + "to": [ + 8.25, + 1.61924, + 13.64672 + ], + "rotation": { + "angle": 22.5, + "axis": "x", + "origin": [ + 8, + 1.09424, + 13.57172 + ] + }, + "faces": { + "north": { + "uv": [ + 6, + 4.5, + 6.5, + 5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 5, + 6, + 5.5, + 6.5 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 6, + 5, + 6.5, + 5.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 5.5, + 6, + 6, + 6.5 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 6.5, + 6, + 6, + 5.5 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 6.5, + 6, + 6, + 6.5 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.5, + 1.53911, + 18.56023 + ], + "to": [ + 8.5, + 3.53911, + 27.31023 + ], + "rotation": { + "angle": 22.5, + "axis": "x", + "origin": [ + 8, + 3.03911, + 14.81023 + ] + }, + "faces": { + "north": { + "uv": [ + 5, + 4, + 5.5, + 5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 5, + 4, + 5.5, + 5 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 5, + 4, + 5.5, + 5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 5, + 4, + 5.5, + 5 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 5.5, + 5, + 5, + 4 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 5.5, + 4, + 5, + 5 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.5, + 1.53911, + 14.06023 + ], + "to": [ + 8.5, + 3.53911, + 18.61023 + ], + "rotation": { + "angle": 22.5, + "axis": "x", + "origin": [ + 8, + 3.03911, + 14.81023 + ] + }, + "faces": { + "north": { + "uv": [ + 5, + 5, + 5.5, + 6 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 4, + 0, + 6.5, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 5.5, + 4, + 6, + 5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 1, + 4, + 3.5, + 5 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 5, + 6.5, + 4.5, + 4 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 1.5, + 5, + 1, + 7.5 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.5, + 3.69135, + 22.79486 + ], + "to": [ + 8.5, + 5.69135, + 26.54486 + ], + "rotation": { + "angle": 22.5, + "axis": "x", + "origin": [ + 8, + 1.19135, + 14.04486 + ] + }, + "faces": { + "north": { + "uv": [ + 5.5, + 5, + 6, + 6 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 5.5, + 5, + 6, + 6 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 5.5, + 5, + 6, + 6 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 5.5, + 5, + 6, + 6 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 6, + 6, + 5.5, + 5 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 6, + 5, + 5.5, + 6 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.5, + 0.05062, + 18.26388 + ], + "to": [ + 8.5, + 2.05062, + 27.01388 + ], + "rotation": { + "angle": 0, + "axis": "x", + "origin": [ + 8, + 0.80062, + 21.06388 + ] + }, + "faces": { + "north": { + "uv": [ + 6, + 1.5, + 6.5, + 2.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 6, + 1.5, + 6.5, + 2.5 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 6, + 1.5, + 6.5, + 2.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 6, + 1.5, + 6.5, + 2.5 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 6.5, + 2.5, + 6, + 1.5 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 6.5, + 1.5, + 6, + 2.5 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.5, + -3.19938, + 25.51388 + ], + "to": [ + 8.5, + 2.05062, + 27.51388 + ], + "rotation": { + "angle": 0, + "axis": "x", + "origin": [ + 8, + 0.80062, + 21.06388 + ] + }, + "faces": { + "north": { + "uv": [ + 5.5, + 5, + 6, + 6 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 5.5, + 5, + 6, + 6 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 5.5, + 5, + 6, + 6 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 5.5, + 5, + 6, + 6 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 6, + 6, + 5.5, + 5 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 6, + 5, + 5.5, + 6 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.75, + -0.44475, + 14.08481 + ], + "to": [ + 8.25, + -0.29475, + 17.58481 + ], + "rotation": { + "angle": 22.5, + "axis": "x", + "origin": [ + 8, + -0.36975, + 15.83481 + ] + }, + "faces": { + "north": { + "uv": [ + 5, + 5, + 5.5, + 6 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 4, + 0, + 6.5, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 5.5, + 4, + 6, + 5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 1, + 4, + 3.5, + 5 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 4.5, + 4, + 5, + 6.5 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 1, + 5, + 1.5, + 7.5 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.75, + -0.44475, + 17.26098 + ], + "to": [ + 8.25, + -0.29475, + 17.76098 + ], + "rotation": { + "angle": -22.5, + "axis": "x", + "origin": [ + 8, + -0.36975, + 19.01098 + ] + }, + "faces": { + "north": { + "uv": [ + 5, + 5, + 5.5, + 6 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 4, + 0, + 6.5, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 5.5, + 4, + 6, + 5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 1, + 4, + 3.5, + 5 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 4.5, + 4, + 5, + 6.5 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 1, + 5, + 1.5, + 7.5 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.75, + -0.90772, + 17.83622 + ], + "to": [ + 8.25, + -0.40772, + 17.98622 + ], + "rotation": { + "angle": 22.5, + "axis": "x", + "origin": [ + 8, + -0.65772, + 17.91122 + ] + }, + "faces": { + "north": { + "uv": [ + 5, + 6.5, + 4.5, + 4 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 4, + 0, + 6.5, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 1.5, + 5, + 1, + 7.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 1, + 4, + 3.5, + 5 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 6, + 5, + 5.5, + 4 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 5.5, + 5, + 5, + 6 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.75, + -0.50318, + 17.83622 + ], + "to": [ + 8.25, + -0.00318, + 17.98622 + ], + "rotation": { + "angle": -22.5, + "axis": "x", + "origin": [ + 8, + -0.25318, + 17.91122 + ] + }, + "faces": { + "north": { + "uv": [ + 5, + 6.5, + 4.5, + 4 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 4, + 0, + 6.5, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 1.5, + 5, + 1, + 7.5 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 1, + 4, + 3.5, + 5 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 6, + 5, + 5.5, + 4 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 5.5, + 5, + 5, + 6 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.6, + 3.25, + -10 + ], + "to": [ + 8.4, + 4.05, + 7 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 3.25, + 1.75 + ] + }, + "faces": { + "north": { + "uv": [ + 6.5, + 0, + 7, + 0.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 3, + 8.5, + 3.5 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 6.5, + 0.5, + 7, + 1 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 3.5, + 8.5, + 4 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 0.5, + 12.5, + 0, + 4 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 1, + 4, + 0.5, + 12.5 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.6, + 3.05, + -8.3 + ], + "to": [ + 8.4, + 3.25, + -8 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 3.25, + 1.75 + ] + }, + "faces": { + "north": { + "uv": [ + 6.5, + 0, + 7, + 0.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 3, + 8.5, + 3.5 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 6.5, + 0.5, + 7, + 1 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 3.5, + 8.5, + 4 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 0, + 4, + 0.5, + 12.5 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 0.5, + 4, + 1, + 12.5 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.6, + 2.25, + -8.75 + ], + "to": [ + 8.4, + 3.05, + 7 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 3.25, + 1.75 + ] + }, + "faces": { + "north": { + "uv": [ + 6.5, + 0, + 7, + 0.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 0, + 3, + 8.5, + 3.5 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 6.5, + 0.5, + 7, + 1 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 0, + 3.5, + 8.5, + 4 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 0, + 4, + 0.5, + 12.5 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 0.5, + 4, + 1, + 12.5 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.5, + 1.75, + -2.45 + ], + "to": [ + 8.5, + 3.85, + 6.5 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 3.25, + 1.75 + ] + }, + "faces": { + "north": { + "uv": [ + 2.5, + 6, + 3, + 7 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 2.5, + 6, + 3, + 7 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 2.5, + 6, + 3, + 7 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 2.5, + 6, + 3, + 7 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 3, + 7, + 2.5, + 6 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 3, + 6, + 2.5, + 7 + ], + "texture": "#2" + } + } + }, + { + "from": [ + 7.9, + 4.05, + -9.75 + ], + "to": [ + 8.1, + 4.6, + -9 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 3.25, + 1.75 + ] + }, + "faces": { + "north": { + "uv": [ + 6.5, + 1, + 7, + 1.5 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 1.5, + 6.5, + 2, + 7 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 6.5, + 1.5, + 7, + 2 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 2, + 6.5, + 2.5, + 7 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 7, + 2.5, + 6.5, + 2 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 7, + 2.5, + 6.5, + 3 + ], + "texture": "#2" + } + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [ + -1.5, + 4.25, + -2.75 + ], + "scale": [ + 0.7, + 0.7, + 0.7 + ] + }, + "thirdperson_lefthand": { + "translation": [ + -1.5, + 4.25, + -2.75 + ], + "scale": [ + 0.7, + 0.7, + 0.7 + ] + }, + "ground": { + "translation": [ + 0, + 9, + 0 + ], + "scale": [ + 0.7, + 0.7, + 0.7 + ] + }, + "head": { + "translation": [ + 0, + 18.75, + 0 + ] + }, + "fixed": { + "rotation": [ + 90, + -45, + 90 + ], + "translation": [ + -2.5, + 4.25, + 0 + ], + "scale": [ + 0.75, + 0.75, + 0.75 + ] + } + }, + "groups": [ + { + "name": "group", + "origin": [ + 8, + 3.25, + 7.75 + ], + "color": 0, + "children": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21 + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/textures/item/lod/marlin.png b/src/main/resources/assets/superbwarfare/textures/item/lod/marlin.png new file mode 100644 index 000000000..8fd0fada7 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/item/lod/marlin.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/marlinicon.png b/src/main/resources/assets/superbwarfare/textures/item/marlin_icon.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/marlinicon.png rename to src/main/resources/assets/superbwarfare/textures/item/marlin_icon.png