From 255b887b7315b8d8be922e4bcbbcfe58304c8792 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Thu, 22 May 2025 02:04:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96sks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/superbwarfare/models/item/sks.json | 28 ++ .../superbwarfare/models/item/sks_base.json | 6 + .../superbwarfare/models/item/sks_icon.json | 6 + .../datagen/ModItemModelProvider.java | 1 + .../assets/superbwarfare/geo/sks.geo.json | 2 +- .../superbwarfare/models/item/sks3d.json | 390 ----------------- .../assets/superbwarfare/models/lod/sks.json | 391 ++++++++++++++++++ .../superbwarfare/textures/item/lod/sks.png | Bin 0 -> 413 bytes .../superbwarfare/textures/item/sks_l.png | Bin 430 -> 0 bytes 9 files changed, 433 insertions(+), 391 deletions(-) create mode 100644 src/generated/resources/assets/superbwarfare/models/item/sks.json create mode 100644 src/generated/resources/assets/superbwarfare/models/item/sks_base.json create mode 100644 src/generated/resources/assets/superbwarfare/models/item/sks_icon.json delete mode 100644 src/main/resources/assets/superbwarfare/models/item/sks3d.json create mode 100644 src/main/resources/assets/superbwarfare/models/lod/sks.json create mode 100644 src/main/resources/assets/superbwarfare/textures/item/lod/sks.png delete mode 100644 src/main/resources/assets/superbwarfare/textures/item/sks_l.png diff --git a/src/generated/resources/assets/superbwarfare/models/item/sks.json b/src/generated/resources/assets/superbwarfare/models/item/sks.json new file mode 100644 index 000000000..69d2a4c3f --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/sks.json @@ -0,0 +1,28 @@ +{ + "parent": "minecraft:item/generated", + "base": { + "parent": "superbwarfare:item/sks_base" + }, + "gui_light": "front", + "loader": "forge:separate_transforms", + "perspectives": { + "fixed": { + "parent": "superbwarfare:lod/sks" + }, + "ground": { + "parent": "superbwarfare:lod/sks" + }, + "gui": { + "parent": "superbwarfare:item/sks_icon" + }, + "head": { + "parent": "superbwarfare:lod/sks" + }, + "thirdperson_lefthand": { + "parent": "superbwarfare:lod/sks" + }, + "thirdperson_righthand": { + "parent": "superbwarfare:lod/sks" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/sks_base.json b/src/generated/resources/assets/superbwarfare/models/item/sks_base.json new file mode 100644 index 000000000..e46fcb904 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/sks_base.json @@ -0,0 +1,6 @@ +{ + "parent": "superbwarfare:displaysettings/sks.item", + "textures": { + "layer0": "superbwarfare:item/sks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/sks_icon.json b/src/generated/resources/assets/superbwarfare/models/item/sks_icon.json new file mode 100644 index 000000000..9363c1162 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/sks_icon.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "superbwarfare:item/sks_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 394fab66c..931f6c2bd 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -58,6 +58,7 @@ public class ModItemModelProvider extends ItemModelProvider { gunItem(ModItems.RPK); gunItem(ModItems.SECONDARY_CATACLYSM); gunItem(ModItems.SENTINEL); + gunItem(ModItems.SKS); simpleItem(ModItems.EMPTY_PERK, "perk/"); diff --git a/src/main/resources/assets/superbwarfare/geo/sks.geo.json b/src/main/resources/assets/superbwarfare/geo/sks.geo.json index cfa940b9c..ad541d82b 100644 --- a/src/main/resources/assets/superbwarfare/geo/sks.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/sks.geo.json @@ -3,7 +3,7 @@ "minecraft:geometry": [ { "description": { - "identifier": "geometry.ak", + "identifier": "geometry.sks", "texture_width": 256, "texture_height": 256, "visible_bounds_width": 21, diff --git a/src/main/resources/assets/superbwarfare/models/item/sks3d.json b/src/main/resources/assets/superbwarfare/models/item/sks3d.json deleted file mode 100644 index b97272690..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/sks3d.json +++ /dev/null @@ -1,390 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [32, 32], - "textures": { - "1": "superbwarfare:item/ak3d" - }, - "elements": [ - { - "from": [7.7, 3.24237, -5.95836], - "to": [8.3, 3.84237, -4.45836], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 3.54237, -5.58336]}, - "faces": { - "north": {"uv": [4.5, 5.5, 5, 6], "texture": "#1"}, - "east": {"uv": [9.5, 0.5, 10.5, 1], "texture": "#1"}, - "south": {"uv": [10.5, 7, 11, 7.5], "texture": "#1"}, - "west": {"uv": [9.5, 1, 10.5, 1.5], "texture": "#1"}, - "up": {"uv": [8, 10.5, 7.5, 9.5], "texture": "#1"}, - "down": {"uv": [8.5, 9.5, 8, 10.5], "texture": "#1"} - } - }, - { - "from": [7.5, 2, 0.25], - "to": [8.5, 3.5, 14.8], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 7.75]}, - "faces": { - "north": {"uv": [9.5, 8, 10, 9], "texture": "#1"}, - "east": {"uv": [0, 0, 7, 1], "texture": "#1"}, - "south": {"uv": [8.5, 9.5, 9, 10.5], "texture": "#1"}, - "west": {"uv": [0, 1, 7, 2], "texture": "#1"}, - "up": {"uv": [1.5, 11.5, 1, 4.5], "texture": "#1"}, - "down": {"uv": [2, 4.5, 1.5, 11.5], "texture": "#1"} - } - }, - { - "from": [7.5, 3.5, 0.25], - "to": [8.5, 4.75, 5.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 7.75]}, - "faces": { - "north": {"uv": [7.5, 10.5, 8, 11], "texture": "#1"}, - "east": {"uv": [7, 3, 9.5, 3.5], "texture": "#1"}, - "south": {"uv": [8, 10.5, 8.5, 11], "texture": "#1"}, - "west": {"uv": [7.5, 3.5, 10, 4], "texture": "#1"}, - "up": {"uv": [5, 10.5, 4.5, 8], "texture": "#1"}, - "down": {"uv": [5.5, 8, 5, 10.5], "texture": "#1"} - } - }, - { - "from": [7.6, 3.5, 5.5], - "to": [8.4, 4.5, 6.75], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 7.75]}, - "faces": { - "north": {"uv": [10.5, 10, 11, 10.5], "texture": "#1"}, - "east": {"uv": [10.5, 10.5, 11, 11], "texture": "#1"}, - "south": {"uv": [11, 0, 11.5, 0.5], "texture": "#1"}, - "west": {"uv": [11, 0.5, 11.5, 1], "texture": "#1"}, - "up": {"uv": [11.5, 2, 11, 1.5], "texture": "#1"}, - "down": {"uv": [3, 11, 2.5, 11.5], "texture": "#1"} - } - }, - { - "from": [7.6, 3.5, 11.60156], - "to": [8.4, 4.5, 14.60156], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 7.75]}, - "faces": { - "north": {"uv": [11, 2.5, 11.5, 3], "texture": "#1"}, - "east": {"uv": [8, 0.5, 9.5, 1], "texture": "#1"}, - "south": {"uv": [3, 11, 3.5, 11.5], "texture": "#1"}, - "west": {"uv": [8, 1, 9.5, 1.5], "texture": "#1"}, - "up": {"uv": [9, 6.5, 8.5, 5], "texture": "#1"}, - "down": {"uv": [7, 8.5, 6.5, 10], "texture": "#1"} - } - }, - { - "from": [7.2, 2.2, 9.35156], - "to": [7.5, 3.25, 13.10156], - "rotation": {"angle": 0, "axis": "y", "origin": [7.9, 3.25, 7.75]}, - "faces": { - "north": {"uv": [11, 2.5, 11.5, 3], "texture": "#1"}, - "east": {"uv": [8, 0.5, 9.5, 1], "texture": "#1"}, - "south": {"uv": [3, 11, 3.5, 11.5], "texture": "#1"}, - "west": {"uv": [8, 1, 9.5, 1.5], "texture": "#1"}, - "up": {"uv": [9, 6.5, 8.5, 5], "texture": "#1"}, - "down": {"uv": [7, 8.5, 6.5, 10], "texture": "#1"} - } - }, - { - "from": [6.9, 2.4, 9.55156], - "to": [7.2, 4.55, 10.40156], - "rotation": {"angle": 0, "axis": "y", "origin": [8.1, 3.25, 7.75]}, - "faces": { - "north": {"uv": [11, 2.5, 11.5, 3], "texture": "#1"}, - "east": {"uv": [8, 0.5, 9.5, 1], "texture": "#1"}, - "south": {"uv": [3, 11, 3.5, 11.5], "texture": "#1"}, - "west": {"uv": [8, 1, 9.5, 1.5], "texture": "#1"}, - "up": {"uv": [9, 6.5, 8.5, 5], "texture": "#1"}, - "down": {"uv": [7, 8.5, 6.5, 10], "texture": "#1"} - } - }, - { - "from": [6.9, 4.55, 8.30156], - "to": [7.7, 5.25, 13.15156], - "rotation": {"angle": 0, "axis": "y", "origin": [8.1, 3.25, 10.25]}, - "faces": { - "north": {"uv": [11, 2.5, 11.5, 3], "texture": "#1"}, - "east": {"uv": [8, 0.5, 9.5, 1], "texture": "#1"}, - "south": {"uv": [3, 11, 3.5, 11.5], "texture": "#1"}, - "west": {"uv": [8, 1, 9.5, 1.5], "texture": "#1"}, - "up": {"uv": [9, 6.5, 8.5, 5], "texture": "#1"}, - "down": {"uv": [7, 8.5, 6.5, 10], "texture": "#1"} - } - }, - { - "from": [6.9, 2.4, 12.05156], - "to": [7.2, 4.55, 12.90156], - "rotation": {"angle": 0, "axis": "y", "origin": [8.1, 3.25, 10.25]}, - "faces": { - "north": {"uv": [11, 2.5, 11.5, 3], "texture": "#1"}, - "east": {"uv": [8, 0.5, 9.5, 1], "texture": "#1"}, - "south": {"uv": [3, 11, 3.5, 11.5], "texture": "#1"}, - "west": {"uv": [8, 1, 9.5, 1.5], "texture": "#1"}, - "up": {"uv": [9, 6.5, 8.5, 5], "texture": "#1"}, - "down": {"uv": [7, 8.5, 6.5, 10], "texture": "#1"} - } - }, - { - "from": [7.7, 3.5, 6.75156], - "to": [8.3, 4.5, 11.60156], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 7.75]}, - "faces": { - "north": {"uv": [3.5, 11, 4, 11.5], "texture": "#1"}, - "east": {"uv": [7.5, 4, 10, 4.5], "texture": "#1"}, - "south": {"uv": [11, 3.5, 11.5, 4], "texture": "#1"}, - "west": {"uv": [8, 0, 10.5, 0.5], "texture": "#1"}, - "up": {"uv": [8.5, 7.5, 8, 5], "texture": "#1"}, - "down": {"uv": [6, 8, 5.5, 10.5], "texture": "#1"} - } - }, - { - "from": [8.2, 3.75, 7.00156], - "to": [9.05, 4.25, 7.50156], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 7.75]}, - "faces": { - "north": {"uv": [4, 11, 4.5, 11.5], "texture": "#1"}, - "east": {"uv": [11, 4, 11.5, 4.5], "texture": "#1"}, - "south": {"uv": [5, 11, 5.5, 11.5], "texture": "#1"}, - "west": {"uv": [11, 5, 11.5, 5.5], "texture": "#1"}, - "up": {"uv": [6, 11.5, 5.5, 11], "texture": "#1"}, - "down": {"uv": [11.5, 5.5, 11, 6], "texture": "#1"} - } - }, - { - "from": [7.5, 4.5, 5.5], - "to": [8.5, 4.65, 7.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 7.75]}, - "faces": { - "north": {"uv": [6.5, 11, 7, 11.5], "texture": "#1"}, - "east": {"uv": [9.5, 3, 10.5, 3.5], "texture": "#1"}, - "south": {"uv": [11, 6.5, 11.5, 7], "texture": "#1"}, - "west": {"uv": [9, 9.5, 10, 10], "texture": "#1"}, - "up": {"uv": [3, 11, 2.5, 10], "texture": "#1"}, - "down": {"uv": [3.5, 10, 3, 11], "texture": "#1"} - } - }, - { - "from": [7.5, 1, 16.45], - "to": [8.5, 2.5, 23.6], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 2.25, 8.85]}, - "faces": { - "north": {"uv": [10, 3.5, 10.5, 4.5], "texture": "#1"}, - "east": {"uv": [0, 2, 4, 3], "texture": "#1"}, - "south": {"uv": [10, 4.5, 10.5, 5.5], "texture": "#1"}, - "west": {"uv": [0, 3, 4, 4], "texture": "#1"}, - "up": {"uv": [4, 9.5, 3.5, 5.5], "texture": "#1"}, - "down": {"uv": [4.5, 5.5, 4, 9.5], "texture": "#1"} - } - }, - { - "from": [7.5, -1.5, 22.6], - "to": [8.5, 1, 23.6], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 2.25, 8.85]}, - "faces": { - "north": {"uv": [8.5, 6.5, 9, 8], "texture": "#1"}, - "east": {"uv": [8.5, 8, 9, 9.5], "texture": "#1"}, - "south": {"uv": [9, 5, 9.5, 6.5], "texture": "#1"}, - "west": {"uv": [9, 6.5, 9.5, 8], "texture": "#1"}, - "up": {"uv": [7.5, 11.5, 7, 11], "texture": "#1"}, - "down": {"uv": [11.5, 7, 11, 7.5], "texture": "#1"} - } - }, - { - "from": [7.5, 1.35, 20.55], - "to": [8.5, 2.5, 22.85], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 1.75, 19.475]}, - "faces": { - "north": {"uv": [7.5, 11, 8, 11.5], "texture": "#1"}, - "east": {"uv": [9.5, 9, 10.5, 9.5], "texture": "#1"}, - "south": {"uv": [11, 7.5, 11.5, 8], "texture": "#1"}, - "west": {"uv": [10, 1.5, 11, 2], "texture": "#1"}, - "up": {"uv": [7, 11, 6.5, 10], "texture": "#1"}, - "down": {"uv": [10.5, 6.5, 10, 7.5], "texture": "#1"} - } - }, - { - "from": [7.5, 5, 8.5], - "to": [8.5, 6, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 8.5]}, - "faces": { - "north": {"uv": [8.5, 11, 9, 11.5], "texture": "#1"}, - "east": {"uv": [11, 8.5, 11.5, 9], "texture": "#1"}, - "south": {"uv": [9, 11, 9.5, 11.5], "texture": "#1"}, - "west": {"uv": [11, 9, 11.5, 9.5], "texture": "#1"}, - "up": {"uv": [10, 11.5, 9.5, 11], "texture": "#1"}, - "down": {"uv": [11.5, 9.5, 11, 10], "texture": "#1"} - } - }, - { - "from": [7.7, 0.44014, 8.10413], - "to": [8.3, 3.04014, 10.60413], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 4.29014, 8.65413]}, - "faces": { - "north": {"uv": [9, 8, 9.5, 9.5], "texture": "#1"}, - "east": {"uv": [5, 4.5, 6.5, 6], "texture": "#1"}, - "south": {"uv": [3.5, 9.5, 4, 11], "texture": "#1"}, - "west": {"uv": [2, 5.5, 3.5, 7], "texture": "#1"}, - "up": {"uv": [4.5, 11, 4, 9.5], "texture": "#1"}, - "down": {"uv": [10, 5, 9.5, 6.5], "texture": "#1"} - } - }, - { - "from": [7.7, -1.34838, 5.92924], - "to": [8.3, 1.25162, 8.42924], - "rotation": {"angle": 45, "axis": "x", "origin": [8, -0.04838, 7.17924]}, - "faces": { - "north": {"uv": [9.5, 6.5, 10, 8], "texture": "#1"}, - "east": {"uv": [7, 0, 8, 1.5], "texture": "#1"}, - "south": {"uv": [7, 9.5, 7.5, 11], "texture": "#1"}, - "west": {"uv": [7, 5, 8, 6.5], "texture": "#1"}, - "up": {"uv": [10, 11, 9.5, 10], "texture": "#1"}, - "down": {"uv": [10.5, 9.5, 10, 10.5], "texture": "#1"} - } - }, - { - "from": [7.5, 1.06973, 14.27681], - "to": [8.49218, 2.56973, 23.27681], - "rotation": {"angle": 22.5, "axis": "x", "origin": [7.99609, 1.71973, 16.87681]}, - "faces": { - "north": {"uv": [11, 1, 10.5, 0], "rotation": 180, "texture": "#1"}, - "east": {"uv": [4.5, 6, 5.5, 8], "rotation": 90, "texture": "#1"}, - "south": {"uv": [2.5, 10.5, 2, 11.5], "texture": "#1"}, - "west": {"uv": [5.5, 6, 6.5, 8], "rotation": 270, "texture": "#1"}, - "up": {"uv": [8, 7.5, 8.5, 9.5], "texture": "#1"}, - "down": {"uv": [6, 8, 6.5, 10], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [7.75, 0.76924, 11.74672], - "to": [8.25, 0.86924, 13.99672], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 0.76924, 14.74672]}, - "faces": { - "north": {"uv": [11.5, 0.5, 12, 1], "texture": "#1"}, - "east": {"uv": [10.5, 1, 11.5, 1.5], "texture": "#1"}, - "south": {"uv": [1, 11.5, 1.5, 12], "texture": "#1"}, - "west": {"uv": [10.5, 3, 11.5, 3.5], "texture": "#1"}, - "up": {"uv": [11, 4.5, 10.5, 3.5], "texture": "#1"}, - "down": {"uv": [5, 10.5, 4.5, 11.5], "texture": "#1"} - } - }, - { - "from": [7.75, 0.76924, 11.14672], - "to": [8.25, 2.11924, 11.74672], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 0.76924, 14.74672]}, - "faces": { - "north": {"uv": [11.5, 1, 12, 1.5], "texture": "#1"}, - "east": {"uv": [1.5, 11.5, 2, 12], "texture": "#1"}, - "south": {"uv": [11.5, 1.5, 12, 2], "texture": "#1"}, - "west": {"uv": [2, 11.5, 2.5, 12], "texture": "#1"}, - "up": {"uv": [12, 2.5, 11.5, 2], "texture": "#1"}, - "down": {"uv": [3, 11.5, 2.5, 12], "texture": "#1"} - } - }, - { - "from": [7.75, 0.76924, 13.89672], - "to": [8.25, 2.11924, 14.49672], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 0.76924, 17.49672]}, - "faces": { - "north": {"uv": [11.5, 1, 12, 1.5], "texture": "#1"}, - "east": {"uv": [1.5, 11.5, 2, 12], "texture": "#1"}, - "south": {"uv": [11.5, 1.5, 12, 2], "texture": "#1"}, - "west": {"uv": [2, 11.5, 2.5, 12], "texture": "#1"}, - "up": {"uv": [12, 2.5, 11.5, 2], "texture": "#1"}, - "down": {"uv": [3, 11.5, 2.5, 12], "texture": "#1"} - } - }, - { - "from": [7.75, 1.06924, 12.54672], - "to": [8.25, 2.11924, 12.89672], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 1.59424, 12.82172]}, - "faces": { - "north": {"uv": [11.5, 2.5, 12, 3], "texture": "#1"}, - "east": {"uv": [3, 11.5, 3.5, 12], "texture": "#1"}, - "south": {"uv": [11.5, 3, 12, 3.5], "texture": "#1"}, - "west": {"uv": [3.5, 11.5, 4, 12], "texture": "#1"}, - "up": {"uv": [12, 4, 11.5, 3.5], "texture": "#1"}, - "down": {"uv": [4.5, 11.5, 4, 12], "texture": "#1"} - } - }, - { - "from": [7.5, 1.75, 3.75], - "to": [8.5, 2, 5.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 7.75]}, - "faces": { - "north": {"uv": [11.5, 4, 12, 4.5], "texture": "#1"}, - "east": {"uv": [10.5, 4.5, 11.5, 5], "texture": "#1"}, - "south": {"uv": [4.5, 11.5, 5, 12], "texture": "#1"}, - "west": {"uv": [5, 10.5, 6, 11], "texture": "#1"}, - "up": {"uv": [11, 6, 10.5, 5], "texture": "#1"}, - "down": {"uv": [11, 6, 10.5, 7], "texture": "#1"} - } - }, - { - "from": [7.7, 2.95, -13.25], - "to": [8.3, 3.55, 1.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.75, 4]}, - "faces": { - "north": {"uv": [11.5, 6, 12, 6.5], "texture": "#1"}, - "east": {"uv": [0, 4, 7.5, 4.5], "texture": "#1"}, - "south": {"uv": [6.5, 11.5, 7, 12], "texture": "#1"}, - "west": {"uv": [4, 2, 11.5, 2.5], "texture": "#1"}, - "up": {"uv": [0.5, 12, 0, 4.5], "texture": "#1"}, - "down": {"uv": [1, 4.5, 0.5, 12], "texture": "#1"} - } - }, - { - "from": [7.9, 3.55, -13], - "to": [8.1, 4.85, -12.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.75, 4]}, - "faces": { - "north": {"uv": [11.5, 6.5, 12, 7], "texture": "#1"}, - "east": {"uv": [7, 11.5, 7.5, 12], "texture": "#1"}, - "south": {"uv": [11.5, 7, 12, 7.5], "texture": "#1"}, - "west": {"uv": [7.5, 11.5, 8, 12], "texture": "#1"}, - "up": {"uv": [12, 8, 11.5, 7.5], "texture": "#1"}, - "down": {"uv": [8.5, 11.5, 8, 12], "texture": "#1"} - } - }, - { - "from": [7.7, 3.95, -5], - "to": [8.3, 4.55, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.75, 4]}, - "faces": { - "north": {"uv": [11.5, 8, 12, 8.5], "texture": "#1"}, - "east": {"uv": [7, 1.5, 10, 2], "texture": "#1"}, - "south": {"uv": [8.5, 11.5, 9, 12], "texture": "#1"}, - "west": {"uv": [7, 2.5, 10, 3], "texture": "#1"}, - "up": {"uv": [7.5, 9.5, 7, 6.5], "texture": "#1"}, - "down": {"uv": [8, 6.5, 7.5, 9.5], "texture": "#1"} - } - } - ], - "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": [-4, 1.5, 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, 22, 23, 24, 25, 26] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/lod/sks.json b/src/main/resources/assets/superbwarfare/models/lod/sks.json new file mode 100644 index 000000000..9c6fed786 --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/lod/sks.json @@ -0,0 +1,391 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "2": "superbwarfare:item/lod/sks", + "particle": "superbwarfare:item/lod/sks" + }, + "elements": [ + { + "from": [7.7, 3.24237, -5.95836], + "to": [8.3, 3.84237, -4.45836], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 3.54237, -5.58336]}, + "faces": { + "north": {"uv": [8.5, 2, 9, 2.5], "texture": "#2"}, + "east": {"uv": [8.5, 2.5, 9.5, 3], "texture": "#2"}, + "south": {"uv": [10, 0.5, 10.5, 1], "texture": "#2"}, + "west": {"uv": [9, 6.5, 10, 7], "texture": "#2"}, + "up": {"uv": [9.5, 8, 9, 7], "texture": "#2"}, + "down": {"uv": [8, 9, 7.5, 10], "texture": "#2"} + } + }, + { + "from": [7.5, 2, 0.25], + "to": [8.5, 3.5, 14.8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 7.75]}, + "faces": { + "north": {"uv": [9, 8, 9.5, 9], "texture": "#2"}, + "east": {"uv": [0, 0, 7.5, 1], "texture": "#2"}, + "south": {"uv": [9, 9, 9.5, 10], "texture": "#2"}, + "west": {"uv": [0, 1, 7.5, 2], "texture": "#2"}, + "up": {"uv": [0.5, 9.5, 0, 2], "texture": "#2"}, + "down": {"uv": [1, 2, 0.5, 9.5], "texture": "#2"} + } + }, + { + "from": [7.5, 3.5, 0.25], + "to": [8.5, 4.75, 5.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 7.75]}, + "faces": { + "north": {"uv": [4, 10, 4.5, 10.5], "texture": "#2"}, + "east": {"uv": [7, 3.5, 9.5, 4], "texture": "#2"}, + "south": {"uv": [10, 4, 10.5, 4.5], "texture": "#2"}, + "west": {"uv": [7, 4, 9.5, 4.5], "texture": "#2"}, + "up": {"uv": [4.5, 10, 4, 7.5], "texture": "#2"}, + "down": {"uv": [5, 7.5, 4.5, 10], "texture": "#2"} + } + }, + { + "from": [7.6, 3.5, 5.5], + "to": [8.4, 4.5, 6.75], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 7.75]}, + "faces": { + "north": {"uv": [4.5, 10, 5, 10.5], "texture": "#2"}, + "east": {"uv": [10, 4.5, 10.5, 5], "texture": "#2"}, + "south": {"uv": [5, 10, 5.5, 10.5], "texture": "#2"}, + "west": {"uv": [10, 5, 10.5, 5.5], "texture": "#2"}, + "up": {"uv": [10.5, 6, 10, 5.5], "texture": "#2"}, + "down": {"uv": [10.5, 6.5, 10, 7], "texture": "#2"} + } + }, + { + "from": [7.6, 3.5, 11.60156], + "to": [8.4, 4.5, 14.60156], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 7.75]}, + "faces": { + "north": {"uv": [10, 7, 10.5, 7.5], "texture": "#2"}, + "east": {"uv": [7.5, 1, 9, 1.5], "texture": "#2"}, + "south": {"uv": [7.5, 10, 8, 10.5], "texture": "#2"}, + "west": {"uv": [7.5, 1.5, 9, 2], "texture": "#2"}, + "up": {"uv": [6, 9, 5.5, 7.5], "texture": "#2"}, + "down": {"uv": [6.5, 7.5, 6, 9], "texture": "#2"} + } + }, + { + "from": [7.2, 2.2, 9.35156], + "to": [7.5, 3.25, 13.10156], + "rotation": {"angle": 0, "axis": "y", "origin": [7.9, 3.25, 7.75]}, + "faces": { + "north": {"uv": [10, 7, 10.5, 7.5], "texture": "#2"}, + "east": {"uv": [7.5, 1, 9, 1.5], "texture": "#2"}, + "south": {"uv": [7.5, 10, 8, 10.5], "texture": "#2"}, + "west": {"uv": [7.5, 1.5, 9, 2], "texture": "#2"}, + "up": {"uv": [5.5, 7.5, 6, 9], "texture": "#2"}, + "down": {"uv": [6, 7.5, 6.5, 9], "texture": "#2"} + } + }, + { + "from": [6.9, 2.4, 9.55156], + "to": [7.2, 4.55, 10.40156], + "rotation": {"angle": 0, "axis": "y", "origin": [8.1, 3.25, 7.75]}, + "faces": { + "north": {"uv": [10, 7, 10.5, 7.5], "texture": "#2"}, + "east": {"uv": [7.5, 1, 9, 1.5], "texture": "#2"}, + "south": {"uv": [7.5, 10, 8, 10.5], "texture": "#2"}, + "west": {"uv": [7.5, 1.5, 9, 2], "texture": "#2"}, + "up": {"uv": [5.5, 7.5, 6, 9], "texture": "#2"}, + "down": {"uv": [6, 7.5, 6.5, 9], "texture": "#2"} + } + }, + { + "from": [6.9, 4.55, 8.30156], + "to": [7.7, 5.25, 13.15156], + "rotation": {"angle": 0, "axis": "y", "origin": [8.1, 3.25, 10.25]}, + "faces": { + "north": {"uv": [10, 7, 10.5, 7.5], "texture": "#2"}, + "east": {"uv": [7.5, 1, 9, 1.5], "texture": "#2"}, + "south": {"uv": [7.5, 10, 8, 10.5], "texture": "#2"}, + "west": {"uv": [7.5, 1.5, 9, 2], "texture": "#2"}, + "up": {"uv": [5.5, 7.5, 6, 9], "texture": "#2"}, + "down": {"uv": [6, 7.5, 6.5, 9], "texture": "#2"} + } + }, + { + "from": [6.9, 2.4, 12.05156], + "to": [7.2, 4.55, 12.90156], + "rotation": {"angle": 0, "axis": "y", "origin": [8.1, 3.25, 10.25]}, + "faces": { + "north": {"uv": [10, 7, 10.5, 7.5], "texture": "#2"}, + "east": {"uv": [7.5, 1, 9, 1.5], "texture": "#2"}, + "south": {"uv": [7.5, 10, 8, 10.5], "texture": "#2"}, + "west": {"uv": [7.5, 1.5, 9, 2], "texture": "#2"}, + "up": {"uv": [5.5, 7.5, 6, 9], "texture": "#2"}, + "down": {"uv": [6, 7.5, 6.5, 9], "texture": "#2"} + } + }, + { + "from": [7.7, 3.5, 6.75156], + "to": [8.3, 4.5, 11.60156], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 7.75]}, + "faces": { + "north": {"uv": [10, 7.5, 10.5, 8], "texture": "#2"}, + "east": {"uv": [7.5, 0, 10, 0.5], "texture": "#2"}, + "south": {"uv": [8, 10, 8.5, 10.5], "texture": "#2"}, + "west": {"uv": [7.5, 0.5, 10, 1], "texture": "#2"}, + "up": {"uv": [5.5, 10, 5, 7.5], "texture": "#2"}, + "down": {"uv": [8, 5, 7.5, 7.5], "texture": "#2"} + } + }, + { + "from": [8.2, 3.75, 7.00156], + "to": [9.05, 4.25, 7.50156], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 7.75]}, + "faces": { + "north": {"uv": [8.5, 10, 9, 10.5], "texture": "#2"}, + "east": {"uv": [10, 8.5, 10.5, 9], "texture": "#2"}, + "south": {"uv": [9, 10, 9.5, 10.5], "texture": "#2"}, + "west": {"uv": [10, 9, 10.5, 9.5], "texture": "#2"}, + "up": {"uv": [10.5, 10, 10, 9.5], "texture": "#2"}, + "down": {"uv": [10.5, 10, 10, 10.5], "texture": "#2"} + } + }, + { + "from": [7.5, 4.5, 5.5], + "to": [8.5, 4.65, 7.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 7.75]}, + "faces": { + "north": {"uv": [0, 10.5, 0.5, 11], "texture": "#2"}, + "east": {"uv": [0, 9.5, 1, 10], "texture": "#2"}, + "south": {"uv": [0.5, 10.5, 1, 11], "texture": "#2"}, + "west": {"uv": [9.5, 1, 10.5, 1.5], "texture": "#2"}, + "up": {"uv": [10, 2.5, 9.5, 1.5], "texture": "#2"}, + "down": {"uv": [10, 3.5, 9.5, 4.5], "texture": "#2"} + } + }, + { + "from": [7.5, 1, 16.45], + "to": [8.5, 2.5, 23.6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 2.25, 8.85]}, + "faces": { + "north": {"uv": [9.5, 5, 10, 6], "texture": "#2"}, + "east": {"uv": [2, 3, 5.5, 4], "texture": "#2"}, + "south": {"uv": [6.5, 9.5, 7, 10.5], "texture": "#2"}, + "west": {"uv": [2, 4, 5.5, 5], "texture": "#2"}, + "up": {"uv": [3, 10.5, 2.5, 7], "texture": "#2"}, + "down": {"uv": [3.5, 7, 3, 10.5], "texture": "#2"} + } + }, + { + "from": [7.5, -1.5, 22.6], + "to": [8.5, 1, 23.6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 2.25, 8.85]}, + "faces": { + "north": {"uv": [7.5, 7.5, 8, 9], "texture": "#2"}, + "east": {"uv": [8, 5, 8.5, 6.5], "texture": "#2"}, + "south": {"uv": [8, 6.5, 8.5, 8], "texture": "#2"}, + "west": {"uv": [7, 8, 7.5, 9.5], "texture": "#2"}, + "up": {"uv": [11, 1, 10.5, 0.5], "texture": "#2"}, + "down": {"uv": [1.5, 10.5, 1, 11], "texture": "#2"} + } + }, + { + "from": [7.5, 1.35, 20.55], + "to": [8.5, 2.5, 22.85], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 1.75, 19.475]}, + "faces": { + "north": {"uv": [10.5, 1, 11, 1.5], "texture": "#2"}, + "east": {"uv": [9.5, 2.5, 10.5, 3], "texture": "#2"}, + "south": {"uv": [1.5, 10.5, 2, 11], "texture": "#2"}, + "west": {"uv": [9.5, 6, 10.5, 6.5], "texture": "#2"}, + "up": {"uv": [7.5, 10.5, 7, 9.5], "texture": "#2"}, + "down": {"uv": [10, 7, 9.5, 8], "texture": "#2"} + } + }, + { + "from": [7.5, 5, 8.5], + "to": [8.5, 6, 8.75], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 8.5]}, + "faces": { + "north": {"uv": [10.5, 1.5, 11, 2], "texture": "#2"}, + "east": {"uv": [10.5, 2, 11, 2.5], "texture": "#2"}, + "south": {"uv": [2.5, 10.5, 3, 11], "texture": "#2"}, + "west": {"uv": [10.5, 2.5, 11, 3], "texture": "#2"}, + "up": {"uv": [3.5, 11, 3, 10.5], "texture": "#2"}, + "down": {"uv": [11, 3, 10.5, 3.5], "texture": "#2"} + } + }, + { + "from": [7.7, 0.44014, 8.10413], + "to": [8.3, 3.04014, 10.60413], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 4.29014, 8.65413]}, + "faces": { + "north": {"uv": [8, 8, 8.5, 9.5], "texture": "#2"}, + "east": {"uv": [2, 5, 3.5, 6.5], "texture": "#2"}, + "south": {"uv": [8.5, 5, 9, 6.5], "texture": "#2"}, + "west": {"uv": [3.5, 5, 5, 6.5], "texture": "#2"}, + "up": {"uv": [9, 8, 8.5, 6.5], "texture": "#2"}, + "down": {"uv": [9, 8, 8.5, 9.5], "texture": "#2"} + } + }, + { + "from": [7.7, -1.34838, 5.92924], + "to": [8.3, 1.25162, 8.42924], + "rotation": {"angle": 45, "axis": "x", "origin": [8, -0.04838, 7.17924]}, + "faces": { + "north": {"uv": [9, 1, 9.5, 2.5], "texture": "#2"}, + "east": {"uv": [5, 5, 6.5, 6.5], "texture": "#2"}, + "south": {"uv": [9, 5, 9.5, 6.5], "texture": "#2"}, + "west": {"uv": [5.5, 3, 7, 4.5], "texture": "#2"}, + "up": {"uv": [6, 10.5, 5.5, 9], "texture": "#2"}, + "down": {"uv": [6.5, 9, 6, 10.5], "texture": "#2"} + } + }, + { + "from": [7.5, 1.06973, 14.27681], + "to": [8.49218, 2.56973, 23.27681], + "rotation": {"angle": 22.5, "axis": "x", "origin": [7.99609, 1.71973, 16.87681]}, + "faces": { + "north": {"uv": [3.5, 10.5, 4, 11], "texture": "#2"}, + "east": {"uv": [5.5, 4.5, 10, 5], "texture": "#2"}, + "south": {"uv": [10.5, 3.5, 11, 4], "texture": "#2"}, + "west": {"uv": [2, 6.5, 6.5, 7], "texture": "#2"}, + "up": {"uv": [7, 9.5, 6.5, 5], "texture": "#2"}, + "down": {"uv": [2.5, 7, 2, 11.5], "texture": "#2"} + } + }, + { + "from": [7.75, 0.76924, 11.74672], + "to": [8.25, 0.86924, 13.99672], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 0.76924, 14.74672]}, + "faces": { + "north": {"uv": [4, 10.5, 4.5, 11], "texture": "#2"}, + "east": {"uv": [8, 9.5, 9, 10], "texture": "#2"}, + "south": {"uv": [10.5, 4, 11, 4.5], "texture": "#2"}, + "west": {"uv": [9.5, 8, 10.5, 8.5], "texture": "#2"}, + "up": {"uv": [10, 9.5, 9.5, 8.5], "texture": "#2"}, + "down": {"uv": [10, 9.5, 9.5, 10.5], "texture": "#2"} + } + }, + { + "from": [7.75, 0.76924, 11.14672], + "to": [8.25, 2.11924, 11.74672], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 0.76924, 14.74672]}, + "faces": { + "north": {"uv": [4.5, 10.5, 5, 11], "texture": "#2"}, + "east": {"uv": [10.5, 4.5, 11, 5], "texture": "#2"}, + "south": {"uv": [5, 10.5, 5.5, 11], "texture": "#2"}, + "west": {"uv": [10.5, 5, 11, 5.5], "texture": "#2"}, + "up": {"uv": [6, 11, 5.5, 10.5], "texture": "#2"}, + "down": {"uv": [11, 5.5, 10.5, 6], "texture": "#2"} + } + }, + { + "from": [7.75, 0.76924, 13.89672], + "to": [8.25, 2.11924, 14.49672], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 0.76924, 17.49672]}, + "faces": { + "north": {"uv": [4.5, 10.5, 5, 11], "texture": "#2"}, + "east": {"uv": [10.5, 4.5, 11, 5], "texture": "#2"}, + "south": {"uv": [5, 10.5, 5.5, 11], "texture": "#2"}, + "west": {"uv": [10.5, 5, 11, 5.5], "texture": "#2"}, + "up": {"uv": [5.5, 10.5, 6, 11], "texture": "#2"}, + "down": {"uv": [10.5, 5.5, 11, 6], "texture": "#2"} + } + }, + { + "from": [7.75, 1.06924, 12.54672], + "to": [8.25, 2.11924, 12.89672], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 1.59424, 12.82172]}, + "faces": { + "north": {"uv": [6, 10.5, 6.5, 11], "texture": "#2"}, + "east": {"uv": [10.5, 6, 11, 6.5], "texture": "#2"}, + "south": {"uv": [6.5, 10.5, 7, 11], "texture": "#2"}, + "west": {"uv": [10.5, 6.5, 11, 7], "texture": "#2"}, + "up": {"uv": [7.5, 11, 7, 10.5], "texture": "#2"}, + "down": {"uv": [11, 7, 10.5, 7.5], "texture": "#2"} + } + }, + { + "from": [7.5, 1.75, 3.75], + "to": [8.5, 2, 5.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.25, 7.75]}, + "faces": { + "north": {"uv": [7.5, 10.5, 8, 11], "texture": "#2"}, + "east": {"uv": [0, 10, 1, 10.5], "texture": "#2"}, + "south": {"uv": [10.5, 7.5, 11, 8], "texture": "#2"}, + "west": {"uv": [10, 0, 11, 0.5], "texture": "#2"}, + "up": {"uv": [10.5, 2.5, 10, 1.5], "texture": "#2"}, + "down": {"uv": [10.5, 3, 10, 4], "texture": "#2"} + } + }, + { + "from": [7.7, 2.95, -13.25], + "to": [8.3, 3.55, 1.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.75, 4]}, + "faces": { + "north": {"uv": [8, 10.5, 8.5, 11], "texture": "#2"}, + "east": {"uv": [1, 2, 8.5, 2.5], "texture": "#2"}, + "south": {"uv": [10.5, 8, 11, 8.5], "texture": "#2"}, + "west": {"uv": [1, 2.5, 8.5, 3], "texture": "#2"}, + "up": {"uv": [1.5, 10.5, 1, 3], "texture": "#2"}, + "down": {"uv": [2, 3, 1.5, 10.5], "texture": "#2"} + } + }, + { + "from": [7.9, 3.55, -13], + "to": [8.1, 4.85, -12.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.75, 4]}, + "faces": { + "north": {"uv": [8.5, 10.5, 9, 11], "texture": "#2"}, + "east": {"uv": [10.5, 8.5, 11, 9], "texture": "#2"}, + "south": {"uv": [9, 10.5, 9.5, 11], "texture": "#2"}, + "west": {"uv": [10.5, 9, 11, 9.5], "texture": "#2"}, + "up": {"uv": [10, 11, 9.5, 10.5], "texture": "#2"}, + "down": {"uv": [11, 9.5, 10.5, 10], "texture": "#2"} + } + }, + { + "from": [7.7, 3.95, -5], + "to": [8.3, 4.55, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.75, 4]}, + "faces": { + "north": {"uv": [10, 10.5, 10.5, 11], "texture": "#2"}, + "east": {"uv": [7, 3, 10, 3.5], "texture": "#2"}, + "south": {"uv": [10.5, 10, 11, 10.5], "texture": "#2"}, + "west": {"uv": [3.5, 7, 6.5, 7.5], "texture": "#2"}, + "up": {"uv": [7.5, 8, 7, 5], "texture": "#2"}, + "down": {"uv": [4, 7.5, 3.5, 10.5], "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": [-4, 1.5, 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, 22, 23, 24, 25, 26] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/textures/item/lod/sks.png b/src/main/resources/assets/superbwarfare/textures/item/lod/sks.png new file mode 100644 index 0000000000000000000000000000000000000000..71db233dd49237c3449627d8a4e48bac0366e438 GIT binary patch literal 413 zcmV;O0b>4%P)Px$S4l)cR9J=WmZ5ILFc60SR3WW#0@oLC*=VGeRT}LJENs%aX=!++vAu<*v4OCz zYdeIm#F0^v!eBaIk>f-A!nLjqtu;B8wFbJ7 z!m$4ds|{^Qx?C!bW44Hz04lDItUxIYa$=rdr=Ti?0?UCed!;abb)XC-ffNRZ$pfC# z6neA1vYyLbroc-;97Vk(ym=S+*l6)7X03~`DWOYb97Tvvd$x$qH6Vq76b4GE+BbXj zmQhNvT=XtP@o5i~T(YAtvJ3#-h2D38%c;8w=;H(pFBVR2&gCb-E|^10(BItFDO=tY z(?*aa$r+WcHJz{UwcU1ZtESqY=Q-&@>V$Jk9vB!H_!s;DTdsHkS(S)?00000NkvXX Hu0mjfD@eJH literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/superbwarfare/textures/item/sks_l.png b/src/main/resources/assets/superbwarfare/textures/item/sks_l.png deleted file mode 100644 index 54aaf12a138766db398b2bfef150083b8db7d6fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 430 zcmV;f0a5;mP)LoWY<%L40(058F61pR2PNhs z75WNL==G|tth09(&=<48^ex~mz>(Z8PVuaOI&3JeO@l;;KhL>%Cjrw$HpjN@Zn7$Yk{Ne= za=T0xa^1%4NvLkSvMh%kpnvfyIVmOX0Gv-JfRN${9{2nH+B9s?ctWZ?HXXmRva&+) Y4eOq!w&zU8ga7~l07*qoM6N<$f|T>dF#rGn