From 0922478262d95ed353e3c7b8f99b0835c7351149 Mon Sep 17 00:00:00 2001 From: Vaern Date: Fri, 28 Jan 2022 20:20:12 -0800 Subject: [PATCH 1/9] radiolysis --- src/main/java/com/hbm/blocks/ModBlocks.java | 6 +- .../hbm/blocks/machine/MachineRadiolysis.java | 71 +++++ .../java/com/hbm/crafting/MineralRecipes.java | 12 + .../inventory/recipes/anvil/AnvilRecipes.java | 14 +- src/main/java/com/hbm/items/ModItems.java | 33 +-- .../items/machine/ItemRTGPelletDepleted.java | 3 +- .../machine/TileEntityMachineRadiolysis.java | 255 ++++++++++++++++++ src/main/resources/assets/hbm/lang/en_US.lang | 3 + .../hbm/textures/items/pellet_rtg_cobalt.png | Bin 0 -> 238 bytes .../items/pellet_rtg_depleted.nickel.png | Bin 0 -> 238 bytes 10 files changed, 368 insertions(+), 29 deletions(-) create mode 100644 src/main/java/com/hbm/blocks/machine/MachineRadiolysis.java create mode 100644 src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java create mode 100644 src/main/resources/assets/hbm/textures/items/pellet_rtg_cobalt.png create mode 100644 src/main/resources/assets/hbm/textures/items/pellet_rtg_depleted.nickel.png diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 409fed4a8..2dbfc0d44 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -867,6 +867,8 @@ public class ModBlocks { public static Block machine_geo; public static Block machine_minirtg; public static Block machine_powerrtg; + public static Block machine_radiolysis; + public static final int guiID_machine_radiolysis = 125; public static Block machine_well; public static Block oil_pipe; @@ -1785,7 +1787,8 @@ public class ModBlocks { machine_geo = new MachineAmgen(Material.iron).setBlockName("machine_geo").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); machine_minirtg = new MachineMiniRTG(Material.iron).setBlockName("machine_minirtg").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":rtg_cell"); machine_powerrtg = new MachineMiniRTG(Material.iron).setBlockName("machine_powerrtg").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":rtg_polonium"); - + machine_radiolysis = new MachineRadiolysis(Material.iron).setBlockName("machine_radiolysis").setHardness(10.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); + red_wire_coated = new WireCoated(Material.iron).setBlockName("red_wire_coated").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":red_wire_coated"); red_cable = new BlockCable(Material.iron).setBlockName("red_cable").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":cable_neo"); rf_cable = new BlockRFCable(Material.iron).setBlockName("rf_cable").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":rf_cable_icon"); @@ -2811,6 +2814,7 @@ public class ModBlocks { GameRegistry.registerBlock(machine_amgen, machine_amgen.getUnlocalizedName()); GameRegistry.registerBlock(machine_minirtg, machine_minirtg.getUnlocalizedName()); GameRegistry.registerBlock(machine_powerrtg, machine_powerrtg.getUnlocalizedName()); + GameRegistry.registerBlock(machine_radiolysis, machine_radiolysis.getUnlocalizedName()); GameRegistry.registerBlock(machine_spp_bottom, machine_spp_bottom.getUnlocalizedName()); GameRegistry.registerBlock(machine_spp_top, machine_spp_top.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/machine/MachineRadiolysis.java b/src/main/java/com/hbm/blocks/machine/MachineRadiolysis.java new file mode 100644 index 000000000..d048d7697 --- /dev/null +++ b/src/main/java/com/hbm/blocks/machine/MachineRadiolysis.java @@ -0,0 +1,71 @@ +package com.hbm.blocks.machine; + +import com.hbm.blocks.BlockDummyable; +import com.hbm.blocks.ModBlocks; +import com.hbm.handler.BossSpawnHandler; +import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityProxyCombo; +import com.hbm.tileentity.machine.TileEntityMachineRadiolysis; + +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +public class MachineRadiolysis extends BlockDummyable { + + public MachineRadiolysis(Material mat) { + super(mat); + } + + @Override + public TileEntity createNewTileEntity(World world, int meta) { + + if(meta >= 12) + return new TileEntityMachineRadiolysis(); + if(meta >= 6) + return new TileEntityProxyCombo(false, true, true); + + return null; + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + if(world.isRemote) { + return true; + } else if(!player.isSneaking()) { + BossSpawnHandler.markFBI(player); + + int[] pos = this.findCore(world, x, y, z); + + if(pos == null) + return false; + + FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_radiolysis, world, pos[0], pos[1], pos[2]); + return true; + } else { + return false; + } + } + + @Override + public int[] getDimensions() { + return new int[] {2, 0, 1, 1, 1, 1,}; + } + + @Override + public int getOffset() { + return 0; + } + + protected void fillSpace(World world, int x, int y, int z, ForgeDirection dir, int o) { + super.fillSpace(world, x, y, z, dir, o); + + this.makeExtra(world, x + dir.offsetX * o + 1, y, z + dir.offsetZ * o); + this.makeExtra(world, x + dir.offsetX * o - 1, y, z + dir.offsetZ * o); + this.makeExtra(world, x + dir.offsetX * o, y, z + dir.offsetZ * o + 1); + this.makeExtra(world, x + dir.offsetX * o, y, z + dir.offsetZ * o - 1); + } +} diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index b56c8f072..29ab3ae64 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -2,6 +2,7 @@ package com.hbm.crafting; import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; +import com.hbm.items.machine.ItemRTGPelletDepleted.DepletedRTGMaterial; import com.hbm.items.special.ItemWasteLong; import com.hbm.items.special.ItemWasteShort; import static com.hbm.inventory.OreDictManager.*; @@ -11,6 +12,7 @@ import net.minecraft.block.Block; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; @@ -211,12 +213,22 @@ public class MineralRecipes { GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_radium), new Object[] { ModItems.billet_ra226, ModItems.billet_ra226, ModItems.billet_ra226, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_weak), new Object[] { ModItems.billet_u238, ModItems.billet_u238, ModItems.billet_pu238, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_strontium), new Object[] { ModItems.billet_sr90, ModItems.billet_sr90, ModItems.billet_sr90, "plateIron" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_cobalt), new Object[] { ModItems.billet_co60, ModItems.billet_co60, ModItems.billet_co60, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_actinium), new Object[] { ModItems.billet_actinium, ModItems.billet_actinium, ModItems.billet_actinium, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_polonium), new Object[] { ModItems.billet_polonium, ModItems.billet_polonium, ModItems.billet_polonium, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_lead), new Object[] { ModItems.billet_pb209, ModItems.billet_pb209, ModItems.billet_pb209, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_gold), new Object[] { ModItems.billet_au198, ModItems.billet_au198, ModItems.billet_au198, "plateIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pellet_rtg_americium), new Object[] { ModItems.billet_am241, ModItems.billet_am241, ModItems.billet_am241, "plateIron" })); + //There's no need for anvil recycling recipes if you simply set the container item + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_bismuth, 3), new Object[] { new ItemStack(ModItems.pellet_rtg_depleted, 1, DepletedRTGMaterial.BISMUTH.ordinal()) }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_lead, 2), new Object[] { new ItemStack(ModItems.pellet_rtg_depleted, 1, DepletedRTGMaterial.LEAD.ordinal()) }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ingot_mercury, 2), new Object[] { new ItemStack(ModItems.pellet_rtg_depleted, 1, DepletedRTGMaterial.MERCURY.ordinal()) }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_neptunium, 3), new Object[] { new ItemStack(ModItems.pellet_rtg_depleted, 1, DepletedRTGMaterial.NEPTUNIUM.ordinal()) }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_zirconium, 3), new Object[] { new ItemStack(ModItems.pellet_rtg_depleted, 1, DepletedRTGMaterial.ZIRCONIUM.ordinal()) }); + if(OreDictionary.doesOreNameExist("ingotNickel")) + GameRegistry.addShapelessRecipe(new ItemStack(OreDictionary.getOres("ingotNickel").get(0).getItem(), 2), new Object[] { new ItemStack(ModItems.pellet_rtg_depleted, 1, DepletedRTGMaterial.NICKEL.ordinal()) }); + GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_copper), 1), new Object[] { "###", "###", "###", '#', ModItems.ingot_copper }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_fluorite), 1), new Object[] { "###", "###", "###", '#', ModItems.fluorite }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.block_niter), 1), new Object[] { "###", "###", "###", '#', ModItems.niter }); diff --git a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java index dfbb1aa4c..cf49930bc 100644 --- a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java @@ -19,6 +19,8 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + public class AnvilRecipes { @@ -596,18 +598,6 @@ public class AnvilRecipes { new AnvilOutput(new ItemStack(ModBlocks.crate_steel, 2)) }).setTier(4)); - //RTG - constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(new ItemStack(ModItems.pellet_rtg_depleted, 1, DepletedRTGMaterial.BISMUTH.ordinal())), new AnvilOutput[] { - new AnvilOutput(new ItemStack(ModItems.billet_bismuth, 3)), new AnvilOutput(new ItemStack(ModItems.plate_iron, 1)) }).setTier(3)); - constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(new ItemStack(ModItems.pellet_rtg_depleted, 1, DepletedRTGMaterial.LEAD.ordinal())), new AnvilOutput[] { - new AnvilOutput(new ItemStack(ModItems.ingot_lead, 2)), new AnvilOutput(new ItemStack(ModItems.plate_iron, 1)) }).setTier(3)); - constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(new ItemStack(ModItems.pellet_rtg_depleted, 1, DepletedRTGMaterial.MERCURY.ordinal())), new AnvilOutput[] { - new AnvilOutput(new ItemStack(ModItems.ingot_mercury, 2)), new AnvilOutput(new ItemStack(ModItems.plate_iron, 1)) }).setTier(3)); - constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(new ItemStack(ModItems.pellet_rtg_depleted, 1, DepletedRTGMaterial.NEPTUNIUM.ordinal())), new AnvilOutput[] { - new AnvilOutput(new ItemStack(ModItems.billet_neptunium, 3)), new AnvilOutput(new ItemStack(ModItems.plate_iron, 1)) }).setTier(3)); - constructionRecipes.add(new AnvilConstructionRecipe(new ComparableStack(new ItemStack(ModItems.pellet_rtg_depleted, 1, DepletedRTGMaterial.ZIRCONIUM.ordinal())), new AnvilOutput[] { - new AnvilOutput(new ItemStack(ModItems.billet_zirconium, 3)), new AnvilOutput(new ItemStack(ModItems.plate_iron, 1)) }).setTier(3)); - if(!GeneralConfig.enable528) { constructionRecipes.add(new AnvilConstructionRecipe( diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 0c2fd40ba..39282d584 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -724,16 +724,17 @@ public class ModItems { public static Item pellet_rtg_depleted; - public static Item pellet_rtg; public static Item pellet_rtg_radium; public static Item pellet_rtg_weak; - public static Item pellet_rtg_polonium; - public static Item pellet_rtg_actinium; + public static Item pellet_rtg; public static Item pellet_rtg_strontium; - public static Item pellet_rtg_lead; - public static Item pellet_rtg_gold; + public static Item pellet_rtg_cobalt; + public static Item pellet_rtg_actinium; + public static Item pellet_rtg_polonium; public static Item pellet_rtg_americium; public static Item pellet_rtg_berkelium; + public static Item pellet_rtg_gold; + public static Item pellet_rtg_lead; public static Item tritium_deuterium_cake; @@ -3095,18 +3096,19 @@ public class ModItems { wiring_red_copper = new ItemWiring().setUnlocalizedName("wiring_red_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wiring_red_copper"); - pellet_rtg_depleted = new ItemRTGPelletDepleted().setUnlocalizedName("pellet_rtg_depleted").setCreativeTab(MainRegistry.controlTab); //TODO: add localization; uncrafting recipes; make radiation scale with depletion for rtgs + pellet_rtg_depleted = new ItemRTGPelletDepleted().setContainerItem(plate_iron).setUnlocalizedName("pellet_rtg_depleted").setCreativeTab(MainRegistry.controlTab); - pellet_rtg = new ItemRTGPellet(10).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(87.7F, HalfLifeType.MEDIUM, false) * 1.5)).setUnlocalizedName("pellet_rtg").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg"); pellet_rtg_radium = new ItemRTGPellet(3).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(16.0F, HalfLifeType.LONG, false) * 1.5)).setUnlocalizedName("pellet_rtg_radium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_radium"); pellet_rtg_weak = new ItemRTGPellet(5).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(1.0F, HalfLifeType.LONG, false) * 1.5)).setUnlocalizedName("pellet_rtg_weak").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_weak"); - pellet_rtg_polonium = new ItemRTGPellet(50).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(138.0F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_polonium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_polonium"); - pellet_rtg_actinium = new ItemRTGPellet(20).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(21.7F, HalfLifeType.MEDIUM, false) * 1.5)).setUnlocalizedName("pellet_rtg_actinium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_actinium"); + pellet_rtg = new ItemRTGPellet(10).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(87.7F, HalfLifeType.MEDIUM, false) * 1.5)).setUnlocalizedName("pellet_rtg").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg"); pellet_rtg_strontium = new ItemRTGPellet(15).setDecays(DepletedRTGMaterial.ZIRCONIUM, (long) (RTGUtil.getLifespan(29.0F, HalfLifeType.MEDIUM, false) * 1.5)).setUnlocalizedName("pellet_rtg_strontium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_strontium"); - pellet_rtg_lead = new ItemRTGPellet(VersatileConfig.rtgDecay() ? 600 : 200).setDecays(DepletedRTGMaterial.BISMUTH, (long) (RTGUtil.getLifespan(0.3F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_lead").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_lead"); - pellet_rtg_gold = new ItemRTGPellet(VersatileConfig.rtgDecay() ? 300 : 100).setDecays(DepletedRTGMaterial.MERCURY, (long) (RTGUtil.getLifespan(2.7F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_gold").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_gold"); + pellet_rtg_cobalt = new ItemRTGPellet(15).setDecays(DepletedRTGMaterial.NICKEL, (long) (RTGUtil.getLifespan(29.0F, HalfLifeType.MEDIUM, false) * 1.5)).setUnlocalizedName("pellet_rtg_cobalt").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_cobalt"); + pellet_rtg_actinium = new ItemRTGPellet(20).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(5.3F, HalfLifeType.MEDIUM, false) * 1.5)).setUnlocalizedName("pellet_rtg_actinium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_actinium"); pellet_rtg_americium = new ItemRTGPellet(20).setDecays(DepletedRTGMaterial.NEPTUNIUM, (long) (RTGUtil.getLifespan(4.7F, HalfLifeType.LONG, false) * 1.5)).setUnlocalizedName("pellet_rtg_americium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_americium"); pellet_rtg_berkelium = new ItemRTGPellet(20).setUnlocalizedName("pellet_rtg_berkelium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_berkelium"); + pellet_rtg_polonium = new ItemRTGPellet(50).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(138.0F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_polonium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_polonium"); + pellet_rtg_gold = new ItemRTGPellet(VersatileConfig.rtgDecay() ? 300 : 100).setDecays(DepletedRTGMaterial.MERCURY, (long) (RTGUtil.getLifespan(2.7F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_gold").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_gold"); + pellet_rtg_lead = new ItemRTGPellet(VersatileConfig.rtgDecay() ? 600 : 200).setDecays(DepletedRTGMaterial.BISMUTH, (long) (RTGUtil.getLifespan(0.3F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_lead").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_lead"); tritium_deuterium_cake = new ItemCustomLore().setUnlocalizedName("tritium_deuterium_cake").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":tritium_deuterium_cake"); @@ -6151,16 +6153,17 @@ public class ModItems { GameRegistry.registerItem(flame_opinion, flame_opinion.getUnlocalizedName()); //Pellets - GameRegistry.registerItem(pellet_rtg, pellet_rtg.getUnlocalizedName()); GameRegistry.registerItem(pellet_rtg_radium, pellet_rtg_radium.getUnlocalizedName()); GameRegistry.registerItem(pellet_rtg_weak, pellet_rtg_weak.getUnlocalizedName()); - GameRegistry.registerItem(pellet_rtg_polonium, pellet_rtg_polonium.getUnlocalizedName()); + GameRegistry.registerItem(pellet_rtg, pellet_rtg.getUnlocalizedName()); GameRegistry.registerItem(pellet_rtg_strontium, pellet_rtg_strontium.getUnlocalizedName()); + GameRegistry.registerItem(pellet_rtg_cobalt, pellet_rtg_cobalt.getUnlocalizedName()); GameRegistry.registerItem(pellet_rtg_actinium, pellet_rtg_actinium.getUnlocalizedName()); - GameRegistry.registerItem(pellet_rtg_lead, pellet_rtg_lead.getUnlocalizedName()); - GameRegistry.registerItem(pellet_rtg_gold, pellet_rtg_gold.getUnlocalizedName()); + GameRegistry.registerItem(pellet_rtg_polonium, pellet_rtg_polonium.getUnlocalizedName()); GameRegistry.registerItem(pellet_rtg_americium, pellet_rtg_americium.getUnlocalizedName()); GameRegistry.registerItem(pellet_rtg_berkelium, pellet_rtg_berkelium.getUnlocalizedName()); + GameRegistry.registerItem(pellet_rtg_gold, pellet_rtg_gold.getUnlocalizedName()); + GameRegistry.registerItem(pellet_rtg_lead, pellet_rtg_lead.getUnlocalizedName()); GameRegistry.registerItem(pellet_rtg_depleted, pellet_rtg_depleted.getUnlocalizedName()); GameRegistry.registerItem(tritium_deuterium_cake, tritium_deuterium_cake.getUnlocalizedName()); GameRegistry.registerItem(pellet_cluster, pellet_cluster.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/machine/ItemRTGPelletDepleted.java b/src/main/java/com/hbm/items/machine/ItemRTGPelletDepleted.java index f6d932e70..f560f400a 100644 --- a/src/main/java/com/hbm/items/machine/ItemRTGPelletDepleted.java +++ b/src/main/java/com/hbm/items/machine/ItemRTGPelletDepleted.java @@ -13,6 +13,7 @@ public class ItemRTGPelletDepleted extends ItemEnumMulti { MERCURY, NEPTUNIUM, LEAD, - ZIRCONIUM; + ZIRCONIUM, + NICKEL; } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java new file mode 100644 index 000000000..dd53f06f8 --- /dev/null +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java @@ -0,0 +1,255 @@ +package com.hbm.tileentity.machine; + +import java.util.List; + +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; +import com.hbm.inventory.fluid.Fluids; +import com.hbm.inventory.recipes.RefineryRecipes; +import com.hbm.items.machine.ItemRTGPellet; +import com.hbm.items.machine.ItemRTGPelletDepleted; +import com.hbm.tileentity.TileEntityMachineBase; +import com.hbm.util.RTGUtil; +import com.hbm.util.Tuple.Quartet; + +import api.hbm.energy.IEnergyGenerator; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import scala.actors.threadpool.Arrays; + +public class TileEntityMachineRadiolysis extends TileEntityMachineBase implements IEnergyGenerator, IFluidAcceptor, IFluidSource, IFluidContainer { + + public long power; + public int progress; + public static final int maxProgress = 100; + public static final int maxPower = 1000000; + + public FluidTank[] tanks; + + private static final int[] slot_io = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 12, 13 }; + private static final int[] slot_rtg = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; + + public TileEntityMachineRadiolysis() { + super(14); //10 rtg slots, 2 fluid ID slots, 2 irradiation slots + tanks = new FluidTank[3]; + tanks[0] = new FluidTank(Fluids.NONE, 8000, 0); + tanks[1] = new FluidTank(Fluids.NONE, 8000, 1); + tanks[2] = new FluidTank(Fluids.NONE, 8000, 2); + } + + @Override + public String getName() { + return "container.radiolysis"; + } + + //IO Methods + @Override + public boolean isItemValidForSlot(int i, ItemStack itemStack) { + return i == 12 || (i < 10 && itemStack.getItem() instanceof ItemRTGPellet); + } + + @Override + public int[] getAccessibleSlotsFromSide(int side) { + return slot_io; + } + + @Override + public boolean canExtractItem(int i, ItemStack itemStack, int j) { + return (i < 10 && itemStack.getItem() instanceof ItemRTGPelletDepleted) || i == 13; + } + + //NBT Methods + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + this.power = nbt.getLong("power"); + this.progress = nbt.getInteger("progress"); + + tanks[0].readFromNBT(nbt, "input"); + tanks[1].readFromNBT(nbt, "output1"); + tanks[2].readFromNBT(nbt, "output2"); + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + + nbt.setLong("power", power); + nbt.setInteger("progress", progress); + + tanks[0].writeToNBT(nbt, "input"); + tanks[1].writeToNBT(nbt, "output1"); + tanks[2].writeToNBT(nbt, "output2"); + } + + public void networkUnpack(NBTTagCompound data) { + this.power = data.getLong("power"); + this.progress = data.getInteger("progress"); + } + + @Override + public void updateEntity() { + + if(!worldObj.isRemote) { + int heat = RTGUtil.updateRTGs(slots, slot_io); + power += heat * 15; + + if(power > maxPower) + power = maxPower; + + setupTanks(); + + if(heat > 0) { + progress += heat; + if(progress >= maxProgress) { + crack(); + progress = 0; + } + } else { + progress = 0; + } + + NBTTagCompound data = new NBTTagCompound(); + data.setLong("power", power); + data.setInteger("progress", progress); + this.networkPack(data, 50); + } + } + + //Processing Methods + private boolean canDoRadiolysis() { + + + + return false; + } + + private void crack() { + + Quartet quart = RefineryRecipes.getCracking(tanks[0].getTankType()); + + if(quart != null) { + + int left = quart.getY(); + int right = quart.getZ(); + + if(tanks[0].getFill() >= 100 && hasSpace(left, right)) { + tanks[0].setFill(tanks[0].getFill() - 100); + tanks[1].setFill(tanks[2].getFill() + left); + tanks[2].setFill(tanks[3].getFill() + right); + } + } + } + + private boolean hasSpace(int left, int right) { + return tanks[2].getFill() + left <= tanks[2].getMaxFill() && tanks[3].getFill() + right <= tanks[3].getMaxFill(); + } + + private void setupTanks() { + + Quartet quart = RefineryRecipes.getCracking(tanks[0].getTankType()); + + if(quart != null) { + tanks[1].setTankType(quart.getW()); + tanks[2].setTankType(quart.getX()); + } else { + tanks[0].setTankType(Fluids.NONE); + tanks[1].setTankType(Fluids.NONE); + tanks[2].setTankType(Fluids.NONE); + } + + } + + //Power methods + @Override + public void setPower(long power) { + this.power = power; + } + + @Override + public long getPower() { + return power; + } + + @Override + public long getMaxPower() { + return maxPower; + } + + //Fluid Methods + @Override + public void setFillstate(int fill, int index) { + if(index < 3 && tanks[index] != null) + tanks[index].setFill(fill); + } + + @Override + public void setFluidFill(int fill, FluidType type) { + for(FluidTank tank : tanks) { + if(tank.getTankType() == type) { + tank.setFill(fill); + } + } + } + + @Override + public void setType(FluidType type, int index) { + this.tanks[index].setTankType(type); + } + + @Override + public List getTanks() { + return Arrays.asList(this.tanks); + } + + @Override + public int getFluidFill(FluidType type) { + for(FluidTank tank : tanks) { + if(tank.getTankType() == type) { + return tank.getFill(); + } + } + return 0; + } + + @Override + public int getMaxFluidFill(FluidType type) { + if(type == tanks[0].getTankType()) + return tanks[0].getMaxFill(); + else + return 0; + } + + @Override + public void fillFluidInit(FluidType type) { + // TODO Auto-generated method stub + + } + + @Override + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { + // TODO Auto-generated method stub + + } + + @Override + public boolean getTact() { + return worldObj.getTotalWorldTime() % 10 == 0; + } + + @Override + public List getFluidList(FluidType type) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void clearFluidList(FluidType type) { + // TODO Auto-generated method stub + + } +} diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index d47fecc0c..75fc0909d 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -2266,10 +2266,13 @@ item.pellet_rtg_americium.name=Americium-241 RTG Pellet item.pellet_rtg_americium.desc=Rare and reliable, good old Americium! item.pellet_rtg_berkelium.name=Berkelium RTG Pellet item.pellet_rtg_berkelium.desc= +item.pellet_rtg_cobalt.name=Cobalt-60 RTG Pellet +item.pellet_rtg_cobalt.desc=Not the best as an RTG, but great for gamma radiation! item.pellet_rtg_depleted.bismuth.name=Decayed Bismuth RTG Pellet item.pellet_rtg_depleted.lead.name=Decayed Lead RTG Pellet item.pellet_rtg_depleted.neptunium.name=Decayed Neptunium RTG Pellet item.pellet_rtg_depleted.mercury.name=Decayed Mercury RTG Pellet +item.pellet_rtg_depleted.nickel.name=Decayed Nickel RTG Pellet item.pellet_rtg_depleted.zirconium.name=Decayed Zirconium RTG Pellet item.pellet_rtg_lead.name=Lead-209 RTG Pellet item.pellet_rtg_lead.desc=Exposure will result in immediate death. diff --git a/src/main/resources/assets/hbm/textures/items/pellet_rtg_cobalt.png b/src/main/resources/assets/hbm/textures/items/pellet_rtg_cobalt.png new file mode 100644 index 0000000000000000000000000000000000000000..2b422f3a209a76f473c0d506f6d3569002f2eb0c GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}f0G|+7Ne%bRis_RU9$2;W2CIm%dsrz@=I@zEB_PFK666>B9}F0zyqVpA zLYxI2k;M!Qe1}1p@p%4<6riBLr;B5VMsV*5Pc8;U9+!(}zS|cqH|qFu%Bksp;2$%G zojNS%G}f0G|-o^~8d@BeIx*f$uN~Gak=hkpdL-_jGX#(FpE6;mO6I$m4SH%y;{u Date: Sat, 29 Jan 2022 22:12:32 -0800 Subject: [PATCH 2/9] radiolysis 2 --- .../java/com/hbm/crafting/MineralRecipes.java | 3 + .../java/com/hbm/hazard/HazardRegistry.java | 8 +- .../inventory/recipes/RadiolysisRecipes.java | 51 +++++++ src/main/java/com/hbm/items/ModItems.java | 2 +- .../machine/TileEntityMachineRadiolysis.java | 132 ++++++++++++------ 5 files changed, 148 insertions(+), 48 deletions(-) create mode 100644 src/main/java/com/hbm/inventory/recipes/RadiolysisRecipes.java diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index 29ab3ae64..6adb78442 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -162,6 +162,9 @@ public class MineralRecipes { GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_po210be, 1), new Object[] { "nuggetPolonium210", "nuggetPolonium210", "nuggetPolonium210", ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_pu238be, 1), new Object[] { "nuggetPlutonium238", "nuggetPlutonium238", "nuggetPlutonium238", ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_ra226be, 1), new Object[] { "nuggetRadium226", "nuggetRadium226", "nuggetRadium226", ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_po210be, 2), new Object[] { ModItems.billet_polonium, ModItems.billet_beryllium })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_pu238be, 2), new Object[] { ModItems.billet_pu238, ModItems.billet_beryllium })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_ra226be, 2), new Object[] { ModItems.billet_ra226, ModItems.billet_beryllium })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_po210be, 6), new Object[] { ModItems.billet_polonium, ModItems.billet_polonium, ModItems.billet_polonium, ModItems.billet_beryllium, ModItems.billet_beryllium, ModItems.billet_beryllium })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_pu238be, 6), new Object[] { ModItems.billet_pu238, ModItems.billet_pu238, ModItems.billet_pu238, ModItems.billet_beryllium, ModItems.billet_beryllium, ModItems.billet_beryllium })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_ra226be, 6), new Object[] { ModItems.billet_ra226, ModItems.billet_ra226, ModItems.billet_ra226, ModItems.billet_beryllium, ModItems.billet_beryllium, ModItems.billet_beryllium })); diff --git a/src/main/java/com/hbm/hazard/HazardRegistry.java b/src/main/java/com/hbm/hazard/HazardRegistry.java index 239a39719..a10b5bb2f 100644 --- a/src/main/java/com/hbm/hazard/HazardRegistry.java +++ b/src/main/java/com/hbm/hazard/HazardRegistry.java @@ -251,8 +251,8 @@ public class HazardRegistry { registerOtherFuel(plate_fuel_mox, mox * ingot, mox * ingot * 100, false); registerOtherFuel(plate_fuel_pu239, pu239 * ingot, pu239 * ingot * 100, false); registerOtherFuel(plate_fuel_sa326, sa326 * ingot, sa326 * ingot * 100, true); - registerOtherFuel(plate_fuel_ra226be, rabe * ingot, po210 * nugget * 3, false); - registerOtherFuel(plate_fuel_pu238be, pube * ingot, pu238 * nugget, false); + registerOtherFuel(plate_fuel_ra226be, rabe * billet, po210 * nugget * 3, false); + registerOtherFuel(plate_fuel_pu238be, pube * billet, pu238 * nugget, false); registerOtherWaste(waste_plate_u233, u233 * ingot * 100); registerOtherWaste(waste_plate_u235, u235 * ingot * 100); @@ -320,6 +320,7 @@ public class HazardRegistry { registerRTGPellet(pellet_rtg_radium, ra226 * rtg, 0); registerRTGPellet(pellet_rtg_weak, (pu238 + (u238 * 2)) * billet, 0); registerRTGPellet(pellet_rtg_strontium, sr90 * rtg, 0); + registerRTGPellet(pellet_rtg_cobalt, co60 * rtg, 0); registerRTGPellet(pellet_rtg_actinium, ac227 * rtg, 0); registerRTGPellet(pellet_rtg_polonium, po210 * rtg, 0, 3F); registerRTGPellet(pellet_rtg_lead, pb209 * rtg, 0, 7F, 5F); @@ -329,10 +330,13 @@ public class HazardRegistry { registerBreedingRodRadiation(BreedingRodType.TRITIUM, 0.001F); registerBreedingRodRadiation(BreedingRodType.CO60, co60); + registerBreedingRodRadiation(BreedingRodType.RA226, ra226); + registerBreedingRodRadiation(BreedingRodType.AC227, ac227); registerBreedingRodRadiation(BreedingRodType.TH232, th232); registerBreedingRodRadiation(BreedingRodType.THF, thf); registerBreedingRodRadiation(BreedingRodType.U235, u235); registerBreedingRodRadiation(BreedingRodType.NP237, np237); + registerBreedingRodRadiation(BreedingRodType.U238, u238); registerBreedingRodRadiation(BreedingRodType.PU238, pu238); //it's in a container :) registerBreedingRodRadiation(BreedingRodType.PU239, pu239); registerBreedingRodRadiation(BreedingRodType.RGP, purg); diff --git a/src/main/java/com/hbm/inventory/recipes/RadiolysisRecipes.java b/src/main/java/com/hbm/inventory/recipes/RadiolysisRecipes.java new file mode 100644 index 000000000..3f87ac9ba --- /dev/null +++ b/src/main/java/com/hbm/inventory/recipes/RadiolysisRecipes.java @@ -0,0 +1,51 @@ +package com.hbm.inventory.recipes; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import com.hbm.inventory.FluidStack; +import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.fluid.Fluids; +import com.hbm.items.machine.ItemFluidIcon; +import com.hbm.util.Tuple.Pair; + +import net.minecraft.item.ItemStack; + +public class RadiolysisRecipes { + //All cracking recipes, + 2H2O => H2O2 + H2, + heavy oil => light oil + waste product, and others i haven't even thought of yet + + private static Map> radiolysis = new HashMap(); //fluidstacks :reimumunch: + + /* I am proud of this but I don't think I should be */ + public static Map getRecipesForNEI() { + Map recipes = new HashMap(); + Iterator key = radiolysis.entrySet().iterator(); + Iterator values = radiolysis.values().iterator(); + + while(key.hasNext() && values.hasNext()) { + Pair pair = (Pair) values.next(); + + recipes.put(ItemFluidIcon.make((FluidType) key.next(), 100), + new ItemStack[] { + ItemFluidIcon.make(pair.getKey().type, pair.getKey().fill), + ItemFluidIcon.make(pair.getValue().type, pair.getValue().fill) }); + } + + return recipes; + } + + public static void registerRadiolysis() { + radiolysis.put(Fluids.WATER, new Pair(new FluidStack(80, Fluids.ACID), new FluidStack(20, Fluids.HYDROGEN))); + + radiolysis.put(Fluids.BITUMEN, new Pair(new FluidStack(80, Fluids.OIL), new FluidStack(20, Fluids.PETROLEUM))); + radiolysis.put(Fluids.SMEAR, new Pair(new FluidStack(60, Fluids.NAPHTHA), new FluidStack(40, Fluids.PETROLEUM))); + radiolysis.put(Fluids.GAS, new Pair(new FluidStack(50, Fluids.PETROLEUM), new FluidStack(0, Fluids.NONE))); + radiolysis.put(Fluids.DIESEL, new Pair(new FluidStack(40, Fluids.KEROSENE), new FluidStack(30, Fluids.PETROLEUM))); + radiolysis.put(Fluids.KEROSENE, new Pair(new FluidStack(60, Fluids.PETROLEUM), new FluidStack(0, Fluids.NONE))); + } + + public static Pair getRadiolysis(FluidType input) { + return radiolysis.get(input); + } +} diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 35a86638c..5cd9212fe 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -2641,7 +2641,7 @@ public class ModItems { billet_pb209 = new Item().setUnlocalizedName("billet_pb209").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pb209"); billet_ra226 = new Item().setUnlocalizedName("billet_ra226").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_ra226"); billet_actinium = new Item().setUnlocalizedName("billet_actinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_actinium"); - billet_schrabidium = new Item().setUnlocalizedName("billet_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_schrabidium"); + billet_schrabidium = new ItemCustomLore().setRarity(EnumRarity.rare).setUnlocalizedName("billet_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_schrabidium"); billet_solinium = new Item().setUnlocalizedName("billet_solinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_solinium"); billet_gh336 = new ItemCustomLore().setRarity(EnumRarity.epic).setUnlocalizedName("billet_gh336").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_gh336"); billet_australium = new ItemCustomLore().setRarity(EnumRarity.uncommon).setUnlocalizedName("billet_australium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_australium"); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java index dd53f06f8..d4b4573bc 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java @@ -1,43 +1,50 @@ package com.hbm.tileentity.machine; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; +import com.hbm.inventory.FluidStack; import com.hbm.inventory.FluidTank; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; -import com.hbm.inventory.recipes.RefineryRecipes; +import com.hbm.inventory.recipes.RadiolysisRecipes; +import com.hbm.items.ModItems; import com.hbm.items.machine.ItemRTGPellet; import com.hbm.items.machine.ItemRTGPelletDepleted; +import com.hbm.lib.Library; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.RTGUtil; -import com.hbm.util.Tuple.Quartet; +import com.hbm.util.Tuple.Pair; import api.hbm.energy.IEnergyGenerator; +import net.minecraft.item.Item; +import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import scala.actors.threadpool.Arrays; public class TileEntityMachineRadiolysis extends TileEntityMachineBase implements IEnergyGenerator, IFluidAcceptor, IFluidSource, IFluidContainer { + //TODO: TileMapping, Render file + resource location, container, gui, gui texture, further recipes public long power; - public int progress; - public static final int maxProgress = 100; public static final int maxPower = 1000000; public FluidTank[] tanks; + public List list1 = new ArrayList(); + public List list2 = new ArrayList(); private static final int[] slot_io = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 12, 13 }; private static final int[] slot_rtg = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; public TileEntityMachineRadiolysis() { - super(14); //10 rtg slots, 2 fluid ID slots, 2 irradiation slots + super(14); //10 rtg slots, 2 fluid ID slots (io), 2 irradiation slots (io) tanks = new FluidTank[3]; - tanks[0] = new FluidTank(Fluids.NONE, 8000, 0); - tanks[1] = new FluidTank(Fluids.NONE, 8000, 1); - tanks[2] = new FluidTank(Fluids.NONE, 8000, 2); + tanks[0] = new FluidTank(Fluids.NONE, 2000, 0); + tanks[1] = new FluidTank(Fluids.NONE, 2000, 1); + tanks[2] = new FluidTank(Fluids.NONE, 2000, 2); } @Override @@ -45,7 +52,7 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement return "container.radiolysis"; } - //IO Methods + /* IO Methods */ @Override public boolean isItemValidForSlot(int i, ItemStack itemStack) { return i == 12 || (i < 10 && itemStack.getItem() instanceof ItemRTGPellet); @@ -61,13 +68,12 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement return (i < 10 && itemStack.getItem() instanceof ItemRTGPelletDepleted) || i == 13; } - //NBT Methods + /* NBT Methods */ @Override public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); this.power = nbt.getLong("power"); - this.progress = nbt.getInteger("progress"); tanks[0].readFromNBT(nbt, "input"); tanks[1].readFromNBT(nbt, "output1"); @@ -79,7 +85,6 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement super.writeToNBT(nbt); nbt.setLong("power", power); - nbt.setInteger("progress", progress); tanks[0].writeToNBT(nbt, "input"); tanks[1].writeToNBT(nbt, "output1"); @@ -88,7 +93,6 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement public void networkUnpack(NBTTagCompound data) { this.power = data.getLong("power"); - this.progress = data.getInteger("progress"); } @Override @@ -101,41 +105,33 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement if(power > maxPower) power = maxPower; + tanks[0].setType(10, 11, slots); setupTanks(); + tanks[0].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); if(heat > 0) { - progress += heat; - if(progress >= maxProgress) { + if(heat >= 100 && worldObj.getTotalWorldTime() % 40 == 0) crack(); - progress = 0; - } - } else { - progress = 0; + + if(heat >= 200 && worldObj.getTotalWorldTime() % 100 == 0) + sterilize(); } NBTTagCompound data = new NBTTagCompound(); data.setLong("power", power); - data.setInteger("progress", progress); this.networkPack(data, 50); } } - //Processing Methods - private boolean canDoRadiolysis() { - - - - return false; - } - + /* Processing Methods */ private void crack() { - Quartet quart = RefineryRecipes.getCracking(tanks[0].getTankType()); + Pair quart = RadiolysisRecipes.getRadiolysis(tanks[0].getTankType()); if(quart != null) { - int left = quart.getY(); - int right = quart.getZ(); + int left = quart.getKey().fill; + int right = quart.getValue().fill; if(tanks[0].getFill() >= 100 && hasSpace(left, right)) { tanks[0].setFill(tanks[0].getFill() - 100); @@ -151,11 +147,11 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement private void setupTanks() { - Quartet quart = RefineryRecipes.getCracking(tanks[0].getTankType()); + Pair quart = RadiolysisRecipes.getRadiolysis(tanks[0].getTankType()); if(quart != null) { - tanks[1].setTankType(quart.getW()); - tanks[2].setTankType(quart.getX()); + tanks[1].setTankType(quart.getKey().type); + tanks[2].setTankType(quart.getValue().type); } else { tanks[0].setTankType(Fluids.NONE); tanks[1].setTankType(Fluids.NONE); @@ -164,7 +160,47 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement } - //Power methods + // Code: pressure, sword, sterilize. + private void sterilize() { + if(!checkIfValid()) + return; + + if(slots[12].getItem() instanceof ItemFood && !(slots[12].getItem() == ModItems.pancake)) { + slots[12].stackSize -= 1; + if(slots[12].stackSize <= 0) + slots[12] = null; + } + + ItemStack output = slots[12].copy(); + output.stackSize = 1; + + if(slots[13] == null) { + slots[13] = output; + slots[13].stackTagCompound.setBoolean("ntmContagion", false); + } else if(slots[13].isItemEqual(output) && slots[13].stackSize + output.stackSize <= slots[13].getMaxStackSize()) { + slots[12].stackSize -= output.stackSize; + if(slots[12].stackSize <= 0) + slots[12] = null; + + slots[13].stackSize += output.stackSize; + slots[13].stackTagCompound.setBoolean("ntmContagion", false); + } + } + + private boolean checkIfValid() { + if(slots[12] == null) + return false; + + if(!slots[12].hasTagCompound()) + return false; + + if(!slots[12].getTagCompound().getBoolean("ntmContagion")) + return false; + + return true; + } + + /* Power methods */ @Override public void setPower(long power) { this.power = power; @@ -180,7 +216,7 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement return maxPower; } - //Fluid Methods + /* Fluid Methods */ @Override public void setFillstate(int fill, int index) { if(index < 3 && tanks[index] != null) @@ -226,14 +262,15 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement @Override public void fillFluidInit(FluidType type) { - // TODO Auto-generated method stub - + fillFluid(xCoord + 1, yCoord, zCoord, this.getTact(), type); + fillFluid(xCoord - 1, yCoord, zCoord, this.getTact(), type); + fillFluid(xCoord, yCoord, zCoord + 1, this.getTact(), type); + fillFluid(xCoord, yCoord, zCoord - 1, this.getTact(), type); } @Override public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { - // TODO Auto-generated method stub - + Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @Override @@ -243,13 +280,18 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement @Override public List getFluidList(FluidType type) { - // TODO Auto-generated method stub - return null; + if(type == tanks[1].getTankType()) + return list1; + if(type == tanks[2].getTankType()) + return list2; + return new ArrayList(); } @Override public void clearFluidList(FluidType type) { - // TODO Auto-generated method stub - + if(type == tanks[1].getTankType()) + list1.clear(); + if(type == tanks[2].getTankType()) + list2.clear(); } } From fbeabb708b34e59f83b4c8758b8ecb957618623e Mon Sep 17 00:00:00 2001 From: Vaern Date: Sat, 29 Jan 2022 22:45:25 -0800 Subject: [PATCH 3/9] ag agagagag --- src/main/java/com/hbm/blocks/ModBlocks.java | 2 +- .../hbm/blocks/machine/MachineRadiolysis.java | 16 ++++++++++++++++ src/main/java/com/hbm/main/MainRegistry.java | 1 + .../java/com/hbm/tileentity/TileMappings.java | 3 ++- .../machine/TileEntityMachineRadiolysis.java | 2 +- src/main/resources/assets/hbm/lang/en_US.lang | 1 + 6 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 0070a3fbb..4d5bc3cd5 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -1791,7 +1791,7 @@ public class ModBlocks { machine_geo = new MachineAmgen(Material.iron).setBlockName("machine_geo").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); machine_minirtg = new MachineMiniRTG(Material.iron).setBlockName("machine_minirtg").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":rtg_cell"); machine_powerrtg = new MachineMiniRTG(Material.iron).setBlockName("machine_powerrtg").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":rtg_polonium"); - machine_radiolysis = new MachineRadiolysis(Material.iron).setBlockName("machine_radiolysis").setHardness(10.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); + machine_radiolysis = new MachineRadiolysis(Material.iron).setBlockName("machine_radiolysis").setHardness(10.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel_machine"); red_wire_coated = new WireCoated(Material.iron).setBlockName("red_wire_coated").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":red_wire_coated"); red_cable = new BlockCable(Material.iron).setBlockName("red_cable").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":cable_neo"); diff --git a/src/main/java/com/hbm/blocks/machine/MachineRadiolysis.java b/src/main/java/com/hbm/blocks/machine/MachineRadiolysis.java index d048d7697..ee51a414b 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineRadiolysis.java +++ b/src/main/java/com/hbm/blocks/machine/MachineRadiolysis.java @@ -68,4 +68,20 @@ public class MachineRadiolysis extends BlockDummyable { this.makeExtra(world, x + dir.offsetX * o, y, z + dir.offsetZ * o + 1); this.makeExtra(world, x + dir.offsetX * o, y, z + dir.offsetZ * o - 1); } + + //Temporary until model made + @Override + public int getRenderType() { + return 0; + } + + @Override + public boolean isOpaqueCube() { + return true; + } + + @Override + public boolean renderAsNormalBlock() { + return true; + } } diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 2c102212b..2e95c800d 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -949,6 +949,7 @@ public class MainRegistry { PressRecipes.register(); RefineryRecipes.registerFractions(); RefineryRecipes.registerCracking(); + RadiolysisRecipes.registerRadiolysis(); LiquefactionRecipes.register(); FuelPoolRecipes.register(); diff --git a/src/main/java/com/hbm/tileentity/TileMappings.java b/src/main/java/com/hbm/tileentity/TileMappings.java index 234430f28..8d3e33da7 100644 --- a/src/main/java/com/hbm/tileentity/TileMappings.java +++ b/src/main/java/com/hbm/tileentity/TileMappings.java @@ -185,7 +185,7 @@ public class TileMappings { put(TileEntityWatz.class, "tileentity_watz"); put(TileEntityMachineBAT9000.class, "tileentity_bat9000"); put(TileEntityMachineOrbus.class, "tileentity_orbus"); - + put(TileEntityLoot.class, "tileentity_ntm_loot"); put(TileEntityBobble.class, "tileentity_ntm_bobblehead"); @@ -231,6 +231,7 @@ public class TileMappings { private static void putMachines() { put(TileEntityDiFurnaceRTG.class, "tileentity_rtg_difurnace"); + put(TileEntityMachineRadiolysis.class, "tileentity_radiolysis"); put(TileEntityUVLamp.class, "tileentity_uv_lamp"); put(TileEntityCondenser.class, "tileentity_condenser"); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java index d4b4573bc..6cf14b1c6 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java @@ -27,7 +27,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; public class TileEntityMachineRadiolysis extends TileEntityMachineBase implements IEnergyGenerator, IFluidAcceptor, IFluidSource, IFluidContainer { - //TODO: TileMapping, Render file + resource location, container, gui, gui texture, further recipes + //TODO: TileMapping, Render file + resource location, container, gui, gui texture, further recipes; add registerRadiolysis to PostLoad public long power; public static final int maxPower = 1000000; diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index b5305ab95..1d1ff4c9f 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -3545,6 +3545,7 @@ tile.machine_puf6_tank.name=Plutonium Hexafluoride Tank tile.machine_pumpjack.name=Pumpjack tile.machine_radar.name=Radar tile.machine_radgen.name=Radiation-Powered Engine +tile.machine_radiolysis.name=Radioisotope Thermoelectric Generator and Radiolysis Chamber tile.machine_reactor.name=Breeding Reactor tile.machine_reactor_small.name=Research Reactor tile.machine_refinery.name=Oil Refinery From ba51590bda161730cf347466d2a921dabde15b24 Mon Sep 17 00:00:00 2001 From: Vaern Date: Sun, 30 Jan 2022 13:03:21 -0800 Subject: [PATCH 4/9] trolling --- src/main/java/com/hbm/blocks/ModBlocks.java | 3 +- .../hbm/blocks/machine/MachineRadiolysis.java | 4 +- src/main/java/com/hbm/handler/GUIHandler.java | 9 ++ .../container/ContainerRadiolysis.java | 77 ++++++++++++++++++ .../com/hbm/inventory/gui/GUIRadiolysis.java | 65 +++++++++++++++ .../machine/TileEntityMachineRadiolysis.java | 48 +++++++---- .../hbm/textures/gui/gui_radiolysis.png | Bin 0 -> 2147 bytes 7 files changed, 187 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/hbm/inventory/container/ContainerRadiolysis.java create mode 100644 src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java create mode 100644 src/main/resources/assets/hbm/textures/gui/gui_radiolysis.png diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 9b4daad41..c700c2eca 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -869,8 +869,7 @@ public class ModBlocks { public static Block machine_minirtg; public static Block machine_powerrtg; public static Block machine_radiolysis; - public static final int guiID_machine_radiolysis = 125; - + public static Block machine_well; public static Block oil_pipe; public static final int guiID_machine_well = 40; diff --git a/src/main/java/com/hbm/blocks/machine/MachineRadiolysis.java b/src/main/java/com/hbm/blocks/machine/MachineRadiolysis.java index ee51a414b..b69185e0c 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineRadiolysis.java +++ b/src/main/java/com/hbm/blocks/machine/MachineRadiolysis.java @@ -26,7 +26,7 @@ public class MachineRadiolysis extends BlockDummyable { if(meta >= 12) return new TileEntityMachineRadiolysis(); if(meta >= 6) - return new TileEntityProxyCombo(false, true, true); + return new TileEntityProxyCombo(true, true, true); return null; } @@ -43,7 +43,7 @@ public class MachineRadiolysis extends BlockDummyable { if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_radiolysis, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return false; diff --git a/src/main/java/com/hbm/handler/GUIHandler.java b/src/main/java/com/hbm/handler/GUIHandler.java index 2bef5fcda..62bcf3bbd 100644 --- a/src/main/java/com/hbm/handler/GUIHandler.java +++ b/src/main/java/com/hbm/handler/GUIHandler.java @@ -28,10 +28,15 @@ public class GUIHandler implements IGuiHandler { public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { TileEntity entity = world.getTileEntity(x, y, z); + /* yeah, that's better but something like UFFR's system would be best */ if(entity instanceof TileEntityMachineLiquefactor) { return new ContainerLiquefactor(player.inventory, (TileEntityMachineLiquefactor) entity); } + if(entity instanceof TileEntityMachineRadiolysis) { + return new ContainerRadiolysis(player.inventory, (TileEntityMachineRadiolysis) entity); + } + switch(ID) { case ModBlocks.guiID_test_difurnace: { if(entity instanceof TileEntityDiFurnace) { @@ -872,6 +877,10 @@ public class GUIHandler implements IGuiHandler { return new GUILiquefactor(player.inventory, (TileEntityMachineLiquefactor) entity); } + if(entity instanceof TileEntityMachineRadiolysis) { + return new GUIRadiolysis(player.inventory, (TileEntityMachineRadiolysis) entity); + } + switch(ID) { case ModBlocks.guiID_test_difurnace: { if(entity instanceof TileEntityDiFurnace) { diff --git a/src/main/java/com/hbm/inventory/container/ContainerRadiolysis.java b/src/main/java/com/hbm/inventory/container/ContainerRadiolysis.java new file mode 100644 index 000000000..c09fccc59 --- /dev/null +++ b/src/main/java/com/hbm/inventory/container/ContainerRadiolysis.java @@ -0,0 +1,77 @@ +package com.hbm.inventory.container; + +import com.hbm.inventory.SlotMachineOutput; +import com.hbm.tileentity.machine.TileEntityMachineRadiolysis; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class ContainerRadiolysis extends Container { + + private TileEntityMachineRadiolysis radiolysis; + + public ContainerRadiolysis(InventoryPlayer playerInv, TileEntityMachineRadiolysis tile) { + radiolysis = tile; + + //RTG + for(byte i = 0; i < 2; i++) { + for(byte j = 0; j < 5; j++) { + this.addSlotToContainer(new Slot(tile, j + i * 5, 188 + i * 18, 8 + j * 18)); + } + } + + //Fluid IO + this.addSlotToContainer(new Slot(tile, 10, 34, 17)); + this.addSlotToContainer(new SlotMachineOutput(tile, 11, 34, 53)); + + //Sterilization + this.addSlotToContainer(new Slot(tile, 12, 148, 17)); + this.addSlotToContainer(new SlotMachineOutput(tile, 13, 148, 53)); + + for(int i = 0; i < 3; i++) { + for(int j = 0; j < 9; j++) { + this.addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); + } + } + + for(int i = 0; i < 9; i++) { + this.addSlotToContainer(new Slot(playerInv, i, 8 + i * 18, 142)); + } + } + + @Override + public boolean canInteractWith(EntityPlayer player) { + return radiolysis.isUseableByPlayer(player); + } + + /** my eye, my eye, coctor coctor coctor **/ + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + ItemStack var3 = null; + Slot slot = (Slot) this.inventorySlots.get(index); + + if(slot != null && slot.getHasStack()) { + ItemStack stack = slot.getStack(); + var3 = stack.copy(); + + if(index <= 13) { + if(!this.mergeItemStack(stack, 14, this.inventorySlots.size(), true)) { + return null; + } + } else if(!this.mergeItemStack(stack, 0, 14, false)) { + return null; + } + + if(stack.stackSize == 0) { + slot.putStack((ItemStack) null); + } else { + slot.onSlotChanged(); + } + } + + return var3; + } +} diff --git a/src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java b/src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java new file mode 100644 index 000000000..c86124ac6 --- /dev/null +++ b/src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java @@ -0,0 +1,65 @@ +package com.hbm.inventory.gui; + +import org.lwjgl.opengl.GL11; + +import com.hbm.inventory.FluidTank; +import com.hbm.inventory.container.ContainerRadiolysis; +import com.hbm.lib.RefStrings; +import com.hbm.tileentity.machine.TileEntityMachineRadiolysis; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; + +public class GUIRadiolysis extends GuiInfoContainer { + + private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_radiolysis.png"); + private TileEntityMachineRadiolysis radiolysis; + + public GUIRadiolysis(InventoryPlayer invPlayer, TileEntityMachineRadiolysis tedf) { + super(new ContainerRadiolysis(invPlayer, tedf)); + radiolysis = tedf; + + this.xSize = 230; + this.ySize = 166; + } + + @Override + public void drawScreen(int mouseX, int mouseY, float f) { + super.drawScreen(mouseX, mouseY, f); + + radiolysis.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 61, guiTop + 17, 8, 52); + radiolysis.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 80, guiTop + 17, 26, 16); + radiolysis.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 80, guiTop + 53, 26, 16); + + this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 17, 16, 52, radiolysis.power, radiolysis.maxPower); + } + + @Override + protected void drawGuiContainerForegroundLayer(int i, int j) { + + String name = this.radiolysis.hasCustomInventoryName() ? this.radiolysis.getInventoryName() : I18n.format(this.radiolysis.getInventoryName()); + + this.fontRendererObj.drawString(name, 88 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); + this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + Minecraft.getMinecraft().getTextureManager().bindTexture(texture); + drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + + int i = (int)(radiolysis.getPower() * 52 / radiolysis.getMaxPower()); + drawTexturedModalRect(guiLeft + 8, guiTop + 69 - i, 240, 52 - i, 16, i); + + Minecraft.getMinecraft().getTextureManager().bindTexture(radiolysis.tanks[0].getSheet()); + radiolysis.tanks[0].renderTank(this, guiLeft + 61, guiTop + 69, radiolysis.tanks[0].getTankType().textureX() * FluidTank.x, radiolysis.tanks[0].getTankType().textureY() * FluidTank.y, 8, 52); + + for(byte j = 0; j < 2; j++) { + Minecraft.getMinecraft().getTextureManager().bindTexture(radiolysis.tanks[j].getSheet()); + radiolysis.tanks[j + 1].renderTank(this, guiLeft + 80, guiTop + 33 + j * 36, radiolysis.tanks[j + 1].getTankType().textureX() * FluidTank.x, radiolysis.tanks[j + 1].getTankType().textureY() * FluidTank.y, 26, 16); + } + } +} diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java index 6cf14b1c6..66765d560 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import com.hbm.blocks.BlockDummyable; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; @@ -21,10 +22,12 @@ import com.hbm.util.RTGUtil; import com.hbm.util.Tuple.Pair; import api.hbm.energy.IEnergyGenerator; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; public class TileEntityMachineRadiolysis extends TileEntityMachineBase implements IEnergyGenerator, IFluidAcceptor, IFluidSource, IFluidContainer { //TODO: TileMapping, Render file + resource location, container, gui, gui texture, further recipes; add registerRadiolysis to PostLoad @@ -99,15 +102,20 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement public void updateEntity() { if(!worldObj.isRemote) { - int heat = RTGUtil.updateRTGs(slots, slot_io); + int heat = RTGUtil.updateRTGs(slots, slot_rtg); power += heat * 15; if(power > maxPower) power = maxPower; + ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - BlockDummyable.offset); + this.sendPower(worldObj, xCoord + 2, yCoord, zCoord, dir); + this.sendPower(worldObj, xCoord - 2, yCoord, zCoord, dir); + this.sendPower(worldObj, xCoord, yCoord, zCoord + 2, dir); + this.sendPower(worldObj, xCoord, yCoord, zCoord - 2, dir); + tanks[0].setType(10, 11, slots); setupTanks(); - tanks[0].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); if(heat > 0) { if(heat >= 100 && worldObj.getTotalWorldTime() % 40 == 0) @@ -117,9 +125,17 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement sterilize(); } + if(worldObj.getTotalWorldTime() % 10 == 0) { + fillFluidInit(tanks[1].getTankType()); + fillFluidInit(tanks[2].getTankType()); + } + NBTTagCompound data = new NBTTagCompound(); data.setLong("power", power); this.networkPack(data, 50); + + for(byte i = 0; i < 3; i++) + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); } } @@ -135,20 +151,20 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement if(tanks[0].getFill() >= 100 && hasSpace(left, right)) { tanks[0].setFill(tanks[0].getFill() - 100); - tanks[1].setFill(tanks[2].getFill() + left); - tanks[2].setFill(tanks[3].getFill() + right); + tanks[1].setFill(tanks[1].getFill() + left); + tanks[2].setFill(tanks[2].getFill() + right); } } } private boolean hasSpace(int left, int right) { - return tanks[2].getFill() + left <= tanks[2].getMaxFill() && tanks[3].getFill() + right <= tanks[3].getMaxFill(); + return tanks[1].getFill() + left <= tanks[1].getMaxFill() && tanks[2].getFill() + right <= tanks[2].getMaxFill(); } private void setupTanks() { Pair quart = RadiolysisRecipes.getRadiolysis(tanks[0].getTankType()); - + if(quart != null) { tanks[1].setTankType(quart.getKey().type); tanks[2].setTankType(quart.getValue().type); @@ -254,18 +270,20 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement @Override public int getMaxFluidFill(FluidType type) { - if(type == tanks[0].getTankType()) - return tanks[0].getMaxFill(); - else - return 0; + for(FluidTank tank : tanks) { + if(tank.getTankType() == type) { + return tank.getMaxFill(); + } + } + return 0; } @Override public void fillFluidInit(FluidType type) { - fillFluid(xCoord + 1, yCoord, zCoord, this.getTact(), type); - fillFluid(xCoord - 1, yCoord, zCoord, this.getTact(), type); - fillFluid(xCoord, yCoord, zCoord + 1, this.getTact(), type); - fillFluid(xCoord, yCoord, zCoord - 1, this.getTact(), type); + fillFluid(this.xCoord + 2, this.yCoord, this.zCoord, this.getTact(), type); + fillFluid(this.xCoord - 2, this.yCoord, this.zCoord, this.getTact(), type); + fillFluid(this.xCoord, this.yCoord, this.zCoord + 2, this.getTact(), type); + fillFluid(this.xCoord, this.yCoord, this.zCoord - 2, this.getTact(), type); } @Override @@ -275,7 +293,7 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement @Override public boolean getTact() { - return worldObj.getTotalWorldTime() % 10 == 0; + return worldObj.getTotalWorldTime() % 20 < 10; } @Override diff --git a/src/main/resources/assets/hbm/textures/gui/gui_radiolysis.png b/src/main/resources/assets/hbm/textures/gui/gui_radiolysis.png new file mode 100644 index 0000000000000000000000000000000000000000..61134e44f04d736b783cc5d32314006ab0ff4336 GIT binary patch literal 2147 zcmd5-c|6qX8h?JjnL&eT>^T``Y`KMTbZRWA$u=s>9MQ4GxRjFYvSj&@CUHL2mRn?3 z<|J{@L1=O%QK6J{&>UBhj*P92RPIlmbN{@5-9PU8dEU?SexK$0KJWH+%FSgJML2UTq57fPYa9>*b~@|?sLhi8=u5)!6xZIx2G_8{ zSXo(tW$n(+PI#~9>go#f2JrS#V zEXd4*^nU=q08ZsYaxtV7LqY{4mP4!n;wmBP8idut(FQo&4E}AvYX`5p;MN1~-LSV8 zTzbK20Jx7~&oi(e1iN9d62XpfFnL(=N9h?fj@vDP*kfeC~+JS{(zh^NJ99-FsT@wxj;Gxl$mxv zYI&3k%4V=Z^g8EfVrqx8WY^1Uf*MJ?I6SN|Vfo#9zkTHF!7%HL@1hoH;>!$AEEo;* z*9#0>8`G2Bu%=t2gmwyU4k0Sxp4)s2Rb3Zbj&>>0->48qicB7<>~E0l%C}ph)bP$} zy>dz&{kBS}ul4DZPE7~eCv|bP@3c;~eBXe&xR9|2WK!eb(8O&FAB_5(p1EKX9(!bJ za)z*dT|{hb(`7;*;jbco6LKsrp!_@1U+eh8M7&GeNtkLUWzq5=q4PU_AzJ7>W8DT_kOF1BN7KjpZ|xiC+HE z3F#fG(o%ms%4X7Q?{mK!A#`@>dB3$9`w>q%VB&=tt(W`2Xc;>3CF(iXQaGj_D$?QF z2wD7eT4({Q5phZi$gOYYh{OwH(aojYfoOIvfmq(_#ukR~?^A>| z?uYb^my)f_=&_wBn#daWMtz6J`K2c*lajLsEd-mDsp3;51M1n9w&HLN`2c;o$jRyk zHlJT-@8c4%milVd!nA6`h_!kXB6&rs`2Crr-BND9V`KRE`dm?sCl*h4=xfWg*~m*| zmWr}3i9&S>Ycbfv2W`#f=SKLhwBM30H_bd%dTtBa&hpb`_YL&#P`WWr7LL6PQBzH~ zmt44KI*lXJ=`Y8YOY6%rh{C)^@gquFUtgt2zy7Z@<-=2v=4@87iLv6PkLpwzF9xrm zIiFTDsKD4$4eqzrO@8jkX`B4Xf<0>89gUId)Z~Io(#ezFZvy>tE<4U|XG_$6K7&1e zLEzEH_a9?Z>8V@Ov=VYwXSuhGc?&~j-H?>ajtzvbmnFPL(mqYgtXy!=oVRqV$6Z}j zmeIe)O?MgjZBBI)`4E9z3}mUi%RtVKR>WLw^@Jy&iP>H-!LontS(&Fq-%(;OwWH3y zD@k)eV#HZn2JM@WQ#p?j2T{r=4Lvvf^&ULav6xyp{6yxQvjhH8Pcx6TUg&q$6V_p~ zcjhV@j9ITKeDLnz0v9mx|M-&ZRb)H=^{F-01H78x;(0?Vk(zH73DghRP zm?z4{Ft=V!Qdo`?(0MOI{_exPGsr}ndx}**>^fiGem+Q=%#M^M(VI`A)DcT0Ew}`% tf8j!@rylehC}NY!|3~gHL*C6#8iidNWV5n)KK_xxE*nSdYD-?qzX9E}l=T1r literal 0 HcmV?d00001 From 9ca0d83933a56de523c92efeff5764784efdbdc6 Mon Sep 17 00:00:00 2001 From: Vaern Date: Sun, 30 Jan 2022 20:09:12 -0800 Subject: [PATCH 5/9] trolling: troll harder --- .../handler/nei/RadiolysisRecipeHandler.java | 132 ++++++++++++++++++ .../container/ContainerRadiolysis.java | 9 +- .../com/hbm/inventory/gui/GUIMachineRTG.java | 2 +- .../com/hbm/inventory/gui/GUIRadiolysis.java | 12 +- .../inventory/recipes/AssemblerRecipes.java | 17 ++- .../hbm/inventory/recipes/FusionRecipes.java | 12 +- .../inventory/recipes/RadiolysisRecipes.java | 26 ++-- src/main/java/com/hbm/main/ClientProxy.java | 1 + src/main/java/com/hbm/main/NEIConfig.java | 2 + .../java/com/hbm/main/ResourceManager.java | 6 +- .../hbm/render/item/ItemRenderLibrary.java | 11 ++ .../render/tileentity/RenderRadiolysis.java | 44 ++++++ .../tileentity/machine/TileEntityITER.java | 4 +- .../machine/TileEntityMachineIGenerator.java | 2 +- .../machine/TileEntityMachineRTG.java | 2 +- .../machine/TileEntityMachineRadiolysis.java | 62 ++++---- .../hbm/textures/gui/gui_radiolysis.png | Bin 2147 -> 2047 bytes .../textures/gui/nei/gui_nei_radiolysis.png | Bin 0 -> 1222 bytes 18 files changed, 285 insertions(+), 59 deletions(-) create mode 100644 src/main/java/com/hbm/handler/nei/RadiolysisRecipeHandler.java create mode 100644 src/main/java/com/hbm/render/tileentity/RenderRadiolysis.java create mode 100644 src/main/resources/assets/hbm/textures/gui/nei/gui_nei_radiolysis.png diff --git a/src/main/java/com/hbm/handler/nei/RadiolysisRecipeHandler.java b/src/main/java/com/hbm/handler/nei/RadiolysisRecipeHandler.java new file mode 100644 index 000000000..edd81d147 --- /dev/null +++ b/src/main/java/com/hbm/handler/nei/RadiolysisRecipeHandler.java @@ -0,0 +1,132 @@ +package com.hbm.handler.nei; + +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map.Entry; + +import com.hbm.blocks.ModBlocks; +import com.hbm.inventory.gui.GUIRadiolysis; +import com.hbm.inventory.recipes.RadiolysisRecipes; +import com.hbm.lib.RefStrings; + +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.TemplateRecipeHandler; +import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect; +import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRectHandler; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.item.ItemStack; + +public class RadiolysisRecipeHandler extends TemplateRecipeHandler { + + public LinkedList transferRectsRec = new LinkedList(); + public LinkedList transferRectsGui = new LinkedList(); + public LinkedList> guiRec = new LinkedList>(); + public LinkedList> guiGui = new LinkedList>(); + + public class RecipeSet extends TemplateRecipeHandler.CachedRecipe { + PositionedStack input; + PositionedStack output1; + PositionedStack output2; + + public RecipeSet(ItemStack input, ItemStack output1, ItemStack output2) { + input.stackSize = 1; + this.input = new PositionedStack(input, 34, 25); + this.output1 = new PositionedStack(output1, 118, 16); + this.output2 = new PositionedStack(output2, 118, 34); + } + + @Override + public List getIngredients() { + return getCycledIngredients(cycleticks / 20, Arrays.asList(input)); + } + + @Override + public PositionedStack getResult() { + return output1; + } + + @Override + public List getOtherStacks() { + List stacks = new ArrayList(); + stacks.add(output2); + return stacks; + } + } + + @Override + public String getRecipeName() { + return "Radiolysis"; + } + + @Override + public String getGuiTexture() { + return RefStrings.MODID + ":textures/gui/nei/gui_nei_radiolysis.png"; + } + + @Override + public void loadCraftingRecipes(String outputId, Object... results) { + + if(outputId.equals("ntmRadiolysis")) { + HashMap recipes = (HashMap) RadiolysisRecipes.getRecipesForNEI(); + + for(Entry recipe : recipes.entrySet()) { + this.arecipes.add(new RecipeSet((ItemStack)recipe.getKey(), (ItemStack)recipe.getValue()[0], (ItemStack)recipe.getValue()[1])); + } + } else { + super.loadCraftingRecipes(outputId, results); + } + } + + @Override + public void loadCraftingRecipes(ItemStack result) { + HashMap recipes = (HashMap) RadiolysisRecipes.getRecipesForNEI(); + + for(Entry recipe : recipes.entrySet()) { + if(NEIServerUtils.areStacksSameType((ItemStack)recipe.getValue()[0], result) || NEIServerUtils.areStacksSameType((ItemStack)recipe.getValue()[1], result)) + this.arecipes.add(new RecipeSet((ItemStack)recipe.getKey(), (ItemStack)recipe.getValue()[0], (ItemStack)recipe.getValue()[1])); + } + } + + @Override + public void loadUsageRecipes(String inputId, Object... ingredients) { + + if(inputId.equals("ntmRadiolysis")) { + loadCraftingRecipes("ntmRadiolysis", new Object[0]); + } else { + super.loadUsageRecipes(inputId, ingredients); + } + } + + @Override + public void loadUsageRecipes(ItemStack ingredient) { + HashMap recipes = (HashMap) RadiolysisRecipes.getRecipesForNEI(); + + for(Entry recipe : recipes.entrySet()) { + if(NEIServerUtils.areStacksSameType((ItemStack)recipe.getKey(), ingredient)) + this.arecipes.add(new RecipeSet((ItemStack)recipe.getKey(), (ItemStack)recipe.getValue()[0], (ItemStack)recipe.getValue()[1])); + } + } + + @Override + public void drawExtras(int recipe) { + drawProgressBar(52, 19, 5, 87, 64, 28, 60, 0); + } + + @Override + public void loadTransferRects() { + transferRectsGui = new LinkedList(); + guiGui = new LinkedList>(); + + transferRects.add(new RecipeTransferRect(new Rectangle(52, 19, 64, 27), "ntmRadiolysis")); + transferRectsGui.add(new RecipeTransferRect(new Rectangle(66, 25, 25, 14), "ntmRadiolysis")); + guiGui.add(GUIRadiolysis.class); + RecipeTransferRectHandler.registerRectsToGuis(getRecipeTransferRectGuis(), transferRects); + RecipeTransferRectHandler.registerRectsToGuis(guiGui, transferRectsGui); + } + +} diff --git a/src/main/java/com/hbm/inventory/container/ContainerRadiolysis.java b/src/main/java/com/hbm/inventory/container/ContainerRadiolysis.java index c09fccc59..d3fe7e708 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerRadiolysis.java +++ b/src/main/java/com/hbm/inventory/container/ContainerRadiolysis.java @@ -31,6 +31,9 @@ public class ContainerRadiolysis extends Container { this.addSlotToContainer(new Slot(tile, 12, 148, 17)); this.addSlotToContainer(new SlotMachineOutput(tile, 13, 148, 53)); + //Battery + this.addSlotToContainer(new Slot(tile, 14, 8, 53)); + for(int i = 0; i < 3; i++) { for(int j = 0; j < 9; j++) { this.addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); @@ -57,11 +60,11 @@ public class ContainerRadiolysis extends Container { ItemStack stack = slot.getStack(); var3 = stack.copy(); - if(index <= 13) { - if(!this.mergeItemStack(stack, 14, this.inventorySlots.size(), true)) { + if(index <= 14) { + if(!this.mergeItemStack(stack, 15, this.inventorySlots.size(), true)) { return null; } - } else if(!this.mergeItemStack(stack, 0, 14, false)) { + } else if(!this.mergeItemStack(stack, 0, 15, false)) { return null; } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java b/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java index 7ac329f62..2dc166fa4 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineRTG.java @@ -43,7 +43,7 @@ public class GUIMachineRTG extends GuiInfoContainer { for(int i = 0; i < pellets.size(); i++) { ItemRTGPellet pellet = pellets.get(i); - pelletText[i + 1] = I18nUtil.resolveKey("desc.gui.rtg.pelletPower", I18nUtil.resolveKey(pellet.getUnlocalizedName() + ".name"), pellet.getHeat() * 10); + pelletText[i + 1] = I18nUtil.resolveKey("desc.gui.rtg.pelletPower", I18nUtil.resolveKey(pellet.getUnlocalizedName() + ".name"), pellet.getHeat() * 5); } this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36, 16, 16, guiLeft - 8, guiTop + 36 + 16, pelletText); diff --git a/src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java b/src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java index c86124ac6..f847032bb 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java +++ b/src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java @@ -30,10 +30,10 @@ public class GUIRadiolysis extends GuiInfoContainer { super.drawScreen(mouseX, mouseY, f); radiolysis.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 61, guiTop + 17, 8, 52); - radiolysis.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 80, guiTop + 17, 26, 16); - radiolysis.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 80, guiTop + 53, 26, 16); + radiolysis.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 87, guiTop + 17, 12, 16); + radiolysis.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 87, guiTop + 53, 12, 16); - this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 17, 16, 52, radiolysis.power, radiolysis.maxPower); + this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 17, 16, 34, radiolysis.power, radiolysis.maxPower); } @Override @@ -51,15 +51,15 @@ public class GUIRadiolysis extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(texture); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - int i = (int)(radiolysis.getPower() * 52 / radiolysis.getMaxPower()); - drawTexturedModalRect(guiLeft + 8, guiTop + 69 - i, 240, 52 - i, 16, i); + int i = (int)(radiolysis.getPower() * 34 / radiolysis.getMaxPower()); + drawTexturedModalRect(guiLeft + 8, guiTop + 51 - i, 240, 34 - i, 16, i); Minecraft.getMinecraft().getTextureManager().bindTexture(radiolysis.tanks[0].getSheet()); radiolysis.tanks[0].renderTank(this, guiLeft + 61, guiTop + 69, radiolysis.tanks[0].getTankType().textureX() * FluidTank.x, radiolysis.tanks[0].getTankType().textureY() * FluidTank.y, 8, 52); for(byte j = 0; j < 2; j++) { Minecraft.getMinecraft().getTextureManager().bindTexture(radiolysis.tanks[j].getSheet()); - radiolysis.tanks[j + 1].renderTank(this, guiLeft + 80, guiTop + 33 + j * 36, radiolysis.tanks[j + 1].getTankType().textureX() * FluidTank.x, radiolysis.tanks[j + 1].getTankType().textureY() * FluidTank.y, 26, 16); + radiolysis.tanks[j + 1].renderTank(this, guiLeft + 87, guiTop + 33 + j * 36, radiolysis.tanks[j + 1].getTankType().textureX() * FluidTank.x, radiolysis.tanks[j + 1].getTankType().textureY() * FluidTank.y, 12, 16); } } } diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index 7482e56cc..7a4bdc46d 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -251,7 +251,7 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModItems.part_carbon, 1), new AStack[] {new ComparableStack(ModItems.plate_polymer, 1), new OreDictStack(COAL.dust(), 1), },50); makeRecipe(new ComparableStack(ModItems.part_copper, 1), new AStack[] {new ComparableStack(ModItems.plate_polymer, 1), new OreDictStack(CU.dust(), 1), },50); makeRecipe(new ComparableStack(ModItems.part_plutonium, 1), new AStack[] {new ComparableStack(ModItems.plate_polymer, 1), new ComparableStack(ModItems.powder_plutonium, 1), },50); - makeRecipe(new ComparableStack(ModItems.thermo_element, 1), new AStack[] {new OreDictStack(STEEL.plate(), 3), new OreDictStack(IRON.plate(), 1), new OreDictStack(CU.plate(), 2), new ComparableStack(ModItems.wire_red_copper, 2), new ComparableStack(ModItems.wire_aluminium, 2), new OreDictStack(NETHERQUARTZ.dust(), 4), },150); + makeRecipe(new ComparableStack(ModItems.thermo_element, 1), new AStack[] {new OreDictStack(STEEL.plate(), 2), new OreDictStack(IRON.plate(), 1), new OreDictStack(CU.plate(), 2), new ComparableStack(ModItems.wire_red_copper, 2), new ComparableStack(ModItems.wire_aluminium, 2), new OreDictStack(NETHERQUARTZ.dust(), 2), },150); makeRecipe(new ComparableStack(ModItems.limiter, 1), new AStack[] {new OreDictStack(STEEL.plate(), 3), new OreDictStack(IRON.plate(), 1), new ComparableStack(ModItems.circuit_copper, 2), new ComparableStack(ModItems.wire_copper, 4), },150); makeRecipe(new ComparableStack(ModItems.plate_dalekanium, 1), new AStack[] {new ComparableStack(ModBlocks.block_meteor, 1), },50); makeRecipe(new ComparableStack(ModBlocks.block_meteor, 1), new AStack[] {new ComparableStack(ModItems.fragment_meteorite, 100), },500); @@ -264,7 +264,7 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModBlocks.machine_rtg_furnace_off, 1), new AStack[] {new ComparableStack(Blocks.furnace, 1), new ComparableStack(ModItems.rtg_unit, 3), new OreDictStack(PB.plate(), 6), new OreDictStack(OreDictManager.getReflector(), 4), new OreDictStack(CU.plate(), 2), },150); makeRecipe(new ComparableStack(ModBlocks.machine_diesel, 1), new AStack[] {new ComparableStack(ModItems.hull_small_steel, 4), new ComparableStack(Blocks.piston, 4), new OreDictStack(STEEL.ingot(), 6), new OreDictStack(MINGRADE.ingot(), 2), new OreDictStack(CU.plate(), 4), new ComparableStack(ModItems.wire_red_copper, 6), },200); makeRecipe(new ComparableStack(ModBlocks.machine_selenium, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 4), new OreDictStack(TI.plate(), 6), new OreDictStack(CU.plate(), 8), new ComparableStack(ModItems.hull_big_steel, 1), new ComparableStack(ModItems.hull_small_steel, 9), new ComparableStack(ModItems.pedestal_steel, 1), new ComparableStack(ModItems.coil_copper, 4), },250); - makeRecipe(new ComparableStack(ModBlocks.machine_rtg_grey, 1), new AStack[] {new ComparableStack(ModItems.rtg_unit, 5), new OreDictStack(STEEL.plate(), 8), new ComparableStack(ModItems.wire_red_copper, 4), new OreDictStack(POLYMER.ingot(), 6), },200); + makeRecipe(new ComparableStack(ModBlocks.machine_rtg_grey, 1), new AStack[] {new ComparableStack(ModItems.rtg_unit, 3), new OreDictStack(STEEL.plate(), 4), new ComparableStack(ModItems.wire_red_copper, 4), new OreDictStack(POLYMER.ingot(), 3), },200); makeRecipe(new ComparableStack(ModBlocks.machine_battery, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 4), new OreDictStack(S.dust(), 12), new OreDictStack(PB.dust(), 12), new OreDictStack(MINGRADE.ingot(), 2), new ComparableStack(ModItems.wire_red_copper, 4), },200); makeRecipe(new ComparableStack(ModBlocks.machine_lithium_battery, 1), new AStack[] {new OreDictStack(POLYMER.ingot(), 4), new OreDictStack(CO.dust(), 12), new OreDictStack(LI.dust(), 12), new OreDictStack(ALLOY.ingot(), 2), new ComparableStack(ModItems.wire_red_copper, 4), },400); makeRecipe(new ComparableStack(ModBlocks.machine_schrabidium_battery, 1), new AStack[] {new OreDictStack(DESH.ingot(), 4), new OreDictStack(NP237.dust(), 12), new OreDictStack(SA326.dust(), 12), new OreDictStack(SA326.ingot(), 2), new ComparableStack(ModItems.wire_schrabidium, 4), },800); @@ -930,6 +930,19 @@ public class AssemblerRecipes { new ComparableStack(ModItems.inf_water_mk2, 2) }, 200); + makeRecipe(new ComparableStack(ModBlocks.machine_radiolysis), new AStack[] { + new OreDictStack(STEEL.ingot(), 10), + new ComparableStack(ModBlocks.steel_beam, 16), + new OreDictStack(DURA.ingot(), 12), + new OreDictStack(DESH.ingot(), 4), + new OreDictStack(PB.plate(), 12), + new ComparableStack(ModItems.board_copper, 4), + new ComparableStack(ModItems.thermo_element, 10), + new ComparableStack(ModItems.circuit_copper, 3), + new ComparableStack(ModItems.wire_red_copper, 8), + new ComparableStack(ModItems.tank_steel, 3) + }, 200); + if(Loader.isModLoaded("Mekanism")) { Block mb = (Block) Block.blockRegistry.getObject("Mekanism:MachineBlock"); diff --git a/src/main/java/com/hbm/inventory/recipes/FusionRecipes.java b/src/main/java/com/hbm/inventory/recipes/FusionRecipes.java index 7f72baf6e..e32ea7ee2 100644 --- a/src/main/java/com/hbm/inventory/recipes/FusionRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/FusionRecipes.java @@ -28,12 +28,12 @@ public class FusionRecipes { public static HashMap levels = new HashMap(); static { - levels.put(Fluids.PLASMA_DT, 1); - levels.put(Fluids.PLASMA_DH3, 2); - levels.put(Fluids.PLASMA_HD, 1); - levels.put(Fluids.PLASMA_HT, 1); - levels.put(Fluids.PLASMA_XM, 3); - levels.put(Fluids.PLASMA_BF, 4); + levels.put(Fluids.PLASMA_DT, 1000); + levels.put(Fluids.PLASMA_DH3, 2000); + levels.put(Fluids.PLASMA_HD, 1000); + levels.put(Fluids.PLASMA_HT, 1000); + levels.put(Fluids.PLASMA_XM, 3000); + levels.put(Fluids.PLASMA_BF, 4000); } public static int getBreedingLevel(FluidType plasma) { diff --git a/src/main/java/com/hbm/inventory/recipes/RadiolysisRecipes.java b/src/main/java/com/hbm/inventory/recipes/RadiolysisRecipes.java index 3f87ac9ba..e70421a8f 100644 --- a/src/main/java/com/hbm/inventory/recipes/RadiolysisRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/RadiolysisRecipes.java @@ -3,10 +3,12 @@ package com.hbm.inventory.recipes; import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import com.hbm.inventory.FluidStack; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; +import com.hbm.items.ModItems; import com.hbm.items.machine.ItemFluidIcon; import com.hbm.util.Tuple.Pair; @@ -20,16 +22,24 @@ public class RadiolysisRecipes { /* I am proud of this but I don't think I should be */ public static Map getRecipesForNEI() { Map recipes = new HashMap(); - Iterator key = radiolysis.entrySet().iterator(); - Iterator values = radiolysis.values().iterator(); + Iterator itr = radiolysis.entrySet().iterator(); - while(key.hasNext() && values.hasNext()) { - Pair pair = (Pair) values.next(); + while(itr.hasNext()) { + Map.Entry entry = (Entry) itr.next(); + Pair pair = (Pair) entry.getValue(); + ItemStack[] outputs = new ItemStack[2]; + if(pair.getKey().type == Fluids.NONE) { + outputs[0] = new ItemStack(ModItems.nothing); + } else { + outputs[0] = ItemFluidIcon.make(pair.getKey().type, pair.getKey().fill); + } + if(pair.getValue().type == Fluids.NONE) { + outputs[1] = new ItemStack(ModItems.nothing); + } else { + outputs[1] = ItemFluidIcon.make(pair.getValue().type, pair.getValue().fill); + } - recipes.put(ItemFluidIcon.make((FluidType) key.next(), 100), - new ItemStack[] { - ItemFluidIcon.make(pair.getKey().type, pair.getKey().fill), - ItemFluidIcon.make(pair.getValue().type, pair.getValue().fill) }); + recipes.put(ItemFluidIcon.make((FluidType) entry.getKey(), 100), outputs); } return recipes; diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 0031bf6ee..7fda16020 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -204,6 +204,7 @@ public class ClientProxy extends ServerProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDeuteriumTower.class, new RenderDeuteriumTower()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineCatalyticCracker.class, new RenderCatalyticCracker()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineLiquefactor.class, new RenderLiquefactor()); + //ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineRadiolysis.class, new RenderRadiolysis()); //AMS ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAMSBase.class, new RenderAMSBase()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAMSEmitter.class, new RenderAMSEmitter()); diff --git a/src/main/java/com/hbm/main/NEIConfig.java b/src/main/java/com/hbm/main/NEIConfig.java index 1544b462d..a3273aac9 100644 --- a/src/main/java/com/hbm/main/NEIConfig.java +++ b/src/main/java/com/hbm/main/NEIConfig.java @@ -57,6 +57,8 @@ public class NEIConfig implements IConfigureNEI { API.registerUsageHandler(new AnvilRecipeHandler()); API.registerRecipeHandler(new FuelPoolHandler()); API.registerUsageHandler(new FuelPoolHandler()); + API.registerRecipeHandler(new RadiolysisRecipeHandler()); + API.registerUsageHandler(new RadiolysisRecipeHandler()); //universal boyes API.registerRecipeHandler(new ZirnoxRecipeHandler()); diff --git a/src/main/java/com/hbm/main/ResourceManager.java b/src/main/java/com/hbm/main/ResourceManager.java index 719d2609c..c4b222b6a 100644 --- a/src/main/java/com/hbm/main/ResourceManager.java +++ b/src/main/java/com/hbm/main/ResourceManager.java @@ -278,6 +278,9 @@ public class ResourceManager { public static final IModelCustom pylon_large = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/network/pylon_large.obj")); public static final IModelCustom substation = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/network/substation.obj")); + //Radiolysis + //public static final IModelCustom radiolysis = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/radiolysis")); + ////Textures TEs public static final ResourceLocation universal = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_.png"); @@ -575,7 +578,8 @@ public class ResourceManager { public static final ResourceLocation pylon_large_tex = new ResourceLocation(RefStrings.MODID, "textures/models/network/pylon_large.png"); public static final ResourceLocation substation_tex = new ResourceLocation(RefStrings.MODID, "textures/models/network/substation.png"); - + //Radiolysis + //public static final ResourceLocation radiolysis_tex = new ResourceLocation(RefStrings.MODID, "textures/models/radiolysis"); ////Obj Items diff --git a/src/main/java/com/hbm/render/item/ItemRenderLibrary.java b/src/main/java/com/hbm/render/item/ItemRenderLibrary.java index b522a905d..e59841542 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderLibrary.java +++ b/src/main/java/com/hbm/render/item/ItemRenderLibrary.java @@ -1194,6 +1194,17 @@ public class ItemRenderLibrary { bindTexture(ResourceManager.liquefactor_tex); ResourceManager.liquefactor.renderPart("Main"); GL11.glShadeModel(GL11.GL_FLAT); }}); + + /*renderers.put(Item.getItemFromBlock(ModBlocks.machine_radiolysis), new ItemRenderBase( ) { + public void renderInventory() { + GL11.glTranslated(0, -2.5, 0); + GL11.glScaled(3, 3, 3); + } + public void renderCommon() { + GL11.glShadeModel(GL11.GL_SMOOTH); + bindTexture(ResourceManager.radiolysis_tex); ResourceManager.radiolysis.renderAll(); + GL11.glShadeModel(GL11.GL_FLAT); + }});*/ } private static void bindTexture(ResourceLocation res) { diff --git a/src/main/java/com/hbm/render/tileentity/RenderRadiolysis.java b/src/main/java/com/hbm/render/tileentity/RenderRadiolysis.java new file mode 100644 index 000000000..f314ca632 --- /dev/null +++ b/src/main/java/com/hbm/render/tileentity/RenderRadiolysis.java @@ -0,0 +1,44 @@ +package com.hbm.render.tileentity; + +import org.lwjgl.opengl.GL11; + +import com.hbm.main.ResourceManager; + +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; + +public class RenderRadiolysis extends TileEntitySpecialRenderer { + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) { + /*GL11.glPushMatrix(); + GL11.glTranslated(x + 0.0D, y, z + 0.0D); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glRotatef(180F, 0F, 1F, 0F); + switch(tileEntity.getBlockMetadata() - 10) { + case 2: + GL11.glRotatef(0F, 0F, 1F, 0F); + GL11.glTranslatef(0F, 0F, -1F); + break; + case 3: + GL11.glRotatef(180F, 0F, 1F, 0F); + GL11.glTranslatef(1F, 0F, 0F); + break; + case 4: + GL11.glRotatef(90F, 0F, 1F, 0F); + GL11.glTranslatef(1F, 0F, -1F); + break; + case 5: + GL11.glRotatef(270F, 0F, 1F, 0F); + break; + } + GL11.glShadeModel(GL11.GL_SMOOTH); + bindTexture(ResourceManager.radiolysis_tex); + ResourceManager.radiolysis.renderAll(); + GL11.glShadeModel(GL11.GL_FLAT); + + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glPopMatrix();*/ + } +} diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java index cf4dd9187..879af660c 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java @@ -192,10 +192,10 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyUser BreederRecipe out = BreederRecipes.getOutput(slots[1]); if(slots[1] != null && slots[1].getItem() == ModItems.meteorite_sword_irradiated) - out = new BreederRecipe(ModItems.meteorite_sword_fused, 1); + out = new BreederRecipe(ModItems.meteorite_sword_fused, 1000); if(slots[1] != null && slots[1].getItem() == ModItems.meteorite_sword_fused) - out = new BreederRecipe(ModItems.meteorite_sword_baleful, 4); + out = new BreederRecipe(ModItems.meteorite_sword_baleful, 4000); if(out == null) { this.progress = 0; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java index 37b1c2028..0c8eea22e 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java @@ -131,7 +131,7 @@ public class TileEntityMachineIGenerator extends TileEntityMachineBase implement // RTG /// this.hasRTG = RTGUtil.hasHeat(slots, RTGSlots); - this.spin += RTGUtil.updateRTGs(slots, RTGSlots) * 0.1; + this.spin += RTGUtil.updateRTGs(slots, RTGSlots) * 0.2; if(this.spin > 0) { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java index 8b93a37c0..027653669 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java @@ -210,7 +210,7 @@ public class TileEntityMachineRTG extends TileEntity implements ISidedInventory, if(heat > heatMax) heat = heatMax; - power += heat * 10; + power += heat * 5; if(power > powerMax) power = powerMax; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java index 66765d560..76b33904c 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java @@ -30,7 +30,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; public class TileEntityMachineRadiolysis extends TileEntityMachineBase implements IEnergyGenerator, IFluidAcceptor, IFluidSource, IFluidContainer { - //TODO: TileMapping, Render file + resource location, container, gui, gui texture, further recipes; add registerRadiolysis to PostLoad + //TODO: Render file + resource locations + itemrenderlibrary + clientproxy, gui texture, further recipes public long power; public static final int maxPower = 1000000; @@ -43,7 +43,7 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement private static final int[] slot_rtg = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; public TileEntityMachineRadiolysis() { - super(14); //10 rtg slots, 2 fluid ID slots (io), 2 irradiation slots (io) + super(15); //10 rtg slots, 2 fluid ID slots (io), 2 irradiation slots (io), battery slot tanks = new FluidTank[3]; tanks[0] = new FluidTank(Fluids.NONE, 2000, 0); tanks[1] = new FluidTank(Fluids.NONE, 2000, 1); @@ -102,12 +102,15 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement public void updateEntity() { if(!worldObj.isRemote) { + power = Library.chargeItemsFromTE(slots, 14, power, maxPower); + int heat = RTGUtil.updateRTGs(slots, slot_rtg); - power += heat * 15; + power += heat * 8; if(power > maxPower) power = maxPower; + ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - BlockDummyable.offset); this.sendPower(worldObj, xCoord + 2, yCoord, zCoord, dir); this.sendPower(worldObj, xCoord - 2, yCoord, zCoord, dir); @@ -178,28 +181,33 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement // Code: pressure, sword, sterilize. private void sterilize() { - if(!checkIfValid()) - return; - - if(slots[12].getItem() instanceof ItemFood && !(slots[12].getItem() == ModItems.pancake)) { - slots[12].stackSize -= 1; - if(slots[12].stackSize <= 0) - slots[12] = null; - } - - ItemStack output = slots[12].copy(); - output.stackSize = 1; - - if(slots[13] == null) { - slots[13] = output; - slots[13].stackTagCompound.setBoolean("ntmContagion", false); - } else if(slots[13].isItemEqual(output) && slots[13].stackSize + output.stackSize <= slots[13].getMaxStackSize()) { - slots[12].stackSize -= output.stackSize; - if(slots[12].stackSize <= 0) - slots[12] = null; + if(slots[12] != null) { + if(slots[12].getItem() instanceof ItemFood && !(slots[12].getItem() == ModItems.pancake)) { + slots[12].stackSize -= 1; + if(slots[12].stackSize <= 0) + slots[12] = null; + } - slots[13].stackSize += output.stackSize; - slots[13].stackTagCompound.setBoolean("ntmContagion", false); + if(!checkIfValid()) + return; + + ItemStack output = slots[12].copy(); + output.stackSize = 1; + + if(slots[13] == null) { + slots[12].stackSize -= output.stackSize; + if(slots[12].stackSize <= 0) + slots[12] = null; + slots[13] = output; + slots[13].stackTagCompound.setBoolean("ntmContagion", false); + } else if(slots[13].isItemEqual(output) && slots[13].stackSize + output.stackSize <= slots[13].getMaxStackSize()) { + slots[12].stackSize -= output.stackSize; + if(slots[12].stackSize <= 0) + slots[12] = null; + + slots[13].stackSize += output.stackSize; + slots[13].stackTagCompound.setBoolean("ntmContagion", false); + } } } @@ -270,10 +278,8 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement @Override public int getMaxFluidFill(FluidType type) { - for(FluidTank tank : tanks) { - if(tank.getTankType() == type) { - return tank.getMaxFill(); - } + if(tanks[0].getTankType() == type) { + return tanks[0].getMaxFill(); } return 0; } diff --git a/src/main/resources/assets/hbm/textures/gui/gui_radiolysis.png b/src/main/resources/assets/hbm/textures/gui/gui_radiolysis.png index 61134e44f04d736b783cc5d32314006ab0ff4336..dbfe0d21deac364a6ea44b70d53b53572c7a3333 100644 GIT binary patch literal 2047 zcmd5-do+~m8h^geOpS4r!_1ajrgnsJTqZ>e9pr9I6VsG7auCYSr4&2jb4xa5>=br5 zhKbw;#l|j7+qIesjkfXS19X z$?9YPP;_y&_W(ff5CM`L?n0}NaXx3~Je=%6_*8QqPYA)b?zRB+SqjpB5b?Z(&Ez=X z9%MT=l_0ypT#o8 z8RR3Jz0Lt_>G*t+p71+?0Gk9Z_O_fD-?s(n7vJbAIX*XY9~OLU6SO{;3@vV)9uoD@ zc1+VWc22GJMPJVjVqz-0=z{sF7^{^IQ|vvXzx%z%FHGZuJ*Jey0vP?q;%k zQkJqn$Q<9)r@WN7%DVDS^)ImjUU(^yS^TF``!{ia#nEz80Rd6EUi9 zK&K6|^d}b(59$S-$*zp>-PIIY&++uD{^UQRiE+7XL)ti@L0SF$`K_x5_^)*Jx>V3^ z{Ut;Cr0w>M-Qqo^+#+pdS7NWUOSE)|-ZoGXi^U10nzZYr0M zAxBfES?i- z%ZGB|cZ};_numV$K@xN+WYTrjFLLO7rif6}>A_5t39H7vu+L79^_wj^WxA-Tw zBEOa%GWw}-d14S{6<>Ar^-dz2JeFRFT?JuJ7qxY4$`iB$$G6Vi+ONV7mq?wH7tzC#x1Yl=W!Uf~H_H zH8^`d(qOV$i=U%F>}^W8PvyOc56Yk16wyfcJ1{FXG$2JVx)!4xh1n+%FC!)1V&oo# zU%=#O=&Xr!=(N$77tlECN2!hqbdhT0-6HQS4KhzvP%#q1jdUia&GF_V-H;~9z0C06 zX1CMCv11&YO=mdEFVxK_5&jdwYAa36XyxEpqTto*uJ3jUL*It$`mH-B1?q=T2eyBM zFOb7rgZI1Je^`rTzO=e3_kobz>V4laInygnBvIxEP+!rK& za@2iv>~wU`GySKLT7SWJ@ayKHSa^27xNuAG4;DLcn!dZ}>qQbjShZnriuq~(7@r$g z>M4P>2lqA{^-k7cQx;FZs@1kcWNiu|{j9V-E`Fc(Bf|+>F~nt#km;-0e3z<3j#mrm zGXDXWU{l_Q#Fu9^{*+LDvm55$cp(Ub*3ML!-dgnmRjL5c`&vU9-X4~|jl?$XsjhGsIX4^S^iVZ?U zU4`Xm_LNpstI!Uy!h~K?M1k4ZsBI?Yq|{r=*}|xz=8#0Lp6W)k?->Dzlf>RzoW3S8 z@Y^OK_v^aVqLsD?PV)u*VUvxF|HO*KhS5hAH%=MCN2Bb^v6fe|OPHa^u~V)cU2(pb zQ9bMnOcqYFf%qrB3>9zv+yF0yj!IbTuycpZr_=dxStC3c)l;14fBNLlel~RbDB|z= zUtkyRw=^=Y5?2r+8#{v>lBz9vX>vDoKKx{+RJUwg-*kIj>L7|xi%Qmxa#xRg)K(1k z_t;S4r3V9s6fEQ`vW=Mnk@jOMs`RTJawUlWe^h>nUhCOFp8XaUd`U5*8vn$=#eron IwDU{)H`5$+sQ>@~ literal 2147 zcmd5-c|6qX8h?JjnL&eT>^T``Y`KMTbZRWA$u=s>9MQ4GxRjFYvSj&@CUHL2mRn?3 z<|J{@L1=O%QK6J{&>UBhj*P92RPIlmbN{@5-9PU8dEU?SexK$0KJWH+%FSgJML2UTq57fPYa9>*b~@|?sLhi8=u5)!6xZIx2G_8{ zSXo(tW$n(+PI#~9>go#f2JrS#V zEXd4*^nU=q08ZsYaxtV7LqY{4mP4!n;wmBP8idut(FQo&4E}AvYX`5p;MN1~-LSV8 zTzbK20Jx7~&oi(e1iN9d62XpfFnL(=N9h?fj@vDP*kfeC~+JS{(zh^NJ99-FsT@wxj;Gxl$mxv zYI&3k%4V=Z^g8EfVrqx8WY^1Uf*MJ?I6SN|Vfo#9zkTHF!7%HL@1hoH;>!$AEEo;* z*9#0>8`G2Bu%=t2gmwyU4k0Sxp4)s2Rb3Zbj&>>0->48qicB7<>~E0l%C}ph)bP$} zy>dz&{kBS}ul4DZPE7~eCv|bP@3c;~eBXe&xR9|2WK!eb(8O&FAB_5(p1EKX9(!bJ za)z*dT|{hb(`7;*;jbco6LKsrp!_@1U+eh8M7&GeNtkLUWzq5=q4PU_AzJ7>W8DT_kOF1BN7KjpZ|xiC+HE z3F#fG(o%ms%4X7Q?{mK!A#`@>dB3$9`w>q%VB&=tt(W`2Xc;>3CF(iXQaGj_D$?QF z2wD7eT4({Q5phZi$gOYYh{OwH(aojYfoOIvfmq(_#ukR~?^A>| z?uYb^my)f_=&_wBn#daWMtz6J`K2c*lajLsEd-mDsp3;51M1n9w&HLN`2c;o$jRyk zHlJT-@8c4%milVd!nA6`h_!kXB6&rs`2Crr-BND9V`KRE`dm?sCl*h4=xfWg*~m*| zmWr}3i9&S>Ycbfv2W`#f=SKLhwBM30H_bd%dTtBa&hpb`_YL&#P`WWr7LL6PQBzH~ zmt44KI*lXJ=`Y8YOY6%rh{C)^@gquFUtgt2zy7Z@<-=2v=4@87iLv6PkLpwzF9xrm zIiFTDsKD4$4eqzrO@8jkX`B4Xf<0>89gUId)Z~Io(#ezFZvy>tE<4U|XG_$6K7&1e zLEzEH_a9?Z>8V@Ov=VYwXSuhGc?&~j-H?>ajtzvbmnFPL(mqYgtXy!=oVRqV$6Z}j zmeIe)O?MgjZBBI)`4E9z3}mUi%RtVKR>WLw^@Jy&iP>H-!LontS(&Fq-%(;OwWH3y zD@k)eV#HZn2JM@WQ#p?j2T{r=4Lvvf^&ULav6xyp{6yxQvjhH8Pcx6TUg&q$6V_p~ zcjhV@j9ITKeDLnz0v9mx|M-&ZRb)H=^{F-01H78x;(0?Vk(zH73DghRP zm?z4{Ft=V!Qdo`?(0MOI{_exPGsr}ndx}**>^fiGem+Q=%#M^M(VI`A)DcT0Ew}`% tf8j!@rylehC}NY!|3~gHL*C6#8iidNWV5n)KK_xxE*nSdYD-?qzX9E}l=T1r diff --git a/src/main/resources/assets/hbm/textures/gui/nei/gui_nei_radiolysis.png b/src/main/resources/assets/hbm/textures/gui/nei/gui_nei_radiolysis.png new file mode 100644 index 0000000000000000000000000000000000000000..fdbbf5f753f203c5c94cde900f27b9c141ffb459 GIT binary patch literal 1222 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5D>38$lZxy-8q?;Kn_c~qpu?a z!^VE@KZ&eBzC?gei0gj_hI$~If#KM(W9H`O-QC^){{zJs5?c;T0#Y0$L4LtN5fEUw z*St3pD8^af5n0T@z;_sg8IR|$NCBFy?CIhdQW5udPH&NvAy3O^=R?2u7p}d^#5sAk z@j*ZTdw;F2zA9R|(T?xX1Wo-1F-@A$wUxXT1qI7;OqcAtwv*{tzG(L}L4(BAbsP+G zGIKPezlwg4ss}3&ojz5b$;QGWcpKMh{e0B}VLRU^CLG-UU1(3@@#c*U8e#{cEiA+u zWciOVEs9{sfA}DRq0B~tyCaElPiu2B1M1_A4EGKl z+{o~z!az*mC{qPD`*EfXj}JyTh;Tp9m672-(8u2FpE}_mOQ)v%8N+tXXx^3obT%3> z{fSK4Z0FX_&YpfMtd{l1<|An_;l(pHh1#<$%b0t3%Gzg5H5>m*e|RmU6EyibYYQWg zVq}^HqS9HO2j`x_c&yq$ab>z9LTqn#aQFW&FAfqR38ZxBO! z4R|3hWQ1Hat* z!^i66c@HX?{!~*)dcKliS%J!DpFVY z=Wo6H?mwjkp+Fy1GxA?>Q~$)|a$oRN`r(A$@)o(}w&FTp`Yz-j^k)GFz!5OLob`da zlGsX5E`eiAGd4vq1dDMeoJwN!iPUM(>}EAc-N>*^N9@3qqr+U%)pGuS#^a8*&mMfT ScmOOz7(8A5T-G@yGywpKKk1|Z literal 0 HcmV?d00001 From 7c1f9ad07829f3bf8e802f1a46e26b5f064688eb Mon Sep 17 00:00:00 2001 From: Vaern Date: Sun, 30 Jan 2022 20:26:54 -0800 Subject: [PATCH 6/9] Balancing my behated The crux of the issue is that every energy buff for moderate and low-power pellets is a buff for the insanely good ones, but every energy nerf for the insanely good ones is a killing blow to the moderate and low-power ones, so I've opted to just nerf the insanely-good ones directly --- src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java | 4 ++-- src/main/java/com/hbm/items/ModItems.java | 2 +- .../hbm/tileentity/machine/TileEntityMachineRadiolysis.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index 7a4bdc46d..881b1ffb2 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -931,9 +931,9 @@ public class AssemblerRecipes { }, 200); makeRecipe(new ComparableStack(ModBlocks.machine_radiolysis), new AStack[] { - new OreDictStack(STEEL.ingot(), 10), + new OreDictStack(STEEL.ingot(), 8), new ComparableStack(ModBlocks.steel_beam, 16), - new OreDictStack(DURA.ingot(), 12), + new OreDictStack(DURA.ingot(), 10), new OreDictStack(DESH.ingot(), 4), new OreDictStack(PB.plate(), 12), new ComparableStack(ModItems.board_copper, 4), diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 2df0fb8af..a77145def 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -3114,7 +3114,7 @@ public class ModItems { pellet_rtg_americium = new ItemRTGPellet(20).setDecays(DepletedRTGMaterial.NEPTUNIUM, (long) (RTGUtil.getLifespan(4.7F, HalfLifeType.LONG, false) * 1.5)).setUnlocalizedName("pellet_rtg_americium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_americium"); pellet_rtg_berkelium = new ItemRTGPellet(20).setUnlocalizedName("pellet_rtg_berkelium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_berkelium"); pellet_rtg_polonium = new ItemRTGPellet(50).setDecays(DepletedRTGMaterial.LEAD, (long) (RTGUtil.getLifespan(138.0F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_polonium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_polonium"); - pellet_rtg_gold = new ItemRTGPellet(VersatileConfig.rtgDecay() ? 300 : 100).setDecays(DepletedRTGMaterial.MERCURY, (long) (RTGUtil.getLifespan(2.7F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_gold").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_gold"); + pellet_rtg_gold = new ItemRTGPellet(VersatileConfig.rtgDecay() ? 200 : 100).setDecays(DepletedRTGMaterial.MERCURY, (long) (RTGUtil.getLifespan(2.7F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_gold").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_rtg_gold"); pellet_rtg_lead = new ItemRTGPellet(VersatileConfig.rtgDecay() ? 600 : 200).setDecays(DepletedRTGMaterial.BISMUTH, (long) (RTGUtil.getLifespan(0.3F, HalfLifeType.SHORT, false) * 1.5)).setUnlocalizedName("pellet_rtg_lead").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":pellet_rtg_lead"); tritium_deuterium_cake = new ItemCustomLore().setUnlocalizedName("tritium_deuterium_cake").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":tritium_deuterium_cake"); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java index 76b33904c..f53f9eaae 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java @@ -105,7 +105,7 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement power = Library.chargeItemsFromTE(slots, 14, power, maxPower); int heat = RTGUtil.updateRTGs(slots, slot_rtg); - power += heat * 8; + power += heat * 10; if(power > maxPower) power = maxPower; From a52bbfda600d6c33a632a7ccb2ea3f1cf0e2cbbd Mon Sep 17 00:00:00 2001 From: Vaern Date: Mon, 31 Jan 2022 19:44:16 -0800 Subject: [PATCH 7/9] holy fuck the gas centrifuge is pure spaghetti, the zirnox will not cooperate with the rework, i'm doing this tomorrow --- .../hbm/blocks/machine/MachineRadiolysis.java | 16 - .../container/ContainerReactorZirnox.java | 4 +- .../inventory/container/ContainerSILEX.java | 15 +- .../hbm/inventory/gui/GUIReactorZirnox.java | 2 +- .../recipes/GasCentrifugeRecipes.java | 2 + src/main/java/com/hbm/main/ClientProxy.java | 2 +- .../java/com/hbm/main/ResourceManager.java | 4 +- .../hbm/render/item/ItemRenderLibrary.java | 4 +- .../render/tileentity/RenderRadiolysis.java | 30 +- .../machine/TileEntityMachineGasCent.java | 11 +- .../machine/TileEntityMachineRadiolysis.java | 12 + .../assets/hbm/models/radiolysis.obj | 2343 +++++++++++++++++ .../assets/hbm/textures/models/radiolysis.png | Bin 0 -> 18598 bytes 13 files changed, 2396 insertions(+), 49 deletions(-) create mode 100644 src/main/resources/assets/hbm/models/radiolysis.obj create mode 100644 src/main/resources/assets/hbm/textures/models/radiolysis.png diff --git a/src/main/java/com/hbm/blocks/machine/MachineRadiolysis.java b/src/main/java/com/hbm/blocks/machine/MachineRadiolysis.java index b69185e0c..70155f788 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineRadiolysis.java +++ b/src/main/java/com/hbm/blocks/machine/MachineRadiolysis.java @@ -68,20 +68,4 @@ public class MachineRadiolysis extends BlockDummyable { this.makeExtra(world, x + dir.offsetX * o, y, z + dir.offsetZ * o + 1); this.makeExtra(world, x + dir.offsetX * o, y, z + dir.offsetZ * o - 1); } - - //Temporary until model made - @Override - public int getRenderType() { - return 0; - } - - @Override - public boolean isOpaqueCube() { - return true; - } - - @Override - public boolean renderAsNormalBlock() { - return true; - } } diff --git a/src/main/java/com/hbm/inventory/container/ContainerReactorZirnox.java b/src/main/java/com/hbm/inventory/container/ContainerReactorZirnox.java index 4f82aec44..99365242e 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerReactorZirnox.java +++ b/src/main/java/com/hbm/inventory/container/ContainerReactorZirnox.java @@ -79,11 +79,11 @@ public class ContainerReactorZirnox extends Container { } else { if(FluidContainerRegistry.getFluidContent(stack, Fluids.CARBONDIOXIDE) > 0) { - if(!this.mergeItemStack(stack, 24, 25, true)) + if(!this.mergeItemStack(stack, 24, 26, false)) return null; } else if(FluidContainerRegistry.getFluidContent(stack, Fluids.WATER) > 0) { - if(!this.mergeItemStack(stack, 25, 26, true)) + if(!this.mergeItemStack(stack, 26, 28, false)) return null; } else { diff --git a/src/main/java/com/hbm/inventory/container/ContainerSILEX.java b/src/main/java/com/hbm/inventory/container/ContainerSILEX.java index dc8369d82..d754fdc98 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerSILEX.java +++ b/src/main/java/com/hbm/inventory/container/ContainerSILEX.java @@ -1,5 +1,6 @@ package com.hbm.inventory.container; +import com.hbm.inventory.SlotMachineOutput; import com.hbm.items.ModItems; import com.hbm.tileentity.machine.TileEntitySILEX; @@ -24,14 +25,14 @@ public class ContainerSILEX extends Container { this.addSlotToContainer(new Slot(te, 2, 8 + 18, 24)); this.addSlotToContainer(new Slot(te, 3, 8 + 18*2, 24)); //Output - this.addSlotToContainer(new Slot(te, 4, 116, 90)); + this.addSlotToContainer(new SlotMachineOutput(te, 4, 116, 90)); //Output Queue - this.addSlotToContainer(new Slot(te, 5, 134, 72)); - this.addSlotToContainer(new Slot(te, 6, 152, 72)); - this.addSlotToContainer(new Slot(te, 7, 134, 90)); - this.addSlotToContainer(new Slot(te, 8, 152, 90)); - this.addSlotToContainer(new Slot(te, 9, 134, 108)); - this.addSlotToContainer(new Slot(te, 10, 152, 108)); + this.addSlotToContainer(new SlotMachineOutput(te, 5, 134, 72)); + this.addSlotToContainer(new SlotMachineOutput(te, 6, 152, 72)); + this.addSlotToContainer(new SlotMachineOutput(te, 7, 134, 90)); + this.addSlotToContainer(new SlotMachineOutput(te, 8, 152, 90)); + this.addSlotToContainer(new SlotMachineOutput(te, 9, 134, 108)); + this.addSlotToContainer(new SlotMachineOutput(te, 10, 152, 108)); for(int i = 0; i < 3; i++) { diff --git a/src/main/java/com/hbm/inventory/gui/GUIReactorZirnox.java b/src/main/java/com/hbm/inventory/gui/GUIReactorZirnox.java index babeb11ed..fefd3c159 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIReactorZirnox.java +++ b/src/main/java/com/hbm/inventory/gui/GUIReactorZirnox.java @@ -36,7 +36,7 @@ public class GUIReactorZirnox extends GuiInfoContainer { zirnox.steam.renderTankInfo(this, mouseX, mouseY, guiLeft + 160, guiTop + 108, 18, 12); zirnox.carbonDioxide.renderTankInfo(this, mouseX, mouseY, guiLeft + 142, guiTop + 108, 18, 12); zirnox.water.renderTankInfo(this, mouseX, mouseY, guiLeft + 178, guiTop + 108, 18, 12); - this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 160, guiTop + 33, 18, 17, new String[] { "Temperature:", " " + Math.round((zirnox.heat) * 0.00001 * 480 + 20) + "°C" }); + this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 160, guiTop + 33, 18, 17, new String[] { "Temperature:", " " + Math.round((zirnox.heat) * 0.00001 * 780 + 20) + "°C" }); this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 178, guiTop + 33, 18, 17, new String[] { "Pressure:", " " + Math.round((zirnox.pressure) * 0.00001 * 30) + " bar" }); 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" }; diff --git a/src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java b/src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java index f7b354184..06d067eb5 100644 --- a/src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java @@ -69,6 +69,8 @@ public class GasCentrifugeRecipes { }; + //TODO: Make a Triplet with input fluid, fluid consumed, and itemstack outputs. use that to rework everything below; look at RadiolysisRecipes + //Recipes for NEI public static List getGasCentOutputs(FluidType fluid) { List outputs = new ArrayList(4); diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 7fda16020..b5d51f5eb 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -204,7 +204,7 @@ public class ClientProxy extends ServerProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDeuteriumTower.class, new RenderDeuteriumTower()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineCatalyticCracker.class, new RenderCatalyticCracker()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineLiquefactor.class, new RenderLiquefactor()); - //ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineRadiolysis.class, new RenderRadiolysis()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineRadiolysis.class, new RenderRadiolysis()); //AMS ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAMSBase.class, new RenderAMSBase()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAMSEmitter.class, new RenderAMSEmitter()); diff --git a/src/main/java/com/hbm/main/ResourceManager.java b/src/main/java/com/hbm/main/ResourceManager.java index c4b222b6a..d2bf7e156 100644 --- a/src/main/java/com/hbm/main/ResourceManager.java +++ b/src/main/java/com/hbm/main/ResourceManager.java @@ -279,7 +279,7 @@ public class ResourceManager { public static final IModelCustom substation = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/network/substation.obj")); //Radiolysis - //public static final IModelCustom radiolysis = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/radiolysis")); + public static final IModelCustom radiolysis = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/radiolysis.obj")); ////Textures TEs @@ -579,7 +579,7 @@ public class ResourceManager { public static final ResourceLocation substation_tex = new ResourceLocation(RefStrings.MODID, "textures/models/network/substation.png"); //Radiolysis - //public static final ResourceLocation radiolysis_tex = new ResourceLocation(RefStrings.MODID, "textures/models/radiolysis"); + public static final ResourceLocation radiolysis_tex = new ResourceLocation(RefStrings.MODID, "textures/models/radiolysis.png"); ////Obj Items diff --git a/src/main/java/com/hbm/render/item/ItemRenderLibrary.java b/src/main/java/com/hbm/render/item/ItemRenderLibrary.java index e59841542..23e51a493 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderLibrary.java +++ b/src/main/java/com/hbm/render/item/ItemRenderLibrary.java @@ -1195,7 +1195,7 @@ public class ItemRenderLibrary { GL11.glShadeModel(GL11.GL_FLAT); }}); - /*renderers.put(Item.getItemFromBlock(ModBlocks.machine_radiolysis), new ItemRenderBase( ) { + renderers.put(Item.getItemFromBlock(ModBlocks.machine_radiolysis), new ItemRenderBase( ) { public void renderInventory() { GL11.glTranslated(0, -2.5, 0); GL11.glScaled(3, 3, 3); @@ -1204,7 +1204,7 @@ public class ItemRenderLibrary { GL11.glShadeModel(GL11.GL_SMOOTH); bindTexture(ResourceManager.radiolysis_tex); ResourceManager.radiolysis.renderAll(); GL11.glShadeModel(GL11.GL_FLAT); - }});*/ + }}); } private static void bindTexture(ResourceLocation res) { diff --git a/src/main/java/com/hbm/render/tileentity/RenderRadiolysis.java b/src/main/java/com/hbm/render/tileentity/RenderRadiolysis.java index f314ca632..3cc1bf524 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderRadiolysis.java +++ b/src/main/java/com/hbm/render/tileentity/RenderRadiolysis.java @@ -2,6 +2,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; +import com.hbm.blocks.BlockDummyable; import com.hbm.main.ResourceManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -11,34 +12,29 @@ public class RenderRadiolysis extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) { - /*GL11.glPushMatrix(); - GL11.glTranslated(x + 0.0D, y, z + 0.0D); + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5D, y, z + 0.5D); GL11.glEnable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glRotatef(180F, 0F, 1F, 0F); - switch(tileEntity.getBlockMetadata() - 10) { + + switch(tileEntity.getBlockMetadata() - BlockDummyable.offset) { case 2: - GL11.glRotatef(0F, 0F, 1F, 0F); - GL11.glTranslatef(0F, 0F, -1F); - break; + GL11.glRotatef(180, 0F, 1F, 0F); break; case 3: - GL11.glRotatef(180F, 0F, 1F, 0F); - GL11.glTranslatef(1F, 0F, 0F); - break; + GL11.glRotatef(0, 0F, 1F, 0F); break; case 4: - GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glTranslatef(1F, 0F, -1F); - break; + GL11.glRotatef(90, 0F, 1F, 0F); break; case 5: - GL11.glRotatef(270F, 0F, 1F, 0F); - break; + GL11.glRotatef(270, 0F, 1F, 0F); break; } + GL11.glShadeModel(GL11.GL_SMOOTH); bindTexture(ResourceManager.radiolysis_tex); ResourceManager.radiolysis.renderAll(); + + GL11.glEnable(GL11.GL_CULL_FACE); GL11.glShadeModel(GL11.GL_FLAT); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glPopMatrix();*/ + GL11.glPopMatrix(); } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java index 268b1a992..205175ae4 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java @@ -7,6 +7,7 @@ import java.util.List; import com.hbm.blocks.BlockDummyable; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; +import com.hbm.interfaces.Spaghetti; import com.hbm.inventory.FluidTank; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; @@ -36,6 +37,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; +@Spaghetti("I still can't believe this was my idea of a 'rework'") public class TileEntityMachineGasCent extends TileEntityMachineBase implements IEnergyUser, IFluidContainer, IFluidAcceptor { public byte age; @@ -226,7 +228,7 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I power = Library.chargeTEFromItems(slots, 0, power, maxPower); setTankType(1); - if(inputTank.getTankType() == PseudoFluidType.PF6 || inputTank.getTankType() == PseudoFluidType.NUF6) { + if(inputTank.getTankType() == PseudoFluidType.PF6 || inputTank.getTankType() == PseudoFluidType.NUF6 || inputTank.getTankType() == PseudoFluidType.MUD) { tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); attemptConversion(); } @@ -334,10 +336,17 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I if(newType == Fluids.UF6) { inputTank.setTankType(PseudoFluidType.NUF6); outputTank.setTankType(PseudoFluidType.NUF6.getOutputFluid()); + return; } if(newType == Fluids.PUF6) { inputTank.setTankType(PseudoFluidType.PF6); outputTank.setTankType(PseudoFluidType.PF6.getOutputFluid()); + return; + } + if(newType == Fluids.WATZ) { + inputTank.setTankType(PseudoFluidType.MUD); + outputTank.setTankType(PseudoFluidType.MUD.getOutputFluid()); + return; } } return; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java index f53f9eaae..c0ed60761 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java @@ -22,11 +22,14 @@ import com.hbm.util.RTGUtil; import com.hbm.util.Tuple.Pair; import api.hbm.energy.IEnergyGenerator; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; public class TileEntityMachineRadiolysis extends TileEntityMachineBase implements IEnergyGenerator, IFluidAcceptor, IFluidSource, IFluidContainer { @@ -318,4 +321,13 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement if(type == tanks[2].getTankType()) list2.clear(); } + + public AxisAlignedBB getRenderBoundingBox() { + return AxisAlignedBB.getBoundingBox(xCoord - 1, yCoord, zCoord - 1, xCoord + 2, yCoord + 3, zCoord + 2); + } + + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() { + return 65536.0D; + } } diff --git a/src/main/resources/assets/hbm/models/radiolysis.obj b/src/main/resources/assets/hbm/models/radiolysis.obj new file mode 100644 index 000000000..81fdbfba3 --- /dev/null +++ b/src/main/resources/assets/hbm/models/radiolysis.obj @@ -0,0 +1,2343 @@ +# Blender v2.79 (sub 0) OBJ File: 'radiolyctic cracker.blend11' +# www.blender.org +mtllib radchamber.mtl +o Cube.003 +v -1.500454 -0.003452 1.500454 +v -1.500454 2.997456 1.500454 +v -1.500454 -0.003452 -1.500454 +v -1.500454 2.997456 -1.500454 +v 1.500454 -0.003452 1.500454 +v 1.500454 2.997456 1.500454 +v 1.500454 -0.003452 -1.500454 +v 1.500454 2.997456 -1.500454 +v -1.498351 0.187406 1.309727 +v -1.505265 2.810412 1.311171 +v -1.441522 2.810412 -1.311171 +v -1.498351 0.187406 -1.309727 +v -1.313272 0.183729 -1.500454 +v -1.313272 2.810274 -1.500454 +v 1.313272 2.810274 -1.500454 +v 1.313272 0.183729 -1.500454 +v 1.500454 0.184605 -1.312397 +v 1.500454 2.809398 -1.312397 +v 1.500454 2.809398 1.312397 +v 1.500454 0.184605 1.312397 +v 1.312296 0.184706 1.500454 +v 1.312296 2.809297 1.500454 +v -1.312296 2.809297 1.500454 +v -1.312296 0.184706 1.500454 +v -1.124380 -0.003452 -1.124380 +v 1.124380 -0.003452 -1.124380 +v 1.124380 -0.003452 1.124380 +v -1.124380 -0.003452 1.124380 +v 1.307815 2.995548 -1.318863 +v -1.332176 2.995548 -1.318863 +v -1.332176 2.995548 1.318863 +v 1.307815 2.995548 1.318863 +v -1.124380 0.371661 -1.124380 +v 1.124380 0.371661 -1.124380 +v 1.124380 0.371661 1.124380 +v -1.124380 0.371661 1.124380 +v 0.000000 1.476425 -0.315458 +v 0.000000 2.037861 -0.228000 +v 0.157729 1.476425 -0.273194 +v 0.114000 2.037861 -0.197454 +v 0.273194 1.476425 -0.157729 +v 0.197454 2.037861 -0.114000 +v 0.315458 1.476425 0.000000 +v 0.228000 2.037861 0.000000 +v 0.273194 1.476425 0.157729 +v 0.197454 2.037861 0.114000 +v 0.157729 1.476425 0.273194 +v 0.114000 2.037861 0.197454 +v 0.000000 1.476425 0.315458 +v 0.000000 2.037861 0.228000 +v -0.157729 1.476425 0.273194 +v -0.114000 2.037861 0.197454 +v -0.273194 1.476425 0.157729 +v -0.197454 2.037861 0.114000 +v -0.315458 1.476425 0.000000 +v -0.228000 2.037861 0.000000 +v -0.273194 1.476425 -0.157729 +v -0.197454 2.037861 -0.114000 +v -0.157729 1.476425 -0.273194 +v -0.114000 2.037861 -0.197454 +v 0.238860 2.037861 -0.413717 +v 0.000000 2.037861 -0.477719 +v 0.413717 2.037861 -0.238860 +v 0.477719 2.037861 -0.000000 +v 0.413717 2.037861 0.238859 +v 0.238860 2.037861 0.413717 +v 0.000000 2.037861 0.477719 +v -0.238859 2.037861 0.413717 +v -0.413717 2.037861 0.238860 +v -0.477719 2.037861 0.000000 +v -0.413717 2.037861 -0.238859 +v -0.238860 2.037861 -0.413717 +v 0.238860 2.236783 -0.413717 +v -0.000000 2.236783 -0.477719 +v 0.413717 2.236783 -0.238860 +v 0.477719 2.236783 -0.000000 +v 0.413717 2.236783 0.238859 +v 0.238860 2.236783 0.413717 +v 0.000000 2.236783 0.477719 +v -0.238859 2.236783 0.413717 +v -0.413717 2.236783 0.238860 +v -0.477719 2.236783 0.000000 +v -0.413717 2.236783 -0.238859 +v -0.238860 2.236783 -0.413717 +v 0.086073 2.236783 -0.149082 +v -0.000000 2.236783 -0.172145 +v 0.149082 2.236783 -0.086073 +v 0.172146 2.236783 0.000000 +v 0.149082 2.236783 0.086073 +v 0.086073 2.236783 0.149082 +v 0.000000 2.236783 0.172146 +v -0.086073 2.236783 0.149082 +v -0.149082 2.236783 0.086073 +v -0.172146 2.236783 0.000000 +v -0.149082 2.236783 -0.086073 +v -0.086073 2.236783 -0.149082 +v 0.086073 2.304473 -0.149082 +v -0.000000 2.304473 -0.172145 +v 0.149082 2.304473 -0.086073 +v 0.172146 2.304473 0.000000 +v 0.149082 2.304473 0.086073 +v 0.086073 2.304473 0.149082 +v 0.000000 2.304473 0.172146 +v -0.086073 2.304473 0.149082 +v -0.149082 2.304473 0.086073 +v -0.172146 2.304473 0.000000 +v -0.149082 2.304473 -0.086073 +v -0.086073 2.304473 -0.149082 +v 0.132126 2.304473 -0.228848 +v 0.000000 2.304473 -0.264251 +v 0.228848 2.304473 -0.132126 +v 0.264251 2.304473 0.000000 +v 0.228848 2.304473 0.132126 +v 0.132126 2.304473 0.228848 +v 0.000000 2.304473 0.264251 +v -0.132126 2.304473 0.228848 +v -0.228848 2.304473 0.132126 +v -0.264251 2.304473 0.000000 +v -0.228849 2.304473 -0.132126 +v -0.132126 2.304473 -0.228848 +v 0.132126 2.465501 -0.228848 +v -0.000000 2.465501 -0.264251 +v 0.228848 2.465501 -0.132126 +v 0.264251 2.465501 0.000000 +v 0.228848 2.465501 0.132126 +v 0.132126 2.465501 0.228848 +v 0.000000 2.465501 0.264251 +v -0.132126 2.465501 0.228848 +v -0.228848 2.465501 0.132126 +v -0.264251 2.465501 0.000000 +v -0.228849 2.465501 -0.132126 +v -0.132126 2.465501 -0.228848 +v 0.238860 2.704567 -0.413717 +v -0.000000 2.704567 -0.477719 +v 0.413717 2.704567 -0.238860 +v 0.477719 2.704567 -0.000000 +v 0.413717 2.704567 0.238859 +v 0.238860 2.704567 0.413717 +v 0.000000 2.704567 0.477719 +v -0.238859 2.704567 0.413717 +v -0.413717 2.704567 0.238860 +v -0.477719 2.704567 0.000000 +v -0.413717 2.704567 -0.238859 +v -0.238860 2.704567 -0.413717 +v 0.086073 2.704567 -0.149082 +v -0.000000 2.704567 -0.172145 +v 0.149082 2.704567 -0.086073 +v 0.172146 2.704567 0.000000 +v 0.149082 2.704567 0.086073 +v 0.086073 2.704567 0.149082 +v 0.000000 2.704567 0.172146 +v -0.086073 2.704567 0.149082 +v -0.149082 2.704567 0.086073 +v -0.172146 2.704567 0.000000 +v -0.149082 2.704567 -0.086073 +v -0.086073 2.704567 -0.149082 +v 0.239142 2.236782 -0.413553 +v 0.000326 2.236782 -0.477719 +v 0.413880 2.236782 -0.238577 +v 0.477719 2.236782 0.000326 +v 0.413553 2.236782 0.239142 +v 0.238577 2.236782 0.413880 +v -0.000326 2.236782 0.477719 +v -0.239142 2.236782 0.413553 +v -0.413880 2.236782 0.238577 +v -0.477719 2.236782 -0.000326 +v -0.413554 2.236782 -0.239142 +v -0.238577 2.236782 -0.413880 +v 0.086175 2.236782 -0.149023 +v 0.000118 2.236782 -0.172145 +v 0.149141 2.236782 -0.085971 +v 0.172145 2.236782 0.000118 +v 0.149023 2.236782 0.086175 +v 0.085971 2.236782 0.149141 +v -0.000118 2.236782 0.172145 +v -0.086175 2.236782 0.149024 +v -0.149141 2.236782 0.085971 +v -0.172145 2.236782 -0.000117 +v -0.149024 2.236782 -0.086174 +v -0.085971 2.236782 -0.149141 +v 0.239142 2.704566 -0.413553 +v 0.000326 2.704566 -0.477719 +v 0.413880 2.704566 -0.238577 +v 0.477719 2.704566 0.000326 +v 0.413553 2.704566 0.239142 +v 0.238577 2.704566 0.413880 +v -0.000326 2.704566 0.477719 +v -0.239142 2.704566 0.413553 +v -0.413880 2.704566 0.238577 +v -0.477719 2.704566 -0.000326 +v -0.413554 2.704566 -0.239142 +v -0.238577 2.704566 -0.413880 +v 0.086175 2.704566 -0.149023 +v 0.000118 2.704566 -0.172145 +v 0.149141 2.704566 -0.085971 +v 0.172145 2.704566 0.000118 +v 0.149023 2.704566 0.086175 +v 0.085971 2.704566 0.149141 +v -0.000118 2.704566 0.172145 +v -0.086174 2.704566 0.149024 +v -0.149141 2.704566 0.085971 +v -0.172145 2.704566 -0.000117 +v -0.149024 2.704566 -0.086174 +v -0.085971 2.704566 -0.149141 +v -1.050000 0.269109 0.787500 +v -1.050000 0.269109 -0.787500 +v 1.050000 0.269109 0.787500 +v 1.050000 0.269109 -0.787500 +v 0.386672 1.503445 0.787500 +v -0.356672 1.503445 0.787500 +v -0.356672 1.503445 -0.787500 +v 0.386672 1.503445 -0.787500 +v -0.880480 1.948496 0.787500 +v -1.050000 1.778976 0.787500 +v -1.050000 1.778976 -0.787500 +v -0.880480 1.948496 -0.787500 +v 1.050000 1.778976 0.787500 +v 0.880480 1.948496 0.787500 +v 0.880480 1.948496 -0.787500 +v 1.050000 1.778976 -0.787500 +v -0.500929 1.948496 -0.787500 +v -0.356672 1.804239 -0.787500 +v -0.356672 1.804239 0.787500 +v -0.500929 1.948496 0.787500 +v 0.386672 1.804239 -0.787500 +v 0.530929 1.948496 -0.787500 +v 0.530929 1.948496 0.787500 +v 0.386672 1.804239 0.787500 +v -0.971629 0.264791 -0.695685 +v -1.050000 0.269109 -0.612500 +v -0.971629 0.264791 -0.521764 +v -1.050000 0.269109 -0.437500 +v -0.971629 0.264791 -0.347843 +v -1.050000 0.269109 -0.262500 +v -0.971629 0.264791 -0.173921 +v -1.050000 0.269109 -0.087500 +v -0.971629 0.264791 -0.000000 +v -1.050000 0.269109 0.087500 +v -0.971629 0.264791 0.173921 +v -1.050000 0.269109 0.262500 +v -0.971629 0.264791 0.347843 +v -1.050000 0.269109 0.437500 +v -0.971629 0.264791 0.521764 +v -1.050000 0.269109 0.612500 +v -0.971629 0.264791 0.695685 +v 0.972741 0.266388 0.695685 +v 1.050000 0.269109 0.612500 +v 0.972741 0.266388 0.521764 +v 1.050000 0.269109 0.437500 +v 0.972741 0.266388 0.347843 +v 1.050000 0.269109 0.262500 +v 0.972741 0.266388 0.173921 +v 1.050000 0.269109 0.087500 +v 0.972741 0.266388 0.000000 +v 1.050000 0.269109 -0.087500 +v 0.972741 0.266388 -0.173921 +v 1.050000 0.269109 -0.262500 +v 0.972741 0.266388 -0.347843 +v 1.050000 0.269109 -0.437500 +v 0.972741 0.266388 -0.521764 +v 1.050000 0.269109 -0.612500 +v 0.972741 0.266388 -0.695685 +v -0.329683 1.506311 -0.695685 +v -0.356672 1.503445 -0.612500 +v -0.329683 1.506311 -0.521764 +v -0.356672 1.503445 -0.437500 +v -0.329683 1.506311 -0.347843 +v -0.356672 1.503445 -0.262500 +v -0.329683 1.506311 -0.173921 +v -0.356672 1.503445 -0.087500 +v -0.329683 1.506311 -0.000000 +v -0.356672 1.503445 0.087500 +v -0.329683 1.506311 0.173921 +v -0.356672 1.503445 0.262500 +v -0.329683 1.506311 0.347843 +v -0.356672 1.503445 0.437500 +v -0.329683 1.506311 0.521764 +v -0.356672 1.503445 0.612500 +v -0.329683 1.506311 0.695685 +v 0.358571 1.506311 -0.695685 +v 0.386672 1.503445 -0.612500 +v 0.358571 1.506311 -0.521764 +v 0.386672 1.503445 -0.437500 +v 0.358571 1.506311 -0.347843 +v 0.386672 1.503445 -0.262500 +v 0.358571 1.506311 -0.173921 +v 0.386672 1.503445 -0.087500 +v 0.358571 1.506311 -0.000000 +v 0.386672 1.503445 0.087500 +v 0.358571 1.506311 0.173921 +v 0.386672 1.503445 0.262500 +v 0.358571 1.506311 0.347843 +v 0.386672 1.503445 0.437500 +v 0.358571 1.506311 0.521764 +v 0.386672 1.503445 0.612500 +v 0.358571 1.506311 0.695685 +v -0.814672 1.918380 0.695685 +v -0.880480 1.948496 0.612500 +v -0.814672 1.918380 0.521764 +v -0.880480 1.948496 0.437500 +v -0.814672 1.918380 0.347843 +v -0.880480 1.948496 0.262500 +v -0.814672 1.918380 0.173921 +v -0.880480 1.948496 0.087500 +v -0.814672 1.918380 0.000000 +v -0.880480 1.948496 -0.087500 +v -0.814672 1.918380 -0.173921 +v -0.880480 1.948496 -0.262500 +v -0.814672 1.918380 -0.347843 +v -0.880480 1.948496 -0.437500 +v -0.814672 1.918380 -0.521764 +v -0.880480 1.948496 -0.612500 +v -0.814672 1.918380 -0.695685 +v -0.971629 1.761423 -0.695685 +v -1.050000 1.778976 -0.612500 +v -0.971629 1.761423 -0.521764 +v -1.050000 1.778976 -0.437500 +v -0.971629 1.761423 -0.347843 +v -1.050000 1.778976 -0.262500 +v -0.971629 1.761423 -0.173921 +v -1.050000 1.778976 -0.087500 +v -0.971629 1.761423 -0.000000 +v -1.050000 1.778976 0.087500 +v -0.971629 1.761423 0.173921 +v -1.050000 1.778976 0.262500 +v -0.971629 1.761423 0.347843 +v -1.050000 1.778976 0.437500 +v -0.971629 1.761423 0.521764 +v -1.050000 1.778976 0.612500 +v -0.971629 1.761423 0.695685 +v 0.815784 1.918380 -0.695685 +v 0.880480 1.948496 -0.612500 +v 0.815784 1.918380 -0.521764 +v 0.880480 1.948496 -0.437500 +v 0.815784 1.918380 -0.347843 +v 0.880480 1.948496 -0.262500 +v 0.815784 1.918380 -0.173921 +v 0.880480 1.948496 -0.087500 +v 0.815784 1.918380 -0.000000 +v 0.880480 1.948496 0.087500 +v 0.815784 1.918380 0.173921 +v 0.880480 1.948496 0.262500 +v 0.815784 1.918380 0.347843 +v 0.880480 1.948496 0.437500 +v 0.815784 1.918380 0.521764 +v 0.880480 1.948496 0.612500 +v 0.815784 1.918380 0.695685 +v 0.972741 1.761423 0.695685 +v 1.050000 1.778976 0.612500 +v 0.972741 1.761423 0.521764 +v 1.050000 1.778976 0.437500 +v 0.972741 1.761423 0.347843 +v 1.050000 1.778976 0.262500 +v 0.972741 1.761423 0.173921 +v 1.050000 1.778976 0.087500 +v 0.972741 1.761423 0.000000 +v 1.050000 1.778976 -0.087500 +v 0.972741 1.761423 -0.173921 +v 1.050000 1.778976 -0.262500 +v 0.972741 1.761423 -0.347843 +v 1.050000 1.778976 -0.437500 +v 0.972741 1.761423 -0.521764 +v 1.050000 1.778976 -0.612500 +v 0.972741 1.761423 -0.695685 +v -0.463250 1.918380 -0.695685 +v -0.500929 1.948496 -0.612500 +v -0.463250 1.918380 -0.521764 +v -0.500929 1.948496 -0.437500 +v -0.463250 1.918380 -0.347843 +v -0.500929 1.948496 -0.262500 +v -0.463250 1.918380 -0.173921 +v -0.500929 1.948496 -0.087500 +v -0.463250 1.918380 -0.000000 +v -0.500929 1.948496 0.087500 +v -0.463250 1.918380 0.173921 +v -0.500929 1.948496 0.262500 +v -0.463250 1.918380 0.347843 +v -0.500929 1.948496 0.437500 +v -0.463250 1.918380 0.521764 +v -0.500929 1.948496 0.612500 +v -0.463250 1.918380 0.695685 +v -0.329683 1.784814 0.695685 +v -0.356672 1.804239 0.612500 +v -0.329683 1.784814 0.521764 +v -0.356672 1.804239 0.437500 +v -0.329683 1.784814 0.347843 +v -0.356672 1.804239 0.262500 +v -0.329683 1.784814 0.173921 +v -0.356672 1.804239 0.087500 +v -0.329683 1.784814 0.000000 +v -0.356672 1.804239 -0.087500 +v -0.329683 1.784814 -0.173921 +v -0.356672 1.804239 -0.262500 +v -0.329683 1.784814 -0.347843 +v -0.356672 1.804239 -0.437500 +v -0.329683 1.784814 -0.521764 +v -0.356672 1.804239 -0.612500 +v -0.329683 1.784814 -0.695685 +v 0.358571 1.784814 -0.695685 +v 0.386672 1.804239 -0.612500 +v 0.358571 1.784814 -0.521764 +v 0.386672 1.804239 -0.437500 +v 0.358571 1.784814 -0.347843 +v 0.386672 1.804239 -0.262500 +v 0.358571 1.784814 -0.173921 +v 0.386672 1.804239 -0.087500 +v 0.358571 1.784814 -0.000000 +v 0.386672 1.804239 0.087500 +v 0.358571 1.784814 0.173921 +v 0.386672 1.804239 0.262500 +v 0.358571 1.784814 0.347843 +v 0.386672 1.804239 0.437500 +v 0.358571 1.784814 0.521764 +v 0.386672 1.804239 0.612500 +v 0.358571 1.784814 0.695685 +v 0.492138 1.918380 0.695685 +v 0.530929 1.948496 0.612500 +v 0.492138 1.918380 0.521764 +v 0.530929 1.948496 0.437500 +v 0.492138 1.918380 0.347843 +v 0.530929 1.948496 0.262500 +v 0.492138 1.918380 0.173921 +v 0.530929 1.948496 0.087500 +v 0.492138 1.918380 0.000000 +v 0.530929 1.948496 -0.087500 +v 0.492138 1.918380 -0.173921 +v 0.530929 1.948496 -0.262500 +v 0.492138 1.918380 -0.347843 +v 0.530929 1.948496 -0.437500 +v 0.492138 1.918380 -0.521764 +v 0.530929 1.948496 -0.612500 +v 0.492138 1.918380 -0.695685 +v 0.386672 1.503445 1.051500 +v -0.356672 1.503445 1.051500 +v -1.050000 0.269109 1.051500 +v 1.050000 0.269109 1.051500 +v -0.356672 1.503445 -1.050000 +v 0.386672 1.503445 -1.050000 +v 1.050000 0.269109 -1.050000 +v -1.050000 0.269109 -1.050000 +v -1.500000 0.312500 0.187500 +v -1.500000 0.687500 0.187500 +v -0.500000 0.312500 0.187500 +v -0.500000 0.687500 0.187500 +v -1.500000 0.312500 -0.187500 +v -1.500000 0.687500 -0.187500 +v -0.500000 0.312500 -0.187500 +v -0.500000 0.687500 -0.187500 +v -0.187500 0.312500 1.500000 +v -0.187500 0.687500 1.500000 +v -0.187500 0.312500 0.500000 +v -0.187500 0.687500 0.500000 +v 0.187500 0.312500 1.500000 +v 0.187500 0.687500 1.500000 +v 0.187500 0.312500 0.500000 +v 0.187500 0.687500 0.500000 +v -0.187500 0.312500 -1.500000 +v -0.187500 0.687500 -1.500000 +v -0.187500 0.312500 -0.500000 +v -0.187500 0.687500 -0.500000 +v 0.187500 0.312500 -1.500000 +v 0.187500 0.687500 -1.500000 +v 0.187500 0.312500 -0.500000 +v 0.187500 0.687500 -0.500000 +v 1.500000 0.312500 0.187500 +v 1.500000 0.687500 0.187500 +v 0.500000 0.312500 0.187500 +v 0.500000 0.687500 0.187500 +v 1.500000 0.312500 -0.187500 +v 1.500000 0.687500 -0.187500 +v 0.500000 0.312500 -0.187500 +v 0.500000 0.687500 -0.187500 +v -1.505620 -0.008618 1.505620 +v -1.505620 3.002622 1.505620 +v -1.505620 -0.008618 -1.505620 +v -1.505620 3.002622 -1.505620 +v 1.505620 -0.008618 1.505620 +v 1.505620 3.002622 1.505620 +v 1.505620 -0.008618 -1.505620 +v 1.505620 3.002622 -1.505620 +v -1.503510 0.182897 1.314237 +v -1.510185 2.814934 1.315685 +v -1.446485 2.814934 -1.315685 +v -1.503510 0.182897 -1.314237 +v -1.317794 0.179208 -1.505620 +v -1.317794 2.814795 -1.505620 +v 1.317794 2.814795 -1.505620 +v 1.317794 0.179208 -1.505620 +v 1.505620 0.180086 -1.316916 +v 1.505620 2.813917 -1.316916 +v 1.505620 2.813917 1.316916 +v 1.505620 0.180086 1.316916 +v 1.316814 0.180187 1.505620 +v 1.316814 2.813816 1.505620 +v -1.316814 2.813816 1.505620 +v -1.316814 0.180187 1.505620 +v -1.115172 -0.008618 -1.118105 +v 1.115172 -0.008618 -1.118105 +v 1.115172 -0.008618 1.118105 +v -1.115172 -0.008618 1.118105 +v 1.312318 3.000708 -1.323404 +v -1.336763 3.000708 -1.323404 +v -1.336763 3.000708 1.323404 +v 1.312318 3.000708 1.323404 +v -1.115172 0.247780 -1.118105 +v 1.115172 0.247780 -1.118105 +v 1.115172 0.247780 1.118105 +v -1.115172 0.247780 1.118105 +v -1.510185 2.814934 1.315685 +v -1.510185 2.814934 -1.315685 +vt 0.781250 0.776119 +vt 0.739583 0.798507 +vt 0.739583 0.776119 +vt 0.656250 0.776119 +vt 0.697917 0.798507 +vt 0.656250 0.798507 +vt 0.614583 0.798507 +vt 0.614583 0.776119 +vt 0.572917 0.776119 +vt 0.531250 0.798507 +vt 0.531250 0.776119 +vt 0.697917 0.776119 +vt 0.739583 0.798507 +vt 0.572917 0.798507 +vt 0.781250 0.776119 +vt 0.739583 0.776119 +vt 0.531250 0.776119 +vt 0.572917 0.798507 +vt 0.531250 0.798507 +vt 0.614583 0.776119 +vt 0.572917 0.776119 +vt 0.656250 0.776119 +vt 0.614583 0.798507 +vt 0.697917 0.798507 +vt 0.656250 0.798507 +vt 0.697917 0.776119 +vt 0.572917 0.820895 +vt 0.531250 0.858209 +vt 0.531250 0.820895 +vt 0.739583 0.820895 +vt 0.781250 0.858209 +vt 0.739583 0.858209 +vt 0.656250 0.820895 +vt 0.614583 0.858209 +vt 0.614583 0.820895 +vt 0.739583 0.820895 +vt 0.781250 0.858209 +vt 0.739583 0.858209 +vt 0.697917 0.858209 +vt 0.697917 0.820895 +vt 0.656250 0.820895 +vt 0.614583 0.858209 +vt 0.614583 0.820895 +vt 0.572917 0.858209 +vt 0.572917 0.820895 +vt 0.697917 0.858209 +vt 0.697917 0.820895 +vt 0.656250 0.858209 +vt 0.572917 0.858209 +vt 0.531250 0.858209 +vt 0.531250 0.820895 +vt 0.656250 0.858209 +vt 0.656250 0.858209 +vt 0.697917 0.873134 +vt 0.656250 0.873134 +vt 0.572917 0.858209 +vt 0.531250 0.873134 +vt 0.531250 0.858209 +vt 0.739583 0.858209 +vt 0.781250 0.873134 +vt 0.739583 0.873134 +vt 0.614583 0.873134 +vt 0.614583 0.858209 +vt 0.781250 0.858209 +vt 0.739583 0.873134 +vt 0.739583 0.858209 +vt 0.697917 0.873134 +vt 0.697917 0.858209 +vt 0.656250 0.858209 +vt 0.614583 0.873134 +vt 0.614583 0.858209 +vt 0.572917 0.858209 +vt 0.572917 0.873134 +vt 0.697917 0.858209 +vt 0.656250 0.873134 +vt 0.572917 0.873134 +vt 0.531250 0.858209 +vt 0.531250 0.873134 +vt 0.959530 0.694249 +vt 0.890075 0.780425 +vt 0.890133 0.667710 +vt 0.864583 0.514925 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.597015 +vt 0.937500 0.514925 +vt 0.937500 0.597015 +vt 0.864583 0.514925 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.597015 +vt 0.937500 0.514925 +vt 0.937500 0.597015 +vt 0.864583 0.514925 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.514925 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.514925 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.514925 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.514925 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.514925 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.597015 +vt 0.937500 0.514925 +vt 0.937500 0.597015 +vt 0.864583 0.514925 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.937500 0.514925 +vt 0.864583 0.597015 +vt 0.864583 0.514925 +vt 0.937500 0.514925 +vt 0.864583 0.597015 +vt 0.937500 0.597015 +vt 0.937500 0.597015 +vt 0.864583 0.514925 +vt 0.937500 0.514925 +vt 0.937500 0.514925 +vt 0.864583 0.597015 +vt 0.937500 0.597015 +vt 0.864583 0.514925 +vt 0.937500 0.597015 +vt 0.864583 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.597015 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.597015 +vt 0.937500 0.597015 +vt 0.937500 0.597015 +vt 0.864583 0.514925 +vt 0.864583 0.597015 +vt 0.864583 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.514925 +vt 0.864583 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.514925 +vt 0.864583 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.514925 +vt 0.864583 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.514925 +vt 0.373879 0.544776 +vt 0.438621 0.544776 +vt 0.468750 0.522388 +vt 0.373879 0.544776 +vt 0.438621 0.544776 +vt 0.468750 0.522388 +vt 0.348297 0.522388 +vt 0.348297 0.477612 +vt 0.468750 0.305970 +vt 0.083333 0.619403 +vt 0.031250 0.425373 +vt 0.083333 0.425373 +vt 0.166667 0.514925 +vt 0.291667 0.477612 +vt 0.291667 0.514925 +vt 0.468750 0.305970 +vt 0.468750 0.522388 +vt 0.348297 0.477612 +vt 0.348297 0.522388 +vt 0.373879 0.544776 +vt 0.438621 0.544776 +vt 0.416667 0.305970 +vt 0.166667 0.477612 +vt 0.041667 0.305970 +vt 0.031250 0.425373 +vt 0.083333 0.619403 +vt 0.031250 0.619403 +vt 0.348297 0.522388 +vt 0.348297 0.477612 +vt 0.468750 0.305970 +vt 0.166667 0.514925 +vt 0.291667 0.477612 +vt 0.291667 0.514925 +vt 0.083333 0.619403 +vt 0.031250 0.425373 +vt 0.083333 0.425373 +vt 0.348297 0.522388 +vt 0.348297 0.477612 +vt 0.468750 0.305970 +vt 0.373879 0.544776 +vt 0.438621 0.544776 +vt 0.468750 0.522388 +vt 0.416667 0.305970 +vt 0.166667 0.477612 +vt 0.041667 0.305970 +vt 0.031250 0.425373 +vt 0.083333 0.619403 +vt 0.031250 0.619403 +vt 0.802083 0.500000 +vt 0.739583 0.589552 +vt 0.739583 0.500000 +vt 0.802083 0.365672 +vt 0.739583 0.455224 +vt 0.739583 0.365672 +vt 0.802083 0.455224 +vt 0.614583 0.455224 +vt 0.614583 0.500000 +vt 0.927083 0.500000 +vt 0.927083 0.455224 +vt 0.739583 0.365672 +vt 0.802083 0.455224 +vt 0.739583 0.455224 +vt 0.739583 0.500000 +vt 0.802083 0.589552 +vt 0.739583 0.589552 +vt 0.802083 0.500000 +vt 0.614583 0.455224 +vt 0.614583 0.500000 +vt 0.927083 0.455224 +vt 0.927083 0.500000 +vt 0.739583 0.500000 +vt 0.614583 0.455224 +vt 0.739583 0.455224 +vt 0.927083 0.500000 +vt 0.802083 0.455224 +vt 0.927083 0.455224 +vt 0.802083 0.500000 +vt 0.739583 0.365672 +vt 0.739583 0.589552 +vt 0.802083 0.589552 +vt 0.802083 0.589552 +vt 0.739583 0.500000 +vt 0.802083 0.500000 +vt 0.802083 0.455224 +vt 0.739583 0.365672 +vt 0.802083 0.365672 +vt 0.739583 0.455224 +vt 0.927083 0.455224 +vt 0.927083 0.500000 +vt 0.614583 0.455224 +vt 0.614583 0.500000 +vt 0.781250 0.798507 +vt 0.781250 0.798507 +vt 0.781250 0.820895 +vt 0.781250 0.820895 +vt 0.781250 0.858209 +vt 0.781250 0.873134 +vt 0.820707 0.697528 +vt 0.848484 0.674329 +vt 0.927149 0.674350 +vt 0.968770 0.724088 +vt 0.959501 0.750607 +vt 0.931725 0.773805 +vt 0.853060 0.773784 +vt 0.820678 0.753885 +vt 0.811439 0.724046 +vt 0.864583 0.597015 +vt 0.864583 0.514925 +vt 0.864583 0.597015 +vt 0.864583 0.514925 +vt 0.864583 0.597015 +vt 0.864583 0.597015 +vt 0.864583 0.597015 +vt 0.864583 0.597015 +vt 0.864583 0.597015 +vt 0.864583 0.597015 +vt 0.864583 0.514925 +vt 0.864583 0.597015 +vt 0.937500 0.597015 +vt 0.864583 0.514925 +vt 0.864583 0.597015 +vt 0.864583 0.514925 +vt 0.937500 0.514925 +vt 0.864583 0.514925 +vt 0.864583 0.514925 +vt 0.937500 0.514925 +vt 0.937500 0.597015 +vt 0.937500 0.597015 +vt 0.937500 0.597015 +vt 0.937500 0.597015 +vt 0.031250 0.619403 +vt 0.083333 0.425373 +vt 0.031250 0.619403 +vt 0.083333 0.425373 +vt 0.802083 0.589552 +vt 0.802083 0.365672 +vt 0.614583 0.500000 +vt 0.802083 0.365672 +vt 0.739583 0.589552 +vt 0.614583 0.664179 +vt 0.656250 0.664179 +vt 0.572917 0.664179 +vt 0.531250 0.664179 +vt 0.739583 0.664179 +vt 0.781250 0.664179 +vt 0.697917 0.664179 +vt 0.656250 0.664179 +vt 0.614583 0.664179 +vt 0.572917 0.664179 +vt 0.531250 0.664179 +vt 0.739583 0.664179 +vt 0.781250 0.664179 +vt 0.697917 0.664179 +vt 0.531250 0.880597 +vt 0.697917 0.880597 +vt 0.656250 0.880597 +vt 0.531250 0.880597 +vt 0.739583 0.880597 +vt 0.614583 0.880597 +vt 0.739583 0.880597 +vt 0.697917 0.880597 +vt 0.614583 0.880597 +vt 0.572917 0.880597 +vt 0.656250 0.880597 +vt 0.572917 0.880597 +vt 0.229167 0.029851 +vt 0.270833 0.014925 +vt 0.270833 0.029851 +vt 0.593750 0.029851 +vt 0.750000 0.014925 +vt 0.750000 0.029851 +vt 0.437500 0.029851 +vt 0.343750 0.014925 +vt 0.437500 0.014925 +vt 0.479167 0.268657 +vt 0.437500 0.283582 +vt 0.437500 0.268657 +vt 0.187500 0.268657 +vt -0.000000 0.283582 +vt -0.000000 0.268657 +vt 0.229167 0.283582 +vt 0.229167 0.268657 +vt 0.552083 0.014925 +vt 0.552083 0.029851 +vt 0.510417 0.014925 +vt 0.302083 0.014925 +vt 0.302083 0.029851 +vt 0.479167 0.014925 +vt 0.510417 0.029851 +vt 0.479167 0.029851 +vt 0.343750 0.029851 +vt 0.302083 0.268657 +vt 0.343750 0.283582 +vt 0.302083 0.283582 +vt 0.343750 0.253731 +vt 0.343750 0.268657 +vt 0.302083 0.238806 +vt 0.302083 0.253731 +vt 0.343750 0.223881 +vt 0.343750 0.238806 +vt 0.302083 0.208955 +vt 0.302083 0.223881 +vt 0.343750 0.194030 +vt 0.343750 0.208955 +vt 0.302083 0.179104 +vt 0.302083 0.194030 +vt 0.343750 0.164179 +vt 0.343750 0.179104 +vt 0.302083 0.149254 +vt 0.302083 0.164179 +vt 0.343750 0.134328 +vt 0.343750 0.149254 +vt 0.302083 0.119403 +vt 0.302083 0.134328 +vt 0.343750 0.104478 +vt 0.343750 0.119403 +vt 0.302083 0.089552 +vt 0.302083 0.104478 +vt 0.343750 0.074627 +vt 0.343750 0.089552 +vt 0.302083 0.059701 +vt 0.302083 0.074627 +vt 0.343750 0.044776 +vt 0.343750 0.059701 +vt 0.302083 0.044776 +vt 0.479167 0.283582 +vt 0.510417 0.268657 +vt 0.510417 0.283582 +vt 0.479167 0.253731 +vt 0.510417 0.238806 +vt 0.510417 0.253731 +vt 0.479167 0.223881 +vt 0.479167 0.238806 +vt 0.510417 0.208955 +vt 0.510417 0.223881 +vt 0.479167 0.194030 +vt 0.479167 0.208955 +vt 0.510417 0.179104 +vt 0.510417 0.194030 +vt 0.479167 0.164179 +vt 0.479167 0.179104 +vt 0.510417 0.149254 +vt 0.510417 0.164179 +vt 0.479167 0.134328 +vt 0.479167 0.149254 +vt 0.510417 0.119403 +vt 0.510417 0.134328 +vt 0.479167 0.104478 +vt 0.479167 0.119403 +vt 0.510417 0.089552 +vt 0.510417 0.104478 +vt 0.479167 0.074627 +vt 0.479167 0.089552 +vt 0.510417 0.059701 +vt 0.510417 0.074627 +vt 0.479167 0.044776 +vt 0.479167 0.059701 +vt 0.510417 0.044776 +vt 0.270833 0.268657 +vt 0.270833 0.283582 +vt 0.270833 0.238806 +vt 0.270833 0.253731 +vt 0.270833 0.208955 +vt 0.270833 0.223881 +vt 0.270833 0.179104 +vt 0.270833 0.194030 +vt 0.270833 0.149254 +vt 0.270833 0.164179 +vt 0.270833 0.119403 +vt 0.270833 0.134328 +vt 0.270833 0.089552 +vt 0.270833 0.104478 +vt 0.270833 0.059701 +vt 0.270833 0.074627 +vt 0.270833 0.044776 +vt 0.552083 0.268657 +vt 0.552083 0.283582 +vt 0.552083 0.253731 +vt 0.552083 0.238806 +vt 0.552083 0.223881 +vt 0.552083 0.208955 +vt 0.552083 0.194030 +vt 0.552083 0.179104 +vt 0.552083 0.164179 +vt 0.552083 0.149254 +vt 0.552083 0.134328 +vt 0.552083 0.119403 +vt 0.552083 0.104478 +vt 0.552083 0.089552 +vt 0.552083 0.074627 +vt 0.552083 0.059701 +vt 0.552083 0.044776 +vt 0.593750 0.268657 +vt 0.593750 0.283582 +vt 0.593750 0.238806 +vt 0.593750 0.253731 +vt 0.593750 0.208955 +vt 0.593750 0.223881 +vt 0.593750 0.179104 +vt 0.593750 0.194030 +vt 0.593750 0.149254 +vt 0.593750 0.164179 +vt 0.593750 0.119403 +vt 0.593750 0.134328 +vt 0.593750 0.089552 +vt 0.593750 0.104478 +vt 0.593750 0.059701 +vt 0.593750 0.074627 +vt 0.593750 0.044776 +vt 0.229167 0.014925 +vt 0.187500 0.029851 +vt 0.187500 0.014925 +vt 0.229167 0.044776 +vt 0.187500 0.059701 +vt 0.187500 0.044776 +vt 0.229167 0.074627 +vt 0.229167 0.059701 +vt 0.187500 0.089552 +vt 0.187500 0.074627 +vt 0.229167 0.104478 +vt 0.229167 0.089552 +vt 0.187500 0.119403 +vt 0.187500 0.104478 +vt 0.229167 0.134328 +vt 0.229167 0.119403 +vt 0.187500 0.149254 +vt 0.187500 0.134328 +vt 0.229167 0.164179 +vt 0.229167 0.149254 +vt 0.187500 0.179104 +vt 0.187500 0.164179 +vt 0.229167 0.194030 +vt 0.229167 0.179104 +vt 0.187500 0.208955 +vt 0.187500 0.194030 +vt 0.229167 0.223881 +vt 0.229167 0.208955 +vt 0.187500 0.238806 +vt 0.187500 0.223881 +vt 0.229167 0.253731 +vt 0.229167 0.238806 +vt 0.187500 0.253731 +vt -0.000000 0.014925 +vt -0.000000 0.029851 +vt -0.000000 0.044776 +vt -0.000000 0.059701 +vt -0.000000 0.074627 +vt -0.000000 0.089552 +vt -0.000000 0.104478 +vt -0.000000 0.119403 +vt -0.000000 0.134328 +vt -0.000000 0.149254 +vt -0.000000 0.164179 +vt -0.000000 0.179104 +vt -0.000000 0.194030 +vt -0.000000 0.208955 +vt -0.000000 0.223881 +vt -0.000000 0.238806 +vt -0.000000 0.253731 +vt 0.437500 0.044776 +vt 0.437500 0.074627 +vt 0.437500 0.059701 +vt 0.437500 0.104478 +vt 0.437500 0.089552 +vt 0.437500 0.134328 +vt 0.437500 0.119403 +vt 0.437500 0.164179 +vt 0.437500 0.149254 +vt 0.437500 0.194030 +vt 0.437500 0.179104 +vt 0.437500 0.223881 +vt 0.437500 0.208955 +vt 0.437500 0.253731 +vt 0.437500 0.238806 +vt 0.750000 0.283582 +vt 0.750000 0.268657 +vt 0.750000 0.253731 +vt 0.750000 0.238806 +vt 0.750000 0.223881 +vt 0.750000 0.208955 +vt 0.750000 0.194030 +vt 0.750000 0.179104 +vt 0.750000 0.164179 +vt 0.750000 0.149254 +vt 0.750000 0.134328 +vt 0.750000 0.119403 +vt 0.750000 0.104478 +vt 0.750000 0.089552 +vt 0.750000 0.074627 +vt 0.750000 0.059701 +vt 0.750000 0.044776 +vt 0.781250 0.880597 +vt 0.781250 0.880597 +vt 0.593750 0.014925 +vt 0.187500 0.283582 +vt 0.468750 0.619403 +vt 0.000000 0.641791 +vt 0.500000 0.641791 +vt 0.031250 0.619403 +vt 0.000000 0.283582 +vt 0.468750 0.305970 +vt 0.500000 0.283582 +vt 0.031250 0.305970 +vt 0.500000 0.283582 +vt 0.000000 0.283582 +vt 0.468750 0.305970 +vt 0.500000 0.641791 +vt 0.468750 0.619403 +vt 0.000000 0.641791 +vt 0.031250 0.619403 +vt 0.531250 0.977612 +vt 0.500000 1.000000 +vt 0.968750 0.664179 +vt 1.000000 0.641791 +vt 1.000000 1.000000 +vt 0.968750 0.664179 +vt 1.000000 1.000000 +vt 1.000000 0.641791 +vt 0.968750 0.977612 +vt 0.500000 1.000000 +vt 0.531250 0.977612 +vt 0.531250 0.664179 +vt 0.562500 0.328358 +vt 1.000000 0.283582 +vt 0.937500 0.328358 +vt 0.937500 0.597015 +vt 0.562500 0.597015 +vt 0.531250 0.619403 +vt 0.531250 0.305970 +vt 1.000000 0.283582 +vt 0.968750 0.619403 +vt 0.062500 0.686567 +vt 0.437500 0.641791 +vt 0.062500 0.641791 +vt 0.062500 0.955224 +vt 0.010417 0.686567 +vt 0.010417 0.955224 +vt 0.437500 0.955224 +vt 0.062500 1.000000 +vt 0.437500 1.000000 +vt 0.437500 0.686567 +vt 0.489583 0.955224 +vt 0.489583 0.686567 +vt 0.031250 0.305970 +vt 0.531250 0.664179 +vt 0.968750 0.977612 +vt 0.968750 0.305970 +vt 0.000000 0.641791 +vt 0.468750 0.619403 +vt 0.500000 0.641791 +vt 0.000000 0.283582 +vt 0.031250 0.619403 +vt 0.468750 0.305970 +vt 0.031250 0.305970 +vt 0.500000 0.283582 +vt 0.500000 0.283582 +vt 0.031250 0.305970 +vt 0.000000 0.283582 +vt 0.500000 0.641791 +vt 0.468750 0.305970 +vt 0.000000 0.641791 +vt 0.468750 0.619403 +vt 0.031250 0.619403 +vt 0.531250 0.977612 +vt 0.500000 1.000000 +vt 1.000000 0.641791 +vt 0.531250 0.664179 +vt 1.000000 1.000000 +vt 0.968750 0.664179 +vt 0.968750 0.977612 +vt 1.000000 1.000000 +vt 0.968750 0.664179 +vt 1.000000 0.641791 +vt 0.500000 1.000000 +vt 0.968750 0.977612 +vt 0.531250 0.977612 +vt 0.531250 0.664179 +vt 1.000000 0.283582 +vt 0.562500 0.328358 +vt 0.937500 0.328358 +vt 0.937500 0.597015 +vt 0.562500 0.597015 +vt 0.531250 0.619403 +vt 1.000000 0.283582 +vt 0.531250 0.305970 +vt 0.968750 0.619403 +vt 0.968750 0.305970 +vt 0.437500 0.641791 +vt 0.062500 0.686567 +vt 0.062500 0.641791 +vt 0.010417 0.686567 +vt 0.062500 0.955224 +vt 0.010417 0.955224 +vt 0.062500 1.000000 +vt 0.437500 0.955224 +vt 0.437500 1.000000 +vt 0.489583 0.955224 +vt 0.437500 0.686567 +vt 0.489583 0.686567 +vt 0.031250 0.619403 +vt 0.031250 0.305970 +vn 0.0000 -1.0000 -0.0000 +vn 0.0000 1.0000 -0.0000 +vn -0.4994 0.0000 -0.8664 +vn 0.4994 0.0000 0.8664 +vn 0.8664 -0.0000 -0.4994 +vn -1.0000 0.0000 -0.0007 +vn -0.8664 0.0000 0.4994 +vn -0.0007 -0.0000 1.0000 +vn 1.0000 -0.0000 0.0007 +vn -0.8657 0.0000 -0.5006 +vn 0.0007 0.0000 -1.0000 +vn 0.8657 -0.0000 0.5006 +vn -0.5006 0.0000 0.8657 +vn 0.5006 0.0000 -0.8657 +vn -0.5000 0.0000 -0.8660 +vn -0.0000 0.0000 -1.0000 +vn 0.5000 0.0000 -0.8660 +vn 0.8660 0.0000 -0.5000 +vn 1.0000 0.0000 -0.0000 +vn 0.8660 0.0000 0.5000 +vn 0.5000 0.0000 0.8660 +vn 0.0000 0.0000 1.0000 +vn -0.5000 0.0000 0.8660 +vn -0.8660 0.0000 0.5000 +vn -1.0000 0.0000 -0.0000 +vn -0.8660 0.0000 -0.5000 +vn 0.8809 0.4734 0.0000 +vn -0.8719 0.4897 0.0000 +vn 0.0000 -0.7193 -0.6947 +vn 0.4940 0.1539 -0.8557 +vn 0.0000 0.1539 -0.9881 +vn 0.3473 -0.7193 -0.6016 +vn 0.8557 0.1539 -0.4940 +vn 0.6016 -0.7193 -0.3473 +vn 0.9881 0.1539 0.0000 +vn 0.6947 -0.7193 0.0000 +vn 0.8557 0.1539 0.4940 +vn 0.6016 -0.7193 0.3473 +vn 0.4940 0.1539 0.8557 +vn 0.3473 -0.7193 0.6016 +vn 0.0000 0.1539 0.9881 +vn 0.0000 -0.7193 0.6947 +vn -0.4940 0.1539 0.8557 +vn -0.6016 -0.7193 0.3473 +vn -0.8557 0.1539 0.4940 +vn -0.9881 0.1539 0.0000 +vn -0.6947 -0.7193 0.0000 +vn -0.8557 0.1539 -0.4940 +vn -0.3473 -0.7193 -0.6016 +vn -0.4940 0.1539 -0.8557 +vn 0.6557 -0.6532 -0.3786 +vn 0.7049 0.6082 -0.3649 +vn 0.7571 -0.6532 0.0000 +vn -0.7571 -0.6532 0.0000 +vn -0.7929 0.6082 -0.0364 +vn -0.6557 -0.6532 -0.3786 +vn 0.0000 -0.6532 0.7571 +vn -0.0364 0.6082 0.7929 +vn -0.3786 -0.6532 0.6557 +vn 0.7929 0.6082 0.0364 +vn 0.6557 -0.6532 0.3786 +vn -0.6685 0.6082 -0.4280 +vn -0.3786 -0.6532 -0.6557 +vn 0.0000 -0.6532 -0.7571 +vn 0.0364 0.6082 -0.7929 +vn 0.3786 -0.6532 -0.6557 +vn -0.4280 0.6082 0.6685 +vn -0.6557 -0.6532 0.3786 +vn 0.6685 0.6082 0.4280 +vn 0.3786 -0.6532 0.6557 +vn -0.3649 0.6082 -0.7049 +vn 0.4280 0.6082 -0.6685 +vn -0.7049 0.6082 0.3649 +vn 0.3649 0.6082 0.7049 +vn 0.5743 0.7314 0.3677 +vn 0.0000 -0.7703 0.6377 +vn 0.3135 0.7314 0.6056 +vn 0.3677 0.7314 -0.5743 +vn 0.6377 -0.7703 0.0000 +vn 0.6056 0.7314 -0.3135 +vn -0.6056 0.7314 0.3135 +vn -0.5523 -0.7703 -0.3189 +vn -0.6812 0.7314 -0.0313 +vn -0.3189 -0.7703 0.5523 +vn -0.0313 0.7314 0.6812 +vn 0.5523 -0.7703 0.3189 +vn 0.6812 0.7314 0.0313 +vn -0.3189 -0.7703 -0.5523 +vn -0.5743 0.7314 -0.3677 +vn -0.3135 0.7314 -0.6056 +vn 0.3189 -0.7703 -0.5523 +vn 0.0313 0.7314 -0.6812 +vn -0.5523 -0.7703 0.3189 +vn -0.3677 0.7314 0.5743 +vn 0.3189 -0.7703 0.5523 +vn 0.0000 -0.7703 -0.6377 +vn 0.5523 -0.7703 -0.3189 +vn -0.6377 -0.7703 0.0000 +vn -0.7571 0.6532 0.0000 +vn 0.3786 0.6532 0.6557 +vn 0.0000 0.6532 0.7571 +vn 0.7571 0.6532 0.0000 +vn -0.6557 0.6532 -0.3786 +vn -0.3786 0.6532 0.6557 +vn 0.6557 0.6532 0.3786 +vn -0.3786 0.6532 -0.6557 +vn 0.3786 0.6532 -0.6557 +vn -0.6557 0.6532 0.3786 +vn 0.0000 0.6532 -0.7571 +vn 0.6557 0.6532 -0.3786 +vn -0.2575 0.9661 0.0204 +vn 0.2350 0.7987 0.5539 +vn 0.4929 0.8701 0.0015 +vn 0.9090 0.4158 0.0295 +vn 0.9434 0.2695 -0.1931 +vn 0.9997 0.0000 0.0241 +vn -0.6297 0.7768 -0.0107 +vn 0.0228 0.7593 0.6503 +vn -0.0188 0.7524 0.6584 +vn -0.9484 0.3168 0.0112 +vn -0.0188 0.7524 -0.6584 +vn -0.6297 0.7768 0.0107 +vn -0.9085 0.4167 -0.0296 +vn -0.9406 0.2792 0.1928 +vn -0.9997 0.0000 -0.0239 +vn -0.4229 0.8072 -0.4117 +vn -0.2575 0.9661 -0.0204 +vn 0.4213 0.8071 0.4136 +vn 0.2596 0.9655 0.0204 +vn -0.2331 0.7987 0.5548 +vn 0.6451 0.3269 0.6906 +vn 0.9482 0.3173 -0.0107 +vn -0.6416 0.3261 0.6943 +vn -0.4947 0.8690 0.0010 +vn -0.9484 0.3168 -0.0112 +vn 0.6334 0.7737 -0.0104 +vn 0.9482 0.3173 0.0107 +vn 0.0228 0.7593 -0.6503 +vn 0.6451 0.3269 -0.6906 +vn 0.7569 0.6534 0.0098 +vn 0.6334 0.7737 0.0104 +vn 0.9482 0.3174 0.0081 +vn 0.8900 0.4558 0.0065 +vn 0.7569 0.6535 0.0070 +vn 0.6335 0.7736 0.0078 +vn 0.9483 0.3174 0.0054 +vn 0.8901 0.4557 0.0047 +vn 0.7569 0.6535 0.0042 +vn 0.6336 0.7736 0.0052 +vn 0.9483 0.3174 0.0027 +vn 0.8901 0.4557 0.0028 +vn 0.7569 0.6535 0.0014 +vn 0.6337 0.7736 0.0026 +vn 0.9483 0.3174 0.0000 +vn 0.8901 0.4557 0.0009 +vn 0.7569 0.6535 -0.0014 +vn 0.6337 0.7736 0.0000 +vn 0.9483 0.3174 -0.0027 +vn 0.8901 0.4557 -0.0009 +vn 0.7569 0.6535 -0.0042 +vn 0.6337 0.7736 -0.0026 +vn 0.9483 0.3174 -0.0054 +vn 0.8901 0.4557 -0.0028 +vn 0.7569 0.6535 -0.0070 +vn 0.6336 0.7736 -0.0052 +vn 0.9482 0.3174 -0.0081 +vn 0.8901 0.4557 -0.0047 +vn 0.7569 0.6534 -0.0098 +vn 0.6335 0.7736 -0.0078 +vn 0.8900 0.4558 -0.0065 +vn -0.6416 0.3261 -0.6943 +vn -0.4947 0.8690 -0.0010 +vn -0.2331 0.7987 -0.5548 +vn -0.8895 0.4569 0.0070 +vn -0.4947 0.8690 -0.0008 +vn -0.2756 0.9612 -0.0102 +vn -0.8895 0.4569 0.0050 +vn -0.9484 0.3168 0.0084 +vn -0.4946 0.8691 -0.0005 +vn -0.2756 0.9612 -0.0073 +vn -0.8895 0.4568 0.0030 +vn -0.9484 0.3168 0.0056 +vn -0.4946 0.8691 -0.0002 +vn -0.2756 0.9612 -0.0043 +vn -0.8896 0.4568 0.0010 +vn -0.9485 0.3169 0.0028 +vn -0.4946 0.8691 0.0000 +vn -0.2757 0.9612 -0.0014 +vn -0.8896 0.4568 -0.0010 +vn -0.9485 0.3169 0.0000 +vn -0.4946 0.8691 0.0002 +vn -0.2757 0.9612 0.0014 +vn -0.8895 0.4568 -0.0030 +vn -0.9485 0.3169 -0.0028 +vn -0.4946 0.8691 0.0005 +vn -0.2756 0.9612 0.0043 +vn -0.8895 0.4569 -0.0050 +vn -0.9484 0.3168 -0.0056 +vn -0.4947 0.8690 0.0008 +vn -0.2756 0.9612 0.0073 +vn -0.8895 0.4569 -0.0070 +vn -0.9484 0.3168 -0.0084 +vn -0.2756 0.9612 0.0102 +vn 0.4929 0.8701 -0.0015 +vn 0.2350 0.7987 -0.5539 +vn 0.4928 0.8701 -0.0011 +vn 0.2778 0.9606 -0.0102 +vn 0.4928 0.8701 -0.0007 +vn 0.2778 0.9606 -0.0073 +vn 0.4928 0.8701 -0.0004 +vn 0.2778 0.9606 -0.0043 +vn 0.4928 0.8701 0.0000 +vn 0.2779 0.9606 -0.0014 +vn 0.4928 0.8701 0.0004 +vn 0.2779 0.9606 0.0014 +vn 0.4928 0.8701 0.0007 +vn 0.2778 0.9606 0.0043 +vn 0.4928 0.8701 0.0011 +vn 0.2778 0.9606 0.0073 +vn 0.2778 0.9606 0.0102 +vn 0.2596 0.9655 -0.0204 +vn 0.4213 0.8071 -0.4136 +vn 0.4650 0.8851 -0.0183 +vn 0.2597 0.9655 -0.0153 +vn 0.4651 0.8852 -0.0131 +vn 0.2598 0.9656 -0.0102 +vn 0.4651 0.8852 -0.0078 +vn 0.2598 0.9656 -0.0051 +vn 0.4651 0.8852 -0.0026 +vn 0.2598 0.9656 0.0000 +vn 0.4651 0.8852 0.0026 +vn 0.2598 0.9656 0.0051 +vn 0.4651 0.8852 0.0078 +vn 0.2598 0.9656 0.0102 +vn 0.4651 0.8852 0.0131 +vn 0.2597 0.9655 0.0153 +vn 0.4650 0.8851 0.0183 +vn 0.9090 0.4158 -0.0295 +vn 0.8721 0.3391 -0.3527 +vn 0.9091 0.4158 -0.0221 +vn 0.9320 0.3618 -0.0188 +vn 0.9093 0.4159 -0.0147 +vn 0.9321 0.3619 -0.0134 +vn 0.9093 0.4159 -0.0074 +vn 0.9322 0.3619 -0.0080 +vn 0.9094 0.4159 0.0000 +vn 0.9322 0.3619 -0.0027 +vn 0.9093 0.4159 0.0074 +vn 0.9322 0.3619 0.0027 +vn 0.9093 0.4159 0.0147 +vn 0.9322 0.3619 0.0080 +vn 0.9091 0.4158 0.0221 +vn 0.9321 0.3619 0.0134 +vn 0.9320 0.3618 0.0188 +vn -0.4229 0.8072 0.4117 +vn -0.9085 0.4167 0.0296 +vn -0.8732 0.3390 0.3500 +vn -0.4663 0.8844 0.0184 +vn -0.9087 0.4168 0.0222 +vn -0.9322 0.3613 0.0188 +vn -0.4664 0.8845 0.0131 +vn -0.2575 0.9661 0.0153 +vn -0.9088 0.4168 0.0148 +vn -0.9323 0.3613 0.0134 +vn -0.4664 0.8845 0.0079 +vn -0.2576 0.9662 0.0102 +vn -0.9089 0.4169 0.0074 +vn -0.9324 0.3614 0.0080 +vn -0.4664 0.8845 0.0026 +vn -0.2576 0.9662 0.0051 +vn -0.9089 0.4169 0.0000 +vn -0.9324 0.3614 0.0027 +vn -0.4664 0.8845 -0.0026 +vn -0.2576 0.9662 0.0000 +vn -0.9089 0.4169 -0.0074 +vn -0.9324 0.3614 -0.0027 +vn -0.4664 0.8845 -0.0079 +vn -0.2576 0.9662 -0.0051 +vn -0.9088 0.4168 -0.0148 +vn -0.9324 0.3614 -0.0080 +vn -0.4664 0.8845 -0.0131 +vn -0.2576 0.9662 -0.0102 +vn -0.9087 0.4168 -0.0222 +vn -0.9323 0.3613 -0.0134 +vn -0.4663 0.8844 -0.0184 +vn -0.2575 0.9661 -0.0153 +vn -0.9322 0.3613 -0.0188 +vn -0.9406 0.2792 -0.1928 +vn -0.9997 0.0000 0.0239 +vn -0.9998 0.0000 0.0221 +vn -0.9998 0.0000 0.0179 +vn -0.9998 0.0000 0.0157 +vn -0.9999 0.0000 0.0119 +vn -0.9999 0.0000 0.0095 +vn -1.0000 0.0000 0.0060 +vn -1.0000 0.0000 0.0031 +vn -1.0000 0.0000 -0.0031 +vn -1.0000 0.0000 -0.0060 +vn -0.9999 0.0000 -0.0095 +vn -0.9999 0.0000 -0.0119 +vn -0.9998 0.0000 -0.0157 +vn -0.9998 0.0000 -0.0179 +vn -0.9998 0.0000 -0.0221 +vn -0.7587 0.6513 -0.0102 +vn -0.7587 0.6514 -0.0072 +vn -0.6298 0.7767 -0.0080 +vn -0.7587 0.6514 -0.0043 +vn -0.6299 0.7766 -0.0053 +vn -0.7587 0.6514 -0.0014 +vn -0.6299 0.7766 -0.0027 +vn -0.7587 0.6514 0.0014 +vn -0.6299 0.7766 0.0000 +vn -0.7587 0.6514 0.0043 +vn -0.6299 0.7766 0.0027 +vn -0.7587 0.6514 0.0072 +vn -0.6299 0.7766 0.0053 +vn -0.7587 0.6513 0.0102 +vn -0.6298 0.7767 0.0080 +vn 0.9434 0.2695 0.1931 +vn 0.9997 0.0000 -0.0241 +vn 0.9998 0.0000 -0.0219 +vn 0.9998 0.0000 -0.0181 +vn 0.9999 0.0000 -0.0156 +vn 0.9999 0.0000 -0.0120 +vn 0.9999 0.0000 -0.0094 +vn 1.0000 0.0000 -0.0060 +vn 1.0000 0.0000 -0.0031 +vn 1.0000 0.0000 0.0031 +vn 1.0000 0.0000 0.0060 +vn 0.9999 0.0000 0.0094 +vn 0.9999 0.0000 0.0120 +vn 0.9999 0.0000 0.0156 +vn 0.9998 0.0000 0.0181 +vn 0.9998 0.0000 0.0219 +vn -0.3473 -0.7193 0.6016 +vn -0.6016 -0.7193 -0.3473 +vn 0.8721 0.3391 0.3527 +vn -0.8732 0.3390 -0.3500 +vn 0.9999 0.0000 0.0110 +vn 0.9997 -0.0257 0.0000 +vn 0.9999 0.0000 -0.0110 +vn 0.9999 -0.0110 0.0000 +vn 0.0000 -0.9999 -0.0105 +vn -0.0113 -0.9999 0.0000 +vn 0.0000 -0.9999 0.0105 +vn 0.0099 -1.0000 0.0000 +vn 0.9996 0.0027 -0.0280 +vn 0.9466 0.3215 0.0230 +vn 0.9486 -0.0207 -0.3158 +vn -0.9999 0.0000 -0.0110 +vn -0.9997 0.0243 0.0000 +vn -0.9486 0.0207 0.3158 +vn -0.9999 0.0110 0.0000 +vn 0.0000 0.9999 0.0105 +vn 0.0113 0.9999 0.0000 +vn 0.0000 0.9999 -0.0105 +vn -0.0099 1.0000 0.0000 +vn -0.9996 -0.0026 0.0265 +vn -0.9999 0.0000 0.0110 +usemtl None +s off +f 44/1/1 65/2/1 46/3/1 +f 38/4/1 72/5/1 62/6/1 +f 38/4/1 61/7/1 40/8/1 +f 42/9/1 64/10/1 44/11/1 +f 60/12/1 71/13/1 72/5/1 +f 40/8/1 63/14/1 42/9/1 +f 56/15/1 71/13/1 58/16/1 +f 56/17/1 69/18/1 70/19/1 +f 52/20/1 69/18/1 54/21/1 +f 50/22/1 68/23/1 52/20/1 +f 50/22/1 66/24/1 67/25/1 +f 46/3/1 66/24/1 48/26/1 +f 75/27/2 88/28/2 76/29/2 +f 83/30/2 94/31/2 95/32/2 +f 79/33/2 92/34/2 80/35/2 +f 77/36/2 88/37/2 89/38/2 +f 83/30/2 96/39/2 84/40/2 +f 74/41/2 85/42/2 73/43/2 +f 80/35/2 93/44/2 81/45/2 +f 77/36/2 90/46/2 78/47/2 +f 84/40/2 86/48/2 74/41/2 +f 73/43/2 87/49/2 75/27/2 +f 81/45/2 94/50/2 82/51/2 +f 79/33/2 90/46/2 91/52/2 +f 103/53/1 114/54/1 115/55/1 +f 99/56/1 112/57/1 100/58/1 +f 107/59/1 118/60/1 119/61/1 +f 103/53/1 116/62/1 104/63/1 +f 100/64/1 113/65/1 101/66/1 +f 107/59/1 120/67/1 108/68/1 +f 98/69/1 109/70/1 97/71/1 +f 105/72/1 116/62/1 117/73/1 +f 102/74/1 113/65/1 114/54/1 +f 108/68/1 110/75/1 98/69/1 +f 97/71/1 111/76/1 99/56/1 +f 106/77/1 117/73/1 118/78/1 +f 131/79/2 127/80/2 122/81/2 +f 165/82/3 201/83/3 177/84/3 +f 159/85/4 195/86/4 171/87/4 +f 168/88/5 204/89/5 180/90/5 +f 163/91/6 199/92/6 175/93/6 +f 162/94/7 198/95/7 174/96/7 +f 160/97/8 196/98/8 172/99/8 +f 158/100/9 194/101/9 170/102/9 +f 164/103/10 200/104/10 176/105/10 +f 166/106/11 202/107/11 178/108/11 +f 157/109/12 193/110/12 169/111/12 +f 161/112/13 197/113/13 173/114/13 +f 167/115/14 203/116/14 179/117/14 +f 87/118/15 135/119/15 75/120/15 +f 148/121/16 76/122/16 88/123/16 +f 149/124/17 77/125/17 89/126/17 +f 150/127/18 78/128/18 90/129/18 +f 79/130/19 151/131/19 139/132/19 +f 152/133/20 80/134/20 92/135/20 +f 153/136/21 81/137/21 93/138/21 +f 94/139/22 142/140/22 82/141/22 +f 83/142/23 155/143/23 143/144/23 +f 84/145/24 156/146/24 144/147/24 +f 74/148/25 146/149/25 134/150/25 +f 73/151/26 145/152/26 133/153/26 +f 224/154/22 213/155/22 214/156/22 +f 226/157/16 219/158/16 220/159/16 +f 224/154/22 214/156/22 223/160/22 +f 223/160/22 214/156/22 210/161/22 +f 214/156/22 205/162/22 210/161/22 +f 209/163/27 436/164/27 207/165/27 +f 210/166/2 433/167/2 209/168/2 +f 207/169/22 217/170/22 209/171/22 +f 209/171/22 217/170/22 228/172/22 +f 227/173/22 228/172/22 217/170/22 +f 217/170/22 218/174/22 227/173/22 +f 436/175/22 434/176/22 435/177/22 +f 434/176/22 436/175/22 433/167/22 +f 205/178/28 434/179/28 210/180/28 +f 226/157/16 220/159/16 225/181/16 +f 225/181/16 220/159/16 212/182/16 +f 220/159/16 208/183/16 212/182/16 +f 212/184/2 437/185/2 211/186/2 +f 211/187/28 440/188/28 206/189/28 +f 222/190/16 211/191/16 206/192/16 +f 221/193/16 222/190/16 206/192/16 +f 221/193/16 206/192/16 216/194/16 +f 215/195/16 216/194/16 206/192/16 +f 440/196/16 438/197/16 439/198/16 +f 438/197/16 440/196/16 437/185/16 +f 208/199/27 438/200/27 212/201/27 +f 442/202/16 443/203/16 441/204/16 +f 448/205/22 445/206/22 447/207/22 +f 446/208/19 441/204/19 445/206/19 +f 447/209/2 441/204/2 443/210/2 +f 444/211/1 446/208/1 448/212/1 +f 451/213/19 450/214/19 449/215/19 +f 453/216/25 456/217/25 455/218/25 +f 449/215/16 454/219/16 453/216/16 +f 451/220/2 453/216/2 455/221/2 +f 454/219/1 452/222/1 456/223/1 +f 458/224/19 459/225/19 457/226/19 +f 464/227/25 461/228/25 463/229/25 +f 462/230/22 457/226/22 461/228/22 +f 459/231/2 461/228/2 457/226/2 +f 460/232/1 462/230/1 464/233/1 +f 467/234/16 466/235/16 465/236/16 +f 469/237/22 472/238/22 471/239/22 +f 465/236/25 470/240/25 469/237/25 +f 465/236/2 471/241/2 467/242/2 +f 472/243/1 466/235/1 468/244/1 +f 44/1/1 64/245/1 65/2/1 +f 38/4/1 60/12/1 72/5/1 +f 38/4/1 62/6/1 61/7/1 +f 42/9/1 63/14/1 64/10/1 +f 60/12/1 58/16/1 71/13/1 +f 40/8/1 61/7/1 63/14/1 +f 56/15/1 70/246/1 71/13/1 +f 56/17/1 54/21/1 69/18/1 +f 52/20/1 68/23/1 69/18/1 +f 50/22/1 67/25/1 68/23/1 +f 50/22/1 48/26/1 66/24/1 +f 46/3/1 65/2/1 66/24/1 +f 75/27/2 87/49/2 88/28/2 +f 83/30/2 82/247/2 94/31/2 +f 79/33/2 91/52/2 92/34/2 +f 77/36/2 76/248/2 88/37/2 +f 83/30/2 95/32/2 96/39/2 +f 74/41/2 86/48/2 85/42/2 +f 80/35/2 92/34/2 93/44/2 +f 77/36/2 89/38/2 90/46/2 +f 84/40/2 96/39/2 86/48/2 +f 73/43/2 85/42/2 87/49/2 +f 81/45/2 93/44/2 94/50/2 +f 79/33/2 78/47/2 90/46/2 +f 103/53/1 102/74/1 114/54/1 +f 99/56/1 111/76/1 112/57/1 +f 107/59/1 106/249/1 118/60/1 +f 103/53/1 115/55/1 116/62/1 +f 100/64/1 112/250/1 113/65/1 +f 107/59/1 119/61/1 120/67/1 +f 98/69/1 110/75/1 109/70/1 +f 105/72/1 104/63/1 116/62/1 +f 102/74/1 101/66/1 113/65/1 +f 108/68/1 120/67/1 110/75/1 +f 97/71/1 109/70/1 111/76/1 +f 106/77/1 105/72/1 117/73/1 +f 123/251/2 121/252/2 122/81/2 +f 122/81/2 132/253/2 131/79/2 +f 131/79/2 130/254/2 129/255/2 +f 129/255/2 128/256/2 131/79/2 +f 127/80/2 126/257/2 125/258/2 +f 125/258/2 124/259/2 123/251/2 +f 123/251/2 122/81/2 127/80/2 +f 131/79/2 128/256/2 127/80/2 +f 127/80/2 125/258/2 123/251/2 +f 165/82/3 189/260/3 201/83/3 +f 159/85/4 183/261/4 195/86/4 +f 168/88/5 192/262/5 204/89/5 +f 163/91/6 187/263/6 199/92/6 +f 162/94/7 186/264/7 198/95/7 +f 160/97/8 184/265/8 196/98/8 +f 158/100/9 182/266/9 194/101/9 +f 164/103/10 188/267/10 200/104/10 +f 166/106/11 190/268/11 202/107/11 +f 157/109/12 181/269/12 193/110/12 +f 161/112/13 185/270/13 197/113/13 +f 167/115/14 191/271/14 203/116/14 +f 87/118/15 147/272/15 135/119/15 +f 148/121/16 136/273/16 76/122/16 +f 149/124/17 137/274/17 77/125/17 +f 150/127/18 138/275/18 78/128/18 +f 79/130/19 91/276/19 151/131/19 +f 152/133/20 140/277/20 80/134/20 +f 153/136/21 141/278/21 81/137/21 +f 94/139/22 154/279/22 142/140/22 +f 83/142/23 95/280/23 155/143/23 +f 84/145/24 96/281/24 156/146/24 +f 74/148/25 86/282/25 146/149/25 +f 73/151/26 85/283/26 145/152/26 +f 209/163/27 433/284/27 436/164/27 +f 210/166/2 434/176/2 433/167/2 +f 205/178/28 435/285/28 434/179/28 +f 212/184/2 438/197/2 437/185/2 +f 211/187/28 437/286/28 440/188/28 +f 208/199/27 439/287/27 438/200/27 +f 442/202/16 444/288/16 443/203/16 +f 448/205/22 446/208/22 445/206/22 +f 446/208/19 442/202/19 441/204/19 +f 447/209/2 445/206/2 441/204/2 +f 444/211/1 442/202/1 446/208/1 +f 451/213/19 452/289/19 450/214/19 +f 453/216/25 454/219/25 456/217/25 +f 449/215/16 450/214/16 454/219/16 +f 451/220/2 449/215/2 453/216/2 +f 454/219/1 450/214/1 452/222/1 +f 458/224/19 460/290/19 459/225/19 +f 464/227/25 462/230/25 461/228/25 +f 462/230/22 458/224/22 457/226/22 +f 459/231/2 463/291/2 461/228/2 +f 460/232/1 458/224/1 462/230/1 +f 467/234/16 468/292/16 466/235/16 +f 469/237/22 470/240/22 472/238/22 +f 465/236/25 466/235/25 470/240/25 +f 465/236/2 469/237/2 471/241/2 +f 472/243/1 470/240/1 466/235/1 +s 1 +f 38/4/29 39/293/30 37/294/31 +f 40/8/32 41/295/33 39/293/30 +f 42/9/34 43/296/35 41/295/33 +f 44/1/36 45/297/37 43/298/35 +f 46/3/38 47/299/39 45/297/37 +f 48/26/40 49/300/41 47/299/39 +f 50/22/42 51/301/43 49/300/41 +f 51/301/43 54/21/44 53/302/45 +f 54/21/44 55/303/46 53/302/45 +f 56/15/47 57/304/48 55/305/46 +f 57/304/48 60/12/49 59/306/50 +f 60/12/49 37/294/31 59/306/50 +f 63/14/51 76/29/52 64/10/53 +f 70/246/54 83/30/55 71/13/56 +f 67/25/57 80/35/58 68/23/59 +f 64/245/53 77/36/60 65/2/61 +f 71/13/56 84/40/62 72/5/63 +f 62/6/64 73/43/65 61/7/66 +f 68/23/59 81/45/67 69/18/68 +f 65/2/61 78/47/69 66/24/70 +f 72/5/63 74/41/71 62/6/64 +f 61/7/66 75/27/72 63/14/51 +f 69/18/68 82/51/73 70/19/54 +f 66/24/70 79/33/74 67/25/57 +f 90/46/75 103/53/76 91/52/77 +f 87/49/78 100/58/79 88/28/80 +f 94/31/81 107/59/82 95/32/83 +f 91/52/77 104/63/84 92/34/85 +f 88/37/80 101/66/86 89/38/87 +f 95/32/83 108/68/88 96/39/89 +f 86/48/90 97/71/91 85/42/92 +f 92/34/85 105/72/93 93/44/94 +f 89/38/87 102/74/95 90/46/75 +f 96/39/89 98/69/96 86/48/90 +f 85/42/92 99/56/97 87/49/78 +f 93/44/94 106/77/98 94/50/81 +f 117/73/68 130/307/99 118/78/54 +f 115/55/57 126/308/100 127/309/101 +f 111/76/51 124/310/102 112/57/53 +f 118/60/54 131/311/103 119/61/56 +f 115/55/57 128/312/104 116/62/59 +f 112/250/53 125/313/105 113/65/61 +f 120/67/63 131/311/103 132/314/106 +f 110/75/64 121/315/107 109/70/66 +f 116/62/59 129/316/108 117/73/68 +f 113/65/61 126/308/100 114/54/70 +f 120/67/63 122/317/109 110/75/64 +f 109/70/66 123/318/110 111/76/51 +f 297/319/111 224/320/112 381/321/113 +f 348/322/114 207/323/115 246/324/116 +f 296/325/117 210/326/118 209/327/119 +f 399/328/120 212/329/121 280/330/122 +f 314/331/123 206/332/124 229/333/125 +f 216/334/126 314/331/123 313/335/127 +f 218/336/128 348/322/114 347/337/129 +f 347/337/129 227/338/130 218/336/128 +f 381/321/113 223/339/131 382/340/132 +f 228/341/133 416/342/134 415/343/135 +f 382/340/132 210/326/118 279/344/136 +f 398/345/137 211/346/138 222/347/139 +f 398/345/137 264/348/140 263/349/141 +f 396/350/142 264/348/140 397/351/143 +f 396/350/142 266/352/144 265/353/145 +f 394/354/146 266/352/144 395/355/147 +f 394/354/146 268/356/148 267/357/149 +f 392/358/150 268/356/148 393/359/151 +f 392/358/150 270/360/152 269/361/153 +f 390/362/154 270/360/152 391/363/155 +f 390/362/154 272/364/156 271/365/157 +f 388/366/158 272/364/156 389/367/159 +f 388/366/158 274/368/160 273/369/161 +f 386/370/162 274/368/160 387/371/163 +f 386/370/162 276/372/164 275/373/165 +f 384/374/166 276/372/164 385/375/167 +f 384/374/166 278/376/168 277/377/169 +f 382/340/132 278/376/168 383/378/170 +f 225/379/171 432/380/172 226/381/173 +f 400/382/174 432/380/172 399/328/120 +f 400/382/174 430/383/175 431/384/176 +f 402/385/177 430/383/175 401/386/178 +f 402/385/177 428/387/179 429/388/180 +f 404/389/181 428/387/179 403/390/182 +f 404/389/181 426/391/183 427/392/184 +f 406/393/185 426/391/183 405/394/186 +f 406/393/185 424/395/187 425/396/188 +f 408/397/189 424/395/187 407/398/190 +f 408/397/189 422/399/191 423/400/192 +f 410/401/193 422/399/191 409/402/194 +f 410/401/193 420/403/195 421/404/196 +f 412/405/197 420/403/195 411/406/198 +f 412/405/197 418/407/199 419/408/200 +f 414/409/201 418/407/199 413/410/202 +f 414/409/201 416/342/134 417/411/203 +f 365/412/204 222/347/139 221/413/205 +f 365/412/204 397/351/143 398/345/137 +f 367/414/206 397/351/143 366/415/207 +f 367/414/206 395/355/147 396/350/142 +f 369/416/208 395/355/147 368/417/209 +f 369/416/208 393/359/151 394/354/146 +f 371/418/210 393/359/151 370/419/211 +f 371/418/210 391/363/155 392/358/150 +f 373/420/212 391/363/155 372/421/213 +f 373/420/212 389/367/159 390/362/154 +f 375/422/214 389/367/159 374/423/215 +f 375/422/214 387/371/163 388/366/158 +f 377/424/216 387/371/163 376/425/217 +f 377/424/216 385/375/167 386/370/162 +f 379/426/218 385/375/167 378/427/219 +f 379/426/218 383/378/170 384/374/166 +f 381/321/113 383/378/170 380/428/220 +f 226/381/173 331/429/221 219/430/222 +f 331/429/221 431/384/176 332/431/223 +f 431/384/176 333/432/224 332/431/223 +f 333/432/224 429/388/180 334/433/225 +f 429/388/180 335/434/226 334/433/225 +f 335/434/226 427/392/184 336/435/227 +f 427/392/184 337/436/228 336/435/227 +f 337/436/228 425/396/188 338/437/229 +f 425/396/188 339/438/230 338/437/229 +f 339/438/230 423/400/192 340/439/231 +f 423/400/192 341/440/232 340/439/231 +f 341/440/232 421/404/196 342/441/233 +f 421/404/196 343/442/234 342/441/233 +f 343/442/234 419/408/200 344/443/235 +f 419/408/200 345/444/236 344/443/235 +f 345/444/236 417/411/203 346/445/237 +f 417/411/203 347/337/129 346/445/237 +f 219/430/222 364/446/238 220/447/239 +f 332/431/223 364/446/238 331/429/221 +f 332/431/223 362/448/240 363/449/241 +f 334/433/225 362/448/240 333/432/224 +f 334/433/225 360/450/242 361/451/243 +f 336/435/227 360/450/242 335/434/226 +f 336/435/227 358/452/244 359/453/245 +f 338/437/229 358/452/244 337/436/228 +f 338/437/229 356/454/246 357/455/247 +f 340/439/231 356/454/246 339/438/230 +f 340/439/231 354/456/248 355/457/249 +f 342/441/233 354/456/248 341/440/232 +f 342/441/233 352/458/250 353/459/251 +f 344/443/235 352/458/250 343/442/234 +f 344/443/235 350/460/252 351/461/253 +f 346/445/237 350/460/252 345/444/236 +f 346/445/237 348/322/114 349/462/254 +f 213/463/255 330/464/256 214/465/257 +f 298/466/258 330/464/256 297/319/111 +f 298/466/258 328/467/259 329/468/260 +f 300/469/261 328/467/259 299/470/262 +f 300/469/261 326/471/263 327/472/264 +f 302/473/265 326/471/263 301/474/266 +f 302/473/265 324/475/267 325/476/268 +f 304/477/269 324/475/267 303/478/270 +f 304/477/269 322/479/271 323/480/272 +f 306/481/273 322/479/271 305/482/274 +f 306/481/273 320/483/275 321/484/276 +f 308/485/277 320/483/275 307/486/278 +f 308/485/277 318/487/279 319/488/280 +f 310/489/281 318/487/279 309/490/282 +f 310/489/281 316/491/283 317/492/284 +f 312/493/285 316/491/283 311/494/286 +f 312/493/285 314/331/123 315/495/287 +f 205/496/288 330/464/256 245/497/289 +f 330/464/256 244/498/290 245/497/289 +f 244/498/290 328/467/259 243/499/291 +f 328/467/259 242/500/292 243/499/291 +f 242/500/292 326/471/263 241/501/293 +f 326/471/263 240/502/294 241/501/293 +f 240/502/294 324/475/267 239/503/295 +f 324/475/267 238/504/296 239/503/295 +f 238/504/296 322/479/271 237/505/25 +f 322/479/271 236/506/297 237/505/25 +f 236/506/297 320/483/275 235/507/298 +f 320/483/275 234/508/299 235/507/298 +f 234/508/299 318/487/279 233/509/300 +f 318/487/279 232/510/301 233/509/300 +f 232/510/301 316/491/283 231/511/302 +f 316/491/283 230/512/303 231/511/302 +f 230/512/303 314/331/123 229/333/125 +f 415/343/135 209/327/119 228/341/133 +f 415/343/135 295/513/304 296/325/117 +f 413/410/202 295/513/304 414/409/201 +f 413/410/202 293/514/305 294/515/306 +f 411/406/198 293/514/305 412/405/197 +f 411/406/198 291/516/307 292/517/308 +f 409/402/194 291/516/307 410/401/193 +f 409/402/194 289/518/309 290/519/310 +f 407/398/190 289/518/309 408/397/189 +f 407/398/190 287/520/311 288/521/312 +f 405/394/186 287/520/311 406/393/185 +f 405/394/186 285/522/313 286/523/314 +f 403/390/182 285/522/313 404/389/181 +f 403/390/182 283/524/315 284/525/316 +f 401/386/178 283/524/315 402/385/177 +f 401/386/178 281/526/317 282/527/318 +f 399/328/120 281/526/317 400/382/174 +f 211/346/138 280/330/122 212/329/121 +f 280/330/122 264/348/140 281/526/317 +f 264/348/140 282/527/318 281/526/317 +f 282/527/318 266/352/144 283/524/315 +f 266/352/144 284/525/316 283/524/315 +f 284/525/316 268/356/148 285/522/313 +f 268/356/148 286/523/314 285/522/313 +f 286/523/314 270/360/152 287/520/311 +f 270/360/152 288/521/312 287/520/311 +f 288/521/312 272/364/156 289/518/309 +f 272/364/156 290/519/310 289/518/309 +f 290/519/310 274/368/160 291/516/307 +f 274/368/160 292/517/308 291/516/307 +f 292/517/308 276/372/164 293/514/305 +f 276/372/164 294/515/306 293/514/305 +f 294/515/306 278/376/168 295/513/304 +f 278/376/168 296/325/117 295/513/304 +f 208/528/319 364/446/238 262/529/320 +f 364/446/238 261/530/321 262/529/320 +f 261/530/321 362/448/240 260/531/322 +f 362/448/240 259/532/323 260/531/322 +f 259/532/323 360/450/242 258/533/324 +f 360/450/242 257/534/325 258/533/324 +f 257/534/325 358/452/244 256/535/326 +f 358/452/244 255/536/327 256/535/326 +f 255/536/327 356/454/246 254/537/19 +f 356/454/246 253/538/328 254/537/19 +f 253/538/328 354/456/248 252/539/329 +f 354/456/248 251/540/330 252/539/329 +f 251/540/330 352/458/250 250/541/331 +f 352/458/250 249/542/332 250/541/331 +f 249/542/332 350/460/252 248/543/333 +f 350/460/252 247/544/334 248/543/333 +f 247/544/334 348/322/114 246/324/116 +f 221/413/205 313/335/127 365/412/204 +f 313/335/127 366/415/207 365/412/204 +f 366/415/207 311/494/286 367/414/206 +f 311/494/286 368/417/209 367/414/206 +f 368/417/209 309/490/282 369/416/208 +f 309/490/282 370/419/211 369/416/208 +f 370/419/211 307/486/278 371/418/210 +f 307/486/278 372/421/213 371/418/210 +f 372/421/213 305/482/274 373/420/212 +f 305/482/274 374/423/215 373/420/212 +f 374/423/215 303/478/270 375/422/214 +f 303/478/270 376/425/217 375/422/214 +f 376/425/217 301/474/266 377/424/216 +f 301/474/266 378/427/219 377/424/216 +f 378/427/219 299/470/262 379/426/218 +f 299/470/262 380/428/220 379/426/218 +f 380/428/220 297/319/111 381/321/113 +f 38/4/29 40/8/32 39/293/30 +f 40/8/32 42/9/34 41/295/33 +f 42/9/34 44/11/36 43/296/35 +f 44/1/36 46/3/38 45/297/37 +f 46/3/38 48/26/40 47/299/39 +f 48/26/40 50/22/42 49/300/41 +f 50/22/42 52/20/335 51/301/43 +f 51/301/43 52/20/335 54/21/44 +f 54/21/44 56/17/47 55/303/46 +f 56/15/47 58/16/336 57/304/48 +f 57/304/48 58/16/336 60/12/49 +f 60/12/49 38/4/29 37/294/31 +f 63/14/51 75/27/72 76/29/52 +f 70/246/54 82/247/73 83/30/55 +f 67/25/57 79/33/74 80/35/58 +f 64/245/53 76/248/52 77/36/60 +f 71/13/56 83/30/55 84/40/62 +f 62/6/64 74/41/71 73/43/65 +f 68/23/59 80/35/58 81/45/67 +f 65/2/61 77/36/60 78/47/69 +f 72/5/63 84/40/62 74/41/71 +f 61/7/66 73/43/65 75/27/72 +f 69/18/68 81/45/67 82/51/73 +f 66/24/70 78/47/69 79/33/74 +f 90/46/75 102/74/95 103/53/76 +f 87/49/78 99/56/97 100/58/79 +f 94/31/81 106/249/98 107/59/82 +f 91/52/77 103/53/76 104/63/84 +f 88/37/80 100/64/79 101/66/86 +f 95/32/83 107/59/82 108/68/88 +f 86/48/90 98/69/96 97/71/91 +f 92/34/85 104/63/84 105/72/93 +f 89/38/87 101/66/86 102/74/95 +f 96/39/89 108/68/88 98/69/96 +f 85/42/92 97/71/91 99/56/97 +f 93/44/94 105/72/93 106/77/98 +f 117/73/68 129/316/108 130/307/99 +f 115/55/57 114/54/70 126/308/100 +f 111/76/51 123/318/110 124/310/102 +f 118/60/54 130/545/99 131/311/103 +f 115/55/57 127/309/101 128/312/104 +f 112/250/53 124/546/102 125/313/105 +f 120/67/63 119/61/56 131/311/103 +f 110/75/64 122/317/109 121/315/107 +f 116/62/59 128/312/104 129/316/108 +f 113/65/61 125/313/105 126/308/100 +f 120/67/63 132/314/106 122/317/109 +f 109/70/66 121/315/107 123/318/110 +f 297/319/111 213/463/255 224/320/112 +f 348/322/114 217/547/337 207/323/115 +f 296/325/117 279/344/136 210/326/118 +f 399/328/120 225/379/171 212/329/121 +f 314/331/123 215/548/338 206/332/124 +f 216/334/126 215/548/338 314/331/123 +f 218/336/128 217/547/337 348/322/114 +f 347/337/129 416/342/134 227/338/130 +f 381/321/113 224/320/112 223/339/131 +f 228/341/133 227/338/130 416/342/134 +f 382/340/132 223/339/131 210/326/118 +f 398/345/137 263/349/141 211/346/138 +f 398/345/137 397/351/143 264/348/140 +f 396/350/142 265/353/145 264/348/140 +f 396/350/142 395/355/147 266/352/144 +f 394/354/146 267/357/149 266/352/144 +f 394/354/146 393/359/151 268/356/148 +f 392/358/150 269/361/153 268/356/148 +f 392/358/150 391/363/155 270/360/152 +f 390/362/154 271/365/157 270/360/152 +f 390/362/154 389/367/159 272/364/156 +f 388/366/158 273/369/161 272/364/156 +f 388/366/158 387/371/163 274/368/160 +f 386/370/162 275/373/165 274/368/160 +f 386/370/162 385/375/167 276/372/164 +f 384/374/166 277/377/169 276/372/164 +f 384/374/166 383/378/170 278/376/168 +f 382/340/132 279/344/136 278/376/168 +f 225/379/171 399/328/120 432/380/172 +f 400/382/174 431/384/176 432/380/172 +f 400/382/174 401/386/178 430/383/175 +f 402/385/177 429/388/180 430/383/175 +f 402/385/177 403/390/182 428/387/179 +f 404/389/181 427/392/184 428/387/179 +f 404/389/181 405/394/186 426/391/183 +f 406/393/185 425/396/188 426/391/183 +f 406/393/185 407/398/190 424/395/187 +f 408/397/189 423/400/192 424/395/187 +f 408/397/189 409/402/194 422/399/191 +f 410/401/193 421/404/196 422/399/191 +f 410/401/193 411/406/198 420/403/195 +f 412/405/197 419/408/200 420/403/195 +f 412/405/197 413/410/202 418/407/199 +f 414/409/201 417/411/203 418/407/199 +f 414/409/201 415/343/135 416/342/134 +f 365/412/204 398/345/137 222/347/139 +f 365/412/204 366/415/207 397/351/143 +f 367/414/206 396/350/142 397/351/143 +f 367/414/206 368/417/209 395/355/147 +f 369/416/208 394/354/146 395/355/147 +f 369/416/208 370/419/211 393/359/151 +f 371/418/210 392/358/150 393/359/151 +f 371/418/210 372/421/213 391/363/155 +f 373/420/212 390/362/154 391/363/155 +f 373/420/212 374/423/215 389/367/159 +f 375/422/214 388/366/158 389/367/159 +f 375/422/214 376/425/217 387/371/163 +f 377/424/216 386/370/162 387/371/163 +f 377/424/216 378/427/219 385/375/167 +f 379/426/218 384/374/166 385/375/167 +f 379/426/218 380/428/220 383/378/170 +f 381/321/113 382/340/132 383/378/170 +f 226/381/173 432/380/172 331/429/221 +f 331/429/221 432/380/172 431/384/176 +f 431/384/176 430/383/175 333/432/224 +f 333/432/224 430/383/175 429/388/180 +f 429/388/180 428/387/179 335/434/226 +f 335/434/226 428/387/179 427/392/184 +f 427/392/184 426/391/183 337/436/228 +f 337/436/228 426/391/183 425/396/188 +f 425/396/188 424/395/187 339/438/230 +f 339/438/230 424/395/187 423/400/192 +f 423/400/192 422/399/191 341/440/232 +f 341/440/232 422/399/191 421/404/196 +f 421/404/196 420/403/195 343/442/234 +f 343/442/234 420/403/195 419/408/200 +f 419/408/200 418/407/199 345/444/236 +f 345/444/236 418/407/199 417/411/203 +f 417/411/203 416/342/134 347/337/129 +f 219/430/222 331/429/221 364/446/238 +f 332/431/223 363/449/241 364/446/238 +f 332/431/223 333/432/224 362/448/240 +f 334/433/225 361/451/243 362/448/240 +f 334/433/225 335/434/226 360/450/242 +f 336/435/227 359/453/245 360/450/242 +f 336/435/227 337/436/228 358/452/244 +f 338/437/229 357/455/247 358/452/244 +f 338/437/229 339/438/230 356/454/246 +f 340/439/231 355/457/249 356/454/246 +f 340/439/231 341/440/232 354/456/248 +f 342/441/233 353/459/251 354/456/248 +f 342/441/233 343/442/234 352/458/250 +f 344/443/235 351/461/253 352/458/250 +f 344/443/235 345/444/236 350/460/252 +f 346/445/237 349/462/254 350/460/252 +f 346/445/237 347/337/129 348/322/114 +f 213/463/255 297/319/111 330/464/256 +f 298/466/258 329/468/260 330/464/256 +f 298/466/258 299/470/262 328/467/259 +f 300/469/261 327/472/264 328/467/259 +f 300/469/261 301/474/266 326/471/263 +f 302/473/265 325/476/268 326/471/263 +f 302/473/265 303/478/270 324/475/267 +f 304/477/269 323/480/272 324/475/267 +f 304/477/269 305/482/274 322/479/271 +f 306/481/273 321/484/276 322/479/271 +f 306/481/273 307/486/278 320/483/275 +f 308/485/277 319/488/280 320/483/275 +f 308/485/277 309/490/282 318/487/279 +f 310/489/281 317/492/284 318/487/279 +f 310/489/281 311/494/286 316/491/283 +f 312/493/285 315/495/287 316/491/283 +f 312/493/285 313/335/127 314/331/123 +f 205/496/288 214/465/257 330/464/256 +f 330/464/256 329/468/260 244/498/290 +f 244/498/290 329/468/260 328/467/259 +f 328/467/259 327/472/264 242/500/292 +f 242/500/292 327/472/264 326/471/263 +f 326/471/263 325/476/268 240/502/294 +f 240/502/294 325/476/268 324/475/267 +f 324/475/267 323/480/272 238/504/296 +f 238/504/296 323/480/272 322/479/271 +f 322/479/271 321/484/276 236/506/297 +f 236/506/297 321/484/276 320/483/275 +f 320/483/275 319/488/280 234/508/299 +f 234/508/299 319/488/280 318/487/279 +f 318/487/279 317/492/284 232/510/301 +f 232/510/301 317/492/284 316/491/283 +f 316/491/283 315/495/287 230/512/303 +f 230/512/303 315/495/287 314/331/123 +f 415/343/135 296/325/117 209/327/119 +f 415/343/135 414/409/201 295/513/304 +f 413/410/202 294/515/306 295/513/304 +f 413/410/202 412/405/197 293/514/305 +f 411/406/198 292/517/308 293/514/305 +f 411/406/198 410/401/193 291/516/307 +f 409/402/194 290/519/310 291/516/307 +f 409/402/194 408/397/189 289/518/309 +f 407/398/190 288/521/312 289/518/309 +f 407/398/190 406/393/185 287/520/311 +f 405/394/186 286/523/314 287/520/311 +f 405/394/186 404/389/181 285/522/313 +f 403/390/182 284/525/316 285/522/313 +f 403/390/182 402/385/177 283/524/315 +f 401/386/178 282/527/318 283/524/315 +f 401/386/178 400/382/174 281/526/317 +f 399/328/120 280/330/122 281/526/317 +f 211/346/138 263/349/141 280/330/122 +f 280/330/122 263/349/141 264/348/140 +f 264/348/140 265/353/145 282/527/318 +f 282/527/318 265/353/145 266/352/144 +f 266/352/144 267/357/149 284/525/316 +f 284/525/316 267/357/149 268/356/148 +f 268/356/148 269/361/153 286/523/314 +f 286/523/314 269/361/153 270/360/152 +f 270/360/152 271/365/157 288/521/312 +f 288/521/312 271/365/157 272/364/156 +f 272/364/156 273/369/161 290/519/310 +f 290/519/310 273/369/161 274/368/160 +f 274/368/160 275/373/165 292/517/308 +f 292/517/308 275/373/165 276/372/164 +f 276/372/164 277/377/169 294/515/306 +f 294/515/306 277/377/169 278/376/168 +f 278/376/168 279/344/136 296/325/117 +f 208/528/319 220/447/239 364/446/238 +f 364/446/238 363/449/241 261/530/321 +f 261/530/321 363/449/241 362/448/240 +f 362/448/240 361/451/243 259/532/323 +f 259/532/323 361/451/243 360/450/242 +f 360/450/242 359/453/245 257/534/325 +f 257/534/325 359/453/245 358/452/244 +f 358/452/244 357/455/247 255/536/327 +f 255/536/327 357/455/247 356/454/246 +f 356/454/246 355/457/249 253/538/328 +f 253/538/328 355/457/249 354/456/248 +f 354/456/248 353/459/251 251/540/330 +f 251/540/330 353/459/251 352/458/250 +f 352/458/250 351/461/253 249/542/332 +f 249/542/332 351/461/253 350/460/252 +f 350/460/252 349/462/254 247/544/334 +f 247/544/334 349/462/254 348/322/114 +f 221/413/205 216/334/126 313/335/127 +f 313/335/127 312/493/285 366/415/207 +f 366/415/207 312/493/285 311/494/286 +f 311/494/286 310/489/281 368/417/209 +f 368/417/209 310/489/281 309/490/282 +f 309/490/282 308/485/277 370/419/211 +f 370/419/211 308/485/277 307/486/278 +f 307/486/278 306/481/273 372/421/213 +f 372/421/213 306/481/273 305/482/274 +f 305/482/274 304/477/269 374/423/215 +f 374/423/215 304/477/269 303/478/270 +f 303/478/270 302/473/265 376/425/217 +f 376/425/217 302/473/265 301/474/266 +f 301/474/266 300/469/261 378/427/219 +f 378/427/219 300/469/261 299/470/262 +f 299/470/262 298/466/258 380/428/220 +f 380/428/220 298/466/258 297/319/111 +usemtl None_life_is_grim2.png.001 +s off +f 9/549/339 2/550/339 1/551/339 +f 10/552/340 4/553/340 2/550/340 +f 4/553/341 12/554/341 3/555/341 +f 12/554/342 1/551/342 3/555/342 +f 13/556/22 4/557/22 3/558/22 +f 14/559/22 8/560/22 4/557/22 +f 15/561/22 7/562/22 8/560/22 +f 16/563/22 3/558/22 7/562/22 +f 17/564/25 8/560/25 7/565/25 +f 8/560/25 19/566/25 6/567/25 +f 19/566/25 5/568/25 6/567/25 +f 5/568/25 17/564/25 7/565/25 +f 21/569/16 6/570/16 5/571/16 +f 22/572/16 2/573/16 6/570/16 +f 23/574/16 1/551/16 2/573/16 +f 24/575/16 5/571/16 1/551/16 +f 25/576/2 7/577/2 3/555/2 +f 26/578/2 5/571/2 7/577/2 +f 27/579/2 1/551/2 5/571/2 +f 28/580/2 3/555/2 1/551/2 +f 29/581/343 4/557/343 8/560/343 +f 30/582/344 2/583/344 4/557/344 +f 2/583/345 32/584/345 6/567/345 +f 6/567/346 29/581/346 8/560/346 +f 33/585/16 26/586/16 25/587/16 +f 36/588/25 25/589/25 28/590/25 +f 35/591/22 28/592/22 27/593/22 +f 34/594/19 27/595/19 26/596/19 +f 33/585/2 35/591/2 34/594/2 +f 9/549/347 10/552/347 2/550/347 +f 10/552/348 11/597/348 4/553/348 +f 4/553/349 11/597/349 12/554/349 +f 12/554/342 9/549/342 1/551/342 +f 13/556/22 14/559/22 4/557/22 +f 14/559/22 15/561/22 8/560/22 +f 15/561/22 16/563/22 7/562/22 +f 16/563/22 13/556/22 3/558/22 +f 17/564/25 18/598/25 8/560/25 +f 8/560/25 18/598/25 19/566/25 +f 19/566/25 20/599/25 5/568/25 +f 5/568/25 20/599/25 17/564/25 +f 21/569/16 22/572/16 6/570/16 +f 22/572/16 23/574/16 2/573/16 +f 23/574/16 24/575/16 1/551/16 +f 24/575/16 21/569/16 5/571/16 +f 25/576/2 26/578/2 7/577/2 +f 26/578/2 27/579/2 5/571/2 +f 27/579/2 28/580/2 1/551/2 +f 28/580/2 25/576/2 3/555/2 +f 29/581/343 30/582/343 4/557/343 +f 30/582/344 31/600/344 2/583/344 +f 2/583/345 31/600/345 32/584/345 +f 6/567/346 32/584/346 29/581/346 +f 33/585/16 34/594/16 26/586/16 +f 36/588/25 33/585/25 25/589/25 +f 35/591/22 36/588/22 28/592/22 +f 34/594/19 35/591/19 27/595/19 +f 33/585/2 36/588/2 35/591/2 +usemtl None_life_is_grim2.png.002 +f 474/601/350 481/602/350 473/603/350 +f 476/604/351 482/605/351 474/601/351 +f 476/604/352 484/606/352 483/607/352 +f 473/603/353 484/606/353 475/608/353 +f 476/609/16 485/610/16 475/611/16 +f 480/612/16 486/613/16 476/609/16 +f 479/614/16 487/615/16 480/612/16 +f 475/611/16 488/616/16 479/614/16 +f 480/612/19 489/617/19 479/618/19 +f 478/619/19 490/620/19 480/612/19 +f 477/621/19 491/622/19 478/619/19 +f 479/618/19 492/623/19 477/621/19 +f 478/624/22 493/625/22 477/626/22 +f 474/627/22 494/628/22 478/624/22 +f 473/603/22 495/629/22 474/627/22 +f 477/626/22 496/630/22 473/603/22 +f 479/631/1 497/632/1 475/608/1 +f 477/626/1 498/633/1 479/631/1 +f 473/603/1 499/634/1 477/626/1 +f 475/608/1 500/635/1 473/603/1 +f 476/609/354 501/636/354 480/612/354 +f 474/637/355 502/638/355 476/609/355 +f 474/637/356 504/639/356 503/640/356 +f 480/612/357 504/639/357 478/619/357 +f 498/641/22 505/642/22 497/643/22 +f 497/644/19 508/645/19 500/646/19 +f 500/647/16 507/648/16 499/649/16 +f 499/650/25 506/651/25 498/652/25 +f 507/648/1 505/642/1 506/651/1 +f 474/601/358 509/653/358 481/602/358 +f 476/604/351 510/654/351 482/605/351 +f 476/604/359 475/608/359 484/606/359 +f 473/603/353 481/602/353 484/606/353 +f 476/609/16 486/613/16 485/610/16 +f 480/612/16 487/615/16 486/613/16 +f 479/614/16 488/616/16 487/615/16 +f 475/611/16 485/610/16 488/616/16 +f 480/612/19 490/620/19 489/617/19 +f 478/619/19 491/622/19 490/620/19 +f 477/621/19 492/623/19 491/622/19 +f 479/618/19 489/617/19 492/623/19 +f 478/624/22 494/628/22 493/625/22 +f 474/627/22 495/629/22 494/628/22 +f 473/603/22 496/630/22 495/629/22 +f 477/626/22 493/625/22 496/630/22 +f 479/631/1 498/633/1 497/632/1 +f 477/626/1 499/634/1 498/633/1 +f 473/603/1 500/635/1 499/634/1 +f 475/608/1 497/632/1 500/635/1 +f 476/609/354 502/638/354 501/636/354 +f 474/637/355 503/640/355 502/638/355 +f 474/637/356 478/619/356 504/639/356 +f 480/612/357 501/636/357 504/639/357 +f 498/641/22 506/651/22 505/642/22 +f 497/644/19 505/642/19 508/645/19 +f 500/647/16 508/645/16 507/648/16 +f 499/650/25 507/648/25 506/651/25 +f 507/648/1 508/645/1 505/642/1 diff --git a/src/main/resources/assets/hbm/textures/models/radiolysis.png b/src/main/resources/assets/hbm/textures/models/radiolysis.png new file mode 100644 index 0000000000000000000000000000000000000000..abb888335619a1e71bc70e080e32f58954a29366 GIT binary patch literal 18598 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 literal 0 HcmV?d00001 From e8034a86b02fe9756490247c6dd585978eba8183 Mon Sep 17 00:00:00 2001 From: Vaern Date: Tue, 1 Feb 2022 19:51:33 -0800 Subject: [PATCH 8/9] Hell yeah! The ZIRNOX Rework works, the gas cent nei handler works, the hazard issue should probably work, the guis should work --- .../com/hbm/hazard/type/HazardTypeHot.java | 4 +- .../hbm/inventory/gui/GUIMachineGasCent.java | 13 +- .../com/hbm/inventory/gui/GUIRadiolysis.java | 26 + .../hbm/inventory/gui/GUIReactorResearch.java | 4 +- .../hbm/inventory/gui/GUIReactorZirnox.java | 23 +- .../inventory/recipes/AssemblerRecipes.java | 1 + .../recipes/GasCentrifugeRecipes.java | 72 +- .../inventory/recipes/RadiolysisRecipes.java | 15 +- src/main/java/com/hbm/main/MainRegistry.java | 1 + .../machine/TileEntityMachineRadiolysis.java | 7 +- .../machine/TileEntityReactorZirnox.java | 33 +- .../machine/TileEntityWasteDrum.java | 2 +- src/main/resources/assets/hbm/lang/en_US.lang | 6 + .../assets/hbm/models/radiolysis.obj | 2974 ++++++++--------- .../hbm/textures/gui/centrifuge_gas.png | Bin 2811 -> 3225 bytes .../hbm/textures/gui/gui_radiolysis.png | Bin 2047 -> 2535 bytes 16 files changed, 1606 insertions(+), 1575 deletions(-) diff --git a/src/main/java/com/hbm/hazard/type/HazardTypeHot.java b/src/main/java/com/hbm/hazard/type/HazardTypeHot.java index c603bf8f2..b47a39b98 100644 --- a/src/main/java/com/hbm/hazard/type/HazardTypeHot.java +++ b/src/main/java/com/hbm/hazard/type/HazardTypeHot.java @@ -24,6 +24,7 @@ public class HazardTypeHot extends HazardTypeBase { boolean reacher = false; boolean gloves = false; + //Why on earth did I add gloves again? if(target instanceof EntityPlayer) { ItemStack item = ((EntityPlayer) target).inventory.getCurrentItem(); if(item != null) @@ -34,7 +35,8 @@ public class HazardTypeHot extends HazardTypeBase { gloves = armor.getItem() instanceof ItemModGloves || ArmorUtil.checkForHazmat(target); if(!gloves) { ItemStack mod = ArmorModHandler.pryMods(armor)[ArmorModHandler.legs_only]; - gloves = mod.getItem() instanceof ItemModGloves; + if(mod != null) + gloves = mod.getItem() instanceof ItemModGloves; } } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineGasCent.java b/src/main/java/com/hbm/inventory/gui/GUIMachineGasCent.java index 94ad38dc8..ea66e3242 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineGasCent.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineGasCent.java @@ -60,22 +60,31 @@ public class GUIMachineGasCent extends GuiInfoContainer { int j = (int)gasCent.getCentrifugeProgressScaled(33); drawTexturedModalRect(guiLeft + 74, guiTop + 37, 208, 0, j, 12); - int a = gasCent.getTankScaled(32, 0); + int a = gasCent.getTankScaled(31, 0); switch (gasCent.inputTank.getTankType()) { case PF6: drawTexturedModalRect(guiLeft + 58, guiTop + 62 - a, 200, 31 - a, 8, a); break; + case MUD: + drawTexturedModalRect(guiLeft + 58, guiTop + 62 - a, 192, 63 - a, 8, a); + break; + case MUD_HEAVY: + drawTexturedModalRect(guiLeft + 58, guiTop + 62 - a, 192, 63 - a, 8, a); + break; case NONE: break; default: drawTexturedModalRect(guiLeft + 58, guiTop + 62 - a, 192, 31 - a, 8, a); } - int b = gasCent.getTankScaled(32, 1); + int b = gasCent.getTankScaled(31, 1); switch (gasCent.outputTank.getTankType()) { case PF6: drawTexturedModalRect(guiLeft + 114, guiTop + 62 - b, 200, 31 - b, 8, b); break; + case MUD_HEAVY: + drawTexturedModalRect(guiLeft + 114, guiTop + 62 - b, 192, 63 - b, 8, b); + break; case NONE: break; default: diff --git a/src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java b/src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java index f847032bb..36a6f87b7 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java +++ b/src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java @@ -1,11 +1,15 @@ package com.hbm.inventory.gui; +import java.util.List; + import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerRadiolysis; +import com.hbm.items.machine.ItemRTGPellet; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineRadiolysis; +import com.hbm.util.I18nUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; @@ -34,6 +38,23 @@ public class GUIRadiolysis extends GuiInfoContainer { radiolysis.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 87, guiTop + 53, 12, 16); this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 17, 16, 34, radiolysis.power, radiolysis.maxPower); + + String[] descText = I18nUtil.resolveKeyArray("desc.gui.radiolysis.desc"); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 16, 16, 16, guiLeft - 8, guiTop + 36 + 16, descText); + + String[] heatText = I18nUtil.resolveKeyArray("desc.gui.rtg.heat", radiolysis.heat); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 16 + 18, 16, 16, guiLeft - 8, guiTop + 36 + 18 + 16, heatText); + + List pellets = ItemRTGPellet.pelletList; + String[] pelletText = new String[pellets.size() + 1]; + pelletText[0] = I18nUtil.resolveKey("desc.gui.rtg.pellets"); + + for(int i = 0; i < pellets.size(); i++) { + ItemRTGPellet pellet = pellets.get(i); + pelletText[i + 1] = I18nUtil.resolveKey("desc.gui.rtg.pelletPower", I18nUtil.resolveKey(pellet.getUnlocalizedName() + ".name"), pellet.getHeat() * 10); + } + + this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 16 + 36, 16, 16, guiLeft - 8, guiTop + 36 + 36 + 16, pelletText); } @Override @@ -57,9 +78,14 @@ public class GUIRadiolysis extends GuiInfoContainer { Minecraft.getMinecraft().getTextureManager().bindTexture(radiolysis.tanks[0].getSheet()); radiolysis.tanks[0].renderTank(this, guiLeft + 61, guiTop + 69, radiolysis.tanks[0].getTankType().textureX() * FluidTank.x, radiolysis.tanks[0].getTankType().textureY() * FluidTank.y, 8, 52); + //For some reason, liquid hydrogen appears as lava. but it doesn't seem to be an issue with any other fuel? for(byte j = 0; j < 2; j++) { Minecraft.getMinecraft().getTextureManager().bindTexture(radiolysis.tanks[j].getSheet()); radiolysis.tanks[j + 1].renderTank(this, guiLeft + 87, guiTop + 33 + j * 36, radiolysis.tanks[j + 1].getTankType().textureX() * FluidTank.x, radiolysis.tanks[j + 1].getTankType().textureY() * FluidTank.y, 12, 16); } + + this.drawInfoPanel(guiLeft - 16, guiTop + 16, 16, 16, 10); + this.drawInfoPanel(guiLeft - 16, guiTop + 16 + 18, 16, 16, 2); + this.drawInfoPanel(guiLeft - 16, guiTop + 16 + 36, 16, 16, 3); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIReactorResearch.java b/src/main/java/com/hbm/inventory/gui/GUIReactorResearch.java index ab3aaa5b8..56393d796 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIReactorResearch.java +++ b/src/main/java/com/hbm/inventory/gui/GUIReactorResearch.java @@ -71,7 +71,7 @@ public class GUIReactorResearch extends GuiInfoContainer { "This reactor is fueled with plate fuel.", "The reaction needs a neutron source to start." }; - this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 14, guiTop + 31, 16, 16, guiLeft - 6, guiTop + 31 + 16, text2); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 14, guiTop + 61, 16, 16, guiLeft - 6, guiTop + 61 + 16, text2); } @Override @@ -145,7 +145,7 @@ public class GUIReactorResearch extends GuiInfoContainer { } this.drawInfoPanel(guiLeft - 14, guiTop + 23, 16, 16, 3); - this.drawInfoPanel(guiLeft - 14, guiTop + 31, 16, 16, 2); + this.drawInfoPanel(guiLeft - 14, guiTop + 61, 16, 16, 2); } diff --git a/src/main/java/com/hbm/inventory/gui/GUIReactorZirnox.java b/src/main/java/com/hbm/inventory/gui/GUIReactorZirnox.java index fefd3c159..dc0f5267d 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIReactorZirnox.java +++ b/src/main/java/com/hbm/inventory/gui/GUIReactorZirnox.java @@ -7,6 +7,7 @@ import com.hbm.lib.RefStrings; import com.hbm.packet.NBTControlPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.tileentity.machine.TileEntityReactorZirnox; +import com.hbm.util.I18nUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; @@ -38,21 +39,21 @@ public class GUIReactorZirnox extends GuiInfoContainer { zirnox.water.renderTankInfo(this, mouseX, mouseY, guiLeft + 178, guiTop + 108, 18, 12); this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 160, guiTop + 33, 18, 17, new String[] { "Temperature:", " " + Math.round((zirnox.heat) * 0.00001 * 780 + 20) + "°C" }); this.drawCustomInfo(this, mouseX, mouseY, guiLeft + 178, guiTop + 33, 18, 17, new String[] { "Pressure:", " " + Math.round((zirnox.pressure) * 0.00001 * 30) + " bar" }); - - 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. Warning:", "this will reduce cooling!" }; - this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 16, 16, 16, guiLeft - 8, guiTop + 36 + 16, info2); + + String[] coolantText = I18nUtil.resolveKeyArray("desc.gui.zirnox.coolant"); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36, 16, 16, guiLeft - 8, guiTop + 36 + 16, coolantText); + + String[] pressureText = I18nUtil.resolveKeyArray("desc.gui.zirnox.pressure"); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 16, 16, 16, guiLeft - 8, guiTop + 36 + 16, pressureText); if(zirnox.water.getFill() <= 0) { - 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); + String[] warning1 = I18nUtil.resolveKeyArray("desc.gui.zirnox.warning1"); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 32, 16, 16, guiLeft - 8, guiTop + 36 + 32 + 16, warning1); } if(zirnox.carbonDioxide.getFill() < 4000) { - 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); + String[] warning2 = I18nUtil.resolveKeyArray("desc.gui.zirnox.warning2"); + this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 32 + 16, 16, 16, guiLeft - 8, guiTop + 36 + 32 + 16, warning2); } } @@ -123,7 +124,7 @@ public class GUIReactorZirnox extends GuiInfoContainer { this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 32, 16, 16, 6); if(zirnox.carbonDioxide.getFill() <= 4000) - this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 32 + 16, 16, 16, 7); + this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 32 + 16, 16, 16, 6); } } \ No newline at end of file diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index 881b1ffb2..57dbb86de 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -932,6 +932,7 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModBlocks.machine_radiolysis), new AStack[] { new OreDictStack(STEEL.ingot(), 8), + new OreDictStack(TCALLOY.ingot(), 4), new ComparableStack(ModBlocks.steel_beam, 16), new OreDictStack(DURA.ingot(), 10), new OreDictStack(DESH.ingot(), 4), diff --git a/src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java b/src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java index 06d067eb5..84d7ed95c 100644 --- a/src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java @@ -2,13 +2,17 @@ package com.hbm.inventory.recipes; import java.util.ArrayList; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Map.Entry; +import com.hbm.inventory.FluidStack; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemFluidIcon; +import com.hbm.util.Tuple.Pair; import net.minecraft.item.ItemStack; @@ -68,59 +72,37 @@ public class GasCentrifugeRecipes { } }; - - //TODO: Make a Triplet with input fluid, fluid consumed, and itemstack outputs. use that to rework everything below; look at RadiolysisRecipes - - //Recipes for NEI - public static List getGasCentOutputs(FluidType fluid) { - List outputs = new ArrayList(4); - if(fluid == Fluids.UF6) { - outputs.add(new ItemStack(ModItems.nugget_u238, 11)); - outputs.add(new ItemStack(ModItems.nugget_u235, 1)); - outputs.add(new ItemStack(ModItems.fluorite, 4)); - } else if(fluid == Fluids.PUF6) { - outputs.add(new ItemStack(ModItems.nugget_pu238, 3)); - outputs.add(new ItemStack(ModItems.nugget_pu_mix, 6)); - outputs.add(new ItemStack(ModItems.fluorite, 3)); - } else if(fluid == Fluids.WATZ) { - outputs.add(new ItemStack(ModItems.powder_iron, 1)); - outputs.add(new ItemStack(ModItems.powder_lead, 1)); - outputs.add(new ItemStack(ModItems.nuclear_waste_tiny, 1)); //we have to omit dust here because the NEI handler only supports 3 items - } - return outputs; - } - - public static int getQuantityRequired(FluidType fluid) { - if(fluid == Fluids.UF6) return 1200; - if(fluid == Fluids.PUF6)return 900; - if(fluid == Fluids.WATZ)return 1000; - return 0; - } + /* Recipe NEI Handler */ + private static Map gasCent = new HashMap(); + //Iterators are lots of fun public static Map getGasCentrifugeRecipes() { Map recipes = new HashMap(); - - for(int i = 0; i < Fluids.getAll().length; i++) { - if(getGasCentOutputs(Fluids.fromID(i)) != null) { - List out = getGasCentOutputs(Fluids.fromID(i)); - ItemStack[] outputs = new ItemStack[4]; - - for(int j = 0; j < out.size(); j++) { - outputs[j] = out.get(j).copy(); - } - for(int j = 0; j < 4; j++) - if(outputs[j] == null) - outputs[j] = new ItemStack(ModItems.nothing); - - ItemStack input = new ItemStack(ModItems.fluid_icon, 1, i); - ItemFluidIcon.addQuantity(input, getQuantityRequired(Fluids.fromID(i))); - - recipes.put(input, outputs); + Iterator itr = gasCent.entrySet().iterator(); + + while(itr.hasNext()) { + Map.Entry entry = (Entry) itr.next(); + FluidStack input = (FluidStack) entry.getKey(); + ItemStack[] out = new ItemStack[4]; + ItemStack[] outputs = (ItemStack[]) entry.getValue(); + + for(int j = 0; j < outputs.length; j++) { + out[j] = outputs[j].copy(); } + for(int j = 0; j < 4; j++) + if(out[j] == null) + out[j] = new ItemStack(ModItems.nothing); + + recipes.put(ItemFluidIcon.make(input.type, input.fill), outputs); } return recipes; } + public static void register() { + gasCent.put(new FluidStack(1200, Fluids.UF6), new ItemStack[] {new ItemStack(ModItems.nugget_u238, 11), new ItemStack(ModItems.nugget_u235, 1), new ItemStack(ModItems.fluorite, 4)}); + gasCent.put(new FluidStack(900, Fluids.PUF6), new ItemStack[] {new ItemStack(ModItems.nugget_pu238, 3), new ItemStack(ModItems.nugget_pu_mix, 6), new ItemStack(ModItems.fluorite, 3)}); + gasCent.put(new FluidStack(1000, Fluids.WATZ), new ItemStack[] {new ItemStack(ModItems.powder_iron, 1), new ItemStack(ModItems.powder_lead, 1), new ItemStack(ModItems.nuclear_waste_tiny, 1)}); + } } diff --git a/src/main/java/com/hbm/inventory/recipes/RadiolysisRecipes.java b/src/main/java/com/hbm/inventory/recipes/RadiolysisRecipes.java index e70421a8f..1a8614f38 100644 --- a/src/main/java/com/hbm/inventory/recipes/RadiolysisRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/RadiolysisRecipes.java @@ -8,6 +8,7 @@ import java.util.Map.Entry; import com.hbm.inventory.FluidStack; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; +import com.hbm.inventory.recipes.RefineryRecipes; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemFluidIcon; import com.hbm.util.Tuple.Pair; @@ -19,7 +20,7 @@ public class RadiolysisRecipes { private static Map> radiolysis = new HashMap(); //fluidstacks :reimumunch: - /* I am proud of this but I don't think I should be */ + /* I am proud of this */ public static Map getRecipesForNEI() { Map recipes = new HashMap(); Iterator itr = radiolysis.entrySet().iterator(); @@ -48,11 +49,13 @@ public class RadiolysisRecipes { public static void registerRadiolysis() { radiolysis.put(Fluids.WATER, new Pair(new FluidStack(80, Fluids.ACID), new FluidStack(20, Fluids.HYDROGEN))); - radiolysis.put(Fluids.BITUMEN, new Pair(new FluidStack(80, Fluids.OIL), new FluidStack(20, Fluids.PETROLEUM))); - radiolysis.put(Fluids.SMEAR, new Pair(new FluidStack(60, Fluids.NAPHTHA), new FluidStack(40, Fluids.PETROLEUM))); - radiolysis.put(Fluids.GAS, new Pair(new FluidStack(50, Fluids.PETROLEUM), new FluidStack(0, Fluids.NONE))); - radiolysis.put(Fluids.DIESEL, new Pair(new FluidStack(40, Fluids.KEROSENE), new FluidStack(30, Fluids.PETROLEUM))); - radiolysis.put(Fluids.KEROSENE, new Pair(new FluidStack(60, Fluids.PETROLEUM), new FluidStack(0, Fluids.NONE))); + //now this is poggers + radiolysis.put(Fluids.OIL, new Pair(new FluidStack(RefineryRecipes.oil_crack_oil, Fluids.CRACKOIL), new FluidStack(RefineryRecipes.oil_crack_petro, Fluids.PETROLEUM))); + radiolysis.put(Fluids.BITUMEN, new Pair(new FluidStack(RefineryRecipes.bitumen_crack_oil, Fluids.OIL), new FluidStack(RefineryRecipes.bitumen_crack_aroma, Fluids.AROMATICS))); + radiolysis.put(Fluids.SMEAR, new Pair(new FluidStack(RefineryRecipes.smear_crack_napht, Fluids.NAPHTHA), new FluidStack(RefineryRecipes.smear_crack_petro, Fluids.PETROLEUM))); + radiolysis.put(Fluids.GAS, new Pair(new FluidStack(RefineryRecipes.gas_crack_petro, Fluids.PETROLEUM), new FluidStack(RefineryRecipes.gas_crack_unsat, Fluids.UNSATURATEDS))); + radiolysis.put(Fluids.DIESEL, new Pair(new FluidStack(RefineryRecipes.diesel_crack_kero, Fluids.KEROSENE), new FluidStack(RefineryRecipes.diesel_crack_petro, Fluids.PETROLEUM))); + radiolysis.put(Fluids.KEROSENE, new Pair(new FluidStack(RefineryRecipes.kero_crack_petro, Fluids.PETROLEUM), new FluidStack(0, Fluids.NONE))); } public static Pair getRadiolysis(FluidType input) { diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index f76286fea..6d0b5bc7d 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -950,6 +950,7 @@ public class MainRegistry { RefineryRecipes.registerFractions(); RefineryRecipes.registerCracking(); RadiolysisRecipes.registerRadiolysis(); + GasCentrifugeRecipes.register(); LiquefactionRecipes.register(); SolidificationRecipes.register(); FuelPoolRecipes.register(); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java index c0ed60761..6cbd6a287 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java @@ -37,6 +37,7 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement public long power; public static final int maxPower = 1000000; + public int heat; public FluidTank[] tanks; public List list1 = new ArrayList(); @@ -80,6 +81,7 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement super.readFromNBT(nbt); this.power = nbt.getLong("power"); + this.heat = nbt.getInteger("heat"); tanks[0].readFromNBT(nbt, "input"); tanks[1].readFromNBT(nbt, "output1"); @@ -91,6 +93,7 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement super.writeToNBT(nbt); nbt.setLong("power", power); + nbt.setInteger("heat", heat); tanks[0].writeToNBT(nbt, "input"); tanks[1].writeToNBT(nbt, "output1"); @@ -99,6 +102,7 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement public void networkUnpack(NBTTagCompound data) { this.power = data.getLong("power"); + this.heat = data.getInteger("heat"); } @Override @@ -107,7 +111,7 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement if(!worldObj.isRemote) { power = Library.chargeItemsFromTE(slots, 14, power, maxPower); - int heat = RTGUtil.updateRTGs(slots, slot_rtg); + heat = RTGUtil.updateRTGs(slots, slot_rtg); power += heat * 10; if(power > maxPower) @@ -138,6 +142,7 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement NBTTagCompound data = new NBTTagCompound(); data.setLong("power", power); + data.setInteger("heat", heat); this.networkPack(data, 50); for(byte i = 0; i < 3; i++) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java index 7f5e154b1..d2becbffe 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java @@ -203,13 +203,15 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF } } } - - this.pressure = (int) ((float)this.heat * (1.5 * this.carbonDioxide.getFill() / 16000)); + + //2(fill) + ((x^2 * fill%) / 100,000) + this.pressure = (this.carbonDioxide.getFill() * 2) + (int)((float)this.heat * (float)this.heat * ((float)this.carbonDioxide.getFill() / (float)this.carbonDioxide.getMaxFill() / 100000F)); if(this.heat > 0 && this.heat < maxHeat) { if(this.water.getFill() > 0 && this.carbonDioxide.getFill() > 0 && this.steam.getFill() < this.steam.getMaxFill()) { generateSteam(); - this.heat -= (int) ((float)this.heat * (Math.sqrt(this.carbonDioxide.getFill()) / 1800)); + //(x * pressure) / 1,000,000 + this.heat -= (int) ((float)this.heat * (float)this.pressure / 1000000F); } else { this.heat -= 10; } @@ -233,19 +235,20 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF private void generateSteam() { // function of SHS produced per tick - // heat% * 25 * 1 (should get rid of any rounding errors) - int Water = (int) (((float)heat / maxHeat) * 25) * 5; - int Steam = Water * 1; - - water.setFill(water.getFill() - Water); - steam.setFill(steam.getFill() + Steam); - - if(water.getFill() < 0) - water.setFill(0); - - if(steam.getFill() > steam.getMaxFill()) - steam.setFill(steam.getMaxFill()); + // heat - 10256/100000 * pressure / 50,000 * 25 * 3 (should get rid of any rounding errors) + if(this.heat > 10256) { + int Water = (int)((((float)heat - 10256F) / (float)maxHeat) * ((float)pressure / (float)(maxPressure / 2)) * 25F * 3F); + int Steam = Water * 1; + + water.setFill(water.getFill() - Water); + steam.setFill(steam.getFill() + Steam); + + if(water.getFill() < 0) + water.setFill(0); + if(steam.getFill() > steam.getMaxFill()) + steam.setFill(steam.getMaxFill()); + } } private boolean hasFuelRod(int id) { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityWasteDrum.java b/src/main/java/com/hbm/tileentity/machine/TileEntityWasteDrum.java index 671a35436..4693ed304 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityWasteDrum.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityWasteDrum.java @@ -170,7 +170,7 @@ public class TileEntityWasteDrum extends TileEntity implements ISidedInventory { if(itemStack.getItem() instanceof ItemRBMKRod) { return ItemRBMKRod.getCoreHeat(itemStack) < 50 && ItemRBMKRod.getHullHeat(itemStack) < 50; } else { - return !FuelPoolRecipes.recipes.containsKey(getStackInSlot(i)); + return !FuelPoolRecipes.recipes.containsKey(new ComparableStack(getStackInSlot(i))); } } diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 799e66f3b..ecef32886 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -404,6 +404,7 @@ container.pumpjack=Pumpjack container.radGen=Radiation-Powered Engine container.radar=Radar container.radiobox=FM Transmitter +container.radiolysis=RTG and Radiolysis Chamber container.radiorec=FM Radio container.rbmkBoiler=RBMK Steam Channel container.rbmkControl=RBMK Control Rods @@ -498,11 +499,16 @@ death.attack.teleporter=%1$s was teleported into nothingness. desc.item.rtgDecay=Decays to: %s desc.item.rtgHeat=Power Level: %s desc.item.wasteCooling=Cool in a Spent Fuel Pool Drum +desc.gui.radiolysis.desc=§9Description§r$This RTG is more efficient then others, and$comes equipped with a radiolysis chamber for$cracking and sterilization. desc.gui.rtgBFurnace.desc=Requires at least 15 heat to process$The more heat on top of that, the faster it runs$Heat going over maximum speed will have no effect$Short-lived pellets may decay desc.gui.rtg.heat=§eCurrent heat level: %s desc.gui.rtg.pellets=Accepted Pellets: desc.gui.rtg.pelletHeat=%s (%s heat) desc.gui.rtg.pelletPower=%s (%s HE/tick) +desc.gui.zirnox.coolant=§3Coolant§r$CO2 transfers heat from the core to the water.$This will boil it into super dense steam.$The efficiency of cooling and steam production$is based on pressure. +desc.gui.zirnox.pressure=§6Pressure§r$Pressure can be reduced by venting CO2.$However, too low a pressure, and cooling$efficiency and steam production will be reduced.$Look out for meltdowns! +desc.gui.zirnox.warning1=§cError:§r Water is required for$the reactor to function properly! +desc.gui.zirnox.warning2=§cError:§r CO2 is required for$the reactor to function properly! digamma.playerDigamma=Digamma exposure: digamma.playerHealth=Digamma influence: diff --git a/src/main/resources/assets/hbm/models/radiolysis.obj b/src/main/resources/assets/hbm/models/radiolysis.obj index 81fdbfba3..ce24df0b5 100644 --- a/src/main/resources/assets/hbm/models/radiolysis.obj +++ b/src/main/resources/assets/hbm/models/radiolysis.obj @@ -1,211 +1,7 @@ -# Blender v2.79 (sub 0) OBJ File: 'radiolyctic cracker.blend11' +# Blender v2.79 (sub 0) OBJ File: 'radiolyctic cracker.blend1111' # www.blender.org mtllib radchamber.mtl -o Cube.003 -v -1.500454 -0.003452 1.500454 -v -1.500454 2.997456 1.500454 -v -1.500454 -0.003452 -1.500454 -v -1.500454 2.997456 -1.500454 -v 1.500454 -0.003452 1.500454 -v 1.500454 2.997456 1.500454 -v 1.500454 -0.003452 -1.500454 -v 1.500454 2.997456 -1.500454 -v -1.498351 0.187406 1.309727 -v -1.505265 2.810412 1.311171 -v -1.441522 2.810412 -1.311171 -v -1.498351 0.187406 -1.309727 -v -1.313272 0.183729 -1.500454 -v -1.313272 2.810274 -1.500454 -v 1.313272 2.810274 -1.500454 -v 1.313272 0.183729 -1.500454 -v 1.500454 0.184605 -1.312397 -v 1.500454 2.809398 -1.312397 -v 1.500454 2.809398 1.312397 -v 1.500454 0.184605 1.312397 -v 1.312296 0.184706 1.500454 -v 1.312296 2.809297 1.500454 -v -1.312296 2.809297 1.500454 -v -1.312296 0.184706 1.500454 -v -1.124380 -0.003452 -1.124380 -v 1.124380 -0.003452 -1.124380 -v 1.124380 -0.003452 1.124380 -v -1.124380 -0.003452 1.124380 -v 1.307815 2.995548 -1.318863 -v -1.332176 2.995548 -1.318863 -v -1.332176 2.995548 1.318863 -v 1.307815 2.995548 1.318863 -v -1.124380 0.371661 -1.124380 -v 1.124380 0.371661 -1.124380 -v 1.124380 0.371661 1.124380 -v -1.124380 0.371661 1.124380 -v 0.000000 1.476425 -0.315458 -v 0.000000 2.037861 -0.228000 -v 0.157729 1.476425 -0.273194 -v 0.114000 2.037861 -0.197454 -v 0.273194 1.476425 -0.157729 -v 0.197454 2.037861 -0.114000 -v 0.315458 1.476425 0.000000 -v 0.228000 2.037861 0.000000 -v 0.273194 1.476425 0.157729 -v 0.197454 2.037861 0.114000 -v 0.157729 1.476425 0.273194 -v 0.114000 2.037861 0.197454 -v 0.000000 1.476425 0.315458 -v 0.000000 2.037861 0.228000 -v -0.157729 1.476425 0.273194 -v -0.114000 2.037861 0.197454 -v -0.273194 1.476425 0.157729 -v -0.197454 2.037861 0.114000 -v -0.315458 1.476425 0.000000 -v -0.228000 2.037861 0.000000 -v -0.273194 1.476425 -0.157729 -v -0.197454 2.037861 -0.114000 -v -0.157729 1.476425 -0.273194 -v -0.114000 2.037861 -0.197454 -v 0.238860 2.037861 -0.413717 -v 0.000000 2.037861 -0.477719 -v 0.413717 2.037861 -0.238860 -v 0.477719 2.037861 -0.000000 -v 0.413717 2.037861 0.238859 -v 0.238860 2.037861 0.413717 -v 0.000000 2.037861 0.477719 -v -0.238859 2.037861 0.413717 -v -0.413717 2.037861 0.238860 -v -0.477719 2.037861 0.000000 -v -0.413717 2.037861 -0.238859 -v -0.238860 2.037861 -0.413717 -v 0.238860 2.236783 -0.413717 -v -0.000000 2.236783 -0.477719 -v 0.413717 2.236783 -0.238860 -v 0.477719 2.236783 -0.000000 -v 0.413717 2.236783 0.238859 -v 0.238860 2.236783 0.413717 -v 0.000000 2.236783 0.477719 -v -0.238859 2.236783 0.413717 -v -0.413717 2.236783 0.238860 -v -0.477719 2.236783 0.000000 -v -0.413717 2.236783 -0.238859 -v -0.238860 2.236783 -0.413717 -v 0.086073 2.236783 -0.149082 -v -0.000000 2.236783 -0.172145 -v 0.149082 2.236783 -0.086073 -v 0.172146 2.236783 0.000000 -v 0.149082 2.236783 0.086073 -v 0.086073 2.236783 0.149082 -v 0.000000 2.236783 0.172146 -v -0.086073 2.236783 0.149082 -v -0.149082 2.236783 0.086073 -v -0.172146 2.236783 0.000000 -v -0.149082 2.236783 -0.086073 -v -0.086073 2.236783 -0.149082 -v 0.086073 2.304473 -0.149082 -v -0.000000 2.304473 -0.172145 -v 0.149082 2.304473 -0.086073 -v 0.172146 2.304473 0.000000 -v 0.149082 2.304473 0.086073 -v 0.086073 2.304473 0.149082 -v 0.000000 2.304473 0.172146 -v -0.086073 2.304473 0.149082 -v -0.149082 2.304473 0.086073 -v -0.172146 2.304473 0.000000 -v -0.149082 2.304473 -0.086073 -v -0.086073 2.304473 -0.149082 -v 0.132126 2.304473 -0.228848 -v 0.000000 2.304473 -0.264251 -v 0.228848 2.304473 -0.132126 -v 0.264251 2.304473 0.000000 -v 0.228848 2.304473 0.132126 -v 0.132126 2.304473 0.228848 -v 0.000000 2.304473 0.264251 -v -0.132126 2.304473 0.228848 -v -0.228848 2.304473 0.132126 -v -0.264251 2.304473 0.000000 -v -0.228849 2.304473 -0.132126 -v -0.132126 2.304473 -0.228848 -v 0.132126 2.465501 -0.228848 -v -0.000000 2.465501 -0.264251 -v 0.228848 2.465501 -0.132126 -v 0.264251 2.465501 0.000000 -v 0.228848 2.465501 0.132126 -v 0.132126 2.465501 0.228848 -v 0.000000 2.465501 0.264251 -v -0.132126 2.465501 0.228848 -v -0.228848 2.465501 0.132126 -v -0.264251 2.465501 0.000000 -v -0.228849 2.465501 -0.132126 -v -0.132126 2.465501 -0.228848 -v 0.238860 2.704567 -0.413717 -v -0.000000 2.704567 -0.477719 -v 0.413717 2.704567 -0.238860 -v 0.477719 2.704567 -0.000000 -v 0.413717 2.704567 0.238859 -v 0.238860 2.704567 0.413717 -v 0.000000 2.704567 0.477719 -v -0.238859 2.704567 0.413717 -v -0.413717 2.704567 0.238860 -v -0.477719 2.704567 0.000000 -v -0.413717 2.704567 -0.238859 -v -0.238860 2.704567 -0.413717 -v 0.086073 2.704567 -0.149082 -v -0.000000 2.704567 -0.172145 -v 0.149082 2.704567 -0.086073 -v 0.172146 2.704567 0.000000 -v 0.149082 2.704567 0.086073 -v 0.086073 2.704567 0.149082 -v 0.000000 2.704567 0.172146 -v -0.086073 2.704567 0.149082 -v -0.149082 2.704567 0.086073 -v -0.172146 2.704567 0.000000 -v -0.149082 2.704567 -0.086073 -v -0.086073 2.704567 -0.149082 -v 0.239142 2.236782 -0.413553 -v 0.000326 2.236782 -0.477719 -v 0.413880 2.236782 -0.238577 -v 0.477719 2.236782 0.000326 -v 0.413553 2.236782 0.239142 -v 0.238577 2.236782 0.413880 -v -0.000326 2.236782 0.477719 -v -0.239142 2.236782 0.413553 -v -0.413880 2.236782 0.238577 -v -0.477719 2.236782 -0.000326 -v -0.413554 2.236782 -0.239142 -v -0.238577 2.236782 -0.413880 -v 0.086175 2.236782 -0.149023 -v 0.000118 2.236782 -0.172145 -v 0.149141 2.236782 -0.085971 -v 0.172145 2.236782 0.000118 -v 0.149023 2.236782 0.086175 -v 0.085971 2.236782 0.149141 -v -0.000118 2.236782 0.172145 -v -0.086175 2.236782 0.149024 -v -0.149141 2.236782 0.085971 -v -0.172145 2.236782 -0.000117 -v -0.149024 2.236782 -0.086174 -v -0.085971 2.236782 -0.149141 -v 0.239142 2.704566 -0.413553 -v 0.000326 2.704566 -0.477719 -v 0.413880 2.704566 -0.238577 -v 0.477719 2.704566 0.000326 -v 0.413553 2.704566 0.239142 -v 0.238577 2.704566 0.413880 -v -0.000326 2.704566 0.477719 -v -0.239142 2.704566 0.413553 -v -0.413880 2.704566 0.238577 -v -0.477719 2.704566 -0.000326 -v -0.413554 2.704566 -0.239142 -v -0.238577 2.704566 -0.413880 -v 0.086175 2.704566 -0.149023 -v 0.000118 2.704566 -0.172145 -v 0.149141 2.704566 -0.085971 -v 0.172145 2.704566 0.000118 -v 0.149023 2.704566 0.086175 -v 0.085971 2.704566 0.149141 -v -0.000118 2.704566 0.172145 -v -0.086174 2.704566 0.149024 -v -0.149141 2.704566 0.085971 -v -0.172145 2.704566 -0.000117 -v -0.149024 2.704566 -0.086174 -v -0.085971 2.704566 -0.149141 +o Cube.001_Cube.002 v -1.050000 0.269109 0.787500 v -1.050000 0.269109 -0.787500 v 1.050000 0.269109 0.787500 @@ -442,6 +238,174 @@ v -0.356672 1.503445 -1.050000 v 0.386672 1.503445 -1.050000 v 1.050000 0.269109 -1.050000 v -1.050000 0.269109 -1.050000 +v 0.000000 1.476425 -0.315458 +v 0.000000 2.037861 -0.228000 +v 0.157729 1.476425 -0.273194 +v 0.114000 2.037861 -0.197454 +v 0.273194 1.476425 -0.157729 +v 0.197454 2.037861 -0.114000 +v 0.315458 1.476425 0.000000 +v 0.228000 2.037861 0.000000 +v 0.273194 1.476425 0.157729 +v 0.197454 2.037861 0.114000 +v 0.157729 1.476425 0.273194 +v 0.114000 2.037861 0.197454 +v 0.000000 1.476425 0.315458 +v 0.000000 2.037861 0.228000 +v -0.157729 1.476425 0.273194 +v -0.114000 2.037861 0.197454 +v -0.273194 1.476425 0.157729 +v -0.197454 2.037861 0.114000 +v -0.315458 1.476425 0.000000 +v -0.228000 2.037861 0.000000 +v -0.273194 1.476425 -0.157729 +v -0.197454 2.037861 -0.114000 +v -0.157729 1.476425 -0.273194 +v -0.114000 2.037861 -0.197454 +v 0.238859 2.037861 -0.413717 +v 0.000000 2.037861 -0.477719 +v 0.413717 2.037861 -0.238860 +v 0.477719 2.037861 -0.000000 +v 0.413717 2.037861 0.238859 +v 0.238860 2.037861 0.413717 +v 0.000000 2.037861 0.477719 +v -0.238859 2.037861 0.413717 +v -0.413717 2.037861 0.238860 +v -0.477719 2.037861 0.000000 +v -0.413717 2.037861 -0.238859 +v -0.238860 2.037861 -0.413717 +v 0.238859 2.236783 -0.413717 +v -0.000000 2.236783 -0.477719 +v 0.413717 2.236783 -0.238860 +v 0.477719 2.236783 -0.000000 +v 0.413717 2.236783 0.238859 +v 0.238860 2.236783 0.413717 +v 0.000000 2.236783 0.477719 +v -0.238859 2.236783 0.413717 +v -0.413717 2.236783 0.238860 +v -0.477719 2.236783 0.000000 +v -0.413717 2.236783 -0.238859 +v -0.238860 2.236783 -0.413717 +v 0.086073 2.236783 -0.149082 +v -0.000000 2.236783 -0.172145 +v 0.149082 2.236783 -0.086073 +v 0.172146 2.236783 0.000000 +v 0.149082 2.236783 0.086073 +v 0.086073 2.236783 0.149082 +v 0.000000 2.236783 0.172146 +v -0.086073 2.236783 0.149082 +v -0.149082 2.236783 0.086073 +v -0.172146 2.236783 0.000000 +v -0.149082 2.236783 -0.086073 +v -0.086073 2.236783 -0.149082 +v 0.086073 2.304473 -0.149082 +v -0.000000 2.304473 -0.172145 +v 0.149082 2.304473 -0.086073 +v 0.172146 2.304473 0.000000 +v 0.149082 2.304473 0.086073 +v 0.086073 2.304473 0.149082 +v 0.000000 2.304473 0.172146 +v -0.086073 2.304473 0.149082 +v -0.149082 2.304473 0.086073 +v -0.172146 2.304473 0.000000 +v -0.149082 2.304473 -0.086073 +v -0.086073 2.304473 -0.149082 +v 0.132126 2.304473 -0.228848 +v 0.000000 2.304473 -0.264251 +v 0.228848 2.304473 -0.132126 +v 0.264251 2.304473 0.000000 +v 0.228848 2.304473 0.132126 +v 0.132126 2.304473 0.228848 +v 0.000000 2.304473 0.264251 +v -0.132126 2.304473 0.228848 +v -0.228848 2.304473 0.132126 +v -0.264251 2.304473 0.000000 +v -0.228849 2.304473 -0.132126 +v -0.132126 2.304473 -0.228848 +v 0.132126 2.465501 -0.228848 +v -0.000000 2.465501 -0.264251 +v 0.228848 2.465501 -0.132126 +v 0.264251 2.465501 0.000000 +v 0.228848 2.465501 0.132126 +v 0.132126 2.465501 0.228848 +v 0.000000 2.465501 0.264251 +v -0.132126 2.465501 0.228848 +v -0.228848 2.465501 0.132126 +v -0.264251 2.465501 0.000000 +v -0.228849 2.465501 -0.132126 +v -0.132126 2.465501 -0.228848 +v 0.238859 2.704567 -0.413717 +v -0.000000 2.704567 -0.477719 +v 0.413717 2.704567 -0.238860 +v 0.477719 2.704567 -0.000000 +v 0.413717 2.704567 0.238859 +v 0.238860 2.704567 0.413717 +v 0.000000 2.704567 0.477719 +v -0.238859 2.704567 0.413717 +v -0.413717 2.704567 0.238860 +v -0.477719 2.704567 0.000000 +v -0.413717 2.704567 -0.238859 +v -0.238860 2.704567 -0.413717 +v 0.086073 2.704567 -0.149082 +v -0.000000 2.704567 -0.172145 +v 0.149082 2.704567 -0.086073 +v 0.172146 2.704567 0.000000 +v 0.149082 2.704567 0.086073 +v 0.086073 2.704567 0.149082 +v 0.000000 2.704567 0.172146 +v -0.086073 2.704567 0.149082 +v -0.149082 2.704567 0.086073 +v -0.172146 2.704567 0.000000 +v -0.149082 2.704567 -0.086073 +v -0.086073 2.704567 -0.149082 +v 0.239142 2.236782 -0.413553 +v 0.000326 2.236782 -0.477719 +v 0.413880 2.236782 -0.238577 +v 0.477719 2.236782 0.000326 +v 0.413553 2.236782 0.239142 +v 0.238577 2.236782 0.413880 +v -0.000326 2.236782 0.477719 +v -0.239142 2.236782 0.413553 +v -0.413880 2.236782 0.238577 +v -0.477719 2.236782 -0.000326 +v -0.413554 2.236782 -0.239142 +v -0.238577 2.236782 -0.413880 +v 0.086175 2.236782 -0.149023 +v 0.000118 2.236782 -0.172145 +v 0.149141 2.236782 -0.085971 +v 0.172145 2.236782 0.000118 +v 0.149023 2.236782 0.086175 +v 0.085971 2.236782 0.149141 +v -0.000118 2.236782 0.172145 +v -0.086174 2.236782 0.149024 +v -0.149141 2.236782 0.085971 +v -0.172145 2.236782 -0.000117 +v -0.149024 2.236782 -0.086174 +v -0.085971 2.236782 -0.149141 +v 0.239142 2.704566 -0.413553 +v 0.000326 2.704566 -0.477719 +v 0.413880 2.704566 -0.238577 +v 0.477719 2.704566 0.000326 +v 0.413553 2.704566 0.239142 +v 0.238577 2.704566 0.413880 +v -0.000326 2.704566 0.477719 +v -0.239142 2.704566 0.413553 +v -0.413880 2.704566 0.238577 +v -0.477719 2.704566 -0.000326 +v -0.413554 2.704566 -0.239142 +v -0.238577 2.704566 -0.413880 +v 0.086175 2.704566 -0.149023 +v 0.000118 2.704566 -0.172145 +v 0.149141 2.704566 -0.085971 +v 0.172145 2.704566 0.000118 +v 0.149023 2.704566 0.086175 +v 0.085971 2.704566 0.149141 +v -0.000118 2.704566 0.172145 +v -0.086174 2.704566 0.149024 +v -0.149141 2.704566 0.085971 +v -0.172145 2.704566 -0.000117 +v -0.149024 2.704566 -0.086174 +v -0.085971 2.704566 -0.149141 v -1.500000 0.312500 0.187500 v -1.500000 0.687500 0.187500 v -0.500000 0.312500 0.187500 @@ -474,17 +438,53 @@ v 1.500000 0.312500 -0.187500 v 1.500000 0.687500 -0.187500 v 0.500000 0.312500 -0.187500 v 0.500000 0.687500 -0.187500 -v -1.505620 -0.008618 1.505620 -v -1.505620 3.002622 1.505620 -v -1.505620 -0.008618 -1.505620 -v -1.505620 3.002622 -1.505620 -v 1.505620 -0.008618 1.505620 -v 1.505620 3.002622 1.505620 -v 1.505620 -0.008618 -1.505620 -v 1.505620 3.002622 -1.505620 +v -1.500454 0.002954 1.500454 +v -1.500454 2.997456 1.500454 +v -1.500454 0.002954 -1.500454 +v -1.500454 2.997456 -1.500454 +v 1.500454 0.002954 1.500454 +v 1.500454 2.997456 1.500454 +v 1.500454 0.002954 -1.500454 +v 1.500454 2.997456 -1.500454 +v -1.498351 0.187406 1.309727 +v -1.497932 2.810412 1.311171 +v -1.498373 2.810412 -1.311171 +v -1.498351 0.187406 -1.309727 +v -1.313272 0.183729 -1.500454 +v -1.313272 2.810274 -1.500454 +v 1.313272 2.810274 -1.500454 +v 1.313272 0.183729 -1.500454 +v 1.500454 0.184605 -1.312397 +v 1.500454 2.809398 -1.312397 +v 1.500454 2.809398 1.312397 +v 1.500454 0.184605 1.312397 +v 1.312296 0.184706 1.500454 +v 1.312296 2.809298 1.500454 +v -1.312296 2.809298 1.500454 +v -1.312296 0.184706 1.500454 +v -1.124380 0.002954 -1.124380 +v 1.124380 0.002954 -1.124380 +v 1.124380 0.002954 1.124380 +v -1.124380 0.002954 1.124380 +v 1.307815 2.995548 -1.318863 +v -1.332176 2.995548 -1.318863 +v -1.332176 2.995548 1.318863 +v 1.307815 2.995548 1.318863 +v -1.124380 0.371661 -1.124380 +v 1.124380 0.371661 -1.124380 +v 1.124380 0.371661 1.124380 +v -1.124380 0.371661 1.124380 +v -1.505620 -0.008619 1.505620 +v -1.505620 3.000036 1.505620 +v -1.505620 -0.008619 -1.505620 +v -1.505620 3.000036 -1.505620 +v 1.505620 -0.008619 1.505620 +v 1.505620 3.000036 1.505620 +v 1.505620 -0.008619 -1.505620 +v 1.505620 3.000036 -1.505620 v -1.503510 0.182897 1.314237 -v -1.510185 2.814934 1.315685 -v -1.446485 2.814934 -1.315685 +v -1.503336 2.814934 1.315685 +v -1.503336 2.814934 -1.315685 v -1.503510 0.182897 -1.314237 v -1.317794 0.179208 -1.505620 v -1.317794 2.814795 -1.505620 @@ -498,23 +498,69 @@ v 1.316814 0.180187 1.505620 v 1.316814 2.813816 1.505620 v -1.316814 2.813816 1.505620 v -1.316814 0.180187 1.505620 -v -1.115172 -0.008618 -1.118105 -v 1.115172 -0.008618 -1.118105 -v 1.115172 -0.008618 1.118105 -v -1.115172 -0.008618 1.118105 -v 1.312318 3.000708 -1.323404 -v -1.336763 3.000708 -1.323404 -v -1.336763 3.000708 1.323404 -v 1.312318 3.000708 1.323404 +v -1.115172 -0.008619 -1.118105 +v 1.115172 -0.008619 -1.118105 +v 1.115172 -0.008619 1.118105 +v -1.115172 -0.008619 1.118105 +v 1.312318 2.998122 -1.323404 +v -1.336763 2.998122 -1.323404 +v -1.336763 2.998122 1.323404 +v 1.312318 2.998122 1.323404 v -1.115172 0.247780 -1.118105 v 1.115172 0.247780 -1.118105 v 1.115172 0.247780 1.118105 v -1.115172 0.247780 1.118105 -v -1.510185 2.814934 1.315685 -v -1.510185 2.814934 -1.315685 -vt 0.781250 0.776119 -vt 0.739583 0.798507 +vt 0.373879 0.544776 +vt 0.438621 0.544776 +vt 0.468750 0.522388 +vt 0.373879 0.544776 +vt 0.438621 0.544776 +vt 0.468750 0.522388 +vt 0.348297 0.522388 +vt 0.348297 0.477612 +vt 0.468750 0.305970 +vt 0.083333 0.619403 +vt 0.031250 0.425373 +vt 0.083333 0.425373 +vt 0.164237 0.514925 +vt 0.294096 0.477612 +vt 0.294096 0.514925 +vt 0.468750 0.305970 +vt 0.468750 0.522388 +vt 0.348297 0.477612 +vt 0.348297 0.522388 +vt 0.373879 0.544776 +vt 0.438621 0.544776 +vt 0.416667 0.305970 +vt 0.164237 0.477612 +vt 0.041667 0.305970 +vt 0.031250 0.425373 +vt 0.083333 0.619403 +vt 0.031250 0.619403 +vt 0.348297 0.522388 +vt 0.348297 0.477612 +vt 0.468750 0.305970 +vt 0.164237 0.514925 +vt 0.294096 0.477612 +vt 0.294096 0.514925 +vt 0.083333 0.619403 +vt 0.031250 0.425373 +vt 0.083333 0.425373 +vt 0.348297 0.522388 +vt 0.348297 0.477612 +vt 0.468750 0.305970 +vt 0.373879 0.544776 +vt 0.438621 0.544776 +vt 0.468750 0.522388 +vt 0.416667 0.305970 +vt 0.164237 0.477612 +vt 0.041667 0.305970 +vt 0.031250 0.425373 +vt 0.083333 0.619403 +vt 0.031250 0.619403 vt 0.739583 0.776119 +vt 0.781250 0.798507 +vt 0.739583 0.798507 vt 0.656250 0.776119 vt 0.697917 0.798507 vt 0.656250 0.798507 @@ -526,44 +572,44 @@ vt 0.531250 0.776119 vt 0.697917 0.776119 vt 0.739583 0.798507 vt 0.572917 0.798507 -vt 0.781250 0.776119 vt 0.739583 0.776119 -vt 0.531250 0.776119 -vt 0.572917 0.798507 -vt 0.531250 0.798507 -vt 0.614583 0.776119 +vt 0.781250 0.798507 vt 0.572917 0.776119 +vt 0.531250 0.798507 +vt 0.531250 0.776119 +vt 0.614583 0.776119 +vt 0.572917 0.798507 vt 0.656250 0.776119 vt 0.614583 0.798507 vt 0.697917 0.798507 vt 0.656250 0.798507 vt 0.697917 0.776119 -vt 0.572917 0.820895 -vt 0.531250 0.858209 vt 0.531250 0.820895 -vt 0.739583 0.820895 -vt 0.781250 0.858209 +vt 0.572917 0.858209 +vt 0.531250 0.858209 +vt 0.781250 0.820895 vt 0.739583 0.858209 -vt 0.656250 0.820895 -vt 0.614583 0.858209 +vt 0.739583 0.820895 vt 0.614583 0.820895 -vt 0.739583 0.820895 -vt 0.781250 0.858209 +vt 0.656250 0.858209 +vt 0.614583 0.858209 +vt 0.781250 0.820895 vt 0.739583 0.858209 +vt 0.739583 0.820895 +vt 0.697917 0.858209 +vt 0.697917 0.820895 +vt 0.614583 0.820895 +vt 0.656250 0.858209 +vt 0.614583 0.858209 +vt 0.572917 0.820895 +vt 0.572917 0.858209 vt 0.697917 0.858209 vt 0.697917 0.820895 vt 0.656250 0.820895 -vt 0.614583 0.858209 -vt 0.614583 0.820895 -vt 0.572917 0.858209 vt 0.572917 0.820895 -vt 0.697917 0.858209 -vt 0.697917 0.820895 -vt 0.656250 0.858209 -vt 0.572917 0.858209 -vt 0.531250 0.858209 vt 0.531250 0.820895 -vt 0.656250 0.858209 +vt 0.531250 0.858209 +vt 0.656250 0.820895 vt 0.656250 0.858209 vt 0.697917 0.873134 vt 0.656250 0.873134 @@ -575,202 +621,256 @@ vt 0.781250 0.873134 vt 0.739583 0.873134 vt 0.614583 0.873134 vt 0.614583 0.858209 -vt 0.781250 0.858209 -vt 0.739583 0.873134 vt 0.739583 0.858209 -vt 0.697917 0.873134 +vt 0.781250 0.873134 +vt 0.739583 0.873134 vt 0.697917 0.858209 +vt 0.697917 0.873134 vt 0.656250 0.858209 vt 0.614583 0.873134 vt 0.614583 0.858209 -vt 0.572917 0.858209 vt 0.572917 0.873134 +vt 0.572917 0.858209 vt 0.697917 0.858209 vt 0.656250 0.873134 vt 0.572917 0.873134 -vt 0.531250 0.858209 vt 0.531250 0.873134 +vt 0.531250 0.858209 vt 0.959530 0.694249 -vt 0.890075 0.780425 -vt 0.890133 0.667710 -vt 0.864583 0.514925 -vt 0.937500 0.597015 -vt 0.937500 0.514925 -vt 0.864583 0.597015 -vt 0.937500 0.514925 -vt 0.937500 0.597015 -vt 0.864583 0.514925 -vt 0.937500 0.597015 -vt 0.937500 0.514925 -vt 0.864583 0.597015 -vt 0.937500 0.514925 -vt 0.937500 0.597015 -vt 0.864583 0.514925 -vt 0.937500 0.597015 -vt 0.937500 0.514925 -vt 0.864583 0.514925 -vt 0.937500 0.597015 -vt 0.937500 0.514925 -vt 0.864583 0.514925 -vt 0.937500 0.597015 -vt 0.937500 0.514925 -vt 0.864583 0.514925 -vt 0.937500 0.597015 -vt 0.937500 0.514925 -vt 0.864583 0.514925 -vt 0.937500 0.597015 -vt 0.937500 0.514925 -vt 0.864583 0.514925 -vt 0.937500 0.597015 -vt 0.937500 0.514925 -vt 0.864583 0.597015 -vt 0.937500 0.514925 -vt 0.937500 0.597015 -vt 0.864583 0.514925 -vt 0.937500 0.597015 -vt 0.937500 0.514925 -vt 0.937500 0.514925 -vt 0.864583 0.597015 -vt 0.864583 0.514925 -vt 0.937500 0.514925 -vt 0.864583 0.597015 -vt 0.937500 0.597015 -vt 0.937500 0.597015 -vt 0.864583 0.514925 -vt 0.937500 0.514925 -vt 0.937500 0.514925 -vt 0.864583 0.597015 -vt 0.937500 0.597015 -vt 0.864583 0.514925 -vt 0.937500 0.597015 -vt 0.864583 0.597015 -vt 0.937500 0.514925 -vt 0.864583 0.597015 -vt 0.937500 0.597015 -vt 0.937500 0.514925 -vt 0.864583 0.597015 -vt 0.937500 0.597015 -vt 0.937500 0.597015 -vt 0.864583 0.514925 -vt 0.864583 0.597015 -vt 0.864583 0.597015 -vt 0.937500 0.514925 -vt 0.864583 0.514925 -vt 0.864583 0.597015 -vt 0.937500 0.514925 -vt 0.864583 0.514925 -vt 0.864583 0.597015 -vt 0.937500 0.514925 -vt 0.864583 0.514925 -vt 0.864583 0.597015 -vt 0.937500 0.514925 -vt 0.864583 0.514925 -vt 0.373879 0.544776 -vt 0.438621 0.544776 -vt 0.468750 0.522388 -vt 0.373879 0.544776 -vt 0.438621 0.544776 -vt 0.468750 0.522388 -vt 0.348297 0.522388 -vt 0.348297 0.477612 -vt 0.468750 0.305970 -vt 0.083333 0.619403 -vt 0.031250 0.425373 -vt 0.083333 0.425373 -vt 0.166667 0.514925 -vt 0.291667 0.477612 -vt 0.291667 0.514925 -vt 0.468750 0.305970 -vt 0.468750 0.522388 -vt 0.348297 0.477612 -vt 0.348297 0.522388 -vt 0.373879 0.544776 -vt 0.438621 0.544776 -vt 0.416667 0.305970 -vt 0.166667 0.477612 -vt 0.041667 0.305970 -vt 0.031250 0.425373 -vt 0.083333 0.619403 -vt 0.031250 0.619403 -vt 0.348297 0.522388 -vt 0.348297 0.477612 -vt 0.468750 0.305970 -vt 0.166667 0.514925 -vt 0.291667 0.477612 -vt 0.291667 0.514925 -vt 0.083333 0.619403 -vt 0.031250 0.425373 -vt 0.083333 0.425373 -vt 0.348297 0.522388 -vt 0.348297 0.477612 -vt 0.468750 0.305970 -vt 0.373879 0.544776 -vt 0.438621 0.544776 -vt 0.468750 0.522388 -vt 0.416667 0.305970 -vt 0.166667 0.477612 -vt 0.041667 0.305970 -vt 0.031250 0.425373 -vt 0.083333 0.619403 -vt 0.031250 0.619403 -vt 0.802083 0.500000 -vt 0.739583 0.589552 -vt 0.739583 0.500000 -vt 0.802083 0.365672 -vt 0.739583 0.455224 -vt 0.739583 0.365672 -vt 0.802083 0.455224 -vt 0.614583 0.455224 -vt 0.614583 0.500000 -vt 0.927083 0.500000 -vt 0.927083 0.455224 -vt 0.739583 0.365672 -vt 0.802083 0.455224 -vt 0.739583 0.455224 -vt 0.739583 0.500000 -vt 0.802083 0.589552 -vt 0.739583 0.589552 -vt 0.802083 0.500000 -vt 0.614583 0.455224 -vt 0.614583 0.500000 -vt 0.927083 0.455224 -vt 0.927083 0.500000 -vt 0.739583 0.500000 -vt 0.614583 0.455224 -vt 0.739583 0.455224 -vt 0.927083 0.500000 -vt 0.802083 0.455224 -vt 0.927083 0.455224 -vt 0.802083 0.500000 -vt 0.739583 0.365672 -vt 0.739583 0.589552 -vt 0.802083 0.589552 -vt 0.802083 0.589552 -vt 0.739583 0.500000 -vt 0.802083 0.500000 -vt 0.802083 0.455224 -vt 0.739583 0.365672 -vt 0.802083 0.365672 -vt 0.739583 0.455224 -vt 0.927083 0.455224 -vt 0.927083 0.500000 -vt 0.614583 0.455224 -vt 0.614583 0.500000 -vt 0.781250 0.798507 -vt 0.781250 0.798507 -vt 0.781250 0.820895 -vt 0.781250 0.820895 -vt 0.781250 0.858209 -vt 0.781250 0.873134 +vt 0.811439 0.724046 vt 0.820707 0.697528 +vt 0.864583 0.514925 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.597015 +vt 0.937500 0.514925 +vt 0.937500 0.597015 +vt 0.864583 0.514925 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.597015 +vt 0.937500 0.514925 +vt 0.937500 0.597015 +vt 0.864583 0.514925 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.514925 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.514925 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.514925 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.514925 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.514925 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.597015 +vt 0.937500 0.514925 +vt 0.937500 0.597015 +vt 0.864583 0.514925 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.937500 0.514925 +vt 0.864583 0.597015 +vt 0.864583 0.514925 +vt 0.937500 0.514925 +vt 0.864583 0.597015 +vt 0.937500 0.597015 +vt 0.937500 0.597015 +vt 0.864583 0.514925 +vt 0.937500 0.514925 +vt 0.937500 0.514925 +vt 0.864583 0.597015 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.597015 +vt 0.864583 0.514925 +vt 0.937500 0.514925 +vt 0.864583 0.597015 +vt 0.937500 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.597015 +vt 0.937500 0.597015 +vt 0.937500 0.597015 +vt 0.864583 0.514925 +vt 0.864583 0.597015 +vt 0.864583 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.514925 +vt 0.864583 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.514925 +vt 0.937500 0.597015 +vt 0.864583 0.514925 +vt 0.864583 0.597015 +vt 0.864583 0.597015 +vt 0.937500 0.514925 +vt 0.864583 0.514925 +vt 0.802083 0.500000 +vt 0.739583 0.500000 +vt 0.739583 0.589552 +vt 0.802083 0.365672 +vt 0.739583 0.365672 +vt 0.739583 0.455224 +vt 0.802083 0.455224 +vt 0.614583 0.500000 +vt 0.927083 0.500000 +vt 0.927083 0.455224 +vt 0.739583 0.365672 +vt 0.739583 0.455224 +vt 0.802083 0.455224 +vt 0.739583 0.500000 +vt 0.739583 0.589552 +vt 0.802083 0.589552 +vt 0.802083 0.500000 +vt 0.614583 0.455224 +vt 0.614583 0.500000 +vt 0.927083 0.500000 +vt 0.927083 0.455224 +vt 0.739583 0.500000 +vt 0.739583 0.455224 +vt 0.614583 0.455224 +vt 0.927083 0.500000 +vt 0.927083 0.455224 +vt 0.802083 0.455224 +vt 0.802083 0.500000 +vt 0.802083 0.365672 +vt 0.739583 0.365672 +vt 0.802083 0.589552 +vt 0.802083 0.589552 +vt 0.802083 0.500000 +vt 0.739583 0.500000 +vt 0.802083 0.455224 +vt 0.802083 0.365672 +vt 0.739583 0.365672 +vt 0.739583 0.455224 +vt 0.927083 0.500000 +vt 0.927083 0.455224 +vt 0.614583 0.455224 +vt 0.614583 0.500000 +vt 0.468750 0.619403 +vt 0.000000 0.641791 +vt 0.500000 0.641791 +vt 0.031250 0.619403 +vt 0.000000 0.283582 +vt 0.468750 0.305970 +vt 0.500000 0.283582 +vt 0.000000 0.283582 +vt 0.468750 0.305970 +vt 0.500000 0.283582 +vt 0.500000 0.641791 +vt 0.468750 0.619403 +vt 0.000000 0.641791 +vt 0.031250 0.619403 +vt 0.500000 1.000000 +vt 0.531250 0.664179 +vt 1.000000 0.641791 +vt 0.968750 0.664179 +vt 1.000000 1.000000 +vt 0.968750 0.977612 +vt 1.000000 0.641791 +vt 0.968750 0.977612 +vt 1.000000 1.000000 +vt 0.531250 0.977612 +vt 0.500000 1.000000 +vt 0.531250 0.664179 +vt 0.562500 0.328358 +vt 1.000000 0.283582 +vt 0.937500 0.328358 +vt 0.937500 0.597015 +vt 0.562500 0.597015 +vt 0.531250 0.619403 +vt 0.531250 0.305970 +vt 1.000000 0.283582 +vt 0.968750 0.619403 +vt 0.062500 0.686567 +vt 0.437500 0.641791 +vt 0.062500 0.641791 +vt 0.062500 0.955224 +vt 0.010417 0.686567 +vt 0.010417 0.955224 +vt 0.437500 0.955224 +vt 0.062500 1.000000 +vt 0.437500 1.000000 +vt 0.437500 0.686567 +vt 0.489583 0.955224 +vt 0.489583 0.686567 +vt 0.000000 0.641791 +vt 0.468750 0.619403 +vt 0.500000 0.641791 +vt 0.000000 0.283582 +vt 0.031250 0.619403 +vt 0.468750 0.305970 +vt 0.031250 0.305970 +vt 0.500000 0.283582 +vt 0.500000 0.283582 +vt 0.031250 0.305970 +vt 0.000000 0.283582 +vt 0.500000 0.641791 +vt 0.468750 0.305970 +vt 0.031250 0.619403 +vt 0.468750 0.619403 +vt 0.000000 0.641791 +vt 0.531250 0.977612 +vt 0.500000 1.000000 +vt 1.000000 0.641791 +vt 0.531250 0.664179 +vt 0.968750 0.977612 +vt 0.968750 0.664179 +vt 1.000000 1.000000 +vt 1.000000 1.000000 +vt 0.968750 0.664179 +vt 1.000000 0.641791 +vt 0.500000 1.000000 +vt 0.968750 0.977612 +vt 0.531250 0.664179 +vt 0.531250 0.977612 +vt 1.000000 0.283582 +vt 0.562500 0.328358 +vt 0.937500 0.328358 +vt 0.937500 0.597015 +vt 0.562500 0.597015 +vt 0.531250 0.619403 +vt 0.968750 0.305970 +vt 0.531250 0.305970 +vt 1.000000 0.283582 +vt 0.968750 0.619403 +vt 0.437500 0.641791 +vt 0.062500 0.686567 +vt 0.062500 0.641791 +vt 0.010417 0.686567 +vt 0.062500 0.955224 +vt 0.010417 0.955224 +vt 0.062500 1.000000 +vt 0.437500 0.955224 +vt 0.437500 1.000000 +vt 0.489583 0.955224 +vt 0.437500 0.686567 +vt 0.489583 0.686567 +vt 0.031250 0.619403 +vt 0.083333 0.425373 +vt 0.031250 0.619403 +vt 0.083333 0.425373 +vt 0.781250 0.776119 +vt 0.781250 0.776119 +vt 0.781250 0.858209 +vt 0.781250 0.858209 +vt 0.781250 0.858209 +vt 0.781250 0.858209 vt 0.848484 0.674329 vt 0.927149 0.674350 +vt 0.890133 0.667710 vt 0.968770 0.724088 vt 0.959501 0.750607 vt 0.931725 0.773805 vt 0.853060 0.773784 +vt 0.890075 0.780425 vt 0.820678 0.753885 -vt 0.811439 0.724046 vt 0.864583 0.597015 vt 0.864583 0.514925 vt 0.864583 0.597015 @@ -787,49 +887,25 @@ vt 0.937500 0.597015 vt 0.864583 0.514925 vt 0.864583 0.597015 vt 0.864583 0.514925 -vt 0.937500 0.514925 +vt 0.937500 0.597015 vt 0.864583 0.514925 vt 0.864583 0.514925 vt 0.937500 0.514925 vt 0.937500 0.597015 vt 0.937500 0.597015 +vt 0.937500 0.514925 vt 0.937500 0.597015 -vt 0.937500 0.597015 -vt 0.031250 0.619403 -vt 0.083333 0.425373 -vt 0.031250 0.619403 -vt 0.083333 0.425373 vt 0.802083 0.589552 +vt 0.614583 0.455224 vt 0.802083 0.365672 vt 0.614583 0.500000 -vt 0.802083 0.365672 vt 0.739583 0.589552 -vt 0.614583 0.664179 -vt 0.656250 0.664179 -vt 0.572917 0.664179 -vt 0.531250 0.664179 -vt 0.739583 0.664179 -vt 0.781250 0.664179 -vt 0.697917 0.664179 -vt 0.656250 0.664179 -vt 0.614583 0.664179 -vt 0.572917 0.664179 -vt 0.531250 0.664179 -vt 0.739583 0.664179 -vt 0.781250 0.664179 -vt 0.697917 0.664179 -vt 0.531250 0.880597 -vt 0.697917 0.880597 -vt 0.656250 0.880597 -vt 0.531250 0.880597 -vt 0.739583 0.880597 -vt 0.614583 0.880597 -vt 0.739583 0.880597 -vt 0.697917 0.880597 -vt 0.614583 0.880597 -vt 0.572917 0.880597 -vt 0.656250 0.880597 -vt 0.572917 0.880597 +vt 0.739583 0.589552 +vt 0.031250 0.305970 +vt 0.031250 0.305970 +vt 0.531250 0.977612 +vt 0.968750 0.664179 +vt 0.968750 0.305970 vt 0.229167 0.029851 vt 0.270833 0.014925 vt 0.270833 0.029851 @@ -1056,118 +1132,42 @@ vt 0.750000 0.089552 vt 0.750000 0.074627 vt 0.750000 0.059701 vt 0.750000 0.044776 -vt 0.781250 0.880597 -vt 0.781250 0.880597 +vt 0.614583 0.664179 +vt 0.656250 0.664179 +vt 0.572917 0.664179 +vt 0.531250 0.664179 +vt 0.781250 0.664179 +vt 0.739583 0.664179 +vt 0.697917 0.664179 +vt 0.656250 0.664179 +vt 0.614583 0.664179 +vt 0.572917 0.664179 +vt 0.531250 0.664179 +vt 0.781250 0.664179 +vt 0.739583 0.664179 +vt 0.697917 0.664179 +vt 0.531250 0.880597 +vt 0.697917 0.880597 +vt 0.656250 0.880597 +vt 0.531250 0.880597 +vt 0.739583 0.880597 +vt 0.614583 0.880597 +vt 0.739583 0.880597 +vt 0.697917 0.880597 +vt 0.614583 0.880597 +vt 0.572917 0.880597 +vt 0.656250 0.880597 +vt 0.572917 0.880597 vt 0.593750 0.014925 vt 0.187500 0.283582 -vt 0.468750 0.619403 -vt 0.000000 0.641791 -vt 0.500000 0.641791 -vt 0.031250 0.619403 -vt 0.000000 0.283582 -vt 0.468750 0.305970 -vt 0.500000 0.283582 -vt 0.031250 0.305970 -vt 0.500000 0.283582 -vt 0.000000 0.283582 -vt 0.468750 0.305970 -vt 0.500000 0.641791 -vt 0.468750 0.619403 -vt 0.000000 0.641791 -vt 0.031250 0.619403 -vt 0.531250 0.977612 -vt 0.500000 1.000000 -vt 0.968750 0.664179 -vt 1.000000 0.641791 -vt 1.000000 1.000000 -vt 0.968750 0.664179 -vt 1.000000 1.000000 -vt 1.000000 0.641791 -vt 0.968750 0.977612 -vt 0.500000 1.000000 -vt 0.531250 0.977612 -vt 0.531250 0.664179 -vt 0.562500 0.328358 -vt 1.000000 0.283582 -vt 0.937500 0.328358 -vt 0.937500 0.597015 -vt 0.562500 0.597015 -vt 0.531250 0.619403 -vt 0.531250 0.305970 -vt 1.000000 0.283582 -vt 0.968750 0.619403 -vt 0.062500 0.686567 -vt 0.437500 0.641791 -vt 0.062500 0.641791 -vt 0.062500 0.955224 -vt 0.010417 0.686567 -vt 0.010417 0.955224 -vt 0.437500 0.955224 -vt 0.062500 1.000000 -vt 0.437500 1.000000 -vt 0.437500 0.686567 -vt 0.489583 0.955224 -vt 0.489583 0.686567 -vt 0.031250 0.305970 -vt 0.531250 0.664179 -vt 0.968750 0.977612 -vt 0.968750 0.305970 -vt 0.000000 0.641791 -vt 0.468750 0.619403 -vt 0.500000 0.641791 -vt 0.000000 0.283582 -vt 0.031250 0.619403 -vt 0.468750 0.305970 -vt 0.031250 0.305970 -vt 0.500000 0.283582 -vt 0.500000 0.283582 -vt 0.031250 0.305970 -vt 0.000000 0.283582 -vt 0.500000 0.641791 -vt 0.468750 0.305970 -vt 0.000000 0.641791 -vt 0.468750 0.619403 -vt 0.031250 0.619403 -vt 0.531250 0.977612 -vt 0.500000 1.000000 -vt 1.000000 0.641791 -vt 0.531250 0.664179 -vt 1.000000 1.000000 -vt 0.968750 0.664179 -vt 0.968750 0.977612 -vt 1.000000 1.000000 -vt 0.968750 0.664179 -vt 1.000000 0.641791 -vt 0.500000 1.000000 -vt 0.968750 0.977612 -vt 0.531250 0.977612 -vt 0.531250 0.664179 -vt 1.000000 0.283582 -vt 0.562500 0.328358 -vt 0.937500 0.328358 -vt 0.937500 0.597015 -vt 0.562500 0.597015 -vt 0.531250 0.619403 -vt 1.000000 0.283582 -vt 0.531250 0.305970 -vt 0.968750 0.619403 -vt 0.968750 0.305970 -vt 0.437500 0.641791 -vt 0.062500 0.686567 -vt 0.062500 0.641791 -vt 0.010417 0.686567 -vt 0.062500 0.955224 -vt 0.010417 0.955224 -vt 0.062500 1.000000 -vt 0.437500 0.955224 -vt 0.437500 1.000000 -vt 0.489583 0.955224 -vt 0.437500 0.686567 -vt 0.489583 0.686567 -vt 0.031250 0.619403 -vt 0.031250 0.305970 -vn 0.0000 -1.0000 -0.0000 -vn 0.0000 1.0000 -0.0000 +vt 0.781250 0.880597 +vt 0.781250 0.880597 +vn 0.0000 0.0000 1.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.8809 0.4734 0.0000 +vn 0.0000 1.0000 0.0000 +vn -0.8719 0.4897 0.0000 +vn 0.0000 -1.0000 0.0000 vn -0.4994 0.0000 -0.8664 vn 0.4994 0.0000 0.8664 vn 0.8664 -0.0000 -0.4994 @@ -1177,105 +1177,39 @@ vn -0.0007 -0.0000 1.0000 vn 1.0000 -0.0000 0.0007 vn -0.8657 0.0000 -0.5006 vn 0.0007 0.0000 -1.0000 -vn 0.8657 -0.0000 0.5006 +vn 0.8657 0.0000 0.5006 vn -0.5006 0.0000 0.8657 vn 0.5006 0.0000 -0.8657 vn -0.5000 0.0000 -0.8660 -vn -0.0000 0.0000 -1.0000 vn 0.5000 0.0000 -0.8660 vn 0.8660 0.0000 -0.5000 vn 1.0000 0.0000 -0.0000 vn 0.8660 0.0000 0.5000 vn 0.5000 0.0000 0.8660 -vn 0.0000 0.0000 1.0000 vn -0.5000 0.0000 0.8660 vn -0.8660 0.0000 0.5000 vn -1.0000 0.0000 -0.0000 vn -0.8660 0.0000 -0.5000 -vn 0.8809 0.4734 0.0000 -vn -0.8719 0.4897 0.0000 -vn 0.0000 -0.7193 -0.6947 -vn 0.4940 0.1539 -0.8557 -vn 0.0000 0.1539 -0.9881 -vn 0.3473 -0.7193 -0.6016 -vn 0.8557 0.1539 -0.4940 -vn 0.6016 -0.7193 -0.3473 -vn 0.9881 0.1539 0.0000 -vn 0.6947 -0.7193 0.0000 -vn 0.8557 0.1539 0.4940 -vn 0.6016 -0.7193 0.3473 -vn 0.4940 0.1539 0.8557 -vn 0.3473 -0.7193 0.6016 -vn 0.0000 0.1539 0.9881 -vn 0.0000 -0.7193 0.6947 -vn -0.4940 0.1539 0.8557 -vn -0.6016 -0.7193 0.3473 -vn -0.8557 0.1539 0.4940 -vn -0.9881 0.1539 0.0000 -vn -0.6947 -0.7193 0.0000 -vn -0.8557 0.1539 -0.4940 -vn -0.3473 -0.7193 -0.6016 -vn -0.4940 0.1539 -0.8557 -vn 0.6557 -0.6532 -0.3786 -vn 0.7049 0.6082 -0.3649 -vn 0.7571 -0.6532 0.0000 -vn -0.7571 -0.6532 0.0000 -vn -0.7929 0.6082 -0.0364 -vn -0.6557 -0.6532 -0.3786 -vn 0.0000 -0.6532 0.7571 -vn -0.0364 0.6082 0.7929 -vn -0.3786 -0.6532 0.6557 -vn 0.7929 0.6082 0.0364 -vn 0.6557 -0.6532 0.3786 -vn -0.6685 0.6082 -0.4280 -vn -0.3786 -0.6532 -0.6557 -vn 0.0000 -0.6532 -0.7571 -vn 0.0364 0.6082 -0.7929 -vn 0.3786 -0.6532 -0.6557 -vn -0.4280 0.6082 0.6685 -vn -0.6557 -0.6532 0.3786 -vn 0.6685 0.6082 0.4280 -vn 0.3786 -0.6532 0.6557 -vn -0.3649 0.6082 -0.7049 -vn 0.4280 0.6082 -0.6685 -vn -0.7049 0.6082 0.3649 -vn 0.3649 0.6082 0.7049 -vn 0.5743 0.7314 0.3677 -vn 0.0000 -0.7703 0.6377 -vn 0.3135 0.7314 0.6056 -vn 0.3677 0.7314 -0.5743 -vn 0.6377 -0.7703 0.0000 -vn 0.6056 0.7314 -0.3135 -vn -0.6056 0.7314 0.3135 -vn -0.5523 -0.7703 -0.3189 -vn -0.6812 0.7314 -0.0313 -vn -0.3189 -0.7703 0.5523 -vn -0.0313 0.7314 0.6812 -vn 0.5523 -0.7703 0.3189 -vn 0.6812 0.7314 0.0313 -vn -0.3189 -0.7703 -0.5523 -vn -0.5743 0.7314 -0.3677 -vn -0.3135 0.7314 -0.6056 -vn 0.3189 -0.7703 -0.5523 -vn 0.0313 0.7314 -0.6812 -vn -0.5523 -0.7703 0.3189 -vn -0.3677 0.7314 0.5743 -vn 0.3189 -0.7703 0.5523 -vn 0.0000 -0.7703 -0.6377 -vn 0.5523 -0.7703 -0.3189 -vn -0.6377 -0.7703 0.0000 -vn -0.7571 0.6532 0.0000 -vn 0.3786 0.6532 0.6557 -vn 0.0000 0.6532 0.7571 -vn 0.7571 0.6532 0.0000 -vn -0.6557 0.6532 -0.3786 -vn -0.3786 0.6532 0.6557 -vn 0.6557 0.6532 0.3786 -vn -0.3786 0.6532 -0.6557 -vn 0.3786 0.6532 -0.6557 -vn -0.6557 0.6532 0.3786 -vn 0.0000 0.6532 -0.7571 -vn 0.6557 0.6532 -0.3786 +vn 0.9999 0.0000 0.0110 +vn 0.9999 0.0135 0.0000 +vn 0.9999 0.0000 -0.0110 +vn 0.9999 -0.0114 0.0000 +vn 0.0000 -0.9999 -0.0105 +vn -0.0113 -0.9999 0.0000 +vn 0.0000 -0.9999 0.0105 +vn 0.0099 -1.0000 0.0000 +vn -0.9999 0.0000 -0.0110 +vn -0.9999 -0.0123 0.0000 +vn -0.9999 0.0001 0.0121 +vn -0.9999 0.0110 0.0000 +vn 0.0000 0.9999 0.0105 +vn 0.0113 0.9999 0.0000 +vn 0.0000 0.9999 -0.0105 +vn -0.0099 1.0000 0.0000 +vn 0.9999 -0.0002 0.0135 +vn 0.9999 0.0110 -0.0002 +vn -0.9999 0.0001 -0.0121 +vn -0.9999 0.0000 0.0110 vn -0.2575 0.9661 0.0204 vn 0.2350 0.7987 0.5539 vn 0.4929 0.8701 0.0015 @@ -1500,844 +1434,902 @@ vn 0.9999 0.0000 0.0120 vn 0.9999 0.0000 0.0156 vn 0.9998 0.0000 0.0181 vn 0.9998 0.0000 0.0219 +vn 0.0000 -0.7193 -0.6947 +vn 0.4940 0.1539 -0.8557 +vn 0.0000 0.1539 -0.9881 +vn 0.3473 -0.7193 -0.6016 +vn 0.8557 0.1539 -0.4940 +vn 0.6016 -0.7193 -0.3473 +vn 0.9881 0.1539 0.0000 +vn 0.6016 -0.7193 0.3473 +vn 0.8557 0.1539 0.4940 +vn 0.3473 -0.7193 0.6016 +vn 0.4940 0.1539 0.8557 +vn 0.0000 -0.7193 0.6947 +vn 0.0000 0.1539 0.9881 +vn -0.4940 0.1539 0.8557 vn -0.3473 -0.7193 0.6016 +vn -0.8557 0.1539 0.4940 +vn -0.6016 -0.7193 0.3473 +vn -0.9881 0.1539 0.0000 vn -0.6016 -0.7193 -0.3473 +vn -0.8557 0.1539 -0.4940 +vn -0.3473 -0.7193 -0.6016 +vn -0.4940 0.1539 -0.8557 +vn 0.6557 -0.6532 -0.3786 +vn 0.7049 0.6082 -0.3649 +vn 0.7571 -0.6532 0.0000 +vn -0.7571 -0.6532 0.0000 +vn -0.7929 0.6082 -0.0364 +vn -0.6557 -0.6532 -0.3786 +vn 0.0000 -0.6532 0.7571 +vn -0.0364 0.6082 0.7929 +vn -0.3786 -0.6532 0.6557 +vn 0.7929 0.6082 0.0364 +vn 0.6557 -0.6532 0.3786 +vn -0.6685 0.6082 -0.4280 +vn -0.3786 -0.6532 -0.6557 +vn 0.0000 -0.6532 -0.7571 +vn 0.0364 0.6082 -0.7929 +vn 0.3786 -0.6532 -0.6557 +vn -0.4280 0.6082 0.6685 +vn -0.6557 -0.6532 0.3786 +vn 0.6685 0.6082 0.4280 +vn 0.3786 -0.6532 0.6557 +vn -0.3649 0.6082 -0.7049 +vn 0.4280 0.6082 -0.6685 +vn -0.7049 0.6082 0.3649 +vn 0.3649 0.6082 0.7049 +vn 0.5743 0.7314 0.3677 +vn 0.0000 -0.7703 0.6377 +vn 0.3135 0.7314 0.6056 +vn 0.3677 0.7314 -0.5743 +vn 0.6377 -0.7703 0.0000 +vn 0.6056 0.7314 -0.3135 +vn -0.6056 0.7314 0.3135 +vn -0.5523 -0.7703 -0.3189 +vn -0.6812 0.7314 -0.0313 +vn -0.3189 -0.7703 0.5523 +vn -0.0313 0.7314 0.6812 +vn 0.5523 -0.7703 0.3189 +vn 0.6812 0.7314 0.0313 +vn -0.3189 -0.7703 -0.5523 +vn -0.5743 0.7314 -0.3677 +vn -0.3135 0.7314 -0.6056 +vn 0.3189 -0.7703 -0.5523 +vn 0.0313 0.7314 -0.6812 +vn -0.5523 -0.7703 0.3189 +vn -0.3677 0.7314 0.5743 +vn 0.3189 -0.7703 0.5523 +vn 0.0000 -0.7703 -0.6377 +vn 0.5523 -0.7703 -0.3189 +vn -0.6377 -0.7703 0.0000 +vn -0.7571 0.6532 0.0000 +vn 0.3786 0.6532 0.6557 +vn 0.0000 0.6532 0.7571 +vn 0.7571 0.6532 0.0000 +vn -0.6557 0.6532 -0.3786 +vn -0.3786 0.6532 0.6557 +vn 0.6557 0.6532 0.3786 +vn -0.3786 0.6532 -0.6557 +vn 0.3786 0.6532 -0.6557 +vn -0.6557 0.6532 0.3786 +vn 0.0000 0.6532 -0.7571 +vn 0.6557 0.6532 -0.3786 vn 0.8721 0.3391 0.3527 vn -0.8732 0.3390 -0.3500 -vn 0.9999 0.0000 0.0110 -vn 0.9997 -0.0257 0.0000 -vn 0.9999 0.0000 -0.0110 -vn 0.9999 -0.0110 0.0000 -vn 0.0000 -0.9999 -0.0105 -vn -0.0113 -0.9999 0.0000 -vn 0.0000 -0.9999 0.0105 -vn 0.0099 -1.0000 0.0000 -vn 0.9996 0.0027 -0.0280 -vn 0.9466 0.3215 0.0230 -vn 0.9486 -0.0207 -0.3158 -vn -0.9999 0.0000 -0.0110 -vn -0.9997 0.0243 0.0000 -vn -0.9486 0.0207 0.3158 -vn -0.9999 0.0110 0.0000 -vn 0.0000 0.9999 0.0105 -vn 0.0113 0.9999 0.0000 -vn 0.0000 0.9999 -0.0105 -vn -0.0099 1.0000 0.0000 -vn -0.9996 -0.0026 0.0265 -vn -0.9999 0.0000 0.0110 +vn 0.6947 -0.7193 0.0000 +vn -0.6947 -0.7193 0.0000 usemtl None s off -f 44/1/1 65/2/1 46/3/1 -f 38/4/1 72/5/1 62/6/1 -f 38/4/1 61/7/1 40/8/1 -f 42/9/1 64/10/1 44/11/1 -f 60/12/1 71/13/1 72/5/1 -f 40/8/1 63/14/1 42/9/1 -f 56/15/1 71/13/1 58/16/1 -f 56/17/1 69/18/1 70/19/1 -f 52/20/1 69/18/1 54/21/1 -f 50/22/1 68/23/1 52/20/1 -f 50/22/1 66/24/1 67/25/1 -f 46/3/1 66/24/1 48/26/1 -f 75/27/2 88/28/2 76/29/2 -f 83/30/2 94/31/2 95/32/2 -f 79/33/2 92/34/2 80/35/2 -f 77/36/2 88/37/2 89/38/2 -f 83/30/2 96/39/2 84/40/2 -f 74/41/2 85/42/2 73/43/2 -f 80/35/2 93/44/2 81/45/2 -f 77/36/2 90/46/2 78/47/2 -f 84/40/2 86/48/2 74/41/2 -f 73/43/2 87/49/2 75/27/2 -f 81/45/2 94/50/2 82/51/2 -f 79/33/2 90/46/2 91/52/2 -f 103/53/1 114/54/1 115/55/1 -f 99/56/1 112/57/1 100/58/1 -f 107/59/1 118/60/1 119/61/1 -f 103/53/1 116/62/1 104/63/1 -f 100/64/1 113/65/1 101/66/1 -f 107/59/1 120/67/1 108/68/1 -f 98/69/1 109/70/1 97/71/1 -f 105/72/1 116/62/1 117/73/1 -f 102/74/1 113/65/1 114/54/1 -f 108/68/1 110/75/1 98/69/1 -f 97/71/1 111/76/1 99/56/1 -f 106/77/1 117/73/1 118/78/1 -f 131/79/2 127/80/2 122/81/2 -f 165/82/3 201/83/3 177/84/3 -f 159/85/4 195/86/4 171/87/4 -f 168/88/5 204/89/5 180/90/5 -f 163/91/6 199/92/6 175/93/6 -f 162/94/7 198/95/7 174/96/7 -f 160/97/8 196/98/8 172/99/8 -f 158/100/9 194/101/9 170/102/9 -f 164/103/10 200/104/10 176/105/10 -f 166/106/11 202/107/11 178/108/11 -f 157/109/12 193/110/12 169/111/12 -f 161/112/13 197/113/13 173/114/13 -f 167/115/14 203/116/14 179/117/14 -f 87/118/15 135/119/15 75/120/15 -f 148/121/16 76/122/16 88/123/16 -f 149/124/17 77/125/17 89/126/17 -f 150/127/18 78/128/18 90/129/18 -f 79/130/19 151/131/19 139/132/19 -f 152/133/20 80/134/20 92/135/20 -f 153/136/21 81/137/21 93/138/21 -f 94/139/22 142/140/22 82/141/22 -f 83/142/23 155/143/23 143/144/23 -f 84/145/24 156/146/24 144/147/24 -f 74/148/25 146/149/25 134/150/25 -f 73/151/26 145/152/26 133/153/26 -f 224/154/22 213/155/22 214/156/22 -f 226/157/16 219/158/16 220/159/16 -f 224/154/22 214/156/22 223/160/22 -f 223/160/22 214/156/22 210/161/22 -f 214/156/22 205/162/22 210/161/22 -f 209/163/27 436/164/27 207/165/27 -f 210/166/2 433/167/2 209/168/2 -f 207/169/22 217/170/22 209/171/22 -f 209/171/22 217/170/22 228/172/22 -f 227/173/22 228/172/22 217/170/22 -f 217/170/22 218/174/22 227/173/22 -f 436/175/22 434/176/22 435/177/22 -f 434/176/22 436/175/22 433/167/22 -f 205/178/28 434/179/28 210/180/28 -f 226/157/16 220/159/16 225/181/16 -f 225/181/16 220/159/16 212/182/16 -f 220/159/16 208/183/16 212/182/16 -f 212/184/2 437/185/2 211/186/2 -f 211/187/28 440/188/28 206/189/28 -f 222/190/16 211/191/16 206/192/16 -f 221/193/16 222/190/16 206/192/16 -f 221/193/16 206/192/16 216/194/16 -f 215/195/16 216/194/16 206/192/16 -f 440/196/16 438/197/16 439/198/16 -f 438/197/16 440/196/16 437/185/16 -f 208/199/27 438/200/27 212/201/27 -f 442/202/16 443/203/16 441/204/16 -f 448/205/22 445/206/22 447/207/22 -f 446/208/19 441/204/19 445/206/19 -f 447/209/2 441/204/2 443/210/2 -f 444/211/1 446/208/1 448/212/1 -f 451/213/19 450/214/19 449/215/19 -f 453/216/25 456/217/25 455/218/25 -f 449/215/16 454/219/16 453/216/16 -f 451/220/2 453/216/2 455/221/2 -f 454/219/1 452/222/1 456/223/1 -f 458/224/19 459/225/19 457/226/19 -f 464/227/25 461/228/25 463/229/25 -f 462/230/22 457/226/22 461/228/22 -f 459/231/2 461/228/2 457/226/2 -f 460/232/1 462/230/1 464/233/1 -f 467/234/16 466/235/16 465/236/16 -f 469/237/22 472/238/22 471/239/22 -f 465/236/25 470/240/25 469/237/25 -f 465/236/2 471/241/2 467/242/2 -f 472/243/1 466/235/1 468/244/1 -f 44/1/1 64/245/1 65/2/1 -f 38/4/1 60/12/1 72/5/1 -f 38/4/1 62/6/1 61/7/1 -f 42/9/1 63/14/1 64/10/1 -f 60/12/1 58/16/1 71/13/1 -f 40/8/1 61/7/1 63/14/1 -f 56/15/1 70/246/1 71/13/1 -f 56/17/1 54/21/1 69/18/1 -f 52/20/1 68/23/1 69/18/1 -f 50/22/1 67/25/1 68/23/1 -f 50/22/1 48/26/1 66/24/1 -f 46/3/1 65/2/1 66/24/1 -f 75/27/2 87/49/2 88/28/2 -f 83/30/2 82/247/2 94/31/2 -f 79/33/2 91/52/2 92/34/2 -f 77/36/2 76/248/2 88/37/2 -f 83/30/2 95/32/2 96/39/2 -f 74/41/2 86/48/2 85/42/2 -f 80/35/2 92/34/2 93/44/2 -f 77/36/2 89/38/2 90/46/2 -f 84/40/2 96/39/2 86/48/2 -f 73/43/2 85/42/2 87/49/2 -f 81/45/2 93/44/2 94/50/2 -f 79/33/2 78/47/2 90/46/2 -f 103/53/1 102/74/1 114/54/1 -f 99/56/1 111/76/1 112/57/1 -f 107/59/1 106/249/1 118/60/1 -f 103/53/1 115/55/1 116/62/1 -f 100/64/1 112/250/1 113/65/1 -f 107/59/1 119/61/1 120/67/1 -f 98/69/1 110/75/1 109/70/1 -f 105/72/1 104/63/1 116/62/1 -f 102/74/1 101/66/1 113/65/1 -f 108/68/1 120/67/1 110/75/1 -f 97/71/1 109/70/1 111/76/1 -f 106/77/1 105/72/1 117/73/1 -f 123/251/2 121/252/2 122/81/2 -f 122/81/2 132/253/2 131/79/2 -f 131/79/2 130/254/2 129/255/2 -f 129/255/2 128/256/2 131/79/2 -f 127/80/2 126/257/2 125/258/2 -f 125/258/2 124/259/2 123/251/2 -f 123/251/2 122/81/2 127/80/2 -f 131/79/2 128/256/2 127/80/2 -f 127/80/2 125/258/2 123/251/2 -f 165/82/3 189/260/3 201/83/3 -f 159/85/4 183/261/4 195/86/4 -f 168/88/5 192/262/5 204/89/5 -f 163/91/6 187/263/6 199/92/6 -f 162/94/7 186/264/7 198/95/7 -f 160/97/8 184/265/8 196/98/8 -f 158/100/9 182/266/9 194/101/9 -f 164/103/10 188/267/10 200/104/10 -f 166/106/11 190/268/11 202/107/11 -f 157/109/12 181/269/12 193/110/12 -f 161/112/13 185/270/13 197/113/13 -f 167/115/14 191/271/14 203/116/14 -f 87/118/15 147/272/15 135/119/15 -f 148/121/16 136/273/16 76/122/16 -f 149/124/17 137/274/17 77/125/17 -f 150/127/18 138/275/18 78/128/18 -f 79/130/19 91/276/19 151/131/19 -f 152/133/20 140/277/20 80/134/20 -f 153/136/21 141/278/21 81/137/21 -f 94/139/22 154/279/22 142/140/22 -f 83/142/23 95/280/23 155/143/23 -f 84/145/24 96/281/24 156/146/24 -f 74/148/25 86/282/25 146/149/25 -f 73/151/26 85/283/26 145/152/26 -f 209/163/27 433/284/27 436/164/27 -f 210/166/2 434/176/2 433/167/2 -f 205/178/28 435/285/28 434/179/28 -f 212/184/2 438/197/2 437/185/2 -f 211/187/28 437/286/28 440/188/28 -f 208/199/27 439/287/27 438/200/27 -f 442/202/16 444/288/16 443/203/16 -f 448/205/22 446/208/22 445/206/22 -f 446/208/19 442/202/19 441/204/19 -f 447/209/2 445/206/2 441/204/2 -f 444/211/1 442/202/1 446/208/1 -f 451/213/19 452/289/19 450/214/19 -f 453/216/25 454/219/25 456/217/25 -f 449/215/16 450/214/16 454/219/16 -f 451/220/2 449/215/2 453/216/2 -f 454/219/1 450/214/1 452/222/1 -f 458/224/19 460/290/19 459/225/19 -f 464/227/25 462/230/25 461/228/25 -f 462/230/22 458/224/22 457/226/22 -f 459/231/2 463/291/2 461/228/2 -f 460/232/1 458/224/1 462/230/1 -f 467/234/16 468/292/16 466/235/16 -f 469/237/22 470/240/22 472/238/22 -f 465/236/25 466/235/25 470/240/25 -f 465/236/2 469/237/2 471/241/2 -f 472/243/1 470/240/1 466/235/1 +f 20/1/1 9/2/1 10/3/1 +f 22/4/2 15/5/2 16/6/2 +f 20/1/1 10/3/1 19/7/1 +f 19/7/1 10/3/1 6/8/1 +f 10/3/1 1/9/1 6/8/1 +f 5/10/3 232/11/3 3/12/3 +f 6/13/4 229/14/4 5/15/4 +f 3/16/1 13/17/1 5/18/1 +f 5/18/1 13/17/1 24/19/1 +f 23/20/1 24/19/1 13/17/1 +f 13/17/1 14/21/1 23/20/1 +f 232/22/1 230/23/1 231/24/1 +f 230/23/1 232/22/1 229/14/1 +f 1/25/5 230/26/5 6/27/5 +f 22/4/2 16/6/2 21/28/2 +f 21/28/2 16/6/2 8/29/2 +f 16/6/2 4/30/2 8/29/2 +f 8/31/4 233/32/4 7/33/4 +f 7/34/5 236/35/5 2/36/5 +f 18/37/2 7/38/2 2/39/2 +f 17/40/2 18/37/2 2/39/2 +f 17/40/2 2/39/2 12/41/2 +f 11/42/2 12/41/2 2/39/2 +f 236/43/2 234/44/2 235/45/2 +f 234/44/2 236/43/2 233/32/2 +f 4/46/3 234/47/3 8/48/3 +f 246/49/6 264/50/6 265/51/6 +f 238/52/6 272/53/6 262/54/6 +f 238/52/6 261/55/6 240/56/6 +f 242/57/6 264/58/6 244/59/6 +f 260/60/6 271/61/6 272/53/6 +f 240/56/6 263/62/6 242/57/6 +f 258/63/6 270/64/6 271/61/6 +f 254/65/6 270/66/6 256/67/6 +f 252/68/6 269/69/6 254/65/6 +f 250/70/6 268/71/6 252/68/6 +f 250/70/6 266/72/6 267/73/6 +f 248/74/6 265/51/6 266/72/6 +f 276/75/4 287/76/4 288/77/4 +f 282/78/4 295/79/4 283/80/4 +f 280/81/4 291/82/4 292/83/4 +f 276/84/4 289/85/4 277/86/4 +f 283/80/4 296/87/4 284/88/4 +f 273/89/4 286/90/4 285/91/4 +f 281/92/4 292/83/4 293/93/4 +f 277/86/4 290/94/4 278/95/4 +f 284/88/4 286/90/4 274/96/4 +f 275/97/4 285/91/4 287/76/4 +f 282/98/4 293/93/4 294/99/4 +f 278/95/4 291/82/4 279/100/4 +f 303/101/6 314/102/6 315/103/6 +f 299/104/6 312/105/6 300/106/6 +f 307/107/6 318/108/6 319/109/6 +f 303/101/6 316/110/6 304/111/6 +f 301/112/6 312/113/6 313/114/6 +f 308/115/6 319/109/6 320/116/6 +f 298/117/6 309/118/6 297/119/6 +f 304/111/6 317/120/6 305/121/6 +f 302/122/6 313/114/6 314/102/6 +f 298/117/6 320/116/6 310/123/6 +f 297/119/6 311/124/6 299/104/6 +f 305/121/6 318/125/6 306/126/6 +f 331/127/4 324/128/4 323/129/4 +f 365/130/7 401/131/7 377/132/7 +f 359/133/8 395/134/8 371/135/8 +f 368/136/9 404/137/9 380/138/9 +f 363/139/10 399/140/10 375/141/10 +f 362/142/11 398/143/11 374/144/11 +f 360/145/12 396/146/12 372/147/12 +f 358/148/13 394/149/13 370/150/13 +f 364/151/14 400/152/14 376/153/14 +f 366/154/15 402/155/15 378/156/15 +f 357/157/16 393/158/16 369/159/16 +f 361/160/17 397/161/17 373/162/17 +f 367/163/18 403/164/18 379/165/18 +f 287/166/19 335/167/19 275/168/19 +f 348/169/2 276/170/2 288/171/2 +f 349/172/20 277/173/20 289/174/20 +f 350/175/21 278/176/21 290/177/21 +f 291/178/22 339/179/22 279/180/22 +f 352/181/23 280/182/23 292/183/23 +f 353/184/24 281/185/24 293/186/24 +f 294/187/1 342/188/1 282/189/1 +f 283/190/25 355/191/25 343/192/25 +f 284/193/26 356/194/26 344/195/26 +f 286/196/27 334/197/27 274/198/27 +f 273/199/28 345/200/28 333/201/28 +f 406/202/1 405/203/1 407/204/1 +f 412/205/2 411/206/2 409/207/2 +f 410/208/27 409/207/27 405/203/27 +f 407/209/6 405/203/6 409/207/6 +f 408/210/4 412/211/4 410/208/4 +f 415/212/27 413/213/27 414/214/27 +f 417/215/22 419/216/22 420/217/22 +f 413/213/1 417/215/1 418/218/1 +f 413/213/6 415/219/6 419/220/6 +f 418/218/4 420/221/4 416/222/4 +f 422/223/27 421/224/27 423/225/27 +f 428/226/22 427/227/22 425/228/22 +f 426/229/2 425/228/2 421/224/2 +f 427/230/6 423/231/6 421/224/6 +f 428/232/4 426/229/4 422/223/4 +f 431/233/1 429/234/1 430/235/1 +f 433/236/2 435/237/2 436/238/2 +f 429/234/22 433/236/22 434/239/22 +f 429/234/6 431/240/6 435/241/6 +f 434/239/4 436/242/4 432/243/4 +f 445/244/29 438/245/29 437/246/29 +f 446/247/30 440/248/30 438/245/30 +f 440/248/31 448/249/31 439/250/31 +f 448/249/32 437/246/32 439/250/32 +f 439/251/1 450/252/1 440/253/1 +f 450/252/1 444/254/1 440/253/1 +f 451/255/1 443/256/1 444/254/1 +f 452/257/1 439/251/1 443/256/1 +f 443/258/27 454/259/27 444/254/27 +f 454/259/27 442/260/27 444/254/27 +f 455/261/27 441/262/27 442/260/27 +f 456/263/27 443/258/27 441/262/27 +f 441/264/2 458/265/2 442/266/2 +f 442/266/2 459/267/2 438/268/2 +f 459/267/2 437/246/2 438/268/2 +f 460/269/2 441/264/2 437/246/2 +f 461/270/4 443/271/4 439/250/4 +f 462/272/4 441/264/4 443/271/4 +f 463/273/4 437/246/4 441/264/4 +f 464/274/4 439/250/4 437/246/4 +f 465/275/33 440/253/33 444/254/33 +f 466/276/34 438/277/34 440/253/34 +f 438/277/35 468/278/35 442/260/35 +f 468/278/36 444/254/36 442/260/36 +f 469/279/2 462/280/2 461/281/2 +f 472/282/27 461/283/27 464/284/27 +f 471/285/1 464/286/1 463/287/1 +f 470/288/22 463/289/22 462/290/22 +f 469/279/4 471/285/4 470/288/4 +f 474/291/37 481/292/37 473/293/37 +f 476/294/38 482/295/38 474/291/38 +f 476/294/39 484/296/39 483/297/39 +f 473/293/40 484/296/40 475/298/40 +f 476/299/2 485/300/2 475/301/2 +f 480/302/2 486/303/2 476/299/2 +f 480/302/2 488/304/2 487/305/2 +f 475/301/2 488/304/2 479/306/2 +f 480/302/22 489/307/22 479/308/22 +f 478/309/22 490/310/22 480/302/22 +f 478/309/22 492/311/22 491/312/22 +f 477/313/22 489/307/22 492/311/22 +f 478/314/1 493/315/1 477/316/1 +f 474/317/1 494/318/1 478/314/1 +f 474/317/1 496/319/1 495/320/1 +f 477/316/1 496/319/1 473/293/1 +f 479/321/6 497/322/6 475/298/6 +f 477/316/6 498/323/6 479/321/6 +f 473/293/6 499/324/6 477/316/6 +f 475/298/6 500/325/6 473/293/6 +f 476/299/41 501/326/41 480/302/41 +f 476/299/42 503/327/42 502/328/42 +f 474/329/43 504/330/43 503/327/43 +f 480/302/44 504/330/44 478/309/44 +f 498/331/1 505/332/1 497/333/1 +f 497/334/22 508/335/22 500/336/22 +f 500/337/2 507/338/2 499/339/2 +f 499/340/27 506/341/27 498/342/27 +f 507/338/6 505/332/6 506/341/6 +f 5/10/3 229/343/3 232/11/3 +f 6/13/4 230/23/4 229/14/4 +f 1/25/5 231/344/5 230/26/5 +f 8/31/4 234/44/4 233/32/4 +f 7/34/5 233/345/5 236/35/5 +f 4/46/3 235/346/3 234/47/3 +f 246/49/6 244/347/6 264/50/6 +f 238/52/6 260/60/6 272/53/6 +f 238/52/6 262/54/6 261/55/6 +f 242/57/6 263/62/6 264/58/6 +f 260/60/6 258/63/6 271/61/6 +f 240/56/6 261/55/6 263/62/6 +f 258/63/6 256/348/6 270/64/6 +f 254/65/6 269/69/6 270/66/6 +f 252/68/6 268/71/6 269/69/6 +f 250/70/6 267/73/6 268/71/6 +f 250/70/6 248/74/6 266/72/6 +f 248/74/6 246/49/6 265/51/6 +f 276/75/4 275/97/4 287/76/4 +f 282/78/4 294/349/4 295/79/4 +f 280/81/4 279/100/4 291/82/4 +f 276/84/4 288/350/4 289/85/4 +f 283/80/4 295/79/4 296/87/4 +f 273/89/4 274/96/4 286/90/4 +f 281/92/4 280/81/4 292/83/4 +f 277/86/4 289/85/4 290/94/4 +f 284/88/4 296/87/4 286/90/4 +f 275/97/4 273/89/4 285/91/4 +f 282/98/4 281/92/4 293/93/4 +f 278/95/4 290/94/4 291/82/4 +f 303/101/6 302/122/6 314/102/6 +f 299/104/6 311/124/6 312/105/6 +f 307/107/6 306/351/6 318/108/6 +f 303/101/6 315/103/6 316/110/6 +f 301/112/6 300/352/6 312/113/6 +f 308/115/6 307/107/6 319/109/6 +f 298/117/6 310/123/6 309/118/6 +f 304/111/6 316/110/6 317/120/6 +f 302/122/6 301/112/6 313/114/6 +f 298/117/6 308/115/6 320/116/6 +f 297/119/6 309/118/6 311/124/6 +f 305/121/6 317/120/6 318/125/6 +f 323/129/4 321/353/4 332/354/4 +f 322/355/4 332/354/4 321/353/4 +f 331/127/4 330/356/4 324/128/4 +f 329/357/4 328/358/4 326/359/4 +f 327/360/4 326/359/4 328/358/4 +f 325/361/4 324/128/4 330/356/4 +f 323/129/4 332/354/4 331/127/4 +f 330/356/4 329/357/4 325/361/4 +f 326/359/4 325/361/4 329/357/4 +f 365/130/7 389/362/7 401/131/7 +f 359/133/8 383/363/8 395/134/8 +f 368/136/9 392/364/9 404/137/9 +f 363/139/10 387/365/10 399/140/10 +f 362/142/11 386/366/11 398/143/11 +f 360/145/12 384/367/12 396/146/12 +f 358/148/13 382/368/13 394/149/13 +f 364/151/14 388/369/14 400/152/14 +f 366/154/15 390/370/15 402/155/15 +f 357/157/16 381/371/16 393/158/16 +f 361/160/17 385/372/17 397/161/17 +f 367/163/18 391/373/18 403/164/18 +f 287/166/19 347/374/19 335/167/19 +f 348/169/2 336/375/2 276/170/2 +f 349/172/20 337/376/20 277/173/20 +f 350/175/21 338/377/21 278/176/21 +f 291/178/22 351/378/22 339/179/22 +f 352/181/23 340/379/23 280/182/23 +f 353/184/24 341/380/24 281/185/24 +f 294/187/1 354/381/1 342/188/1 +f 283/190/25 295/382/25 355/191/25 +f 284/193/26 296/383/26 356/194/26 +f 286/196/27 346/384/27 334/197/27 +f 273/199/28 285/385/28 345/200/28 +f 406/202/1 407/204/1 408/386/1 +f 412/205/2 409/207/2 410/208/2 +f 410/208/27 405/203/27 406/202/27 +f 407/209/6 409/207/6 411/387/6 +f 408/210/4 410/208/4 406/202/4 +f 415/212/27 414/214/27 416/388/27 +f 417/215/22 420/217/22 418/218/22 +f 413/213/1 418/218/1 414/214/1 +f 413/213/6 419/220/6 417/215/6 +f 418/218/4 416/222/4 414/214/4 +f 422/223/27 423/225/27 424/389/27 +f 428/226/22 425/228/22 426/229/22 +f 426/229/2 421/224/2 422/223/2 +f 427/230/6 421/224/6 425/228/6 +f 428/232/4 422/223/4 424/390/4 +f 431/233/1 430/235/1 432/391/1 +f 433/236/2 436/238/2 434/239/2 +f 429/234/22 434/239/22 430/235/22 +f 429/234/6 435/241/6 433/236/6 +f 434/239/4 432/243/4 430/235/4 +f 445/244/45 446/247/45 438/245/45 +f 446/247/46 447/392/46 440/248/46 +f 440/248/31 447/392/31 448/249/31 +f 448/249/32 445/244/32 437/246/32 +f 439/251/1 449/393/1 450/252/1 +f 450/252/1 451/255/1 444/254/1 +f 451/255/1 452/257/1 443/256/1 +f 452/257/1 449/393/1 439/251/1 +f 443/258/27 453/394/27 454/259/27 +f 454/259/27 455/261/27 442/260/27 +f 455/261/27 456/263/27 441/262/27 +f 456/263/27 453/394/27 443/258/27 +f 441/264/2 457/395/2 458/265/2 +f 442/266/2 458/265/2 459/267/2 +f 459/267/2 460/269/2 437/246/2 +f 460/269/2 457/395/2 441/264/2 +f 461/270/4 462/272/4 443/271/4 +f 462/272/4 463/273/4 441/264/4 +f 463/273/4 464/274/4 437/246/4 +f 464/274/4 461/270/4 439/250/4 +f 465/275/33 466/276/33 440/253/33 +f 466/276/34 467/396/34 438/277/34 +f 438/277/35 467/396/35 468/278/35 +f 468/278/36 465/275/36 444/254/36 +f 469/279/2 470/288/2 462/280/2 +f 472/282/27 469/279/27 461/283/27 +f 471/285/1 472/282/1 464/286/1 +f 470/288/22 471/285/22 463/289/22 +f 469/279/4 472/282/4 471/285/4 +f 474/291/47 482/295/47 481/292/47 +f 476/294/38 483/297/38 482/295/38 +f 476/294/48 475/298/48 484/296/48 +f 473/293/40 481/292/40 484/296/40 +f 476/299/2 486/303/2 485/300/2 +f 480/302/2 487/305/2 486/303/2 +f 480/302/2 479/306/2 488/304/2 +f 475/301/2 485/300/2 488/304/2 +f 480/302/22 490/310/22 489/307/22 +f 478/309/22 491/312/22 490/310/22 +f 478/309/22 477/313/22 492/311/22 +f 477/313/22 479/308/22 489/307/22 +f 478/314/1 494/318/1 493/315/1 +f 474/317/1 495/320/1 494/318/1 +f 474/317/1 473/293/1 496/319/1 +f 477/316/1 493/315/1 496/319/1 +f 479/321/6 498/323/6 497/322/6 +f 477/316/6 499/324/6 498/323/6 +f 473/293/6 500/325/6 499/324/6 +f 475/298/6 497/322/6 500/325/6 +f 476/299/41 502/328/41 501/326/41 +f 476/299/42 474/329/42 503/327/42 +f 474/329/43 478/309/43 504/330/43 +f 480/302/44 501/326/44 504/330/44 +f 498/331/1 506/341/1 505/332/1 +f 497/334/22 505/332/22 508/335/22 +f 500/337/2 508/335/2 507/338/2 +f 499/340/27 507/338/27 506/341/27 +f 507/338/6 508/335/6 505/332/6 s 1 -f 38/4/29 39/293/30 37/294/31 -f 40/8/32 41/295/33 39/293/30 -f 42/9/34 43/296/35 41/295/33 -f 44/1/36 45/297/37 43/298/35 -f 46/3/38 47/299/39 45/297/37 -f 48/26/40 49/300/41 47/299/39 -f 50/22/42 51/301/43 49/300/41 -f 51/301/43 54/21/44 53/302/45 -f 54/21/44 55/303/46 53/302/45 -f 56/15/47 57/304/48 55/305/46 -f 57/304/48 60/12/49 59/306/50 -f 60/12/49 37/294/31 59/306/50 -f 63/14/51 76/29/52 64/10/53 -f 70/246/54 83/30/55 71/13/56 -f 67/25/57 80/35/58 68/23/59 -f 64/245/53 77/36/60 65/2/61 -f 71/13/56 84/40/62 72/5/63 -f 62/6/64 73/43/65 61/7/66 -f 68/23/59 81/45/67 69/18/68 -f 65/2/61 78/47/69 66/24/70 -f 72/5/63 74/41/71 62/6/64 -f 61/7/66 75/27/72 63/14/51 -f 69/18/68 82/51/73 70/19/54 -f 66/24/70 79/33/74 67/25/57 -f 90/46/75 103/53/76 91/52/77 -f 87/49/78 100/58/79 88/28/80 -f 94/31/81 107/59/82 95/32/83 -f 91/52/77 104/63/84 92/34/85 -f 88/37/80 101/66/86 89/38/87 -f 95/32/83 108/68/88 96/39/89 -f 86/48/90 97/71/91 85/42/92 -f 92/34/85 105/72/93 93/44/94 -f 89/38/87 102/74/95 90/46/75 -f 96/39/89 98/69/96 86/48/90 -f 85/42/92 99/56/97 87/49/78 -f 93/44/94 106/77/98 94/50/81 -f 117/73/68 130/307/99 118/78/54 -f 115/55/57 126/308/100 127/309/101 -f 111/76/51 124/310/102 112/57/53 -f 118/60/54 131/311/103 119/61/56 -f 115/55/57 128/312/104 116/62/59 -f 112/250/53 125/313/105 113/65/61 -f 120/67/63 131/311/103 132/314/106 -f 110/75/64 121/315/107 109/70/66 -f 116/62/59 129/316/108 117/73/68 -f 113/65/61 126/308/100 114/54/70 -f 120/67/63 122/317/109 110/75/64 -f 109/70/66 123/318/110 111/76/51 -f 297/319/111 224/320/112 381/321/113 -f 348/322/114 207/323/115 246/324/116 -f 296/325/117 210/326/118 209/327/119 -f 399/328/120 212/329/121 280/330/122 -f 314/331/123 206/332/124 229/333/125 -f 216/334/126 314/331/123 313/335/127 -f 218/336/128 348/322/114 347/337/129 -f 347/337/129 227/338/130 218/336/128 -f 381/321/113 223/339/131 382/340/132 -f 228/341/133 416/342/134 415/343/135 -f 382/340/132 210/326/118 279/344/136 -f 398/345/137 211/346/138 222/347/139 -f 398/345/137 264/348/140 263/349/141 -f 396/350/142 264/348/140 397/351/143 -f 396/350/142 266/352/144 265/353/145 -f 394/354/146 266/352/144 395/355/147 -f 394/354/146 268/356/148 267/357/149 -f 392/358/150 268/356/148 393/359/151 -f 392/358/150 270/360/152 269/361/153 -f 390/362/154 270/360/152 391/363/155 -f 390/362/154 272/364/156 271/365/157 -f 388/366/158 272/364/156 389/367/159 -f 388/366/158 274/368/160 273/369/161 -f 386/370/162 274/368/160 387/371/163 -f 386/370/162 276/372/164 275/373/165 -f 384/374/166 276/372/164 385/375/167 -f 384/374/166 278/376/168 277/377/169 -f 382/340/132 278/376/168 383/378/170 -f 225/379/171 432/380/172 226/381/173 -f 400/382/174 432/380/172 399/328/120 -f 400/382/174 430/383/175 431/384/176 -f 402/385/177 430/383/175 401/386/178 -f 402/385/177 428/387/179 429/388/180 -f 404/389/181 428/387/179 403/390/182 -f 404/389/181 426/391/183 427/392/184 -f 406/393/185 426/391/183 405/394/186 -f 406/393/185 424/395/187 425/396/188 -f 408/397/189 424/395/187 407/398/190 -f 408/397/189 422/399/191 423/400/192 -f 410/401/193 422/399/191 409/402/194 -f 410/401/193 420/403/195 421/404/196 -f 412/405/197 420/403/195 411/406/198 -f 412/405/197 418/407/199 419/408/200 -f 414/409/201 418/407/199 413/410/202 -f 414/409/201 416/342/134 417/411/203 -f 365/412/204 222/347/139 221/413/205 -f 365/412/204 397/351/143 398/345/137 -f 367/414/206 397/351/143 366/415/207 -f 367/414/206 395/355/147 396/350/142 -f 369/416/208 395/355/147 368/417/209 -f 369/416/208 393/359/151 394/354/146 -f 371/418/210 393/359/151 370/419/211 -f 371/418/210 391/363/155 392/358/150 -f 373/420/212 391/363/155 372/421/213 -f 373/420/212 389/367/159 390/362/154 -f 375/422/214 389/367/159 374/423/215 -f 375/422/214 387/371/163 388/366/158 -f 377/424/216 387/371/163 376/425/217 -f 377/424/216 385/375/167 386/370/162 -f 379/426/218 385/375/167 378/427/219 -f 379/426/218 383/378/170 384/374/166 -f 381/321/113 383/378/170 380/428/220 -f 226/381/173 331/429/221 219/430/222 -f 331/429/221 431/384/176 332/431/223 -f 431/384/176 333/432/224 332/431/223 -f 333/432/224 429/388/180 334/433/225 -f 429/388/180 335/434/226 334/433/225 -f 335/434/226 427/392/184 336/435/227 -f 427/392/184 337/436/228 336/435/227 -f 337/436/228 425/396/188 338/437/229 -f 425/396/188 339/438/230 338/437/229 -f 339/438/230 423/400/192 340/439/231 -f 423/400/192 341/440/232 340/439/231 -f 341/440/232 421/404/196 342/441/233 -f 421/404/196 343/442/234 342/441/233 -f 343/442/234 419/408/200 344/443/235 -f 419/408/200 345/444/236 344/443/235 -f 345/444/236 417/411/203 346/445/237 -f 417/411/203 347/337/129 346/445/237 -f 219/430/222 364/446/238 220/447/239 -f 332/431/223 364/446/238 331/429/221 -f 332/431/223 362/448/240 363/449/241 -f 334/433/225 362/448/240 333/432/224 -f 334/433/225 360/450/242 361/451/243 -f 336/435/227 360/450/242 335/434/226 -f 336/435/227 358/452/244 359/453/245 -f 338/437/229 358/452/244 337/436/228 -f 338/437/229 356/454/246 357/455/247 -f 340/439/231 356/454/246 339/438/230 -f 340/439/231 354/456/248 355/457/249 -f 342/441/233 354/456/248 341/440/232 -f 342/441/233 352/458/250 353/459/251 -f 344/443/235 352/458/250 343/442/234 -f 344/443/235 350/460/252 351/461/253 -f 346/445/237 350/460/252 345/444/236 -f 346/445/237 348/322/114 349/462/254 -f 213/463/255 330/464/256 214/465/257 -f 298/466/258 330/464/256 297/319/111 -f 298/466/258 328/467/259 329/468/260 -f 300/469/261 328/467/259 299/470/262 -f 300/469/261 326/471/263 327/472/264 -f 302/473/265 326/471/263 301/474/266 -f 302/473/265 324/475/267 325/476/268 -f 304/477/269 324/475/267 303/478/270 -f 304/477/269 322/479/271 323/480/272 -f 306/481/273 322/479/271 305/482/274 -f 306/481/273 320/483/275 321/484/276 -f 308/485/277 320/483/275 307/486/278 -f 308/485/277 318/487/279 319/488/280 -f 310/489/281 318/487/279 309/490/282 -f 310/489/281 316/491/283 317/492/284 -f 312/493/285 316/491/283 311/494/286 -f 312/493/285 314/331/123 315/495/287 -f 205/496/288 330/464/256 245/497/289 -f 330/464/256 244/498/290 245/497/289 -f 244/498/290 328/467/259 243/499/291 -f 328/467/259 242/500/292 243/499/291 -f 242/500/292 326/471/263 241/501/293 -f 326/471/263 240/502/294 241/501/293 -f 240/502/294 324/475/267 239/503/295 -f 324/475/267 238/504/296 239/503/295 -f 238/504/296 322/479/271 237/505/25 -f 322/479/271 236/506/297 237/505/25 -f 236/506/297 320/483/275 235/507/298 -f 320/483/275 234/508/299 235/507/298 -f 234/508/299 318/487/279 233/509/300 -f 318/487/279 232/510/301 233/509/300 -f 232/510/301 316/491/283 231/511/302 -f 316/491/283 230/512/303 231/511/302 -f 230/512/303 314/331/123 229/333/125 -f 415/343/135 209/327/119 228/341/133 -f 415/343/135 295/513/304 296/325/117 -f 413/410/202 295/513/304 414/409/201 -f 413/410/202 293/514/305 294/515/306 -f 411/406/198 293/514/305 412/405/197 -f 411/406/198 291/516/307 292/517/308 -f 409/402/194 291/516/307 410/401/193 -f 409/402/194 289/518/309 290/519/310 -f 407/398/190 289/518/309 408/397/189 -f 407/398/190 287/520/311 288/521/312 -f 405/394/186 287/520/311 406/393/185 -f 405/394/186 285/522/313 286/523/314 -f 403/390/182 285/522/313 404/389/181 -f 403/390/182 283/524/315 284/525/316 -f 401/386/178 283/524/315 402/385/177 -f 401/386/178 281/526/317 282/527/318 -f 399/328/120 281/526/317 400/382/174 -f 211/346/138 280/330/122 212/329/121 -f 280/330/122 264/348/140 281/526/317 -f 264/348/140 282/527/318 281/526/317 -f 282/527/318 266/352/144 283/524/315 -f 266/352/144 284/525/316 283/524/315 -f 284/525/316 268/356/148 285/522/313 -f 268/356/148 286/523/314 285/522/313 -f 286/523/314 270/360/152 287/520/311 -f 270/360/152 288/521/312 287/520/311 -f 288/521/312 272/364/156 289/518/309 -f 272/364/156 290/519/310 289/518/309 -f 290/519/310 274/368/160 291/516/307 -f 274/368/160 292/517/308 291/516/307 -f 292/517/308 276/372/164 293/514/305 -f 276/372/164 294/515/306 293/514/305 -f 294/515/306 278/376/168 295/513/304 -f 278/376/168 296/325/117 295/513/304 -f 208/528/319 364/446/238 262/529/320 -f 364/446/238 261/530/321 262/529/320 -f 261/530/321 362/448/240 260/531/322 -f 362/448/240 259/532/323 260/531/322 -f 259/532/323 360/450/242 258/533/324 -f 360/450/242 257/534/325 258/533/324 -f 257/534/325 358/452/244 256/535/326 -f 358/452/244 255/536/327 256/535/326 -f 255/536/327 356/454/246 254/537/19 -f 356/454/246 253/538/328 254/537/19 -f 253/538/328 354/456/248 252/539/329 -f 354/456/248 251/540/330 252/539/329 -f 251/540/330 352/458/250 250/541/331 -f 352/458/250 249/542/332 250/541/331 -f 249/542/332 350/460/252 248/543/333 -f 350/460/252 247/544/334 248/543/333 -f 247/544/334 348/322/114 246/324/116 -f 221/413/205 313/335/127 365/412/204 -f 313/335/127 366/415/207 365/412/204 -f 366/415/207 311/494/286 367/414/206 -f 311/494/286 368/417/209 367/414/206 -f 368/417/209 309/490/282 369/416/208 -f 309/490/282 370/419/211 369/416/208 -f 370/419/211 307/486/278 371/418/210 -f 307/486/278 372/421/213 371/418/210 -f 372/421/213 305/482/274 373/420/212 -f 305/482/274 374/423/215 373/420/212 -f 374/423/215 303/478/270 375/422/214 -f 303/478/270 376/425/217 375/422/214 -f 376/425/217 301/474/266 377/424/216 -f 301/474/266 378/427/219 377/424/216 -f 378/427/219 299/470/262 379/426/218 -f 299/470/262 380/428/220 379/426/218 -f 380/428/220 297/319/111 381/321/113 -f 38/4/29 40/8/32 39/293/30 -f 40/8/32 42/9/34 41/295/33 -f 42/9/34 44/11/36 43/296/35 -f 44/1/36 46/3/38 45/297/37 -f 46/3/38 48/26/40 47/299/39 -f 48/26/40 50/22/42 49/300/41 -f 50/22/42 52/20/335 51/301/43 -f 51/301/43 52/20/335 54/21/44 -f 54/21/44 56/17/47 55/303/46 -f 56/15/47 58/16/336 57/304/48 -f 57/304/48 58/16/336 60/12/49 -f 60/12/49 38/4/29 37/294/31 -f 63/14/51 75/27/72 76/29/52 -f 70/246/54 82/247/73 83/30/55 -f 67/25/57 79/33/74 80/35/58 -f 64/245/53 76/248/52 77/36/60 -f 71/13/56 83/30/55 84/40/62 -f 62/6/64 74/41/71 73/43/65 -f 68/23/59 80/35/58 81/45/67 -f 65/2/61 77/36/60 78/47/69 -f 72/5/63 84/40/62 74/41/71 -f 61/7/66 73/43/65 75/27/72 -f 69/18/68 81/45/67 82/51/73 -f 66/24/70 78/47/69 79/33/74 -f 90/46/75 102/74/95 103/53/76 -f 87/49/78 99/56/97 100/58/79 -f 94/31/81 106/249/98 107/59/82 -f 91/52/77 103/53/76 104/63/84 -f 88/37/80 100/64/79 101/66/86 -f 95/32/83 107/59/82 108/68/88 -f 86/48/90 98/69/96 97/71/91 -f 92/34/85 104/63/84 105/72/93 -f 89/38/87 101/66/86 102/74/95 -f 96/39/89 108/68/88 98/69/96 -f 85/42/92 97/71/91 99/56/97 -f 93/44/94 105/72/93 106/77/98 -f 117/73/68 129/316/108 130/307/99 -f 115/55/57 114/54/70 126/308/100 -f 111/76/51 123/318/110 124/310/102 -f 118/60/54 130/545/99 131/311/103 -f 115/55/57 127/309/101 128/312/104 -f 112/250/53 124/546/102 125/313/105 -f 120/67/63 119/61/56 131/311/103 -f 110/75/64 122/317/109 121/315/107 -f 116/62/59 128/312/104 129/316/108 -f 113/65/61 125/313/105 126/308/100 -f 120/67/63 132/314/106 122/317/109 -f 109/70/66 121/315/107 123/318/110 -f 297/319/111 213/463/255 224/320/112 -f 348/322/114 217/547/337 207/323/115 -f 296/325/117 279/344/136 210/326/118 -f 399/328/120 225/379/171 212/329/121 -f 314/331/123 215/548/338 206/332/124 -f 216/334/126 215/548/338 314/331/123 -f 218/336/128 217/547/337 348/322/114 -f 347/337/129 416/342/134 227/338/130 -f 381/321/113 224/320/112 223/339/131 -f 228/341/133 227/338/130 416/342/134 -f 382/340/132 223/339/131 210/326/118 -f 398/345/137 263/349/141 211/346/138 -f 398/345/137 397/351/143 264/348/140 -f 396/350/142 265/353/145 264/348/140 -f 396/350/142 395/355/147 266/352/144 -f 394/354/146 267/357/149 266/352/144 -f 394/354/146 393/359/151 268/356/148 -f 392/358/150 269/361/153 268/356/148 -f 392/358/150 391/363/155 270/360/152 -f 390/362/154 271/365/157 270/360/152 -f 390/362/154 389/367/159 272/364/156 -f 388/366/158 273/369/161 272/364/156 -f 388/366/158 387/371/163 274/368/160 -f 386/370/162 275/373/165 274/368/160 -f 386/370/162 385/375/167 276/372/164 -f 384/374/166 277/377/169 276/372/164 -f 384/374/166 383/378/170 278/376/168 -f 382/340/132 279/344/136 278/376/168 -f 225/379/171 399/328/120 432/380/172 -f 400/382/174 431/384/176 432/380/172 -f 400/382/174 401/386/178 430/383/175 -f 402/385/177 429/388/180 430/383/175 -f 402/385/177 403/390/182 428/387/179 -f 404/389/181 427/392/184 428/387/179 -f 404/389/181 405/394/186 426/391/183 -f 406/393/185 425/396/188 426/391/183 -f 406/393/185 407/398/190 424/395/187 -f 408/397/189 423/400/192 424/395/187 -f 408/397/189 409/402/194 422/399/191 -f 410/401/193 421/404/196 422/399/191 -f 410/401/193 411/406/198 420/403/195 -f 412/405/197 419/408/200 420/403/195 -f 412/405/197 413/410/202 418/407/199 -f 414/409/201 417/411/203 418/407/199 -f 414/409/201 415/343/135 416/342/134 -f 365/412/204 398/345/137 222/347/139 -f 365/412/204 366/415/207 397/351/143 -f 367/414/206 396/350/142 397/351/143 -f 367/414/206 368/417/209 395/355/147 -f 369/416/208 394/354/146 395/355/147 -f 369/416/208 370/419/211 393/359/151 -f 371/418/210 392/358/150 393/359/151 -f 371/418/210 372/421/213 391/363/155 -f 373/420/212 390/362/154 391/363/155 -f 373/420/212 374/423/215 389/367/159 -f 375/422/214 388/366/158 389/367/159 -f 375/422/214 376/425/217 387/371/163 -f 377/424/216 386/370/162 387/371/163 -f 377/424/216 378/427/219 385/375/167 -f 379/426/218 384/374/166 385/375/167 -f 379/426/218 380/428/220 383/378/170 -f 381/321/113 382/340/132 383/378/170 -f 226/381/173 432/380/172 331/429/221 -f 331/429/221 432/380/172 431/384/176 -f 431/384/176 430/383/175 333/432/224 -f 333/432/224 430/383/175 429/388/180 -f 429/388/180 428/387/179 335/434/226 -f 335/434/226 428/387/179 427/392/184 -f 427/392/184 426/391/183 337/436/228 -f 337/436/228 426/391/183 425/396/188 -f 425/396/188 424/395/187 339/438/230 -f 339/438/230 424/395/187 423/400/192 -f 423/400/192 422/399/191 341/440/232 -f 341/440/232 422/399/191 421/404/196 -f 421/404/196 420/403/195 343/442/234 -f 343/442/234 420/403/195 419/408/200 -f 419/408/200 418/407/199 345/444/236 -f 345/444/236 418/407/199 417/411/203 -f 417/411/203 416/342/134 347/337/129 -f 219/430/222 331/429/221 364/446/238 -f 332/431/223 363/449/241 364/446/238 -f 332/431/223 333/432/224 362/448/240 -f 334/433/225 361/451/243 362/448/240 -f 334/433/225 335/434/226 360/450/242 -f 336/435/227 359/453/245 360/450/242 -f 336/435/227 337/436/228 358/452/244 -f 338/437/229 357/455/247 358/452/244 -f 338/437/229 339/438/230 356/454/246 -f 340/439/231 355/457/249 356/454/246 -f 340/439/231 341/440/232 354/456/248 -f 342/441/233 353/459/251 354/456/248 -f 342/441/233 343/442/234 352/458/250 -f 344/443/235 351/461/253 352/458/250 -f 344/443/235 345/444/236 350/460/252 -f 346/445/237 349/462/254 350/460/252 -f 346/445/237 347/337/129 348/322/114 -f 213/463/255 297/319/111 330/464/256 -f 298/466/258 329/468/260 330/464/256 -f 298/466/258 299/470/262 328/467/259 -f 300/469/261 327/472/264 328/467/259 -f 300/469/261 301/474/266 326/471/263 -f 302/473/265 325/476/268 326/471/263 -f 302/473/265 303/478/270 324/475/267 -f 304/477/269 323/480/272 324/475/267 -f 304/477/269 305/482/274 322/479/271 -f 306/481/273 321/484/276 322/479/271 -f 306/481/273 307/486/278 320/483/275 -f 308/485/277 319/488/280 320/483/275 -f 308/485/277 309/490/282 318/487/279 -f 310/489/281 317/492/284 318/487/279 -f 310/489/281 311/494/286 316/491/283 -f 312/493/285 315/495/287 316/491/283 -f 312/493/285 313/335/127 314/331/123 -f 205/496/288 214/465/257 330/464/256 -f 330/464/256 329/468/260 244/498/290 -f 244/498/290 329/468/260 328/467/259 -f 328/467/259 327/472/264 242/500/292 -f 242/500/292 327/472/264 326/471/263 -f 326/471/263 325/476/268 240/502/294 -f 240/502/294 325/476/268 324/475/267 -f 324/475/267 323/480/272 238/504/296 -f 238/504/296 323/480/272 322/479/271 -f 322/479/271 321/484/276 236/506/297 -f 236/506/297 321/484/276 320/483/275 -f 320/483/275 319/488/280 234/508/299 -f 234/508/299 319/488/280 318/487/279 -f 318/487/279 317/492/284 232/510/301 -f 232/510/301 317/492/284 316/491/283 -f 316/491/283 315/495/287 230/512/303 -f 230/512/303 315/495/287 314/331/123 -f 415/343/135 296/325/117 209/327/119 -f 415/343/135 414/409/201 295/513/304 -f 413/410/202 294/515/306 295/513/304 -f 413/410/202 412/405/197 293/514/305 -f 411/406/198 292/517/308 293/514/305 -f 411/406/198 410/401/193 291/516/307 -f 409/402/194 290/519/310 291/516/307 -f 409/402/194 408/397/189 289/518/309 -f 407/398/190 288/521/312 289/518/309 -f 407/398/190 406/393/185 287/520/311 -f 405/394/186 286/523/314 287/520/311 -f 405/394/186 404/389/181 285/522/313 -f 403/390/182 284/525/316 285/522/313 -f 403/390/182 402/385/177 283/524/315 -f 401/386/178 282/527/318 283/524/315 -f 401/386/178 400/382/174 281/526/317 -f 399/328/120 280/330/122 281/526/317 -f 211/346/138 263/349/141 280/330/122 -f 280/330/122 263/349/141 264/348/140 -f 264/348/140 265/353/145 282/527/318 -f 282/527/318 265/353/145 266/352/144 -f 266/352/144 267/357/149 284/525/316 -f 284/525/316 267/357/149 268/356/148 -f 268/356/148 269/361/153 286/523/314 -f 286/523/314 269/361/153 270/360/152 -f 270/360/152 271/365/157 288/521/312 -f 288/521/312 271/365/157 272/364/156 -f 272/364/156 273/369/161 290/519/310 -f 290/519/310 273/369/161 274/368/160 -f 274/368/160 275/373/165 292/517/308 -f 292/517/308 275/373/165 276/372/164 -f 276/372/164 277/377/169 294/515/306 -f 294/515/306 277/377/169 278/376/168 -f 278/376/168 279/344/136 296/325/117 -f 208/528/319 220/447/239 364/446/238 -f 364/446/238 363/449/241 261/530/321 -f 261/530/321 363/449/241 362/448/240 -f 362/448/240 361/451/243 259/532/323 -f 259/532/323 361/451/243 360/450/242 -f 360/450/242 359/453/245 257/534/325 -f 257/534/325 359/453/245 358/452/244 -f 358/452/244 357/455/247 255/536/327 -f 255/536/327 357/455/247 356/454/246 -f 356/454/246 355/457/249 253/538/328 -f 253/538/328 355/457/249 354/456/248 -f 354/456/248 353/459/251 251/540/330 -f 251/540/330 353/459/251 352/458/250 -f 352/458/250 351/461/253 249/542/332 -f 249/542/332 351/461/253 350/460/252 -f 350/460/252 349/462/254 247/544/334 -f 247/544/334 349/462/254 348/322/114 -f 221/413/205 216/334/126 313/335/127 -f 313/335/127 312/493/285 366/415/207 -f 366/415/207 312/493/285 311/494/286 -f 311/494/286 310/489/281 368/417/209 -f 368/417/209 310/489/281 309/490/282 -f 309/490/282 308/485/277 370/419/211 -f 370/419/211 308/485/277 307/486/278 -f 307/486/278 306/481/273 372/421/213 -f 372/421/213 306/481/273 305/482/274 -f 305/482/274 304/477/269 374/423/215 -f 374/423/215 304/477/269 303/478/270 -f 303/478/270 302/473/265 376/425/217 -f 376/425/217 302/473/265 301/474/266 -f 301/474/266 300/469/261 378/427/219 -f 378/427/219 300/469/261 299/470/262 -f 299/470/262 298/466/258 380/428/220 -f 380/428/220 298/466/258 297/319/111 -usemtl None_life_is_grim2.png.001 -s off -f 9/549/339 2/550/339 1/551/339 -f 10/552/340 4/553/340 2/550/340 -f 4/553/341 12/554/341 3/555/341 -f 12/554/342 1/551/342 3/555/342 -f 13/556/22 4/557/22 3/558/22 -f 14/559/22 8/560/22 4/557/22 -f 15/561/22 7/562/22 8/560/22 -f 16/563/22 3/558/22 7/562/22 -f 17/564/25 8/560/25 7/565/25 -f 8/560/25 19/566/25 6/567/25 -f 19/566/25 5/568/25 6/567/25 -f 5/568/25 17/564/25 7/565/25 -f 21/569/16 6/570/16 5/571/16 -f 22/572/16 2/573/16 6/570/16 -f 23/574/16 1/551/16 2/573/16 -f 24/575/16 5/571/16 1/551/16 -f 25/576/2 7/577/2 3/555/2 -f 26/578/2 5/571/2 7/577/2 -f 27/579/2 1/551/2 5/571/2 -f 28/580/2 3/555/2 1/551/2 -f 29/581/343 4/557/343 8/560/343 -f 30/582/344 2/583/344 4/557/344 -f 2/583/345 32/584/345 6/567/345 -f 6/567/346 29/581/346 8/560/346 -f 33/585/16 26/586/16 25/587/16 -f 36/588/25 25/589/25 28/590/25 -f 35/591/22 28/592/22 27/593/22 -f 34/594/19 27/595/19 26/596/19 -f 33/585/2 35/591/2 34/594/2 -f 9/549/347 10/552/347 2/550/347 -f 10/552/348 11/597/348 4/553/348 -f 4/553/349 11/597/349 12/554/349 -f 12/554/342 9/549/342 1/551/342 -f 13/556/22 14/559/22 4/557/22 -f 14/559/22 15/561/22 8/560/22 -f 15/561/22 16/563/22 7/562/22 -f 16/563/22 13/556/22 3/558/22 -f 17/564/25 18/598/25 8/560/25 -f 8/560/25 18/598/25 19/566/25 -f 19/566/25 20/599/25 5/568/25 -f 5/568/25 20/599/25 17/564/25 -f 21/569/16 22/572/16 6/570/16 -f 22/572/16 23/574/16 2/573/16 -f 23/574/16 24/575/16 1/551/16 -f 24/575/16 21/569/16 5/571/16 -f 25/576/2 26/578/2 7/577/2 -f 26/578/2 27/579/2 5/571/2 -f 27/579/2 28/580/2 1/551/2 -f 28/580/2 25/576/2 3/555/2 -f 29/581/343 30/582/343 4/557/343 -f 30/582/344 31/600/344 2/583/344 -f 2/583/345 31/600/345 32/584/345 -f 6/567/346 32/584/346 29/581/346 -f 33/585/16 34/594/16 26/586/16 -f 36/588/25 33/585/25 25/589/25 -f 35/591/22 36/588/22 28/592/22 -f 34/594/19 35/591/19 27/595/19 -f 33/585/2 36/588/2 35/591/2 -usemtl None_life_is_grim2.png.002 -f 474/601/350 481/602/350 473/603/350 -f 476/604/351 482/605/351 474/601/351 -f 476/604/352 484/606/352 483/607/352 -f 473/603/353 484/606/353 475/608/353 -f 476/609/16 485/610/16 475/611/16 -f 480/612/16 486/613/16 476/609/16 -f 479/614/16 487/615/16 480/612/16 -f 475/611/16 488/616/16 479/614/16 -f 480/612/19 489/617/19 479/618/19 -f 478/619/19 490/620/19 480/612/19 -f 477/621/19 491/622/19 478/619/19 -f 479/618/19 492/623/19 477/621/19 -f 478/624/22 493/625/22 477/626/22 -f 474/627/22 494/628/22 478/624/22 -f 473/603/22 495/629/22 474/627/22 -f 477/626/22 496/630/22 473/603/22 -f 479/631/1 497/632/1 475/608/1 -f 477/626/1 498/633/1 479/631/1 -f 473/603/1 499/634/1 477/626/1 -f 475/608/1 500/635/1 473/603/1 -f 476/609/354 501/636/354 480/612/354 -f 474/637/355 502/638/355 476/609/355 -f 474/637/356 504/639/356 503/640/356 -f 480/612/357 504/639/357 478/619/357 -f 498/641/22 505/642/22 497/643/22 -f 497/644/19 508/645/19 500/646/19 -f 500/647/16 507/648/16 499/649/16 -f 499/650/25 506/651/25 498/652/25 -f 507/648/1 505/642/1 506/651/1 -f 474/601/358 509/653/358 481/602/358 -f 476/604/351 510/654/351 482/605/351 -f 476/604/359 475/608/359 484/606/359 -f 473/603/353 481/602/353 484/606/353 -f 476/609/16 486/613/16 485/610/16 -f 480/612/16 487/615/16 486/613/16 -f 479/614/16 488/616/16 487/615/16 -f 475/611/16 485/610/16 488/616/16 -f 480/612/19 490/620/19 489/617/19 -f 478/619/19 491/622/19 490/620/19 -f 477/621/19 492/623/19 491/622/19 -f 479/618/19 489/617/19 492/623/19 -f 478/624/22 494/628/22 493/625/22 -f 474/627/22 495/629/22 494/628/22 -f 473/603/22 496/630/22 495/629/22 -f 477/626/22 493/625/22 496/630/22 -f 479/631/1 498/633/1 497/632/1 -f 477/626/1 499/634/1 498/633/1 -f 473/603/1 500/635/1 499/634/1 -f 475/608/1 497/632/1 500/635/1 -f 476/609/354 502/638/354 501/636/354 -f 474/637/355 503/640/355 502/638/355 -f 474/637/356 478/619/356 504/639/356 -f 480/612/357 501/636/357 504/639/357 -f 498/641/22 506/651/22 505/642/22 -f 497/644/19 505/642/19 508/645/19 -f 500/647/16 508/645/16 507/648/16 -f 499/650/25 507/648/25 506/651/25 -f 507/648/1 508/645/1 505/642/1 +f 93/397/49 20/398/50 177/399/51 +f 144/400/52 3/401/53 42/402/54 +f 92/403/55 6/404/56 5/405/57 +f 195/406/58 8/407/59 76/408/60 +f 110/409/61 2/410/62 25/411/63 +f 12/412/64 110/409/61 109/413/65 +f 14/414/66 144/400/52 143/415/67 +f 143/415/67 23/416/68 14/414/66 +f 177/399/51 19/417/69 178/418/70 +f 24/419/71 212/420/72 211/421/73 +f 178/418/70 6/404/56 75/422/74 +f 194/423/75 7/424/76 18/425/77 +f 194/423/75 60/426/78 59/427/79 +f 192/428/80 60/426/78 193/429/81 +f 192/428/80 62/430/82 61/431/83 +f 190/432/84 62/430/82 191/433/85 +f 190/432/84 64/434/86 63/435/87 +f 188/436/88 64/434/86 189/437/89 +f 188/436/88 66/438/90 65/439/91 +f 186/440/92 66/438/90 187/441/93 +f 186/440/92 68/442/94 67/443/95 +f 184/444/96 68/442/94 185/445/97 +f 184/444/96 70/446/98 69/447/99 +f 182/448/100 70/446/98 183/449/101 +f 182/448/100 72/450/102 71/451/103 +f 180/452/104 72/450/102 181/453/105 +f 180/452/104 74/454/106 73/455/107 +f 178/418/70 74/454/106 179/456/108 +f 21/457/109 228/458/110 22/459/111 +f 196/460/112 228/458/110 195/406/58 +f 196/460/112 226/461/113 227/462/114 +f 198/463/115 226/461/113 197/464/116 +f 198/463/115 224/465/117 225/466/118 +f 200/467/119 224/465/117 199/468/120 +f 200/467/119 222/469/121 223/470/122 +f 202/471/123 222/469/121 201/472/124 +f 202/471/123 220/473/125 221/474/126 +f 204/475/127 220/473/125 203/476/128 +f 204/475/127 218/477/129 219/478/130 +f 206/479/131 218/477/129 205/480/132 +f 206/479/131 216/481/133 217/482/134 +f 208/483/135 216/481/133 207/484/136 +f 208/483/135 214/485/137 215/486/138 +f 210/487/139 214/485/137 209/488/140 +f 210/487/139 212/420/72 213/489/141 +f 161/490/142 18/425/77 17/491/143 +f 161/490/142 193/429/81 194/423/75 +f 163/492/144 193/429/81 162/493/145 +f 163/492/144 191/433/85 192/428/80 +f 165/494/146 191/433/85 164/495/147 +f 165/494/146 189/437/89 190/432/84 +f 167/496/148 189/437/89 166/497/149 +f 167/496/148 187/441/93 188/436/88 +f 169/498/150 187/441/93 168/499/151 +f 169/498/150 185/445/97 186/440/92 +f 171/500/152 185/445/97 170/501/153 +f 171/500/152 183/449/101 184/444/96 +f 173/502/154 183/449/101 172/503/155 +f 173/502/154 181/453/105 182/448/100 +f 175/504/156 181/453/105 174/505/157 +f 175/504/156 179/456/108 180/452/104 +f 177/399/51 179/456/108 176/506/158 +f 22/459/111 127/507/159 15/508/160 +f 127/507/159 227/462/114 128/509/161 +f 227/462/114 129/510/162 128/509/161 +f 129/510/162 225/466/118 130/511/163 +f 225/466/118 131/512/164 130/511/163 +f 131/512/164 223/470/122 132/513/165 +f 223/470/122 133/514/166 132/513/165 +f 133/514/166 221/474/126 134/515/167 +f 221/474/126 135/516/168 134/515/167 +f 135/516/168 219/478/130 136/517/169 +f 219/478/130 137/518/170 136/517/169 +f 137/518/170 217/482/134 138/519/171 +f 217/482/134 139/520/172 138/519/171 +f 139/520/172 215/486/138 140/521/173 +f 215/486/138 141/522/174 140/521/173 +f 141/522/174 213/489/141 142/523/175 +f 213/489/141 143/415/67 142/523/175 +f 15/508/160 160/524/176 16/525/177 +f 128/509/161 160/524/176 127/507/159 +f 128/509/161 158/526/178 159/527/179 +f 130/511/163 158/526/178 129/510/162 +f 130/511/163 156/528/180 157/529/181 +f 132/513/165 156/528/180 131/512/164 +f 132/513/165 154/530/182 155/531/183 +f 134/515/167 154/530/182 133/514/166 +f 134/515/167 152/532/184 153/533/185 +f 136/517/169 152/532/184 135/516/168 +f 136/517/169 150/534/186 151/535/187 +f 138/519/171 150/534/186 137/518/170 +f 138/519/171 148/536/188 149/537/189 +f 140/521/173 148/536/188 139/520/172 +f 140/521/173 146/538/190 147/539/191 +f 142/523/175 146/538/190 141/522/174 +f 142/523/175 144/400/52 145/540/192 +f 9/541/193 126/542/194 10/543/195 +f 94/544/196 126/542/194 93/397/49 +f 94/544/196 124/545/197 125/546/198 +f 96/547/199 124/545/197 95/548/200 +f 96/547/199 122/549/201 123/550/202 +f 98/551/203 122/549/201 97/552/204 +f 98/551/203 120/553/205 121/554/206 +f 100/555/207 120/553/205 99/556/208 +f 100/555/207 118/557/209 119/558/210 +f 102/559/211 118/557/209 101/560/212 +f 102/559/211 116/561/213 117/562/214 +f 104/563/215 116/561/213 103/564/216 +f 104/563/215 114/565/217 115/566/218 +f 106/567/219 114/565/217 105/568/220 +f 106/567/219 112/569/221 113/570/222 +f 108/571/223 112/569/221 107/572/224 +f 108/571/223 110/409/61 111/573/225 +f 1/574/226 126/542/194 41/575/227 +f 126/542/194 40/576/228 41/575/227 +f 40/576/228 124/545/197 39/577/229 +f 124/545/197 38/578/230 39/577/229 +f 38/578/230 122/549/201 37/579/231 +f 122/549/201 36/580/232 37/579/231 +f 36/580/232 120/553/205 35/581/233 +f 120/553/205 34/582/234 35/581/233 +f 34/582/234 118/557/209 33/583/27 +f 118/557/209 32/584/235 33/583/27 +f 32/584/235 116/561/213 31/585/236 +f 116/561/213 30/586/237 31/585/236 +f 30/586/237 114/565/217 29/587/238 +f 114/565/217 28/588/239 29/587/238 +f 28/588/239 112/569/221 27/589/240 +f 112/569/221 26/590/241 27/589/240 +f 26/590/241 110/409/61 25/411/63 +f 211/421/73 5/405/57 24/419/71 +f 211/421/73 91/591/242 92/403/55 +f 209/488/140 91/591/242 210/487/139 +f 209/488/140 89/592/243 90/593/244 +f 207/484/136 89/592/243 208/483/135 +f 207/484/136 87/594/245 88/595/246 +f 205/480/132 87/594/245 206/479/131 +f 205/480/132 85/596/247 86/597/248 +f 203/476/128 85/596/247 204/475/127 +f 203/476/128 83/598/249 84/599/250 +f 201/472/124 83/598/249 202/471/123 +f 201/472/124 81/600/251 82/601/252 +f 199/468/120 81/600/251 200/467/119 +f 199/468/120 79/602/253 80/603/254 +f 197/464/116 79/602/253 198/463/115 +f 197/464/116 77/604/255 78/605/256 +f 195/406/58 77/604/255 196/460/112 +f 7/424/76 76/408/60 8/407/59 +f 76/408/60 60/426/78 77/604/255 +f 60/426/78 78/605/256 77/604/255 +f 78/605/256 62/430/82 79/602/253 +f 62/430/82 80/603/254 79/602/253 +f 80/603/254 64/434/86 81/600/251 +f 64/434/86 82/601/252 81/600/251 +f 82/601/252 66/438/90 83/598/249 +f 66/438/90 84/599/250 83/598/249 +f 84/599/250 68/442/94 85/596/247 +f 68/442/94 86/597/248 85/596/247 +f 86/597/248 70/446/98 87/594/245 +f 70/446/98 88/595/246 87/594/245 +f 88/595/246 72/450/102 89/592/243 +f 72/450/102 90/593/244 89/592/243 +f 90/593/244 74/454/106 91/591/242 +f 74/454/106 92/403/55 91/591/242 +f 4/606/257 160/524/176 58/607/258 +f 160/524/176 57/608/259 58/607/258 +f 57/608/259 158/526/178 56/609/260 +f 158/526/178 55/610/261 56/609/260 +f 55/610/261 156/528/180 54/611/262 +f 156/528/180 53/612/263 54/611/262 +f 53/612/263 154/530/182 52/613/264 +f 154/530/182 51/614/265 52/613/264 +f 51/614/265 152/532/184 50/615/22 +f 152/532/184 49/616/266 50/615/22 +f 49/616/266 150/534/186 48/617/267 +f 150/534/186 47/618/268 48/617/267 +f 47/618/268 148/536/188 46/619/269 +f 148/536/188 45/620/270 46/619/269 +f 45/620/270 146/538/190 44/621/271 +f 146/538/190 43/622/272 44/621/271 +f 43/622/272 144/400/52 42/402/54 +f 17/491/143 109/413/65 161/490/142 +f 109/413/65 162/493/145 161/490/142 +f 162/493/145 107/572/224 163/492/144 +f 107/572/224 164/495/147 163/492/144 +f 164/495/147 105/568/220 165/494/146 +f 105/568/220 166/497/149 165/494/146 +f 166/497/149 103/564/216 167/496/148 +f 103/564/216 168/499/151 167/496/148 +f 168/499/151 101/560/212 169/498/150 +f 101/560/212 170/501/153 169/498/150 +f 170/501/153 99/556/208 171/500/152 +f 99/556/208 172/503/155 171/500/152 +f 172/503/155 97/552/204 173/502/154 +f 97/552/204 174/505/157 173/502/154 +f 174/505/157 95/548/200 175/504/156 +f 95/548/200 176/506/158 175/504/156 +f 176/506/158 93/397/49 177/399/51 +f 238/52/273 239/623/274 237/624/275 +f 240/56/276 241/625/277 239/623/274 +f 242/57/278 243/626/279 241/625/277 +f 243/627/279 246/49/280 245/628/281 +f 245/628/281 248/74/282 247/629/283 +f 247/629/283 250/70/284 249/630/285 +f 250/70/284 251/631/286 249/630/285 +f 252/68/287 253/632/288 251/631/286 +f 254/65/289 255/633/290 253/632/288 +f 255/634/290 258/63/291 257/635/292 +f 257/635/292 260/60/293 259/636/294 +f 259/636/294 238/52/273 237/624/275 +f 263/62/295 276/75/296 264/58/297 +f 270/64/298 283/80/299 271/61/300 +f 267/73/301 280/81/302 268/71/303 +f 264/50/297 277/86/304 265/51/305 +f 271/61/300 284/88/306 272/53/307 +f 262/54/308 273/89/309 261/55/310 +f 268/71/303 281/92/311 269/69/312 +f 265/51/305 278/95/313 266/72/314 +f 272/53/307 274/96/315 262/54/308 +f 261/55/310 275/97/316 263/62/295 +f 269/69/312 282/98/317 270/66/298 +f 266/72/314 279/100/318 267/73/301 +f 290/94/319 303/101/320 291/82/321 +f 287/76/322 300/106/323 288/77/324 +f 294/349/325 307/107/326 295/79/327 +f 291/82/321 304/111/328 292/83/329 +f 288/350/324 301/112/330 289/85/331 +f 295/79/327 308/115/332 296/87/333 +f 286/90/334 297/119/335 285/91/336 +f 292/83/329 305/121/337 293/93/338 +f 289/85/331 302/122/339 290/94/319 +f 296/87/333 298/117/340 286/90/334 +f 285/91/336 299/104/341 287/76/322 +f 293/93/338 306/126/342 294/99/325 +f 317/120/312 330/637/343 318/125/298 +f 315/103/301 326/638/344 327/639/345 +f 311/124/295 324/640/346 312/105/297 +f 318/108/298 331/641/347 319/109/300 +f 315/103/301 328/642/348 316/110/303 +f 312/113/297 325/643/349 313/114/305 +f 319/109/300 332/644/350 320/116/307 +f 310/123/308 321/645/351 309/118/310 +f 316/110/303 329/646/352 317/120/312 +f 313/114/305 326/638/344 314/102/314 +f 320/116/307 322/647/353 310/123/308 +f 309/118/310 323/648/354 311/124/295 +f 93/397/49 9/541/193 20/398/50 +f 144/400/52 13/649/355 3/401/53 +f 92/403/55 75/422/74 6/404/56 +f 195/406/58 21/457/109 8/407/59 +f 110/409/61 11/650/356 2/410/62 +f 12/412/64 11/650/356 110/409/61 +f 14/414/66 13/649/355 144/400/52 +f 143/415/67 212/420/72 23/416/68 +f 177/399/51 20/398/50 19/417/69 +f 24/419/71 23/416/68 212/420/72 +f 178/418/70 19/417/69 6/404/56 +f 194/423/75 59/427/79 7/424/76 +f 194/423/75 193/429/81 60/426/78 +f 192/428/80 61/431/83 60/426/78 +f 192/428/80 191/433/85 62/430/82 +f 190/432/84 63/435/87 62/430/82 +f 190/432/84 189/437/89 64/434/86 +f 188/436/88 65/439/91 64/434/86 +f 188/436/88 187/441/93 66/438/90 +f 186/440/92 67/443/95 66/438/90 +f 186/440/92 185/445/97 68/442/94 +f 184/444/96 69/447/99 68/442/94 +f 184/444/96 183/449/101 70/446/98 +f 182/448/100 71/451/103 70/446/98 +f 182/448/100 181/453/105 72/450/102 +f 180/452/104 73/455/107 72/450/102 +f 180/452/104 179/456/108 74/454/106 +f 178/418/70 75/422/74 74/454/106 +f 21/457/109 195/406/58 228/458/110 +f 196/460/112 227/462/114 228/458/110 +f 196/460/112 197/464/116 226/461/113 +f 198/463/115 225/466/118 226/461/113 +f 198/463/115 199/468/120 224/465/117 +f 200/467/119 223/470/122 224/465/117 +f 200/467/119 201/472/124 222/469/121 +f 202/471/123 221/474/126 222/469/121 +f 202/471/123 203/476/128 220/473/125 +f 204/475/127 219/478/130 220/473/125 +f 204/475/127 205/480/132 218/477/129 +f 206/479/131 217/482/134 218/477/129 +f 206/479/131 207/484/136 216/481/133 +f 208/483/135 215/486/138 216/481/133 +f 208/483/135 209/488/140 214/485/137 +f 210/487/139 213/489/141 214/485/137 +f 210/487/139 211/421/73 212/420/72 +f 161/490/142 194/423/75 18/425/77 +f 161/490/142 162/493/145 193/429/81 +f 163/492/144 192/428/80 193/429/81 +f 163/492/144 164/495/147 191/433/85 +f 165/494/146 190/432/84 191/433/85 +f 165/494/146 166/497/149 189/437/89 +f 167/496/148 188/436/88 189/437/89 +f 167/496/148 168/499/151 187/441/93 +f 169/498/150 186/440/92 187/441/93 +f 169/498/150 170/501/153 185/445/97 +f 171/500/152 184/444/96 185/445/97 +f 171/500/152 172/503/155 183/449/101 +f 173/502/154 182/448/100 183/449/101 +f 173/502/154 174/505/157 181/453/105 +f 175/504/156 180/452/104 181/453/105 +f 175/504/156 176/506/158 179/456/108 +f 177/399/51 178/418/70 179/456/108 +f 22/459/111 228/458/110 127/507/159 +f 127/507/159 228/458/110 227/462/114 +f 227/462/114 226/461/113 129/510/162 +f 129/510/162 226/461/113 225/466/118 +f 225/466/118 224/465/117 131/512/164 +f 131/512/164 224/465/117 223/470/122 +f 223/470/122 222/469/121 133/514/166 +f 133/514/166 222/469/121 221/474/126 +f 221/474/126 220/473/125 135/516/168 +f 135/516/168 220/473/125 219/478/130 +f 219/478/130 218/477/129 137/518/170 +f 137/518/170 218/477/129 217/482/134 +f 217/482/134 216/481/133 139/520/172 +f 139/520/172 216/481/133 215/486/138 +f 215/486/138 214/485/137 141/522/174 +f 141/522/174 214/485/137 213/489/141 +f 213/489/141 212/420/72 143/415/67 +f 15/508/160 127/507/159 160/524/176 +f 128/509/161 159/527/179 160/524/176 +f 128/509/161 129/510/162 158/526/178 +f 130/511/163 157/529/181 158/526/178 +f 130/511/163 131/512/164 156/528/180 +f 132/513/165 155/531/183 156/528/180 +f 132/513/165 133/514/166 154/530/182 +f 134/515/167 153/533/185 154/530/182 +f 134/515/167 135/516/168 152/532/184 +f 136/517/169 151/535/187 152/532/184 +f 136/517/169 137/518/170 150/534/186 +f 138/519/171 149/537/189 150/534/186 +f 138/519/171 139/520/172 148/536/188 +f 140/521/173 147/539/191 148/536/188 +f 140/521/173 141/522/174 146/538/190 +f 142/523/175 145/540/192 146/538/190 +f 142/523/175 143/415/67 144/400/52 +f 9/541/193 93/397/49 126/542/194 +f 94/544/196 125/546/198 126/542/194 +f 94/544/196 95/548/200 124/545/197 +f 96/547/199 123/550/202 124/545/197 +f 96/547/199 97/552/204 122/549/201 +f 98/551/203 121/554/206 122/549/201 +f 98/551/203 99/556/208 120/553/205 +f 100/555/207 119/558/210 120/553/205 +f 100/555/207 101/560/212 118/557/209 +f 102/559/211 117/562/214 118/557/209 +f 102/559/211 103/564/216 116/561/213 +f 104/563/215 115/566/218 116/561/213 +f 104/563/215 105/568/220 114/565/217 +f 106/567/219 113/570/222 114/565/217 +f 106/567/219 107/572/224 112/569/221 +f 108/571/223 111/573/225 112/569/221 +f 108/571/223 109/413/65 110/409/61 +f 1/574/226 10/543/195 126/542/194 +f 126/542/194 125/546/198 40/576/228 +f 40/576/228 125/546/198 124/545/197 +f 124/545/197 123/550/202 38/578/230 +f 38/578/230 123/550/202 122/549/201 +f 122/549/201 121/554/206 36/580/232 +f 36/580/232 121/554/206 120/553/205 +f 120/553/205 119/558/210 34/582/234 +f 34/582/234 119/558/210 118/557/209 +f 118/557/209 117/562/214 32/584/235 +f 32/584/235 117/562/214 116/561/213 +f 116/561/213 115/566/218 30/586/237 +f 30/586/237 115/566/218 114/565/217 +f 114/565/217 113/570/222 28/588/239 +f 28/588/239 113/570/222 112/569/221 +f 112/569/221 111/573/225 26/590/241 +f 26/590/241 111/573/225 110/409/61 +f 211/421/73 92/403/55 5/405/57 +f 211/421/73 210/487/139 91/591/242 +f 209/488/140 90/593/244 91/591/242 +f 209/488/140 208/483/135 89/592/243 +f 207/484/136 88/595/246 89/592/243 +f 207/484/136 206/479/131 87/594/245 +f 205/480/132 86/597/248 87/594/245 +f 205/480/132 204/475/127 85/596/247 +f 203/476/128 84/599/250 85/596/247 +f 203/476/128 202/471/123 83/598/249 +f 201/472/124 82/601/252 83/598/249 +f 201/472/124 200/467/119 81/600/251 +f 199/468/120 80/603/254 81/600/251 +f 199/468/120 198/463/115 79/602/253 +f 197/464/116 78/605/256 79/602/253 +f 197/464/116 196/460/112 77/604/255 +f 195/406/58 76/408/60 77/604/255 +f 7/424/76 59/427/79 76/408/60 +f 76/408/60 59/427/79 60/426/78 +f 60/426/78 61/431/83 78/605/256 +f 78/605/256 61/431/83 62/430/82 +f 62/430/82 63/435/87 80/603/254 +f 80/603/254 63/435/87 64/434/86 +f 64/434/86 65/439/91 82/601/252 +f 82/601/252 65/439/91 66/438/90 +f 66/438/90 67/443/95 84/599/250 +f 84/599/250 67/443/95 68/442/94 +f 68/442/94 69/447/99 86/597/248 +f 86/597/248 69/447/99 70/446/98 +f 70/446/98 71/451/103 88/595/246 +f 88/595/246 71/451/103 72/450/102 +f 72/450/102 73/455/107 90/593/244 +f 90/593/244 73/455/107 74/454/106 +f 74/454/106 75/422/74 92/403/55 +f 4/606/257 16/525/177 160/524/176 +f 160/524/176 159/527/179 57/608/259 +f 57/608/259 159/527/179 158/526/178 +f 158/526/178 157/529/181 55/610/261 +f 55/610/261 157/529/181 156/528/180 +f 156/528/180 155/531/183 53/612/263 +f 53/612/263 155/531/183 154/530/182 +f 154/530/182 153/533/185 51/614/265 +f 51/614/265 153/533/185 152/532/184 +f 152/532/184 151/535/187 49/616/266 +f 49/616/266 151/535/187 150/534/186 +f 150/534/186 149/537/189 47/618/268 +f 47/618/268 149/537/189 148/536/188 +f 148/536/188 147/539/191 45/620/270 +f 45/620/270 147/539/191 146/538/190 +f 146/538/190 145/540/192 43/622/272 +f 43/622/272 145/540/192 144/400/52 +f 17/491/143 12/412/64 109/413/65 +f 109/413/65 108/571/223 162/493/145 +f 162/493/145 108/571/223 107/572/224 +f 107/572/224 106/567/219 164/495/147 +f 164/495/147 106/567/219 105/568/220 +f 105/568/220 104/563/215 166/497/149 +f 166/497/149 104/563/215 103/564/216 +f 103/564/216 102/559/211 168/499/151 +f 168/499/151 102/559/211 101/560/212 +f 101/560/212 100/555/207 170/501/153 +f 170/501/153 100/555/207 99/556/208 +f 99/556/208 98/551/203 172/503/155 +f 172/503/155 98/551/203 97/552/204 +f 97/552/204 96/547/199 174/505/157 +f 174/505/157 96/547/199 95/548/200 +f 95/548/200 94/544/196 176/506/158 +f 176/506/158 94/544/196 93/397/49 +f 238/52/273 240/56/276 239/623/274 +f 240/56/276 242/57/278 241/625/277 +f 242/57/278 244/59/357 243/626/279 +f 243/627/279 244/347/357 246/49/280 +f 245/628/281 246/49/280 248/74/282 +f 247/629/283 248/74/282 250/70/284 +f 250/70/284 252/68/287 251/631/286 +f 252/68/287 254/65/289 253/632/288 +f 254/65/289 256/67/358 255/633/290 +f 255/634/290 256/348/358 258/63/291 +f 257/635/292 258/63/291 260/60/293 +f 259/636/294 260/60/293 238/52/273 +f 263/62/295 275/97/316 276/75/296 +f 270/64/298 282/78/317 283/80/299 +f 267/73/301 279/100/318 280/81/302 +f 264/50/297 276/84/296 277/86/304 +f 271/61/300 283/80/299 284/88/306 +f 262/54/308 274/96/315 273/89/309 +f 268/71/303 280/81/302 281/92/311 +f 265/51/305 277/86/304 278/95/313 +f 272/53/307 284/88/306 274/96/315 +f 261/55/310 273/89/309 275/97/316 +f 269/69/312 281/92/311 282/98/317 +f 266/72/314 278/95/313 279/100/318 +f 290/94/319 302/122/339 303/101/320 +f 287/76/322 299/104/341 300/106/323 +f 294/349/325 306/351/342 307/107/326 +f 291/82/321 303/101/320 304/111/328 +f 288/350/324 300/352/323 301/112/330 +f 295/79/327 307/107/326 308/115/332 +f 286/90/334 298/117/340 297/119/335 +f 292/83/329 304/111/328 305/121/337 +f 289/85/331 301/112/330 302/122/339 +f 296/87/333 308/115/332 298/117/340 +f 285/91/336 297/119/335 299/104/341 +f 293/93/338 305/121/337 306/126/342 +f 317/120/312 329/646/352 330/637/343 +f 315/103/301 314/102/314 326/638/344 +f 311/124/295 323/648/354 324/640/346 +f 318/108/298 330/651/343 331/641/347 +f 315/103/301 327/639/345 328/642/348 +f 312/113/297 324/652/346 325/643/349 +f 319/109/300 331/641/347 332/644/350 +f 310/123/308 322/647/353 321/645/351 +f 316/110/303 328/642/348 329/646/352 +f 313/114/305 325/643/349 326/638/344 +f 320/116/307 332/644/350 322/647/353 +f 309/118/310 321/645/351 323/648/354 diff --git a/src/main/resources/assets/hbm/textures/gui/centrifuge_gas.png b/src/main/resources/assets/hbm/textures/gui/centrifuge_gas.png index 6621f4ea62b5ee20bf6275da1842cc8766001950..79e0723bf49e1eebc0e8495930a8e9975f80fae5 100644 GIT binary patch delta 2576 zcmcJRYdDl!8^@pLnP(WL7>rY~XB;9CLQK?{N+Qv0+gr|tl$%`4VQh%~J%Zt2R5?`9;heVJv!<;jM9YtlSg^8YJ`+j0ewOh%o6JsUgYILul6adh;`E7tr#qlzwX6o&+Hh>W>JC;+`=YdBCj7`(` z)X=@O-WWx>2jF#aIQ$0usik}CXTqtIVK(WOM!)vCVTq=+q|bLh?tGniKYC|+Ne?}X z`En|q*_rUde5%X*iE(XT+~N1s^ZkDQwOb9@RCKgaq&d!K+;r{ft!npC2Be_l_dTyR zRzZg^|7cuM)8GkZfpu=D{Lg&iXdQkUtDZ1@fA88Q)IC?2m<~TZ;awio%`RwReg?lEX7k7$1 z2ifwPif-@o>}?qz@`0R_@HeI#J_gnpDw(N}tswNroSy4@ZeHQ$(csX=ri@O1o8K_E zo7Zo$l*Xa2CcJuIoHzhaK3!t%nHHLpc8oUKhQ7Fs*0r@au`CmX3G8s)`O-k1gxcpZ zKdMjXLlZ%38ZIQ-u0}n|e>+ZFc#y62haf`Sqh1#;Yi^9sfSe=ev;UYFTd6Icuxmp? z@Q>erxHy_8T`oM4a_it}#bUhK+i$u~!n1pNSFTAa99Gft+}xgY8=f5qbyU{md{bsp zH&%E!eoBO`1k*1Cvn4H-t%z@#^K<>2=U>H~?Sy?K+M(5-9=G4EBE3ViSDzK1@iTs| zz|ZL&SsDLKR1-6%hfLk)skB+=XyWAgP)N(}n^#syR1$i!JDv|$b=e_XtlC%E-bG^= z;ro4u6`&nlS0+&vF>KIMYH^al{DHcem+enHbHL>?0EPQg$52As`1k5XXkMuA@&}7q zrULIpV=Gax$S6kfn%(o31w7i}O9qGfBCFzb-@hF+p&F(lUF`a@`KWTTpAge zXs{3fB-ygLD@9znZqu1rEz5`7hB$YaJs=ozRa8o;&=fbsTlxbzF7pBVi8UYM-o%6tQcBj8?6mf3=sW;N;l{TnR{8 z5I+g#88sbbxo7Tw6|OPkGSf%;7CrNKbPK>P%yGNdPv;+!8PppWFzuI>WTh8C7>3W< z?^UdVW)0VYP~ZiNi{{f@t~glq{Fj)Y={Wh`{B+=ZGgHfnKfKb;EM_O7#}y42hCmUX z^&OrLi#1GyS~|r0rK5_*_7HKAV1xKG!Q3j2OuT`>$zastR}&8{&xmXwa=_9!aG%FXaacR$jo+LcpU2 zI@QyR^s3bcj0hXw`QBGFD&)sB_ujP zBi600`S!14Vd*B`q?aXatT*h&%w(D^C6vqF7axFm*6j-J%V)mf)P#6wx`Gk1PoK(U zC_gmq-Q1R|&c>iRNfz0CyOd`Gsbu7|&i|ef0|^-#hZ-<+Y5kQLs%>*pforkm~Kx-82u#nlT>}+;_BlO{q z8BN(!=H}gC0YKD7Zo4dGPg=coDg++l%zkr}3f6DTobRasoQO}IAnk3xdR$)pBqQGj z%KSPkF=o%p0)dSSH~}U?vj`_GqPx@U)0&mLwbqQolP_8lWd(L-Jb`=F z7b&7&u4urJSg9{7WnY`|RJ%&EkjsTY`w;<|(Y#^0T1S{8QDx7KQ7O=qMb_PTwQ2H8^A9SzhNPj43ol2(7}Ye7sk61h$?Mjf6CA%=bJ|cN|1G9DCst@`5aya zGAuQuj<8vP%`AYM*b5<{5OM;>uObk0+CqcX4Zg%siWT6TM(s;fsq!!y)b5B%zl9M? z(*qSqR3(^wX-#Y@bg*3Wo&_a*{qc2bgbfgZTL? zwwAvIATON|msTJwrj{#MtK;IxXKw@oZuy*@>gf`mH%kiVc~Z`gXxpzFk!wfm?ioBF zVy1;+id*?I#IeG$<^QRS3M?FxUo=YcPn!iZ#(tO=;Ep$Mp~4FV^>D$c>}r zCxVTzVx|C-lj3GzRu>$K6&LFb(e20LP1xUx`kPvr9{Dd{DL0jMTAk~tNA~BB*Rjp`r5RM_g5s<6ml zwbMPmt+r}dDOMYK7~%zZCYgW+EnJv3t@r;GcK$Ch5_DhOS5(jHbCMb#`l#|#1$b}p K^SHQ*=%0!}6^H|pY-lNxIccv7oH#-d}x!5f%I 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 X&y_AsO`5wo0=wmSoMu-`^-ui`21v#b delta 1755 zcmb_a{Wn{OAHMfCx4UA>NT%MJv?~oUG<4;l-%#SEsb)CYbZCy(l+{bCWo7R5Ry9hD zPOVr{Db*6R3~S5n(CC&`%uG)yNfouOm^w{pQp?V_+aIvA&v}0Mobx=N=RD_go_UiE z!!|b%?FWD@{h&1YN(=yO76$YaNDdnS@~;b5=zCHCUM?h5krSkWz#lGM4G7UA7~5-u?kkZ^X5XZ~avikxfAZ1om*t zj`i8XrttL-)M2?qrv6}T!R!yuwe!>l+<;g*2Fc4W9qG-*9F2cPQl?9afNv;`e-T%q z7~?8L%@BnGHjb3TdgoT?_;`MVo;pD`GZS3|upuFl0mpt+^+MUNJ`d~x&^zyMYEiR}pO=yzESI z2)(XdnI46Lgy#Yy!}EwxZ~`*ajIlnoWhUjhhIWkPVuhW>sCR?(ARN=MU>=Jufm@m$ zFIzG^7lSdUYe;W?h4avAcL-Rl!t@<;k_a(&+bkfBC*E0|XIkgmAhl`*EX9g~`0|BR zJ4LgVs8Syu>Oyal1&_1isui14I_bQ9a~gX)B!w}!l*W>j9|6N0j08)m&Y-A<9cp2{ zhFjCA6EmlvEYEudEL5M4o2Fi`3oo-E3QWaK5BS_vf4Fd7u#kEH>{8t*N&aPS8&#G$ z8Oq#zEOh0uxeF;JYC7I*wW}MtI(i%yKmBd+vz?N}=gBs_b^qKLTRwSY+b6mb`ObHQ z|8eXt6Dr()IqktrT}q+pEu)2NgO8@Ls!tHi^CPqH#dZ<4PY4i&z+OI4hyrf)fGk)9=tEC>km$PqIn7c;5-z66XWY@s7@{n{ zD~4y9{1K?_KG~!SBaA{0S_(}}0K4OMR6o<(z0z#PzFZA-a2Q8EosjYENW3syeay%@ zwuc;dF$X$rLd}8f^_@087@7ynTwo4!;eubw3Wq6$t}Y^-78z)Z?r7@?TM`q5p+HIF zG3WZGW)te6pd?9H8Z361obW0k#cIMep<5W&$dw2l7-H@)_ks}(`l)=vWkqW$JKk0m zQEqdf6}svL>TKRXo}}nx{C_uqJ0|Wmoj+<1ymBZ%lj(l8{1Q76{P<{K|6mpxc?P0k zZ{W0;zyaWY@a9Tr_?G~fk+6)g+vEQI+K2)F4;wmxTN5;cY5Dyh|Iu@RyAcMuzy1yE z)Xknw#yNNuggMwT@Q}uAIn0u~Vg2%37o)Zn$M&wv>l)M-Pcci&qof@)&$`zu1bl9A zfJh($ From 6b81452c9170f7a746037fae93aec450f3077b3f Mon Sep 17 00:00:00 2001 From: Vaern <90118520+Vaern@users.noreply.github.com> Date: Tue, 1 Feb 2022 19:58:01 -0800 Subject: [PATCH 9/9] Last minute balancing changes --- .../com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java index 6cbd6a287..099f61581 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java @@ -128,7 +128,7 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement setupTanks(); if(heat > 0) { - if(heat >= 100 && worldObj.getTotalWorldTime() % 40 == 0) + if(heat >= 100 && worldObj.getTotalWorldTime() % 30 == 0) crack(); if(heat >= 200 && worldObj.getTotalWorldTime() % 100 == 0)