diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Ntw20Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Ntw20Layer.java deleted file mode 100644 index 141a606a6..000000000 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/gun/Ntw20Layer.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.atsuishio.superbwarfare.client.layer.gun; - -import com.atsuishio.superbwarfare.Mod; -import com.atsuishio.superbwarfare.item.gun.heavy.Ntw20Item; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; -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 Ntw20Layer extends GeoRenderLayer { - private static final ResourceLocation LAYER = Mod.loc("textures/item/ntw_20_e.png"); - - public Ntw20Layer(GeoRenderer entityRenderer) { - super(entityRenderer); - } - - @Override - public void render(PoseStack poseStack, Ntw20Item animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { - RenderType glowRenderType = RenderType.eyes(LAYER); - getRenderer().reRender(getDefaultBakedModel(animatable), poseStack, bufferSource, animatable, glowRenderType, bufferSource.getBuffer(glowRenderType), partialTick, packedLight, OverlayTexture.NO_OVERLAY, 0xFFFFFFFF); - } -} diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Ntw20Renderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Ntw20Renderer.java index 3ad06badc..2198d2e54 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Ntw20Renderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/Ntw20Renderer.java @@ -27,8 +27,6 @@ public class Ntw20Renderer extends GeoItemRenderer { public Ntw20Renderer() { super(new Ntw20Model()); - // TODO layer -// this.addRenderLayer(new Ntw20Layer(this)); } @Override @@ -86,18 +84,6 @@ public class Ntw20Renderer extends GeoItemRenderer { bone.setHidden(GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) != 0); } - if (name.equals("Cross1")) { - bone.setHidden(ClientEventHandler.zoomPos < 0.7 || data.attachment.get(AttachmentType.SCOPE) != 1); - } - - if (name.equals("Cross2")) { - bone.setHidden(ClientEventHandler.zoomPos < 0.7 || data.attachment.get(AttachmentType.SCOPE) != 2); - } - - if (name.equals("Cross3")) { - bone.setHidden(ClientEventHandler.zoomPos < 0.7 || data.attachment.get(AttachmentType.SCOPE) != 3); - } - if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 2 && (name.equals("bone1") || name.equals("zhituiqi") || name.equals("guan") || name.equals("hidden"))) { bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); @@ -108,6 +94,17 @@ public class Ntw20Renderer extends GeoItemRenderer { bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom); } + int scopeType = GunData.from(itemStack).attachment.get(AttachmentType.SCOPE); + + switch (scopeType) { + case 1 -> + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, packedLightIn, 0, 0.468755, 40, 1, 255, 0, 0, 255, "eotech", false); + case 2 -> + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, packedLightIn, 0, 0.48875, 9, 1, 255, 0, 0, 255, "acog", true); + case 3 -> + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, packedLightIn, 0, 0.46875, 30, (float) ClientEventHandler.customZoom, 255, 0, 0, 255, "lpvo", true); + } + AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 3.70229375, 0.8); ItemModelHelper.handleGunAttachments(bone, itemStack, name); diff --git a/src/main/resources/assets/superbwarfare/geo/ntw_20.geo.json b/src/main/resources/assets/superbwarfare/geo/ntw_20.geo.json index aa731f146..d85a84511 100644 --- a/src/main/resources/assets/superbwarfare/geo/ntw_20.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/ntw_20.geo.json @@ -60,6 +60,15 @@ "pivot": [-0.19219, -0.53937, 1.6325] }, { + "name": "cross", + "parent": "0", + "pivot": [ + 0, + 7.5, + -100 + ] + }, + { "name": "flare", "parent": "0", "pivot": [0, 3.51914, -59.23672] @@ -6490,198 +6499,6 @@ } ] }, - { - "name": "Cross1", - "parent": "Scope1", - "pivot": [0, 7.49172, -1359.5], - "cubes": [ - { - "origin": [-1, 12.01906, -1359.5], - "size": [2, 0.5, 0], - "uv": { - "south": {"uv": [25.25, 127.25], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-2.4319, 11.42595, -1359.5], - "size": [2, 0.5, 0], - "pivot": [-2.20684, 10.7945, -1359.5], - "rotation": [0, 0, -22.5], - "uv": { - "south": {"uv": [25.25, 127.25], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-3.98178, 11.42595, -1359.5], - "size": [2, 0.5, 0], - "pivot": [-2.20684, 10.7945, -1359.5], - "rotation": [0, 0, -45], - "uv": { - "south": {"uv": [25.25, 127.25], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-5.41369, 12.01906, -1359.5], - "size": [2, 0.5, 0], - "pivot": [-2.20684, 10.7945, -1359.5], - "rotation": [0, 0, -67.5], - "uv": { - "south": {"uv": [25.25, 127.25], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-5.07771, 5.91633, -1359.5], - "size": [2, 0.5, 0], - "pivot": [-3.30277, 5.28488, -1359.5], - "rotation": [0, 0, -135], - "uv": { - "south": {"uv": [25.25, 127.25], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-6.50962, 6.50945, -1359.5], - "size": [2, 0.5, 0], - "pivot": [-3.30277, 5.28488, -1359.5], - "rotation": [0, 0, -157.5], - "uv": { - "south": {"uv": [25.25, 127.25], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-3.52783, 5.91633, -1359.5], - "size": [2, 0.5, 0], - "pivot": [-3.30277, 5.28488, -1359.5], - "rotation": [0, 0, -112.5], - "uv": { - "south": {"uv": [25.25, 127.25], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-5.77734, 7.24172, -1359.5], - "size": [2, 0.5, 0], - "pivot": [-4.77734, 7.49172, -1359.5], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [25.25, 127.25], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.25, 12.51906, -1359.5], - "size": [0.5, 2, 0], - "pivot": [0, 7.49172, -1359.5], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [25.25, 127.25], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.25, 12.51906, -1359.5], - "size": [0.5, 2, 0], - "pivot": [0, 7.49172, -1359.5], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [25.5, 127.25], "uv_size": [-0.25, 0.25]} - } - }, - { - "origin": [-0.25, 12.51906, -1359.5], - "size": [0.5, 2, 0], - "uv": { - "south": {"uv": [25.5, 127.25], "uv_size": [-0.25, 0.25]} - } - }, - { - "origin": [-0.25, 12.51906, -1359.5], - "size": [0.5, 2, 0], - "pivot": [0, 7.49172, -1359.5], - "rotation": [0, 0, -180], - "uv": { - "south": {"uv": [25.25, 127.25], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.5, 6.99172, -1359.5], - "size": [1, 1, 0], - "pivot": [0, 7.49172, -1359.5], - "rotation": [0, 0, -135], - "uv": { - "south": {"uv": [25.25, 127.25], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [3.52593, 10.75515, -1359.5], - "size": [2, 0.5, 0], - "pivot": [2.38867, 7.3099, -1359.5], - "rotation": [0, 0, 157.5], - "uv": { - "south": {"uv": [25.25, 127.25], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [2.13479, 9.56081, -1359.5], - "size": [2, 0.5, 0], - "pivot": [2.38867, 7.3099, -1359.5], - "rotation": [0, 0, 112.5], - "uv": { - "south": {"uv": [25.25, 127.25], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [2.94914, 10.01962, -1359.5], - "size": [2, 0.5, 0], - "pivot": [2.38867, 7.3099, -1359.5], - "rotation": [0, 0, 135], - "uv": { - "south": {"uv": [25.25, 127.25], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [1.20684, 9.44857, -1359.5], - "size": [2, 0.5, 0], - "pivot": [2.38867, 7.3099, -1359.5], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [25.25, 127.25], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [0.30658, 9.69997, -1359.5], - "size": [2, 0.5, 0], - "pivot": [2.38867, 7.3099, -1359.5], - "rotation": [0, 0, 67.5], - "uv": { - "south": {"uv": [25.25, 127.25], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.88776, 11.09112, -1359.5], - "size": [2, 0.5, 0], - "pivot": [2.38867, 7.3099, -1359.5], - "rotation": [0, 0, 22.5], - "uv": { - "south": {"uv": [25.25, 127.25], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.42895, 10.27676, -1359.5], - "size": [2, 0.5, 0], - "pivot": [2.38867, 7.3099, -1359.5], - "rotation": [0, 0, 45], - "uv": { - "south": {"uv": [25.25, 127.25], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [3.77734, 11.65541, -1359.5], - "size": [2, 0.5, 0], - "pivot": [2.38867, 7.3099, -1359.5], - "rotation": [0, 0, -180], - "uv": { - "south": {"uv": [25.25, 127.25], "uv_size": [0.25, 0.25]} - } - } - ] - }, { "name": "bone41", "parent": "Scope1", @@ -7118,20 +6935,6 @@ "parent": "body", "pivot": [0, 5.985, -7.25] }, - { - "name": "Cross2", - "parent": "Scope2", - "pivot": [0, -3.29125, -1569.05], - "cubes": [ - { - "origin": [-1.7625, -14.46625, -1569.05], - "size": [3.525, 22.35, 0], - "uv": { - "south": {"uv": [115.25, 53], "uv_size": [11.75, 74.5]} - } - } - ] - }, { "name": "hidden", "parent": "Scope2", @@ -9511,283 +9314,6 @@ "parent": "body", "pivot": [0, 6.09, -5.4] }, - { - "name": "Cross3", - "parent": "Scope3", - "pivot": [0, 7.52544, -135.99707], - "cubes": [ - { - "origin": [-0.03795, -2.68258, -135.99707], - "size": [0.07591, 20.41603, 0], - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.03795, -2.68258, -135.99707], - "size": [0.07591, 20.41603, 0], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.07167, -2.68258, -135.99707], - "size": [0.14334, 4.16, 0], - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.07167, -2.68258, -135.99707], - "size": [0.14334, 4.16, 0], - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.07167, -2.68258, -135.99707], - "size": [0.13928, 4.16, 0], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.07167, -2.68258, -135.99707], - "size": [0.13928, 4.16, 0], - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, -180], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - } - ] - }, - { - "name": "bone173", - "parent": "Cross3", - "pivot": [0, 7.52544, -135.99707], - "cubes": [ - { - "origin": [-0.05542, 6.3378, -135.99707], - "size": [0.11084, 0.07962, 0], - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05542, 5.2978, -135.99707], - "size": [0.11084, 0.07962, 0], - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05542, 4.2578, -135.99707], - "size": [0.11084, 0.07963, 0], - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05542, 3.2178, -135.99707], - "size": [0.11084, 0.07963, 0], - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05542, 3.2178, -135.99707], - "size": [0.11084, 0.07963, 0], - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05542, 6.3378, -135.99707], - "size": [0.11084, 0.07962, 0], - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05542, 5.2978, -135.99707], - "size": [0.11084, 0.07962, 0], - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05542, 4.2578, -135.99707], - "size": [0.11084, 0.07963, 0], - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - } - ] - }, - { - "name": "bone174", - "parent": "Cross3", - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, -90], - "cubes": [ - { - "origin": [-0.05542, 6.3378, -135.99707], - "size": [0.11084, 0.07962, 0], - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05542, 5.2978, -135.99707], - "size": [0.11084, 0.07962, 0], - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05542, 4.2578, -135.99707], - "size": [0.11084, 0.07963, 0], - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05542, 3.2178, -135.99707], - "size": [0.11084, 0.07963, 0], - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05542, 3.2178, -135.99707], - "size": [0.11084, 0.07963, 0], - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05542, 6.3378, -135.99707], - "size": [0.11084, 0.07962, 0], - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05542, 5.2978, -135.99707], - "size": [0.11084, 0.07962, 0], - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - }, - { - "origin": [-0.05542, 4.2578, -135.99707], - "size": [0.11084, 0.07963, 0], - "pivot": [0, 7.52544, -135.99707], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [31, 46], "uv_size": [0.25, 0.25]} - } - } - ] - }, - { - "name": "bone97", - "parent": "Cross3", - "pivot": [0, 7.43849, -128.9932], - "cubes": [ - { - "origin": [0.03797, 7.11838, -135.9932], - "size": [0.07053, 0.3688, 0], - "pivot": [0, 7.52484, -135.9932], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [120.75, 54.75], "uv_size": [0.5, 0.5]} - } - }, - { - "origin": [-0.10851, 7.11838, -135.9932], - "size": [0.07053, 0.3688, 0], - "pivot": [0, 7.52484, -135.9932], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [120.75, 54.75], "uv_size": [0.5, 0.5]} - } - }, - { - "origin": [-0.10818, 7.63335, -135.9932], - "size": [0.07053, 0.30111, 0], - "pivot": [0, 7.52484, -135.9932], - "rotation": [0, 0, 180], - "uv": { - "south": {"uv": [120.75, 54.75], "uv_size": [0.5, 0.5]} - } - }, - { - "origin": [0.03797, 7.56249, -135.9932], - "size": [0.07053, 0.3688, 0], - "pivot": [0, 7.52484, -135.9932], - "rotation": [0, 0, 90], - "uv": { - "south": {"uv": [120.75, 54.75], "uv_size": [0.5, 0.5]} - } - }, - { - "origin": [0.03765, 7.63335, -135.9932], - "size": [0.07053, 0.30111, 0], - "pivot": [0, 7.52484, -135.9932], - "rotation": [0, 0, -180], - "uv": { - "south": {"uv": [120.75, 54.75], "uv_size": [0.5, 0.5]} - } - }, - { - "origin": [-0.10851, 7.56249, -135.9932], - "size": [0.07053, 0.3688, 0], - "pivot": [0, 7.52484, -135.9932], - "rotation": [0, 0, -90], - "uv": { - "south": {"uv": [120.75, 54.75], "uv_size": [0.5, 0.5]} - } - } - ] - }, { "name": "bone102", "parent": "Scope3", diff --git a/src/main/resources/assets/superbwarfare/textures/crosshair/lpvo.png b/src/main/resources/assets/superbwarfare/textures/crosshair/lpvo.png index 404314c12..57aa0419f 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/crosshair/lpvo.png and b/src/main/resources/assets/superbwarfare/textures/crosshair/lpvo.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/m4_e.png b/src/main/resources/assets/superbwarfare/textures/item/m4_e.png deleted file mode 100644 index 6d89f4269..000000000 Binary files a/src/main/resources/assets/superbwarfare/textures/item/m4_e.png and /dev/null differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/ntw_20.png b/src/main/resources/assets/superbwarfare/textures/item/ntw_20.png index d901f4649..4093c11af 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/item/ntw_20.png and b/src/main/resources/assets/superbwarfare/textures/item/ntw_20.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/ntw_20_e.png b/src/main/resources/assets/superbwarfare/textures/item/ntw_20_e.png deleted file mode 100644 index d9f94b3fb..000000000 Binary files a/src/main/resources/assets/superbwarfare/textures/item/ntw_20_e.png and /dev/null differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/qbz95_e.png b/src/main/resources/assets/superbwarfare/textures/item/qbz95_e.png deleted file mode 100644 index 190adc6b4..000000000 Binary files a/src/main/resources/assets/superbwarfare/textures/item/qbz95_e.png and /dev/null differ