From d6ac41a7e321a9f3adf7535de58d5c445d34307a Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Mon, 10 Jun 2024 14:11:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B3=B0=E7=91=9F=E6=9C=A8?= =?UTF-8?q?=E4=BB=93=E7=9A=84=E5=B1=8F=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../target/client/layer/TaserLayer2.java | 27 ++ .../client/model/item/TaserItemModel.java | 14 +- .../renderer/item/TaserItemRenderer.java | 2 + .../assets/target/geo/taser.geo.json | 422 +++--------------- .../assets/target/textures/item/tasergun.png | Bin 5208 -> 5155 bytes .../target/textures/item/tasergun_e.png | Bin 199 -> 18986 bytes .../target/textures/item/tasergun_e2.png | Bin 0 -> 16756 bytes .../resources/data/target/guns/taser.json | 2 +- 8 files changed, 93 insertions(+), 374 deletions(-) create mode 100644 src/main/java/net/mcreator/target/client/layer/TaserLayer2.java create mode 100644 src/main/resources/assets/target/textures/item/tasergun_e2.png diff --git a/src/main/java/net/mcreator/target/client/layer/TaserLayer2.java b/src/main/java/net/mcreator/target/client/layer/TaserLayer2.java new file mode 100644 index 000000000..bedad6305 --- /dev/null +++ b/src/main/java/net/mcreator/target/client/layer/TaserLayer2.java @@ -0,0 +1,27 @@ +package net.mcreator.target.client.layer; + +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import net.mcreator.target.item.gun.Taser; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.resources.ResourceLocation; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.renderer.GeoRenderer; +import software.bernie.geckolib.renderer.layer.GeoRenderLayer; + +public class TaserLayer2 extends GeoRenderLayer { + private static final ResourceLocation LAYER = new ResourceLocation("target", "textures/item/tasergun_e2.png"); + + public TaserLayer2(GeoRenderer itemGeoRenderer) { + super(itemGeoRenderer); + } + + @Override + public void render(PoseStack poseStack, Taser animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int light, int packedOverlay) { + + RenderType glowRenderType = RenderType.eyes(LAYER); + getRenderer().reRender(getDefaultBakedModel(animatable), poseStack, bufferSource, animatable, glowRenderType, bufferSource.getBuffer(glowRenderType), partialTick, light, OverlayTexture.NO_OVERLAY, 1, 1, 1, 1); + } +} diff --git a/src/main/java/net/mcreator/target/client/model/item/TaserItemModel.java b/src/main/java/net/mcreator/target/client/model/item/TaserItemModel.java index 126cf7d50..e47834f28 100644 --- a/src/main/java/net/mcreator/target/client/model/item/TaserItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/TaserItemModel.java @@ -34,22 +34,20 @@ public class TaserItemModel extends GeoModel { CoreGeoBone gun = getAnimationProcessor().getBone("bone"); CoreGeoBone shen = getAnimationProcessor().getBone("shen"); CoreGeoBone bar = getAnimationProcessor().getBone("bar"); - CoreGeoBone bar2 = getAnimationProcessor().getBone("bar2"); - CoreGeoBone screen = getAnimationProcessor().getBone("screen"); - CoreGeoBone screen2 = getAnimationProcessor().getBone("screen2"); + CoreGeoBone bluecover = getAnimationProcessor().getBone("bluecover"); + CoreGeoBone redcover = getAnimationProcessor().getBone("redcover"); Player player = Minecraft.getInstance().player; ItemStack stack = player.getMainHandItem(); bar.setScaleX((float) ItemNBTTool.getInt(stack, TAG_POWER, 1200) / 1200); - bar2.setScaleX((float) ItemNBTTool.getInt(stack, TAG_POWER, 1200) / 1200); if (ItemNBTTool.getInt(stack, TAG_POWER, 1200) >= 400) { - screen.setHidden(false); - screen2.setHidden(true); + bluecover.setHidden(false); + redcover.setHidden(true); } else { - screen.setHidden(true); - screen2.setHidden(false); + bluecover.setHidden(true); + redcover.setHidden(false); } double fp = player.getPersistentData().getDouble("fire_pos"); diff --git a/src/main/java/net/mcreator/target/client/renderer/item/TaserItemRenderer.java b/src/main/java/net/mcreator/target/client/renderer/item/TaserItemRenderer.java index ec88ec790..1942b2672 100644 --- a/src/main/java/net/mcreator/target/client/renderer/item/TaserItemRenderer.java +++ b/src/main/java/net/mcreator/target/client/renderer/item/TaserItemRenderer.java @@ -1,6 +1,7 @@ package net.mcreator.target.client.renderer.item; import net.mcreator.target.client.layer.TaserLayer; +import net.mcreator.target.client.layer.TaserLayer2; import net.mcreator.target.item.gun.Taser; import net.mcreator.target.client.model.item.TaserItemModel; import net.minecraft.resources.ResourceLocation; @@ -10,6 +11,7 @@ public class TaserItemRenderer extends GeoItemRenderer { public TaserItemRenderer() { super(new TaserItemModel()); this.addRenderLayer(new TaserLayer(this)); + this.addRenderLayer(new TaserLayer2(this)); } @Override diff --git a/src/main/resources/assets/target/geo/taser.geo.json b/src/main/resources/assets/target/geo/taser.geo.json index 5fd552e7d..202d13d9d 100644 --- a/src/main/resources/assets/target/geo/taser.geo.json +++ b/src/main/resources/assets/target/geo/taser.geo.json @@ -209,6 +209,46 @@ "parent": "0", "pivot": [-0.00238, 0.35352, 0.03753] }, + { + "name": "bluecover", + "parent": "gun", + "pivot": [-0.01562, 0, 0], + "rotation": [22.5, 0, 0], + "cubes": [ + { + "origin": [-0.50391, -0.36866, 3.22849], + "size": [1.00781, 0.69109, 0], + "uv": { + "north": {"uv": [30.60938, 18.25391], "uv_size": [1, 1]}, + "east": {"uv": [30.60938, 19.75391], "uv_size": [1, 1]}, + "south": {"uv": [30.60938, 19.75391], "uv_size": [1, 1]}, + "west": {"uv": [30.60938, 19.75391], "uv_size": [1, 1]}, + "up": {"uv": [31.60938, 20.75391], "uv_size": [-1, -1]}, + "down": {"uv": [31.60938, 20.75391], "uv_size": [-1, -1]} + } + } + ] + }, + { + "name": "redcover", + "parent": "gun", + "pivot": [-0.01562, 0, 0], + "rotation": [22.5, 0, 0], + "cubes": [ + { + "origin": [-0.50391, -0.36866, 3.22849], + "size": [1.00781, 0.69109, 0], + "uv": { + "north": {"uv": [29.35938, 18.50391], "uv_size": [1, 1]}, + "east": {"uv": [29.35938, 19.75391], "uv_size": [1, 1]}, + "south": {"uv": [29.35938, 19.75391], "uv_size": [1, 1]}, + "west": {"uv": [29.35938, 19.75391], "uv_size": [1, 1]}, + "up": {"uv": [30.35938, 20.75391], "uv_size": [-1, -1]}, + "down": {"uv": [30.35938, 20.75391], "uv_size": [-1, -1]} + } + } + ] + }, { "name": "screen", "parent": "gun", @@ -218,18 +258,18 @@ { "name": "bar", "parent": "screen", - "pivot": [0.41875, 1.16114, 3.80684], + "pivot": [0.4656, 0.07321, 3.22067], "cubes": [ { - "origin": [-0.43432, -0.28538, 3.21677], - "size": [0.8687, 0.5, 0.00781], + "origin": [-0.4656, -0.30648, 3.21677], + "size": [0.9312, 0.57188, 0.00781], "uv": { - "north": {"uv": [1.25, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [1.25, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [1.25, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [1.25, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [2.25, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [2.25, 24], "uv_size": [-1, -0.75]} + "north": {"uv": [30.60938, 21.73438], "uv_size": [1, 0.75]}, + "east": {"uv": [30.60938, 21.73438], "uv_size": [1, 0.75]}, + "south": {"uv": [30.60938, 21.73438], "uv_size": [1, 0.75]}, + "west": {"uv": [30.60938, 21.73438], "uv_size": [1, 0.75]}, + "up": {"uv": [31.60938, 22.48438], "uv_size": [-1, -0.75]}, + "down": {"uv": [31.60938, 22.48438], "uv_size": [-1, -0.75]} } } ] @@ -240,363 +280,15 @@ "pivot": [-0.01562, 1.11614, 2.90465], "cubes": [ { - "origin": [-0.48437, 0.18212, 3.22067], - "size": [0.96875, 0.1325, 0.00781], + "origin": [-0.50391, -0.36866, 3.22067], + "size": [1.00781, 0.69109, 0.00781], "uv": { - "north": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [1, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [1, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [-0.58007, 0.01476, 3.22067], - "size": [0.92969, 0.14031, 0.00781], - "pivot": [-0.09569, -0.25024, 3.22849], - "rotation": [0, 0, 22.5], - "uv": { - "north": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [1, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [1, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [-0.24804, 0.15507, 3.22067], - "size": [0.54297, 0.13672, 0.00781], - "pivot": [-0.09569, -0.25024, 3.22849], - "rotation": [0, 0, 22.5], - "uv": { - "north": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [1, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [1, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [0.07618, 0.29179, 3.22067], - "size": [0.17188, 0.05859, 0.00781], - "pivot": [-0.09569, -0.25024, 3.22849], - "rotation": [0, 0, 22.5], - "uv": { - "north": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [1, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [1, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [-0.26523, -0.50562, 3.22067], - "size": [0.46797, 0.07, 0.00781], - "pivot": [0, -0.02062, 3.22458], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [1, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [1, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [-0.26523, -0.35562, 3.22067], - "size": [0.46797, 0.07, 0.00781], - "pivot": [0, -0.02062, 3.22458], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [1, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [1, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [-0.26523, -0.20562, 3.22067], - "size": [0.46797, 0.07, 0.00781], - "pivot": [0, -0.02062, 3.22458], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [1, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [1, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [-0.26523, -0.05562, 3.22067], - "size": [0.46797, 0.07, 0.00781], - "pivot": [0, -0.02062, 3.22458], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [1, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [1, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [-0.26523, 0.09438, 3.22067], - "size": [0.46797, 0.07, 0.00781], - "pivot": [0, -0.02062, 3.22458], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [1, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [1, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [-0.26523, 0.24438, 3.22067], - "size": [0.46797, 0.07, 0.00781], - "pivot": [0, -0.02062, 3.22458], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [1, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [1, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [-0.26523, 0.39438, 3.22067], - "size": [0.46797, 0.07, 0.00781], - "pivot": [0, -0.02062, 3.22458], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [1, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [1, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [-0.48437, -0.35538, 3.22067], - "size": [0.96875, 0.07, 0.00781], - "uv": { - "north": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [0, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [1, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [1, 24], "uv_size": [-1, -0.75]} - } - } - ] - }, - { - "name": "screen2", - "parent": "gun", - "pivot": [-0.01562, 0, 0], - "rotation": [22.5, 0, 0] - }, - { - "name": "bar2", - "parent": "screen2", - "pivot": [0.41875, 1.16114, 3.80684], - "cubes": [ - { - "origin": [-0.43432, -0.28538, 3.21677], - "size": [0.8687, 0.5, 0.00781], - "uv": { - "north": {"uv": [3.75, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [3.75, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [3.75, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [3.75, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [4.75, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [4.75, 24], "uv_size": [-1, -0.75]} - } - } - ] - }, - { - "name": "cover2", - "parent": "screen2", - "pivot": [-0.01562, 1.11614, 2.90465], - "cubes": [ - { - "origin": [-0.48437, 0.18212, 3.22067], - "size": [0.96875, 0.1325, 0.00781], - "uv": { - "north": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [3.5, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [3.5, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [-0.58007, 0.01476, 3.22067], - "size": [0.92969, 0.14031, 0.00781], - "pivot": [-0.09569, -0.25024, 3.22849], - "rotation": [0, 0, 22.5], - "uv": { - "north": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [3.5, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [3.5, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [-0.24804, 0.15507, 3.22067], - "size": [0.54297, 0.13672, 0.00781], - "pivot": [-0.09569, -0.25024, 3.22849], - "rotation": [0, 0, 22.5], - "uv": { - "north": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [3.5, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [3.5, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [0.07618, 0.29179, 3.22067], - "size": [0.17188, 0.05859, 0.00781], - "pivot": [-0.09569, -0.25024, 3.22849], - "rotation": [0, 0, 22.5], - "uv": { - "north": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [3.5, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [3.5, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [-0.26523, -0.50562, 3.22067], - "size": [0.46797, 0.07, 0.00781], - "pivot": [0, -0.02062, 3.22458], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [3.5, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [3.5, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [-0.26523, -0.35562, 3.22067], - "size": [0.46797, 0.07, 0.00781], - "pivot": [0, -0.02062, 3.22458], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [3.5, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [3.5, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [-0.26523, -0.20562, 3.22067], - "size": [0.46797, 0.07, 0.00781], - "pivot": [0, -0.02062, 3.22458], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [3.5, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [3.5, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [-0.26523, -0.05562, 3.22067], - "size": [0.46797, 0.07, 0.00781], - "pivot": [0, -0.02062, 3.22458], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [3.5, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [3.5, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [-0.26523, 0.09438, 3.22067], - "size": [0.46797, 0.07, 0.00781], - "pivot": [0, -0.02062, 3.22458], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [3.5, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [3.5, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [-0.26523, 0.24438, 3.22067], - "size": [0.46797, 0.07, 0.00781], - "pivot": [0, -0.02062, 3.22458], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [3.5, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [3.5, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [-0.26523, 0.39438, 3.22067], - "size": [0.46797, 0.07, 0.00781], - "pivot": [0, -0.02062, 3.22458], - "rotation": [0, 0, -90], - "uv": { - "north": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [3.5, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [3.5, 24], "uv_size": [-1, -0.75]} - } - }, - { - "origin": [-0.48437, -0.35538, 3.22067], - "size": [0.96875, 0.07, 0.00781], - "uv": { - "north": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "east": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "south": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "west": {"uv": [2.5, 23.25], "uv_size": [1, 0.75]}, - "up": {"uv": [3.5, 24], "uv_size": [-1, -0.75]}, - "down": {"uv": [3.5, 24], "uv_size": [-1, -0.75]} + "north": {"uv": [31.10938, 20.92188], "uv_size": [0.25, 0.25391]}, + "east": {"uv": [31.57813, 28.57813], "uv_size": [-0.20312, 0.34375]}, + "south": {"uv": [19.10938, 22.75391], "uv_size": [12.75, 8.75]}, + "west": {"uv": [31.57813, 28.57813], "uv_size": [-0.23437, 0.34375]}, + "up": {"uv": [31.34375, 28.875], "uv_size": [0.23438, -0.29687]}, + "down": {"uv": [19.35938, 23.06641], "uv_size": [-0.25, -0.3125]} } } ] diff --git a/src/main/resources/assets/target/textures/item/tasergun.png b/src/main/resources/assets/target/textures/item/tasergun.png index 80f1a45d0f55998bf3d04bd3e1c6f5bb1f78f2f5..7ef2d85e677308aa2aee3bf88777b76f2db96e54 100644 GIT binary patch literal 5155 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 literal 5208 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 W#f`7!gkSNV82@%$?Cv+s%l`#Det)C@ literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSeV#6kAr*7pUfRg(kRZ|;*dKdl z!PGy|D|1yZ&N`^~Y0JNP6D*ehSrvU}86!|N@!-eA8Q0Ea&p6&;+rR4TMb~LTTO+2O r$X$Kg;KP1>@gCN+2!P? ziC8(Z#J0%0tJ8a%ylaa%=az{~UCPGLVX~WuBNsn9vznB$3?p|D4$2orR;hvp0SG_< z0uX=z1Rwwb2tWV=5P*QD1%$^Py)qdhRb zZ&B*2ReLoR-;!y&^nRU66mOpkk+3?g?p(4&-$CLhXN3Q00bZa0SG_<0uX=z1Rwx` o#sqe=H*xu^K!@^QfX2?$Zg0VqVcYY3uUK8;;2QVvsj>O(A8i!CrvLx| literal 0 HcmV?d00001 diff --git a/src/main/resources/data/target/guns/taser.json b/src/main/resources/data/target/guns/taser.json index a1edbb3a2..50ade3525 100644 --- a/src/main/resources/data/target/guns/taser.json +++ b/src/main/resources/data/target/guns/taser.json @@ -4,7 +4,7 @@ "recoil_y": 0.002, "zoom_speed": 2, "zoom": 1.25, - "damage": 7, + "damage": 5, "velocity": 3, "mag": 1, "weight": 0,