diff --git a/src/main/java/com/hbm/blocks/bomb/Landmine.java b/src/main/java/com/hbm/blocks/bomb/Landmine.java index 804be5825..e1050e32e 100644 --- a/src/main/java/com/hbm/blocks/bomb/Landmine.java +++ b/src/main/java/com/hbm/blocks/bomb/Landmine.java @@ -155,7 +155,8 @@ public class Landmine extends BlockContainer implements IBomb { world.newExplosion(null, x + 0.5, y + 0.5, z + 0.5, 2.5F, false, false); } if(this == ModBlocks.mine_he) { - ExplosionLarge.explode(world, x + 0.5, y + 0.5, z + 0.5, 10F, true, false, false); + ExplosionLarge.explode(world, x + 0.5, y + 0.5, z + 0.5, 3F, true, false, false); + world.newExplosion(null, x + 0.5, y + 2, z + 0.5, 15F, false, false); } if(this == ModBlocks.mine_shrap) { ExplosionLarge.explode(world, x + 0.5, y + 0.5, z + 0.5, 1, true, false, false); diff --git a/src/main/java/com/hbm/main/ResourceManager.java b/src/main/java/com/hbm/main/ResourceManager.java index c1ffd90ec..150e213df 100644 --- a/src/main/java/com/hbm/main/ResourceManager.java +++ b/src/main/java/com/hbm/main/ResourceManager.java @@ -57,6 +57,7 @@ public class ResourceManager { //Landmines public static final IModelCustom mine_ap = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/mine_ap.obj")); public static final IModelCustom mine_he = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/mine_he.obj")); + public static final IModelCustom mine_marelet = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/bombs/marelet.obj")); public static final IModelCustom mine_fat = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/mine_fat.obj")); //Oil Pumps @@ -342,7 +343,8 @@ public class ResourceManager { //Landmines public static final ResourceLocation mine_ap_tex = new ResourceLocation(RefStrings.MODID, "textures/models/mine_ap.png"); - public static final ResourceLocation mine_he_tex = new ResourceLocation(RefStrings.MODID, "textures/models/mine_he.png"); + //public static final ResourceLocation mine_he_tex = new ResourceLocation(RefStrings.MODID, "textures/models/mine_he.png"); + public static final ResourceLocation mine_marelet_tex = new ResourceLocation(RefStrings.MODID, "textures/models/bombs/mine_marelet.png"); public static final ResourceLocation mine_shrap_tex = new ResourceLocation(RefStrings.MODID, "textures/models/mine_shrap.png"); public static final ResourceLocation mine_fat_tex = new ResourceLocation(RefStrings.MODID, "textures/models/mine_fat.png"); diff --git a/src/main/java/com/hbm/render/item/ItemRenderLibrary.java b/src/main/java/com/hbm/render/item/ItemRenderLibrary.java index c7bde4b4f..dab0a2c30 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderLibrary.java +++ b/src/main/java/com/hbm/render/item/ItemRenderLibrary.java @@ -617,11 +617,20 @@ public class ItemRenderLibrary { public void renderInventory() { GL11.glScaled(6, 6, 6); } + public void renderNonInv() { + GL11.glTranslated(0.25, 0.625, 0); + GL11.glRotated(45, 0, 1, 0); + GL11.glRotated(-15, 0, 0, 1); + } public void renderCommon() { GL11.glScaled(4, 4, 4); - bindTexture(ResourceManager.mine_he_tex); - ResourceManager.mine_he.renderAll(); - }}); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glShadeModel(GL11.GL_SMOOTH); + bindTexture(ResourceManager.mine_marelet_tex); ResourceManager.mine_marelet.renderAll(); + GL11.glShadeModel(GL11.GL_FLAT); + GL11.glEnable(GL11.GL_CULL_FACE); + } + }); renderers.put(Item.getItemFromBlock(ModBlocks.mine_shrap), new ItemRenderBase() { public void renderInventory() { diff --git a/src/main/java/com/hbm/render/tileentity/RenderLandmine.java b/src/main/java/com/hbm/render/tileentity/RenderLandmine.java index bc41fc0f7..33314bb68 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderLandmine.java +++ b/src/main/java/com/hbm/render/tileentity/RenderLandmine.java @@ -11,39 +11,42 @@ import net.minecraft.tileentity.TileEntity; public class RenderLandmine extends TileEntitySpecialRenderer { - @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) - { - GL11.glPushMatrix(); - GL11.glTranslated(x + 0.5D, y, z + 0.5D); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_CULL_FACE); - + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) { + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5D, y, z + 0.5D); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glRotatef(180, 0F, 1F, 0F); Block block = tileEntity.getWorldObj().getBlock(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); if(block == ModBlocks.mine_ap) { - GL11.glTranslated(0, -0.075, 0); + GL11.glTranslated(0, -0.075, 0); GL11.glScaled(1.5D, 1.5D, 1.5D); bindTexture(ResourceManager.mine_ap_tex); - ResourceManager.mine_ap.renderAll(); + ResourceManager.mine_ap.renderAll(); } if(block == ModBlocks.mine_he) { - bindTexture(ResourceManager.mine_he_tex); - ResourceManager.mine_he.renderAll(); + GL11.glRotatef(-90, 0F, 1F, 0F); + GL11.glShadeModel(GL11.GL_SMOOTH); + bindTexture(ResourceManager.mine_marelet_tex); + ResourceManager.mine_marelet.renderAll(); + GL11.glShadeModel(GL11.GL_FLAT); } if(block == ModBlocks.mine_shrap) { bindTexture(ResourceManager.mine_shrap_tex); - ResourceManager.mine_he.renderAll(); + ResourceManager.mine_he.renderAll(); } if(block == ModBlocks.mine_fat) { GL11.glScaled(0.25D, 0.25D, 0.25D); bindTexture(ResourceManager.mine_fat_tex); - ResourceManager.mine_fat.renderAll(); + ResourceManager.mine_fat.renderAll(); } - GL11.glPopMatrix(); - } + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glPopMatrix(); + } } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityLandmine.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityLandmine.java index 6ea852f6b..b6b909f62 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityLandmine.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityLandmine.java @@ -37,29 +37,32 @@ public class TileEntityLandmine extends TileEntity { if (block == ModBlocks.mine_fat) { range = 2.5D; } + + if(!isPrimed) + range *= 2; List list = worldObj.getEntitiesWithinAABBExcludingEntity(null, - AxisAlignedBB.getBoundingBox(xCoord - range, yCoord - height, zCoord - range, xCoord + range, yCoord + height, zCoord + range)); + AxisAlignedBB.getBoundingBox(xCoord - range, yCoord - height, zCoord - range, xCoord + range + 1, yCoord + height, zCoord + range + 1)); boolean flag = false; - for (Object o : list) { - - if (o instanceof EntityLivingBase) { - + for(Object o : list) { + + if(o instanceof EntityLivingBase) { + flag = true; - + if(isPrimed) { - - ((Landmine)block).explode(worldObj, xCoord, yCoord, zCoord); + //why did i do it like that? + ((Landmine) block).explode(worldObj, xCoord, yCoord, zCoord); } - + return; } } - + if(!isPrimed && !flag) { - - this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "hbm:item.techBoop", 2.0F, 1.0F); + + this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "hbm:weapon.fstbmbStart", 3.0F, 1.0F); isPrimed = true; } } diff --git a/src/main/java/com/hbm/util/InventoryUtil.java b/src/main/java/com/hbm/util/InventoryUtil.java index 19477712e..54420bfdf 100644 --- a/src/main/java/com/hbm/util/InventoryUtil.java +++ b/src/main/java/com/hbm/util/InventoryUtil.java @@ -7,6 +7,7 @@ import com.hbm.inventory.recipes.anvil.AnvilRecipes.AnvilOutput; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -447,4 +448,75 @@ public class InventoryUtil { return true; } + + public static boolean mergeItemStack(List slots, ItemStack stack, int start, int end, boolean reverse) { + + boolean success = false; + int index = start; + + if(reverse) { + index = end - 1; + } + + Slot slot; + ItemStack currentStack; + + if(stack.isStackable()) { + while(stack.stackSize > 0 && (!reverse && index < end || reverse && index >= start)) { + slot = slots.get(index); + currentStack = slot.getStack(); + + if(currentStack != null && currentStack.getItem() == stack.getItem() && (!stack.getHasSubtypes() || stack.getItemDamage() == currentStack.getItemDamage()) && ItemStack.areItemStackTagsEqual(stack, currentStack)) { + int l = currentStack.stackSize + stack.stackSize; + + if(l <= stack.getMaxStackSize()) { + stack.stackSize = 0; + currentStack.stackSize = l; + slot.onSlotChanged(); + success = true; + } else if(currentStack.stackSize < stack.getMaxStackSize()) { + stack.stackSize -= stack.getMaxStackSize() - currentStack.stackSize; + currentStack.stackSize = stack.getMaxStackSize(); + slot.onSlotChanged(); + success = true; + } + } + + if(reverse) { + --index; + } else { + ++index; + } + } + } + + if(stack.stackSize > 0) { + if(reverse) { + index = end - 1; + } else { + index = start; + } + + while(!reverse && index < end || reverse && index >= start) { + slot = slots.get(index); + currentStack = slot.getStack(); + + if(currentStack == null) { + slot.putStack(stack.copy()); + slot.onSlotChanged(); + stack.stackSize = 0; + success = true; + break; + } + + if(reverse) { + --index; + } else { + ++index; + } + } + } + + return success; + } } diff --git a/src/main/java/com/hbm/util/ItemStackUtil.java b/src/main/java/com/hbm/util/ItemStackUtil.java index f2eaa87b5..01cad08e8 100644 --- a/src/main/java/com/hbm/util/ItemStackUtil.java +++ b/src/main/java/com/hbm/util/ItemStackUtil.java @@ -15,6 +15,15 @@ public class ItemStackUtil { return stack.copy(); } + public static ItemStack carefulCopyWithSize(ItemStack stack, int size) { + if(stack == null) + return null; + + ItemStack copy = stack.copy(); + copy.stackSize = size; + return copy; + } + /** * Runs carefulCopy over the entire ItemStack array. * @param array diff --git a/src/main/resources/assets/hbm/models/bombs/marelet.obj b/src/main/resources/assets/hbm/models/bombs/marelet.obj new file mode 100644 index 000000000..b23cecb2f --- /dev/null +++ b/src/main/resources/assets/hbm/models/bombs/marelet.obj @@ -0,0 +1,815 @@ +# Blender v2.79 (sub 0) OBJ File: 'marelet.blend' +# www.blender.org +o Circle +v -0.000000 0.000000 -0.250000 +v -0.095671 0.000000 -0.230970 +v -0.176777 0.000000 -0.176777 +v -0.230970 0.000000 -0.095671 +v -0.250000 0.000000 0.000000 +v -0.230970 0.000000 0.095671 +v -0.176777 0.000000 0.176777 +v -0.095671 0.000000 0.230970 +v -0.000000 0.000000 0.250000 +v 0.095671 0.000000 0.230970 +v 0.176777 0.000000 0.176777 +v 0.230970 0.000000 0.095671 +v 0.250000 0.000000 -0.000000 +v 0.230970 0.000000 -0.095671 +v 0.176777 0.000000 -0.176777 +v 0.095671 0.000000 -0.230970 +v -0.000000 0.093750 -0.250000 +v -0.095671 0.093750 -0.230970 +v -0.176777 0.093750 -0.176777 +v -0.230970 0.093750 -0.095671 +v -0.250000 0.093750 0.000000 +v -0.230970 0.093750 0.095671 +v -0.176777 0.093750 0.176777 +v -0.095671 0.093750 0.230970 +v -0.000000 0.093750 0.250000 +v 0.095671 0.093750 0.230970 +v 0.176777 0.093750 0.176777 +v 0.230970 0.093750 0.095671 +v 0.250000 0.093750 -0.000000 +v 0.230970 0.093750 -0.095671 +v 0.176777 0.093750 -0.176777 +v 0.095671 0.093750 -0.230970 +v -0.000000 0.093750 -0.156250 +v -0.059794 0.093750 -0.144356 +v -0.110485 0.093750 -0.110485 +v -0.144356 0.093750 -0.059794 +v -0.156250 0.093750 -0.000000 +v -0.144356 0.093750 0.059794 +v -0.110485 0.093750 0.110485 +v -0.059794 0.093750 0.144356 +v -0.000000 0.093750 0.156250 +v 0.059794 0.093750 0.144356 +v 0.110485 0.093750 0.110485 +v 0.144356 0.093750 0.059794 +v 0.156250 0.093750 -0.000000 +v 0.144356 0.093750 -0.059794 +v 0.110485 0.093750 -0.110485 +v 0.059794 0.093750 -0.144356 +v -0.059794 0.125000 -0.144356 +v -0.000000 0.125000 -0.156250 +v -0.110485 0.125000 -0.110485 +v -0.144356 0.125000 -0.059794 +v -0.156250 0.125000 -0.000000 +v -0.144356 0.125000 0.059794 +v -0.110485 0.125000 0.110485 +v -0.059794 0.125000 0.144356 +v -0.000000 0.125000 0.156250 +v 0.059794 0.125000 0.144356 +v 0.110485 0.125000 0.110485 +v 0.144356 0.125000 0.059794 +v 0.156250 0.125000 -0.000000 +v 0.144356 0.125000 -0.059794 +v 0.110485 0.125000 -0.110485 +v 0.059794 0.125000 -0.144356 +v -0.018686 0.125000 -0.045111 +v -0.000000 0.125000 -0.048828 +v -0.034527 0.125000 -0.034527 +v -0.045111 0.125000 -0.018686 +v -0.048828 0.125000 -0.000000 +v -0.045111 0.125000 0.018686 +v -0.034527 0.125000 0.034527 +v -0.018686 0.125000 0.045111 +v -0.000000 0.125000 0.048828 +v 0.018686 0.125000 0.045111 +v 0.034527 0.125000 0.034527 +v 0.045111 0.125000 0.018686 +v 0.048828 0.125000 -0.000000 +v 0.045111 0.125000 -0.018686 +v 0.034527 0.125000 -0.034527 +v 0.018686 0.125000 -0.045111 +v -0.018686 0.156250 -0.045111 +v -0.000000 0.156250 -0.048828 +v -0.034527 0.156250 -0.034527 +v -0.045111 0.156250 -0.018686 +v -0.048828 0.156250 -0.000000 +v -0.045111 0.156250 0.018686 +v -0.034527 0.156250 0.034527 +v -0.018686 0.156250 0.045111 +v -0.000000 0.156250 0.048828 +v 0.018686 0.156250 0.045111 +v 0.034527 0.156250 0.034527 +v 0.045111 0.156250 0.018686 +v 0.048828 0.156250 -0.000000 +v 0.045111 0.156250 -0.018686 +v 0.034527 0.156250 -0.034527 +v 0.018686 0.156250 -0.045111 +v -0.062500 0.071843 -0.299278 +v -0.062500 0.084642 -0.290316 +v -0.078125 0.080805 -0.312078 +v -0.078125 0.093604 -0.303116 +v 0.062500 0.071843 -0.299278 +v 0.062500 0.084642 -0.290316 +v 0.078125 0.080805 -0.312078 +v 0.078125 0.093604 -0.303116 +v -0.078125 0.025957 -0.233746 +v -0.062500 0.025957 -0.233746 +v -0.062500 0.038756 -0.224784 +v -0.078125 0.038756 -0.224784 +v 0.078125 0.038756 -0.224784 +v 0.078125 0.025957 -0.233746 +v 0.062500 0.025957 -0.233746 +v 0.062500 0.038756 -0.224784 +v -0.007813 0.125000 -0.061035 +v -0.007813 0.125000 0.061035 +v -0.007813 0.140625 -0.061035 +v -0.007813 0.140625 0.061035 +v 0.007812 0.125000 -0.061035 +v 0.007812 0.125000 0.061035 +v 0.007812 0.140625 -0.061035 +v 0.007812 0.140625 0.061035 +v -0.023438 0.125000 -0.092285 +v -0.023438 0.140625 -0.092285 +v 0.023437 0.125000 -0.092285 +v 0.023437 0.140625 -0.092285 +v -0.023438 0.125000 0.092285 +v -0.023438 0.140625 0.092285 +v 0.023437 0.125000 0.092285 +v 0.023437 0.140625 0.092285 +v 0.023437 0.140625 0.076660 +v 0.023437 0.125000 0.076660 +v -0.023438 0.140625 0.076660 +v -0.023438 0.125000 0.076660 +v -0.007813 0.125000 0.107910 +v -0.007813 0.140625 0.107910 +v 0.007812 0.125000 0.107910 +v 0.007812 0.140625 0.107910 +v -0.000000 0.000000 -0.250000 +v -0.095671 0.000000 -0.230970 +v -0.176777 0.000000 -0.176777 +v -0.230970 0.000000 -0.095671 +v -0.250000 0.000000 0.000000 +v -0.230970 0.000000 0.095671 +v -0.176777 0.000000 0.176777 +v -0.095671 0.000000 0.230970 +v -0.000000 0.000000 0.250000 +v 0.095671 0.000000 0.230970 +v 0.176777 0.000000 0.176777 +v 0.230970 0.000000 0.095671 +v 0.250000 0.000000 -0.000000 +v 0.230970 0.000000 -0.095671 +v 0.176777 0.000000 -0.176777 +v 0.095671 0.000000 -0.230970 +v -0.059794 0.125000 -0.144356 +v -0.000000 0.125000 -0.156250 +v -0.110485 0.125000 -0.110485 +v -0.144356 0.125000 -0.059794 +v -0.156250 0.125000 -0.000000 +v -0.144356 0.125000 0.059794 +v -0.110485 0.125000 0.110485 +v -0.059794 0.125000 0.144356 +v -0.000000 0.125000 0.156250 +v 0.059794 0.125000 0.144356 +v 0.110485 0.125000 0.110485 +v 0.144356 0.125000 0.059794 +v 0.156250 0.125000 -0.000000 +v 0.144356 0.125000 -0.059794 +v 0.110485 0.125000 -0.110485 +v 0.059794 0.125000 -0.144356 +v -0.018686 0.125000 -0.045111 +v -0.000000 0.125000 -0.048828 +v -0.034527 0.125000 -0.034527 +v -0.045111 0.125000 -0.018686 +v -0.048828 0.125000 -0.000000 +v -0.045111 0.125000 0.018686 +v -0.034527 0.125000 0.034527 +v -0.018686 0.125000 0.045111 +v -0.000000 0.125000 0.048828 +v 0.018686 0.125000 0.045111 +v 0.034527 0.125000 0.034527 +v 0.045111 0.125000 0.018686 +v 0.048828 0.125000 -0.000000 +v 0.045111 0.125000 -0.018686 +v 0.034527 0.125000 -0.034527 +v 0.018686 0.125000 -0.045111 +v -0.018686 0.156250 -0.045111 +v -0.000000 0.156250 -0.048828 +v -0.034527 0.156250 -0.034527 +v -0.045111 0.156250 -0.018686 +v -0.048828 0.156250 -0.000000 +v -0.045111 0.156250 0.018686 +v -0.034527 0.156250 0.034527 +v -0.018686 0.156250 0.045111 +v -0.000000 0.156250 0.048828 +v 0.018686 0.156250 0.045111 +v 0.034527 0.156250 0.034527 +v 0.045111 0.156250 0.018686 +v 0.048828 0.156250 -0.000000 +v 0.045111 0.156250 -0.018686 +v 0.034527 0.156250 -0.034527 +v 0.018686 0.156250 -0.045111 +v -0.000000 0.093750 -0.250000 +v -0.095671 0.093750 -0.230970 +v -0.176777 0.093750 -0.176777 +v -0.230970 0.093750 -0.095671 +v -0.250000 0.093750 0.000000 +v -0.230970 0.093750 0.095671 +v -0.176777 0.093750 0.176777 +v -0.095671 0.093750 0.230970 +v -0.000000 0.093750 0.250000 +v 0.095671 0.093750 0.230970 +v 0.176777 0.093750 0.176777 +v 0.230970 0.093750 0.095671 +v 0.250000 0.093750 -0.000000 +v 0.230970 0.093750 -0.095671 +v 0.176777 0.093750 -0.176777 +v 0.095671 0.093750 -0.230970 +v -0.000000 0.093750 -0.156250 +v -0.059794 0.093750 -0.144356 +v -0.110485 0.093750 -0.110485 +v -0.144356 0.093750 -0.059794 +v -0.156250 0.093750 -0.000000 +v -0.144356 0.093750 0.059794 +v -0.110485 0.093750 0.110485 +v -0.059794 0.093750 0.144356 +v -0.000000 0.093750 0.156250 +v 0.059794 0.093750 0.144356 +v 0.110485 0.093750 0.110485 +v 0.144356 0.093750 0.059794 +v 0.156250 0.093750 -0.000000 +v 0.144356 0.093750 -0.059794 +v 0.110485 0.093750 -0.110485 +v 0.059794 0.093750 -0.144356 +v 0.217422 0.093750 0.115947 +v 0.245242 0.093750 0.023918 +v 0.235727 0.093750 -0.071753 +v 0.135888 0.093750 0.072467 +v 0.153277 0.093750 0.014949 +v 0.147330 0.093750 -0.044846 +v 0.135888 0.093750 -0.072467 +v 0.153277 0.093750 -0.014949 +v 0.147330 0.093750 0.044846 +v 0.118953 0.093750 0.097813 +v 0.217422 0.093750 -0.115947 +v 0.245242 0.093750 -0.023918 +v 0.235727 0.093750 0.071753 +v 0.190325 0.093750 0.156500 +v 0.127421 0.093750 -0.085140 +v 0.150303 0.093750 -0.029897 +v 0.150303 0.093750 0.029897 +v 0.127421 0.093750 0.085140 +v 0.203873 0.093750 -0.136224 +v 0.240485 0.093750 -0.047835 +v 0.240485 0.093750 0.047835 +v 0.203873 0.093750 0.136224 +vt 0.021128 0.848623 +vt 0.002102 0.881181 +vt 0.002102 0.848622 +vt 0.024844 0.881181 +vt 0.062003 0.913740 +vt 0.024844 0.913740 +vt 0.084745 0.881181 +vt 0.084745 0.913740 +vt 0.058287 0.848623 +vt 0.028560 0.816064 +vt 0.058287 0.816065 +vt 0.028560 0.946298 +vt 0.062003 0.881181 +vt 0.021128 0.946298 +vt 0.002102 0.913739 +vt 0.065719 0.816064 +vt 0.084745 0.848623 +vt 0.065719 0.848623 +vt 0.065719 0.946299 +vt 0.084745 0.946299 +vt 0.021128 0.816064 +vt 0.002102 0.816064 +vt 0.064819 0.101506 +vt 0.075401 0.567673 +vt 0.022198 0.660399 +vt 0.119565 0.500000 +vt 0.116848 1.000000 +vt 0.116848 0.500000 +vt 0.141304 0.500000 +vt 0.138587 1.000000 +vt 0.138587 0.500000 +vt 0.122283 0.500000 +vt 0.119565 1.000000 +vt 0.103261 0.500000 +vt 0.100543 1.000000 +vt 0.100543 0.500000 +vt 0.144022 1.000000 +vt 0.141304 1.000000 +vt 0.125000 0.500000 +vt 0.122283 1.000000 +vt 0.105978 0.500000 +vt 0.103261 1.000000 +vt 0.127717 0.500000 +vt 0.125000 1.000000 +vt 0.108696 0.500000 +vt 0.105978 1.000000 +vt 0.130435 1.000000 +vt 0.127717 1.000000 +vt 0.111413 0.500000 +vt 0.108696 1.000000 +vt 0.130435 0.500000 +vt 0.133152 1.000000 +vt 0.114130 1.000000 +vt 0.111413 1.000000 +vt 0.135870 0.500000 +vt 0.133152 0.500000 +vt 0.114130 0.500000 +vt 0.135870 1.000000 +vt 0.029848 0.595825 +vt 0.022768 0.283972 +vt 0.058360 0.221940 +vt 0.028560 0.848623 +vt 0.058287 0.946299 +vt 0.002102 0.946298 +vt 0.084745 0.816064 +vt 0.011615 0.194232 +vt 0.022198 0.101506 +vt 0.036025 0.051323 +vt 0.050991 0.051323 +vt 0.075401 0.194232 +vt 0.081129 0.315385 +vt 0.081129 0.446520 +vt 0.064819 0.660399 +vt 0.050991 0.710582 +vt 0.036025 0.710582 +vt 0.011615 0.567672 +vt 0.005887 0.446520 +vt 0.005887 0.315385 +vt 0.144022 0.500000 +vt 0.022768 0.533794 +vt 0.018937 0.452746 +vt 0.018937 0.365020 +vt 0.029848 0.221940 +vt 0.039098 0.188369 +vt 0.049110 0.188369 +vt 0.065440 0.283971 +vt 0.069271 0.365020 +vt 0.069271 0.452746 +vt 0.065440 0.533794 +vt 0.058360 0.595825 +vt 0.049110 0.629397 +vt 0.039098 0.629397 +vt 0.828804 0.500000 +vt 0.771739 -0.000000 +vt 0.828804 -0.000000 +vt 0.429348 0.500000 +vt 0.372283 -0.000000 +vt 0.429348 -0.000000 +vt 0.885870 0.500000 +vt 0.885870 -0.000000 +vt 0.486413 0.500000 +vt 0.486413 -0.000000 +vt 0.942935 0.500000 +vt 0.942935 -0.000000 +vt 0.543478 0.500000 +vt 0.543478 -0.000000 +vt 0.144022 0.500000 +vt 0.086957 -0.000000 +vt 0.144022 -0.000000 +vt 1.000000 0.500000 +vt 1.000000 -0.000000 +vt 0.600543 0.500000 +vt 0.600543 -0.000000 +vt 0.201087 0.500000 +vt 0.201087 -0.000000 +vt 0.657609 0.500000 +vt 0.657609 -0.000000 +vt 0.258152 0.500000 +vt 0.258152 -0.000000 +vt 0.714674 0.500000 +vt 0.714674 -0.000000 +vt 0.315217 0.500000 +vt 0.315217 -0.000000 +vt 0.771739 0.500000 +vt 0.372283 0.500000 +vt 0.105978 0.880952 +vt 0.103261 1.000000 +vt 0.103261 0.880952 +vt 0.127717 0.880952 +vt 0.125000 1.000000 +vt 0.125000 0.880952 +vt 0.108696 0.880952 +vt 0.105978 1.000000 +vt 0.130435 0.880952 +vt 0.127717 1.000000 +vt 0.111413 0.880952 +vt 0.108696 1.000000 +vt 0.133152 0.880952 +vt 0.130435 1.000000 +vt 0.114130 0.880952 +vt 0.111413 1.000000 +vt 0.135870 0.880952 +vt 0.133152 1.000000 +vt 0.116848 0.880952 +vt 0.114130 1.000000 +vt 0.138587 0.880952 +vt 0.135870 1.000000 +vt 0.119565 0.880952 +vt 0.116848 1.000000 +vt 0.141304 0.880952 +vt 0.138587 1.000000 +vt 0.122283 0.880952 +vt 0.119565 1.000000 +vt 0.100543 1.000000 +vt 0.100543 0.880952 +vt 0.144022 0.880952 +vt 0.141304 1.000000 +vt 0.122283 1.000000 +vt 0.133152 0.904762 +vt 0.130435 1.000000 +vt 0.130435 0.904762 +vt 0.114130 0.904762 +vt 0.111413 1.000000 +vt 0.111413 0.904762 +vt 0.135870 0.904762 +vt 0.133152 1.000000 +vt 0.116848 1.000000 +vt 0.114130 1.000000 +vt 0.138587 0.904762 +vt 0.135870 1.000000 +vt 0.116848 0.904762 +vt 0.119565 1.000000 +vt 0.141304 0.904762 +vt 0.138587 1.000000 +vt 0.122283 0.904762 +vt 0.119565 0.904762 +vt 0.100543 0.904762 +vt 0.103261 1.000000 +vt 0.100543 1.000000 +vt 0.144022 0.904762 +vt 0.141304 1.000000 +vt 0.125000 0.904762 +vt 0.122283 1.000000 +vt 0.105978 0.904762 +vt 0.103261 0.904762 +vt 0.127717 0.904762 +vt 0.125000 1.000000 +vt 0.108696 0.904762 +vt 0.105978 1.000000 +vt 0.127717 1.000000 +vt 0.108696 1.000000 +vt 0.009109 0.867647 +vt 0.030876 0.892060 +vt 0.009109 0.892060 +vt 0.054996 0.892060 +vt 0.076764 0.867648 +vt 0.076764 0.892060 +vt 0.002879 0.892060 +vt 0.082994 0.892060 +vt 0.037603 0.867648 +vt 0.034817 0.892060 +vt 0.034817 0.867648 +vt 0.051056 0.892060 +vt 0.048270 0.867648 +vt 0.051056 0.867648 +vt 0.054996 0.867648 +vt 0.030876 0.867648 +vt 0.041543 0.867648 +vt 0.037603 0.892060 +vt 0.048270 0.892060 +vt 0.044329 0.867648 +vt 0.044329 0.892060 +vt 0.674592 0.500000 +vt 0.660326 1.000000 +vt 0.660326 0.500000 +vt 0.845788 0.500000 +vt 0.831522 1.000000 +vt 0.831522 0.500000 +vt 0.788723 0.500000 +vt 0.774457 1.000000 +vt 0.774457 0.500000 +vt 0.731658 0.500000 +vt 0.717391 1.000000 +vt 0.717391 0.500000 +vt 0.688859 0.500000 +vt 0.703125 1.000000 +vt 0.688859 1.000000 +vt 0.802989 0.500000 +vt 0.817255 1.000000 +vt 0.802989 1.000000 +vt 0.745924 0.500000 +vt 0.760190 1.000000 +vt 0.745924 1.000000 +vt 0.674592 1.000000 +vt 0.860054 0.500000 +vt 0.845788 1.000000 +vt 0.788723 1.000000 +vt 0.731658 1.000000 +vt 0.703125 0.500000 +vt 0.603261 1.000000 +vt 0.603261 0.500000 +vt 0.543478 1.000000 +vt 0.543478 0.500000 +vt 0.486413 0.500000 +vt 0.486413 1.000000 +vt 0.429348 1.000000 +vt 0.429348 0.500000 +vt 0.372283 1.000000 +vt 0.372283 0.500000 +vt 0.312500 0.500000 +vt 0.312500 1.000000 +vt 0.255435 1.000000 +vt 0.255435 0.500000 +vt 0.201087 1.000000 +vt 0.201087 0.500000 +vt 0.144022 1.000000 +vt 0.144022 0.500000 +vt 0.086957 0.500000 +vt 0.086957 1.000000 +vt 1.000000 0.500000 +vt 0.945652 1.000000 +vt 0.945652 0.500000 +vt 0.888587 0.500000 +vt 0.888587 1.000000 +vt 0.860054 1.000000 +vt 0.817255 0.500000 +vt 0.760190 0.500000 +vt 0.086957 0.500000 +vt 0.144022 1.000000 +vt 0.144022 1.000000 +vt 0.002879 0.867647 +vt 0.082994 0.867648 +vt 0.041543 0.892060 +vt 1.000000 1.000000 +vn 0.0000 0.8192 0.5736 +vn 0.0000 0.5736 -0.8192 +vn 1.0000 -0.0000 0.0000 +vn 0.0000 -0.5736 0.8192 +vn 0.0000 -0.8192 -0.5736 +vn -1.0000 0.0000 0.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +vn 0.9239 0.0000 -0.3827 +vn -0.7071 0.0000 0.7071 +vn -0.9239 0.0000 0.3827 +vn 0.7071 0.0000 -0.7071 +vn -0.3827 0.0000 0.9239 +vn 0.3827 0.0000 -0.9239 +vn 0.0000 0.0000 1.0000 +vn -0.3827 0.0000 -0.9239 +vn 0.0000 0.0000 -1.0000 +vn 0.3827 0.0000 0.9239 +vn -0.7071 0.0000 -0.7071 +vn 0.7071 0.0000 0.7071 +vn -0.9239 0.0000 -0.3827 +vn 0.9239 0.0000 0.3827 +vn 0.9732 0.0000 0.2297 +vn -0.9732 0.0000 0.2297 +vn 0.8944 0.0000 0.4472 +vn -0.8944 0.0000 0.4472 +s off +f 98/1/1 108/2/1 107/3/1 +f 100/4/2 103/5/2 99/6/2 +f 103/5/3 109/7/3 110/8/3 +f 102/9/4 97/10/4 101/11/4 +f 103/5/5 97/12/5 99/6/5 +f 100/4/1 102/9/1 104/13/1 +f 97/14/5 105/15/5 99/6/5 +f 101/16/6 112/17/6 102/18/6 +f 101/19/5 110/8/5 111/20/5 +f 99/6/6 108/2/6 100/4/6 +f 97/21/3 107/3/3 106/22/3 +f 102/18/1 109/7/1 104/13/1 +f 151/23/7 147/24/7 143/25/7 +f 160/26/8 175/27/8 159/28/8 +f 168/29/8 183/30/8 167/31/8 +f 161/32/8 176/33/8 160/26/8 +f 153/34/8 170/35/8 154/36/8 +f 168/29/8 170/37/8 184/38/8 +f 162/39/8 177/40/8 161/32/8 +f 155/41/8 169/42/8 153/34/8 +f 163/43/8 178/44/8 162/39/8 +f 156/45/8 171/46/8 155/41/8 +f 163/43/8 180/47/8 179/48/8 +f 157/49/8 172/50/8 156/45/8 +f 164/51/8 181/52/8 180/47/8 +f 157/49/8 174/53/8 173/54/8 +f 166/55/8 181/52/8 165/56/8 +f 159/28/8 174/53/8 158/57/8 +f 167/31/8 182/58/8 166/55/8 +f 186/59/8 189/60/8 193/61/8 +f 98/1/1 100/4/1 108/2/1 +f 100/4/2 104/13/2 103/5/2 +f 103/5/3 104/13/3 109/7/3 +f 102/9/4 98/62/4 97/10/4 +f 103/5/5 101/63/5 97/12/5 +f 100/4/1 98/62/1 102/9/1 +f 97/14/5 106/64/5 105/15/5 +f 101/16/6 111/65/6 112/17/6 +f 101/19/5 103/5/5 110/8/5 +f 99/6/6 105/15/6 108/2/6 +f 97/21/3 98/1/3 107/3/3 +f 102/18/1 112/17/1 109/7/1 +f 139/66/7 138/67/7 137/68/7 +f 137/68/7 152/69/7 151/23/7 +f 151/23/7 150/70/7 149/71/7 +f 149/71/7 148/72/7 151/23/7 +f 148/72/7 147/24/7 151/23/7 +f 147/24/7 146/73/7 145/74/7 +f 145/74/7 144/75/7 147/24/7 +f 144/75/7 143/25/7 147/24/7 +f 143/25/7 142/76/7 141/77/7 +f 141/77/7 140/78/7 139/66/7 +f 139/66/7 137/68/7 151/23/7 +f 143/25/7 141/77/7 139/66/7 +f 139/66/7 151/23/7 143/25/7 +f 160/26/8 176/33/8 175/27/8 +f 168/29/8 184/38/8 183/30/8 +f 161/32/8 177/40/8 176/33/8 +f 153/34/8 169/42/8 170/35/8 +f 168/29/8 154/79/8 170/37/8 +f 162/39/8 178/44/8 177/40/8 +f 155/41/8 171/46/8 169/42/8 +f 163/43/8 179/48/8 178/44/8 +f 156/45/8 172/50/8 171/46/8 +f 163/43/8 164/51/8 180/47/8 +f 157/49/8 173/54/8 172/50/8 +f 164/51/8 165/56/8 181/52/8 +f 157/49/8 158/57/8 174/53/8 +f 166/55/8 182/58/8 181/52/8 +f 159/28/8 175/27/8 174/53/8 +f 167/31/8 183/30/8 182/58/8 +f 186/59/8 185/80/8 189/60/8 +f 185/80/8 187/81/8 189/60/8 +f 187/81/8 188/82/8 189/60/8 +f 189/60/8 190/83/8 191/84/8 +f 191/84/8 192/85/8 189/60/8 +f 192/85/8 193/61/8 189/60/8 +f 193/61/8 194/86/8 195/87/8 +f 195/87/8 196/88/8 197/89/8 +f 197/89/8 198/90/8 199/91/8 +f 199/91/8 200/92/8 186/59/8 +f 193/61/8 195/87/8 186/59/8 +f 195/87/8 197/89/8 186/59/8 +f 197/89/8 199/91/8 186/59/8 +s 1 +f 30/93/9 13/94/3 14/95/9 +f 23/96/10 6/97/11 7/98/10 +f 31/99/12 14/95/9 15/100/12 +f 24/101/13 7/98/10 8/102/13 +f 32/103/14 15/100/12 16/104/14 +f 25/105/15 8/102/13 9/106/15 +f 18/107/16 1/108/17 2/109/16 +f 17/110/17 16/104/14 1/111/17 +f 26/112/18 9/106/15 10/113/18 +f 19/114/19 2/109/16 3/115/19 +f 27/116/20 10/113/18 11/117/20 +f 20/118/21 3/115/19 4/119/21 +f 28/120/22 11/117/20 12/121/22 +f 21/122/6 4/119/21 5/123/6 +f 29/124/3 12/121/22 13/94/3 +f 22/125/11 5/123/6 6/97/11 +f 35/126/19 49/127/16 34/128/16 +f 43/129/20 58/130/18 42/131/18 +f 36/132/21 51/133/19 35/126/19 +f 44/134/22 59/135/20 43/129/20 +f 37/136/6 52/137/21 36/132/21 +f 45/138/3 60/139/22 44/134/22 +f 38/140/11 53/141/6 37/136/6 +f 46/142/9 61/143/3 45/138/3 +f 39/144/10 54/145/11 38/140/11 +f 47/146/12 62/147/9 46/142/9 +f 40/148/13 55/149/10 39/144/10 +f 48/150/14 63/151/12 47/146/12 +f 41/152/15 56/153/13 40/148/13 +f 34/128/16 50/154/17 33/155/17 +f 33/156/17 64/157/14 48/150/14 +f 42/131/18 57/158/15 41/152/15 +f 77/159/3 92/160/22 76/161/22 +f 70/162/11 85/163/6 69/164/6 +f 78/165/9 93/166/3 77/159/3 +f 70/162/11 87/167/10 86/168/11 +f 79/169/12 94/170/9 78/165/9 +f 71/171/10 88/172/13 87/167/10 +f 80/173/14 95/174/12 79/169/12 +f 73/175/15 88/172/13 72/176/13 +f 66/177/17 81/178/16 82/179/17 +f 66/180/17 96/181/14 80/173/14 +f 74/182/18 89/183/15 73/175/15 +f 67/184/19 81/178/16 65/185/16 +f 75/186/20 90/187/18 74/182/18 +f 68/188/21 83/189/19 67/184/19 +f 75/186/20 92/160/22 91/190/20 +f 69/164/6 84/191/21 68/188/21 +f 119/192/23 118/193/9 117/194/23 +f 114/195/21 115/196/24 113/197/24 +f 123/198/25 119/192/23 117/194/23 +f 115/196/24 121/199/26 113/197/24 +f 128/200/22 130/201/9 129/202/9 +f 132/203/21 126/204/11 131/205/21 +f 114/195/21 131/205/21 116/206/21 +f 129/202/9 118/193/9 120/207/9 +f 136/208/18 127/209/22 128/200/22 +f 125/210/11 134/211/13 126/204/11 +f 133/212/13 136/208/18 134/211/13 +f 246/213/8 227/214/8 211/215/8 +f 243/216/8 230/217/8 214/218/8 +f 244/219/8 229/220/8 213/221/8 +f 245/222/8 228/223/8 212/224/8 +f 254/225/8 236/226/8 250/227/8 +f 252/228/8 238/229/8 248/230/8 +f 253/231/8 237/232/8 249/233/8 +f 254/225/8 242/234/8 246/213/8 +f 251/235/8 239/236/8 243/216/8 +f 252/228/8 240/237/8 244/219/8 +f 253/231/8 241/238/8 245/222/8 +f 233/239/8 228/223/8 236/226/8 +f 211/215/8 226/240/8 210/241/8 +f 210/241/8 225/242/8 209/243/8 +f 208/244/8 225/242/8 224/245/8 +f 208/244/8 223/246/8 207/247/8 +f 207/247/8 222/248/8 206/249/8 +f 205/250/8 222/248/8 221/251/8 +f 205/250/8 220/252/8 204/253/8 +f 204/253/8 219/254/8 203/255/8 +f 203/255/8 218/256/8 202/257/8 +f 201/258/8 218/256/8 217/259/8 +f 201/260/8 232/261/8 216/262/8 +f 215/263/8 232/261/8 231/264/8 +f 251/235/8 231/264/8 247/265/8 +f 235/266/8 230/217/8 238/229/8 +f 234/267/8 229/220/8 237/232/8 +f 30/93/9 29/124/3 13/94/3 +f 23/96/10 22/125/11 6/97/11 +f 31/99/12 30/93/9 14/95/9 +f 24/101/13 23/96/10 7/98/10 +f 32/103/14 31/99/12 15/100/12 +f 25/105/15 24/101/13 8/102/13 +f 18/107/16 17/268/17 1/108/17 +f 17/110/17 32/103/14 16/104/14 +f 26/112/18 25/105/15 9/106/15 +f 19/114/19 18/107/16 2/109/16 +f 27/116/20 26/112/18 10/113/18 +f 20/118/21 19/114/19 3/115/19 +f 28/120/22 27/116/20 11/117/20 +f 21/122/6 20/118/21 4/119/21 +f 29/124/3 28/120/22 12/121/22 +f 22/125/11 21/122/6 5/123/6 +f 35/126/19 51/133/19 49/127/16 +f 43/129/20 59/135/20 58/130/18 +f 36/132/21 52/137/21 51/133/19 +f 44/134/22 60/139/22 59/135/20 +f 37/136/6 53/141/6 52/137/21 +f 45/138/3 61/143/3 60/139/22 +f 38/140/11 54/145/11 53/141/6 +f 46/142/9 62/147/9 61/143/3 +f 39/144/10 55/149/10 54/145/11 +f 47/146/12 63/151/12 62/147/9 +f 40/148/13 56/153/13 55/149/10 +f 48/150/14 64/157/14 63/151/12 +f 41/152/15 57/158/15 56/153/13 +f 34/128/16 49/127/16 50/154/17 +f 33/156/17 50/269/17 64/157/14 +f 42/131/18 58/130/18 57/158/15 +f 77/159/3 93/166/3 92/160/22 +f 70/162/11 86/168/11 85/163/6 +f 78/165/9 94/170/9 93/166/3 +f 70/162/11 71/171/10 87/167/10 +f 79/169/12 95/174/12 94/170/9 +f 71/171/10 72/176/13 88/172/13 +f 80/173/14 96/181/14 95/174/12 +f 73/175/15 89/183/15 88/172/13 +f 66/177/17 65/185/16 81/178/16 +f 66/180/17 82/270/17 96/181/14 +f 74/182/18 90/187/18 89/183/15 +f 67/184/19 83/189/19 81/178/16 +f 75/186/20 91/190/20 90/187/18 +f 68/188/21 84/191/21 83/189/19 +f 75/186/20 76/161/22 92/160/22 +f 69/164/6 85/163/6 84/191/21 +f 119/192/23 120/207/9 118/193/9 +f 114/195/21 116/206/21 115/196/24 +f 123/198/25 124/271/25 119/192/23 +f 115/196/24 122/272/26 121/199/26 +f 128/200/22 127/209/22 130/201/9 +f 132/203/21 125/210/11 126/204/11 +f 114/195/21 132/203/21 131/205/21 +f 129/202/9 130/201/9 118/193/9 +f 136/208/18 135/273/18 127/209/22 +f 125/210/11 133/212/13 134/211/13 +f 133/212/13 135/273/18 136/208/18 +f 246/213/8 242/234/8 227/214/8 +f 243/216/8 239/236/8 230/217/8 +f 244/219/8 240/237/8 229/220/8 +f 245/222/8 241/238/8 228/223/8 +f 254/225/8 233/239/8 236/226/8 +f 252/228/8 235/266/8 238/229/8 +f 253/231/8 234/267/8 237/232/8 +f 254/225/8 250/227/8 242/234/8 +f 251/235/8 247/265/8 239/236/8 +f 252/228/8 248/230/8 240/237/8 +f 253/231/8 249/233/8 241/238/8 +f 233/239/8 212/224/8 228/223/8 +f 211/215/8 227/214/8 226/240/8 +f 210/241/8 226/240/8 225/242/8 +f 208/244/8 209/243/8 225/242/8 +f 208/244/8 224/245/8 223/246/8 +f 207/247/8 223/246/8 222/248/8 +f 205/250/8 206/249/8 222/248/8 +f 205/250/8 221/251/8 220/252/8 +f 204/253/8 220/252/8 219/254/8 +f 203/255/8 219/254/8 218/256/8 +f 201/258/8 202/257/8 218/256/8 +f 201/260/8 217/274/8 232/261/8 +f 215/263/8 216/262/8 232/261/8 +f 251/235/8 215/263/8 231/264/8 +f 235/266/8 214/218/8 230/217/8 +f 234/267/8 213/221/8 229/220/8 diff --git a/src/main/resources/assets/hbm/textures/models/bombs/mine_marelet.png b/src/main/resources/assets/hbm/textures/models/bombs/mine_marelet.png new file mode 100644 index 000000000..1ef34e457 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/bombs/mine_marelet.png differ