diff --git a/src/generated/resources/assets/superbwarfare/models/item/taser.json b/src/generated/resources/assets/superbwarfare/models/item/taser.json new file mode 100644 index 000000000..a159bf6af --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/taser.json @@ -0,0 +1,28 @@ +{ + "parent": "minecraft:item/generated", + "base": { + "parent": "superbwarfare:item/taser_base" + }, + "gui_light": "front", + "loader": "forge:separate_transforms", + "perspectives": { + "fixed": { + "parent": "superbwarfare:lod/taser" + }, + "ground": { + "parent": "superbwarfare:lod/taser" + }, + "gui": { + "parent": "superbwarfare:item/taser_icon" + }, + "head": { + "parent": "superbwarfare:lod/taser" + }, + "thirdperson_lefthand": { + "parent": "superbwarfare:lod/taser" + }, + "thirdperson_righthand": { + "parent": "superbwarfare:lod/taser" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/taser_base.json b/src/generated/resources/assets/superbwarfare/models/item/taser_base.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/taser_base.json rename to src/generated/resources/assets/superbwarfare/models/item/taser_base.json index 13c7cef0c..b8f4d43c6 100644 --- a/src/main/resources/assets/superbwarfare/models/item/taser_base.json +++ b/src/generated/resources/assets/superbwarfare/models/item/taser_base.json @@ -1,6 +1,6 @@ { "parent": "superbwarfare:displaysettings/taser.item", "textures": { - "layer0": "superbwarfare:item/tasergun" + "layer0": "superbwarfare:item/taser" } } \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/taser_icon.json b/src/generated/resources/assets/superbwarfare/models/item/taser_icon.json new file mode 100644 index 000000000..a760046ed --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/taser_icon.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "superbwarfare:item/taser_icon" + } +} \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/TaserItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/TaserItemModel.java index 0fda60c18..931c1e3c3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/TaserItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/TaserItemModel.java @@ -29,7 +29,7 @@ public class TaserItemModel extends GeoModel { @Override public ResourceLocation getTextureResource(TaserItem animatable) { - return Mod.loc("textures/item/tasergun.png"); + return Mod.loc("textures/item/taser.png"); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java index edb81059c..8a4595b92 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -60,6 +60,7 @@ public class ModItemModelProvider extends ItemModelProvider { gunItem(ModItems.SENTINEL); gunItem(ModItems.SKS); gunItem(ModItems.SVD); + gunItem(ModItems.TASER); simpleItem(ModItems.EMPTY_PERK, "perk/"); diff --git a/src/main/resources/assets/superbwarfare/models/custom/taser_electrode.json b/src/main/resources/assets/superbwarfare/models/custom/taser_electrode.json deleted file mode 100644 index 35a434989..000000000 --- a/src/main/resources/assets/superbwarfare/models/custom/taser_electrode.json +++ /dev/null @@ -1,879 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [ - 32, - 32 - ], - "elements": [ - { - "from": [ - 7.55, - 7.55, - 5.9 - ], - "to": [ - 8.45, - 9.05, - 6 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8.3, - 8.75 - ] - }, - "faces": { - "north": { - "uv": [ - 4, - 5.5, - 4.5, - 6.25 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 9.5, - 5.5, - 9.625, - 6.25 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 0, - 6, - 0.5, - 6.75 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 6, - 9.5, - 6.125, - 10.25 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 5.5, - 10.125, - 5, - 10 - ], - "texture": "#0" - }, - "down": { - "uv": [ - 10.5, - 5, - 10, - 5.125 - ], - "texture": "#0" - } - } - }, - { - "from": [ - 7.35, - 7.45, - 5.95 - ], - "to": [ - 8.65, - 9.15, - 7.5 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8, - 8.3, - 8.75 - ] - }, - "faces": { - "north": { - "uv": [ - 0, - 5, - 0.625, - 5.875 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 1, - 4, - 1.75, - 4.875 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 1, - 5, - 1.625, - 5.875 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 2, - 4, - 2.75, - 4.875 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 3.625, - 6.25, - 3, - 5.5 - ], - "texture": "#0" - }, - "down": { - "uv": [ - 6.125, - 3, - 5.5, - 3.75 - ], - "texture": "#0" - } - } - }, - { - "from": [ - 7.5, - 7.15, - 7.25 - ], - "to": [ - 8.5, - 9.55, - 7.5 - ], - "rotation": { - "angle": 0, - "axis": "y", - "origin": [ - 8.05, - 8.3, - 8.75 - ] - }, - "faces": { - "north": { - "uv": [ - 4, - 2, - 4.5, - 3.25 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 6, - 8, - 6.125, - 9.25 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 3, - 4, - 3.5, - 5.25 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 8, - 6, - 8.125, - 7.25 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 6, - 10.125, - 5.5, - 10 - ], - "texture": "#0" - }, - "down": { - "uv": [ - 10.5, - 5.5, - 10, - 5.625 - ], - "texture": "#0" - } - } - }, - { - "from": [ - 7.5, - 9.09825, - 6.88986 - ], - "to": [ - 8.5, - 9.49825, - 7.33986 - ], - "rotation": { - "angle": -22.5, - "axis": "x", - "origin": [ - 8, - 9.29825, - 7.16486 - ] - }, - "faces": { - "north": { - "uv": [ - 8.5, - 6.5, - 9, - 6.75 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 10, - 6, - 10.25, - 6.25 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 8.5, - 7, - 9, - 7.25 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 6.5, - 10, - 6.75, - 10.25 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 9, - 7.75, - 8.5, - 7.5 - ], - "texture": "#0" - }, - "down": { - "uv": [ - 8.5, - 8.5, - 8, - 8.75 - ], - "texture": "#0" - } - } - }, - { - "from": [ - 7.5, - 7.20175, - 6.88986 - ], - "to": [ - 8.5, - 7.60175, - 7.33986 - ], - "rotation": { - "angle": 22.5, - "axis": "x", - "origin": [ - 8, - 7.40175, - 7.16486 - ] - }, - "faces": { - "north": { - "uv": [ - 8.5, - 8, - 9, - 8.25 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 10, - 6.5, - 10.25, - 6.75 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 8.5, - 8.5, - 9, - 8.75 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 7, - 10, - 7.25, - 10.25 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 0.5, - 9.25, - 0, - 9 - ], - "texture": "#0" - }, - "down": { - "uv": [ - 1, - 9, - 0.5, - 9.25 - ], - "texture": "#0" - } - } - }, - { - "from": [ - 7.5, - 7.0257, - 6.16269 - ], - "to": [ - 8.5, - 7.4257, - 6.61269 - ], - "rotation": { - "angle": 22.5, - "axis": "x", - "origin": [ - 8, - 7.4757, - 7.18769 - ] - }, - "faces": { - "north": { - "uv": [ - 1, - 9, - 1.5, - 9.25 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 10, - 7, - 10.25, - 7.25 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 1.5, - 9, - 2, - 9.25 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 7.5, - 10, - 7.75, - 10.25 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 2.5, - 9.25, - 2, - 9 - ], - "texture": "#0" - }, - "down": { - "uv": [ - 3, - 9, - 2.5, - 9.25 - ], - "texture": "#0" - } - } - }, - { - "from": [ - 7.5, - 8.92605, - 6.12411 - ], - "to": [ - 8.5, - 9.32605, - 6.57411 - ], - "rotation": { - "angle": -22.5, - "axis": "x", - "origin": [ - 8, - 9.12605, - 6.39911 - ] - }, - "faces": { - "north": { - "uv": [ - 3, - 9, - 3.5, - 9.25 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 10, - 7.5, - 10.25, - 7.75 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 3.5, - 9, - 4, - 9.25 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 8, - 10, - 8.25, - 10.25 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 9.5, - 4.25, - 9, - 4 - ], - "texture": "#0" - }, - "down": { - "uv": [ - 5, - 9, - 4.5, - 9.25 - ], - "texture": "#0" - } - } - }, - { - "from": [ - 7.5, - 9.07779, - 6.48425 - ], - "to": [ - 8.5, - 9.37779, - 6.93425 - ], - "rotation": { - "angle": 0, - "axis": "x", - "origin": [ - 8, - 9.17779, - 6.05925 - ] - }, - "faces": { - "north": { - "uv": [ - 10, - 8, - 10.5, - 8.125 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 10.5, - 8.5, - 10.75, - 8.625 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 8.5, - 10, - 9, - 10.125 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 9, - 10.5, - 9.25, - 10.625 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 9.5, - 4.75, - 9, - 4.5 - ], - "texture": "#0" - }, - "down": { - "uv": [ - 5.5, - 9, - 5, - 9.25 - ], - "texture": "#0" - } - } - }, - { - "from": [ - 7.5, - 7.28, - 6.48425 - ], - "to": [ - 8.5, - 7.51, - 6.93425 - ], - "rotation": { - "angle": 0, - "axis": "x", - "origin": [ - 8, - 9.17221, - 5.85925 - ] - }, - "faces": { - "north": { - "uv": [ - 10, - 8.5, - 10.5, - 8.625 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 10.5, - 9, - 10.75, - 9.125 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 9, - 10, - 9.5, - 10.125 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 9.5, - 10.5, - 9.75, - 10.625 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 9.5, - 5.25, - 9, - 5 - ], - "texture": "#0" - }, - "down": { - "uv": [ - 6, - 9, - 5.5, - 9.25 - ], - "texture": "#0" - } - } - }, - { - "from": [ - 7.25, - 7.98995, - 7.93076 - ], - "to": [ - 8.75, - 8.78995, - 8.73076 - ], - "rotation": { - "angle": 45, - "axis": "x", - "origin": [ - 8, - 9.28995, - 7.83076 - ] - }, - "faces": { - "north": { - "uv": [ - 6.5, - 4, - 7.25, - 4.375 - ], - "texture": "#0" - }, - "east": { - "uv": [ - 4.5, - 8.5, - 4.875, - 8.875 - ], - "texture": "#0" - }, - "south": { - "uv": [ - 4.5, - 6.5, - 5.25, - 6.875 - ], - "texture": "#0" - }, - "west": { - "uv": [ - 5, - 8.5, - 5.375, - 8.875 - ], - "texture": "#0" - }, - "up": { - "uv": [ - 7.25, - 4.875, - 6.5, - 4.5 - ], - "texture": "#0" - }, - "down": { - "uv": [ - 7.25, - 5, - 6.5, - 5.375 - ], - "texture": "#0" - } - } - } - ], - "gui_light": "front", - "display": { - "thirdperson_righthand": { - "translation": [ - 0, - -0.25, - 2 - ] - }, - "thirdperson_lefthand": { - "translation": [ - 0, - -0.25, - 2 - ] - }, - "firstperson_righthand": { - "rotation": [ - 85.36, - -8.76, - 9.32 - ], - "translation": [ - 0, - 1.5, - 2 - ] - }, - "firstperson_lefthand": { - "rotation": [ - 85.36, - -8.76, - 9.32 - ], - "translation": [ - 0, - 1.5, - 2 - ] - }, - "gui": { - "rotation": [ - -134.25, - 45, - -180 - ], - "translation": [ - 1.75, - 1, - 0 - ], - "scale": [ - 3, - 3, - 3 - ] - }, - "head": { - "translation": [ - 0, - 10.25, - -1.25 - ] - }, - "fixed": { - "translation": [ - 0, - 0.5, - 1.25 - ], - "scale": [ - 1.5, - 1.5, - 1.5 - ] - } - }, - "groups": [ - { - "name": "group", - "origin": [ - 8, - 9.28995, - 4.83076 - ], - "color": 0, - "children": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9 - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/taser.json b/src/main/resources/assets/superbwarfare/models/item/taser.json deleted file mode 100644 index 83826a4b0..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/taser.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "loader": "neoforge:separate_transforms", - "gui_light": "front", - "base": { - "parent": "superbwarfare:item/taser_base" - }, - "perspectives": { - "gui": { - "parent": "superbwarfare:item/taser3d" - }, - "thirdperson_righthand": { - "parent": "superbwarfare:item/taser3d" - }, - "thirdperson_lefthand": { - "parent": "superbwarfare:item/taser3d" - }, - "ground": { - "parent": "superbwarfare:item/taser3d" - }, - "fixed": { - "parent": "superbwarfare:item/taser3d" - }, - "head": { - "parent": "superbwarfare:item/taser3d" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/taser_electrode.json b/src/main/resources/assets/superbwarfare/models/item/taser_electrode.json index 2cc8afb34..441c85a97 100644 --- a/src/main/resources/assets/superbwarfare/models/item/taser_electrode.json +++ b/src/main/resources/assets/superbwarfare/models/item/taser_electrode.json @@ -1,7 +1,175 @@ { - "parent": "superbwarfare:custom/taser_electrode", - "textures": { - "0": "superbwarfare:block/tasergun", - "particle": "superbwarfare:item/tasergun" - } + "credit": "Made with Blockbench", + "textures": { + "2": "superbwarfare:item/taser_electrode" + }, + "elements": [ + { + "from": [7.55, 7.55, 5.9], + "to": [8.45, 9.05, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.3, 8.75]}, + "faces": { + "north": {"uv": [2, 0, 3, 2], "texture": "#2"}, + "east": {"uv": [2, 2, 3, 4], "texture": "#2"}, + "south": {"uv": [3, 0, 4, 2], "texture": "#2"}, + "west": {"uv": [3, 2, 4, 4], "texture": "#2"}, + "up": {"uv": [1, 7, 0, 6], "texture": "#2"}, + "down": {"uv": [7, 0, 6, 1], "texture": "#2"} + } + }, + { + "from": [7.35, 7.45, 5.95], + "to": [8.65, 9.15, 7.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.3, 8.75]}, + "faces": { + "north": {"uv": [0, 4, 1, 6], "texture": "#2"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#2"}, + "south": {"uv": [4, 0, 5, 2], "texture": "#2"}, + "west": {"uv": [0, 2, 2, 4], "texture": "#2"}, + "up": {"uv": [2, 6, 1, 4], "texture": "#2"}, + "down": {"uv": [3, 4, 2, 6], "texture": "#2"} + } + }, + { + "from": [7.5, 7.15, 7.25], + "to": [8.5, 9.55, 7.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8.05, 8.3, 8.75]}, + "faces": { + "north": {"uv": [4, 2, 5, 4], "texture": "#2"}, + "east": {"uv": [3, 4, 4, 6], "texture": "#2"}, + "south": {"uv": [4, 4, 5, 6], "texture": "#2"}, + "west": {"uv": [5, 0, 6, 2], "texture": "#2"}, + "up": {"uv": [2, 7, 1, 6], "texture": "#2"}, + "down": {"uv": [7, 1, 6, 2], "texture": "#2"} + } + }, + { + "from": [7.5, 9.09825, 6.88986], + "to": [8.5, 9.49825, 7.33986], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 9.29825, 7.16486]}, + "faces": { + "north": {"uv": [2, 6, 3, 7], "texture": "#2"}, + "east": {"uv": [3, 6, 4, 7], "texture": "#2"}, + "south": {"uv": [4, 6, 5, 7], "texture": "#2"}, + "west": {"uv": [5, 6, 6, 7], "texture": "#2"}, + "up": {"uv": [7, 7, 6, 6], "texture": "#2"}, + "down": {"uv": [1, 7, 0, 8], "texture": "#2"} + } + }, + { + "from": [7.5, 7.20175, 6.88986], + "to": [8.5, 7.60175, 7.33986], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 7.40175, 7.16486]}, + "faces": { + "north": {"uv": [7, 0, 8, 1], "texture": "#2"}, + "east": {"uv": [1, 7, 2, 8], "texture": "#2"}, + "south": {"uv": [7, 1, 8, 2], "texture": "#2"}, + "west": {"uv": [2, 7, 3, 8], "texture": "#2"}, + "up": {"uv": [8, 3, 7, 2], "texture": "#2"}, + "down": {"uv": [4, 7, 3, 8], "texture": "#2"} + } + }, + { + "from": [7.5, 7.0257, 6.16269], + "to": [8.5, 7.4257, 6.61269], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 7.4757, 7.18769]}, + "faces": { + "north": {"uv": [7, 3, 8, 4], "texture": "#2"}, + "east": {"uv": [4, 7, 5, 8], "texture": "#2"}, + "south": {"uv": [7, 4, 8, 5], "texture": "#2"}, + "west": {"uv": [5, 7, 6, 8], "texture": "#2"}, + "up": {"uv": [8, 6, 7, 5], "texture": "#2"}, + "down": {"uv": [7, 7, 6, 8], "texture": "#2"} + } + }, + { + "from": [7.5, 8.92605, 6.12411], + "to": [8.5, 9.32605, 6.57411], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 9.12605, 6.39911]}, + "faces": { + "north": {"uv": [7, 6, 8, 7], "texture": "#2"}, + "east": {"uv": [7, 7, 8, 8], "texture": "#2"}, + "south": {"uv": [0, 8, 1, 9], "texture": "#2"}, + "west": {"uv": [8, 0, 9, 1], "texture": "#2"}, + "up": {"uv": [2, 9, 1, 8], "texture": "#2"}, + "down": {"uv": [9, 1, 8, 2], "texture": "#2"} + } + }, + { + "from": [7.5, 9.07779, 6.48425], + "to": [8.5, 9.37779, 6.93425], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 9.17779, 6.05925]}, + "faces": { + "north": {"uv": [2, 8, 3, 9], "texture": "#2"}, + "east": {"uv": [8, 2, 9, 3], "texture": "#2"}, + "south": {"uv": [3, 8, 4, 9], "texture": "#2"}, + "west": {"uv": [8, 3, 9, 4], "texture": "#2"}, + "up": {"uv": [5, 9, 4, 8], "texture": "#2"}, + "down": {"uv": [9, 4, 8, 5], "texture": "#2"} + } + }, + { + "from": [7.5, 7.28, 6.48425], + "to": [8.5, 7.51, 6.93425], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 9.17221, 5.85925]}, + "faces": { + "north": {"uv": [5, 8, 6, 9], "texture": "#2"}, + "east": {"uv": [8, 5, 9, 6], "texture": "#2"}, + "south": {"uv": [6, 8, 7, 9], "texture": "#2"}, + "west": {"uv": [8, 6, 9, 7], "texture": "#2"}, + "up": {"uv": [8, 9, 7, 8], "texture": "#2"}, + "down": {"uv": [9, 7, 8, 8], "texture": "#2"} + } + }, + { + "from": [7.25, 7.98995, 7.93076], + "to": [8.75, 8.78995, 8.73076], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 9.28995, 7.83076]}, + "faces": { + "north": {"uv": [5, 2, 7, 3], "texture": "#2"}, + "east": {"uv": [8, 8, 9, 9], "texture": "#2"}, + "south": {"uv": [5, 3, 7, 4], "texture": "#2"}, + "west": {"uv": [0, 9, 1, 10], "texture": "#2"}, + "up": {"uv": [7, 5, 5, 4], "texture": "#2"}, + "down": {"uv": [7, 5, 5, 6], "texture": "#2"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "translation": [0, -0.25, 2] + }, + "thirdperson_lefthand": { + "translation": [0, -0.25, 2] + }, + "firstperson_righthand": { + "rotation": [85.36, -8.76, 9.32], + "translation": [0, 1.5, 2] + }, + "firstperson_lefthand": { + "rotation": [85.36, -8.76, 9.32], + "translation": [0, 1.5, 2] + }, + "gui": { + "rotation": [-134.25, 45, -180], + "translation": [1.75, 1, 0], + "scale": [3, 3, 3] + }, + "head": { + "translation": [0, 10.25, -1.25] + }, + "fixed": { + "translation": [0, 0.5, 1.25], + "scale": [1.5, 1.5, 1.5] + } + }, + "groups": [ + { + "name": "group", + "origin": [8, 9.28995, 4.83076], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/taser3d.json b/src/main/resources/assets/superbwarfare/models/lod/taser.json similarity index 99% rename from src/main/resources/assets/superbwarfare/models/item/taser3d.json rename to src/main/resources/assets/superbwarfare/models/lod/taser.json index b144ef0f0..914a7443d 100644 --- a/src/main/resources/assets/superbwarfare/models/item/taser3d.json +++ b/src/main/resources/assets/superbwarfare/models/lod/taser.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "superbwarfare:item/tasergun" + "0": "superbwarfare:item/lod/taser" }, "elements": [ { diff --git a/src/main/resources/assets/superbwarfare/textures/item/tasergun.png b/src/main/resources/assets/superbwarfare/textures/item/lod/taser.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/tasergun.png rename to src/main/resources/assets/superbwarfare/textures/item/lod/taser.png diff --git a/src/main/resources/assets/superbwarfare/textures/item/taser.png b/src/main/resources/assets/superbwarfare/textures/item/taser.png new file mode 100644 index 000000000..49791febc Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/item/taser.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/taser_electrode.png b/src/main/resources/assets/superbwarfare/textures/item/taser_electrode.png new file mode 100644 index 000000000..aba08fa23 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/item/taser_electrode.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/taser_icon.png b/src/main/resources/assets/superbwarfare/textures/item/taser_icon.png new file mode 100644 index 000000000..35dc97a92 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/item/taser_icon.png differ