diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/DevotionItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/DevotionItemModel.java index 04a146293..10be8f002 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/DevotionItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/DevotionItemModel.java @@ -32,6 +32,16 @@ public class DevotionItemModel extends CustomGunModel { return Mod.loc("textures/item/devotion.png"); } + @Override + public ResourceLocation getLODModelResource(DevotionItem animatable) { + return Mod.loc("geo/lod/devotion.geo.json"); + } + + @Override + public ResourceLocation getLODTextureResource(DevotionItem animatable) { + return Mod.loc("textures/item/lod/devotion.png"); + } + @Override public void setCustomAnimations(DevotionItem animatable, long instanceId, AnimationState animationState) { Player player = Minecraft.getInstance().player; diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/DevotionItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/DevotionItemRenderer.java index 0606c2446..7b6540b85 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/DevotionItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/DevotionItemRenderer.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.DevotionItemModel; import com.atsuishio.superbwarfare.client.renderer.CustomGunRenderer; import com.atsuishio.superbwarfare.item.gun.GunItem; @@ -10,6 +11,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,9 +37,24 @@ public class DevotionItemRenderer 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.3875, 0.35); - AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.22993125, 20, 1, 255, 0, 0, 255, "apex_2x", false); + if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND || this.renderPerspective == ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) { + ItemModelHelper.handleGunAttachments(bone, itemStack, name); + AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.3875, 0.35); + + if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) { + AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.22993125, 20, 1, 255, 0, 0, 255, "apex_2x", false); + } else { + if (bone.getName().equals("magazine2")) { + bone.setHidden(true); + } + } + } else { + ItemModelHelper.hideAllAttachments(bone, name); + } + } else { + ItemModelHelper.hideAllAttachments(bone, name); } if (renderingArms) { diff --git a/src/main/resources/assets/superbwarfare/geo/lod/devotion.geo.json b/src/main/resources/assets/superbwarfare/geo/lod/devotion.geo.json new file mode 100644 index 000000000..bef08feb4 --- /dev/null +++ b/src/main/resources/assets/superbwarfare/geo/lod/devotion.geo.json @@ -0,0 +1,257 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.devotion", + "texture_width": 64, + "texture_height": 64, + "visible_bounds_width": 2, + "visible_bounds_height": 2.5, + "visible_bounds_offset": [0, 0.75, 0] + }, + "bones": [ + { + "name": "group", + "pivot": [0, 0.22609, -3.55095], + "cubes": [ + { + "origin": [-0.82, -0.01, -13.05], + "size": [1.64, 2.46, 16.4], + "uv": { + "north": {"uv": [22, 27], "uv_size": [2, 3]}, + "east": {"uv": [0, 0], "uv_size": [20, 3]}, + "south": {"uv": [27, 25], "uv_size": [2, 3]}, + "west": {"uv": [0, 3], "uv_size": [20, 3]}, + "up": {"uv": [0, 12], "uv_size": [2, 20]}, + "down": {"uv": [2, 32], "uv_size": [2, -20]} + } + }, + { + "origin": [-0.82, 0.81, 3.35], + "size": [1.64, 1.64, 9.84], + "uv": { + "north": {"uv": [18, 29], "uv_size": [2, 2]}, + "east": {"uv": [8, 12], "uv_size": [12, 2]}, + "south": {"uv": [29, 19], "uv_size": [2, 2]}, + "west": {"uv": [8, 14], "uv_size": [12, 2]}, + "up": {"uv": [8, 16], "uv_size": [2, 12]}, + "down": {"uv": [10, 28], "uv_size": [2, -12]} + } + }, + { + "origin": [-0.82, -2.47, 12.37], + "size": [1.64, 3.28, 0.82], + "uv": { + "north": {"uv": [20, 12], "uv_size": [2, 4]}, + "east": {"uv": [20, 29], "uv_size": [1, 4]}, + "south": {"uv": [6, 25], "uv_size": [2, 4]}, + "west": {"uv": [21, 29], "uv_size": [1, 4]}, + "up": {"uv": [28, 3], "uv_size": [2, 1]}, + "down": {"uv": [9, 32], "uv_size": [2, -1]} + } + }, + { + "origin": [-0.82, -1.71671, 3.66294], + "size": [1.64, 0.82, 9.02], + "pivot": [0, -1.30671, 10.63294], + "rotation": [-22.5, 0, 0], + "uv": { + "north": {"uv": [14, 31], "uv_size": [2, 1]}, + "east": {"uv": [24, 9], "uv_size": [11, 1]}, + "south": {"uv": [31, 15], "uv_size": [2, 1]}, + "west": {"uv": [24, 10], "uv_size": [11, 1]}, + "up": {"uv": [12, 16], "uv_size": [2, 11]}, + "down": {"uv": [14, 27], "uv_size": [2, -11]} + } + }, + { + "origin": [-0.82, -0.83, -6.31], + "size": [1.64, 0.82, 9.66], + "uv": { + "north": {"uv": [31, 16], "uv_size": [2, 1]}, + "east": {"uv": [24, 7], "uv_size": [13, 1]}, + "south": {"uv": [31, 17], "uv_size": [2, 1]}, + "west": {"uv": [24, 8], "uv_size": [13, 1]}, + "up": {"uv": [4, 12], "uv_size": [2, 13]}, + "down": {"uv": [6, 25], "uv_size": [2, -13]} + } + }, + { + "origin": [-0.82, -5.75, 2.53], + "size": [1.64, 5.74, 1.64], + "pivot": [0, -2.06, 1.71], + "rotation": [22.5, 0, 0], + "uv": { + "north": {"uv": [18, 22], "uv_size": [2, 7]}, + "east": {"uv": [20, 22], "uv_size": [2, 7]}, + "south": {"uv": [22, 20], "uv_size": [2, 7]}, + "west": {"uv": [24, 0], "uv_size": [2, 7]}, + "up": {"uv": [29, 21], "uv_size": [2, 2]}, + "down": {"uv": [25, 31], "uv_size": [2, -2]} + } + }, + { + "origin": [-0.82, -3.7, -0.07], + "size": [1.64, 2.87, 0.205], + "uv": { + "north": {"uv": [25, 15], "uv_size": [2, 4]}, + "east": {"uv": [29, 25], "uv_size": [1, 4]}, + "south": {"uv": [25, 19], "uv_size": [2, 4]}, + "west": {"uv": [29, 29], "uv_size": [1, 4]}, + "up": {"uv": [18, 31], "uv_size": [2, 1]}, + "down": {"uv": [31, 19], "uv_size": [2, -1]} + } + }, + { + "origin": [-0.82, -4.46101, -4.7722], + "size": [1.64, 4.1, 0.82], + "pivot": [0, -4.46101, -4.3622], + "rotation": [22.5, 0, 0], + "uv": { + "north": {"uv": [20, 0], "uv_size": [2, 5]}, + "east": {"uv": [6, 29], "uv_size": [1, 5]}, + "south": {"uv": [22, 0], "uv_size": [2, 5]}, + "west": {"uv": [7, 29], "uv_size": [1, 5]}, + "up": {"uv": [31, 19], "uv_size": [2, 1]}, + "down": {"uv": [31, 21], "uv_size": [2, -1]} + } + }, + { + "origin": [-0.82, -4.61791, -4.741], + "size": [1.64, 0.82, 2.05], + "uv": { + "north": {"uv": [31, 21], "uv_size": [2, 1]}, + "east": {"uv": [30, 6], "uv_size": [3, 1]}, + "south": {"uv": [31, 22], "uv_size": [2, 1]}, + "west": {"uv": [30, 29], "uv_size": [3, 1]}, + "up": {"uv": [28, 0], "uv_size": [2, 3]}, + "down": {"uv": [8, 31], "uv_size": [2, -3]} + } + }, + { + "origin": [-3.28, -4.93, -3.03], + "size": [6.56, 4.92, 2.96], + "uv": { + "north": {"uv": [0, 6], "uv_size": [8, 6]}, + "east": {"uv": [16, 16], "uv_size": [3, 6]}, + "south": {"uv": [8, 6], "uv_size": [8, 6]}, + "west": {"uv": [19, 16], "uv_size": [3, 6]}, + "up": {"uv": [16, 6], "uv_size": [8, 3]}, + "down": {"uv": [16, 12], "uv_size": [8, -3]} + } + }, + { + "origin": [-0.82, 2.45, -7.31], + "size": [1.64, 0.41, 6.56], + "uv": { + "north": {"uv": [25, 31], "uv_size": [2, 1]}, + "east": {"uv": [25, 23], "uv_size": [8, 1]}, + "south": {"uv": [27, 31], "uv_size": [2, 1]}, + "west": {"uv": [25, 24], "uv_size": [8, 1]}, + "up": {"uv": [22, 12], "uv_size": [2, 8]}, + "down": {"uv": [16, 30], "uv_size": [2, -8]} + } + }, + { + "origin": [-0.82, 2.45, -0.75], + "size": [1.64, 0.574, 3.034], + "uv": { + "north": {"uv": [31, 30], "uv_size": [2, 1]}, + "east": {"uv": [20, 5], "uv_size": [4, 1]}, + "south": {"uv": [31, 31], "uv_size": [2, 1]}, + "west": {"uv": [26, 6], "uv_size": [4, 1]}, + "up": {"uv": [25, 25], "uv_size": [2, 4]}, + "down": {"uv": [26, 4], "uv_size": [2, -4]} + } + }, + { + "origin": [0.82, 2.45, -0.75], + "size": [0.164, 1.804, 1.394], + "uv": { + "north": {"uv": [11, 31], "uv_size": [1, 2]}, + "east": {"uv": [30, 0], "uv_size": [2, 2]}, + "south": {"uv": [0, 32], "uv_size": [1, 2]}, + "west": {"uv": [30, 2], "uv_size": [2, 2]}, + "up": {"uv": [32, 0], "uv_size": [1, 2]}, + "down": {"uv": [1, 34], "uv_size": [1, -2]} + } + }, + { + "origin": [-0.984, 2.45, -0.75], + "size": [0.164, 1.804, 1.394], + "uv": { + "north": {"uv": [2, 32], "uv_size": [1, 2]}, + "east": {"uv": [16, 30], "uv_size": [2, 2]}, + "south": {"uv": [32, 2], "uv_size": [1, 2]}, + "west": {"uv": [22, 30], "uv_size": [2, 2]}, + "up": {"uv": [3, 32], "uv_size": [1, 2]}, + "down": {"uv": [9, 34], "uv_size": [1, -2]} + } + }, + { + "origin": [0.41, -0.42, -18.79], + "size": [0.41, 0.41, 8.2], + "uv": { + "north": {"uv": [10, 32], "uv_size": [1, 1]}, + "east": {"uv": [24, 11], "uv_size": [10, 1]}, + "south": {"uv": [18, 32], "uv_size": [1, 1]}, + "west": {"uv": [24, 12], "uv_size": [10, 1]}, + "up": {"uv": [24, 13], "uv_size": [1, 10]}, + "down": {"uv": [24, 33], "uv_size": [1, -10]} + } + }, + { + "origin": [-0.82, -0.42, -18.79], + "size": [0.41, 0.41, 8.2], + "uv": { + "north": {"uv": [19, 32], "uv_size": [1, 1]}, + "east": {"uv": [25, 13], "uv_size": [10, 1]}, + "south": {"uv": [22, 32], "uv_size": [1, 1]}, + "west": {"uv": [25, 14], "uv_size": [10, 1]}, + "up": {"uv": [4, 25], "uv_size": [1, 10]}, + "down": {"uv": [5, 35], "uv_size": [1, -10]} + } + }, + { + "origin": [-0.41, 1.425, -19.61], + "size": [0.82, 0.82, 6.56], + "uv": { + "north": {"uv": [23, 32], "uv_size": [1, 1]}, + "east": {"uv": [26, 4], "uv_size": [8, 1]}, + "south": {"uv": [25, 32], "uv_size": [1, 1]}, + "west": {"uv": [26, 5], "uv_size": [8, 1]}, + "up": {"uv": [12, 27], "uv_size": [1, 8]}, + "down": {"uv": [13, 35], "uv_size": [1, -8]} + } + }, + { + "origin": [-0.615, 1.22, -22.808], + "size": [1.23, 1.23, 3.198], + "uv": { + "north": {"uv": [30, 25], "uv_size": [2, 2]}, + "east": {"uv": [27, 15], "uv_size": [4, 2]}, + "south": {"uv": [30, 27], "uv_size": [2, 2]}, + "west": {"uv": [27, 17], "uv_size": [4, 2]}, + "up": {"uv": [14, 27], "uv_size": [2, 4]}, + "down": {"uv": [27, 23], "uv_size": [2, -4]} + } + }, + { + "origin": [-0.615, 0.4, -13.788], + "size": [1.23, 2.05, 0.738], + "uv": { + "north": {"uv": [10, 28], "uv_size": [2, 3]}, + "east": {"uv": [30, 30], "uv_size": [1, 3]}, + "south": {"uv": [27, 28], "uv_size": [2, 3]}, + "west": {"uv": [8, 31], "uv_size": [1, 3]}, + "up": {"uv": [14, 32], "uv_size": [2, 1]}, + "down": {"uv": [16, 33], "uv_size": [2, -1]} + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/devotion.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/devotion.item.json index 39f1553d8..c292b42f5 100644 --- a/src/main/resources/assets/superbwarfare/models/displaysettings/devotion.item.json +++ b/src/main/resources/assets/superbwarfare/models/displaysettings/devotion.item.json @@ -7,30 +7,6 @@ ], "gui_light": "front", "display": { - "thirdperson_righthand": { - "translation": [ - -1.25, - 0.25, - -2 - ], - "scale": [ - 0.6, - 0.6, - 0.6 - ] - }, - "thirdperson_lefthand": { - "translation": [ - 0, - 0.25, - -4.25 - ], - "scale": [ - 0.55, - 0.55, - 0.55 - ] - }, "firstperson_righthand": { "translation": [ -0.25, @@ -55,57 +31,59 @@ 0 ] }, + "thirdperson_righthand": { + "translation": [ + -0.75, + -0.25, + -0.25 + ], + "scale": [ + 0.75, + 0.75, + 0.75 + ] + }, + "thirdperson_lefthand": { + "scale": [ + 0, + 0, + 0 + ] + }, "ground": { "translation": [ 0, 3, - 0 + 1.75 ], "scale": [ - 0.55, - 0.55, - 0.55 - ] - }, - "gui": { - "rotation": [ - 30, - -145, - 0 - ], - "translation": [ - -2, - 0.75, - 0 - ], - "scale": [ - 0.7, - 0.7, - 0.7 + 0.8, + 0.8, + 0.8 ] }, "head": { - "rotation": [ + "translation": [ 0, - -90, - 0 + 11, + 1 ] }, "fixed": { "rotation": [ 0, - 90, + -90, 0 ], "translation": [ - -10.25, - -1.75, - -2 + -3.5, + 1.75, + -0.75 ], "scale": [ - 1.1, - 1.1, - 1.1 + 1.4, + 1.4, + 1.4 ] } } diff --git a/src/main/resources/assets/superbwarfare/models/lod/devotion.json b/src/main/resources/assets/superbwarfare/models/lod/devotion.json deleted file mode 100644 index f721583b0..000000000 --- a/src/main/resources/assets/superbwarfare/models/lod/devotion.json +++ /dev/null @@ -1,296 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [64, 64], - "textures": { - "0": "superbwarfare:item/lod/devotion", - "particle": "superbwarfare:item/lod/devotion" - }, - "elements": [ - { - "from": [7, 2, 0], - "to": [9, 5, 20], - "shade": false, - "faces": { - "north": {"uv": [5.5, 6.75, 6, 7.5], "texture": "#0"}, - "east": {"uv": [0, 0, 5, 0.75], "texture": "#0"}, - "south": {"uv": [6.75, 6.25, 7.25, 7], "texture": "#0"}, - "west": {"uv": [0, 0.75, 5, 1.5], "texture": "#0"}, - "up": {"uv": [0.5, 8, 0, 3], "texture": "#0"}, - "down": {"uv": [1, 3, 0.5, 8], "texture": "#0"} - } - }, - { - "from": [7, 3, 20], - "to": [9, 5, 32], - "shade": false, - "faces": { - "north": {"uv": [4.5, 7.25, 5, 7.75], "texture": "#0"}, - "east": {"uv": [2, 3, 5, 3.5], "texture": "#0"}, - "south": {"uv": [7.25, 4.75, 7.75, 5.25], "texture": "#0"}, - "west": {"uv": [2, 3.5, 5, 4], "texture": "#0"}, - "up": {"uv": [2.5, 7, 2, 4], "texture": "#0"}, - "down": {"uv": [3, 4, 2.5, 7], "texture": "#0"} - } - }, - { - "from": [7, -1, 31], - "to": [9, 3, 32], - "shade": false, - "faces": { - "north": {"uv": [5, 3, 5.5, 4], "texture": "#0"}, - "east": {"uv": [5, 7.25, 5.25, 8.25], "texture": "#0"}, - "south": {"uv": [1.5, 6.25, 2, 7.25], "texture": "#0"}, - "west": {"uv": [5.25, 7.25, 5.5, 8.25], "texture": "#0"}, - "up": {"uv": [7.5, 1, 7, 0.75], "texture": "#0"}, - "down": {"uv": [2.75, 7.75, 2.25, 8], "texture": "#0"} - } - }, - { - "from": [7, -0.08135, 20.38164], - "to": [9, 0.91865, 31.38164], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 0.41865, 28.88164]}, - "shade": false, - "faces": { - "north": {"uv": [3.5, 7.75, 4, 8], "texture": "#0"}, - "east": {"uv": [6, 2.25, 8.75, 2.5], "texture": "#0"}, - "south": {"uv": [7.75, 3.75, 8.25, 4], "texture": "#0"}, - "west": {"uv": [6, 2.5, 8.75, 2.75], "texture": "#0"}, - "up": {"uv": [3.5, 6.75, 3, 4], "texture": "#0"}, - "down": {"uv": [4, 4, 3.5, 6.75], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 2, 20], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 3]}, - "shade": false, - "faces": { - "north": {"uv": [7.75, 4, 8.25, 4.25], "texture": "#0"}, - "east": {"uv": [6, 1.75, 9.25, 2], "texture": "#0"}, - "south": {"uv": [7.75, 4.25, 8.25, 4.5], "texture": "#0"}, - "west": {"uv": [6, 2, 9.25, 2.25], "texture": "#0"}, - "up": {"uv": [1.5, 6.25, 1, 3], "texture": "#0"}, - "down": {"uv": [2, 3, 1.5, 6.25], "texture": "#0"} - } - }, - { - "from": [7, -5, 19], - "to": [9, 2, 21], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, -0.5, 18]}, - "shade": false, - "faces": { - "north": {"uv": [4.5, 5.5, 5, 7.25], "texture": "#0"}, - "east": {"uv": [5, 5.5, 5.5, 7.25], "texture": "#0"}, - "south": {"uv": [5.5, 5, 6, 6.75], "texture": "#0"}, - "west": {"uv": [6, 0, 6.5, 1.75], "texture": "#0"}, - "up": {"uv": [7.75, 5.75, 7.25, 5.25], "texture": "#0"}, - "down": {"uv": [6.75, 7.25, 6.25, 7.75], "texture": "#0"} - } - }, - { - "from": [7, -2.5, 14], - "to": [9, 1, 14.25], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 3]}, - "shade": false, - "faces": { - "north": {"uv": [6.25, 3.75, 6.75, 4.75], "texture": "#0"}, - "east": {"uv": [7.25, 6.25, 7.5, 7.25], "texture": "#0"}, - "south": {"uv": [6.25, 4.75, 6.75, 5.75], "texture": "#0"}, - "west": {"uv": [7.25, 7.25, 7.5, 8.25], "texture": "#0"}, - "up": {"uv": [5, 8, 4.5, 7.75], "texture": "#0"}, - "down": {"uv": [8.25, 4.5, 7.75, 4.75], "texture": "#0"} - } - }, - { - "from": [7, -3.42806, 8.87536], - "to": [9, 1.57194, 9.87536], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, -3.42806, 9.37536]}, - "shade": false, - "faces": { - "north": {"uv": [5, 0, 5.5, 1.25], "texture": "#0"}, - "east": {"uv": [1.5, 7.25, 1.75, 8.5], "texture": "#0"}, - "south": {"uv": [5.5, 0, 6, 1.25], "texture": "#0"}, - "west": {"uv": [1.75, 7.25, 2, 8.5], "texture": "#0"}, - "up": {"uv": [8.25, 5, 7.75, 4.75], "texture": "#0"}, - "down": {"uv": [8.25, 5, 7.75, 5.25], "texture": "#0"} - } - }, - { - "from": [7, -3.6194, 8.91342], - "to": [9, -2.6194, 11.41342], - "rotation": {"angle": 0, "axis": "x", "origin": [8, -3.1194, 11.41342]}, - "shade": false, - "faces": { - "north": {"uv": [7.75, 5.25, 8.25, 5.5], "texture": "#0"}, - "east": {"uv": [7.5, 1.5, 8.25, 1.75], "texture": "#0"}, - "south": {"uv": [7.75, 5.5, 8.25, 5.75], "texture": "#0"}, - "west": {"uv": [7.5, 7.25, 8.25, 7.5], "texture": "#0"}, - "up": {"uv": [7.5, 0.75, 7, 0], "texture": "#0"}, - "down": {"uv": [2.5, 7, 2, 7.75], "texture": "#0"} - } - }, - { - "from": [4, -4, 11], - "to": [12, 2, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 3]}, - "shade": false, - "faces": { - "north": {"uv": [0, 1.5, 2, 3], "texture": "#0"}, - "east": {"uv": [4, 4, 4.75, 5.5], "texture": "#0"}, - "south": {"uv": [2, 1.5, 4, 3], "texture": "#0"}, - "west": {"uv": [4.75, 4, 5.5, 5.5], "texture": "#0"}, - "up": {"uv": [6, 2.25, 4, 1.5], "texture": "#0"}, - "down": {"uv": [6, 2.25, 4, 3], "texture": "#0"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 5.5, 15], - "shade": false, - "faces": { - "north": {"uv": [6.25, 7.75, 6.75, 8], "texture": "#0"}, - "east": {"uv": [6.25, 5.75, 8.25, 6], "texture": "#0"}, - "south": {"uv": [6.75, 7.75, 7.25, 8], "texture": "#0"}, - "west": {"uv": [6.25, 6, 8.25, 6.25], "texture": "#0"}, - "up": {"uv": [6, 5, 5.5, 3], "texture": "#0"}, - "down": {"uv": [4.5, 5.5, 4, 7.5], "texture": "#0"} - } - }, - { - "from": [7, 5, 15], - "to": [9, 5.7, 18.7], - "shade": false, - "faces": { - "north": {"uv": [7.75, 7.5, 8.25, 7.75], "texture": "#0"}, - "east": {"uv": [5, 1.25, 6, 1.5], "texture": "#0"}, - "south": {"uv": [7.75, 7.75, 8.25, 8], "texture": "#0"}, - "west": {"uv": [6.5, 1.5, 7.5, 1.75], "texture": "#0"}, - "up": {"uv": [6.75, 7.25, 6.25, 6.25], "texture": "#0"}, - "down": {"uv": [7, 0, 6.5, 1], "texture": "#0"} - } - }, - { - "from": [6.8, 5, 15], - "to": [7, 7.2, 16.7], - "shade": false, - "faces": { - "north": {"uv": [2.75, 7.75, 3, 8.25], "texture": "#0"}, - "east": {"uv": [7.5, 0, 8, 0.5], "texture": "#0"}, - "south": {"uv": [0, 8, 0.25, 8.5], "texture": "#0"}, - "west": {"uv": [7.5, 0.5, 8, 1], "texture": "#0"}, - "up": {"uv": [8.25, 0.5, 8, 0], "texture": "#0"}, - "down": {"uv": [0.5, 8, 0.25, 8.5], "texture": "#0"} - } - }, - { - "from": [9, 5, 15], - "to": [9.2, 7.2, 16.7], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, - "shade": false, - "faces": { - "north": {"uv": [0.5, 8, 0.75, 8.5], "texture": "#0"}, - "east": {"uv": [4, 7.5, 4.5, 8], "texture": "#0"}, - "south": {"uv": [8, 0.5, 8.25, 1], "texture": "#0"}, - "west": {"uv": [5.5, 7.5, 6, 8], "texture": "#0"}, - "up": {"uv": [1, 8.5, 0.75, 8], "texture": "#0"}, - "down": {"uv": [2.5, 8, 2.25, 8.5], "texture": "#0"} - } - }, - { - "from": [7, 1.5, -7], - "to": [7.5, 2, 3], - "shade": false, - "faces": { - "north": {"uv": [2.5, 8, 2.75, 8.25], "texture": "#0"}, - "east": {"uv": [6, 2.75, 8.5, 3], "texture": "#0"}, - "south": {"uv": [4.5, 8, 4.75, 8.25], "texture": "#0"}, - "west": {"uv": [6, 3, 8.5, 3.25], "texture": "#0"}, - "up": {"uv": [6.25, 5.75, 6, 3.25], "texture": "#0"}, - "down": {"uv": [6.25, 5.75, 6, 8.25], "texture": "#0"} - } - }, - { - "from": [8.5, 1.5, -7], - "to": [9, 2, 3], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, - "shade": false, - "faces": { - "north": {"uv": [4.75, 8, 5, 8.25], "texture": "#0"}, - "east": {"uv": [6.25, 3.25, 8.75, 3.5], "texture": "#0"}, - "south": {"uv": [5.5, 8, 5.75, 8.25], "texture": "#0"}, - "west": {"uv": [6.25, 3.5, 8.75, 3.75], "texture": "#0"}, - "up": {"uv": [1.25, 8.75, 1, 6.25], "texture": "#0"}, - "down": {"uv": [1.5, 6.25, 1.25, 8.75], "texture": "#0"} - } - }, - { - "from": [7.5, 3.75, -8], - "to": [8.5, 4.75, 0], - "shade": false, - "faces": { - "north": {"uv": [5.75, 8, 6, 8.25], "texture": "#0"}, - "east": {"uv": [6.5, 1, 8.5, 1.25], "texture": "#0"}, - "south": {"uv": [6.25, 8, 6.5, 8.25], "texture": "#0"}, - "west": {"uv": [6.5, 1.25, 8.5, 1.5], "texture": "#0"}, - "up": {"uv": [3.25, 8.75, 3, 6.75], "texture": "#0"}, - "down": {"uv": [3.5, 6.75, 3.25, 8.75], "texture": "#0"} - } - }, - { - "from": [7.25, 3.5, -11.9], - "to": [8.75, 5, -8], - "shade": false, - "faces": { - "north": {"uv": [7.5, 6.25, 8, 6.75], "texture": "#0"}, - "east": {"uv": [6.75, 3.75, 7.75, 4.25], "texture": "#0"}, - "south": {"uv": [7.5, 6.75, 8, 7.25], "texture": "#0"}, - "west": {"uv": [6.75, 4.25, 7.75, 4.75], "texture": "#0"}, - "up": {"uv": [4, 7.75, 3.5, 6.75], "texture": "#0"}, - "down": {"uv": [7.25, 4.75, 6.75, 5.75], "texture": "#0"} - } - }, - { - "from": [7.25, 2.5, -0.9], - "to": [8.75, 5, 0], - "shade": false, - "faces": { - "north": {"uv": [2.5, 7, 3, 7.75], "texture": "#0"}, - "east": {"uv": [7.5, 7.5, 7.75, 8.25], "texture": "#0"}, - "south": {"uv": [6.75, 7, 7.25, 7.75], "texture": "#0"}, - "west": {"uv": [2, 7.75, 2.25, 8.5], "texture": "#0"}, - "up": {"uv": [4, 8.25, 3.5, 8], "texture": "#0"}, - "down": {"uv": [4.5, 8, 4, 8.25], "texture": "#0"} - } - } - ], - "gui_light": "front", - "display": { - "thirdperson_righthand": { - "translation": [-1.25, 2.5, -4], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [-1.25, 2.5, -4], - "scale": [0, 0, 0] - }, - "ground": { - "translation": [0, 4, -2.25], - "scale": [0.4, 0.4, 0.4] - }, - "head": { - "translation": [0, 18.25, -7.75] - }, - "fixed": { - "rotation": [0, 90, 0], - "translation": [-3.5, 6, 0] - } - }, - "groups": [ - { - "name": "group", - "origin": [0, 0, 0], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/lod/glock_17.json b/src/main/resources/assets/superbwarfare/models/lod/glock_17.json deleted file mode 100644 index 1bc8f2713..000000000 --- a/src/main/resources/assets/superbwarfare/models/lod/glock_17.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [32, 32], - "textures": { - "0": "superbwarfare:item/lod/glock_17", - "particle": "superbwarfare:item/lod/glock_17" - }, - "elements": [ - { - "from": [7, 6, 2], - "to": [9, 8, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [7, 6, 2]}, - "faces": { - "north": {"uv": [7, 1.5, 8, 2.5], "texture": "#0"}, - "east": {"uv": [0, 0, 6.5, 1], "texture": "#0"}, - "south": {"uv": [7, 2.5, 8, 3.5], "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, 5, 2.25], - "to": [9, 6, 14.25], - "rotation": {"angle": 0, "axis": "y", "origin": [7, 4, 2]}, - "faces": { - "north": {"uv": [7, 4.5, 8, 5], "texture": "#0"}, - "east": {"uv": [6, 5.5, 12, 6], "texture": "#0"}, - "south": {"uv": [7, 5, 8, 5.5], "texture": "#0"}, - "west": {"uv": [6, 6, 12, 6.5], "texture": "#0"}, - "up": {"uv": [3, 8, 2, 2], "texture": "#0"}, - "down": {"uv": [4, 2, 3, 8], "texture": "#0"} - } - }, - { - "from": [7.75, 3.25, 7.75], - "to": [8.25, 5, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [7, 4, 1]}, - "faces": { - "north": {"uv": [7.5, 0, 8, 1], "texture": "#0"}, - "east": {"uv": [8, 0, 8.5, 1], "texture": "#0"}, - "south": {"uv": [8, 1, 8.5, 2], "texture": "#0"}, - "west": {"uv": [2, 8, 2.5, 9], "texture": "#0"}, - "up": {"uv": [7, 2, 6.5, 1.5], "texture": "#0"}, - "down": {"uv": [8, 1, 7.5, 1.5], "texture": "#0"} - } - }, - { - "from": [7.75, 3.25, 8], - "to": [8.25, 3.5, 11.75], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 3.375, 8.875]}, - "faces": { - "north": {"uv": [8, 2, 8.5, 2.5], "texture": "#0"}, - "east": {"uv": [7, 3.5, 9, 4], "texture": "#0"}, - "south": {"uv": [2.5, 8, 3, 8.5], "texture": "#0"}, - "west": {"uv": [7, 4, 9, 4.5], "texture": "#0"}, - "up": {"uv": [7.5, 8.5, 7, 6.5], "texture": "#0"}, - "down": {"uv": [8, 6.5, 7.5, 8.5], "texture": "#0"} - } - }, - { - "from": [7.00781, -0.51537, 11.15224], - "to": [8.99219, 6.23463, 14.15224], - "rotation": {"angle": -22.5, "axis": "x", "origin": [7, 4.23463, 12.15224]}, - "faces": { - "north": {"uv": [4, 5.5, 5, 9], "texture": "#0"}, - "east": {"uv": [4, 2, 5.5, 5.5], "texture": "#0"}, - "south": {"uv": [5, 5.5, 6, 9], "texture": "#0"}, - "west": {"uv": [5.5, 2, 7, 5.5], "texture": "#0"}, - "up": {"uv": [7.5, 1.5, 6.5, 0], "texture": "#0"}, - "down": {"uv": [7, 6.5, 6, 8], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [-1, 1.5, 0], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "scale": [0, 0, 0] - }, - "firstperson_lefthand": { - "translation": [0, -80, 0], - "scale": [0, 0, 0] - }, - "ground": { - "translation": [0, -0.25, 0], - "scale": [0.75, 0.75, 0.75] - }, - "head": { - "translation": [0, 10.25, 0] - }, - "fixed": { - "rotation": [90, 45, -90], - "translation": [1.25, 4, 0], - "scale": [1.2, 1.2, 1.2] - } - } -} \ No newline at end of file