From ab1c6b2d81ac0627eb34f173952cc9f7b1b00df8 Mon Sep 17 00:00:00 2001 From: Boblet Date: Tue, 11 Jan 2022 17:00:37 +0100 Subject: [PATCH] this one will hurt a lot obvious errors in this one, don't try to build it lmao --- .../com/hbm/handler/FluidTypeHandler.java | 199 ++-- .../java/com/hbm/inventory/FluidTank.java | 2 +- .../com/hbm/inventory/fluid/FluidType.java | 1 + .../hbm/inventory/gui/GUIReactorZirnox.java | 64 +- .../tileentity/machine/TileEntityBarrel.java | 4 +- .../machine/TileEntityMachineBAT9000.java | 3 +- .../machine/TileEntityMachineFluidTank.java | 2 +- .../assets/hbm/models/blocks/barbed_wire.obj | 868 +++++++++++------- 8 files changed, 668 insertions(+), 475 deletions(-) diff --git a/src/main/java/com/hbm/handler/FluidTypeHandler.java b/src/main/java/com/hbm/handler/FluidTypeHandler.java index d9050065a..8f2a75486 100644 --- a/src/main/java/com/hbm/handler/FluidTypeHandler.java +++ b/src/main/java/com/hbm/handler/FluidTypeHandler.java @@ -5,101 +5,99 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import com.hbm.inventory.fluid.FluidType.FluidTrait; +import com.hbm.inventory.fluid.Fluids; import com.hbm.render.util.EnumSymbol; public class FluidTypeHandler { - public static enum FluidTrait { - AMAT, - CORROSIVE, - CORROSIVE_2, - LEAD_CONTAINER, - NO_CONTAINER, - NO_ID; - } - - public static enum FluidType { - NONE (0x888888, 0, 1, 1, 0, 0, 0, EnumSymbol.NONE, "hbmfluid.none"), + @Deprecated //you might spot this deprecated annotation and thing "oh goodie, that's something for me to remove and replace!" + //no. + //if you tough any of this i promise you will regret being born + //deprecated means "avoid using in the future" not "fuck with this with your heart's content" + //hands off. if you can read this, close this class now. + public static class FluidType extends com.hbm.inventory.fluid.FluidType { + public static FluidType NONE = new FluidType (0x888888, 0, 1, 1, 0, 0, 0, EnumSymbol.NONE, "hbmfluid.none"), - WATER (0x3333FF, 1, 1, 1, 0, 0, 0, EnumSymbol.NONE, "hbmfluid.water"), - STEAM (0xe5e5e5, 9, 2, 1, 3, 0, 0, EnumSymbol.NONE, "hbmfluid.steam", 100), - HOTSTEAM (0xE7D6D6, 1, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.hotsteam", 300), - SUPERHOTSTEAM (0xE7B7B7, 2, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.superhotsteam", 450), - ULTRAHOTSTEAM (0xE39393, 13, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.ultrahotsteam", 600), - COOLANT (0xd8fcff, 2, 1, 1, 1, 0, 0, EnumSymbol.NONE, "hbmfluid.coolant"), + WATER = new FluidType (0x3333FF, 1, 1, 1, 0, 0, 0, EnumSymbol.NONE, "hbmfluid.water"), + STEAM = new FluidType (0xe5e5e5, 9, 2, 1, 3, 0, 0, EnumSymbol.NONE, "hbmfluid.steam", 100), + HOTSTEAM = new FluidType (0xE7D6D6, 1, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.hotsteam", 300), + SUPERHOTSTEAM = new FluidType (0xE7B7B7, 2, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.superhotsteam", 450), + ULTRAHOTSTEAM = new FluidType (0xE39393, 13, 1, 2, 4, 0, 0, EnumSymbol.NONE, "hbmfluid.ultrahotsteam", 600), + COOLANT = new FluidType (0xd8fcff, 2, 1, 1, 1, 0, 0, EnumSymbol.NONE, "hbmfluid.coolant"), - LAVA (0xFF3300, 3, 1, 1, 4, 0, 0, EnumSymbol.NOWATER, "hbmfluid.lava", 1200), + LAVA = new FluidType (0xFF3300, 3, 1, 1, 4, 0, 0, EnumSymbol.NOWATER, "hbmfluid.lava", 1200), - DEUTERIUM (0x0000FF, 4, 1, 1, 3, 4, 0, EnumSymbol.NONE, "hbmfluid.deuterium"), - TRITIUM (0x000099, 5, 1, 1, 3, 4, 0, EnumSymbol.RADIATION, "hbmfluid.tritium"), + DEUTERIUM = new FluidType (0x0000FF, 4, 1, 1, 3, 4, 0, EnumSymbol.NONE, "hbmfluid.deuterium"), + TRITIUM = new FluidType (0x000099, 5, 1, 1, 3, 4, 0, EnumSymbol.RADIATION, "hbmfluid.tritium"), - OIL (0x020202, 6, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.oil"), - HOTOIL (0x300900, 8, 2, 1, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.hotoil", 350), + OIL = new FluidType (0x020202, 6, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.oil"), + HOTOIL = new FluidType (0x300900, 8, 2, 1, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.hotoil", 350), - HEAVYOIL (0x141312, 2, 2, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.heavyoil"), - BITUMEN (0x1f2426, 3, 2, 1, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.bitumen"), - SMEAR (0x190f01, 7, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.smear"), - HEATINGOIL (0x211806, 4, 2, 1, 2, 2, 0, EnumSymbol.NONE, "hbmfluid.heatingoil"), + HEAVYOIL = new FluidType (0x141312, 2, 2, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.heavyoil"), + BITUMEN = new FluidType (0x1f2426, 3, 2, 1, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.bitumen"), + SMEAR = new FluidType (0x190f01, 7, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.smear"), + HEATINGOIL = new FluidType (0x211806, 4, 2, 1, 2, 2, 0, EnumSymbol.NONE, "hbmfluid.heatingoil"), - RECLAIMED (0x332b22, 8, 1, 1, 2, 2, 0, EnumSymbol.NONE, "hbmfluid.reclaimed"), - PETROIL (0x44413d, 9, 1, 1, 1, 3, 0, EnumSymbol.NONE, "hbmfluid.petroil"), + RECLAIMED = new FluidType (0x332b22, 8, 1, 1, 2, 2, 0, EnumSymbol.NONE, "hbmfluid.reclaimed"), + PETROIL = new FluidType (0x44413d, 9, 1, 1, 1, 3, 0, EnumSymbol.NONE, "hbmfluid.petroil"), - LUBRICANT (0x606060, 10, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.lubricant"), + LUBRICANT = new FluidType (0x606060, 10, 1, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.lubricant"), - NAPHTHA (0x595744, 5, 2, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.naphtha"), - DIESEL (0xf2eed5, 11, 1, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.diesel"), + NAPHTHA = new FluidType (0x595744, 5, 2, 1, 2, 1, 0, EnumSymbol.NONE, "hbmfluid.naphtha"), + DIESEL = new FluidType (0xf2eed5, 11, 1, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.diesel"), - LIGHTOIL (0x8c7451, 6, 2, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.lightoil"), - KEROSENE (0xffa5d2, 12, 1, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.kerosene"), + LIGHTOIL = new FluidType (0x8c7451, 6, 2, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.lightoil"), + KEROSENE = new FluidType (0xffa5d2, 12, 1, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.kerosene"), - GAS (0xfffeed, 13, 1, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.gas"), - PETROLEUM (0x7cb7c9, 7, 2, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.petroleum"), - LPG (0x4747EA, 5, 2, 2, 1, 3, 1, EnumSymbol.NONE, "hbmfluid.lpg"), + GAS = new FluidType (0xfffeed, 13, 1, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.gas"), + PETROLEUM = new FluidType (0x7cb7c9, 7, 2, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.petroleum"), + LPG = new FluidType (0x4747EA, 5, 2, 2, 1, 3, 1, EnumSymbol.NONE, "hbmfluid.lpg"), - BIOGAS (0xbfd37c, 12, 2, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.biogas"), - BIOFUEL (0xeef274, 13, 2, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.biofuel"), + BIOGAS = new FluidType (0xbfd37c, 12, 2, 1, 1, 4, 1, EnumSymbol.NONE, "hbmfluid.biogas"), + BIOFUEL = new FluidType (0xeef274, 13, 2, 1, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.biofuel"), - NITAN (0x8018ad, 15, 2, 1, 2, 4, 1, EnumSymbol.NONE, "hbmfluid.nitan"), + NITAN = new FluidType (0x8018ad, 15, 2, 1, 2, 4, 1, EnumSymbol.NONE, "hbmfluid.nitan"), - UF6 (0xD1CEBE, 14, 1, 1, 4, 0, 2, EnumSymbol.RADIATION, "hbmfluid.uf6", FluidTrait.CORROSIVE), - PUF6 (0x4C4C4C, 15, 1, 1, 4, 0, 4, EnumSymbol.RADIATION, "hbmfluid.puf6", FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER), - SAS3 (0x4ffffc, 14, 2, 1, 5, 0, 4, EnumSymbol.RADIATION, "hbmfluid.sas3", FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER), - SCHRABIDIC (0x006B6B, 14, 1, 2, 5, 0, 5, EnumSymbol.ACID, "hbmfluid.schrabidic", FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER), + UF6 = new FluidType (0xD1CEBE, 14, 1, 1, 4, 0, 2, EnumSymbol.RADIATION, "hbmfluid.uf6", FluidTrait.CORROSIVE), + PUF6 = new FluidType (0x4C4C4C, 15, 1, 1, 4, 0, 4, EnumSymbol.RADIATION, "hbmfluid.puf6", FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER), + SAS3 = new FluidType (0x4ffffc, 14, 2, 1, 5, 0, 4, EnumSymbol.RADIATION, "hbmfluid.sas3", FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER), + SCHRABIDIC = new FluidType (0x006B6B, 14, 1, 2, 5, 0, 5, EnumSymbol.ACID, "hbmfluid.schrabidic", FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER), - AMAT (0x010101, 0, 2, 1, 5, 0, 5, EnumSymbol.ANTIMATTER, "hbmfluid.amat", FluidTrait.AMAT), - ASCHRAB (0xb50000, 1, 2, 1, 5, 0, 5, EnumSymbol.ANTIMATTER, "hbmfluid.aschrab", FluidTrait.AMAT), + AMAT = new FluidType (0x010101, 0, 2, 1, 5, 0, 5, EnumSymbol.ANTIMATTER, "hbmfluid.amat", FluidTrait.AMAT), + ASCHRAB = new FluidType (0xb50000, 1, 2, 1, 5, 0, 5, EnumSymbol.ANTIMATTER, "hbmfluid.aschrab", FluidTrait.AMAT), - ACID (0xfff7aa, 10, 2, 1, 3, 0, 3, EnumSymbol.OXIDIZER, "hbmfluid.acid", FluidTrait.CORROSIVE), - WATZ (0x86653E, 11, 2, 1, 4, 0, 3, EnumSymbol.ACID, "hbmfluid.watz", FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER), - CRYOGEL (0x32ffff, 0, 1, 2, 2, 0, 0, EnumSymbol.CROYGENIC, "hbmfluid.cryogel", -170), + ACID = new FluidType (0xfff7aa, 10, 2, 1, 3, 0, 3, EnumSymbol.OXIDIZER, "hbmfluid.acid", FluidTrait.CORROSIVE), + WATZ = new FluidType (0x86653E, 11, 2, 1, 4, 0, 3, EnumSymbol.ACID, "hbmfluid.watz", FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER), + CRYOGEL = new FluidType (0x32ffff, 0, 1, 2, 2, 0, 0, EnumSymbol.CROYGENIC, "hbmfluid.cryogel", -170), - HYDROGEN (0x4286f4, 3, 1, 2, 3, 4, 0, EnumSymbol.CROYGENIC, "hbmfluid.hydrogen"), - OXYGEN (0x98bdf9, 4, 1, 2, 3, 0, 0, EnumSymbol.CROYGENIC, "hbmfluid.oxygen"), - XENON (0xba45e8, 5, 1, 2, 0, 0, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.xenon"), - BALEFIRE (0x28e02e, 6, 1, 2, 4, 4, 3, EnumSymbol.RADIATION, "hbmfluid.balefire", 1500, FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER), + HYDROGEN = new FluidType (0x4286f4, 3, 1, 2, 3, 4, 0, EnumSymbol.CROYGENIC, "hbmfluid.hydrogen"), + OXYGEN = new FluidType (0x98bdf9, 4, 1, 2, 3, 0, 0, EnumSymbol.CROYGENIC, "hbmfluid.oxygen"), + XENON = new FluidType (0xba45e8, 5, 1, 2, 0, 0, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.xenon"), + BALEFIRE = new FluidType (0x28e02e, 6, 1, 2, 4, 4, 3, EnumSymbol.RADIATION, "hbmfluid.balefire", 1500, FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER), - MERCURY (0x808080, 7, 1, 2, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.mercury"), - PAIN (0x938541, 15, 1, 2, 2, 0, 1, EnumSymbol.ACID, "hbmfluid.pain", 300, FluidTrait.CORROSIVE), + MERCURY = new FluidType (0x808080, 7, 1, 2, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.mercury"), + PAIN = new FluidType (0x938541, 15, 1, 2, 2, 0, 1, EnumSymbol.ACID, "hbmfluid.pain", 300, FluidTrait.CORROSIVE), - WASTEFLUID (0x544400, 0, 2, 2, 2, 0, 1, EnumSymbol.RADIATION, "hbmfluid.wastefluid", FluidTrait.LEAD_CONTAINER), - WASTEGAS (0xB8B8B8, 1, 2, 2, 2, 0, 1, EnumSymbol.RADIATION, "hbmfluid.wastegas", FluidTrait.LEAD_CONTAINER), + WASTEFLUID = new FluidType (0x544400, 0, 2, 2, 2, 0, 1, EnumSymbol.RADIATION, "hbmfluid.wastefluid", FluidTrait.LEAD_CONTAINER), + WASTEGAS = new FluidType (0xB8B8B8, 1, 2, 2, 2, 0, 1, EnumSymbol.RADIATION, "hbmfluid.wastegas", FluidTrait.LEAD_CONTAINER), - GASOLINE (0x445772, 2, 2, 2, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.gasoline"), - SPENTSTEAM (0x445772, 3, 2, 2, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.spentsteam"), - FRACKSOL (0x798A6B, 4, 2, 2, 1, 3, 3, EnumSymbol.ACID, "hbmfluid.fracksol", FluidTrait.CORROSIVE), + GASOLINE = new FluidType (0x445772, 2, 2, 2, 1, 2, 0, EnumSymbol.NONE, "hbmfluid.gasoline"), + SPENTSTEAM = new FluidType (0x445772, 3, 2, 2, 2, 0, 0, EnumSymbol.NONE, "hbmfluid.spentsteam"), + FRACKSOL = new FluidType (0x798A6B, 4, 2, 2, 1, 3, 3, EnumSymbol.ACID, "hbmfluid.fracksol", FluidTrait.CORROSIVE), - PLASMA_DT (0xF7AFDE, 8, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_dt", 3250, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), - PLASMA_HD (0xF0ADF4, 9, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_hd", 2500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), - PLASMA_HT (0xD1ABF2, 10, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_ht", 3000, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), - PLASMA_XM (0xC6A5FF, 11, 1, 2, 0, 4, 1, EnumSymbol.RADIATION, "hbmfluid.plasma_xm", 4250, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), - PLASMA_BF (0xA7F1A3, 12, 1, 2, 4, 5, 4, EnumSymbol.ANTIMATTER, "hbmfluid.plasma_bf", 8500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), - PLASMA_DH3 (0xFF83AA, 6, 2, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_dh3", 3480, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), + PLASMA_DT = new FluidType (0xF7AFDE, 8, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_dt", 3250, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), + PLASMA_HD = new FluidType (0xF0ADF4, 9, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_hd", 2500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), + PLASMA_HT = new FluidType (0xD1ABF2, 10, 1, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_ht", 3000, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), + PLASMA_XM = new FluidType (0xC6A5FF, 11, 1, 2, 0, 4, 1, EnumSymbol.RADIATION, "hbmfluid.plasma_xm", 4250, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), + PLASMA_BF = new FluidType (0xA7F1A3, 12, 1, 2, 4, 5, 4, EnumSymbol.ANTIMATTER, "hbmfluid.plasma_bf", 8500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), + PLASMA_DH3 = new FluidType (0xFF83AA, 6, 2, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_dh3", 3480, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID), - HELIUM3 (0xFCF0C4, 7, 2, 2, 3, 4, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.helium3"), - DEATH (0x717A88, 8, 2, 2, 2, 0, 1, EnumSymbol.ACID, "hbmfluid.death", 300, FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER), - ETHANOL (0xe0ffff, 9, 2, 2, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.ethanol"), - HEAVYWATER (0x00a0b0, 10, 2, 2, 1, 0, 0, EnumSymbol.NONE, "hbmfluid.heavywater"), - CARBONDIOXIDE (0x747474, 11, 2, 2, 3, 0, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.carbondioxide"); + HELIUM3 = new FluidType (0xFCF0C4, 7, 2, 2, 3, 4, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.helium3"), + DEATH = new FluidType (0x717A88, 8, 2, 2, 2, 0, 1, EnumSymbol.ACID, "hbmfluid.death", 300, FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER), + ETHANOL = new FluidType (0xe0ffff, 9, 2, 2, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.ethanol"), + HEAVYWATER = new FluidType (0x00a0b0, 10, 2, 2, 1, 0, 0, EnumSymbol.NONE, "hbmfluid.heavywater"), + CARBONDIOXIDE = new FluidType (0x747474, 11, 2, 2, 3, 0, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.carbondioxide"); //Approximate HEX Color of the fluid, used for pipe rendering private int color; @@ -138,36 +136,11 @@ public class FluidTypeHandler { } private FluidType(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, int temperature, FluidTrait... traits) { - this.color = color; - this.textureX = x; - this.textureY = y; - this.name = name; - this.sheetID = sheet; - this.poison = p; - this.flammability = f; - this.reactivity = r; - this.symbol = symbol; - this.temperature = temperature; - Collections.addAll(this.traits, traits); + super(color, x, y, sheet, p, f, r, symbol, name, temperature, traits); } - - public int getColor() { - return this.color; - } - public int getMSAColor() { - return this.color; - } - public int textureX() { - return this.textureX; - } - public int textureY() { - return this.textureY; - } - public int getSheetID() { - return this.sheetID; - } - public String getUnlocalizedName() { - return this.name; + + public static com.hbm.inventory.fluid.FluidType[] values() { + return Fluids.metaOrder.toArray(new com.hbm.inventory.fluid.FluidType[0]); } public static FluidType getEnum(int i) { @@ -186,36 +159,8 @@ public class FluidTypeHandler { return FluidType.NONE; } - public int getID() { - return Arrays.asList(FluidType.values()).indexOf(this); - } - - public String getName() { - return this.toString(); - } - - public boolean isHot() { - return this.temperature >= 100; - } - - public boolean isCorrosive() { - return this.traits.contains(FluidTrait.CORROSIVE) || this.traits.contains(FluidTrait.CORROSIVE_2); - } - - public boolean isAntimatter() { - return this.traits.contains(FluidTrait.AMAT); - } - - public boolean hasNoContainer() { - return this.traits.contains(FluidTrait.NO_CONTAINER); - } - public boolean needsLeadContainer() { return this.traits.contains(FluidTrait.LEAD_CONTAINER); } - - public boolean hasNoID() { - return this.traits.contains(FluidTrait.NO_ID); - } }; } diff --git a/src/main/java/com/hbm/inventory/FluidTank.java b/src/main/java/com/hbm/inventory/FluidTank.java index 9d0bd3f3d..8f2178174 100644 --- a/src/main/java/com/hbm/inventory/FluidTank.java +++ b/src/main/java/com/hbm/inventory/FluidTank.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.List; import com.hbm.handler.ArmorModHandler; -import com.hbm.handler.FluidTypeHandler.FluidTrait; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IPartiallyFillable; +import com.hbm.inventory.fluid.FluidType.FluidTrait; import com.hbm.inventory.gui.GuiInfoContainer; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemFluidIdentifier; diff --git a/src/main/java/com/hbm/inventory/fluid/FluidType.java b/src/main/java/com/hbm/inventory/fluid/FluidType.java index e0958616f..597bb10f1 100644 --- a/src/main/java/com/hbm/inventory/fluid/FluidType.java +++ b/src/main/java/com/hbm/inventory/fluid/FluidType.java @@ -115,6 +115,7 @@ public class FluidType { CORROSIVE, CORROSIVE_2, NO_CONTAINER, + LEAD_CONTAINER, NO_ID; } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIReactorZirnox.java b/src/main/java/com/hbm/inventory/gui/GUIReactorZirnox.java index a85f81984..77dd185a1 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIReactorZirnox.java +++ b/src/main/java/com/hbm/inventory/gui/GUIReactorZirnox.java @@ -4,7 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerReactorZirnox; import com.hbm.lib.RefStrings; -import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.NBTControlPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.tileentity.machine.TileEntityReactorZirnox; @@ -17,8 +16,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; public class GUIReactorZirnox extends GuiInfoContainer { - - //fuck you + + // fuck you private static final ResourceLocation texture = new ResourceLocation(RefStrings.MODID, "textures/gui/reactors/gui_zirnox.png"); private TileEntityReactorZirnox zirnox; @@ -43,45 +42,40 @@ public class GUIReactorZirnox extends GuiInfoContainer { String[] info = new String[] { "CO2 transfers heat from the core", "to the water. This will boil", "the water into steam.", "Water Consumption Rate:", "100 mB/t", "2000 mB/s" }; this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36, 16, 16, guiLeft - 8, guiTop + 36 + 16, info); - String[] info2 = new String[] { "Pressure can be reduced by", - "reducing the amount of CO2", - "in the reactor." }; + String[] info2 = new String[] { "Pressure can be reduced by", "reducing the amount of CO2", "in the reactor." }; this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 16, 16, 16, guiLeft - 8, guiTop + 36 + 16, info2); if(zirnox.water.getFill() <= 0) { - String[] warn1 = new String[] { "Error: Water is required for", - "the reactor to function properly!" }; + String[] warn1 = new String[] { "Error: Water is required for", "the reactor to function properly!" }; this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 32, 16, 16, guiLeft - 8, guiTop + 36 + 32 + 16, warn1); } if(zirnox.carbonDioxide.getFill() < 4000) { - String[] warn2 = new String[] { "Error: CO2 is required for", - "the reactor to function properly!" }; + String[] warn2 = new String[] { "Error: CO2 is required for", "the reactor to function properly!" }; this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 32 + 16, 16, 16, guiLeft - 8, guiTop + 36 + 32 + 16, warn2); } } protected void mouseClicked(int x, int y, int i) { - super.mouseClicked(x, y, i); - + super.mouseClicked(x, y, i); + NBTTagCompound control = new NBTTagCompound(); + if(guiLeft + 144 <= x && guiLeft + 144 + 14 > x && guiTop + 35 < y && guiTop + 35 + 14 >= y) { + control.setBoolean("control", true); - if(guiLeft + 144 <= x && guiLeft + 144 + 14 > x && guiTop + 35 < y && guiTop + 35 + 14 >= y) { - control.setBoolean("control", true); - - PacketDispatcher.wrapper.sendToServer(new NBTControlPacket(control, zirnox.xCoord, zirnox.yCoord, zirnox.zCoord)); - mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("hbm:block.rbmk_az5_cover"), 0.5F)); - } - - if(guiLeft + 151 <= x && guiLeft + 151 + 36 > x && guiTop + 51 < y && guiTop + 51 + 36 >= y) { - control.setBoolean("vent", true); //sus impostre like amogus - PacketDispatcher.wrapper.sendToServer(new NBTControlPacket(control, zirnox.xCoord, zirnox.yCoord, zirnox.zCoord)); mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("hbm:block.rbmk_az5_cover"), 0.5F)); } - } + + if(guiLeft + 151 <= x && guiLeft + 151 + 36 > x && guiTop + 51 < y && guiTop + 51 + 36 >= y) { + control.setBoolean("vent", true); // sus impostre like amogus + + PacketDispatcher.wrapper.sendToServer(new NBTControlPacket(control, zirnox.xCoord, zirnox.yCoord, zirnox.zCoord)); + mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("hbm:block.rbmk_az5_cover"), 0.5F)); + } + } @Override protected void drawGuiContainerForegroundLayer(int i, int j) { @@ -101,25 +95,25 @@ public class GUIReactorZirnox extends GuiInfoContainer { drawTexturedModalRect(guiLeft + 160, guiTop + 108, 238, 0 + 12 * s, 18, 12); int c = zirnox.getGaugeScaled(6, 1); - drawTexturedModalRect(guiLeft + 142, guiTop + 108, 238, 0 + 12 * c, 18, 12); + drawTexturedModalRect(guiLeft + 142, guiTop + 108, 238, 0 + 12 * c, 18, 12); int w = zirnox.getGaugeScaled(6, 2); - drawTexturedModalRect(guiLeft + 178, guiTop + 108, 238, 0 + 12 * w, 18, 12); + drawTexturedModalRect(guiLeft + 178, guiTop + 108, 238, 0 + 12 * w, 18, 12); - int h = zirnox.getGaugeScaled(12, 3); - drawTexturedModalRect(guiLeft + 160, guiTop + 33, 220, 0 + 18 * h, 18, 17); + int h = zirnox.getGaugeScaled(12, 3); + drawTexturedModalRect(guiLeft + 160, guiTop + 33, 220, 0 + 18 * h, 18, 17); int p = zirnox.getGaugeScaled(12, 4); - drawTexturedModalRect(guiLeft + 178, guiTop + 33, 220, 0 + 18 * p, 18, 17); + drawTexturedModalRect(guiLeft + 178, guiTop + 33, 220, 0 + 18 * p, 18, 17); if(zirnox.isOn) { - for(int x = 0; x < 4; x++) - for(int y = 0; y < 4; y++) - drawTexturedModalRect(guiLeft + 7 + 36 * x, guiTop + 15 + 36 * y, 238, 238, 18, 18); - for(int x = 0; x < 3; x++) - for(int y = 0; y < 3; y++) - drawTexturedModalRect(guiLeft + 25 + 36 * x, guiTop + 33 + 36 * y, 238, 238, 18, 18); - drawTexturedModalRect(guiLeft + 142, guiTop + 15, 220, 238, 18, 18); + for(int x = 0; x < 4; x++) + for(int y = 0; y < 4; y++) + drawTexturedModalRect(guiLeft + 7 + 36 * x, guiTop + 15 + 36 * y, 238, 238, 18, 18); + for(int x = 0; x < 3; x++) + for(int y = 0; y < 3; y++) + drawTexturedModalRect(guiLeft + 25 + 36 * x, guiTop + 33 + 36 * y, 238, 238, 18, 18); + drawTexturedModalRect(guiLeft + 142, guiTop + 15, 220, 238, 18, 18); } this.drawInfoPanel(guiLeft - 16, guiTop + 36, 16, 16, 2); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java b/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java index a3934438d..c042c3e7a 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java @@ -4,11 +4,11 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.handler.FluidTypeHandler.FluidTrait; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType.FluidTrait; import com.hbm.lib.Library; import com.hbm.main.ModEventHandler; import com.hbm.tileentity.TileEntityMachineBase; @@ -73,7 +73,7 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc Block b = this.getBlockType(); //for when you fill antimatter into a matter tank - if(b != ModBlocks.barrel_antimatter && tank.getTankType().traits.contains(FluidTrait.AMAT)) { + if(b != ModBlocks.barrel_antimatter && tank.getTankType().isAntimatter()) { worldObj.func_147480_a(xCoord, yCoord, zCoord, false); worldObj.newExplosion(null, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 5, true, true); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBAT9000.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBAT9000.java index 2d8a9d254..0363733b1 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBAT9000.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBAT9000.java @@ -1,6 +1,5 @@ package com.hbm.tileentity.machine; -import com.hbm.handler.FluidTypeHandler.FluidTrait; import com.hbm.handler.FluidTypeHandler.FluidType; import cpw.mods.fml.relauncher.Side; @@ -21,7 +20,7 @@ public class TileEntityMachineBAT9000 extends TileEntityBarrel { @Override public void checkFluidInteraction() { - if(tank.getTankType().traits.contains(FluidTrait.AMAT)) { + if(tank.getTankType().isAntimatter()) { worldObj.func_147480_a(xCoord, yCoord, zCoord, false); worldObj.newExplosion(null, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 10, true, true); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java index c80b5aa83..65a801cb5 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java @@ -4,12 +4,12 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.handler.FluidTypeHandler.FluidTrait; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.fluid.FluidType.FluidTrait; import com.hbm.lib.Library; import com.hbm.tileentity.TileEntityMachineBase; diff --git a/src/main/resources/assets/hbm/models/blocks/barbed_wire.obj b/src/main/resources/assets/hbm/models/blocks/barbed_wire.obj index 944c6e71e..ba7e3ec2d 100644 --- a/src/main/resources/assets/hbm/models/blocks/barbed_wire.obj +++ b/src/main/resources/assets/hbm/models/blocks/barbed_wire.obj @@ -1,41 +1,20 @@ -# Blender v2.76 (sub 0) OBJ File: '' +# Blender v2.79 (sub 0) OBJ File: '' # www.blender.org o cube -v 0.500000 0.062531 0.187500 -v 0.500000 0.062531 -0.187500 v -0.500000 0.062531 -0.187500 v -0.500000 0.062531 0.187500 -v 0.437500 0.937531 0.187500 -v 0.437500 0.937531 -0.187500 +v 0.500000 0.062531 -0.187500 +v 0.500000 0.062531 0.187500 v -0.437500 0.937531 -0.187500 v -0.437500 0.937531 0.187500 -v 0.500000 0.687500 -0.437469 -v 0.500000 0.312500 -0.437469 -v -0.500000 0.687500 -0.437469 -v -0.500000 0.312500 -0.437469 -v 0.500000 0.687500 0.437562 -v 0.500000 0.312500 0.437531 -v 0.500000 0.687500 0.437500 -v -0.500000 0.687500 0.437531 -v -0.500000 0.312500 0.437531 -v 0.500000 0.323245 -0.441920 -v 0.500000 0.058080 -0.176755 -v -0.500000 0.323245 -0.441920 -v -0.500000 0.058080 -0.176755 -v 0.500000 0.941964 0.176799 -v 0.500000 0.676821 0.441986 -v 0.500000 0.676777 0.441942 -v -0.500000 0.941964 0.176799 -v -0.500000 0.676777 0.441942 +v 0.437500 0.937531 -0.187500 +v 0.437500 0.937531 0.187500 v -0.500000 0.676821 0.441986 -v 0.500000 0.941920 -0.176755 -v 0.500000 0.676755 -0.441920 -v -0.500000 0.941920 -0.176755 -v -0.500000 0.676755 -0.441920 -v 0.500000 0.323201 0.441964 -v 0.500000 0.058036 0.176799 -v -0.500000 0.323201 0.441964 -v -0.500000 0.058036 0.176799 +v 0.500000 0.676821 0.441986 +v 0.500000 0.941964 0.176799 +v 0.500000 0.676777 0.441942 +v -0.500000 0.676777 0.441942 +v -0.500000 0.941964 0.176799 v -0.437500 0.968458 0.510064 v -0.437500 -0.003814 -0.462208 v -0.437500 1.012652 0.465869 @@ -80,115 +59,136 @@ v -0.124969 0.687500 -0.375000 v -0.124937 0.312500 -0.375000 v -0.124969 0.687500 -0.500000 v -0.124969 0.312500 -0.500000 -v -0.125000 0.312500 -0.375000 v 0.375031 0.687500 -0.375000 v 0.375031 0.312500 -0.375000 v 0.375031 0.687500 -0.500000 v 0.375031 0.312500 -0.500000 v -0.374969 0.125000 0.187500 -v -0.374969 0.000000 0.187500 +v -0.374969 -0.000000 0.187500 v -0.374969 0.125000 -0.187500 v -0.374969 0.000000 -0.187500 v -0.124969 0.125000 0.187500 -v -0.124969 0.000000 0.187500 +v -0.124969 -0.000000 0.187500 v -0.124969 0.125000 -0.187500 v -0.124969 0.000000 -0.187500 +v 0.125031 0.720971 -0.486136 +v 0.125031 0.632583 -0.397748 +v 0.125031 0.897748 -0.132583 +v 0.125031 0.986136 -0.220971 v 0.375031 0.125000 0.187500 -v 0.375031 0.000000 0.187500 +v 0.375031 -0.000000 0.187500 v 0.375031 0.125000 -0.187500 v 0.375031 0.000000 -0.187500 +v 0.125031 0.279029 -0.486136 +v 0.125031 0.013864 -0.220971 +v 0.125031 0.102252 -0.132583 +v 0.125031 0.367418 -0.397748 +v 0.125031 0.102252 0.132583 +v 0.125031 0.013864 0.220971 +v 0.125031 0.279029 0.486136 +v 0.125031 0.367417 0.397748 v 0.125031 0.125000 0.187500 -v 0.125031 0.000000 0.187500 +v 0.125031 -0.000000 0.187500 v 0.125031 0.125000 -0.187500 v 0.125031 0.000000 -0.187500 +v -0.124969 0.279029 -0.486136 +v -0.124969 0.013864 -0.220971 +v -0.124969 0.102252 -0.132583 +v -0.124969 0.367418 -0.397748 +v -0.124969 0.102252 0.132583 +v -0.124969 0.013864 0.220971 +v -0.124969 0.279029 0.486136 +v -0.124969 0.367417 0.397748 v 0.125031 1.000000 0.187500 v 0.125031 0.875000 0.187500 v 0.125031 1.000000 -0.187500 v 0.125031 0.875000 -0.187500 +v -0.124969 0.720971 -0.486136 +v -0.124969 0.632583 -0.397748 +v -0.124969 0.897748 -0.132583 +v -0.124969 0.986136 -0.220971 +v 0.375031 0.897748 0.132583 +v 0.375031 0.632582 0.397748 +v 0.375031 0.720971 0.486136 +v 0.375031 0.986136 0.220971 v -0.374969 1.000000 0.187500 v -0.374969 0.875000 0.187500 v -0.374969 1.000000 -0.187500 v -0.374969 0.875000 -0.187500 +v 0.375031 0.102252 0.132583 +v 0.375031 0.013864 0.220971 +v 0.375031 0.279029 0.486136 +v 0.375031 0.367417 0.397748 +v 0.375031 0.279029 -0.486136 +v 0.375031 0.013864 -0.220971 +v 0.375031 0.102252 -0.132583 +v 0.375031 0.367418 -0.397748 v -0.124969 1.000000 0.187500 v -0.124969 0.875000 0.187500 v -0.124969 1.000000 -0.187500 v -0.124969 0.875000 -0.187500 +v 0.375031 0.720971 -0.486136 +v 0.375031 0.632583 -0.397748 +v 0.375031 0.897748 -0.132583 +v 0.375031 0.986136 -0.220971 +v 0.125031 0.897748 0.132583 +v 0.125031 0.632582 0.397748 +v 0.125031 0.720971 0.486136 +v 0.125031 0.986136 0.220971 v 0.375031 1.000000 0.187500 v 0.375031 0.875000 0.187500 v 0.375031 1.000000 -0.187500 v 0.375031 0.875000 -0.187500 +v -0.124969 0.897748 0.132583 +v -0.124969 0.632582 0.397748 +v -0.124969 0.720971 0.486136 +v -0.124969 0.986136 0.220971 +v -0.374969 0.720971 -0.486136 +v -0.374969 0.632583 -0.397748 +v -0.374969 0.897748 -0.132583 +v -0.374969 0.986136 -0.220971 v -0.374969 0.279029 0.486136 v -0.374969 0.013864 0.220971 v -0.374969 0.367417 0.397748 v -0.374969 0.102252 0.132583 -v -0.374969 0.720971 0.486136 -v -0.374969 0.632582 0.397748 -v -0.374969 0.986136 0.220971 -v -0.374969 0.897748 0.132583 -v -0.374969 0.102252 -0.132583 -v -0.374969 0.013864 -0.220971 -v -0.374969 0.367418 -0.397748 v -0.374969 0.279029 -0.486136 -v -0.374969 0.897748 -0.132583 -v -0.374969 0.632583 -0.397748 -v -0.374969 0.986136 -0.220971 -v -0.374969 0.720971 -0.486136 -v -0.124969 0.720971 0.486136 -v -0.124969 0.632582 0.397748 -v -0.124969 0.986136 0.220971 -v -0.124969 0.897748 0.132583 -v 0.125031 0.720971 0.486136 -v 0.125031 0.632582 0.397748 -v 0.125031 0.986136 0.220971 -v 0.125031 0.897748 0.132583 -v 0.375031 0.897748 -0.132583 -v 0.375031 0.632583 -0.397748 -v 0.375031 0.986136 -0.220971 -v 0.375031 0.720971 -0.486136 -v 0.375031 0.102252 -0.132583 -v 0.375031 0.013864 -0.220971 -v 0.375031 0.367418 -0.397748 -v 0.375031 0.279029 -0.486136 -v 0.375031 0.279029 0.486136 -v 0.375031 0.013864 0.220971 -v 0.375031 0.367417 0.397748 -v 0.375031 0.102252 0.132583 -v 0.375031 0.720971 0.486136 -v 0.375031 0.632582 0.397748 -v 0.375031 0.986136 0.220971 -v 0.375031 0.897748 0.132583 -v -0.124969 0.897748 -0.132583 -v -0.124969 0.632583 -0.397748 -v -0.124969 0.986136 -0.220971 -v -0.124969 0.720971 -0.486136 -v -0.124969 0.279029 0.486136 -v -0.124969 0.013864 0.220971 -v -0.124969 0.367417 0.397748 -v -0.124969 0.102252 0.132583 -v -0.124969 0.102252 -0.132583 -v -0.124969 0.013864 -0.220971 -v -0.124969 0.367418 -0.397748 -v -0.124969 0.279029 -0.486136 -v 0.125031 0.279029 0.486136 -v 0.125031 0.013864 0.220971 -v 0.125031 0.367417 0.397748 -v 0.125031 0.102252 0.132583 -v 0.125031 0.102252 -0.132583 -v 0.125031 0.013864 -0.220971 -v 0.125031 0.367418 -0.397748 -v 0.125031 0.279029 -0.486136 -v 0.125031 0.897748 -0.132583 -v 0.125031 0.632583 -0.397748 -v 0.125031 0.986136 -0.220971 -v 0.125031 0.720971 -0.486136 +v -0.374969 0.013864 -0.220971 +v -0.374969 0.102252 -0.132583 +v -0.374969 0.367418 -0.397748 +v -0.374969 0.897748 0.132583 +v -0.374969 0.632582 0.397748 +v -0.374969 0.720971 0.486136 +v -0.374969 0.986136 0.220971 +v -0.125000 0.312500 -0.375000 +v 0.500000 0.058036 0.176799 +v -0.500000 0.058036 0.176799 +v -0.500000 0.323201 0.441964 +v 0.500000 0.323201 0.441964 +v 0.500000 0.676755 -0.441920 +v -0.500000 0.676755 -0.441920 +v -0.500000 0.941920 -0.176755 +v 0.500000 0.941920 -0.176755 +v 0.500000 0.058080 -0.176755 +v -0.500000 0.058080 -0.176755 +v -0.500000 0.323245 -0.441920 +v 0.500000 0.323245 -0.441920 +v 0.500000 0.312500 0.437531 +v -0.500000 0.312500 0.437531 +v -0.500000 0.687500 0.437531 +v 0.500000 0.687500 0.437500 +v 0.500000 0.687500 0.437562 +v 0.500000 0.312500 -0.437469 +v -0.500000 0.312500 -0.437469 +v -0.500000 0.687500 -0.437469 +v 0.500000 0.687500 -0.437469 vt 0.687012 0.187500 vt 0.687012 0.374512 vt 0.187988 0.187500 vt 0.187988 0.374512 -vt 0.624512 0.375000 -vt 0.624512 0.562012 -vt 0.187988 0.375000 -vt 0.187988 0.562012 +vt 0.562500 0.562500 +vt 0.562500 0.375000 +vt 1.000000 0.562500 +vt 1.000000 0.375000 vt 0.500488 0.812988 vt 0.999512 0.812988 vt 0.999512 0.999512 @@ -218,7 +218,58 @@ vt 0.031738 0.687012 vt 0.031738 0.000488 vt 0.062012 0.687012 vt 0.062012 0.000488 +vt 0.000488 0.687012 +vt 0.000488 0.000488 +vt 0.030762 0.687012 +vt 0.030762 0.000488 +vt 0.062988 0.687012 +vt 0.062988 0.000488 +vt 0.093262 0.687012 +vt 0.093262 0.000488 +vt 0.062012 0.687988 +vt 0.062012 0.718262 +vt 0.031738 0.687988 +vt 0.031738 0.718262 vt 0.093262 0.718262 +vt 0.093262 0.687988 +vt 0.062988 0.718262 +vt 0.062988 0.687988 +vt 0.094238 0.687012 +vt 0.094238 0.000488 +vt 0.124512 0.687012 +vt 0.124512 0.000488 +vt 0.031738 0.687012 +vt 0.031738 0.000488 +vt 0.062012 0.687012 +vt 0.062012 0.000488 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187500 0.812500 +vt 0.187012 0.625488 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187500 0.812500 +vt 0.187012 0.625488 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187500 0.812500 +vt 0.187012 0.625488 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187500 0.812500 +vt 0.187012 0.625488 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187500 0.812500 +vt 0.187012 0.625488 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187500 0.812500 +vt 0.187012 0.625488 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187500 0.812500 +vt 0.187012 0.625488 vt 0.125488 0.812012 vt 0.125488 0.625488 vt 0.187500 0.812500 @@ -227,219 +278,422 @@ vt 0.125488 0.624512 vt 0.125488 0.562988 vt 0.312500 0.624512 vt 0.312500 0.562988 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.312500 0.624512 +vt 0.312500 0.562988 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.187500 0.812500 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.312500 0.624512 +vt 0.312500 0.562988 +vt 0.312500 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.312500 0.624512 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.187500 0.812500 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.312500 0.624512 +vt 0.312500 0.562988 +vt 0.312500 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.312500 0.624512 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.187500 0.812500 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.312500 0.624512 +vt 0.312500 0.562988 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.187500 0.812500 +vt 0.312500 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.312500 0.624512 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.312500 0.624512 +vt 0.312500 0.562988 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.187500 0.812500 +vt 0.312500 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.312500 0.624512 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.312500 0.624512 +vt 0.312500 0.562988 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.187500 0.812500 +vt 0.312500 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.312500 0.624512 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.312500 0.624512 +vt 0.312500 0.562988 +vt 0.312500 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.312500 0.624512 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.187500 0.812500 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187500 0.812500 +vt 0.187012 0.625488 +vt 0.312500 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.312500 0.624512 +vt 0.312500 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.312500 0.624512 +vt 0.125488 0.624512 +vt 0.125488 0.562988 vt 0.187988 0.625488 vt 0.249512 0.625488 vt 0.249512 0.812012 vt 0.500000 0.562988 vt 0.500000 0.624512 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187012 0.625488 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.500000 0.562988 +vt 0.500000 0.624512 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187012 0.625488 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187012 0.625488 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.187988 0.625488 +vt 0.249512 0.625488 +vt 0.249512 0.812012 +vt 0.000488 0.812988 +vt 0.499512 0.812988 +vt 0.500000 1.000000 vt 0.000488 1.000000 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187012 0.625488 +vt 0.500488 0.812988 +vt 0.999512 0.812988 +vt 0.999512 0.999512 +vt 0.000488 0.812988 +vt 0.499512 0.812988 +vt 0.500000 1.000000 +vt 0.000488 1.000000 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187012 0.625488 +vt 0.500488 0.812988 +vt 0.999512 0.812988 +vt 0.999512 0.999512 +vt 0.000488 1.000000 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.000488 0.812988 +vt 0.499512 0.812988 +vt 0.500000 1.000000 +vt 0.000488 1.000000 +vt 0.500488 0.812988 +vt 0.999512 0.812988 +vt 0.999512 0.999512 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187012 0.625488 +vt 0.000488 0.812988 +vt 0.499512 0.812988 +vt 0.500000 1.000000 vt 0.000488 0.999512 -vt 1.062012 0.375488 -vt 0.625488 0.375488 -vt 0.625488 0.562012 -vt 1.062012 0.562012 -vt 1.187012 0.187988 -vt 0.687988 0.187988 -vt 0.687988 0.374512 -vt 1.187012 0.374512 -vn 0.000000 1.000000 0.000000 -vn 0.000000 0.707200 0.707000 -vn 0.000000 -0.707000 -0.707200 -vn 1.000000 0.000000 0.000000 -vn -1.000000 0.000000 0.000000 -vn 0.000000 0.707100 0.707100 -vn 0.000000 -0.707100 -0.707100 -vn 0.000000 -0.707100 0.707100 -vn 0.000000 0.707100 -0.707100 -vn 1.000000 0.000100 0.000000 -vn 1.000000 0.000000 -0.000300 -vn -1.000000 0.000100 -0.000200 -vn 0.000000 0.000000 -1.000000 -vn -0.000000 -0.000100 -1.000000 -vn 0.000000 -0.000100 1.000000 -vn -0.000000 0.000000 1.000000 -vn 0.000000 -1.000000 0.000000 +vt 0.500488 0.812988 +vt 0.999512 0.812988 +vt 0.999512 0.999512 +vt 0.125488 0.624512 +vt 0.125488 0.562988 +vt 0.000488 0.812988 +vt 0.499512 0.812988 +vt 0.500000 1.000000 +vt 0.000488 1.000000 +vt 0.500488 0.812988 +vt 0.999512 0.812988 +vt 0.999512 0.999512 +vt 0.125488 0.812012 +vt 0.125488 0.625488 +vt 0.187012 0.625488 +vt 0.125000 0.562500 +vt 0.562500 0.562500 +vt 0.562500 0.375000 +vt 0.125000 0.375000 +vt 0.687500 0.187500 +vt 0.187500 0.187500 +vt 0.187500 0.375000 +vt 0.687500 0.375000 +vt 0.093750 0.718750 +vn 0.0000 1.0000 0.0000 +vn 0.0000 0.7072 0.7070 +vn 0.0000 -0.7070 -0.7072 +vn 1.0000 0.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.7071 0.7071 +vn 0.0000 -0.7071 -0.7071 +vn 0.0000 -0.7071 0.7071 +vn 0.0000 0.7071 -0.7071 +vn 1.0000 0.0001 0.0000 +vn 1.0000 -0.0000 -0.0003 +vn -1.0000 0.0001 -0.0002 +vn 0.0000 0.0000 -1.0000 +vn -0.0000 -0.0001 -1.0000 +vn 0.0000 -0.0001 1.0000 +vn -0.0000 -0.0000 1.0000 +vn 0.0000 -1.0000 0.0000 s off -f 3/1/1 4/2/1 2/3/1 -f 4/2/1 1/4/1 2/3/1 -f 7/5/1 8/6/1 6/7/1 -f 8/6/1 5/8/1 6/7/1 -f 27/9/2 23/10/2 22/11/2 -f 24/12/3 26/13/3 25/14/3 -f 36/15/4 37/16/4 38/17/4 -f 37/16/4 39/18/4 38/17/4 -f 40/19/5 41/20/5 42/21/5 -f 41/20/5 43/22/5 42/21/5 -f 40/23/6 42/24/6 38/25/6 -f 42/24/6 36/26/6 38/25/6 -f 41/27/7 39/28/7 37/29/7 -f 42/30/8 43/31/8 36/32/8 -f 43/31/8 37/33/8 36/32/8 -f 38/34/9 39/35/9 40/36/9 -f 39/35/9 41/37/9 40/36/9 -f 44/15/4 45/16/4 46/17/4 -f 45/16/4 47/18/4 46/17/4 -f 48/19/5 49/20/5 50/21/5 -f 49/20/5 51/22/5 50/21/5 -f 48/23/9 50/24/9 46/25/9 -f 50/24/9 44/26/9 46/25/9 -f 51/38/8 49/27/8 45/29/8 -f 49/27/8 47/28/8 45/29/8 -f 50/30/6 51/31/6 44/32/6 -f 51/31/6 45/33/6 44/32/6 -f 46/34/7 47/35/7 48/36/7 -f 47/35/7 49/37/7 48/36/7 -f 52/39/4 53/40/4 54/41/4 -f 53/40/4 55/42/4 54/41/4 -f 56/39/4 57/40/4 58/41/4 -f 57/40/4 59/42/4 58/41/4 -f 60/39/4 61/40/4 62/41/4 -f 61/40/4 63/42/4 62/41/4 -f 64/39/4 65/40/4 66/41/4 -f 65/40/4 67/42/4 66/41/4 -f 68/39/4 69/40/4 70/41/4 -f 69/40/4 71/42/4 70/41/4 -f 72/39/4 73/40/4 74/41/4 -f 73/40/4 75/42/4 74/41/4 -f 76/39/10 77/40/10 78/41/10 -f 77/40/11 79/42/11 78/41/11 -f 81/39/4 82/40/4 83/41/4 -f 82/40/4 84/42/4 83/41/4 -f 85/43/4 86/44/4 87/45/4 -f 86/44/4 88/46/4 87/45/4 -f 89/43/4 90/44/4 91/45/4 -f 90/44/4 92/46/4 91/45/4 -f 180/47/5 178/48/5 177/49/5 -f 179/41/5 180/47/5 177/49/5 -f 93/43/4 94/44/4 95/45/4 -f 94/44/4 96/46/4 95/45/4 -f 176/46/5 174/50/5 173/51/5 -f 175/45/5 176/46/5 173/51/5 -f 172/47/5 170/48/5 169/49/5 -f 171/41/5 172/47/5 169/49/5 -f 97/43/4 98/44/4 99/45/4 -f 98/44/4 100/46/4 99/45/4 -f 168/46/5 166/50/5 165/51/5 -f 167/45/5 168/46/5 165/51/5 -f 164/47/5 162/48/5 161/49/5 -f 163/41/5 164/47/5 161/49/5 -f 101/43/4 102/44/4 103/45/4 -f 102/44/4 104/46/4 103/45/4 -f 160/47/5 158/48/5 157/49/5 -f 159/41/5 160/47/5 157/49/5 -f 156/46/5 154/50/5 153/51/5 -f 155/45/5 156/46/5 153/51/5 -f 105/43/4 106/44/4 107/45/4 -f 106/44/4 108/46/4 107/45/4 -f 152/47/5 150/48/5 149/49/5 -f 151/41/5 152/47/5 149/49/5 -f 148/46/5 146/50/5 145/51/5 -f 147/45/5 148/46/5 145/51/5 -f 109/43/4 110/44/4 111/45/4 -f 110/44/4 112/46/4 111/45/4 -f 144/47/5 142/48/5 141/49/5 -f 143/41/5 144/47/5 141/49/5 -f 140/46/5 138/50/5 137/51/5 -f 139/45/5 140/46/5 137/51/5 -f 113/43/4 114/44/4 115/45/4 -f 114/44/4 116/46/4 115/45/4 -f 136/46/5 134/50/5 133/51/5 -f 135/45/5 136/46/5 133/51/5 -f 132/47/5 130/48/5 129/49/5 -f 131/41/5 132/47/5 129/49/5 -f 117/39/4 118/40/4 119/41/4 -f 118/40/4 120/42/4 119/41/4 -f 128/46/5 126/50/5 125/51/5 -f 127/45/5 128/46/5 125/51/5 -f 124/46/5 122/50/5 121/51/5 -f 123/45/5 124/46/5 121/51/5 -f 121/43/4 122/44/4 123/45/4 -f 122/44/4 124/46/4 123/45/4 -f 120/47/5 118/48/5 117/49/5 -f 119/41/5 120/47/5 117/49/5 -f 116/46/5 114/50/5 113/51/5 -f 115/45/5 116/46/5 113/51/5 -f 125/43/4 126/44/4 127/45/4 -f 126/44/4 128/46/4 127/45/4 -f 112/46/5 110/50/5 109/51/5 -f 111/45/5 112/46/5 109/51/5 -f 108/46/5 106/50/5 105/51/5 -f 107/45/5 108/46/5 105/51/5 -f 129/39/4 130/40/4 131/41/4 -f 130/40/4 132/42/4 131/41/4 -f 104/46/5 102/50/5 101/51/5 -f 103/45/5 104/46/5 101/51/5 -f 100/46/5 98/50/5 97/51/5 -f 99/45/5 100/46/5 97/51/5 -f 133/43/4 134/44/4 135/45/4 -f 134/44/4 136/46/4 135/45/4 -f 96/46/5 94/50/5 93/51/5 -f 95/45/5 96/46/5 93/51/5 -f 92/46/5 90/50/5 89/51/5 -f 91/45/5 92/46/5 89/51/5 -f 137/43/4 138/44/4 139/45/4 -f 138/44/4 140/46/4 139/45/4 -f 88/46/5 86/50/5 85/51/5 -f 87/45/5 88/46/5 85/51/5 -f 84/47/5 82/48/5 81/49/5 -f 83/41/5 84/47/5 81/49/5 -f 141/39/4 142/40/4 143/41/4 -f 142/40/4 144/42/4 143/41/4 -f 79/47/12 80/48/12 76/49/12 -f 78/41/5 79/47/5 76/49/5 -f 75/47/5 73/48/5 72/49/5 -f 74/41/5 75/47/5 72/49/5 -f 145/43/4 146/44/4 147/45/4 -f 146/44/4 148/46/4 147/45/4 -f 71/47/5 69/48/5 68/49/5 -f 70/41/5 71/47/5 68/49/5 -f 67/47/5 65/48/5 64/49/5 -f 66/41/5 67/47/5 64/49/5 -f 149/39/4 150/40/4 151/41/4 -f 150/40/4 152/42/4 151/41/4 -f 63/47/5 61/48/5 60/49/5 -f 62/41/5 63/47/5 60/49/5 -f 59/47/5 57/48/5 56/49/5 -f 58/41/5 59/47/5 56/49/5 -f 153/43/4 154/44/4 155/45/4 -f 154/44/4 156/46/4 155/45/4 -f 55/47/5 53/48/5 52/49/5 -f 54/41/5 55/47/5 52/49/5 -f 33/12/9 35/13/9 34/14/9 -f 32/52/9 33/12/9 34/14/9 -f 157/39/4 158/40/4 159/41/4 -f 158/40/4 160/42/4 159/41/4 -f 35/9/8 33/10/8 32/11/8 -f 34/14/8 35/9/8 32/11/8 -f 29/12/9 31/13/9 30/14/9 -f 28/52/9 29/12/9 30/14/9 -f 161/39/4 162/40/4 163/41/4 -f 162/40/4 164/42/4 163/41/4 -f 31/9/8 29/10/8 28/11/8 -f 30/14/8 31/9/8 28/11/8 -f 22/52/3 24/12/3 25/14/3 -f 25/14/2 27/9/2 22/11/2 -f 165/43/4 166/44/4 167/45/4 -f 166/44/4 168/46/4 167/45/4 -f 19/12/7 21/13/7 20/14/7 -f 18/52/7 19/12/7 20/14/7 -f 21/9/6 19/10/6 18/11/6 -f 20/14/6 21/9/6 18/11/6 -f 169/39/4 170/40/4 171/41/4 -f 170/40/4 172/42/4 171/41/4 -f 14/12/13 17/13/13 16/14/13 -f 15/53/14 14/12/14 16/14/14 -f 17/9/15 14/10/15 13/11/15 -f 16/14/16 17/9/16 13/11/16 -f 173/43/4 174/44/4 175/45/4 -f 174/44/4 176/46/4 175/45/4 -f 10/12/13 12/13/13 11/14/13 -f 9/52/13 10/12/13 11/14/13 -f 12/9/16 10/10/16 9/11/16 -f 11/14/16 12/9/16 9/11/16 -f 177/39/4 178/40/4 179/41/4 -f 178/40/4 180/42/4 179/41/4 -f 7/54/17 6/55/17 5/56/17 -f 8/57/17 7/54/17 5/56/17 -f 3/58/17 2/59/17 1/60/17 -f 4/61/17 3/58/17 1/60/17 +f 1/1/1 2/2/1 3/3/1 +f 2/2/1 4/4/1 3/3/1 +f 5/5/1 6/6/1 7/7/1 +f 6/6/1 8/8/1 7/7/1 +f 9/9/2 10/10/2 11/11/2 +f 12/12/3 13/13/3 14/14/3 +f 15/15/4 16/16/4 17/17/4 +f 16/16/4 18/18/4 17/17/4 +f 19/19/5 20/20/5 21/21/5 +f 20/20/5 22/22/5 21/21/5 +f 19/23/6 21/24/6 17/25/6 +f 21/24/6 15/26/6 17/25/6 +f 20/27/7 18/28/7 16/29/7 +f 21/30/8 22/31/8 15/32/8 +f 22/31/8 16/33/8 15/32/8 +f 17/34/9 18/35/9 19/36/9 +f 18/35/9 20/37/9 19/36/9 +f 23/38/4 24/39/4 25/40/4 +f 24/39/4 26/41/4 25/40/4 +f 27/42/5 28/43/5 29/44/5 +f 28/43/5 30/45/5 29/44/5 +f 27/46/9 29/47/9 25/48/9 +f 29/47/9 23/49/9 25/48/9 +f 30/50/8 28/51/8 24/52/8 +f 28/51/8 26/53/8 24/52/8 +f 29/54/6 30/55/6 23/56/6 +f 30/55/6 24/57/6 23/56/6 +f 25/58/7 26/59/7 27/60/7 +f 26/59/7 28/61/7 27/60/7 +f 31/62/4 32/63/4 33/64/4 +f 32/63/4 34/65/4 33/64/4 +f 35/66/4 36/67/4 37/68/4 +f 36/67/4 38/69/4 37/68/4 +f 39/70/4 40/71/4 41/72/4 +f 40/71/4 42/73/4 41/72/4 +f 43/74/4 44/75/4 45/76/4 +f 44/75/4 46/77/4 45/76/4 +f 47/78/4 48/79/4 49/80/4 +f 48/79/4 50/81/4 49/80/4 +f 51/82/4 52/83/4 53/84/4 +f 52/83/4 54/85/4 53/84/4 +f 55/86/10 56/87/10 57/88/10 +f 56/87/11 58/89/11 57/88/11 +f 59/90/4 60/91/4 61/92/4 +f 60/91/4 62/93/4 61/92/4 +f 63/94/4 64/95/4 65/96/4 +f 64/95/4 66/97/4 65/96/4 +f 67/98/4 68/99/4 69/100/4 +f 68/99/4 70/101/4 69/100/4 +f 71/102/5 72/103/5 73/104/5 +f 74/105/5 71/102/5 73/104/5 +f 75/106/4 76/107/4 77/108/4 +f 76/107/4 78/109/4 77/108/4 +f 79/110/5 80/111/5 81/112/5 +f 82/113/5 79/110/5 81/112/5 +f 83/114/5 84/115/5 85/116/5 +f 86/117/5 83/114/5 85/116/5 +f 87/118/4 88/119/4 89/120/4 +f 88/119/4 90/121/4 89/120/4 +f 91/122/5 92/123/5 93/124/5 +f 94/125/5 91/122/5 93/124/5 +f 95/126/5 96/127/5 97/128/5 +f 98/129/5 95/126/5 97/128/5 +f 99/130/4 100/131/4 101/132/4 +f 100/131/4 102/133/4 101/132/4 +f 103/134/5 104/135/5 105/136/5 +f 106/137/5 103/134/5 105/136/5 +f 107/138/5 108/139/5 109/140/5 +f 110/141/5 107/138/5 109/140/5 +f 111/142/4 112/143/4 113/144/4 +f 112/143/4 114/145/4 113/144/4 +f 115/146/5 116/147/5 117/148/5 +f 118/149/5 115/146/5 117/148/5 +f 119/150/5 120/151/5 121/152/5 +f 122/153/5 119/150/5 121/152/5 +f 123/154/4 124/155/4 125/156/4 +f 124/155/4 126/157/4 125/156/4 +f 127/158/5 128/159/5 129/160/5 +f 130/161/5 127/158/5 129/160/5 +f 131/162/5 132/163/5 133/164/5 +f 134/165/5 131/162/5 133/164/5 +f 135/166/4 136/167/4 137/168/4 +f 136/167/4 138/169/4 137/168/4 +f 139/170/5 140/171/5 141/172/5 +f 142/173/5 139/170/5 141/172/5 +f 143/174/5 144/175/5 145/176/5 +f 146/177/5 143/174/5 145/176/5 +f 147/178/4 148/179/4 149/180/4 +f 148/179/4 150/181/4 149/180/4 +f 151/182/5 152/183/5 153/184/5 +f 154/185/5 151/182/5 153/184/5 +f 155/186/5 156/187/5 157/188/5 +f 158/189/5 155/186/5 157/188/5 +f 157/190/4 156/191/4 158/189/4 +f 156/191/4 155/186/4 158/189/4 +f 150/192/5 148/193/5 147/194/5 +f 149/180/5 150/192/5 147/194/5 +f 138/169/5 136/195/5 135/196/5 +f 137/168/5 138/169/5 135/196/5 +f 153/197/4 152/198/4 154/185/4 +f 152/198/4 151/182/4 154/185/4 +f 126/157/5 124/199/5 123/200/5 +f 125/156/5 126/157/5 123/200/5 +f 114/145/5 112/201/5 111/202/5 +f 113/144/5 114/145/5 111/202/5 +f 145/203/4 144/204/4 146/177/4 +f 144/204/4 143/205/4 146/177/4 +f 102/133/5 100/206/5 99/207/5 +f 101/132/5 102/133/5 99/207/5 +f 90/121/5 88/208/5 87/209/5 +f 89/120/5 90/121/5 87/209/5 +f 141/210/4 140/211/4 142/173/4 +f 140/211/4 139/170/4 142/173/4 +f 78/109/5 76/212/5 75/213/5 +f 77/108/5 78/109/5 75/213/5 +f 70/101/5 68/214/5 67/215/5 +f 69/100/5 70/101/5 67/215/5 +f 133/216/4 132/217/4 134/165/4 +f 132/217/4 131/162/4 134/165/4 +f 66/97/5 64/218/5 63/219/5 +f 65/96/5 66/97/5 63/219/5 +f 62/220/5 60/221/5 59/222/5 +f 61/92/5 62/220/5 59/222/5 +f 129/223/4 128/224/4 130/161/4 +f 128/224/4 127/225/4 130/161/4 +f 58/226/12 159/227/12 55/228/12 +f 57/88/5 58/226/5 55/228/5 +f 54/229/5 52/230/5 51/231/5 +f 53/84/5 54/229/5 51/231/5 +f 121/232/4 120/233/4 122/153/4 +f 120/233/4 119/150/4 122/153/4 +f 50/234/5 48/235/5 47/236/5 +f 49/80/5 50/234/5 47/236/5 +f 46/237/5 44/238/5 43/239/5 +f 45/76/5 46/237/5 43/239/5 +f 117/240/4 116/241/4 118/149/4 +f 116/241/4 115/242/4 118/149/4 +f 42/243/5 40/244/5 39/245/5 +f 41/72/5 42/243/5 39/245/5 +f 38/246/5 36/247/5 35/248/5 +f 37/68/5 38/246/5 35/248/5 +f 109/249/4 108/250/4 110/141/4 +f 108/250/4 107/138/4 110/141/4 +f 34/251/5 32/252/5 31/253/5 +f 33/64/5 34/251/5 31/253/5 +f 160/254/9 161/255/9 162/256/9 +f 163/257/9 160/254/9 162/256/9 +f 105/258/4 104/259/4 106/137/4 +f 104/259/4 103/260/4 106/137/4 +f 161/261/8 160/262/8 163/263/8 +f 162/256/8 161/261/8 163/263/8 +f 164/264/9 165/265/9 166/266/9 +f 167/267/9 164/264/9 166/266/9 +f 97/268/4 96/269/4 98/129/4 +f 96/269/4 95/270/4 98/129/4 +f 165/271/8 164/272/8 167/273/8 +f 166/266/8 165/271/8 167/273/8 +f 11/274/3 12/12/3 14/14/3 +f 14/14/2 9/9/2 11/11/2 +f 93/275/4 92/276/4 94/125/4 +f 92/276/4 91/122/4 94/125/4 +f 168/277/7 169/278/7 170/279/7 +f 171/280/7 168/277/7 170/279/7 +f 169/281/6 168/282/6 171/283/6 +f 170/279/6 169/281/6 171/283/6 +f 85/284/4 84/285/4 86/117/4 +f 84/285/4 83/286/4 86/117/4 +f 172/287/13 173/288/13 174/289/13 +f 175/290/14 172/287/14 174/289/14 +f 173/291/15 172/292/15 176/293/15 +f 174/289/16 173/291/16 176/293/16 +f 81/294/4 80/295/4 82/113/4 +f 80/295/4 79/110/4 82/113/4 +f 177/296/13 178/297/13 179/298/13 +f 180/299/13 177/296/13 179/298/13 +f 178/300/16 177/301/16 180/302/16 +f 179/298/16 178/300/16 180/302/16 +f 73/303/4 72/304/4 74/105/4 +f 72/304/4 71/305/4 74/105/4 +f 5/306/17 7/307/17 8/308/17 +f 6/309/17 5/306/17 8/308/17 +f 1/310/17 3/311/17 4/312/17 +f 2/313/17 1/310/17 4/312/17 +f 20/27/7 16/29/7 22/314/7