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 80f1a45d0..7ef2d85e6 100644 Binary files a/src/main/resources/assets/target/textures/item/tasergun.png and b/src/main/resources/assets/target/textures/item/tasergun.png differ diff --git a/src/main/resources/assets/target/textures/item/tasergun_e.png b/src/main/resources/assets/target/textures/item/tasergun_e.png index 22b9c5858..91f7a4da2 100644 Binary files a/src/main/resources/assets/target/textures/item/tasergun_e.png and b/src/main/resources/assets/target/textures/item/tasergun_e.png differ diff --git a/src/main/resources/assets/target/textures/item/tasergun_e2.png b/src/main/resources/assets/target/textures/item/tasergun_e2.png new file mode 100644 index 000000000..d9deb6fc8 Binary files /dev/null and b/src/main/resources/assets/target/textures/item/tasergun_e2.png differ 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,