diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory12ga.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory12ga.java index abd376759..777c2d4c4 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory12ga.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory12ga.java @@ -672,6 +672,9 @@ public class XFactory12ga { .addBus("BELT", new BusAnimationSequence().setPos(1, 0, 0).hold(750).addPos(0, 0, 0, 500, IType.SIN_UP).hold(2000).addPos(1, 0, 0, 500, IType.SIN_UP)) .addBus("MAG", new BusAnimationSequence().hold(1500).addPos(0, -1, 0, 250, IType.SIN_UP).addPos(2, -1, 0, 500, IType.SIN_UP).addPos(7, 1, 0, 250, IType.SIN_UP).addPos(15, 2, 0, 250).setPos(0, -2, 0).addPos(0, 0, 0, 500, IType.SIN_UP)) .addBus("MAGROT", new BusAnimationSequence().hold(2250).addPos(0, 0, -180, 500, IType.SIN_FULL).setPos(0, 0, 0)); + case INSPECT: return new BusAnimation() + .addBus("BOTTLE", new BusAnimationSequence().setPos(8, -8, -2).addPos(6, -4, -2, 500, IType.SIN_DOWN).addPos(3, -3, -5, 500, IType.SIN_FULL).addPos(3, -2, -5, 1000).addPos(4, -6, -2, 750, IType.SIN_FULL).addPos(6, -8, -2, 500, IType.SIN_UP)) + .addBus("SIP", new BusAnimationSequence().setPos(25, 0, 0).hold(500).addPos(-90, 0, 0, 500, IType.SIN_FULL).addPos(-110, 0, 0, 1000).addPos(25, 0, 0, 750, IType.SIN_FULL)); } return null; diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java index ce23a4e69..e9e40dfe0 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerClient.java +++ b/src/main/java/com/hbm/main/ModEventHandlerClient.java @@ -923,7 +923,7 @@ public class ModEventHandlerClient { ); String prefix = "Slot "; - int gunScale = 8; + //int gunScale = 8; int slotScale = 1; boolean ignoreNonNTM = true; boolean onlyGuns = true; diff --git a/src/main/java/com/hbm/main/ResourceManager.java b/src/main/java/com/hbm/main/ResourceManager.java index 889727560..5ec3d90fc 100644 --- a/src/main/java/com/hbm/main/ResourceManager.java +++ b/src/main/java/com/hbm/main/ResourceManager.java @@ -885,6 +885,7 @@ public class ResourceManager { public static final IModelCustom m2 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/m2_browning.obj")).asVBO(); public static final IModelCustom shredder = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/shredder.obj")).asVBO(); public static final IModelCustom sexy = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/sexy.obj")).asVBO(); + public static final IModelCustom whiskey = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/whiskey.obj")).asVBO(); public static final IModelCustom quadro = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/quadro.obj")).asVBO(); public static final IModelCustom mike_hawk = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/mike_hawk.obj")).asVBO(); public static final IModelCustom minigun = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/minigun.obj")).asVBO(); @@ -1009,6 +1010,7 @@ public class ResourceManager { public static final ResourceLocation shredder_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/shredder.png"); public static final ResourceLocation shredder_orig_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/shredder_orig.png"); public static final ResourceLocation sexy_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/sexy_real_no_fake.png"); + public static final ResourceLocation whiskey_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/whiskey.png"); public static final ResourceLocation quadro_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/quadro.png"); public static final ResourceLocation quadro_rocket_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/quadro_rocket.png"); public static final ResourceLocation minigun_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/minigun.png"); diff --git a/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderSexy.java b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderSexy.java index c237a95e4..acd889ab4 100644 --- a/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderSexy.java +++ b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderSexy.java @@ -42,13 +42,13 @@ public class ItemRenderSexy extends ItemRenderWeaponBase { @Override public void renderFirstPerson(ItemStack stack) { ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem(); - Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.sexy_tex); double scale = 0.375D; GL11.glScaled(scale, scale, scale); boolean doesCycle = HbmAnimations.getRelevantAnim(0) != null && HbmAnimations.getRelevantAnim(0).animation.getBus("CYCLE") != null; boolean reloading = HbmAnimations.getRelevantAnim(0) != null && HbmAnimations.getRelevantAnim(0).animation.getBus("BELT") != null; boolean useShellCount = HbmAnimations.getRelevantAnim(0) != null && HbmAnimations.getRelevantAnim(0).animation.getBus("SHELLS") != null; + boolean girldinner = HbmAnimations.getRelevantAnim(0) != null && HbmAnimations.getRelevantAnim(0).animation.getBus("BOTTLE") != null; double[] equip = HbmAnimations.getRelevantTransformation("EQUIP"); double[] lower = HbmAnimations.getRelevantTransformation("LOWER"); double[] recoil = HbmAnimations.getRelevantTransformation("RECOIL"); @@ -60,6 +60,26 @@ public class ItemRenderSexy extends ItemRenderWeaponBase { double[] mag = HbmAnimations.getRelevantTransformation("MAG"); double[] magRot = HbmAnimations.getRelevantTransformation("MAGROT"); double[] shellCount = HbmAnimations.getRelevantTransformation("SHELLS"); + double[] bottle = HbmAnimations.getRelevantTransformation("BOTTLE"); + double[] sippy = HbmAnimations.getRelevantTransformation("SIP"); + + GL11.glShadeModel(GL11.GL_SMOOTH); + + if(girldinner) { + GL11.glPushMatrix(); + GL11.glTranslated(bottle[0], bottle[1], bottle[2]); + GL11.glTranslated(0, 2, 0); + GL11.glRotated(sippy[0], 1, 0, 0); + GL11.glRotated(90, 0, 1, 0); + GL11.glRotated(-15, 1, 0, 0); + GL11.glTranslated(0, -2, 0); + GL11.glScaled(1.5, 1.5, 1.5); + Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.whiskey_tex); + ResourceManager.whiskey.renderAll(); + GL11.glPopMatrix(); + } + + Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.sexy_tex); GL11.glTranslated(0, -1, -8); GL11.glRotated(equip[0], 1, 0, 0); @@ -71,8 +91,6 @@ public class ItemRenderSexy extends ItemRenderWeaponBase { GL11.glTranslated(0, 0, recoil[2]); - GL11.glShadeModel(GL11.GL_SMOOTH); - ResourceManager.sexy.renderPart("Gun"); GL11.glPushMatrix(); diff --git a/src/main/resources/assets/hbm/models/weapons/whiskey.obj b/src/main/resources/assets/hbm/models/weapons/whiskey.obj new file mode 100644 index 000000000..4c64b19d5 --- /dev/null +++ b/src/main/resources/assets/hbm/models/weapons/whiskey.obj @@ -0,0 +1,605 @@ +# Blender v2.79 (sub 0) OBJ File: 'whiskey.blend' +# www.blender.org +o Plane +v -0.437500 1.750000 0.375000 +v -0.375000 1.750000 0.437500 +v -0.375000 1.750000 -0.437500 +v -0.437500 1.750000 -0.375000 +v 0.437500 1.750000 -0.375000 +v 0.375000 1.750000 -0.437500 +v 0.375000 1.750000 0.437500 +v 0.437500 1.750000 0.375000 +v 0.437500 0.250000 0.375000 +v 0.375000 0.250000 0.437500 +v 0.375000 0.250000 -0.437500 +v 0.437500 0.250000 -0.375000 +v -0.437500 0.250000 -0.375000 +v -0.375000 0.250000 -0.437500 +v -0.375000 0.250000 0.437500 +v -0.437500 0.250000 0.375000 +v -0.375000 0.000000 0.500000 +v -0.500000 0.000000 0.375000 +v 0.500000 0.000000 0.375000 +v 0.375000 0.000000 0.500000 +v -0.500000 0.000000 -0.375000 +v -0.375000 0.000000 -0.500000 +v 0.375000 0.000000 -0.500000 +v 0.500000 0.000000 -0.375000 +v -0.500000 2.000000 0.375000 +v -0.375000 2.000000 0.500000 +v 0.375000 2.000000 0.500000 +v 0.500000 2.000000 0.375000 +v -0.375000 2.000000 -0.500000 +v -0.500000 2.000000 -0.375000 +v 0.500000 2.000000 -0.375000 +v 0.375000 2.000000 -0.500000 +v -0.500000 0.187500 0.375000 +v -0.375000 0.187500 0.500000 +v -0.375000 0.187500 -0.500000 +v -0.500000 0.187500 -0.375000 +v 0.500000 0.187500 -0.375000 +v 0.375000 0.187500 -0.500000 +v 0.375000 0.187500 0.500000 +v 0.500000 0.187500 0.375000 +v -0.500000 1.812500 -0.375000 +v -0.375000 1.812500 -0.500000 +v -0.375000 1.812500 0.500000 +v -0.500000 1.812500 0.375000 +v 0.375000 1.812500 -0.500000 +v 0.500000 1.812500 -0.375000 +v 0.500000 1.812500 0.375000 +v 0.375000 1.812500 0.500000 +v 0.000000 2.125000 -0.312500 +v -0.156250 2.125000 -0.270633 +v -0.270633 2.125000 -0.156250 +v -0.312500 2.125000 0.000000 +v -0.270633 2.125000 0.156250 +v -0.156250 2.125000 0.270633 +v -0.000000 2.125000 0.312500 +v 0.156250 2.125000 0.270633 +v 0.270633 2.125000 0.156250 +v 0.312500 2.125000 0.000000 +v 0.270633 2.125000 -0.156250 +v 0.156250 2.125000 -0.270633 +v 0.000000 2.250000 -0.187500 +v -0.093750 2.250000 -0.162380 +v -0.162380 2.250000 -0.093750 +v -0.187500 2.250000 0.000000 +v -0.162380 2.250000 0.093750 +v -0.093750 2.250000 0.162380 +v -0.000000 2.250000 0.187500 +v 0.093750 2.250000 0.162380 +v 0.162380 2.250000 0.093750 +v 0.187500 2.250000 0.000000 +v 0.162380 2.250000 -0.093750 +v 0.093750 2.250000 -0.162380 +v 0.000000 3.000000 -0.187500 +v -0.093750 3.000000 -0.162380 +v -0.162380 3.000000 -0.093750 +v -0.187500 3.000000 0.000000 +v -0.162380 3.000000 0.093750 +v -0.093750 3.000000 0.162380 +v -0.000000 3.000000 0.187500 +v 0.093750 3.000000 0.162380 +v 0.162380 3.000000 0.093750 +v 0.187500 3.000000 0.000000 +v 0.162380 3.000000 -0.093750 +v 0.093750 3.000000 -0.162380 +v 0.000000 3.000000 -0.125000 +v -0.062500 3.000000 -0.108253 +v -0.108253 3.000000 -0.062500 +v -0.125000 3.000000 0.000000 +v -0.108253 3.000000 0.062500 +v -0.062500 3.000000 0.108253 +v -0.000000 3.000000 0.125000 +v 0.062500 3.000000 0.108253 +v 0.108253 3.000000 0.062500 +v 0.125000 3.000000 0.000000 +v 0.108253 3.000000 -0.062500 +v 0.062500 3.000000 -0.108253 +v 0.000000 2.500000 -0.125000 +v -0.062500 2.500000 -0.108253 +v -0.108253 2.500000 -0.062500 +v -0.125000 2.500000 0.000000 +v -0.108253 2.500000 0.062500 +v -0.062500 2.500000 0.108253 +v -0.000000 2.500000 0.125000 +v 0.062500 2.500000 0.108253 +v 0.108253 2.500000 0.062500 +v 0.125000 2.500000 0.000000 +v 0.108253 2.500000 -0.062500 +v 0.062500 2.500000 -0.108253 +vt 0.052937 0.823977 +vt 0.225652 0.867155 +vt 0.052937 0.867155 +vt 0.693212 0.823976 +vt 0.865928 0.867155 +vt 0.693212 0.867155 +vt 0.266362 0.823977 +vt 0.439078 0.867155 +vt 0.266362 0.867155 +vt 0.439078 0.758665 +vt 0.266377 0.715427 +vt 0.439093 0.715486 +vt 0.865928 0.803621 +vt 0.865928 0.823976 +vt 0.225652 0.758591 +vt 0.052952 0.715353 +vt 0.225667 0.715413 +vt 0.865929 0.758812 +vt 0.693228 0.715574 +vt 0.865943 0.715633 +vt 0.479787 0.823977 +vt 0.652503 0.867155 +vt 0.479787 0.867155 +vt 0.652503 0.758739 +vt 0.479802 0.715500 +vt 0.652518 0.715560 +vt 0.439078 0.823977 +vt 0.652503 0.823976 +vt 0.225652 0.823977 +vt 0.012227 0.823977 +vt 0.012227 0.867155 +vt 0.052937 0.758532 +vt 0.012242 0.715339 +vt 0.693213 0.758753 +vt 0.266362 0.758606 +vt 0.479787 0.758679 +vt 0.508551 0.382113 +vt 0.630679 0.544951 +vt 0.467841 0.667080 +vt 0.683035 0.806349 +vt 0.469610 0.806349 +vt 0.439078 0.803622 +vt 0.652503 0.803622 +vt 0.042759 0.806349 +vt 0.256185 0.806349 +vt 0.225652 0.803622 +vt 0.591439 0.012228 +vt 0.571084 0.357659 +vt 0.571084 0.012228 +vt 0.398369 0.357659 +vt 0.398369 0.012228 +vt 0.184943 0.012227 +vt 0.012227 0.357659 +vt 0.012228 0.012227 +vt 0.378014 0.357659 +vt 0.378014 0.012228 +vt 0.784510 0.012227 +vt 0.764155 0.357659 +vt 0.764155 0.012227 +vt 0.205298 0.357659 +vt 0.205298 0.012227 +vt 0.184943 0.357659 +vt 0.591439 0.357659 +vt 0.439071 0.779020 +vt 0.266355 0.778960 +vt 0.469604 0.776303 +vt 0.449249 0.776296 +vt 0.652496 0.779094 +vt 0.479780 0.779034 +vt 0.683029 0.776377 +vt 0.662674 0.776370 +vt 0.865922 0.779167 +vt 0.693206 0.779108 +vt 0.012227 0.758518 +vt 0.042753 0.776156 +vt 0.022398 0.776149 +vt 0.225645 0.778946 +vt 0.052930 0.778887 +vt 0.256178 0.776230 +vt 0.235824 0.776223 +vt 0.827850 0.426816 +vt 0.841753 0.445442 +vt 0.827850 0.449167 +vt 0.827850 0.404465 +vt 0.841753 0.423091 +vt 0.827850 0.382113 +vt 0.841753 0.400739 +vt 0.827849 0.627976 +vt 0.841752 0.646602 +vt 0.827849 0.650328 +vt 0.827849 0.605625 +vt 0.841752 0.624251 +vt 0.827850 0.583274 +vt 0.841752 0.601900 +vt 0.841752 0.564648 +vt 0.841752 0.579549 +vt 0.827850 0.560923 +vt 0.841752 0.542297 +vt 0.841752 0.557198 +vt 0.827850 0.538572 +vt 0.841753 0.519946 +vt 0.841752 0.534846 +vt 0.827850 0.516220 +vt 0.841753 0.497595 +vt 0.841753 0.512495 +vt 0.827850 0.493869 +vt 0.841753 0.475243 +vt 0.841753 0.490144 +vt 0.827850 0.471518 +vt 0.841753 0.452892 +vt 0.841753 0.467793 +vt 0.857124 0.159276 +vt 0.864574 0.187081 +vt 0.844220 0.207436 +vt 0.693212 0.803622 +vt 0.345713 0.544951 +vt 0.345713 0.504242 +vt 0.467841 0.382113 +vt 0.630679 0.504242 +vt 0.508551 0.667080 +vt 0.662680 0.806349 +vt 0.449255 0.806349 +vt 0.266362 0.803622 +vt 0.479787 0.803622 +vt 0.022405 0.806349 +vt 0.235830 0.806349 +vt 0.052937 0.803622 +vt 0.784510 0.357659 +vt 0.841753 0.430541 +vt 0.841753 0.408190 +vt 0.841753 0.385839 +vt 0.841752 0.631702 +vt 0.841752 0.609350 +vt 0.841752 0.586999 +vt 0.829319 0.207436 +vt 0.816415 0.199985 +vt 0.808964 0.187081 +vt 0.808964 0.172180 +vt 0.816415 0.159276 +vt 0.829319 0.151826 +vt 0.844220 0.151826 +vt 0.864574 0.172180 +vt 0.857124 0.199985 +vt 0.321258 0.518454 +vt 0.238315 0.521438 +vt 0.220754 0.488898 +vt 0.237168 0.559627 +vt 0.184896 0.690885 +vt 0.182030 0.607808 +vt 0.214707 0.590337 +vt 0.139480 0.690836 +vt 0.012227 0.554530 +vt 0.095226 0.551540 +vt 0.112801 0.584112 +vt 0.012232 0.509129 +vt 0.148725 0.382113 +vt 0.189887 0.466440 +vt 0.151549 0.465183 +vt 0.118860 0.482620 +vt 0.200962 0.548521 +vt 0.190371 0.563643 +vt 0.143679 0.606579 +vt 0.173577 0.571533 +vt 0.139421 0.559473 +vt 0.154899 0.570068 +vt 0.096376 0.513327 +vt 0.131245 0.542854 +vt 0.132598 0.524424 +vt 0.143165 0.509279 +vt 0.159957 0.501494 +vt 0.178656 0.502956 +vt 0.194151 0.513552 +vt 0.202343 0.530124 +vt 0.655134 0.605624 +vt 0.655134 0.627975 +vt 0.655135 0.449166 +vt 0.655135 0.471518 +vt 0.655135 0.404464 +vt 0.655135 0.426815 +vt 0.655134 0.516220 +vt 0.655134 0.538571 +vt 0.655134 0.583273 +vt 0.655135 0.382113 +vt 0.655135 0.493869 +vt 0.655134 0.560922 +vt 0.655133 0.650326 +vt 0.883468 0.127371 +vt 0.898369 0.012227 +vt 0.898369 0.127371 +vt 0.928170 0.127371 +vt 0.943070 0.012227 +vt 0.943071 0.127371 +vt 0.972872 0.127371 +vt 0.987773 0.012227 +vt 0.987773 0.127371 +vt 0.868567 0.127371 +vt 0.883468 0.012227 +vt 0.838766 0.127371 +vt 0.853666 0.012227 +vt 0.853666 0.127371 +vt 0.913269 0.127371 +vt 0.928170 0.012227 +vt 0.957971 0.127371 +vt 0.972872 0.012227 +vt 0.868567 0.012227 +vt 0.823865 0.127371 +vt 0.838766 0.012227 +vt 0.913269 0.012227 +vt 0.957971 0.012227 +vt 0.808964 0.127371 +vt 0.823865 0.012227 +vt 0.194123 0.382196 +vt 0.321258 0.563814 +vt 0.808964 0.012227 +vn 0.0000 0.0000 -1.0000 +vn -1.0000 0.0000 0.0000 +vn 1.0000 0.0000 0.0000 +vn -0.7071 0.7071 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.7071 0.0000 0.7071 +vn -0.7071 0.0000 0.7071 +vn 0.7071 0.0000 -0.7071 +vn -0.7071 0.0000 -0.7071 +vn 0.0000 -1.0000 0.0000 +vn -0.5774 0.5774 0.5774 +vn 0.5774 0.5774 0.5774 +vn 0.7071 0.7071 0.0000 +vn 0.0000 0.7071 0.7071 +vn -0.5774 0.5774 -0.5774 +vn 0.5774 0.5774 -0.5774 +vn 0.0000 0.7071 -0.7071 +vn 0.7071 -0.7071 0.0000 +vn 0.5774 -0.5774 0.5774 +vn 0.0000 -0.7071 0.7071 +vn -0.5774 -0.5774 0.5774 +vn -0.7071 -0.7071 0.0000 +vn -0.5774 -0.5774 -0.5774 +vn 0.0000 -0.7071 -0.7071 +vn 0.5774 -0.5774 -0.5774 +vn 0.0000 1.0000 -0.0000 +vn 0.3493 0.9190 -0.1829 +vn 0.4649 0.8474 -0.2564 +vn 0.5891 0.8080 0.0000 +vn 0.2564 0.8474 -0.4649 +vn -0.1829 0.9190 -0.3493 +vn -0.2564 0.8474 -0.4649 +vn 0.0000 0.8080 -0.5891 +vn -0.3493 0.9190 -0.1829 +vn -0.3493 0.9190 0.1829 +vn -0.4649 0.8474 0.2564 +vn -0.5891 0.8080 0.0000 +vn -0.1829 0.9190 0.3493 +vn 0.1829 0.9190 0.3493 +vn 0.4649 0.8474 0.2564 +vn 0.2564 0.8474 0.4649 +vn -0.0000 0.8080 0.5891 +vn 0.4567 0.4070 -0.7911 +vn 0.0000 0.4070 -0.9134 +vn -0.4649 0.8474 -0.2564 +vn -0.4567 0.4070 -0.7911 +vn -0.9134 0.4070 -0.0000 +vn -0.7911 0.4070 -0.4567 +vn -0.2564 0.8474 0.4649 +vn -0.7911 0.4070 0.4567 +vn -0.4567 0.4070 0.7911 +vn -0.0000 0.4070 0.9134 +vn 0.4567 0.4070 0.7911 +vn 0.7911 0.4070 0.4567 +vn 0.9134 0.4070 0.0000 +vn 0.7911 0.4070 -0.4567 +vn -0.8660 0.0000 0.5000 +vn 0.5000 0.0000 -0.8660 +vn -0.5000 0.0000 -0.8660 +vn 0.8660 0.0000 0.5000 +vn -0.5000 0.0000 0.8660 +vn -0.8660 0.0000 -0.5000 +vn 0.8660 0.0000 -0.5000 +vn 0.5000 0.0000 0.8660 +vn 0.3493 0.9190 0.1829 +vn 0.1829 0.9190 -0.3493 +s off +f 35/1/1 23/2/1 22/3/1 +f 33/4/2 21/5/2 18/6/2 +f 37/7/3 19/8/3 24/9/3 +f 47/10/3 31/11/3 28/12/3 +f 33/4/4 13/13/4 36/14/4 +f 45/15/1 29/16/1 32/17/1 +f 41/18/2 25/19/2 30/20/2 +f 39/21/5 17/22/5 20/23/5 +f 43/24/5 27/25/5 26/26/5 +f 40/27/6 20/23/6 19/8/6 +f 18/6/7 34/28/7 33/4/7 +f 38/29/8 24/9/8 23/2/8 +f 36/30/9 22/3/9 21/31/9 +f 42/32/9 30/33/9 29/16/9 +f 26/26/7 44/34/7 43/24/7 +f 46/35/8 32/17/8 31/11/8 +f 48/36/6 28/12/6 27/25/6 +f 24/37/10 20/38/10 18/39/10 +f 34/28/11 16/40/11 33/4/11 +f 40/27/12 10/41/12 39/21/12 +f 37/7/13 9/42/13 40/27/13 +f 39/21/14 15/43/14 34/28/14 +f 36/30/15 14/44/15 35/1/15 +f 38/29/16 12/45/16 37/7/16 +f 35/1/17 11/46/17 38/29/17 +f 11/47/8 5/48/8 12/49/8 +f 12/49/3 8/50/3 9/51/3 +f 16/52/2 4/53/2 13/54/2 +f 9/51/6 7/55/6 10/56/6 +f 13/57/9 3/58/9 14/59/9 +f 10/56/5 2/60/5 15/61/5 +f 15/61/7 1/62/7 16/52/7 +f 14/59/1 6/63/1 11/47/1 +f 46/35/18 8/64/18 5/65/18 +f 47/10/19 7/66/19 8/67/19 +f 48/36/20 2/68/20 7/69/20 +f 43/24/21 1/70/21 2/71/21 +f 44/34/22 4/72/22 1/73/22 +f 41/74/23 3/75/23 4/76/23 +f 42/32/24 6/77/24 3/78/24 +f 45/15/25 5/79/25 6/80/25 +f 74/81/26 85/82/26 73/83/26 +f 75/84/26 86/85/26 74/81/26 +f 76/86/26 87/87/26 75/84/26 +f 77/88/26 88/89/26 76/90/26 +f 78/91/26 89/92/26 77/88/26 +f 79/93/26 90/94/26 78/91/26 +f 79/93/26 92/95/26 91/96/26 +f 80/97/26 93/98/26 92/99/26 +f 81/100/26 94/101/26 93/102/26 +f 82/103/26 95/104/26 94/105/26 +f 83/106/26 96/107/26 95/108/26 +f 84/109/26 85/110/26 96/111/26 +f 105/112/26 107/113/26 97/114/26 +f 35/1/1 38/29/1 23/2/1 +f 33/4/2 36/14/2 21/5/2 +f 37/7/3 40/27/3 19/8/3 +f 47/10/3 46/35/3 31/11/3 +f 33/4/4 16/115/4 13/13/4 +f 45/15/1 42/32/1 29/16/1 +f 41/18/2 44/34/2 25/19/2 +f 39/21/5 34/28/5 17/22/5 +f 43/24/5 48/36/5 27/25/5 +f 40/27/6 39/21/6 20/23/6 +f 18/6/7 17/22/7 34/28/7 +f 38/29/8 37/7/8 24/9/8 +f 36/30/9 35/1/9 22/3/9 +f 42/32/9 41/74/9 30/33/9 +f 26/26/7 25/19/7 44/34/7 +f 46/35/8 45/15/8 32/17/8 +f 48/36/6 47/10/6 28/12/6 +f 18/39/10 21/116/10 22/117/10 +f 22/117/10 23/118/10 24/37/10 +f 24/37/10 19/119/10 20/38/10 +f 20/38/10 17/120/10 18/39/10 +f 18/39/10 22/117/10 24/37/10 +f 34/28/11 15/121/11 16/40/11 +f 40/27/12 9/122/12 10/41/12 +f 37/7/13 12/123/13 9/42/13 +f 39/21/14 10/124/14 15/43/14 +f 36/30/15 13/125/15 14/44/15 +f 38/29/16 11/126/16 12/45/16 +f 35/1/17 14/127/17 11/46/17 +f 11/47/8 6/63/8 5/48/8 +f 12/49/3 5/48/3 8/50/3 +f 16/52/2 1/62/2 4/53/2 +f 9/51/6 8/50/6 7/55/6 +f 13/57/9 4/128/9 3/58/9 +f 10/56/5 7/55/5 2/60/5 +f 15/61/7 2/60/7 1/62/7 +f 14/59/1 3/58/1 6/63/1 +f 46/35/18 47/10/18 8/64/18 +f 47/10/19 48/36/19 7/66/19 +f 48/36/20 43/24/20 2/68/20 +f 43/24/21 44/34/21 1/70/21 +f 44/34/22 41/18/22 4/72/22 +f 41/74/23 42/32/23 3/75/23 +f 42/32/24 45/15/24 6/77/24 +f 45/15/25 46/35/25 5/79/25 +f 74/81/26 86/129/26 85/82/26 +f 75/84/26 87/130/26 86/85/26 +f 76/86/26 88/131/26 87/87/26 +f 77/88/26 89/132/26 88/89/26 +f 78/91/26 90/133/26 89/92/26 +f 79/93/26 91/134/26 90/94/26 +f 79/93/26 80/97/26 92/95/26 +f 80/97/26 81/100/26 93/98/26 +f 81/100/26 82/103/26 94/101/26 +f 82/103/26 83/106/26 95/104/26 +f 83/106/26 84/109/26 96/107/26 +f 84/109/26 73/83/26 85/110/26 +f 97/114/26 98/135/26 99/136/26 +f 99/136/26 100/137/26 101/138/26 +f 101/138/26 102/139/26 103/140/26 +f 103/140/26 104/141/26 105/112/26 +f 105/112/26 106/142/26 107/113/26 +f 107/113/26 108/143/26 97/114/26 +f 97/114/26 99/136/26 101/138/26 +f 101/138/26 103/140/26 97/114/26 +f 103/140/26 105/112/26 97/114/26 +s 1 +f 31/144/27 59/145/28 58/146/29 +f 31/144/27 60/147/30 59/145/28 +f 29/148/31 50/149/32 49/150/33 +f 30/151/34 50/149/32 29/148/31 +f 25/152/35 53/153/36 52/154/37 +f 26/155/38 53/153/36 25/152/35 +f 27/156/39 57/157/40 56/158/41 +f 27/156/39 56/158/41 55/159/42 +f 49/150/33 72/160/43 60/147/30 +f 50/149/32 61/161/44 49/150/33 +f 51/162/45 62/163/46 50/149/32 +f 51/162/45 64/164/47 63/165/48 +f 53/153/36 64/164/47 52/154/37 +f 54/166/49 65/167/50 53/153/36 +f 55/159/42 66/168/51 54/166/49 +f 56/158/41 67/169/52 55/159/42 +f 57/157/40 68/170/53 56/158/41 +f 58/146/29 69/171/54 57/157/40 +f 59/145/28 70/172/55 58/146/29 +f 60/147/30 71/173/56 59/145/28 +f 66/174/51 77/88/57 65/175/50 +f 61/176/44 84/109/58 72/177/43 +f 63/178/48 74/81/59 62/179/46 +f 70/180/55 81/100/60 69/181/54 +f 67/182/52 78/91/61 66/174/51 +f 64/183/47 75/84/62 63/178/48 +f 71/184/56 82/103/3 70/180/55 +f 68/185/53 79/93/5 67/182/52 +f 65/175/50 76/90/2 64/186/47 +f 72/177/43 83/106/63 71/184/56 +f 62/179/46 73/83/1 61/176/44 +f 69/181/54 80/97/64 68/185/53 +f 95/187/57 106/188/2 94/189/2 +f 92/190/59 103/191/1 91/192/1 +f 89/193/63 100/194/3 88/195/3 +f 96/196/61 107/197/57 95/187/57 +f 86/198/64 97/199/5 85/200/5 +f 93/201/62 104/202/59 92/190/59 +f 90/203/58 101/204/63 89/193/63 +f 85/200/5 108/205/61 96/196/61 +f 87/206/60 98/207/64 86/198/64 +f 94/189/2 105/208/62 93/201/62 +f 91/192/1 102/209/58 90/203/58 +f 88/210/3 99/211/60 87/206/60 +f 57/157/40 28/212/65 58/146/29 +f 28/212/65 31/144/27 58/146/29 +f 31/144/27 32/213/66 60/147/30 +f 60/147/30 32/213/66 49/150/33 +f 32/213/66 29/148/31 49/150/33 +f 30/151/34 51/162/45 50/149/32 +f 51/162/45 30/151/34 52/154/37 +f 30/151/34 25/152/35 52/154/37 +f 26/155/38 54/166/49 53/153/36 +f 27/156/39 28/212/65 57/157/40 +f 54/166/49 26/155/38 55/159/42 +f 26/155/38 27/156/39 55/159/42 +f 49/150/33 61/161/44 72/160/43 +f 50/149/32 62/163/46 61/161/44 +f 51/162/45 63/165/48 62/163/46 +f 51/162/45 52/154/37 64/164/47 +f 53/153/36 65/167/50 64/164/47 +f 54/166/49 66/168/51 65/167/50 +f 55/159/42 67/169/52 66/168/51 +f 56/158/41 68/170/53 67/169/52 +f 57/157/40 69/171/54 68/170/53 +f 58/146/29 70/172/55 69/171/54 +f 59/145/28 71/173/56 70/172/55 +f 60/147/30 72/160/43 71/173/56 +f 66/174/51 78/91/61 77/88/57 +f 61/176/44 73/83/1 84/109/58 +f 63/178/48 75/84/62 74/81/59 +f 70/180/55 82/103/3 81/100/60 +f 67/182/52 79/93/5 78/91/61 +f 64/183/47 76/86/2 75/84/62 +f 71/184/56 83/106/63 82/103/3 +f 68/185/53 80/97/64 79/93/5 +f 65/175/50 77/88/57 76/90/2 +f 72/177/43 84/109/58 83/106/63 +f 62/179/46 74/81/59 73/83/1 +f 69/181/54 81/100/60 80/97/64 +f 95/187/57 107/197/57 106/188/2 +f 92/190/59 104/202/59 103/191/1 +f 89/193/63 101/204/63 100/194/3 +f 96/196/61 108/205/61 107/197/57 +f 86/198/64 98/207/64 97/199/5 +f 93/201/62 105/208/62 104/202/59 +f 90/203/58 102/209/58 101/204/63 +f 85/200/5 97/199/5 108/205/61 +f 87/206/60 99/211/60 98/207/64 +f 94/189/2 106/188/2 105/208/62 +f 91/192/1 103/191/1 102/209/58 +f 88/210/3 100/214/3 99/211/60 diff --git a/src/main/resources/assets/hbm/textures/models/weapons/whiskey (Kopie).png b/src/main/resources/assets/hbm/textures/models/weapons/whiskey (Kopie).png new file mode 100644 index 000000000..959b94011 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/weapons/whiskey (Kopie).png differ diff --git a/src/main/resources/assets/hbm/textures/models/weapons/whiskey.png b/src/main/resources/assets/hbm/textures/models/weapons/whiskey.png new file mode 100644 index 000000000..590f3ff30 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/weapons/whiskey.png differ diff --git a/src/main/resources/assets/hbm/textures/models/weapons/whiskey.xcf b/src/main/resources/assets/hbm/textures/models/weapons/whiskey.xcf new file mode 100644 index 000000000..2376c64d5 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/weapons/whiskey.xcf differ