diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/K98ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/K98ItemModel.java index f5653d365..12809b1e6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/K98ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/K98ItemModel.java @@ -30,6 +30,16 @@ public class K98ItemModel extends CustomGunModel { return Mod.loc("textures/item/k_98.png"); } + @Override + public ResourceLocation getLODModelResource(K98Item animatable) { + return Mod.loc("geo/lod/k_98.geo.json"); + } + + @Override + public ResourceLocation getLODTextureResource(K98Item animatable) { + return Mod.loc("textures/item/lod/k_98.png"); + } + @Override public void setCustomAnimations(K98Item animatable, long instanceId, AnimationState animationState) { Player player = Minecraft.getInstance().player; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/MosinNagantItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/MosinNagantItemModel.java index b98a6c5fb..f9748b2d0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/MosinNagantItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/MosinNagantItemModel.java @@ -30,6 +30,16 @@ public class MosinNagantItemModel extends CustomGunModel { return Mod.loc("textures/item/mosin_nagant.png"); } + @Override + public ResourceLocation getLODModelResource(MosinNagantItem animatable) { + return Mod.loc("geo/lod/mosin_nagant.geo.json"); + } + + @Override + public ResourceLocation getLODTextureResource(MosinNagantItem animatable) { + return Mod.loc("textures/item/lod/mosin_nagant.png"); + } + @Override public void setCustomAnimations(MosinNagantItem animatable, long instanceId, AnimationState animationState) { Player player = Minecraft.getInstance().player; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/K98ItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/K98ItemRenderer.java index e18482ba3..61ee8c215 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/K98ItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/K98ItemRenderer.java @@ -10,6 +10,7 @@ import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; +import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.animatable.GeoItem; import software.bernie.geckolib.cache.object.GeoBone; @@ -35,8 +36,11 @@ public class K98ItemRenderer extends CustomGunRenderer { var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); + if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.9772, 0.4); + if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { + AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.9772, 0.4); + } } if (renderingArms) { diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MosinNagantItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MosinNagantItemRenderer.java index d0d67ab34..acddc40da 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MosinNagantItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/MosinNagantItemRenderer.java @@ -1,6 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.gun; import com.atsuishio.superbwarfare.client.AnimationHelper; +import com.atsuishio.superbwarfare.client.ItemModelHelper; import com.atsuishio.superbwarfare.client.model.item.MosinNagantItemModel; import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.event.ClientEventHandler; @@ -41,15 +42,25 @@ public class MosinNagantItemRenderer extends CustomGunRenderer boolean flag = name.equals("jia") || name.equals("b1") || name.equals("b2"); if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) { - if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) { + if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { + if (flag) { bone.setHidden(ClientEventHandler.zoomPos > 0.7); } + + ItemModelHelper.handleGunAttachments(bone, itemStack, name); + AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 2.38345, 0.6); + + if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) { + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.259025, -0.05, 0.08f, 0, 0, 0, 255, "pu", true); + } else if (flag) { + bone.setHidden(false); + } + } else { + ItemModelHelper.hideAllAttachments(bone, name); } - AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.259025, -0.05, 0.08f, 0, 0, 0, 255, "pu", true); - AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 2.38345, 0.6); - } else if (flag) { - bone.setHidden(false); + } else { + ItemModelHelper.hideAllAttachments(bone, name); } if (renderingArms) { diff --git a/src/main/resources/assets/superbwarfare/geo/lod/k_98.geo.json b/src/main/resources/assets/superbwarfare/geo/lod/k_98.geo.json new file mode 100644 index 000000000..a0fed4d30 --- /dev/null +++ b/src/main/resources/assets/superbwarfare/geo/lod/k_98.geo.json @@ -0,0 +1,231 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.k_98", + "texture_width": 64, + "texture_height": 64, + "visible_bounds_width": 4, + "visible_bounds_height": 2.5, + "visible_bounds_offset": [0, 0.75, 0] + }, + "bones": [ + { + "name": "group", + "pivot": [0, -0.91342, 22.73323], + "cubes": [ + { + "origin": [-0.575, 2.72451, -0.01748], + "size": [1.15, 0.46, 1.6675], + "uv": { + "north": {"uv": [22, 20], "uv_size": [1, 1]}, + "east": {"uv": [4, 4], "uv_size": [31, 1]}, + "south": {"uv": [22, 21], "uv_size": [1, 1]}, + "west": {"uv": [4, 5], "uv_size": [31, 1]}, + "up": {"uv": [4, 6], "uv_size": [1, 31]}, + "down": {"uv": [5, 37], "uv_size": [1, -31]} + } + }, + { + "origin": [-0.345, 2.03451, -31.87248], + "size": [0.69, 0.69, 35.3625], + "uv": { + "north": {"uv": [22, 20], "uv_size": [1, 1]}, + "east": {"uv": [4, 4], "uv_size": [31, 1]}, + "south": {"uv": [22, 21], "uv_size": [1, 1]}, + "west": {"uv": [4, 5], "uv_size": [31, 1]}, + "up": {"uv": [4, 6], "uv_size": [1, 31]}, + "down": {"uv": [5, 37], "uv_size": [1, -31]} + } + }, + { + "origin": [-0.345, 2.72451, -31.75748], + "size": [0.69, 0.575, 0.6325], + "uv": { + "north": {"uv": [22, 20], "uv_size": [1, 1]}, + "east": {"uv": [4, 4], "uv_size": [31, 1]}, + "south": {"uv": [22, 21], "uv_size": [1, 1]}, + "west": {"uv": [4, 5], "uv_size": [31, 1]}, + "up": {"uv": [4, 6], "uv_size": [1, 31]}, + "down": {"uv": [5, 37], "uv_size": [1, -31]} + } + }, + { + "origin": [-0.7475, 0.76951, -23.59248], + "size": [1.495, 2.07, 0.8625], + "uv": { + "north": {"uv": [22, 20], "uv_size": [1, 1]}, + "east": {"uv": [4, 4], "uv_size": [31, 1]}, + "south": {"uv": [22, 21], "uv_size": [1, 1]}, + "west": {"uv": [4, 5], "uv_size": [31, 1]}, + "up": {"uv": [4, 6], "uv_size": [1, 31]}, + "down": {"uv": [5, 37], "uv_size": [1, -31]} + } + }, + { + "origin": [-0.7475, 0.76951, -22.09748], + "size": [1.495, 2.07, 0.7475], + "uv": { + "north": {"uv": [22, 20], "uv_size": [1, 1]}, + "east": {"uv": [4, 4], "uv_size": [31, 1]}, + "south": {"uv": [22, 21], "uv_size": [1, 1]}, + "west": {"uv": [4, 5], "uv_size": [31, 1]}, + "up": {"uv": [4, 6], "uv_size": [1, 31]}, + "down": {"uv": [5, 37], "uv_size": [1, -31]} + } + }, + { + "origin": [-0.8625, 0.76951, -16.17498], + "size": [1.725, 2.185, 1.2075], + "uv": { + "north": {"uv": [22, 20], "uv_size": [1, 1]}, + "east": {"uv": [4, 4], "uv_size": [31, 1]}, + "south": {"uv": [22, 21], "uv_size": [1, 1]}, + "west": {"uv": [4, 5], "uv_size": [31, 1]}, + "up": {"uv": [4, 6], "uv_size": [1, 31]}, + "down": {"uv": [5, 37], "uv_size": [1, -31]} + } + }, + { + "origin": [-0.575, 2.72451, -9.21748], + "size": [1.15, 0.345, 4.6575], + "uv": { + "north": {"uv": [22, 20], "uv_size": [1, 1]}, + "east": {"uv": [4, 4], "uv_size": [31, 1]}, + "south": {"uv": [22, 21], "uv_size": [1, 1]}, + "west": {"uv": [4, 5], "uv_size": [31, 1]}, + "up": {"uv": [4, 6], "uv_size": [1, 31]}, + "down": {"uv": [5, 37], "uv_size": [1, -31]} + } + }, + { + "origin": [-1.265, 2.49451, 1.65002], + "size": [0.92, 0.46, 0.46], + "uv": { + "north": {"uv": [22, 22], "uv_size": [1, 1]}, + "east": {"uv": [23, 14], "uv_size": [1, 1]}, + "south": {"uv": [23, 15], "uv_size": [1, 1]}, + "west": {"uv": [23, 20], "uv_size": [1, 1]}, + "up": {"uv": [23, 21], "uv_size": [1, 1]}, + "down": {"uv": [22, 24], "uv_size": [1, -1]} + } + }, + { + "origin": [-1.45854, 1.29151, 1.65002], + "size": [0.46, 1.61, 0.46], + "pivot": [-1.22855, 2.44151, 1.88002], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [22, 22], "uv_size": [1, 1], "uv_rotation": 270}, + "east": {"uv": [24, 22], "uv_size": [-1, -1], "uv_rotation": 90}, + "south": {"uv": [23, 15], "uv_size": [1, 1], "uv_rotation": 90}, + "west": {"uv": [23, 23], "uv_size": [-1, 1], "uv_rotation": 90}, + "up": {"uv": [24, 21], "uv_size": [-1, -1], "uv_rotation": 90}, + "down": {"uv": [24, 15], "uv_size": [-1, -1], "uv_rotation": 90} + } + }, + { + "origin": [-0.345, 2.72451, -4.55998], + "size": [0.69, 0.23, 7.59], + "uv": { + "north": {"uv": [23, 22], "uv_size": [1, 1]}, + "east": {"uv": [23, 23], "uv_size": [1, 1]}, + "south": {"uv": [0, 24], "uv_size": [1, 1]}, + "west": {"uv": [1, 24], "uv_size": [1, 1]}, + "up": {"uv": [2, 24], "uv_size": [1, 1]}, + "down": {"uv": [24, 3], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.8625, 0.48201, -7.72248], + "size": [1.725, 1.955, 11.5], + "uv": { + "north": {"uv": [20, 2], "uv_size": [2, 2]}, + "east": {"uv": [0, 0], "uv_size": [16, 2]}, + "south": {"uv": [20, 20], "uv_size": [2, 2]}, + "west": {"uv": [0, 2], "uv_size": [16, 2]}, + "up": {"uv": [0, 4], "uv_size": [2, 16]}, + "down": {"uv": [2, 20], "uv_size": [2, -16]} + } + }, + { + "origin": [-0.6325, 0.82701, -23.70748], + "size": [1.265, 1.61, 15.985], + "uv": { + "north": {"uv": [20, 2], "uv_size": [2, 2]}, + "east": {"uv": [0, 0], "uv_size": [16, 2]}, + "south": {"uv": [20, 20], "uv_size": [2, 2]}, + "west": {"uv": [0, 2], "uv_size": [16, 2]}, + "up": {"uv": [0, 4], "uv_size": [2, 16]}, + "down": {"uv": [2, 20], "uv_size": [2, -16]} + } + }, + { + "origin": [-0.6325, 2.43701, -17.26748], + "size": [1.265, 0.345, 7.82], + "uv": { + "north": {"uv": [20, 2], "uv_size": [2, 2]}, + "east": {"uv": [0, 0], "uv_size": [16, 2]}, + "south": {"uv": [20, 20], "uv_size": [2, 2]}, + "west": {"uv": [0, 2], "uv_size": [16, 2]}, + "up": {"uv": [0, 4], "uv_size": [2, 16]}, + "down": {"uv": [2, 20], "uv_size": [2, -16]} + } + }, + { + "origin": [-0.8625, -4.76655, 1.95389], + "size": [1.725, 2.07, 14.375], + "pivot": [0, -3.84655, 15.9423], + "rotation": [-22.5, 0, 0], + "uv": { + "north": {"uv": [22, 2], "uv_size": [2, 2]}, + "east": {"uv": [6, 6], "uv_size": [12, 2]}, + "south": {"uv": [6, 22], "uv_size": [2, 2]}, + "west": {"uv": [6, 8], "uv_size": [12, 2]}, + "up": {"uv": [6, 10], "uv_size": [2, 12]}, + "down": {"uv": [8, 22], "uv_size": [2, -12]} + } + }, + { + "origin": [-0.8625, -1.08592, 6.78983], + "size": [1.725, 2.185, 10.0625], + "uv": { + "north": {"uv": [22, 6], "uv_size": [2, 2]}, + "east": {"uv": [14, 14], "uv_size": [9, 2]}, + "south": {"uv": [8, 22], "uv_size": [2, 2]}, + "west": {"uv": [16, 0], "uv_size": [9, 2]}, + "up": {"uv": [14, 16], "uv_size": [2, 9]}, + "down": {"uv": [16, 25], "uv_size": [2, -9]} + } + }, + { + "origin": [-0.8625, -3.15592, 11.96483], + "size": [1.725, 4.255, 4.8875], + "uv": { + "north": {"uv": [0, 20], "uv_size": [2, 4]}, + "east": {"uv": [18, 6], "uv_size": [4, 4]}, + "south": {"uv": [2, 20], "uv_size": [2, 4]}, + "west": {"uv": [18, 16], "uv_size": [4, 4]}, + "up": {"uv": [20, 10], "uv_size": [2, 4]}, + "down": {"uv": [18, 24], "uv_size": [2, -4]} + } + }, + { + "origin": [-0.8625, -4.90338, 15.67088], + "size": [1.725, 1.74746, 1.18144], + "uv": { + "north": {"uv": [22, 8], "uv_size": [2, 2]}, + "east": {"uv": [22, 10], "uv_size": [2, 2]}, + "south": {"uv": [22, 12], "uv_size": [2, 2]}, + "west": {"uv": [22, 16], "uv_size": [2, 2]}, + "up": {"uv": [22, 18], "uv_size": [2, 2]}, + "down": {"uv": [20, 24], "uv_size": [2, -2]} + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/geo/lod/mosin_nagant.geo.json b/src/main/resources/assets/superbwarfare/geo/lod/mosin_nagant.geo.json new file mode 100644 index 000000000..bc0f89ae6 --- /dev/null +++ b/src/main/resources/assets/superbwarfare/geo/lod/mosin_nagant.geo.json @@ -0,0 +1,314 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.mosin_nagant", + "texture_width": 32, + "texture_height": 32, + "visible_bounds_width": 4, + "visible_bounds_height": 1.5, + "visible_bounds_offset": [0, 0.25, 0] + }, + "bones": [ + { + "name": "group", + "pivot": [0, 3.83658, 27.48323], + "cubes": [ + { + "origin": [-0.69, 2.26451, -0.01748], + "size": [1.38, 0.92, 3.5075], + "uv": { + "north": {"uv": [20, 23], "uv_size": [1, 1]}, + "east": {"uv": [18, 16], "uv_size": [3, 1]}, + "south": {"uv": [23, 20], "uv_size": [1, 1]}, + "west": {"uv": [21, 6], "uv_size": [3, 1]}, + "up": {"uv": [2, 21], "uv_size": [1, 3]}, + "down": {"uv": [3, 24], "uv_size": [1, -3]} + } + }, + { + "origin": [-0.575, 3.87451, -2.31748], + "size": [1.15, 1.15, 6.3825], + "pivot": [0, 4.44951, 1.16127], + "rotation": [0, 0, 45], + "uv": { + "north": {"uv": [21, 23], "uv_size": [1, 1]}, + "east": {"uv": [18, 15], "uv_size": [6, 1]}, + "south": {"uv": [23, 21], "uv_size": [1, 1]}, + "west": {"uv": [16, 18], "uv_size": [6, 1]}, + "up": {"uv": [19, 0], "uv_size": [1, 6]}, + "down": {"uv": [16, 25], "uv_size": [1, -6]} + } + }, + { + "origin": [-0.46, 1.80451, -35.43748], + "size": [0.92, 0.92, 7.7625], + "uv": { + "north": {"uv": [23, 22], "uv_size": [1, 1]}, + "east": {"uv": [16, 17], "uv_size": [7, 1]}, + "south": {"uv": [23, 23], "uv_size": [1, 1]}, + "west": {"uv": [18, 12], "uv_size": [7, 1]}, + "up": {"uv": [4, 18], "uv_size": [1, 7]}, + "down": {"uv": [5, 25], "uv_size": [1, -7]} + } + }, + { + "origin": [-0.345, 2.72451, -34.17248], + "size": [0.69, 0.575, 0.6325], + "uv": { + "north": {"uv": [24, 0], "uv_size": [1, 1]}, + "east": {"uv": [24, 1], "uv_size": [1, 1]}, + "south": {"uv": [2, 24], "uv_size": [1, 1]}, + "west": {"uv": [3, 24], "uv_size": [1, 1]}, + "up": {"uv": [24, 4], "uv_size": [1, 1]}, + "down": {"uv": [24, 6], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.7475, 0.76951, -8.23998], + "size": [1.495, 2.07, 0.5175], + "uv": { + "north": {"uv": [17, 21], "uv_size": [1, 2]}, + "east": {"uv": [18, 21], "uv_size": [1, 2]}, + "south": {"uv": [19, 21], "uv_size": [1, 2]}, + "west": {"uv": [21, 19], "uv_size": [1, 2]}, + "up": {"uv": [24, 6], "uv_size": [1, 1]}, + "down": {"uv": [24, 8], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.7475, 0.76951, -22.15498], + "size": [1.495, 2.07, 0.5175], + "uv": { + "north": {"uv": [20, 21], "uv_size": [1, 2]}, + "east": {"uv": [21, 21], "uv_size": [1, 2]}, + "south": {"uv": [22, 0], "uv_size": [1, 2]}, + "west": {"uv": [22, 2], "uv_size": [1, 2]}, + "up": {"uv": [12, 24], "uv_size": [1, 1]}, + "down": {"uv": [13, 25], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.575, 2.37951, -7.72248], + "size": [1.15, 0.69, 3.1625], + "uv": { + "north": {"uv": [14, 24], "uv_size": [1, 1]}, + "east": {"uv": [21, 7], "uv_size": [3, 1]}, + "south": {"uv": [15, 24], "uv_size": [1, 1]}, + "west": {"uv": [21, 16], "uv_size": [3, 1]}, + "up": {"uv": [12, 21], "uv_size": [1, 3]}, + "down": {"uv": [13, 24], "uv_size": [1, -3]} + } + }, + { + "origin": [-1.265, 2.49451, -0.53498], + "size": [0.92, 0.46, 0.46], + "uv": { + "north": {"uv": [24, 15], "uv_size": [1, 1]}, + "east": {"uv": [24, 16], "uv_size": [1, 1]}, + "south": {"uv": [24, 17], "uv_size": [1, 1]}, + "west": {"uv": [18, 24], "uv_size": [1, 1]}, + "up": {"uv": [24, 18], "uv_size": [1, 1]}, + "down": {"uv": [19, 25], "uv_size": [1, -1]} + } + }, + { + "origin": [-1.45854, 1.29151, -0.53498], + "size": [0.46, 1.61, 0.46], + "pivot": [-1.22855, 2.44151, -0.30498], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [20, 24], "uv_size": [1, 1]}, + "east": {"uv": [24, 20], "uv_size": [1, 1]}, + "south": {"uv": [21, 24], "uv_size": [1, 1]}, + "west": {"uv": [24, 21], "uv_size": [1, 1]}, + "up": {"uv": [22, 24], "uv_size": [1, 1]}, + "down": {"uv": [24, 23], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.345, 2.14951, -4.55998], + "size": [0.69, 0.805, 7.59], + "uv": { + "north": {"uv": [23, 24], "uv_size": [1, 1]}, + "east": {"uv": [18, 13], "uv_size": [7, 1]}, + "south": {"uv": [24, 23], "uv_size": [1, 1]}, + "west": {"uv": [18, 14], "uv_size": [7, 1]}, + "up": {"uv": [6, 18], "uv_size": [1, 7]}, + "down": {"uv": [7, 25], "uv_size": [1, -7]} + } + }, + { + "origin": [-0.8625, 0.48201, -7.72248], + "size": [1.725, 1.955, 11.5], + "uv": { + "north": {"uv": [19, 6], "uv_size": [2, 2]}, + "east": {"uv": [4, 4], "uv_size": [10, 2]}, + "south": {"uv": [17, 19], "uv_size": [2, 2]}, + "west": {"uv": [4, 6], "uv_size": [10, 2]}, + "up": {"uv": [4, 8], "uv_size": [2, 10]}, + "down": {"uv": [6, 18], "uv_size": [2, -10]} + } + }, + { + "origin": [0.7475, 2.55201, -1.05248], + "size": [0.345, 1.84, 0.575], + "uv": { + "north": {"uv": [22, 4], "uv_size": [1, 2]}, + "east": {"uv": [14, 22], "uv_size": [1, 2]}, + "south": {"uv": [15, 22], "uv_size": [1, 2]}, + "west": {"uv": [22, 18], "uv_size": [1, 2]}, + "up": {"uv": [24, 24], "uv_size": [1, 1]}, + "down": {"uv": [0, 26], "uv_size": [1, -1]} + } + }, + { + "origin": [0.7475, 2.55201, 0.78752], + "size": [0.345, 1.84, 0.575], + "uv": { + "north": {"uv": [22, 20], "uv_size": [1, 2]}, + "east": {"uv": [22, 22], "uv_size": [1, 2]}, + "south": {"uv": [0, 23], "uv_size": [1, 2]}, + "west": {"uv": [23, 0], "uv_size": [1, 2]}, + "up": {"uv": [25, 0], "uv_size": [1, 1]}, + "down": {"uv": [1, 26], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.1725, 3.70201, 0.78752], + "size": [0.92, 0.69, 0.575], + "uv": { + "north": {"uv": [25, 1], "uv_size": [1, 1]}, + "east": {"uv": [2, 25], "uv_size": [1, 1]}, + "south": {"uv": [25, 2], "uv_size": [1, 1]}, + "west": {"uv": [3, 25], "uv_size": [1, 1]}, + "up": {"uv": [25, 3], "uv_size": [1, 1]}, + "down": {"uv": [4, 26], "uv_size": [1, -1]} + } + }, + { + "origin": [-0.1725, 3.70201, -1.05248], + "size": [0.92, 0.69, 0.575], + "uv": { + "north": {"uv": [25, 4], "uv_size": [1, 1]}, + "east": {"uv": [5, 25], "uv_size": [1, 1]}, + "south": {"uv": [25, 5], "uv_size": [1, 1]}, + "west": {"uv": [6, 25], "uv_size": [1, 1]}, + "up": {"uv": [25, 6], "uv_size": [1, 1]}, + "down": {"uv": [7, 26], "uv_size": [1, -1]} + } + }, + { + "origin": [0.7475, 1.97701, -1.16748], + "size": [0.38633, 0.575, 2.645], + "uv": { + "north": {"uv": [25, 7], "uv_size": [1, 1]}, + "east": {"uv": [23, 2], "uv_size": [2, 1]}, + "south": {"uv": [12, 25], "uv_size": [1, 1]}, + "west": {"uv": [23, 3], "uv_size": [2, 1]}, + "up": {"uv": [1, 23], "uv_size": [1, 2]}, + "down": {"uv": [23, 6], "uv_size": [1, -2]} + } + }, + { + "origin": [-0.6325, 0.82701, -28.30748], + "size": [1.265, 1.61, 20.585], + "uv": { + "north": {"uv": [25, 12], "uv_size": [1, 1]}, + "east": {"uv": [8, 8], "uv_size": [18, 1]}, + "south": {"uv": [13, 25], "uv_size": [1, 1]}, + "west": {"uv": [8, 9], "uv_size": [18, 1]}, + "up": {"uv": [8, 10], "uv_size": [1, 18]}, + "down": {"uv": [9, 28], "uv_size": [1, -18]} + } + }, + { + "origin": [-0.6325, 2.43701, -28.30748], + "size": [1.265, 0.345, 20.585], + "uv": { + "north": {"uv": [25, 13], "uv_size": [1, 1]}, + "east": {"uv": [10, 10], "uv_size": [18, 1]}, + "south": {"uv": [14, 25], "uv_size": [1, 1]}, + "west": {"uv": [10, 11], "uv_size": [18, 1]}, + "up": {"uv": [10, 12], "uv_size": [1, 18]}, + "down": {"uv": [11, 30], "uv_size": [1, -18]} + } + }, + { + "origin": [-0.8625, -4.76655, 1.95389], + "size": [1.725, 2.07, 14.375], + "pivot": [0, -3.84655, 15.9423], + "rotation": [-22.5, 0, 0], + "uv": { + "north": {"uv": [19, 19], "uv_size": [2, 2]}, + "east": {"uv": [0, 0], "uv_size": [13, 2]}, + "south": {"uv": [20, 0], "uv_size": [2, 2]}, + "west": {"uv": [0, 2], "uv_size": [13, 2]}, + "up": {"uv": [0, 4], "uv_size": [2, 13]}, + "down": {"uv": [2, 17], "uv_size": [2, -13]} + } + }, + { + "origin": [-0.8625, -1.08592, 6.78983], + "size": [1.725, 2.185, 5.2325], + "uv": { + "north": {"uv": [20, 2], "uv_size": [2, 2]}, + "east": {"uv": [14, 4], "uv_size": [5, 2]}, + "south": {"uv": [20, 4], "uv_size": [2, 2]}, + "west": {"uv": [14, 6], "uv_size": [5, 2]}, + "up": {"uv": [12, 16], "uv_size": [2, 5]}, + "down": {"uv": [16, 17], "uv_size": [2, -5]} + } + }, + { + "origin": [-0.8625, -3.15592, 11.96483], + "size": [1.725, 4.255, 4.8875], + "uv": { + "north": {"uv": [14, 16], "uv_size": [2, 4]}, + "east": {"uv": [12, 12], "uv_size": [4, 4]}, + "south": {"uv": [0, 17], "uv_size": [2, 4]}, + "west": {"uv": [13, 0], "uv_size": [4, 4]}, + "up": {"uv": [17, 0], "uv_size": [2, 4]}, + "down": {"uv": [2, 21], "uv_size": [2, -4]} + } + }, + { + "origin": [-0.8625, -4.90338, 15.67088], + "size": [1.725, 1.74746, 1.18144], + "uv": { + "north": {"uv": [14, 20], "uv_size": [2, 2]}, + "east": {"uv": [17, 23], "uv_size": [1, 2]}, + "south": {"uv": [0, 21], "uv_size": [2, 2]}, + "west": {"uv": [23, 17], "uv_size": [1, 2]}, + "up": {"uv": [18, 23], "uv_size": [2, 1]}, + "down": {"uv": [23, 20], "uv_size": [2, -1]} + } + } + ] + } + ], + "item_display_transforms": { + "thirdperson_righthand": { + "translation": [-0.75, -0.25, 1], + "scale": [0.6, 0.6, 0.6] + }, + "thirdperson_lefthand": { + "scale": [0, 0, 0] + }, + "ground": { + "translation": [0, 1.5, 3.5], + "scale": [0.6, 0.6, 0.6] + }, + "head": { + "translation": [0, 5.5, 2] + }, + "fixed": { + "rotation": [0, -90, 0], + "translation": [-8.25, 0, 0], + "scale": [1.1, 1.1, 1.1] + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/insidious.json b/src/main/resources/assets/superbwarfare/models/displaysettings/insidious.json new file mode 100644 index 000000000..088e9c710 --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/insidious.json @@ -0,0 +1,67 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [ + 64, + 64 + ], + "display": { + "thirdperson_righthand": { + "translation": [ + -0.75, + -0.25, + 1 + ], + "scale": [ + 0.6, + 0.6, + 0.6 + ] + }, + "thirdperson_lefthand": { + "scale": [ + 0, + 0, + 0 + ] + }, + "ground": { + "translation": [ + 0, + 1.5, + 3.5 + ], + "scale": [ + 0.6, + 0.6, + 0.6 + ] + }, + "head": { + "translation": [ + 0, + 5.5, + 2 + ] + }, + "fixed": { + "rotation": [ + 0, + -90, + 0 + ], + "translation": [ + -8.25, + 0, + 0 + ], + "scale": [ + 1.1, + 1.1, + 1.1 + ] + } + }, + "textures": { + "particle": "item/k_98" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/javelin.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/javelin.item.json index aeb9e029a..981b03a75 100644 --- a/src/main/resources/assets/superbwarfare/models/displaysettings/javelin.item.json +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/javelin.item.json @@ -38,6 +38,13 @@ 0.75 ] }, + "thirdperson_lefthand": { + "scale": [ + 0, + 0, + 0 + ] + }, "ground": { "translation": [ 0, diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/k_98.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/k_98.item.json index 274d72564..b144439ac 100644 --- a/src/main/resources/assets/superbwarfare/models/displaysettings/k_98.item.json +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/k_98.item.json @@ -26,21 +26,59 @@ 0 ] }, - "gui": { + "thirdperson_righthand": { + "translation": [ + -0.75, + -0.25, + 1 + ], + "scale": [ + 0.6, + 0.6, + 0.6 + ] + }, + "thirdperson_lefthand": { + "scale": [ + 0, + 0, + 0 + ] + }, + "ground": { + "translation": [ + 0, + 1.5, + 3.5 + ], + "scale": [ + 0.6, + 0.6, + 0.6 + ] + }, + "head": { + "translation": [ + 0, + 5.5, + 2 + ] + }, + "fixed": { "rotation": [ - 165.69, - -39.63, - 178.66 + 0, + -90, + 0 ], "translation": [ - -1.9, - -3.25, + -8.25, + 0, 0 ], "scale": [ - 0.18, - 0.18, - 0.18 + 1.1, + 1.1, + 1.1 ] } } diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/mosin_nagant.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/mosin_nagant.item.json index 274d72564..b144439ac 100644 --- a/src/main/resources/assets/superbwarfare/models/displaysettings/mosin_nagant.item.json +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/mosin_nagant.item.json @@ -26,21 +26,59 @@ 0 ] }, - "gui": { + "thirdperson_righthand": { + "translation": [ + -0.75, + -0.25, + 1 + ], + "scale": [ + 0.6, + 0.6, + 0.6 + ] + }, + "thirdperson_lefthand": { + "scale": [ + 0, + 0, + 0 + ] + }, + "ground": { + "translation": [ + 0, + 1.5, + 3.5 + ], + "scale": [ + 0.6, + 0.6, + 0.6 + ] + }, + "head": { + "translation": [ + 0, + 5.5, + 2 + ] + }, + "fixed": { "rotation": [ - 165.69, - -39.63, - 178.66 + 0, + -90, + 0 ], "translation": [ - -1.9, - -3.25, + -8.25, + 0, 0 ], "scale": [ - 0.18, - 0.18, - 0.18 + 1.1, + 1.1, + 1.1 ] } } diff --git a/src/main/resources/assets/superbwarfare/models/lod/k_98.json b/src/main/resources/assets/superbwarfare/models/lod/k_98.json deleted file mode 100644 index 9a4751169..000000000 --- a/src/main/resources/assets/superbwarfare/models/lod/k_98.json +++ /dev/null @@ -1,260 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [64, 64], - "textures": { - "0": "superbwarfare:item/lod/k_98", - "particle": "superbwarfare:item/lod/k_98" - }, - "elements": [ - { - "from": [7.5, 7, 15.7], - "to": [8.5, 7.4, 17.15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 0.5]}, - "faces": { - "north": {"uv": [5.5, 5, 5.75, 5.25], "texture": "#0"}, - "east": {"uv": [1, 1, 8.75, 1.25], "texture": "#0"}, - "south": {"uv": [5.5, 5.25, 5.75, 5.5], "texture": "#0"}, - "west": {"uv": [1, 1.25, 8.75, 1.5], "texture": "#0"}, - "up": {"uv": [1.25, 9.25, 1, 1.5], "texture": "#0"}, - "down": {"uv": [1.5, 1.5, 1.25, 9.25], "texture": "#0"} - } - }, - { - "from": [7.7, 6.4, -12], - "to": [8.3, 7, 18.75], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 0.5]}, - "faces": { - "north": {"uv": [5.5, 5, 5.75, 5.25], "texture": "#0"}, - "east": {"uv": [1, 1, 8.75, 1.25], "texture": "#0"}, - "south": {"uv": [5.5, 5.25, 5.75, 5.5], "texture": "#0"}, - "west": {"uv": [1, 1.25, 8.75, 1.5], "texture": "#0"}, - "up": {"uv": [1.25, 9.25, 1, 1.5], "texture": "#0"}, - "down": {"uv": [1.5, 1.5, 1.25, 9.25], "texture": "#0"} - } - }, - { - "from": [7.7, 7, -11.9], - "to": [8.3, 7.5, -11.35], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 0.5]}, - "faces": { - "north": {"uv": [5.5, 5, 5.75, 5.25], "texture": "#0"}, - "east": {"uv": [1, 1, 8.75, 1.25], "texture": "#0"}, - "south": {"uv": [5.5, 5.25, 5.75, 5.5], "texture": "#0"}, - "west": {"uv": [1, 1.25, 8.75, 1.5], "texture": "#0"}, - "up": {"uv": [1.25, 9.25, 1, 1.5], "texture": "#0"}, - "down": {"uv": [1.5, 1.5, 1.25, 9.25], "texture": "#0"} - } - }, - { - "from": [7.35, 5.3, -4.8], - "to": [8.65, 7.1, -4.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 0.5]}, - "faces": { - "north": {"uv": [5.5, 5, 5.75, 5.25], "texture": "#0"}, - "east": {"uv": [1, 1, 8.75, 1.25], "texture": "#0"}, - "south": {"uv": [5.5, 5.25, 5.75, 5.5], "texture": "#0"}, - "west": {"uv": [1, 1.25, 8.75, 1.5], "texture": "#0"}, - "up": {"uv": [1.25, 9.25, 1, 1.5], "texture": "#0"}, - "down": {"uv": [1.5, 1.5, 1.25, 9.25], "texture": "#0"} - } - }, - { - "from": [7.35, 5.3, -3.5], - "to": [8.65, 7.1, -2.85], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 0.5]}, - "faces": { - "north": {"uv": [5.5, 5, 5.75, 5.25], "texture": "#0"}, - "east": {"uv": [1, 1, 8.75, 1.25], "texture": "#0"}, - "south": {"uv": [5.5, 5.25, 5.75, 5.5], "texture": "#0"}, - "west": {"uv": [1, 1.25, 8.75, 1.5], "texture": "#0"}, - "up": {"uv": [1.25, 9.25, 1, 1.5], "texture": "#0"}, - "down": {"uv": [1.5, 1.5, 1.25, 9.25], "texture": "#0"} - } - }, - { - "from": [7.25, 5.3, 1.65], - "to": [8.75, 7.2, 2.7], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 0.5]}, - "faces": { - "north": {"uv": [5.5, 5, 5.75, 5.25], "texture": "#0"}, - "east": {"uv": [1, 1, 8.75, 1.25], "texture": "#0"}, - "south": {"uv": [5.5, 5.25, 5.75, 5.5], "texture": "#0"}, - "west": {"uv": [1, 1.25, 8.75, 1.5], "texture": "#0"}, - "up": {"uv": [1.25, 9.25, 1, 1.5], "texture": "#0"}, - "down": {"uv": [1.5, 1.5, 1.25, 9.25], "texture": "#0"} - } - }, - { - "from": [7.5, 7, 7.7], - "to": [8.5, 7.3, 11.75], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 0.5]}, - "faces": { - "north": {"uv": [5.5, 5, 5.75, 5.25], "texture": "#0"}, - "east": {"uv": [1, 1, 8.75, 1.25], "texture": "#0"}, - "south": {"uv": [5.5, 5.25, 5.75, 5.5], "texture": "#0"}, - "west": {"uv": [1, 1.25, 8.75, 1.5], "texture": "#0"}, - "up": {"uv": [1.25, 9.25, 1, 1.5], "texture": "#0"}, - "down": {"uv": [1.5, 1.5, 1.25, 9.25], "texture": "#0"} - } - }, - { - "from": [8.3, 6.8, 17.15], - "to": [9.1, 7.2, 17.55], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, -3.6]}, - "faces": { - "north": {"uv": [5.5, 5.5, 5.75, 5.75], "texture": "#0"}, - "east": {"uv": [5.75, 3.5, 6, 3.75], "texture": "#0"}, - "south": {"uv": [5.75, 3.75, 6, 4], "texture": "#0"}, - "west": {"uv": [5.75, 5, 6, 5.25], "texture": "#0"}, - "up": {"uv": [6, 5.5, 5.75, 5.25], "texture": "#0"}, - "down": {"uv": [5.75, 5.75, 5.5, 6], "texture": "#0"} - } - }, - { - "from": [8.8683, 5.75391, 17.15], - "to": [9.2683, 7.15391, 17.55], - "rotation": {"angle": 22.5, "axis": "z", "origin": [9.0683, 6.75391, 17.35]}, - "faces": { - "north": {"uv": [5.5, 5.5, 5.75, 5.75], "rotation": 270, "texture": "#0"}, - "east": {"uv": [6, 5.5, 5.75, 5.25], "rotation": 90, "texture": "#0"}, - "south": {"uv": [5.75, 3.75, 6, 4], "rotation": 90, "texture": "#0"}, - "west": {"uv": [5.75, 5.75, 5.5, 6], "rotation": 90, "texture": "#0"}, - "up": {"uv": [5.75, 5, 6, 5.25], "rotation": 90, "texture": "#0"}, - "down": {"uv": [5.75, 3.5, 6, 3.75], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [7.7, 7, 11.75], - "to": [8.3, 7.2, 18.35], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 4]}, - "faces": { - "north": {"uv": [5.75, 5.5, 6, 5.75], "texture": "#0"}, - "east": {"uv": [5.75, 5.75, 6, 6], "texture": "#0"}, - "south": {"uv": [0, 6, 0.25, 6.25], "texture": "#0"}, - "west": {"uv": [0.25, 6, 0.5, 6.25], "texture": "#0"}, - "up": {"uv": [0.75, 6.25, 0.5, 6], "texture": "#0"}, - "down": {"uv": [6.25, 0.5, 6, 0.75], "texture": "#0"} - } - }, - { - "from": [7.25, 5.05, 9], - "to": [8.75, 6.75, 19], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 0.5]}, - "faces": { - "north": {"uv": [5, 0.5, 5.5, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 4, 0.5], "texture": "#0"}, - "south": {"uv": [5, 5, 5.5, 5.5], "texture": "#0"}, - "west": {"uv": [0, 0.5, 4, 1], "texture": "#0"}, - "up": {"uv": [0.5, 5, 0, 1], "texture": "#0"}, - "down": {"uv": [1, 1, 0.5, 5], "texture": "#0"} - } - }, - { - "from": [7.45, 5.35, -4.9], - "to": [8.55, 6.75, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 0.5]}, - "faces": { - "north": {"uv": [5, 0.5, 5.5, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 4, 0.5], "texture": "#0"}, - "south": {"uv": [5, 5, 5.5, 5.5], "texture": "#0"}, - "west": {"uv": [0, 0.5, 4, 1], "texture": "#0"}, - "up": {"uv": [0.5, 5, 0, 1], "texture": "#0"}, - "down": {"uv": [1, 1, 0.5, 5], "texture": "#0"} - } - }, - { - "from": [7.45, 6.75, 0.7], - "to": [8.55, 7.05, 7.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 0.5]}, - "faces": { - "north": {"uv": [5, 0.5, 5.5, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 4, 0.5], "texture": "#0"}, - "south": {"uv": [5, 5, 5.5, 5.5], "texture": "#0"}, - "west": {"uv": [0, 0.5, 4, 1], "texture": "#0"}, - "up": {"uv": [0.5, 5, 0, 1], "texture": "#0"}, - "down": {"uv": [1, 1, 0.5, 5], "texture": "#0"} - } - }, - { - "from": [7.25, 0.48603, 17.41424], - "to": [8.75, 2.28603, 29.91424], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 1.28603, 29.57807]}, - "faces": { - "north": {"uv": [5.5, 0.5, 6, 1], "texture": "#0"}, - "east": {"uv": [1.5, 1.5, 4.5, 2], "texture": "#0"}, - "south": {"uv": [1.5, 5.5, 2, 6], "texture": "#0"}, - "west": {"uv": [1.5, 2, 4.5, 2.5], "texture": "#0"}, - "up": {"uv": [2, 5.5, 1.5, 2.5], "texture": "#0"}, - "down": {"uv": [2.5, 2.5, 2, 5.5], "texture": "#0"} - } - }, - { - "from": [7.25, 3.68658, 21.6194], - "to": [8.75, 5.58658, 30.3694], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 3.83658, 35.48323]}, - "faces": { - "north": {"uv": [5.5, 1.5, 6, 2], "texture": "#0"}, - "east": {"uv": [3.5, 3.5, 5.75, 4], "texture": "#0"}, - "south": {"uv": [2, 5.5, 2.5, 6], "texture": "#0"}, - "west": {"uv": [4, 0, 6.25, 0.5], "texture": "#0"}, - "up": {"uv": [4, 6.25, 3.5, 4], "texture": "#0"}, - "down": {"uv": [4.5, 4, 4, 6.25], "texture": "#0"} - } - }, - { - "from": [7.25, 1.88658, 26.1194], - "to": [8.75, 5.58658, 30.3694], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 3.83658, 35.48323]}, - "faces": { - "north": {"uv": [0, 5, 0.5, 6], "texture": "#0"}, - "east": {"uv": [4.5, 1.5, 5.5, 2.5], "texture": "#0"}, - "south": {"uv": [0.5, 5, 1, 6], "texture": "#0"}, - "west": {"uv": [4.5, 4, 5.5, 5], "texture": "#0"}, - "up": {"uv": [5.5, 3.5, 5, 2.5], "texture": "#0"}, - "down": {"uv": [5, 5, 4.5, 6], "texture": "#0"} - } - }, - { - "from": [7.25, 0.36705, 29.34206], - "to": [8.75, 1.88658, 30.3694], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 3.93658, 35.48323]}, - "faces": { - "north": {"uv": [5.5, 2, 6, 2.5], "texture": "#0"}, - "east": {"uv": [5.5, 2.5, 6, 3], "texture": "#0"}, - "south": {"uv": [5.5, 3, 6, 3.5], "texture": "#0"}, - "west": {"uv": [5.5, 4, 6, 4.5], "texture": "#0"}, - "up": {"uv": [6, 5, 5.5, 4.5], "texture": "#0"}, - "down": {"uv": [5.5, 5.5, 5, 6], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [-1.5, 2, -4.75], - "scale": [0.7, 0.7, 0.7] - }, - "thirdperson_lefthand": { - "translation": [-1.5, 2, -4.75], - "scale": [0.7, 0.7, 0.7] - }, - "ground": { - "translation": [0, 1.5, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "translation": [0, 9.75, -4.25] - }, - "fixed": { - "rotation": [0, -90, 0], - "translation": [3.5, 2.25, 0] - } - }, - "groups": [ - { - "name": "group", - "origin": [8, 3.83658, 35.48323], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/lod/mosin_nagant.json b/src/main/resources/assets/superbwarfare/models/lod/mosin_nagant.json deleted file mode 100644 index 5370d91d1..000000000 --- a/src/main/resources/assets/superbwarfare/models/lod/mosin_nagant.json +++ /dev/null @@ -1,324 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [32, 32], - "textures": { - "0": "superbwarfare:item/lod/mosin_nagant" - }, - "elements": [ - { - "from": [7.4, 6.6, 15.7], - "to": [8.6, 7.4, 18.75], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 0.5]}, - "faces": { - "north": {"uv": [10, 11.5, 10.5, 12], "texture": "#0"}, - "east": {"uv": [9, 8, 10.5, 8.5], "texture": "#0"}, - "south": {"uv": [11.5, 10, 12, 10.5], "texture": "#0"}, - "west": {"uv": [10.5, 3, 12, 3.5], "texture": "#0"}, - "up": {"uv": [1.5, 12, 1, 10.5], "texture": "#0"}, - "down": {"uv": [2, 10.5, 1.5, 12], "texture": "#0"} - } - }, - { - "from": [7.5, 8, 13.7], - "to": [8.5, 9, 19.25], - "rotation": {"angle": 45, "axis": "z", "origin": [8, 8.5, 16.725]}, - "faces": { - "north": {"uv": [10.5, 11.5, 11, 12], "texture": "#0"}, - "east": {"uv": [9, 7.5, 12, 8], "texture": "#0"}, - "south": {"uv": [11.5, 10.5, 12, 11], "texture": "#0"}, - "west": {"uv": [8, 9, 11, 9.5], "texture": "#0"}, - "up": {"uv": [10, 3, 9.5, 0], "texture": "#0"}, - "down": {"uv": [8.5, 9.5, 8, 12.5], "texture": "#0"} - } - }, - { - "from": [7.6, 6.2, -15.1], - "to": [8.4, 7, -8.35], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.7, 0.275]}, - "faces": { - "north": {"uv": [11.5, 11, 12, 11.5], "texture": "#0"}, - "east": {"uv": [8, 8.5, 11.5, 9], "texture": "#0"}, - "south": {"uv": [11.5, 11.5, 12, 12], "texture": "#0"}, - "west": {"uv": [9, 6, 12.5, 6.5], "texture": "#0"}, - "up": {"uv": [2.5, 12.5, 2, 9], "texture": "#0"}, - "down": {"uv": [3, 9, 2.5, 12.5], "texture": "#0"} - } - }, - { - "from": [7.7, 7, -14], - "to": [8.3, 7.5, -13.45], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, -1.6]}, - "faces": { - "north": {"uv": [12, 0, 12.5, 0.5], "texture": "#0"}, - "east": {"uv": [12, 0.5, 12.5, 1], "texture": "#0"}, - "south": {"uv": [1, 12, 1.5, 12.5], "texture": "#0"}, - "west": {"uv": [1.5, 12, 2, 12.5], "texture": "#0"}, - "up": {"uv": [12.5, 2.5, 12, 2], "texture": "#0"}, - "down": {"uv": [12.5, 2.5, 12, 3], "texture": "#0"} - } - }, - { - "from": [7.35, 5.3, 8.55], - "to": [8.65, 7.1, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 6.8]}, - "faces": { - "north": {"uv": [8.5, 10.5, 9, 11.5], "texture": "#0"}, - "east": {"uv": [9, 10.5, 9.5, 11.5], "texture": "#0"}, - "south": {"uv": [9.5, 10.5, 10, 11.5], "texture": "#0"}, - "west": {"uv": [10.5, 9.5, 11, 10.5], "texture": "#0"}, - "up": {"uv": [12.5, 3.5, 12, 3], "texture": "#0"}, - "down": {"uv": [12.5, 3.5, 12, 4], "texture": "#0"} - } - }, - { - "from": [7.35, 5.3, -3.55], - "to": [8.65, 7.1, -3.1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, -5.3]}, - "faces": { - "north": {"uv": [10, 10.5, 10.5, 11.5], "texture": "#0"}, - "east": {"uv": [10.5, 10.5, 11, 11.5], "texture": "#0"}, - "south": {"uv": [11, 0, 11.5, 1], "texture": "#0"}, - "west": {"uv": [11, 1, 11.5, 2], "texture": "#0"}, - "up": {"uv": [6.5, 12.5, 6, 12], "texture": "#0"}, - "down": {"uv": [7, 12, 6.5, 12.5], "texture": "#0"} - } - }, - { - "from": [7.5, 6.7, 9], - "to": [8.5, 7.3, 11.75], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 0.5]}, - "faces": { - "north": {"uv": [7, 12, 7.5, 12.5], "texture": "#0"}, - "east": {"uv": [10.5, 3.5, 12, 4], "texture": "#0"}, - "south": {"uv": [7.5, 12, 8, 12.5], "texture": "#0"}, - "west": {"uv": [10.5, 8, 12, 8.5], "texture": "#0"}, - "up": {"uv": [6.5, 12, 6, 10.5], "texture": "#0"}, - "down": {"uv": [7, 10.5, 6.5, 12], "texture": "#0"} - } - }, - { - "from": [8.3, 6.8, 15.25], - "to": [9.1, 7.2, 15.65], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, -5.5]}, - "faces": { - "north": {"uv": [12, 7.5, 12.5, 8], "texture": "#0"}, - "east": {"uv": [12, 8, 12.5, 8.5], "texture": "#0"}, - "south": {"uv": [12, 8.5, 12.5, 9], "texture": "#0"}, - "west": {"uv": [9, 12, 9.5, 12.5], "texture": "#0"}, - "up": {"uv": [12.5, 9.5, 12, 9], "texture": "#0"}, - "down": {"uv": [10, 12, 9.5, 12.5], "texture": "#0"} - } - }, - { - "from": [8.8683, 5.75391, 15.25], - "to": [9.2683, 7.15391, 15.65], - "rotation": {"angle": 22.5, "axis": "z", "origin": [9.0683, 6.75391, 15.45]}, - "faces": { - "north": {"uv": [10, 12, 10.5, 12.5], "texture": "#0"}, - "east": {"uv": [12, 10, 12.5, 10.5], "texture": "#0"}, - "south": {"uv": [10.5, 12, 11, 12.5], "texture": "#0"}, - "west": {"uv": [12, 10.5, 12.5, 11], "texture": "#0"}, - "up": {"uv": [11.5, 12.5, 11, 12], "texture": "#0"}, - "down": {"uv": [12.5, 11, 12, 11.5], "texture": "#0"} - } - }, - { - "from": [7.7, 6.5, 11.75], - "to": [8.3, 7.2, 18.35], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 4]}, - "faces": { - "north": {"uv": [11.5, 12, 12, 12.5], "texture": "#0"}, - "east": {"uv": [9, 6.5, 12.5, 7], "texture": "#0"}, - "south": {"uv": [12, 11.5, 12.5, 12], "texture": "#0"}, - "west": {"uv": [9, 7, 12.5, 7.5], "texture": "#0"}, - "up": {"uv": [3.5, 12.5, 3, 9], "texture": "#0"}, - "down": {"uv": [4, 9, 3.5, 12.5], "texture": "#0"} - } - }, - { - "from": [7.25, 5.05, 9], - "to": [8.75, 6.75, 19], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 0.5]}, - "faces": { - "north": {"uv": [9.5, 3, 10.5, 4], "texture": "#0"}, - "east": {"uv": [2, 2, 7, 3], "texture": "#0"}, - "south": {"uv": [8.5, 9.5, 9.5, 10.5], "texture": "#0"}, - "west": {"uv": [2, 3, 7, 4], "texture": "#0"}, - "up": {"uv": [3, 9, 2, 4], "texture": "#0"}, - "down": {"uv": [4, 4, 3, 9], "texture": "#0"} - } - }, - { - "from": [7.05, 6.85, 14.8], - "to": [7.35, 8.45, 15.3], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 0.5]}, - "faces": { - "north": {"uv": [11, 2, 11.5, 3], "texture": "#0"}, - "east": {"uv": [7, 11, 7.5, 12], "texture": "#0"}, - "south": {"uv": [7.5, 11, 8, 12], "texture": "#0"}, - "west": {"uv": [11, 9, 11.5, 10], "texture": "#0"}, - "up": {"uv": [12.5, 12.5, 12, 12], "texture": "#0"}, - "down": {"uv": [0.5, 12.5, 0, 13], "texture": "#0"} - } - }, - { - "from": [7.05, 6.85, 16.4], - "to": [7.35, 8.45, 16.9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 2.1]}, - "faces": { - "north": {"uv": [11, 10, 11.5, 11], "texture": "#0"}, - "east": {"uv": [11, 11, 11.5, 12], "texture": "#0"}, - "south": {"uv": [0, 11.5, 0.5, 12.5], "texture": "#0"}, - "west": {"uv": [11.5, 0, 12, 1], "texture": "#0"}, - "up": {"uv": [13, 0.5, 12.5, 0], "texture": "#0"}, - "down": {"uv": [1, 12.5, 0.5, 13], "texture": "#0"} - } - }, - { - "from": [7.35, 7.85, 16.4], - "to": [8.15, 8.45, 16.9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 2.1]}, - "faces": { - "north": {"uv": [12.5, 0.5, 13, 1], "texture": "#0"}, - "east": {"uv": [1, 12.5, 1.5, 13], "texture": "#0"}, - "south": {"uv": [12.5, 1, 13, 1.5], "texture": "#0"}, - "west": {"uv": [1.5, 12.5, 2, 13], "texture": "#0"}, - "up": {"uv": [13, 2, 12.5, 1.5], "texture": "#0"}, - "down": {"uv": [2.5, 12.5, 2, 13], "texture": "#0"} - } - }, - { - "from": [7.35, 7.85, 14.8], - "to": [8.15, 8.45, 15.3], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 0.5]}, - "faces": { - "north": {"uv": [12.5, 2, 13, 2.5], "texture": "#0"}, - "east": {"uv": [2.5, 12.5, 3, 13], "texture": "#0"}, - "south": {"uv": [12.5, 2.5, 13, 3], "texture": "#0"}, - "west": {"uv": [3, 12.5, 3.5, 13], "texture": "#0"}, - "up": {"uv": [13, 3.5, 12.5, 3], "texture": "#0"}, - "down": {"uv": [4, 12.5, 3.5, 13], "texture": "#0"} - } - }, - { - "from": [7.01406, 6.35, 14.7], - "to": [7.35, 6.85, 17], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 2.1]}, - "faces": { - "north": {"uv": [12.5, 3.5, 13, 4], "texture": "#0"}, - "east": {"uv": [11.5, 1, 12.5, 1.5], "texture": "#0"}, - "south": {"uv": [6, 12.5, 6.5, 13], "texture": "#0"}, - "west": {"uv": [11.5, 1.5, 12.5, 2], "texture": "#0"}, - "up": {"uv": [1, 12.5, 0.5, 11.5], "texture": "#0"}, - "down": {"uv": [12, 2, 11.5, 3], "texture": "#0"} - } - }, - { - "from": [7.45, 5.35, -8.9], - "to": [8.55, 6.75, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 0.5]}, - "faces": { - "north": {"uv": [12.5, 6, 13, 6.5], "texture": "#0"}, - "east": {"uv": [4, 4, 13, 4.5], "texture": "#0"}, - "south": {"uv": [6.5, 12.5, 7, 13], "texture": "#0"}, - "west": {"uv": [4, 4.5, 13, 5], "texture": "#0"}, - "up": {"uv": [4.5, 14, 4, 5], "texture": "#0"}, - "down": {"uv": [5, 5, 4.5, 14], "texture": "#0"} - } - }, - { - "from": [7.45, 6.75, -8.9], - "to": [8.55, 7.05, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.5, 0.5]}, - "faces": { - "north": {"uv": [12.5, 6.5, 13, 7], "texture": "#0"}, - "east": {"uv": [5, 5, 14, 5.5], "texture": "#0"}, - "south": {"uv": [7, 12.5, 7.5, 13], "texture": "#0"}, - "west": {"uv": [5, 5.5, 14, 6], "texture": "#0"}, - "up": {"uv": [5.5, 15, 5, 6], "texture": "#0"}, - "down": {"uv": [6, 6, 5.5, 15], "texture": "#0"} - } - }, - { - "from": [7.25, 0.48603, 17.41424], - "to": [8.75, 2.28603, 29.91424], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 1.28603, 29.57807]}, - "faces": { - "north": {"uv": [9.5, 9.5, 10.5, 10.5], "texture": "#0"}, - "east": {"uv": [0, 0, 6.5, 1], "texture": "#0"}, - "south": {"uv": [10, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [0, 1, 6.5, 2], "texture": "#0"}, - "up": {"uv": [1, 8.5, 0, 2], "texture": "#0"}, - "down": {"uv": [2, 2, 1, 8.5], "texture": "#0"} - } - }, - { - "from": [7.25, 3.68658, 21.6194], - "to": [8.75, 5.58658, 26.1694], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 3.83658, 35.48323]}, - "faces": { - "north": {"uv": [10, 1, 11, 2], "texture": "#0"}, - "east": {"uv": [7, 2, 9.5, 3], "texture": "#0"}, - "south": {"uv": [10, 2, 11, 3], "texture": "#0"}, - "west": {"uv": [7, 3, 9.5, 4], "texture": "#0"}, - "up": {"uv": [7, 10.5, 6, 8], "texture": "#0"}, - "down": {"uv": [9, 6, 8, 8.5], "texture": "#0"} - } - }, - { - "from": [7.25, 1.88658, 26.1194], - "to": [8.75, 5.58658, 30.3694], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 3.83658, 35.48323]}, - "faces": { - "north": {"uv": [7, 8, 8, 10], "texture": "#0"}, - "east": {"uv": [6, 6, 8, 8], "texture": "#0"}, - "south": {"uv": [0, 8.5, 1, 10.5], "texture": "#0"}, - "west": {"uv": [6.5, 0, 8.5, 2], "texture": "#0"}, - "up": {"uv": [9.5, 2, 8.5, 0], "texture": "#0"}, - "down": {"uv": [2, 8.5, 1, 10.5], "texture": "#0"} - } - }, - { - "from": [7.25, 0.36705, 29.34206], - "to": [8.75, 1.88658, 30.3694], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 3.93658, 35.48323]}, - "faces": { - "north": {"uv": [7, 10, 8, 11], "texture": "#0"}, - "east": {"uv": [8.5, 11.5, 9, 12.5], "texture": "#0"}, - "south": {"uv": [0, 10.5, 1, 11.5], "texture": "#0"}, - "west": {"uv": [11.5, 8.5, 12, 9.5], "texture": "#0"}, - "up": {"uv": [10, 12, 9, 11.5], "texture": "#0"}, - "down": {"uv": [12.5, 9.5, 11.5, 10], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [-1.5, 2, -4.75], - "scale": [0.7, 0.7, 0.7] - }, - "thirdperson_lefthand": { - "translation": [-1.5, 2, -4.75], - "scale": [0.7, 0.7, 0.7] - }, - "ground": { - "translation": [0, 1.5, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "translation": [0, 9.75, -4.25] - }, - "fixed": { - "rotation": [0, -90, 0], - "translation": [3.5, 2.25, 0] - } - }, - "groups": [ - { - "name": "group", - "origin": [8, 3.83658, 35.48323], - "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] - } - ] -} \ No newline at end of file