diff --git a/changelog b/changelog index 7838ee2a1..d4ebe75e8 100644 --- a/changelog +++ b/changelog @@ -50,4 +50,5 @@ * All NTM type explosions are no longer affected by difficulty setting, preventing them from dealing damage in peaceful mode * There are a few instances of vanilla explosions still being used, those will be phased out in the future * Fixed tutorial presentations triggering when hitting F1 not just in the inventory but also when looking at the block in question -* Fixed a bug regarding shift clicking in the breeding reactor \ No newline at end of file +* Fixed a bug regarding shift clicking in the breeding reactor +* Fixed empty particle capsules not being extractable from the ICF pellet maker diff --git a/src/main/java/com/hbm/blocks/generic/BlockCrate.java b/src/main/java/com/hbm/blocks/generic/BlockCrate.java index 2fa11286c..ea7ffd968 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockCrate.java +++ b/src/main/java/com/hbm/blocks/generic/BlockCrate.java @@ -79,9 +79,7 @@ public class BlockCrate extends BlockFalling { BlockCrate.addToListWithWeight(weaponList, ModItems.gun_karl, 4); BlockCrate.addToListWithWeight(weaponList, ModItems.gun_panzerschreck, 6); BlockCrate.addToListWithWeight(weaponList, ModItems.gun_hk69, 8); - BlockCrate.addToListWithWeight(weaponList, ModItems.gun_stinger, 7); BlockCrate.addToListWithWeight(weaponList, ModItems.gun_mp40, 9); - BlockCrate.addToListWithWeight(weaponList, ModItems.gun_uzi, 6); BlockCrate.addToListWithWeight(weaponList, ModItems.gun_uzi_silencer, 5); BlockCrate.addToListWithWeight(weaponList, ModItems.gun_uboinik, 8); BlockCrate.addToListWithWeight(weaponList, ModItems.gun_lever_action, 7); diff --git a/src/main/java/com/hbm/crafting/WeaponRecipes.java b/src/main/java/com/hbm/crafting/WeaponRecipes.java index 375dab9eb..315035266 100644 --- a/src/main/java/com/hbm/crafting/WeaponRecipes.java +++ b/src/main/java/com/hbm/crafting/WeaponRecipes.java @@ -101,7 +101,6 @@ public class WeaponRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_karl, 1), new Object[] { "SSW", " MW", 'S', STEEL.shell(), 'W', ALLOY.plate(), 'M', ModItems.mechanism_launcher_2 }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_quadro, 1), new Object[] { "SSS", "SSS", "CM ", 'S', STEEL.pipe(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BASIC), 'M', ModItems.mechanism_launcher_2 }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_hk69, 1), new Object[] { "SSI", " MB", 'S', STEEL.shell(), 'I', IRON.ingot(), 'M', ModItems.mechanism_launcher_1, 'B', STEEL.bolt() }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_stinger, 1), new Object[] { "SSW", "CMW", 'S', STEEL.plate(), 'W', TI.plate(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED), 'M', ModItems.mechanism_launcher_2 }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_revolver, 1), new Object[] { "SSM", " RW", 'S', STEEL.plate(), 'W', KEY_PLANKS, 'R', AL.wireFine(), 'M', ModItems.mechanism_revolver_1 }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_revolver_saturnite, 1), new Object[] { "SSM", " RW", 'S', BIGMT.plate(), 'W', KEY_PLANKS, 'R', W.wireFine(), 'M', ModItems.mechanism_revolver_2 }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_revolver_gold, 1), new Object[] { "SSM", " RW", 'S', GOLD.plate(), 'W', W.ingot(), 'R', GOLD.wireFine(), 'M', ModItems.mechanism_revolver_1 }); diff --git a/src/main/java/com/hbm/inventory/fluid/Fluids.java b/src/main/java/com/hbm/inventory/fluid/Fluids.java index 0221aa838..d0f21d3cd 100644 --- a/src/main/java/com/hbm/inventory/fluid/Fluids.java +++ b/src/main/java/com/hbm/inventory/fluid/Fluids.java @@ -618,8 +618,11 @@ public class Fluids { SODIUM.addTraits(new FT_Heatable().setEff(HeatingType.PWR, 2.5D).setEff(HeatingType.ICF, 3D).addStep(400, 1, SODIUM_HOT, 1)); SODIUM_HOT.addTraits(new FT_Coolable(SODIUM, 1, 1, 400).setEff(CoolingType.HEATEXCHANGER, 1.0D)); + /* Fuck you, this is final now. If you had any concerns, you could have told me like a normal person instead of shitting on in-dev values that change every other day */ LEAD.addTraits(new FT_Heatable().setEff(HeatingType.PWR, 0.75D).setEff(HeatingType.ICF, 4D).addStep(800, 1, LEAD_HOT, 1), new FT_PWRModerator(0.75D)); - LEAD_HOT.addTraits(new FT_Coolable(LEAD, 1, 1, 680 /* -15% is not a huge nerf but it will piss off the PWRmaxxers hard, lead should not be the end-all-be-all, especially given the cost */).setEff(CoolingType.HEATEXCHANGER, 1.0D)); + /* Or maybe not, because I blocked your sorry ass. Guess why that is? */ + LEAD_HOT.addTraits(new FT_Coolable(LEAD, 1, 1, 680).setEff(CoolingType.HEATEXCHANGER, 1.0D)); + /* Maybe shittalking me in some corner where you thought I wouldn't listen was not that bright of an idea afterall? */ THORIUM_SALT.addTraits(new FT_Heatable().setEff(HeatingType.PWR, 1.0D).addStep(400, 1, THORIUM_SALT_HOT, 1), new FT_PWRModerator(2.5D)); THORIUM_SALT_HOT.addTraits(new FT_Coolable(THORIUM_SALT_DEPLETED, 1, 1, 400).setEff(CoolingType.HEATEXCHANGER, 1.0D)); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 439df34ec..93128a3dd 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -1528,7 +1528,6 @@ public class ModItems { public static Item gun_karl; public static Item gun_quadro; public static Item gun_hk69; - public static Item gun_stinger; public static Item gun_skystinger; public static Item gun_revolver; public static Item gun_revolver_saturnite; @@ -1637,6 +1636,7 @@ public class ModItems { public static Item gun_spas12; public static Item gun_panzerschreck; public static Item gun_g3; + public static Item gun_stinger; public static Item ammo_standard; @@ -4081,7 +4081,6 @@ public class ModItems { gun_quadro = new ItemGunBase(GunRocketFactory.getQuadroConfig()).setUnlocalizedName("gun_quadro").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_quadro"); gun_hk69 = new ItemGunBase(GunGrenadeFactory.getHK69Config()).setUnlocalizedName("gun_hk69").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_hk69"); //gun_congolake = new ItemGunBase(GunGrenadeFactory.getCongoConfig()).setUnlocalizedName("gun_congolake").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_congolake"); - gun_stinger = new ItemGunBase(GunRocketHomingFactory.getStingerConfig()).setUnlocalizedName("gun_stinger").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_stinger"); gun_skystinger = new ItemGunBase(GunRocketHomingFactory.getSkyStingerConfig()).setUnlocalizedName("gun_skystinger").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_skystinger"); gun_revolver = new ItemGunBase(Gun357MagnumFactory.getRevolverConfig()).setUnlocalizedName("gun_revolver").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver"); gun_revolver_saturnite = new ItemGunBase(Gun357MagnumFactory.getRevolverSaturniteConfig()).setUnlocalizedName("gun_revolver_saturnite").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_saturnite"); @@ -6952,7 +6951,6 @@ public class ModItems { GameRegistry.registerItem(gun_karl, gun_karl.getUnlocalizedName()); GameRegistry.registerItem(gun_quadro, gun_quadro.getUnlocalizedName()); GameRegistry.registerItem(gun_hk69, gun_hk69.getUnlocalizedName()); - GameRegistry.registerItem(gun_stinger, gun_stinger.getUnlocalizedName()); GameRegistry.registerItem(gun_fatman, gun_fatman.getUnlocalizedName()); GameRegistry.registerItem(gun_proto, gun_proto.getUnlocalizedName()); GameRegistry.registerItem(gun_mirv, gun_mirv.getUnlocalizedName()); @@ -7027,6 +7025,7 @@ public class ModItems { GameRegistry.registerItem(gun_spas12, gun_spas12.getUnlocalizedName()); GameRegistry.registerItem(gun_panzerschreck, gun_panzerschreck.getUnlocalizedName()); GameRegistry.registerItem(gun_g3, gun_g3.getUnlocalizedName()); + GameRegistry.registerItem(gun_stinger, gun_stinger.getUnlocalizedName()); GameRegistry.registerItem(ammo_standard, ammo_standard.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/weapon/sedna/Crosshair.java b/src/main/java/com/hbm/items/weapon/sedna/Crosshair.java index fe308bbf9..6292b6785 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/Crosshair.java +++ b/src/main/java/com/hbm/items/weapon/sedna/Crosshair.java @@ -20,7 +20,9 @@ public enum Crosshair { L_ARROWS(32, 122, 32), L_BOX(64, 122, 32), L_CIRCUMFLEX(96, 122, 32), - L_RAD(0, 154, 32); + L_RAD(0, 154, 32), + L_MODERN(32, 154, 32), + L_BOX_OUTLINE(64, 154, 32); public int x; public int y; diff --git a/src/main/java/com/hbm/items/weapon/sedna/ItemGunBaseNT.java b/src/main/java/com/hbm/items/weapon/sedna/ItemGunBaseNT.java index ccbdf5941..78ea096aa 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/ItemGunBaseNT.java +++ b/src/main/java/com/hbm/items/weapon/sedna/ItemGunBaseNT.java @@ -66,7 +66,7 @@ public class ItemGunBaseNT extends Item implements IKeybindReceiver, IEquipRecei public static float aimingProgress; /** NEVER ACCESS DIRECTLY - USE GETTER */ - private GunConfig[] configs_DNA; + protected GunConfig[] configs_DNA; public GunConfig getConfig(ItemStack stack, int index) { GunConfig cfg = configs_DNA[index]; diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactoryClient.java b/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactoryClient.java index ed5481210..0aefd80de 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactoryClient.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactoryClient.java @@ -41,6 +41,7 @@ public class GunFactoryClient { MinecraftForgeClient.registerItemRenderer(ModItems.gun_spas12, new ItemRenderSPAS12()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_panzerschreck, new ItemRenderPanzerschreck()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_g3, new ItemRenderG3()); + MinecraftForgeClient.registerItemRenderer(ModItems.gun_stinger, new ItemRenderStinger()); //PROJECTILES ammo_debug.setRenderer(LegoClient.RENDER_STANDARD_BULLET); ammo_debug_buckshot.setRenderer(LegoClient.RENDER_STANDARD_BULLET); @@ -98,6 +99,7 @@ public class GunFactoryClient { ((ItemGunBaseNT) ModItems.gun_spas12) .getConfig(null, 0).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO); ((ItemGunBaseNT) ModItems.gun_panzerschreck) .getConfig(null, 0).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO); ((ItemGunBaseNT) ModItems.gun_g3) .getConfig(null, 0).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO); + ((ItemGunBaseNT) ModItems.gun_stinger) .getConfig(null, 0).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO); ((ItemGunBaseNT) ModItems.gun_light_revolver_dani).getConfig(null, 0).hud(LegoClient.HUD_COMPONENT_DURABILITY_MIRROR, LegoClient.HUD_COMPONENT_AMMO_MIRROR); ((ItemGunBaseNT) ModItems.gun_light_revolver_dani).getConfig(null, 1).hud(LegoClient.HUD_COMPONENT_DURABILITY, LegoClient.HUD_COMPONENT_AMMO); diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java b/src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java index a4c95a68b..52ce656b4 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java @@ -658,4 +658,15 @@ public class Orchestras { if(timer == 28) player.worldObj.playSoundAtEntity(player, "hbm:weapon.reload.revolverClose", 1F, 1F); } }; + + public static BiConsumer ORCHESTRA_STINGER = (stack, ctx) -> { + EntityPlayer player = ctx.player; + if(player.worldObj.isRemote) return; + AnimType type = ItemGunBaseNT.getLastAnim(stack, ctx.configIndex); + int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex); + + if(type == AnimType.RELOAD) { + if(timer == 30) player.worldObj.playSoundAtEntity(player, "hbm:weapon.reload.insertCanister", 1F, 1F); + } + }; } diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryRocket.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryRocket.java index bf02cc3bb..8eed61386 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryRocket.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryRocket.java @@ -11,7 +11,9 @@ import com.hbm.items.weapon.sedna.Crosshair; import com.hbm.items.weapon.sedna.GunConfig; import com.hbm.items.weapon.sedna.ItemGunBaseNT; import com.hbm.items.weapon.sedna.Receiver; +import com.hbm.items.weapon.sedna.ItemGunBaseNT.LambdaContext; import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmo; +import com.hbm.items.weapon.sedna.impl.ItemGunStinger; import com.hbm.items.weapon.sedna.mags.MagazineSingleReload; import com.hbm.lib.RefStrings; import com.hbm.render.anim.BusAnimation; @@ -56,8 +58,22 @@ public class XFactoryRocket { .setupStandardConfiguration() .anim(LAMBDA_PANZERSCHRECK_ANIMS).orchestra(Orchestras.ORCHESTRA_PANERSCHRECK) ).setUnlocalizedName("gun_panzerschreck").setTextureName(RefStrings.MODID + ":gun_darter"); + + ModItems.gun_stinger = new ItemGunStinger(new GunConfig() + .dura(300).draw(7).inspect(40).crosshair(Crosshair.L_BOX_OUTLINE) + .rec(new Receiver(0) + .dmg(25F).delay(5).reload(50).jam(40).sound("hbm:weapon.rpgShoot", 1.0F, 1.0F) + .mag(new MagazineSingleReload(0, 1).addConfigs(rocket_rpzb_he, rocket_rpzb_heat)) + .offset(1, -0.0625 * 1.5, -0.1875D) + .setupStandardFire().recoil(Lego.LAMBDA_STANDARD_RECOIL)) + .setupStandardConfiguration().ps(LAMBDA_STINGER_SECONDARY_PRESS).rs(LAMBDA_STINGER_SECONDARY_RELEASE) + .anim(LAMBDA_PANZERSCHRECK_ANIMS).orchestra(Orchestras.ORCHESTRA_STINGER) + ).setUnlocalizedName("gun_stinger").setTextureName(RefStrings.MODID + ":gun_darter"); } + public static BiConsumer LAMBDA_STINGER_SECONDARY_PRESS = (stack, ctx) -> { ItemGunStinger.setIsLockingOn(stack, true); }; + public static BiConsumer LAMBDA_STINGER_SECONDARY_RELEASE = (stack, ctx) -> { ItemGunStinger.setIsLockingOn(stack, false); }; + @SuppressWarnings("incomplete-switch") public static BiFunction LAMBDA_PANZERSCHRECK_ANIMS = (stack, type) -> { boolean empty = ((ItemGunBaseNT) stack.getItem()).getConfig(stack, 0).getReceivers(stack)[0].getMagazine(stack).getAmount(stack) <= 0; switch(type) { diff --git a/src/main/java/com/hbm/items/weapon/sedna/impl/ItemGunStinger.java b/src/main/java/com/hbm/items/weapon/sedna/impl/ItemGunStinger.java new file mode 100644 index 000000000..9f1bcce05 --- /dev/null +++ b/src/main/java/com/hbm/items/weapon/sedna/impl/ItemGunStinger.java @@ -0,0 +1,73 @@ +package com.hbm.items.weapon.sedna.impl; + +import com.hbm.items.weapon.sedna.GunConfig; +import com.hbm.items.weapon.sedna.ItemGunBaseNT; +import com.hbm.items.weapon.sedna.hud.IHUDComponent; +import com.hbm.render.util.RenderScreenOverlay; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; +import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre; + +public class ItemGunStinger extends ItemGunBaseNT { + + public static final String KEY_LOCKINGON = "lockingon"; + + public static float prevLockon; + public static float lockon; + + public ItemGunStinger(GunConfig... cfg) { + super(cfg); + } + + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean isHeld) { + super.onUpdate(stack, world, entity, slot, isHeld); + + if(!world.isRemote && !isHeld && this.getIsLockingOn(stack)) { + this.setIsLockingOn(stack, false); + } + + this.prevLockon = this.lockon; + if(isHeld && this.getIsLockingOn(stack)) { + this.lockon += (1F / 100F); + } else { + this.lockon = 0F; + } + } + + @Override + @SideOnly(Side.CLIENT) + public void renderHUD(Pre event, ElementType type, EntityPlayer player, ItemStack stack) { + + ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem(); + + if(type == ElementType.CROSSHAIRS) { + event.setCanceled(true); + if(aimingProgress < 1F) return; + RenderScreenOverlay.renderCustomCrosshairs(event.resolution, Minecraft.getMinecraft().ingameGUI, gun.getConfig(stack, 0).getCrosshair(stack)); + RenderScreenOverlay.renderStingerLockon(event.resolution, Minecraft.getMinecraft().ingameGUI); + } + + int confNo = this.configs_DNA.length; + + for(int i = 0; i < confNo; i++) { + IHUDComponent[] components = gun.getConfig(stack, i).getHUDComponents(stack); + + if(components != null) for(IHUDComponent component : components) { + int bottomOffset = 0; + component.renderHUDComponent(event, type, player, stack, bottomOffset, i); + bottomOffset += component.getComponentHeight(player, stack); + } + } + } + + public static boolean getIsLockingOn(ItemStack stack) { return getValueBool(stack, KEY_LOCKINGON); } + public static void setIsLockingOn(ItemStack stack, boolean value) { setValueBool(stack, KEY_LOCKINGON, value); } +} diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 6baab5f59..234f22f1f 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -529,7 +529,6 @@ public class ClientProxy extends ServerProxy { //guns MinecraftForgeClient.registerItemRenderer(ModItems.gun_rpg, new ItemRenderRpg()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_karl, new ItemRenderRpg()); - MinecraftForgeClient.registerItemRenderer(ModItems.gun_stinger, new ItemRenderStinger()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_skystinger, new ItemRenderStinger()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver, new ItemRenderWeaponFFColt(ResourceManager.ff_gun_bright, ResourceManager.ff_iron, ResourceManager.ff_wood)); MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_saturnite, new ItemRenderWeaponFFColt(ResourceManager.ff_saturnite, ResourceManager.ff_iron, ResourceManager.ff_wood)); diff --git a/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderStinger.java b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderStinger.java new file mode 100644 index 000000000..b80e3354e --- /dev/null +++ b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderStinger.java @@ -0,0 +1,125 @@ +package com.hbm.render.item.weapon.sedna; + +import org.lwjgl.opengl.GL11; + +import com.hbm.items.weapon.sedna.ItemGunBaseNT; +import com.hbm.main.ResourceManager; +import com.hbm.render.anim.HbmAnimations; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.item.ItemStack; + +public class ItemRenderStinger extends ItemRenderWeaponBase { + + @Override + protected float getTurnMagnitude(ItemStack stack) { return ItemGunBaseNT.getIsAiming(stack) ? 2.5F : -0.25F; } + + @Override + public void setupFirstPerson(ItemStack stack) { + GL11.glTranslated(0, 0, 0.875); + + float offset = 0.8F; + standardAimingTransform(stack, + -3.75F * offset, -9F * offset, -3.5F * offset, + -2.625F * offset, -6.5, -8.5F); + } + + @Override + public void renderFirstPerson(ItemStack stack) { + if(ItemGunBaseNT.prevAimingProgress == 1 && ItemGunBaseNT.aimingProgress == 1) return; + + ItemGunBaseNT gun = (ItemGunBaseNT) stack.getItem(); + Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.stinger_tex); + double scale = 1.5D; + GL11.glScaled(scale, scale, scale); + + double[] equip = HbmAnimations.getRelevantTransformation("EQUIP"); + double[] reload = HbmAnimations.getRelevantTransformation("RELOAD"); + double[] rocket = HbmAnimations.getRelevantTransformation("ROCKET"); + + GL11.glTranslated(0, -1, -1); + GL11.glRotated(equip[0], 1, 0, 0); + GL11.glTranslated(0, 1, 1); + + GL11.glTranslated(0, -4, -3); + GL11.glRotated(reload[0], 1, 0, 0); + GL11.glTranslated(0, 4, 3); + + GL11.glShadeModel(GL11.GL_SMOOTH); + + GL11.glPushMatrix(); + GL11.glRotated(180, 0, 1, 0); + ResourceManager.stinger.renderAll(); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.panzerschreck_tex); + GL11.glTranslated(rocket[0], rocket[1] + 3.5, rocket[2] - 3); + ResourceManager.panzerschreck.renderPart("Rocket"); + GL11.glShadeModel(GL11.GL_FLAT); + + GL11.glPushMatrix(); + GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_CULL_FACE); + OpenGlHelper.glBlendFunc(770, 771, 1, 0); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240F, 240F); + + String label = "Not accurate"; + FontRenderer font = Minecraft.getMinecraft().fontRenderer; + float f3 = 0.04F; + GL11.glTranslatef(0.025F, -0.5F, (font.getStringWidth(label) / 2) * f3 - 3); + GL11.glScalef(f3, -f3, f3); + GL11.glRotated(90, 0, 1, 0); + GL11.glRotated(45, -1, 0, 0); + GL11.glNormal3f(0.0F, 0.0F, -1.0F * f3); + font.drawString(label, 0, 0, 0xff0000); + + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glPopAttrib(); + GL11.glPopMatrix(); + + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + GL11.glTranslated(0, 0, 6.5); + GL11.glRotated(90, 0, 1, 0); + GL11.glRotated(90 * gun.shotRand, 1, 0, 0); + GL11.glScaled(0.75, 0.75, 0.75); + this.renderMuzzleFlash(gun.lastShot[0], 150, 7.5); + GL11.glPopMatrix(); + } + + @Override + public void setupThirdPerson(ItemStack stack) { + super.setupThirdPerson(stack); + double scale = 1.5D; + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(0, -2.5, -3.5); + GL11.glRotated(180, 0, 1, 0); + + } + + @Override + public void setupInv(ItemStack stack) { + super.setupInv(stack); + double scale = 1.0625D; + GL11.glScaled(scale, scale, scale); + GL11.glRotated(25, 1, 0, 0); + GL11.glRotated(225, 0, 1, 0); + GL11.glTranslated(0.25, -2.5, 0); + } + + @Override + public void renderOther(ItemStack stack, ItemRenderType type) { + GL11.glEnable(GL11.GL_LIGHTING); + + GL11.glShadeModel(GL11.GL_SMOOTH); + GL11.glEnable(GL11.GL_CULL_FACE); + Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.stinger_tex); + ResourceManager.stinger.renderAll(); + GL11.glShadeModel(GL11.GL_FLAT); + } +} diff --git a/src/main/java/com/hbm/render/util/RenderScreenOverlay.java b/src/main/java/com/hbm/render/util/RenderScreenOverlay.java index e1c65f7de..25dc54906 100644 --- a/src/main/java/com/hbm/render/util/RenderScreenOverlay.java +++ b/src/main/java/com/hbm/render/util/RenderScreenOverlay.java @@ -8,6 +8,7 @@ import com.hbm.extprop.HbmPlayerProps; import com.hbm.interfaces.Spaghetti; import com.hbm.interfaces.Untested; import com.hbm.items.weapon.sedna.Crosshair; +import com.hbm.items.weapon.sedna.impl.ItemGunStinger; import com.hbm.lib.RefStrings; import net.minecraft.client.Minecraft; @@ -25,8 +26,8 @@ import net.minecraftforge.client.GuiIngameForge; public class RenderScreenOverlay { - private static final ResourceLocation misc = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_misc.png"); - private static final RenderItem itemRenderer = RenderItem.getInstance(); + public static final ResourceLocation misc = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_misc.png"); + public static final RenderItem itemRenderer = RenderItem.getInstance(); private static long lastSurvey; private static float prevResult; @@ -38,8 +39,6 @@ public class RenderScreenOverlay { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_BLEND); - // GL11.glDisable(GL11.GL_DEPTH_TEST); - // GL11.glDepthMask(false); OpenGlHelper.glBlendFunc(770, 771, 1, 0); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glDisable(GL11.GL_ALPHA_TEST); @@ -98,7 +97,7 @@ public class RenderScreenOverlay { public static void renderCustomCrosshairs(ScaledResolution resolution, Gui gui, Crosshair cross) { - + if(cross == Crosshair.NONE) { Minecraft.getMinecraft().renderEngine.bindTexture(Gui.icons); return; @@ -107,13 +106,26 @@ public class RenderScreenOverlay { int size = cross.size; GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(misc); - GL11.glEnable(GL11.GL_BLEND); - OpenGlHelper.glBlendFunc(GL11.GL_ONE_MINUS_DST_COLOR, GL11.GL_ONE_MINUS_SRC_COLOR, 1, 0); - gui.drawTexturedModalRect(resolution.getScaledWidth() / 2 - (size / 2), resolution.getScaledHeight() / 2 - (size / 2), cross.x, cross.y, size, size); - OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0); - GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); + Minecraft.getMinecraft().renderEngine.bindTexture(misc); + GL11.glEnable(GL11.GL_BLEND); + OpenGlHelper.glBlendFunc(GL11.GL_ONE_MINUS_DST_COLOR, GL11.GL_ONE_MINUS_SRC_COLOR, 1, 0); + gui.drawTexturedModalRect(resolution.getScaledWidth() / 2 - (size / 2), resolution.getScaledHeight() / 2 - (size / 2), cross.x, cross.y, size, size); + OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0); + GL11.glDisable(GL11.GL_BLEND); + GL11.glPopMatrix(); + Minecraft.getMinecraft().renderEngine.bindTexture(Gui.icons); + } + + public static void renderStingerLockon(ScaledResolution resolution, Gui gui) { + + int progress = (int) (ItemGunStinger.lockon * 28); + + GL11.glPushMatrix(); + Minecraft.getMinecraft().renderEngine.bindTexture(misc); + GL11.glDisable(GL11.GL_BLEND); + gui.drawTexturedModalRect(resolution.getScaledWidth() / 2 - 15, resolution.getScaledHeight() / 2 + 18, 146, 18, 30, 10); + gui.drawTexturedModalRect(resolution.getScaledWidth() / 2 - 14, resolution.getScaledHeight() / 2 + 19, 147, 29, progress, 8); + GL11.glPopMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(Gui.icons); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityICFPress.java b/src/main/java/com/hbm/tileentity/machine/TileEntityICFPress.java index ae353b4aa..459f93bed 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityICFPress.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityICFPress.java @@ -156,7 +156,7 @@ public class TileEntityICFPress extends TileEntityMachineBase implements IFluidS @Override public boolean canExtractItem(int slot, ItemStack itemStack, int side) { - return slot == 1; + return slot == 1 || slot == 3; } @Override diff --git a/src/main/resources/assets/hbm/models/weapons/stinger.obj b/src/main/resources/assets/hbm/models/weapons/stinger.obj index 06422b0b2..5f99e4edd 100644 --- a/src/main/resources/assets/hbm/models/weapons/stinger.obj +++ b/src/main/resources/assets/hbm/models/weapons/stinger.obj @@ -1,733 +1,5 @@ -# Blender v2.79 (sub 0) OBJ File: '' +# Blender v2.79 (sub 0) OBJ File: 'stinger.blend' # www.blender.org -mtllib stinger.(1obj.mtl -o Cube.001_Cube.002 -v 0.393889 3.128783 -9.337228 -v 0.393890 1.846543 -5.892444 -v 0.393889 1.846542 -9.337228 -v -0.393894 3.128783 -5.892444 -v -0.393895 1.846542 -9.337228 -v -0.393894 1.846543 -5.892444 -v -0.393895 3.128783 -9.337228 -v -0.000002 3.303435 -5.049528 -v -0.382998 1.728983 -5.208168 -v -0.000002 1.728983 -5.049528 -v -0.382998 3.303435 -5.208168 -v -0.541638 1.728983 -5.591164 -v -0.541638 3.303435 -5.591164 -v -0.382998 1.728983 -5.974160 -v -0.382998 3.303435 -5.974160 -v -0.000002 1.728983 -6.132800 -v -0.000002 3.303435 -6.132800 -v 0.382994 1.728983 -5.974160 -v 0.382994 3.303435 -5.974160 -v 0.541634 1.728983 -5.591164 -v 0.541634 3.303435 -5.591164 -v 0.382994 1.728983 -5.208168 -v 0.382994 3.303435 -5.208168 -v -1.403786 4.699999 -5.797567 -v -1.686627 4.582843 -7.948311 -v -1.686626 4.582843 -5.797567 -v -1.803787 4.299999 -7.948311 -v -1.803786 4.299999 -5.797567 -v -1.686626 4.017155 -5.797567 -v -1.686627 4.017155 -7.948311 -v -1.403786 3.899999 -5.797567 -v -1.403787 3.899999 -7.948311 -v -1.120942 4.017155 -5.797567 -v -1.003787 4.299999 -7.948312 -v -1.003786 4.299999 -5.797568 -v -1.883787 4.299999 -7.982080 -v -1.743199 3.960587 -7.982080 -v -1.120943 4.582843 -7.948312 -v -1.120942 4.582843 -5.797568 -v -0.923786 4.299999 -5.755472 -v -0.923787 4.299999 -7.982080 -v -1.064375 4.639411 -8.277956 -v -1.064375 4.639411 -7.982080 -v -1.120943 4.017155 -7.948311 -v -1.403787 3.819999 -7.982080 -v -1.064375 3.960587 -7.982080 -v -1.403787 4.699999 -7.948311 -v -1.403787 4.779999 -7.982080 -v -1.743199 4.639411 -7.982080 -v -0.923787 4.299999 -8.277956 -v -1.743199 3.960587 -8.277955 -v -1.883787 4.299999 -8.277955 -v -1.403787 3.819999 -8.277956 -v -1.064375 3.960587 -8.277956 -v -1.743199 4.639411 -8.277956 -v -1.403787 4.779999 -8.277956 -v -1.403786 4.779999 -5.755472 -v -1.064374 4.639411 -5.489088 -v -1.064374 4.639411 -5.755472 -v -1.883786 4.299999 -5.755472 -v -1.743198 4.639411 -5.755472 -v -1.064374 3.960587 -5.755472 -v -1.403786 3.819999 -5.755472 -v -1.743198 3.960587 -5.755472 -v -1.743198 3.960587 -5.489088 -v -0.923786 4.299999 -5.489088 -v -1.883786 4.299999 -5.489088 -v -1.064374 3.960587 -5.489088 -v -1.743198 4.639411 -5.489088 -v -1.403786 3.819999 -5.489088 -v -1.403786 4.779999 -5.489088 -v -1.473919 4.208779 -7.811895 -v -0.447114 3.729971 -5.941060 -v -0.447115 3.729971 -7.811896 -v 0.128767 2.756387 -3.983544 -v 0.128767 1.614719 -3.555136 -v 0.128767 1.614719 -3.983544 -v 0.128767 2.756387 -3.555136 -v -0.128769 1.614719 -3.555136 -v -0.128769 2.756387 -3.555136 -v -0.128769 1.614719 -3.983544 -v -0.128769 2.756387 -3.983544 -v 0.190951 3.077327 -3.167776 -v -0.208109 2.727468 -3.531600 -v 0.197875 2.727295 -3.523528 -v -0.198185 2.731559 -4.030576 -v 0.207799 2.731387 -4.022504 -v -0.191081 3.087375 -4.380480 -v 0.214907 3.087207 -4.372408 -v -0.207801 3.932427 -3.521620 -v -0.190953 3.586487 -4.376348 -v -0.214909 3.576612 -3.171716 -v 0.215035 3.586319 -4.368276 -v 0.198183 3.932260 -3.513548 -v 0.191079 3.576439 -3.163644 -v 0.771273 5.530663 -9.417193 -v 0.771274 4.098263 -6.669316 -v 0.771273 4.098262 -9.417192 -v 0.771274 5.530663 -6.669316 -v -0.771278 4.098263 -6.669316 -v -0.771278 5.530663 -6.669316 -v -0.771279 4.098262 -9.417192 -v -0.000003 4.089742 -9.779048 -v -0.346641 3.977118 9.779048 -v 0.000003 4.089750 9.779048 -v -0.346647 3.977114 -9.779048 -v -0.560881 3.682245 9.779048 -v -0.560887 3.682238 -9.779048 -v -0.560881 3.317762 9.779048 -v -0.560887 3.317755 -9.779048 -v -0.346641 3.022886 9.779048 -v -0.346647 3.022882 -9.779048 -v 0.000003 2.910254 9.779048 -v -0.000003 2.910250 -9.779048 -v 0.346647 3.022886 9.779048 -v 0.346641 3.022882 -9.779048 -v 0.560887 3.317762 9.779048 -v 0.560881 3.317755 -9.779048 -v 0.560887 3.682245 9.779048 -v -0.381311 4.024827 -9.822908 -v 0.560881 3.682238 -9.779048 -v 0.346647 3.977118 9.779048 -v 0.346641 3.977114 -9.779048 -v 0.519971 4.215673 9.897908 -v -0.841321 3.226638 9.897908 -v 0.841327 3.773365 9.897908 -v -0.841321 3.773365 9.897908 -v 0.841327 3.226638 9.897908 -v 0.519971 2.784330 9.897908 -v 0.000003 2.615382 9.897908 -v -0.519965 2.784330 9.897908 -v -0.519965 4.215673 9.897908 -v 0.000003 4.384622 9.897908 -v -0.616975 3.299531 -9.822908 -v -0.616975 3.700462 -10.379472 -v -0.616975 3.299530 -10.379472 -v -0.616975 3.700462 -9.822908 -v 0.381305 4.024827 -9.822908 -v -0.000003 4.148718 -9.822908 -v 0.616969 3.700462 -9.822908 -v 0.616969 3.299531 -9.822908 -v 0.381305 2.975170 -9.822908 -v -0.381311 2.975170 -9.822908 -v -0.000003 2.851278 -9.822908 -v 0.616969 3.700462 -10.379472 -v -0.000003 4.148718 -10.379472 -v 0.381305 2.975170 -10.379472 -v 0.616969 3.299530 -10.379472 -v -0.381311 2.975170 -10.379472 -v -0.381311 4.024827 -10.379472 -v -0.000003 2.851278 -10.379472 -v 0.381305 4.024827 -10.379472 -v 0.393890 3.128783 -5.892444 -v -1.473918 4.208779 -5.941060 -v -0.215037 3.077499 -3.175848 -v -0.197877 3.936519 -4.020596 -v 0.208107 3.936351 -4.012524 -v -0.771279 5.530663 -9.417192 -vt 0.527579 0.843077 -vt 0.818514 0.903517 -vt 0.527579 0.904025 -vt 0.818514 0.999529 -vt 0.527579 0.938195 -vt 0.818514 0.938957 -vt 0.451532 0.938195 -vt 0.601607 0.751835 -vt 0.564045 0.842170 -vt 0.601607 0.842170 -vt 0.564045 0.751835 -vt 0.526858 0.842170 -vt 0.526858 0.751835 -vt 0.490047 0.842170 -vt 0.490047 0.751835 -vt 0.452109 0.842170 -vt 0.751857 0.751835 -vt 0.714295 0.842170 -vt 0.751857 0.842170 -vt 0.714295 0.751835 -vt 0.676356 0.842170 -vt 0.676356 0.751835 -vt 0.639545 0.842170 -vt 0.639545 0.751835 -vt 0.525741 0.869077 -vt 0.515026 0.885956 -vt 0.463759 0.885334 -vt 0.601692 0.396030 -vt 0.639188 0.583813 -vt 0.639188 0.396030 -vt 0.676683 0.583813 -vt 0.676683 0.396030 -vt 0.714179 0.396030 -vt 0.714179 0.583813 -vt 0.751674 0.396030 -vt 0.451711 0.583813 -vt 0.489206 0.396030 -vt 0.451711 0.396030 -vt 0.526701 0.583813 -vt 0.526701 0.396030 -vt 0.676683 0.593980 -vt 0.714179 0.593980 -vt 0.564197 0.583813 -vt 0.564197 0.396030 -vt 0.526701 0.385823 -vt 0.526701 0.593980 -vt 0.564197 0.619244 -vt 0.564197 0.593980 -vt 0.489206 0.583813 -vt 0.751674 0.583813 -vt 0.751674 0.593980 -vt 0.489206 0.593980 -vt 0.601692 0.583813 -vt 0.601692 0.593980 -vt 0.639188 0.593980 -vt 0.451827 0.314796 -vt 0.579610 0.279064 -vt 0.601536 0.314798 -vt 0.451711 0.619244 -vt 0.489206 0.619244 -vt 0.714179 0.619244 -vt 0.639188 0.619244 -vt 0.601692 0.619244 -vt 0.526701 0.619244 -vt 0.751674 0.619244 -vt 0.676683 0.619244 -vt 0.601692 0.385823 -vt 0.564197 0.365688 -vt 0.564197 0.385823 -vt 0.676683 0.385823 -vt 0.639188 0.385823 -vt 0.489206 0.385823 -vt 0.451711 0.385823 -vt 0.714179 0.385823 -vt 0.624771 0.279664 -vt 0.751320 0.315075 -vt 0.603068 0.315060 -vt 0.526701 0.365688 -vt 0.489206 0.365688 -vt 0.751674 0.385823 -vt 0.714179 0.365688 -vt 0.639188 0.365688 -vt 0.451711 0.365688 -vt 0.676683 0.365688 -vt 0.601692 0.365688 -vt 0.751346 0.193282 -vt 0.452761 0.263765 -vt 0.751346 0.263765 -vt 0.647089 0.751158 -vt 0.571440 0.645292 -vt 0.647089 0.645292 -vt 0.571440 0.751158 -vt 0.526386 0.644688 -vt 0.526386 0.751158 -vt 0.451379 0.644688 -vt 0.691237 0.751158 -vt 0.691237 0.645292 -vt 0.451379 0.619409 -vt 0.526386 0.619409 -vt 0.820207 0.914045 -vt 0.865118 0.939246 -vt 0.865118 0.914045 -vt 0.954494 0.939246 -vt 0.954494 0.914045 -vt 1.000067 0.939246 -vt 1.000067 0.914045 -vt 0.948519 0.999611 -vt 0.821154 0.982062 -vt 0.999562 0.982062 -vt 0.997335 0.982124 -vt 0.872418 0.999486 -vt 0.821195 0.982124 -vt 0.998746 0.842514 -vt 0.916847 0.720802 -vt 0.916847 0.842514 -vt 0.916847 0.665046 -vt 0.834948 0.720802 -vt 0.753049 0.720802 -vt 0.834948 0.842514 -vt 0.225330 0.955040 -vt 0.262812 0.116603 -vt 0.225330 0.116603 -vt 0.262812 0.955040 -vt 0.300293 0.116603 -vt 0.300293 0.955040 -vt 0.337775 0.116603 -vt 0.337775 0.955040 -vt 0.375256 0.116603 -vt 0.375256 0.955040 -vt 0.412738 0.116603 -vt 0.037923 0.955040 -vt 0.075404 0.116603 -vt 0.037923 0.116603 -vt 0.075404 0.955040 -vt 0.112886 0.116603 -vt 0.112886 0.955040 -vt 0.150367 0.116603 -vt 0.262812 0.959827 -vt 0.150367 0.955040 -vt 0.187849 0.116603 -vt 0.187849 0.955040 -vt 0.187849 0.101602 -vt 0.144918 0.065072 -vt 0.006436 0.036153 -vt 0.145032 0.034460 -vt 0.150367 0.101602 -vt 0.112886 0.101602 -vt 0.075404 0.101602 -vt 0.037923 0.101602 -vt 0.375256 0.101602 -vt 0.337775 0.101602 -vt 0.262812 0.101602 -vt 0.225330 0.101602 -vt 0.300293 0.101602 -vt 0.337775 0.959827 -vt 0.300293 0.999948 -vt 0.337775 0.999948 -vt 0.300293 0.959827 -vt 0.187849 0.959827 -vt 0.225330 0.959827 -vt 0.150367 0.959827 -vt 0.112886 0.959827 -vt 0.075404 0.959827 -vt 0.412738 0.955040 -vt 0.375256 0.959827 -vt 0.412738 0.959827 -vt 0.153921 0.065967 -vt 0.296232 0.034750 -vt 0.295940 0.065362 -vt 0.225330 0.999948 -vt 0.075404 0.999948 -vt 0.112886 0.999948 -vt 0.375256 0.999948 -vt 0.262812 0.999948 -vt 0.150367 0.999948 -vt 0.412738 0.999948 -vt 0.187849 0.999948 -vt 0.037923 0.999948 -vt 0.818514 0.843077 -vt 0.527579 0.999529 -vt 0.451532 0.904025 -vt 0.452109 0.751835 -vt 0.453239 0.868198 -vt 0.463954 0.851318 -vt 0.489628 0.844584 -vt 0.515221 0.851940 -vt 0.489352 0.892690 -vt 0.451711 0.593980 -vt 0.579613 0.350531 -vt 0.473752 0.350529 -vt 0.526683 0.365331 -vt 0.473750 0.279063 -vt 0.526680 0.264262 -vt 0.729617 0.350470 -vt 0.677205 0.365127 -vt 0.624787 0.350459 -vt 0.677183 0.265008 -vt 0.729601 0.279675 -vt 0.751674 0.365688 -vt 0.452761 0.193282 -vt 0.451379 0.751158 -vt 0.820207 0.939246 -vt 0.872853 0.939693 -vt 0.947243 0.939693 -vt 0.999034 0.957243 -vt 0.820625 0.957243 -vt 0.874129 0.999611 -vt 0.821713 0.957571 -vt 0.997853 0.957571 -vt 0.873670 0.940209 -vt 0.946630 0.940209 -vt 0.945378 0.999486 -vt 0.998746 0.720802 -vt 0.834948 0.665046 -vt 0.753049 0.842514 -vt 0.032998 0.011064 -vt 0.075862 0.001081 -vt 0.118655 0.010018 -vt 0.118356 0.090161 -vt 0.032699 0.091207 -vt 0.075492 0.100143 -vt 0.006322 0.066764 -vt 0.412738 0.101602 -vt 0.037923 0.959827 -vt 0.268581 0.090244 -vt 0.224605 0.099890 -vt 0.180808 0.090618 -vt 0.154212 0.035355 -vt 0.181571 0.010473 -vt 0.225547 0.000826 -vt 0.269344 0.010099 -vn 1.0000 0.0000 -0.0000 -vn -1.0000 -0.0000 0.0000 -vn 0.0000 0.0000 -1.0000 -vn 0.0000 -1.0000 0.0000 -vn -0.3827 0.0000 0.9239 -vn -0.9239 0.0000 0.3827 -vn -0.9239 -0.0000 -0.3827 -vn -0.3827 -0.0000 -0.9239 -vn 0.3827 -0.0000 -0.9239 -vn 0.9239 0.0000 -0.3827 -vn 0.9239 0.0000 0.3827 -vn 0.3827 0.0000 0.9239 -vn -0.3827 0.9239 0.0000 -vn -0.9239 0.3827 0.0000 -vn -0.9239 -0.3827 0.0000 -vn -0.3827 -0.9239 0.0000 -vn 0.3827 -0.9239 0.0000 -vn 0.9239 -0.3827 -0.0000 -vn -0.3839 -0.1590 0.9096 -vn 0.9239 0.3827 -0.0000 -vn 0.3827 0.9239 -0.0000 -vn 0.4572 0.1894 -0.8689 -vn 0.3839 -0.1590 0.9096 -vn -0.1590 -0.3839 0.9096 -vn 0.3839 0.1590 0.9096 -vn -0.3839 0.1590 0.9096 -vn 0.1590 -0.3839 0.9096 -vn 0.1590 0.3839 0.9096 -vn -0.1590 0.3839 0.9096 -vn -0.4572 0.1894 -0.8689 -vn 0.1894 -0.4572 -0.8689 -vn 0.1894 0.4572 -0.8689 -vn -0.1894 0.4572 -0.8689 -vn -0.4572 -0.1894 -0.8690 -vn -0.4572 -0.1894 -0.8689 -vn 0.4572 -0.1894 -0.8689 -vn -0.1894 -0.4572 -0.8689 -vn 0.0000 0.0000 1.0000 -vn 0.4226 0.9063 -0.0000 -vn -0.0142 -0.7129 0.7011 -vn -0.0003 -1.0000 -0.0082 -vn 0.0139 -0.7012 -0.7128 -vn -0.9998 0.0004 -0.0199 -vn 0.9998 -0.0004 0.0199 -vn -0.3090 0.9511 -0.0000 -vn -0.8090 0.5878 0.0000 -vn -0.8090 -0.5878 0.0000 -vn -0.3090 -0.9511 0.0000 -vn 0.3090 -0.9511 0.0000 -vn 0.8090 -0.5878 -0.0000 -vn -0.1904 0.5858 0.7877 -vn -0.1903 0.5859 0.7877 -vn 0.8090 0.5878 -0.0000 -vn 0.3090 0.9511 -0.0000 -vn 0.1206 0.3711 -0.9207 -vn 0.3157 0.2294 -0.9207 -vn 0.3902 0.0000 -0.9207 -vn 0.3157 -0.2294 -0.9207 -vn 0.1206 -0.3711 -0.9207 -vn -0.1206 -0.3711 -0.9207 -vn -0.3157 -0.2294 -0.9207 -vn -0.1206 0.3711 -0.9207 -vn -0.3902 0.0000 -0.9207 -vn -0.3157 0.2294 -0.9207 -vn -0.6160 0.0000 0.7877 -vn -0.4984 0.3621 0.7877 -vn -0.4983 0.3621 0.7877 -vn -0.4983 0.3621 0.7878 -vn 0.1904 0.5858 0.7877 -vn 0.1903 0.5859 0.7877 -vn 0.4984 0.3621 0.7877 -vn 0.4983 0.3621 0.7877 -vn 0.6160 0.0000 0.7877 -vn 0.4984 -0.3621 0.7877 -vn 0.1904 -0.5859 0.7877 -vn -0.1904 -0.5859 0.7877 -vn -0.4984 -0.3621 0.7877 -vn -0.4572 0.1894 -0.8690 -vn -0.4983 -0.3621 0.7877 -usemtl None -s 1 -f 1/1/1 2/2/1 3/3/1 -f 4/4/2 5/5/2 6/6/2 -f 7/7/3 3/3/3 5/5/3 -f 6/6/4 3/3/4 2/2/4 -f 8/8/5 9/9/5 10/10/5 -f 11/11/6 12/12/6 9/9/6 -f 13/13/7 14/14/7 12/12/7 -f 15/15/8 16/16/8 14/14/8 -f 17/17/9 18/18/9 16/19/9 -f 19/20/10 20/21/10 18/18/10 -f 21/22/11 22/23/11 20/21/11 -f 23/24/12 10/10/12 22/23/12 -f 16/25/4 18/26/4 22/27/4 -f 24/28/13 25/29/13 26/30/13 -f 26/30/14 27/31/14 28/32/14 -f 27/31/15 29/33/15 28/32/15 -f 30/34/16 31/35/16 29/33/16 -f 32/36/17 33/37/17 31/38/17 -f 33/37/18 34/39/18 35/40/18 -f 30/34/19 36/41/19 37/42/19 -f 35/40/20 38/43/20 39/44/20 -f 38/43/21 24/28/21 39/44/21 -f 39/44/22 40/45/22 35/40/22 -f 41/46/20 42/47/20 43/48/20 -f 44/49/23 41/46/23 34/39/23 -f 32/50/24 37/42/24 45/51/24 -f 38/43/25 41/46/25 43/48/25 -f 25/29/26 36/41/26 27/31/26 -f 32/36/27 46/52/27 44/49/27 -f 47/53/28 43/48/28 48/54/28 -f 47/53/29 49/55/29 25/29/29 -f 50/56/3 51/57/3 52/58/3 -f 46/52/17 53/59/17 54/60/17 -f 36/41/15 51/61/15 37/42/15 -f 48/54/13 55/62/13 49/55/13 -f 43/48/21 56/63/21 48/54/21 -f 46/52/18 50/64/18 41/46/18 -f 37/42/16 53/65/16 45/51/16 -f 49/55/14 52/66/14 36/41/14 -f 57/67/21 58/68/21 59/69/21 -f 26/30/30 60/70/30 61/71/30 -f 31/38/31 62/72/31 63/73/31 -f 24/28/32 59/69/32 39/44/32 -f 24/28/33 61/71/33 57/67/33 -f 29/33/34 60/70/35 28/32/35 -f 33/37/36 40/45/36 62/72/36 -f 31/35/37 64/74/37 29/33/37 -f 65/75/38 66/76/38 67/77/38 -f 62/72/18 66/78/18 68/79/18 -f 63/80/16 65/81/16 64/74/16 -f 60/70/14 69/82/14 61/71/14 -f 40/45/20 58/68/20 66/78/20 -f 62/72/17 70/83/17 63/73/17 -f 64/74/15 67/84/15 60/70/15 -f 61/71/13 71/85/13 57/67/13 -f 72/86/39 73/87/39 74/88/39 -f 75/89/1 76/90/1 77/91/1 -f 78/92/38 79/93/38 76/90/38 -f 80/94/2 81/95/2 79/93/2 -f 82/96/3 77/91/3 81/97/3 -f 79/93/4 77/98/4 76/99/4 -f 83/100/40 84/101/40 85/102/40 -f 85/102/41 86/103/41 87/104/41 -f 87/104/42 88/105/42 89/106/42 -f 90/107/43 91/108/43 92/109/43 -f 93/110/44 94/111/44 95/112/44 -f 96/113/1 97/114/1 98/115/1 -f 99/116/38 100/117/38 97/114/38 -f 101/118/2 102/119/2 100/117/2 -f 100/117/4 98/115/4 97/114/4 -f 103/120/45 104/121/45 105/122/45 -f 106/123/46 107/124/46 104/121/46 -f 108/125/2 109/126/2 107/124/2 -f 110/127/47 111/128/47 109/126/47 -f 112/129/48 113/130/48 111/128/48 -f 114/131/49 115/132/49 113/133/49 -f 116/134/50 117/135/50 115/132/50 -f 118/136/1 119/137/1 117/135/1 -f 103/120/51 120/138/52 106/123/52 -f 121/139/53 122/140/53 119/137/53 -f 123/141/54 105/122/54 122/140/54 -f 105/122/55 124/142/55 122/140/55 -f 125/143/38 126/144/38 127/145/38 -f 122/140/56 126/146/56 119/137/56 -f 117/135/57 126/146/57 128/147/57 -f 115/132/58 128/147/58 129/148/58 -f 113/133/59 129/148/59 130/149/59 -f 113/130/60 131/150/60 111/128/60 -f 111/128/61 125/151/61 109/126/61 -f 105/122/62 132/152/62 133/153/62 -f 109/126/63 127/154/63 107/124/63 -f 104/121/64 127/154/64 132/152/64 -f 134/155/2 135/156/2 136/157/2 -f 108/125/65 134/155/65 110/127/65 -f 106/123/66 137/158/67 108/125/68 -f 103/120/69 138/159/70 139/160/69 -f 123/141/71 140/161/72 138/159/71 -f 118/136/73 140/161/73 121/139/73 -f 116/134/74 141/162/74 118/136/74 -f 114/131/75 142/163/75 116/134/75 -f 114/164/76 143/165/76 144/166/76 -f 112/129/77 134/155/77 143/165/77 -f 145/167/3 136/168/3 135/169/3 -f 138/159/54 146/170/54 139/160/54 -f 141/162/50 147/171/50 148/172/50 -f 143/165/47 136/157/47 149/173/47 -f 139/160/45 150/174/45 120/138/45 -f 141/162/1 145/175/1 140/161/1 -f 144/166/48 149/173/48 151/176/48 -f 120/138/46 135/156/46 137/158/46 -f 140/161/53 152/177/53 138/159/53 -f 142/163/49 151/178/49 147/171/49 -f 1/1/1 153/179/1 2/2/1 -f 4/4/2 7/180/2 5/5/2 -f 7/7/3 1/181/3 3/3/3 -f 6/6/4 5/5/4 3/3/4 -f 8/8/5 11/11/5 9/9/5 -f 11/11/6 13/13/6 12/12/6 -f 13/13/7 15/15/7 14/14/7 -f 15/15/8 17/182/8 16/16/8 -f 17/17/9 19/20/9 18/18/9 -f 19/20/10 21/22/10 20/21/10 -f 21/22/11 23/24/11 22/23/11 -f 23/24/12 8/8/12 10/10/12 -f 22/27/4 10/183/4 16/25/4 -f 9/184/4 12/185/4 14/186/4 -f 14/186/4 16/25/4 10/183/4 -f 18/26/4 20/187/4 22/27/4 -f 10/183/4 9/184/4 14/186/4 -f 24/28/13 47/53/13 25/29/13 -f 26/30/14 25/29/14 27/31/14 -f 27/31/15 30/34/15 29/33/15 -f 30/34/16 32/50/16 31/35/16 -f 32/36/17 44/49/17 33/37/17 -f 33/37/18 44/49/18 34/39/18 -f 30/34/19 27/31/19 36/41/19 -f 35/40/20 34/39/20 38/43/20 -f 38/43/21 47/53/21 24/28/21 -f 39/44/22 59/69/22 40/45/22 -f 41/46/20 50/64/20 42/47/20 -f 44/49/23 46/52/23 41/46/23 -f 32/50/24 30/34/24 37/42/24 -f 38/43/25 34/39/25 41/46/25 -f 25/29/26 49/55/26 36/41/26 -f 32/36/27 45/188/27 46/52/27 -f 47/53/28 38/43/28 43/48/28 -f 47/53/29 48/54/29 49/55/29 -f 52/58/3 55/189/3 42/190/3 -f 56/191/3 42/190/3 55/189/3 -f 50/56/3 54/192/3 51/57/3 -f 53/193/3 51/57/3 54/192/3 -f 52/58/3 42/190/3 50/56/3 -f 46/52/17 45/188/17 53/59/17 -f 36/41/15 52/66/15 51/61/15 -f 48/54/13 56/63/13 55/62/13 -f 43/48/21 42/47/21 56/63/21 -f 46/52/18 54/60/18 50/64/18 -f 37/42/16 51/61/16 53/65/16 -f 49/55/14 55/62/14 52/66/14 -f 57/67/21 71/85/21 58/68/21 -f 26/30/30 28/32/78 60/70/30 -f 31/38/31 33/37/31 62/72/31 -f 24/28/32 57/67/32 59/69/32 -f 24/28/33 26/30/33 61/71/33 -f 29/33/34 64/74/34 60/70/35 -f 33/37/36 35/40/36 40/45/36 -f 31/35/37 63/80/37 64/74/37 -f 58/194/38 71/195/38 69/196/38 -f 69/196/38 67/77/38 58/194/38 -f 65/75/38 70/197/38 68/198/38 -f 68/198/38 66/76/38 65/75/38 -f 58/194/38 67/77/38 66/76/38 -f 62/72/18 40/45/18 66/78/18 -f 63/80/16 70/199/16 65/81/16 -f 60/70/14 67/84/14 69/82/14 -f 40/45/20 59/69/20 58/68/20 -f 62/72/17 68/79/17 70/83/17 -f 64/74/15 65/81/15 67/84/15 -f 61/71/13 69/82/13 71/85/13 -f 72/86/39 154/200/39 73/87/39 -f 75/89/1 78/92/1 76/90/1 -f 78/92/38 80/94/38 79/93/38 -f 80/94/2 82/201/2 81/95/2 -f 82/96/3 75/89/3 77/91/3 -f 79/93/4 81/95/4 77/98/4 -f 83/100/40 155/202/40 84/101/40 -f 85/102/41 84/101/41 86/103/41 -f 87/104/42 86/103/42 88/105/42 -f 86/203/43 84/204/43 155/205/43 -f 155/205/43 92/109/43 88/206/43 -f 90/107/43 156/207/43 91/108/43 -f 91/108/43 88/206/43 92/109/43 -f 86/203/43 155/205/43 88/206/43 -f 95/112/44 83/208/44 89/209/44 -f 85/210/44 87/211/44 83/208/44 -f 89/209/44 93/110/44 95/112/44 -f 157/212/44 94/111/44 93/110/44 -f 83/208/44 87/211/44 89/209/44 -f 96/113/1 99/213/1 97/114/1 -f 99/116/38 101/214/38 100/117/38 -f 101/118/2 158/215/2 102/119/2 -f 100/117/4 102/119/4 98/115/4 -f 103/120/45 106/123/45 104/121/45 -f 106/123/46 108/125/46 107/124/46 -f 108/125/2 110/127/2 109/126/2 -f 110/127/47 112/129/47 111/128/47 -f 112/129/48 114/164/48 113/130/48 -f 114/131/49 116/134/49 115/132/49 -f 116/134/50 118/136/50 117/135/50 -f 118/136/1 121/139/1 119/137/1 -f 103/120/51 139/160/51 120/138/52 -f 121/139/53 123/141/53 122/140/53 -f 123/141/54 103/120/54 105/122/54 -f 105/122/55 133/153/55 124/142/55 -f 124/216/38 133/217/38 132/218/38 -f 132/218/38 127/145/38 124/216/38 -f 125/143/38 131/219/38 129/220/38 -f 130/221/38 129/220/38 131/219/38 -f 128/222/38 126/144/38 125/143/38 -f 124/216/38 127/145/38 126/144/38 -f 125/143/38 129/220/38 128/222/38 -f 122/140/56 124/142/56 126/146/56 -f 117/135/57 119/137/57 126/146/57 -f 115/132/58 117/135/58 128/147/58 -f 113/133/59 115/132/59 129/148/59 -f 113/130/60 130/223/60 131/150/60 -f 111/128/61 131/150/61 125/151/61 -f 105/122/62 104/121/62 132/152/62 -f 109/126/63 125/151/63 127/154/63 -f 104/121/64 107/124/64 127/154/64 -f 134/155/2 137/158/2 135/156/2 -f 108/125/65 137/158/65 134/155/65 -f 106/123/66 120/138/66 137/158/67 -f 103/120/69 123/141/70 138/159/70 -f 123/141/71 121/139/72 140/161/72 -f 118/136/73 141/162/73 140/161/73 -f 116/134/74 142/163/74 141/162/74 -f 114/131/75 144/224/75 142/163/75 -f 114/164/76 112/129/76 143/165/76 -f 112/129/77 110/127/79 134/155/77 -f 135/169/3 150/225/3 145/167/3 -f 146/226/3 152/227/3 150/225/3 -f 145/167/3 148/228/3 136/168/3 -f 147/229/3 151/230/3 149/231/3 -f 149/231/3 136/168/3 148/228/3 -f 150/225/3 152/227/3 145/167/3 -f 148/228/3 147/229/3 149/231/3 -f 138/159/54 152/177/54 146/170/54 -f 141/162/50 142/163/50 147/171/50 -f 143/165/47 134/155/47 136/157/47 -f 139/160/45 146/170/45 150/174/45 -f 141/162/1 148/172/1 145/175/1 -f 144/166/48 143/165/48 149/173/48 -f 120/138/46 150/174/46 135/156/46 -f 140/161/53 145/175/53 152/177/53 -f 142/163/49 144/224/49 151/178/49 o Mag_Cube.002 v -0.089029 2.933951 -0.760703 v -0.089029 1.301304 -1.115814 @@ -809,7 +81,7 @@ vt 0.847847 0.234129 vt 0.870079 0.477673 vt 0.832728 0.477252 vt 0.845893 0.232242 -vn -1.0000 0.0000 0.0000 +vn -1.0000 -0.0000 0.0000 vn 0.0000 -0.0279 -0.9996 vn 0.9599 0.0013 0.2804 vn 0.9594 0.0014 0.2820 @@ -833,50 +105,789 @@ vn 0.9591 0.0015 0.2831 vn 0.9632 -0.0258 0.2676 vn -0.9993 0.0350 0.0119 vn -0.9602 0.0012 0.2793 -usemtl None_NONE s 1 -f 159/232/80 160/233/80 161/234/80 -f 162/235/81 160/236/81 163/237/81 -f 164/238/82 165/239/83 166/240/84 -f 167/241/85 165/242/85 168/243/85 -f 160/244/86 166/245/86 161/246/86 -f 169/247/87 170/248/87 171/249/88 -f 172/250/89 168/251/89 173/252/89 -f 174/253/90 168/254/90 164/238/90 -f 175/255/91 163/237/91 176/256/92 -f 177/257/80 163/258/80 159/232/80 -f 170/259/80 176/260/80 177/257/80 -f 169/261/92 176/256/92 178/262/92 -f 171/263/93 173/264/93 174/253/93 -f 179/265/94 173/266/94 180/267/94 -f 171/263/93 175/268/93 169/269/93 -f 170/259/80 172/270/80 179/271/80 -f 177/257/95 167/272/95 172/270/95 -f 174/253/93 162/273/93 175/268/93 -f 171/249/88 179/274/88 180/275/88 -f 161/246/96 165/276/96 181/277/96 -f 164/238/93 182/278/93 162/273/93 -f 159/232/97 181/279/98 167/272/99 -f 159/232/80 163/258/80 160/233/80 -f 162/235/81 182/280/81 160/236/81 -f 164/238/82 168/254/100 165/239/83 -f 167/241/85 181/281/85 165/242/85 -f 160/244/86 182/282/86 166/245/86 -f 169/247/87 178/283/87 170/248/87 -f 172/250/89 167/284/89 168/251/89 -f 174/253/101 173/264/101 168/254/101 -f 175/255/91 162/235/91 163/237/91 -f 177/257/80 176/260/80 163/258/80 -f 170/259/80 178/285/80 176/260/80 -f 169/261/92 175/255/91 176/256/92 -f 171/263/93 180/286/93 173/264/93 -f 179/265/94 172/287/94 173/266/94 -f 171/263/93 174/253/93 175/268/93 -f 170/259/80 177/257/80 172/270/80 -f 177/257/102 159/232/102 167/272/102 -f 174/253/93 164/238/93 162/273/93 -f 171/249/88 170/248/87 179/274/88 -f 161/246/96 166/245/96 165/276/96 -f 164/238/93 166/240/93 182/278/93 -f 159/232/97 161/234/103 181/279/98 - +f 1/1/1 2/2/1 3/3/1 +f 4/4/2 2/5/2 5/6/2 +f 6/7/3 7/8/4 8/9/5 +f 9/10/6 7/11/6 10/12/6 +f 2/13/7 8/14/7 3/15/7 +f 11/16/8 12/17/8 13/18/9 +f 14/19/10 10/20/10 15/21/10 +f 16/22/11 10/23/11 6/7/11 +f 17/24/12 5/6/12 18/25/13 +f 19/26/1 5/27/1 1/1/1 +f 12/28/1 18/29/1 19/26/1 +f 11/30/13 18/25/13 20/31/13 +f 13/32/14 15/33/14 16/22/14 +f 21/34/15 15/35/15 22/36/15 +f 13/32/14 17/37/14 11/38/14 +f 12/28/1 14/39/1 21/40/1 +f 19/26/16 9/41/16 14/39/16 +f 16/22/14 4/42/14 17/37/14 +f 13/18/9 21/43/9 22/44/9 +f 3/15/17 7/45/17 23/46/17 +f 6/7/14 24/47/14 4/42/14 +f 1/1/18 23/48/19 9/41/20 +f 1/1/1 5/27/1 2/2/1 +f 4/4/2 24/49/2 2/5/2 +f 6/7/3 10/23/21 7/8/4 +f 9/10/6 23/50/6 7/11/6 +f 2/13/7 24/51/7 8/14/7 +f 11/16/8 20/52/8 12/17/8 +f 14/19/10 9/53/10 10/20/10 +f 16/22/22 15/33/22 10/23/22 +f 17/24/12 4/4/12 5/6/12 +f 19/26/1 18/29/1 5/27/1 +f 12/28/1 20/54/1 18/29/1 +f 11/30/13 17/24/12 18/25/13 +f 13/32/14 22/55/14 15/33/14 +f 21/34/15 14/56/15 15/35/15 +f 13/32/14 16/22/14 17/37/14 +f 12/28/1 19/26/1 14/39/1 +f 19/26/23 1/1/23 9/41/23 +f 16/22/14 6/7/14 4/42/14 +f 13/18/9 12/17/8 21/43/9 +f 3/15/17 8/14/17 7/45/17 +f 6/7/14 8/9/14 24/47/14 +f 1/1/18 3/3/24 23/48/19 +o Cube.001_Cube.002 +v 0.393889 3.128783 -9.337228 +v 0.393890 1.846543 -5.892444 +v 0.393889 1.846542 -9.337228 +v -0.393894 3.128783 -5.892444 +v -0.393895 1.846542 -9.337228 +v -0.393894 1.846543 -5.892444 +v -0.393895 3.128783 -9.337228 +v -0.000002 3.303435 -5.049528 +v -0.382998 1.728983 -5.208168 +v -0.000002 1.728983 -5.049528 +v -0.382998 3.303435 -5.208168 +v -0.541638 1.728983 -5.591164 +v -0.541638 3.303435 -5.591164 +v -0.382998 1.728983 -5.974160 +v -0.382998 3.303435 -5.974160 +v -0.000002 1.728983 -6.132800 +v -0.000002 3.303435 -6.132800 +v 0.382994 1.728983 -5.974160 +v 0.382994 3.303435 -5.974160 +v 0.541634 1.728983 -5.591164 +v 0.541634 3.303435 -5.591164 +v 0.382994 1.728983 -5.208168 +v 0.382994 3.303435 -5.208168 +v -1.403786 4.699999 -5.797567 +v -1.686627 4.582843 -7.948311 +v -1.686626 4.582843 -5.797567 +v -1.803787 4.300000 -7.948311 +v -1.803786 4.300000 -5.797567 +v -1.686626 4.017156 -5.797567 +v -1.686627 4.017156 -7.948311 +v -1.403786 3.899999 -5.797567 +v -1.403787 3.899999 -7.948311 +v -1.120942 4.017156 -5.797567 +v -1.003787 4.300000 -7.948312 +v -1.003786 4.300000 -5.797568 +v -1.883787 4.300000 -7.982080 +v -1.743199 3.960587 -7.982080 +v -1.120943 4.582843 -7.948312 +v -1.120942 4.582843 -5.797568 +v -0.923786 4.300000 -5.755472 +v -0.923787 4.300000 -7.982080 +v -1.064375 4.639411 -8.277956 +v -1.064375 4.639411 -7.982080 +v -1.120943 4.017156 -7.948311 +v -1.403787 3.819999 -7.982080 +v -1.064375 3.960587 -7.982080 +v -1.403787 4.699999 -7.948311 +v -1.403787 4.779999 -7.982080 +v -1.743199 4.639411 -7.982080 +v -0.923787 4.300000 -8.277956 +v -1.743199 3.960588 -8.277955 +v -1.883787 4.300000 -8.277955 +v -1.403787 3.819999 -8.277956 +v -1.064375 3.960588 -8.277956 +v -1.743199 4.639411 -8.277956 +v -1.403787 4.779999 -8.277956 +v -1.403786 4.779999 -5.755472 +v -1.064374 4.639411 -5.489088 +v -1.064374 4.639411 -5.755472 +v -1.883786 4.300000 -5.755472 +v -1.743198 4.639411 -5.755472 +v -1.064374 3.960587 -5.755472 +v -1.403786 3.819999 -5.755472 +v -1.743198 3.960587 -5.755472 +v -1.743198 3.960587 -5.489088 +v -0.923786 4.300000 -5.489088 +v -1.883786 4.300000 -5.489088 +v -1.064374 3.960587 -5.489088 +v -1.743198 4.639411 -5.489088 +v -1.403786 3.819999 -5.489088 +v -1.403786 4.779999 -5.489088 +v -1.473919 4.208779 -7.811895 +v -0.447114 3.729971 -5.941060 +v -0.447115 3.729971 -7.811896 +v 0.128767 2.756387 -3.983544 +v 0.128767 1.614719 -3.555136 +v 0.128767 1.614719 -3.983544 +v 0.128767 2.756387 -3.555136 +v -0.128769 1.614719 -3.555136 +v -0.128769 2.756387 -3.555136 +v -0.128769 1.614719 -3.983544 +v -0.128769 2.756387 -3.983544 +v 0.190951 3.077327 -3.167776 +v -0.208109 2.727468 -3.531600 +v 0.197875 2.727295 -3.523528 +v -0.198185 2.731559 -4.030576 +v 0.207799 2.731387 -4.022504 +v -0.191081 3.087375 -4.380480 +v 0.214907 3.087207 -4.372408 +v -0.207801 3.932427 -3.521620 +v -0.190953 3.586487 -4.376348 +v -0.214909 3.576612 -3.171716 +v 0.215035 3.586319 -4.368276 +v 0.198183 3.932260 -3.513548 +v 0.191079 3.576439 -3.163644 +v 0.771273 5.530663 -9.417193 +v 0.771274 4.098263 -6.669316 +v 0.771273 4.098262 -9.417192 +v 0.771274 5.530663 -6.669315 +v -0.771278 4.098263 -6.669316 +v -0.771278 5.530663 -6.669315 +v -0.771279 4.098262 -9.417192 +v -0.000003 4.089743 -9.779048 +v -0.346641 3.977118 9.779048 +v 0.000003 4.089749 9.779048 +v -0.346647 3.977114 -9.779048 +v -0.560881 3.682245 9.779048 +v -0.560887 3.682239 -9.779048 +v -0.560881 3.317761 9.779048 +v -0.560887 3.317755 -9.779048 +v -0.346641 3.022886 9.779048 +v -0.346647 3.022882 -9.779048 +v 0.000003 2.910254 9.779048 +v -0.000003 2.910250 -9.779048 +v 0.346647 3.022886 9.779048 +v 0.346641 3.022882 -9.779048 +v 0.560887 3.317761 9.779048 +v 0.560881 3.317755 -9.779048 +v 0.560887 3.682245 9.779048 +v -0.381311 4.024827 -9.822908 +v 0.560881 3.682239 -9.779048 +v 0.346647 3.977118 9.779048 +v 0.346641 3.977114 -9.779048 +v 0.519971 4.215672 9.897908 +v -0.841321 3.226638 9.897908 +v 0.841327 3.773365 9.897908 +v -0.841321 3.773365 9.897908 +v 0.841327 3.226638 9.897908 +v 0.519971 2.784329 9.897908 +v 0.000003 2.615381 9.897908 +v -0.519965 2.784329 9.897908 +v -0.519965 4.215672 9.897908 +v 0.000003 4.384622 9.897908 +v -0.616975 3.299531 -9.822908 +v -0.616975 3.700463 -10.379472 +v -0.616975 3.299531 -10.379472 +v -0.616975 3.700463 -9.822908 +v 0.381305 4.024827 -9.822908 +v -0.000003 4.148718 -9.822908 +v 0.616969 3.700463 -9.822908 +v 0.616969 3.299531 -9.822908 +v 0.381305 2.975170 -9.822908 +v -0.381311 2.975170 -9.822908 +v -0.000003 2.851279 -9.822908 +v 0.616969 3.700463 -10.379472 +v -0.000003 4.148718 -10.379472 +v 0.381305 2.975170 -10.379472 +v 0.616969 3.299531 -10.379472 +v -0.381311 2.975170 -10.379472 +v -0.381311 4.024827 -10.379472 +v -0.000003 2.851279 -10.379472 +v 0.381305 4.024827 -10.379472 +v 0.393890 3.128783 -5.892444 +v -1.473918 4.208779 -5.941060 +v -0.215037 3.077499 -3.175848 +v -0.197877 3.936519 -4.020596 +v 0.208107 3.936351 -4.012524 +v -0.771279 5.530663 -9.417192 +v 0.771273 5.530663 -9.417193 +v 0.771274 4.098263 -6.669316 +v 0.771273 4.098262 -9.417192 +v 0.771274 5.530663 -6.669315 +v -0.771278 4.098263 -6.669316 +v -0.771278 5.530663 -6.669315 +v -0.771279 4.098262 -9.417192 +v -0.771279 5.530663 -9.417192 +vt 0.753049 0.842514 +vt 0.834948 0.720802 +vt 0.753049 0.720802 +vt 0.451379 0.751158 +vt 0.526386 0.644688 +vt 0.526386 0.751158 +vt 0.647089 0.751158 +vt 0.691237 0.645292 +vt 0.691237 0.751158 +vt 0.571440 0.645292 +vt 0.571440 0.751158 +vt 0.834948 0.720802 +vt 0.753049 0.842514 +vt 0.753049 0.720802 +vt 0.865118 0.914045 +vt 0.954494 0.939246 +vt 0.954494 0.914045 +vt 0.677183 0.265008 +vt 0.751320 0.315075 +vt 0.677205 0.365127 +vt 0.647089 0.645292 +vt 0.451379 0.644688 +vt 0.526386 0.619409 +vt 0.916847 0.720802 +vt 0.834948 0.842514 +vt 0.998746 0.720802 +vt 0.916847 0.842514 +vt 0.998746 0.842514 +vt 0.451532 0.904025 +vt 0.527579 0.938195 +vt 0.451532 0.938195 +vt 1.000067 0.939246 +vt 1.000067 0.914045 +vt 0.997335 0.982124 +vt 0.821713 0.957571 +vt 0.997853 0.957571 +vt 0.948519 0.999611 +vt 0.821154 0.982062 +vt 0.999562 0.982062 +vt 0.872418 0.999486 +vt 0.821195 0.982124 +vt 0.916847 0.720802 +vt 0.527579 0.999529 +vt 0.818514 0.938957 +vt 0.818514 0.999529 +vt 0.751346 0.193282 +vt 0.452761 0.263765 +vt 0.751346 0.263765 +vt 0.834948 0.665046 +vt 0.916847 0.665046 +vt 0.527579 0.843077 +vt 0.818514 0.903517 +vt 0.527579 0.904025 +vt 0.820207 0.914045 +vt 0.865118 0.939246 +vt 0.916847 0.842514 +vt 0.998746 0.720802 +vt 0.998746 0.842514 +vt 0.489352 0.892690 +vt 0.453239 0.868198 +vt 0.489628 0.844584 +vt 0.834948 0.665046 +vt 0.916847 0.665046 +vt 0.118655 0.010018 +vt 0.144918 0.065072 +vt 0.075492 0.100143 +vt 0.872853 0.939693 +vt 0.947243 0.939693 +vt 0.999034 0.957243 +vt 0.874129 0.999611 +vt 0.820625 0.957243 +vt 0.873670 0.940209 +vt 0.946630 0.940209 +vt 0.945378 0.999486 +vt 0.526680 0.264262 +vt 0.601536 0.314798 +vt 0.526683 0.365331 +vt 0.181571 0.010473 +vt 0.295940 0.065362 +vt 0.224605 0.099890 +vt 0.834948 0.842514 +vt 0.624787 0.350459 +vt 0.603068 0.315060 +vt 0.624771 0.279664 +vt 0.729601 0.279675 +vt 0.729617 0.350470 +vt 0.451379 0.619409 +vt 0.452761 0.193282 +vt 0.818514 0.843077 +vt 0.820207 0.939246 +vt 0.515221 0.851940 +vt 0.525741 0.869077 +vt 0.515026 0.885956 +vt 0.463759 0.885334 +vt 0.463954 0.851318 +vt 0.006322 0.066764 +vt 0.006436 0.036153 +vt 0.032998 0.011064 +vt 0.075862 0.001081 +vt 0.145032 0.034460 +vt 0.118356 0.090161 +vt 0.032699 0.091207 +vt 0.473752 0.350529 +vt 0.451827 0.314796 +vt 0.473750 0.279063 +vt 0.579610 0.279064 +vt 0.579613 0.350531 +vt 0.180808 0.090618 +vt 0.153921 0.065967 +vt 0.154212 0.035355 +vt 0.225547 0.000826 +vt 0.269344 0.010099 +vt 0.296232 0.034750 +vt 0.268581 0.090244 +vt 0.150367 0.999948 +vt 0.187849 0.959827 +vt 0.150367 0.959827 +vt 0.564045 0.751835 +vt 0.601607 0.842170 +vt 0.601607 0.751835 +vt 0.337775 0.955040 +vt 0.300293 0.116603 +vt 0.300293 0.955040 +vt 0.639188 0.365688 +vt 0.601692 0.385823 +vt 0.639188 0.385823 +vt 0.676683 0.619244 +vt 0.714179 0.593980 +vt 0.676683 0.593980 +vt 0.489206 0.365688 +vt 0.451711 0.385823 +vt 0.489206 0.385823 +vt 0.526858 0.751835 +vt 0.564045 0.842170 +vt 0.526701 0.385823 +vt 0.112886 0.959827 +vt 0.714179 0.583813 +vt 0.676683 0.396030 +vt 0.676683 0.583813 +vt 0.075404 0.955040 +vt 0.037923 0.116603 +vt 0.037923 0.955040 +vt 0.526701 0.583813 +vt 0.564197 0.396030 +vt 0.526701 0.396030 +vt 0.601692 0.583813 +vt 0.639188 0.396030 +vt 0.601692 0.396030 +vt 0.639188 0.593980 +vt 0.639188 0.583813 +vt 0.112886 0.955040 +vt 0.075404 0.116603 +vt 0.489206 0.396030 +vt 0.451711 0.396030 +vt 0.601692 0.365688 +vt 0.564197 0.385823 +vt 0.601692 0.593980 +vt 0.489206 0.583813 +vt 0.526701 0.593980 +vt 0.451711 0.593980 +vt 0.451711 0.583813 +vt 0.564197 0.583813 +vt 0.564197 0.593980 +vt 0.751674 0.593980 +vt 0.751674 0.583813 +vt 0.714295 0.751835 +vt 0.751857 0.842170 +vt 0.751857 0.751835 +vt 0.639545 0.842170 +vt 0.639545 0.751835 +vt 0.452109 0.751835 +vt 0.490047 0.842170 +vt 0.490047 0.751835 +vt 0.714179 0.365688 +vt 0.676683 0.385823 +vt 0.714179 0.385823 +vt 0.751674 0.365688 +vt 0.751674 0.385823 +vt 0.375256 0.959827 +vt 0.337775 0.999948 +vt 0.375256 0.999948 +vt 0.714179 0.619244 +vt 0.676356 0.751835 +vt 0.714295 0.842170 +vt 0.714179 0.396030 +vt 0.751674 0.396030 +vt 0.526858 0.842170 +vt 0.676356 0.842170 +vt 0.564197 0.619244 +vt 0.262812 0.999948 +vt 0.300293 0.959827 +vt 0.262812 0.959827 +vt 0.225330 0.999948 +vt 0.225330 0.959827 +vt 0.526701 0.365688 +vt 0.037923 0.959827 +vt 0.075404 0.999948 +vt 0.075404 0.959827 +vt 0.412738 0.999948 +vt 0.412738 0.959827 +vt 0.225330 0.955040 +vt 0.187849 0.116603 +vt 0.187849 0.955040 +vt 0.187849 0.999948 +vt 0.412738 0.955040 +vt 0.375256 0.116603 +vt 0.375256 0.955040 +vt 0.150367 0.955040 +vt 0.112886 0.116603 +vt 0.262812 0.955040 +vt 0.262812 0.116603 +vt 0.337775 0.116603 +vt 0.225330 0.116603 +vt 0.601692 0.619244 +vt 0.262812 0.101602 +vt 0.225330 0.101602 +vt 0.337775 0.101602 +vt 0.300293 0.101602 +vt 0.037923 0.101602 +vt 0.187849 0.101602 +vt 0.150367 0.116603 +vt 0.150367 0.101602 +vt 0.112886 0.101602 +vt 0.412738 0.101602 +vt 0.412738 0.116603 +vt 0.075404 0.101602 +vt 0.489206 0.619244 +vt 0.489206 0.593980 +vt 0.112886 0.999948 +vt 0.526701 0.619244 +vt 0.337775 0.959827 +vt 0.300293 0.999948 +vt 0.676683 0.365688 +vt 0.451711 0.365688 +vt 0.564197 0.365688 +vt 0.452109 0.842170 +vt 0.751674 0.619244 +vt 0.037923 0.999948 +vt 0.639188 0.619244 +vt 0.375256 0.101602 +vt 0.451711 0.619244 +vn -1.0000 -0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 -0.0000 1.0000 +vn 1.0000 0.0000 -0.0000 +vn -0.0003 -1.0000 -0.0082 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 -0.0000 +vn 0.0139 -0.7012 -0.7128 +vn 0.9998 -0.0004 0.0199 +vn -0.9998 0.0004 -0.0199 +vn 0.4226 0.9063 -0.0000 +vn -0.0142 -0.7129 0.7011 +vn 0.9511 0.3090 0.0000 +vn 0.5878 0.8090 0.0000 +vn -0.7071 0.0000 0.7071 +vn -0.9511 -0.3090 0.0000 +vn -0.9511 0.3090 0.0000 +vn -0.7071 0.7071 0.0000 +vn -0.7071 -0.7071 -0.0000 +vn 0.7071 -0.7071 0.0000 +vn 0.9511 -0.3090 0.0000 +vn 0.5878 -0.8090 -0.0000 +vn 0.7071 0.7071 -0.0000 +vn -0.2750 0.2750 0.9213 +vn -0.3889 0.0000 0.9213 +vn 0.3293 -0.3293 -0.8850 +vn -0.0000 -0.4657 -0.8850 +vn -0.0000 0.3889 0.9213 +vn 0.2750 -0.2750 0.9213 +vn 0.3889 0.0000 0.9213 +vn -0.0000 -0.3889 0.9213 +vn 0.2750 0.2750 0.9213 +vn -0.2750 -0.2750 0.9213 +vn 0.7071 0.0000 -0.7071 +vn 0.7071 0.0000 0.7071 +vn -0.7071 0.0000 -0.7071 +vn -0.5878 -0.8090 0.0000 +vn 0.3293 0.3293 -0.8850 +vn 0.4657 -0.0000 -0.8850 +vn -0.3293 0.3293 -0.8850 +vn 0.0000 0.4657 -0.8850 +vn -0.3292 -0.3293 -0.8850 +vn -0.4657 0.0000 -0.8850 +vn -0.5878 0.8090 0.0000 +vn -0.5676 0.1844 0.8024 +vn -0.5676 -0.1844 0.8024 +vn -0.5675 0.1844 0.8024 +vn -0.3293 -0.3293 -0.8850 +vn -0.3556 0.1155 -0.9275 +vn -0.2198 0.3025 -0.9275 +vn -0.2197 0.3025 -0.9275 +vn 0.0000 0.3739 -0.9275 +vn -0.2197 -0.3025 -0.9275 +vn -0.3556 -0.1155 -0.9275 +vn 0.2197 -0.3025 -0.9275 +vn -0.0000 -0.3739 -0.9275 +vn 0.2198 0.3025 -0.9275 +vn 0.3556 0.1155 -0.9275 +vn 0.3556 -0.1155 -0.9275 +vn 0.5676 -0.1844 0.8024 +vn 0.5676 0.1844 0.8024 +vn 0.3508 0.4828 0.8024 +vn -0.0000 0.5968 0.8024 +vn -0.3508 0.4828 0.8024 +vn -0.0000 -0.5968 0.8024 +vn 0.3508 -0.4828 0.8024 +vn -0.3508 -0.4828 0.8024 +s off +f 182/57/25 124/58/25 125/59/25 +f 106/60/25 103/61/25 104/62/25 +f 99/63/26 105/64/26 106/65/26 +f 104/62/27 100/66/27 102/67/27 +f 187/68/28 190/69/28 188/70/28 +f 109/71/29 110/72/29 111/73/29 +f 94/74/27 90/75/27 95/76/27 +f 102/67/28 101/77/28 99/63/28 +f 105/78/30 100/79/30 103/61/30 +f 184/80/31 189/81/31 187/68/31 +f 123/82/28 122/83/28 120/84/28 +f 25/85/26 29/86/26 31/87/26 +f 111/73/32 112/88/32 113/89/32 +f 117/90/33 107/91/33 113/92/33 +f 114/93/34 115/94/34 116/95/34 +f 117/90/33 118/96/33 119/97/33 +f 124/58/30 122/83/30 121/98/30 +f 31/99/25 30/100/25 28/101/25 +f 96/102/35 97/103/35 98/104/35 +f 125/105/27 121/98/27 123/106/27 +f 25/107/28 26/108/28 27/109/28 +f 30/100/30 27/109/30 26/108/30 +f 107/110/36 108/111/36 109/71/36 +f 185/112/25 186/113/25 183/114/25 +f 44/115/30 34/116/30 36/117/30 +f 184/80/26 188/118/26 186/119/26 +f 156/120/27 149/121/27 154/122/27 +f 110/123/34 108/124/34 179/125/34 +f 114/93/34 180/126/34 115/94/34 +f 110/123/34 179/125/34 112/127/34 +f 115/94/34 179/125/34 116/95/34 +f 109/128/33 111/129/33 107/91/33 +f 181/130/33 118/96/33 117/90/33 +f 107/91/33 111/129/33 113/92/33 +f 77/131/26 76/132/26 80/133/26 +f 171/134/26 159/135/26 170/136/26 +f 182/57/25 126/137/25 124/58/25 +f 106/60/25 105/78/25 103/61/25 +f 99/63/26 101/77/26 105/64/26 +f 104/62/27 103/61/27 100/66/27 +f 187/68/28 189/81/28 190/69/28 +f 109/71/29 108/111/29 110/72/29 +f 95/76/27 93/138/27 91/139/27 +f 91/139/27 89/140/27 94/74/27 +f 94/74/27 92/141/27 90/75/27 +f 90/75/27 82/142/27 95/76/27 +f 95/76/27 91/139/27 94/74/27 +f 102/67/28 100/66/28 101/77/28 +f 105/78/30 101/143/30 100/79/30 +f 184/80/31 185/112/31 189/81/31 +f 123/82/28 121/98/28 122/83/28 +f 25/85/26 27/109/26 29/86/26 +f 111/73/32 110/72/32 112/88/32 +f 117/90/33 119/97/33 107/91/33 +f 124/58/30 126/137/30 122/83/30 +f 31/99/25 29/86/25 30/100/25 +f 96/102/35 178/144/35 97/103/35 +f 125/105/27 124/58/27 121/98/27 +f 25/107/28 177/145/28 26/108/28 +f 30/100/30 29/86/30 27/109/30 +f 107/110/36 179/146/36 108/111/36 +f 185/112/25 184/80/25 186/113/25 +f 36/117/30 38/147/30 40/148/30 +f 40/148/30 42/149/30 44/115/30 +f 44/115/30 46/150/30 34/116/30 +f 34/116/30 33/151/30 36/117/30 +f 36/117/30 40/148/30 44/115/30 +f 184/80/26 187/68/26 188/118/26 +f 152/152/27 150/153/27 148/154/27 +f 148/154/27 157/155/27 156/120/27 +f 156/120/27 151/156/27 149/121/27 +f 149/121/27 155/157/27 154/122/27 +f 154/122/27 153/158/27 152/152/27 +f 152/152/27 148/154/27 154/122/27 +f 148/154/27 156/120/27 154/122/27 +f 115/94/34 112/127/34 179/125/34 +f 80/133/26 66/159/26 74/160/26 +f 74/160/26 78/161/26 77/131/26 +f 77/131/26 75/162/26 76/132/26 +f 76/132/26 79/163/26 80/133/26 +f 80/133/26 74/160/26 77/131/26 +f 170/136/26 176/164/26 169/165/26 +f 169/165/26 172/166/26 171/134/26 +f 171/134/26 175/167/26 159/135/26 +f 175/167/26 173/168/26 159/135/26 +f 173/168/26 160/169/26 159/135/26 +f 159/135/26 174/170/26 170/136/26 +f 170/136/26 169/165/26 171/134/26 +s 1 +f 169/171/37 162/172/38 164/173/37 +f 35/174/39 34/175/27 32/176/27 +f 134/177/40 131/178/41 132/179/41 +f 93/180/42 81/181/31 85/182/42 +f 76/183/25 61/184/43 60/185/25 +f 92/186/44 87/187/30 86/188/44 +f 37/189/25 33/190/39 35/174/39 +f 64/191/28 92/186/44 86/188/44 +f 165/192/45 169/171/37 164/173/37 +f 54/193/43 52/194/25 51/195/25 +f 140/196/46 137/197/30 138/198/30 +f 58/199/28 63/200/47 59/201/28 +f 71/202/31 50/203/42 48/204/31 +f 73/205/48 51/195/49 49/206/48 +f 49/206/42 52/194/25 50/203/42 +f 142/207/45 139/208/46 140/196/46 +f 57/209/50 87/187/51 55/210/51 +f 95/211/31 83/212/47 81/181/31 +f 72/213/52 49/206/48 71/202/52 +f 68/214/53 65/215/54 58/199/54 +f 69/216/55 68/214/53 56/217/55 +f 62/218/56 72/213/52 71/202/52 +f 62/218/56 65/215/54 67/219/56 +f 54/193/57 69/220/55 56/221/55 +f 43/222/58 40/223/26 41/224/26 +f 32/176/27 46/225/59 47/226/59 +f 41/227/26 38/228/60 39/229/60 +f 89/230/43 84/231/25 88/232/43 +f 94/233/30 88/232/43 87/234/30 +f 167/235/61 160/236/40 173/237/61 +f 75/238/43 69/220/30 61/184/43 +f 45/239/28 42/240/58 43/222/58 +f 63/200/62 64/191/63 59/201/63 +f 57/209/50 64/191/63 86/188/50 +f 50/203/64 81/181/65 48/204/65 +f 87/234/51 53/241/66 55/242/51 +f 52/194/67 85/182/64 50/203/64 +f 81/181/65 63/200/62 48/204/65 +f 51/195/49 61/184/57 54/193/57 +f 68/214/44 59/201/28 57/209/44 +f 39/229/60 36/243/25 37/189/25 +f 47/226/59 44/244/28 45/239/28 +f 66/245/47 72/213/31 67/219/47 +f 174/246/68 161/247/41 144/248/68 +f 170/249/31 144/248/68 163/250/31 +f 83/212/47 90/251/28 64/191/28 +f 168/252/30 171/253/46 166/254/46 +f 167/235/61 175/255/30 168/256/30 +f 127/257/31 146/258/38 147/259/38 +f 68/214/44 55/210/30 56/217/30 +f 176/260/38 163/250/31 162/172/38 +f 138/261/30 135/262/61 136/263/61 +f 145/264/37 141/265/45 142/207/45 +f 71/202/31 63/200/47 62/218/47 +f 130/266/68 131/178/41 128/267/68 +f 56/221/30 53/241/43 54/193/43 +f 161/247/69 134/177/70 132/179/71 +f 136/263/61 133/268/40 134/177/40 +f 130/266/68 129/269/31 127/257/31 +f 88/232/72 52/194/67 53/241/66 +f 80/270/31 73/205/42 72/213/31 +f 131/178/73 156/271/74 128/267/75 +f 128/267/75 157/272/76 129/269/76 +f 135/262/77 149/273/78 133/268/78 +f 133/268/78 151/274/73 131/178/73 +f 139/208/79 154/275/80 137/197/80 +f 148/276/81 143/277/82 146/258/81 +f 157/272/76 146/258/81 129/269/76 +f 141/265/83 150/278/82 152/279/83 +f 154/280/80 135/262/77 137/281/80 +f 73/205/42 76/183/25 60/185/25 +f 165/192/84 145/264/85 142/207/84 +f 147/259/86 164/173/85 162/172/86 +f 127/257/87 144/248/88 130/266/88 +f 139/208/79 152/279/83 153/282/79 +f 168/252/89 140/196/90 138/198/89 +f 130/266/88 161/247/69 132/179/71 +f 136/263/91 168/256/89 138/261/89 +f 134/177/70 167/235/91 136/263/91 +f 166/254/90 142/207/84 140/196/90 +f 69/216/30 78/283/44 70/284/44 +f 147/259/38 143/277/37 145/264/37 +f 166/254/46 172/285/45 165/192/45 +f 74/286/28 67/219/47 65/215/28 +f 158/287/40 159/288/41 160/236/40 +f 78/283/44 65/215/28 70/284/44 +f 91/289/25 85/182/42 84/231/25 +f 127/257/87 162/172/86 163/250/87 +f 169/171/37 176/260/38 162/172/38 +f 35/174/39 33/190/39 34/175/27 +f 134/177/40 133/268/40 131/178/41 +f 93/180/42 95/211/31 81/181/31 +f 76/183/25 75/238/43 61/184/43 +f 92/186/44 94/290/30 87/187/30 +f 37/189/25 36/243/25 33/190/39 +f 64/191/28 90/251/28 92/186/44 +f 165/192/45 172/285/45 169/171/37 +f 54/193/43 53/241/43 52/194/25 +f 140/196/46 139/208/46 137/197/30 +f 58/199/28 62/218/47 63/200/47 +f 71/202/31 49/206/42 50/203/42 +f 73/205/48 60/185/49 51/195/49 +f 49/206/42 51/195/25 52/194/25 +f 142/207/45 141/265/45 139/208/46 +f 57/209/50 86/188/50 87/187/51 +f 95/211/31 82/291/47 83/212/47 +f 72/213/52 73/205/48 49/206/48 +f 68/214/53 70/284/53 65/215/54 +f 69/216/55 70/284/53 68/214/53 +f 62/218/56 67/219/56 72/213/52 +f 62/218/56 58/199/54 65/215/54 +f 54/193/57 61/184/57 69/220/55 +f 43/222/58 42/240/58 40/223/26 +f 32/176/27 34/175/27 46/225/59 +f 41/227/26 40/292/26 38/228/60 +f 89/230/43 91/289/25 84/231/25 +f 94/233/30 89/230/43 88/232/43 +f 167/235/61 158/287/40 160/236/40 +f 75/238/43 77/293/30 69/220/30 +f 45/239/28 44/244/28 42/240/58 +f 63/200/62 83/212/62 64/191/63 +f 57/209/50 59/201/63 64/191/63 +f 50/203/64 85/182/64 81/181/65 +f 87/234/51 88/232/72 53/241/66 +f 52/194/67 84/231/67 85/182/64 +f 81/181/65 83/212/62 63/200/62 +f 51/195/49 60/185/49 61/184/57 +f 68/214/44 58/199/28 59/201/28 +f 39/229/60 38/228/60 36/243/25 +f 47/226/59 46/225/59 44/244/28 +f 66/245/47 80/270/31 72/213/31 +f 174/246/68 159/288/41 161/247/41 +f 170/249/31 174/246/68 144/248/68 +f 83/212/47 82/291/47 90/251/28 +f 168/252/30 175/294/30 171/253/46 +f 167/235/61 173/237/61 175/255/30 +f 127/257/31 129/269/31 146/258/38 +f 68/214/44 57/209/44 55/210/30 +f 176/260/38 170/249/31 163/250/31 +f 138/261/30 137/281/30 135/262/61 +f 145/264/37 143/277/37 141/265/45 +f 71/202/31 48/204/31 63/200/47 +f 130/266/68 132/179/41 131/178/41 +f 56/221/30 55/242/30 53/241/43 +f 161/247/69 158/287/70 134/177/70 +f 136/263/61 135/262/61 133/268/40 +f 130/266/68 128/267/68 129/269/31 +f 88/232/72 84/231/67 52/194/67 +f 80/270/31 79/295/42 73/205/42 +f 131/178/73 151/274/73 156/271/74 +f 128/267/75 156/271/74 157/272/76 +f 135/262/77 155/296/77 149/273/78 +f 133/268/78 149/273/78 151/274/73 +f 139/208/79 153/282/79 154/275/80 +f 148/276/81 150/278/82 143/277/82 +f 157/272/76 148/276/81 146/258/81 +f 141/265/83 143/277/82 150/278/82 +f 154/280/80 155/296/77 135/262/77 +f 73/205/42 79/295/42 76/183/25 +f 165/192/84 164/173/85 145/264/85 +f 147/259/86 145/264/85 164/173/85 +f 127/257/87 163/250/87 144/248/88 +f 139/208/79 141/265/83 152/279/83 +f 168/252/89 166/254/90 140/196/90 +f 130/266/88 144/248/88 161/247/69 +f 136/263/91 167/235/91 168/256/89 +f 134/177/70 158/287/70 167/235/91 +f 166/254/90 165/192/84 142/207/84 +f 69/216/30 77/297/30 78/283/44 +f 147/259/38 146/258/38 143/277/37 +f 166/254/46 171/253/46 172/285/45 +f 74/286/28 66/245/47 67/219/47 +f 158/287/40 161/247/41 159/288/41 +f 78/283/44 74/286/28 65/215/28 +f 91/289/25 93/180/42 85/182/42 +f 127/257/87 147/259/86 162/172/86 diff --git a/src/main/resources/assets/hbm/textures/misc/overlay_misc.png b/src/main/resources/assets/hbm/textures/misc/overlay_misc.png index 423b33845..4162b065c 100644 Binary files a/src/main/resources/assets/hbm/textures/misc/overlay_misc.png and b/src/main/resources/assets/hbm/textures/misc/overlay_misc.png differ