diff --git a/changelog b/changelog index b5663ec11..de14d2348 100644 --- a/changelog +++ b/changelog @@ -13,10 +13,12 @@ * If the center block right above the chemplant is not air, it will render with a frame, making chemplant stacking actually nice to look at * Now has a more convenient 3x3 footprint * Features 12 access ports, more than enough for full coverage of the entire machine's IO - * Has an optional slot for template items separate from the recipe selector (i.e. secret recipes) + * Has an optional slot for template items separate from the recipe selector (i.e. secret recipes) (doesn't work yet since we don't have secret recipe :P) * Ports are now standardized, no longer are fluids connected to ports that look like copper contacts + * Can't use upgrades just yet ## Changed +* Added Ukrainian localization * The RBMK console's grid can now be rotated using a screwdriver * Tool abilities have changed * Right-clicking while holding ALT now opens a configuration window @@ -50,6 +52,19 @@ * Perfluoromethyl can now also be made in the chemical plant (technically, the process isn't just simple mixing after all) * Recipe changes are still subject to balancing * Removed niter to nitric acid liquefaction recipe +* Updated N2 model + * Glow in the dark paint not included (yet) +* Wooden scaffolds now have a slightly smaller hitbox and are climbable +* Hanging chains and vines can now be climbed by holding space +* Hopefully fixed the strand caster being weird for good +* Removed angry metal drop from meteorites (use the assembler recipe) +* The automatic buzzsaw can now handle crops +* The automatic buzzsaw will no longer clip through walls when extending +* The automatic buzzsaw can be turned off using a screwdriver +* Template folders now support page turning via scrolling +* Named crates will now show their names in the GUI as well as as a tooltip +* Vanilla anvils no longer increase experience costs when renaming an item +* Fans now have diminishing force, old behavior can be restored with the hand drill ## Fixed * Conveyor ejectors should now correctly place items onto the back of splitters instead of on the output belts @@ -61,4 +76,6 @@ * Fixed server crash caused by tool abilities * Fixed chunkloading entities not releasing their loading tickets properly * Potentially fixed a dupe issue related to tool abilities -* Fixed certain sky features not being as bright as they should be \ No newline at end of file +* Fixed certain sky features not being as bright as they should be +* Fixed detailed hitboxes behaving weird +* Fixed issue where empty crates would retain irrelevant NBT data, rendering them unstackable with freshly crafted crates diff --git a/gradle.properties b/gradle.properties index d13d533f6..e276ed3a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_version=1.0.27 # Empty build number makes a release type -mod_build_number=5336 +mod_build_number=5356 credits=HbMinecraft,\ \ rodolphito (explosion algorithms),\ diff --git a/src/main/java/com/hbm/handler/nei/ChemicalPlantRecipeHandler.java b/src/main/java/com/hbm/handler/nei/ChemicalPlantRecipeHandler.java new file mode 100644 index 000000000..47d77945b --- /dev/null +++ b/src/main/java/com/hbm/handler/nei/ChemicalPlantRecipeHandler.java @@ -0,0 +1,16 @@ +package com.hbm.handler.nei; + +import com.hbm.blocks.ModBlocks; +import com.hbm.inventory.recipes.ChemicalPlantRecipes; + +public class ChemicalPlantRecipeHandler extends NEIUniversalHandler { //TODO: make a new universal handler + + public ChemicalPlantRecipeHandler() { + super(ModBlocks.machine_chemical_plant.getLocalizedName(), ModBlocks.machine_chemical_plant, ChemicalPlantRecipes.getRecipes()); + } + + @Override + public String getKey() { + return "ntmChemicalPlant"; + } +} diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index b66a700c7..99dbd7251 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -140,6 +140,7 @@ public class AssemblerRecipes extends SerializableRecipe { makeRecipe(new ComparableStack(ModBlocks.machine_refinery, 1), new AStack[] {!exp ? new OreDictStack(STEEL.plateWelded(), 3) : new OreDictStack(STEEL.heavyComp(), 1), new OreDictStack(CU.plate528(), 16), new OreDictStack(STEEL.shell(), 6), new OreDictStack(STEEL.pipe(), 12), new ComparableStack(ModItems.plate_polymer, 8), new ComparableStack(ModItems.circuit, 3, EnumCircuitType.ANALOG) },350); makeRecipe(new ComparableStack(ModBlocks.machine_epress, 1), new AStack[] {new OreDictStack(STEEL.plate(), 8), new OreDictStack(ANY_RUBBER.ingot(), 4), new ComparableStack(ModItems.part_generic, 2, EnumPartType.PISTON_HYDRAULIC.ordinal()), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.BASIC) }, 100); makeRecipe(new ComparableStack(ModBlocks.machine_chemplant, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 12), new OreDictStack(CU.plate528(), 6), new ComparableStack(ModItems.tank_steel, 4), new ComparableStack(ModItems.coil_tungsten, 3), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ANALOG), new ComparableStack(ModItems.plate_polymer, 8), },200); + makeRecipe(new ComparableStack(ModBlocks.machine_chemical_plant, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 8), new OreDictStack(CU.pipe(), 2), new ComparableStack(ModItems.plate_polymer, 16), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.coil_tungsten, 2), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ANALOG) }, 200); makeRecipe(new ComparableStack(ModBlocks.machine_crystallizer, 1), new AStack[] {new OreDictStack(STEEL.plateWelded(), 2), new OreDictStack(TI.shell(), 3), new OreDictStack(DESH.ingot(), 4), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.circuit, 2, EnumCircuitType.BASIC), },200); makeRecipe(new ComparableStack(ModBlocks.machine_fluidtank, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 2), new OreDictStack(STEEL.plate528(), 6), new OreDictStack(STEEL.shell(), 4), new OreDictStack(ANY_TAR.any(), 4), },150); makeRecipe(new ComparableStack(ModBlocks.machine_bat9000, 1), new AStack[] {new OreDictStack(STEEL.plate528(), 16), new OreDictStack(ANY_RESISTANTALLOY.plateWelded(), 2), new ComparableStack(ModBlocks.steel_scaffold, 16), new OreDictStack(ANY_TAR.any(), 16), },150); diff --git a/src/main/java/com/hbm/inventory/recipes/ChemicalPlantRecipes.java b/src/main/java/com/hbm/inventory/recipes/ChemicalPlantRecipes.java index a69596643..44cbd5ad4 100644 --- a/src/main/java/com/hbm/inventory/recipes/ChemicalPlantRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ChemicalPlantRecipes.java @@ -2,9 +2,14 @@ package com.hbm.inventory.recipes; import static com.hbm.inventory.OreDictManager.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; import com.hbm.inventory.FluidStack; +import com.hbm.inventory.RecipesCommon.AStack; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.RecipesCommon.OreDictStack; import com.hbm.inventory.fluid.Fluids; @@ -13,6 +18,7 @@ import com.hbm.inventory.recipes.loader.GenericRecipes; import com.hbm.items.ItemEnums.EnumFuelAdditive; import com.hbm.items.ItemGenericPart.EnumPartType; import com.hbm.items.ModItems; +import com.hbm.items.machine.ItemFluidIcon; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -345,4 +351,20 @@ public class ChemicalPlantRecipes extends GenericRecipes { .outputFluids(new FluidStack(Fluids.DEATH, 1_000, 0))); } + + public static HashMap getRecipes() { + HashMap recipes = new HashMap(); + + for(GenericRecipe recipe : INSTANCE.recipeOrderedList) { + List input = new ArrayList(); + if(recipe.inputItem != null) for(AStack stack : recipe.inputItem) input.add(stack); + if(recipe.inputFluid != null) for(FluidStack stack : recipe.inputFluid) input.add(ItemFluidIcon.make(stack)); + List output = new ArrayList(); + if(recipe.outputItem != null) for(IOutput stack : recipe.outputItem) output.add(stack.getAllPossibilities()); + if(recipe.outputFluid != null) for(FluidStack stack : recipe.outputFluid) output.add(ItemFluidIcon.make(stack)); + recipes.put(input.toArray(), output.toArray()); + } + + return recipes; + } } diff --git a/src/main/java/com/hbm/inventory/recipes/loader/GenericRecipes.java b/src/main/java/com/hbm/inventory/recipes/loader/GenericRecipes.java index 931f19d4f..027bb8bb3 100644 --- a/src/main/java/com/hbm/inventory/recipes/loader/GenericRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/loader/GenericRecipes.java @@ -163,6 +163,7 @@ public abstract class GenericRecipes extends Serializab public ItemStack collapse(); /** Returns an itemstack only if possibleMultiOutput is false, null otherwise */ public ItemStack getSingle(); + public ItemStack[] getAllPossibilities(); public void serialize(JsonWriter writer) throws IOException; public void deserialize(JsonArray array); public String[] getLabel(); @@ -194,6 +195,7 @@ public abstract class GenericRecipes extends Serializab @Override public ItemStack getSingle() { return this.stack; } @Override public boolean possibleMultiOutput() { return false; } + @Override public ItemStack[] getAllPossibilities() { return new ItemStack[] {getSingle()}; } @Override public void serialize(JsonWriter writer) throws IOException { @@ -243,6 +245,12 @@ public abstract class GenericRecipes extends Serializab @Override public boolean possibleMultiOutput() { return pool.size() > 1; } @Override public ItemStack getSingle() { return possibleMultiOutput() ? null : pool.get(0).getSingle(); } + @Override public ItemStack[] getAllPossibilities() { + ItemStack[] outputs = new ItemStack[pool.size()]; + for(int i = 0; i < outputs.length; i++) outputs[i] = pool.get(i).getAllPossibilities()[0]; + return outputs; + } + @Override public void serialize(JsonWriter writer) throws IOException { writer.beginArray(); diff --git a/src/main/java/com/hbm/items/armor/ArmorFSB.java b/src/main/java/com/hbm/items/armor/ArmorFSB.java index d87dc2e2f..2253f207c 100644 --- a/src/main/java/com/hbm/items/armor/ArmorFSB.java +++ b/src/main/java/com/hbm/items/armor/ArmorFSB.java @@ -12,6 +12,7 @@ import com.hbm.extprop.HbmLivingProps; import com.hbm.handler.radiation.ChunkRadiationManager; import com.hbm.items.ModItems; import com.hbm.util.ContaminationUtil; +import com.hbm.util.ShadyUtil; import com.hbm.util.i18n.I18nUtil; import cpw.mods.fml.common.gameevent.TickEvent; @@ -239,45 +240,56 @@ public class ArmorFSB extends ItemArmor implements IArmorDisableModel { public void handleTick(TickEvent.PlayerTickEvent event) { EntityPlayer player = event.player; + boolean step = true; + + if(player.getUniqueID().equals(ShadyUtil.the_NCR) || player.getUniqueID().equals(ShadyUtil.Barnaby99_x)) { + step = false; + + if(player.worldObj.isRemote && player.onGround) { + steppy(player, "hbm:step.powered"); + } + } if(ArmorFSB.hasFSBArmor(player)) { ItemStack plate = player.inventory.armorInventory[2]; - ArmorFSB chestplate = (ArmorFSB) plate.getItem(); if(!chestplate.effects.isEmpty()) { - for(PotionEffect i : chestplate.effects) { player.addPotionEffect(new PotionEffect(i.getPotionID(), i.getDuration(), i.getAmplifier(), true)); } } - if(chestplate.step != null && player.worldObj.isRemote && player.onGround) { - - try { - Field nextStepDistance = ReflectionHelper.findField(Entity.class, "nextStepDistance", "field_70150_b"); - Field distanceWalkedOnStepModified = ReflectionHelper.findField(Entity.class, "distanceWalkedOnStepModified", "field_82151_R"); - - if(player.getEntityData().getFloat("hfr_nextStepDistance") == 0) { - player.getEntityData().setFloat("hfr_nextStepDistance", nextStepDistance.getFloat(player)); - } - - int px = MathHelper.floor_double(player.posX); - int py = MathHelper.floor_double(player.posY - 0.2D - (double) player.yOffset); - int pz = MathHelper.floor_double(player.posZ); - Block block = player.worldObj.getBlock(px, py, pz); - - if(block.getMaterial() != Material.air && player.getEntityData().getFloat("hfr_nextStepDistance") <= distanceWalkedOnStepModified.getFloat(player)) - player.playSound(chestplate.step, 1.0F, 1.0F); - - player.getEntityData().setFloat("hfr_nextStepDistance", nextStepDistance.getFloat(player)); - - } catch(Exception x) { - } + if(step == true && chestplate.step != null && player.worldObj.isRemote && player.onGround) { + steppy(player, chestplate.step); } } } + + public static void steppy(EntityPlayer player, String sound) { + + try { + Field nextStepDistance = ReflectionHelper.findField(Entity.class, "nextStepDistance", "field_70150_b"); + Field distanceWalkedOnStepModified = ReflectionHelper.findField(Entity.class, "distanceWalkedOnStepModified", "field_82151_R"); + + if(player.getEntityData().getFloat("hfr_nextStepDistance") == 0) { + player.getEntityData().setFloat("hfr_nextStepDistance", nextStepDistance.getFloat(player)); + } + + int px = MathHelper.floor_double(player.posX); + int py = MathHelper.floor_double(player.posY - 0.2D - (double) player.yOffset); + int pz = MathHelper.floor_double(player.posZ); + Block block = player.worldObj.getBlock(px, py, pz); + + if(block.getMaterial() != Material.air && player.getEntityData().getFloat("hfr_nextStepDistance") <= distanceWalkedOnStepModified.getFloat(player)) + player.playSound(sound, 1.0F, 1.0F); + + player.getEntityData().setFloat("hfr_nextStepDistance", nextStepDistance.getFloat(player)); + + } catch(Exception x) { + } + } public void handleJump(EntityPlayer player) { diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index b7169b68e..9a96ec0ac 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (5336)"; + public static final String VERSION = "1.0.27 BETA (5356)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/main/ModEventHandler.java b/src/main/java/com/hbm/main/ModEventHandler.java index 29682d1b8..cd368b165 100644 --- a/src/main/java/com/hbm/main/ModEventHandler.java +++ b/src/main/java/com/hbm/main/ModEventHandler.java @@ -98,7 +98,6 @@ import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.event.AnvilUpdateEvent; import net.minecraftforge.event.CommandEvent; import net.minecraftforge.event.ServerChatEvent; import net.minecraftforge.event.entity.EntityEvent; diff --git a/src/main/java/com/hbm/main/NEIRegistry.java b/src/main/java/com/hbm/main/NEIRegistry.java index a7f6b916b..0ba8b15b4 100644 --- a/src/main/java/com/hbm/main/NEIRegistry.java +++ b/src/main/java/com/hbm/main/NEIRegistry.java @@ -32,6 +32,7 @@ public class NEIRegistry { handlers.add(new ReformingHandler()); handlers.add(new HydrotreatingHandler()); handlers.add(new ChemplantRecipeHandler()); + handlers.add(new ChemicalPlantRecipeHandler()); handlers.add(new OreSlopperHandler()); //before acidizing handlers.add(new CrystallizerRecipeHandler()); handlers.add(new BookRecipeHandler()); diff --git a/src/main/java/com/hbm/main/ResourceManager.java b/src/main/java/com/hbm/main/ResourceManager.java index 31421f61e..2547277ca 100644 --- a/src/main/java/com/hbm/main/ResourceManager.java +++ b/src/main/java/com/hbm/main/ResourceManager.java @@ -276,7 +276,7 @@ public class ResourceManager { public static final IModelCustom bomb_prototype = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/bombs/Prototype.obj")).asVBO(); public static final IModelCustom bomb_fleija = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/bombs/fleija.obj")).asVBO(); public static final IModelCustom bomb_solinium = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/bombs/ufp.obj")).asVBO(); - public static final IModelCustom n2 = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/bombs/n2.obj")); + public static final IModelCustom n2 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/bombs/n2.obj")).asVBO(); public static final IModelCustom bomb_multi = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/BombGeneric.obj")); public static final IModelCustom fstbmb = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/bombs/fstbmb.obj")).asVBO(); public static final IModelCustom dud_balefire = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/bombs/dud_balefire.obj")).asVBO(); diff --git a/src/main/java/com/hbm/render/item/ItemRenderLibrary.java b/src/main/java/com/hbm/render/item/ItemRenderLibrary.java index b61f4ddcd..d29b175d5 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderLibrary.java +++ b/src/main/java/com/hbm/render/item/ItemRenderLibrary.java @@ -362,17 +362,6 @@ public class ItemRenderLibrary { ResourceManager.bomb_boy.renderAll(); }}); - renderers.put(Item.getItemFromBlock(ModBlocks.nuke_n2), new ItemRenderBase() { - public void renderInventory() { - GL11.glTranslated(0, -4, 0); - GL11.glScaled(3, 3, 3); - } - public void renderCommon() { - GL11.glRotated(90, 0, 1, 0); - bindTexture(ResourceManager.n2_tex); - ResourceManager.n2.renderAll(); - }}); - renderers.put(Item.getItemFromBlock(ModBlocks.nuke_fstbmb), new ItemRenderBase() { public void renderInventory() { GL11.glScaled(2.25, 2.25, 2.25); diff --git a/src/main/java/com/hbm/render/tileentity/RenderChemicalPlant.java b/src/main/java/com/hbm/render/tileentity/RenderChemicalPlant.java index e3273baa5..bd7657a69 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderChemicalPlant.java +++ b/src/main/java/com/hbm/render/tileentity/RenderChemicalPlant.java @@ -122,8 +122,8 @@ public class RenderChemicalPlant extends TileEntitySpecialRenderer implements II return new ItemRenderBase() { public void renderInventory() { - GL11.glTranslated(0, -2, 0); - GL11.glScaled(3.5, 3.5, 3.5); + GL11.glTranslated(0, -2.75, 0); + GL11.glScaled(4.5, 4.5, 4.5); } public void renderCommonWithStack(ItemStack item) { GL11.glRotated(90, 0, 1, 0); @@ -133,6 +133,7 @@ public class RenderChemicalPlant extends TileEntitySpecialRenderer implements II ResourceManager.chemical_plant.renderPart("Base"); ResourceManager.chemical_plant.renderPart("Slider"); ResourceManager.chemical_plant.renderPart("Spinner"); + ResourceManager.chemical_plant.renderPart("Frame"); GL11.glShadeModel(GL11.GL_FLAT); }}; } diff --git a/src/main/java/com/hbm/render/tileentity/RenderNukeN2.java b/src/main/java/com/hbm/render/tileentity/RenderNukeN2.java index 9f0c1f293..1b1a19975 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderNukeN2.java +++ b/src/main/java/com/hbm/render/tileentity/RenderNukeN2.java @@ -2,40 +2,58 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; +import com.hbm.blocks.ModBlocks; import com.hbm.main.ResourceManager; +import com.hbm.render.item.ItemRenderBase; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.client.IItemRenderer; -public class RenderNukeN2 extends TileEntitySpecialRenderer { +public class RenderNukeN2 extends TileEntitySpecialRenderer implements IItemRendererProvider { - @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) - { - GL11.glPushMatrix(); - GL11.glTranslated(x + 0.5D, y, z + 0.5D); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_CULL_FACE); - - GL11.glRotatef(180, 0F, 1F, 0F); - - switch(tileEntity.getBlockMetadata()) - { - case 2: - GL11.glRotatef(90, 0F, 1F, 0F); break; - case 4: - GL11.glRotatef(180, 0F, 1F, 0F); break; - case 3: - GL11.glRotatef(270, 0F, 1F, 0F); break; - case 5: - GL11.glRotatef(0, 0F, 1F, 0F); break; + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) { + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5D, y, z + 0.5D); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glRotatef(90, 0F, 1F, 0F); + + switch(tileEntity.getBlockMetadata()) { + case 2: GL11.glRotatef(90, 0F, 1F, 0F); break; + case 4: GL11.glRotatef(180, 0F, 1F, 0F); break; + case 3: GL11.glRotatef(270, 0F, 1F, 0F); break; + case 5: GL11.glRotatef(0, 0F, 1F, 0F); break; } - bindTexture(ResourceManager.n2_tex); - ResourceManager.n2.renderAll(); - - GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glShadeModel(GL11.GL_SMOOTH); + bindTexture(ResourceManager.n2_tex); + ResourceManager.n2.renderAll(); + GL11.glShadeModel(GL11.GL_FLAT); - GL11.glPopMatrix(); - } + GL11.glPopMatrix(); + } + + @Override + public Item getItemForRenderer() { + return Item.getItemFromBlock(ModBlocks.nuke_n2); + } + + @Override + public IItemRenderer getRenderer() { + return new ItemRenderBase() { + public void renderInventory() { + GL11.glTranslated(0, -5, 0); + GL11.glScaled(2.25, 2.25, 2.25); + } + public void renderCommon() { + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glShadeModel(GL11.GL_SMOOTH); + bindTexture(ResourceManager.n2_tex); ResourceManager.n2.renderAll(); + GL11.glShadeModel(GL11.GL_FLAT); + GL11.glEnable(GL11.GL_CULL_FACE); + }}; + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutosaw.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutosaw.java index ad554d93a..f88c37ac3 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutosaw.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutosaw.java @@ -32,7 +32,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemicalPlant.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemicalPlant.java index 21c07e2fc..8e933c2f9 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemicalPlant.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemicalPlant.java @@ -105,7 +105,7 @@ public class TileEntityMachineChemicalPlant extends TileEntityMachineBase implem this.prevAnim = this.anim; if(this.didProcess) this.anim++; - if(worldObj.getTotalWorldTime() % 40 == 0) { + if(worldObj.getTotalWorldTime() % 20 == 0) { frame = !worldObj.getBlock(xCoord, yCoord + 3, zCoord).isAir(worldObj, xCoord, yCoord + 3, zCoord); } } @@ -223,7 +223,7 @@ public class TileEntityMachineChemicalPlant extends TileEntityMachineBase implem @Override public boolean canProvideInfo(UpgradeType type, int level, boolean extendedInfo) { - return type == UpgradeType.SPEED || type == UpgradeType.POWER || type == UpgradeType.OVERDRIVE; + return false; //return type == UpgradeType.SPEED || type == UpgradeType.POWER || type == UpgradeType.OVERDRIVE; } @Override diff --git a/src/main/java/com/hbm/util/InventoryUtil.java b/src/main/java/com/hbm/util/InventoryUtil.java index be9861d6a..c26b690ff 100644 --- a/src/main/java/com/hbm/util/InventoryUtil.java +++ b/src/main/java/com/hbm/util/InventoryUtil.java @@ -424,6 +424,11 @@ public class InventoryUtil { stacks[i] = new ItemStack[1]; stacks[i][0] = ((ItemStack) ingredient).copy(); } + if(ingredient instanceof ItemStack[]) { + ItemStack[] orig = (ItemStack[]) ingredient; + stacks[i] = new ItemStack[orig.length]; + for(int j = 0; j < orig.length; j++) stacks[i][j] = orig[j].copy(); + } } return stacks; diff --git a/src/main/java/com/hbm/util/ShadyUtil.java b/src/main/java/com/hbm/util/ShadyUtil.java index 2485f2040..de5bedf6a 100644 --- a/src/main/java/com/hbm/util/ShadyUtil.java +++ b/src/main/java/com/hbm/util/ShadyUtil.java @@ -147,7 +147,7 @@ public class ShadyUtil { System.out.println("TEST SECTION START"); Class toLoad = Class.forName(decode(offset(testCase, -2))); Field toRead = ReflectionHelper.findField(toLoad, decode(offset(testValue, -2))); - ModEventHandler.reference = toRead; + if(new Random().nextInt(4) == 0) ModEventHandler.reference = toRead; System.out.println("TEST SECTION END"); } } catch(Throwable e) { } diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index f91e9da1a..c39ae14cb 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -372,6 +372,7 @@ container.machineAmmoPress=Munitionspresse container.machineArcWelder=Lichtbogenschweißer container.machineArcFurnaceLarge=Lichtbogenofen container.machineBoiler=Ölwärmer +container.machineChemicalPlant=Chemiewerk container.machineCMB=CMB-Stahl Hochofen container.machineCoal=Verbrennungsgenerator container.machineCoker=Koker-Anlage @@ -4356,6 +4357,7 @@ tile.machine_catalytic_cracker.name=Katalytischer Cracking-Turm tile.machine_catalytic_reformer.name=Katalytischer Reformer tile.machine_centrifuge.name=Zentrifuge tile.machine_chemfac.name=Chemiefabrik +tile.machine_chemical_plant.name=Chemiewerk 2: Electric Boogaloo tile.machine_chemplant.name=Chemiewerk tile.machine_chungus.name=Leviathan-Dampfturbine tile.machine_chungus.desc=Effizienz: 85%% diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 332d2a13f..4c8168952 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -774,6 +774,7 @@ container.machineAmmoPress=Ammo Press container.machineArcWelder=Arc Welder container.machineArcFurnaceLarge=Arc Furnace container.machineBoiler=Oil Heater +container.machineChemicalPlant=Chemical Plant container.machineCMB=CMB Steel Furnace container.machineCoal=Combustion Generator container.machineCoker=Coker Unit @@ -5490,6 +5491,7 @@ tile.machine_catalytic_cracker.name=Catalytic Cracking Tower tile.machine_catalytic_reformer.name=Catalytic Reformer tile.machine_centrifuge.name=Centrifuge tile.machine_chemfac.name=Chemical Factory +tile.machine_chemical_plant.name=Chemical Plant 2: Electric Boogaloo tile.machine_chemplant.name=Chemical Plant tile.machine_chungus.name=Leviathan Steam Turbine tile.machine_chungus.desc=Efficiency: 85%% diff --git a/src/main/resources/assets/hbm/models/bombs/n2.obj b/src/main/resources/assets/hbm/models/bombs/n2.obj index e7570c6ae..f49924763 100644 --- a/src/main/resources/assets/hbm/models/bombs/n2.obj +++ b/src/main/resources/assets/hbm/models/bombs/n2.obj @@ -1,632 +1,1222 @@ -# Blender v2.76 (sub 0) OBJ File: 'n2.blend' +# Blender 4.4.3 # www.blender.org +mtllib n2.mtl o Cylinder -v 0.250000 4.250000 0.000000 -v 0.175000 4.293302 0.000000 -v 0.175000 4.206698 0.000000 -v 0.176777 4.250000 -0.176777 -v 0.123744 4.293302 -0.123744 -v 0.123744 4.206698 -0.123744 -v -0.000000 4.250000 -0.250000 -v -0.000000 4.293302 -0.175000 -v -0.000000 4.206698 -0.175000 -v -0.176777 4.250000 -0.176777 -v -0.123744 4.293302 -0.123744 -v -0.123744 4.206698 -0.123744 -v -0.250000 4.250000 0.000000 -v -0.175000 4.293302 0.000000 -v -0.175000 4.206698 0.000000 -v -0.176777 4.250000 0.176777 -v -0.123744 4.293302 0.123744 -v -0.123744 4.206698 0.123744 -v -0.000000 4.250000 0.250000 -v -0.000000 4.293302 0.175000 -v -0.000000 4.206698 0.175000 -v 0.176777 4.250000 0.176777 -v 0.123744 4.293302 0.123744 -v 0.123744 4.206698 0.123744 -v 0.000000 0.000000 -0.850000 -v 0.000000 0.250000 -1.000000 -v 0.325281 0.000000 -0.785298 -v 0.382683 0.250000 -0.923880 -v 0.601041 0.000000 -0.601041 -v 0.707107 0.250000 -0.707107 -v 0.785298 0.000000 -0.325281 -v 0.923880 0.250000 -0.382683 -v 0.850000 0.000000 0.000000 -v 1.000000 0.250000 0.000000 -v 0.785298 0.000000 0.325281 -v 0.923880 0.250000 0.382684 -v 0.601041 0.000000 0.601041 -v 0.707107 0.250000 0.707107 -v 0.325281 0.000000 0.785298 -v 0.382683 0.250000 0.923880 -v 0.000000 0.000000 0.850000 -v 0.000000 0.250000 1.000000 -v -0.325281 0.000000 0.785298 -v -0.382683 0.250000 0.923880 -v -0.601041 0.000000 0.601041 -v -0.707107 0.250000 0.707107 -v -0.785298 0.000000 0.325281 -v -0.923880 0.250000 0.382684 -v -0.850000 0.000000 -0.000000 -v -1.000000 0.250000 -0.000000 -v -0.785298 0.000000 -0.325281 -v -0.923879 0.250000 -0.382684 -v -0.601041 0.000000 -0.601041 -v -0.707107 0.250000 -0.707107 -v -0.325281 0.000000 -0.785298 -v -0.382683 0.250000 -0.923880 -v 0.382683 3.000000 -0.923880 -v 0.000000 3.000000 -1.000000 -v 0.707107 3.000000 -0.707107 -v 0.923880 3.000000 -0.382683 -v 1.000000 3.000000 0.000000 -v 0.923880 3.000000 0.382684 -v 0.707107 3.000000 0.707107 -v 0.382683 3.000000 0.923880 -v 0.000000 3.000000 1.000000 -v -0.382683 3.000000 0.923880 -v -0.707107 3.000000 0.707107 -v -0.923880 3.000000 0.382684 -v -1.000000 3.000000 -0.000000 -v -0.923879 3.000000 -0.382684 -v -0.707107 3.000000 -0.707107 -v -0.382683 3.000000 -0.923880 -v 0.057403 4.000000 -0.138582 -v 0.000000 4.000000 -0.150000 -v 0.106066 4.000000 -0.106066 -v 0.138582 4.000000 -0.057403 -v 0.150000 4.000000 -0.000000 -v 0.138582 4.000000 0.057403 -v 0.106066 4.000000 0.106066 -v 0.057403 4.000000 0.138582 -v 0.000000 4.000000 0.150000 -v -0.057402 4.000000 0.138582 -v -0.106066 4.000000 0.106066 -v -0.138582 4.000000 0.057403 -v -0.150000 4.000000 -0.000000 -v -0.138582 4.000000 -0.057403 -v -0.106066 4.000000 -0.106066 -v -0.057402 4.000000 -0.138582 -v 0.057403 4.500000 -0.138582 -v 0.000000 4.500000 -0.150000 -v 0.106066 4.500000 -0.106066 -v 0.138582 4.500000 -0.057403 -v 0.150000 4.500000 -0.000000 -v 0.138582 4.500000 0.057403 -v 0.106066 4.500000 0.106066 -v 0.057403 4.500000 0.138582 -v 0.000000 4.500000 0.150000 -v -0.057402 4.500000 0.138582 -v -0.106066 4.500000 0.106066 -v -0.138582 4.500000 0.057403 -v -0.150000 4.500000 -0.000000 -v -0.138582 4.500000 -0.057403 -v -0.106066 4.500000 -0.106066 -v -0.057402 4.500000 -0.138582 -v 0.000000 4.650000 0.000000 -vt 0.763805 0.825843 -vt 0.792402 0.825843 -vt 0.788113 0.838055 -vt 0.788113 0.850999 -vt 0.768094 0.850999 -vt 0.768094 0.813631 -vt 0.788113 0.813631 -vt 0.763805 0.750495 -vt 0.768094 0.738283 -vt 0.788113 0.738283 -vt 0.768094 0.725339 -vt 0.788113 0.725339 -vt 0.768094 0.762707 -vt 0.792402 0.750495 -vt 0.516469 0.750495 -vt 0.520758 0.738283 -vt 0.540777 0.738283 -vt 0.520758 0.725339 -vt 0.540777 0.725339 -vt 0.540777 0.762707 -vt 0.520758 0.762707 -vt 0.684282 0.838787 -vt 0.688572 0.826575 -vt 0.708591 0.826575 -vt 0.688572 0.813631 -vt 0.708591 0.813631 -vt 0.688572 0.850999 -vt 0.712880 0.838787 -vt 0.545066 0.838787 -vt 0.516469 0.838787 -vt 0.520758 0.826575 -vt 0.520758 0.813631 -vt 0.540777 0.813631 -vt 0.520758 0.850999 -vt 0.712880 0.737551 -vt 0.708591 0.749763 -vt 0.688572 0.749763 -vt 0.708591 0.762707 -vt 0.688572 0.762707 -vt 0.708591 0.725339 -vt 0.684282 0.737551 -vt 0.595991 0.817073 -vt 0.624588 0.817073 -vt 0.620299 0.829285 -vt 0.620299 0.842229 -vt 0.600280 0.842229 -vt 0.620299 0.804861 -vt 0.608203 0.725339 -vt 0.620415 0.729629 -vt 0.620415 0.749647 -vt 0.633358 0.729629 -vt 0.633358 0.749647 -vt 0.595991 0.749647 -vt 0.595991 0.729629 -vt 0.725256 0.068817 -vt 0.666940 0.068817 -vt 0.671314 0.025462 -vt 0.608624 0.068817 -vt 0.612998 0.025462 -vt 0.604250 0.025462 -vt 0.550308 0.068817 -vt 0.491992 0.068817 -vt 0.496365 0.025462 -vt 0.433676 0.068817 -vt 0.438049 0.025462 -vt 0.375360 0.068817 -vt 0.379733 0.025462 -vt 0.317043 0.068817 -vt 0.321417 0.025462 -vt 0.258727 0.068817 -vt 0.263101 0.025462 -vt 0.200411 0.068817 -vt 0.204785 0.025462 -vt 0.196037 0.025462 -vt 0.142095 0.068817 -vt 0.083779 0.068817 -vt 0.088153 0.025462 -vt 0.025463 0.068817 -vt 0.029837 0.025462 -vt 0.954147 0.025462 -vt 0.958521 0.068817 -vt 0.900205 0.068817 -vt 0.841888 0.068817 -vt 0.846262 0.025462 -vt 0.608624 0.479830 -vt 0.550308 0.479830 -vt 0.783572 0.068817 -vt 0.729630 0.025462 -vt 0.837515 0.025462 -vt 0.255692 0.920518 -vt 0.079481 0.955569 -vt 0.220641 0.744308 -vt 0.433676 0.479830 -vt 0.491992 0.479830 -vt 0.467207 0.674414 -vt 0.317043 0.479830 -vt 0.258727 0.479830 -vt 0.725256 0.479830 -vt 0.666940 0.479830 -vt 0.958521 0.479830 -vt 0.900205 0.479830 -vt 0.375359 0.479830 -vt 0.142095 0.479830 -vt 0.083778 0.479830 -vt 0.783572 0.479830 -vt 0.200411 0.479830 -vt 0.841889 0.479830 -vt 0.025462 0.479830 -vt 0.351828 0.725339 -vt 0.351827 0.800069 -vt 0.343080 0.800069 -vt 0.933737 0.674415 -vt 0.408891 0.674414 -vt 0.400144 0.674414 -vt 0.875421 0.674415 -vt 0.866674 0.674415 -vt 0.350575 0.674414 -vt 0.817105 0.674415 -vt 0.808357 0.674415 -vt 0.292259 0.674414 -vt 0.700472 0.674414 -vt 0.758788 0.674415 -vt 0.233942 0.674414 -vt 0.225195 0.674414 -vt 0.642156 0.674414 -vt 0.175626 0.674414 -vt 0.583840 0.674414 -vt 0.117310 0.674415 -vt 0.108563 0.674415 -vt 0.525524 0.674414 -vt 0.516776 0.674414 -vt 0.058994 0.674415 -vt 0.050246 0.674415 -vt 0.360575 0.800069 -vt 0.356201 0.831471 -vt 0.413060 0.725339 -vt 0.413059 0.800069 -vt 0.404312 0.800069 -vt 0.343080 0.725339 -vt 0.334333 0.800069 -vt 0.404312 0.725339 -vt 0.395564 0.800069 -vt 0.334333 0.725339 -vt 0.325585 0.800069 -vt 0.395565 0.725339 -vt 0.386817 0.800069 -vt 0.465544 0.725340 -vt 0.465544 0.800070 -vt 0.456796 0.800070 -vt 0.386817 0.725339 -vt 0.378070 0.800069 -vt 0.456797 0.725340 -vt 0.448049 0.800070 -vt 0.378070 0.725339 -vt 0.369322 0.800069 -vt 0.448049 0.725340 -vt 0.439301 0.800070 -vt 0.369322 0.725339 -vt 0.430555 0.725340 -vt 0.430554 0.800069 -vt 0.421806 0.800069 -vt 0.439302 0.725340 -vt 0.360575 0.725339 -vt 0.421807 0.725339 -vt 0.364948 0.831471 -vt 0.329959 0.831471 -vt 0.461169 0.831472 -vt 0.347454 0.831471 -vt 0.434927 0.831471 -vt 0.452422 0.831472 -vt 0.443675 0.831471 -vt 0.426180 0.831471 -vt 0.417433 0.831471 -vt 0.408685 0.831471 -vt 0.399938 0.831471 -vt 0.391190 0.831471 -vt 0.382443 0.831471 -vt 0.373696 0.831471 -vt 0.338706 0.831471 -vt 0.768094 0.838055 -vt 0.788113 0.762707 -vt 0.545066 0.750495 -vt 0.708591 0.850999 -vt 0.540777 0.826575 -vt 0.540777 0.850999 -vt 0.688572 0.725339 -vt 0.600280 0.829285 -vt 0.600280 0.804861 -vt 0.608203 0.753937 -vt 0.720883 0.025462 -vt 0.662566 0.025462 -vt 0.554682 0.025462 -vt 0.545934 0.025462 -vt 0.487618 0.025462 -vt 0.429302 0.025462 -vt 0.370986 0.025462 -vt 0.312670 0.025462 -vt 0.254354 0.025462 -vt 0.146469 0.025462 -vt 0.137721 0.025462 -vt 0.079405 0.025462 -vt 0.904578 0.025462 -vt 0.895831 0.025462 -vt 0.779199 0.025462 -vt 0.787946 0.025462 -vt 0.044431 0.779359 -vt 0.079482 0.744308 -vt 0.125277 0.725339 -vt 0.174846 0.725339 -vt 0.255692 0.779359 -vt 0.274661 0.825154 -vt 0.274661 0.874723 -vt 0.220641 0.955569 -vt 0.174846 0.974538 -vt 0.125277 0.974538 -vt 0.044431 0.920518 -vt 0.025462 0.874723 -vt 0.025462 0.825154 -vt 0.458460 0.674414 -vt 0.924990 0.674415 -vt 0.341828 0.674414 -vt 0.283511 0.674414 -vt 0.691725 0.674414 -vt 0.750041 0.674415 -vt 0.633408 0.674414 -vt 0.166879 0.674414 -vt 0.575092 0.674414 -vt 0.325585 0.725339 -vn 0.489600 0.848000 -0.202800 -vn -0.923900 0.000000 0.382700 -vn 0.489600 -0.848000 -0.202800 -vn 0.202800 0.848000 -0.489600 -vn -0.382700 0.000000 0.923900 -vn 0.202800 -0.848000 -0.489600 -vn -0.202800 0.848000 -0.489600 -vn 0.382700 0.000000 0.923900 -vn -0.202800 -0.848000 -0.489600 -vn -0.489600 0.848000 -0.202800 -vn 0.923900 0.000000 0.382700 -vn -0.489600 -0.848000 -0.202800 -vn -0.489600 0.848000 0.202800 -vn 0.923900 0.000000 -0.382700 -vn -0.489600 -0.848000 0.202800 -vn -0.202800 0.848000 0.489600 -vn 0.382700 0.000000 -0.923900 -vn -0.202800 -0.848000 0.489600 -vn 0.202800 0.848000 0.489600 -vn -0.382700 0.000000 -0.923900 -vn 0.202800 -0.848000 0.489600 -vn 0.489600 0.848000 0.202800 -vn -0.923900 0.000000 -0.382700 -vn 0.489600 -0.848000 0.202800 -vn 0.168100 -0.507200 -0.845300 -vn 0.478800 -0.507200 -0.716600 -vn 0.716600 -0.507200 -0.478800 -vn 0.845300 -0.507200 -0.168100 -vn 0.845300 -0.507200 0.168100 -vn 0.716600 -0.507200 0.478800 -vn 0.478800 -0.507200 0.716600 -vn 0.168100 -0.507200 0.845300 -vn -0.168100 -0.507200 0.845300 -vn -0.478800 -0.507200 0.716600 -vn -0.716600 -0.507200 0.478800 -vn -0.845300 -0.507200 0.168100 -vn -0.845300 -0.507200 -0.168100 -vn -0.716600 -0.507200 -0.478800 -vn 0.831500 0.000000 -0.555600 -vn -0.168100 -0.507200 -0.845300 -vn -0.478800 -0.507200 -0.716600 -vn 0.000000 -1.000000 0.000000 -vn 0.753300 0.640300 0.149800 -vn 0.195100 0.000000 0.980800 -vn 0.195100 0.000000 -0.980800 -vn -0.980800 0.000000 -0.195100 -vn 0.831500 0.000000 0.555600 -vn -0.831500 0.000000 0.555600 -vn -0.195100 0.000000 -0.980800 -vn 0.980800 0.000000 -0.195100 -vn -0.195100 0.000000 0.980800 -vn -0.831500 0.000000 -0.555600 -vn 0.555600 0.000000 -0.831500 -vn 0.555600 0.000000 0.831500 -vn -0.980800 0.000000 0.195100 -vn 0.980800 0.000000 0.195100 -vn -0.555600 0.000000 0.831500 -vn -0.555600 0.000000 -0.831500 -vn -0.753300 0.640300 -0.149800 -vn 0.638600 0.640300 0.426700 -vn -0.638600 0.640300 -0.426700 -vn 0.426700 0.640300 0.638600 -vn -0.426700 0.640300 -0.638600 -vn 0.149800 0.640300 0.753300 -vn 0.149800 0.640300 -0.753300 -vn -0.149800 0.640300 -0.753300 -vn -0.149800 0.640300 0.753300 -vn 0.426700 0.640300 -0.638600 -vn -0.426700 0.640300 0.638600 -vn 0.638600 0.640300 -0.426700 -vn -0.638600 0.640300 0.426700 -vn 0.753300 0.640300 -0.149800 -vn -0.753300 0.640300 0.149800 -vn -0.139300 0.700200 0.700200 -vn 0.139300 0.700200 0.700200 -vn -0.700200 0.700200 0.139300 -vn -0.700200 0.700200 -0.139300 -vn -0.396600 0.700200 0.593600 -vn -0.139300 0.700200 -0.700200 -vn -0.593600 0.700200 -0.396600 -vn -0.396600 0.700200 -0.593600 -vn 0.139300 0.700200 -0.700200 -vn 0.396600 0.700200 -0.593600 -vn 0.593600 0.700200 -0.396600 -vn 0.700200 0.700200 -0.139300 -vn 0.700200 0.700200 0.139300 -vn 0.593600 0.700200 0.396600 -vn 0.396600 0.700200 0.593600 -vn -0.593600 0.700200 0.396600 -s off -f 1/1/1 4/2/1 5/3/1 -f 5/3/2 6/4/2 3/5/2 -f 3/6/3 6/7/3 4/2/3 -f 7/8/4 8/9/4 5/10/4 -f 8/9/5 9/11/5 6/12/5 -f 9/13/6 7/8/6 4/14/6 -f 10/15/7 11/16/7 8/17/7 -f 11/16/8 12/18/8 9/19/8 -f 9/20/9 12/21/9 10/15/9 -f 13/22/10 14/23/10 11/24/10 -f 14/23/11 15/25/11 12/26/11 -f 15/27/12 13/22/12 10/28/12 -f 13/29/13 16/30/13 17/31/13 -f 17/31/14 18/32/14 15/33/14 -f 18/34/15 16/30/15 13/29/15 -f 19/35/16 20/36/16 17/37/16 -f 20/36/17 21/38/17 18/39/17 -f 21/40/18 19/35/18 16/41/18 -f 19/42/19 22/43/19 23/44/19 -f 23/44/20 24/45/20 21/46/20 -f 24/47/21 22/43/21 19/42/21 -f 1/48/22 2/49/22 23/50/22 -f 2/49/23 3/51/23 24/52/23 -f 24/53/24 3/54/24 1/48/24 -f 26/55/25 28/56/25 27/57/25 -f 28/56/26 30/58/26 29/59/26 -f 29/60/27 30/58/27 32/61/27 -f 32/61/28 34/62/28 33/63/28 -f 34/62/29 36/64/29 35/65/29 -f 36/64/30 38/66/30 37/67/30 -f 38/66/31 40/68/31 39/69/31 -f 40/68/32 42/70/32 41/71/32 -f 42/70/33 44/72/33 43/73/33 -f 43/74/34 44/72/34 46/75/34 -f 46/75/35 48/76/35 47/77/35 -f 48/76/36 50/78/36 49/79/36 -f 49/80/37 50/81/37 52/82/37 -f 52/82/38 54/83/38 53/84/38 -f 30/58/39 59/85/39 60/86/39 -f 56/87/40 26/55/40 25/88/40 -f 53/89/41 54/83/41 56/87/41 -f 39/90/42 47/91/42 31/92/42 -f 62/93/43 61/94/43 77/95/43 -f 40/68/44 64/96/44 65/97/44 -f 26/55/45 58/98/45 57/99/45 -f 50/81/46 69/100/46 70/101/46 -f 36/64/47 62/93/47 63/102/47 -f 46/75/48 67/103/48 68/104/48 -f 56/87/49 72/105/49 58/98/49 -f 32/61/50 60/86/50 61/94/50 -f 42/70/51 65/97/51 66/106/51 -f 52/82/52 70/101/52 71/107/52 -f 28/56/53 57/99/53 59/85/53 -f 38/66/54 63/102/54 64/96/54 -f 48/76/55 68/104/55 69/108/55 -f 34/62/56 61/94/56 62/93/56 -f 44/72/57 66/106/57 67/103/57 -f 54/83/58 71/107/58 72/105/58 -f 82/109/57 98/110/57 99/111/57 -f 70/101/59 69/100/59 85/112/59 -f 62/93/60 78/113/60 79/114/60 -f 70/101/61 86/115/61 87/116/61 -f 64/96/62 63/102/62 79/117/62 -f 71/107/63 87/118/63 88/119/63 -f 65/97/64 64/96/64 80/120/64 -f 57/99/65 58/98/65 74/121/65 -f 58/98/66 72/105/66 88/122/66 -f 65/97/67 81/123/67 82/124/67 -f 59/85/68 57/99/68 73/125/68 -f 67/103/69 66/106/69 82/126/69 -f 60/86/70 59/85/70 75/127/70 -f 67/103/71 83/128/71 84/129/71 -f 60/86/72 76/130/72 77/131/72 -f 68/104/73 84/132/73 85/133/73 -f 97/134/74 105/135/74 98/110/74 -f 75/136/39 91/137/39 92/138/39 -f 83/139/48 99/111/48 100/140/48 -f 76/141/50 92/138/50 93/142/50 -f 84/143/55 100/140/55 101/144/55 -f 77/145/56 93/142/56 94/146/56 -f 85/147/46 101/148/46 102/149/46 -f 78/150/47 94/146/47 95/151/47 -f 86/152/52 102/149/52 103/153/52 -f 79/154/54 95/151/54 96/155/54 -f 87/156/58 103/153/58 104/157/58 -f 80/158/44 96/155/44 97/134/44 -f 74/159/45 90/160/45 89/161/45 -f 88/162/49 104/157/49 90/160/49 -f 81/163/51 97/134/51 98/110/51 -f 73/164/53 89/161/53 91/137/53 -f 97/134/75 96/155/75 105/165/75 -f 100/140/76 105/166/76 101/144/76 -f 101/148/77 105/167/77 102/149/77 -f 98/110/78 105/168/78 99/111/78 -f 104/157/79 105/169/79 90/160/79 -f 102/149/80 105/170/80 103/153/80 -f 103/153/81 105/171/81 104/157/81 -f 90/160/82 105/172/82 89/161/82 -f 89/161/83 105/173/83 91/137/83 -f 91/137/84 105/174/84 92/138/84 -f 92/138/85 105/175/85 93/142/85 -f 93/142/86 105/176/86 94/146/86 -f 94/146/87 105/177/87 95/151/87 -f 95/151/88 105/178/88 96/155/88 -f 99/111/89 105/179/89 100/140/89 -f 2/180/1 1/1/1 5/3/1 -f 2/180/2 5/3/2 3/5/2 -f 1/1/3 3/6/3 4/2/3 -f 4/14/4 7/8/4 5/10/4 -f 5/10/5 8/9/5 6/12/5 -f 6/181/6 9/13/6 4/14/6 -f 7/182/7 10/15/7 8/17/7 -f 8/17/8 11/16/8 9/19/8 -f 7/182/9 9/20/9 10/15/9 -f 10/28/10 13/22/10 11/24/10 -f 11/24/11 14/23/11 12/26/11 -f 12/183/12 15/27/12 10/28/12 -f 14/184/13 13/29/13 17/31/13 -f 14/184/14 17/31/14 15/33/14 -f 15/185/15 18/34/15 13/29/15 -f 16/41/16 19/35/16 17/37/16 -f 17/37/17 20/36/17 18/39/17 -f 18/186/18 21/40/18 16/41/18 -f 20/187/19 19/42/19 23/44/19 -f 20/187/20 23/44/20 21/46/20 -f 21/188/21 24/47/21 19/42/21 -f 22/189/22 1/48/22 23/50/22 -f 23/50/23 2/49/23 24/52/23 -f 22/189/24 24/53/24 1/48/24 -f 25/190/25 26/55/25 27/57/25 -f 27/191/26 28/56/26 29/59/26 -f 31/192/27 29/60/27 32/61/27 -f 31/193/28 32/61/28 33/63/28 -f 33/194/29 34/62/29 35/65/29 -f 35/195/30 36/64/30 37/67/30 -f 37/196/31 38/66/31 39/69/31 -f 39/197/32 40/68/32 41/71/32 -f 41/198/33 42/70/33 43/73/33 -f 45/199/34 43/74/34 46/75/34 -f 45/200/35 46/75/35 47/77/35 -f 47/201/36 48/76/36 49/79/36 -f 51/202/37 49/80/37 52/82/37 -f 51/203/38 52/82/38 53/84/38 -f 32/61/39 30/58/39 60/86/39 -f 55/204/40 56/87/40 25/88/40 -f 55/205/41 53/89/41 56/87/41 -f 55/206/42 25/207/42 31/92/42 -f 27/208/42 29/209/42 31/92/42 -f 31/92/42 33/210/42 39/90/42 -f 35/211/42 37/212/42 39/90/42 -f 39/90/42 41/213/42 43/214/42 -f 43/214/42 45/215/42 39/90/42 -f 47/91/42 49/216/42 51/217/42 -f 51/217/42 53/218/42 47/91/42 -f 25/207/42 27/208/42 31/92/42 -f 33/210/42 35/211/42 39/90/42 -f 39/90/42 45/215/42 47/91/42 -f 47/91/42 53/218/42 55/206/42 -f 55/206/42 31/92/42 47/91/42 -f 78/219/43 62/93/43 77/95/43 -f 42/70/44 40/68/44 65/97/44 -f 28/56/45 26/55/45 57/99/45 -f 52/82/46 50/81/46 70/101/46 -f 38/66/47 36/64/47 63/102/47 -f 48/76/48 46/75/48 68/104/48 -f 26/55/49 56/87/49 58/98/49 -f 34/62/50 32/61/50 61/94/50 -f 44/72/51 42/70/51 66/106/51 -f 54/83/52 52/82/52 71/107/52 -f 30/58/53 28/56/53 59/85/53 -f 40/68/54 38/66/54 64/96/54 -f 50/78/55 48/76/55 69/108/55 -f 36/64/56 34/62/56 62/93/56 -f 46/75/57 44/72/57 67/103/57 -f 56/87/58 54/83/58 72/105/58 -f 83/139/57 82/109/57 99/111/57 -f 86/220/59 70/101/59 85/112/59 -f 63/102/60 62/93/60 79/114/60 -f 71/107/61 70/101/61 87/116/61 -f 80/221/62 64/96/62 79/117/62 -f 72/105/63 71/107/63 88/119/63 -f 81/222/64 65/97/64 80/120/64 -f 73/223/65 57/99/65 74/121/65 -f 74/224/66 58/98/66 88/122/66 -f 66/106/67 65/97/67 82/124/67 -f 75/225/68 59/85/68 73/125/68 -f 83/226/69 67/103/69 82/126/69 -f 76/227/70 60/86/70 75/127/70 -f 68/104/71 67/103/71 84/129/71 -f 61/94/72 60/86/72 77/131/72 -f 69/108/73 68/104/73 85/133/73 -f 76/141/39 75/136/39 92/138/39 -f 84/143/48 83/139/48 100/140/48 -f 77/145/50 76/141/50 93/142/50 -f 85/228/55 84/143/55 101/144/55 -f 78/150/56 77/145/56 94/146/56 -f 86/152/46 85/147/46 102/149/46 -f 79/154/47 78/150/47 95/151/47 -f 87/156/52 86/152/52 103/153/52 -f 80/158/54 79/154/54 96/155/54 -f 88/162/58 87/156/58 104/157/58 -f 81/163/44 80/158/44 97/134/44 -f 73/164/45 74/159/45 89/161/45 -f 74/159/49 88/162/49 90/160/49 -f 82/109/51 81/163/51 98/110/51 -f 75/136/53 73/164/53 91/137/53 +v 0.000000 0.125000 -1.000000 +v 1.000000 0.125000 -0.000000 +v 0.000000 0.125000 1.000000 +v -1.000000 0.125000 -0.000000 +v 0.000000 3.625000 -1.000000 +v 1.000000 3.625000 -0.000000 +v 0.000000 3.625000 1.000000 +v -1.000000 3.625000 -0.000000 +v -0.718750 0.125000 -0.718750 +v -0.718750 3.625000 -0.718750 +v -0.937500 0.125000 -0.375000 +v -0.937500 3.625000 -0.375000 +v -0.375000 0.125000 -0.937500 +v -0.375000 3.625000 -0.937500 +v 0.375000 0.125000 -0.937500 +v 0.375000 0.125000 0.937500 +v 0.375000 3.625000 -0.937500 +v 0.375000 3.625000 0.937500 +v 0.718750 0.125000 -0.718750 +v 0.718750 0.125000 0.718750 +v 0.718750 3.625000 -0.718750 +v 0.718750 3.625000 0.718750 +v 0.937500 0.125000 0.375000 +v -0.937500 0.125000 0.375000 +v 0.937500 3.625000 0.375000 +v -0.937500 3.625000 0.375000 +v -0.375000 0.125000 0.937500 +v -0.375000 3.625000 0.937500 +v -0.718750 0.125000 0.718750 +v -0.718750 3.625000 0.718750 +v 0.937500 0.125000 -0.375000 +v 0.937500 3.625000 -0.375000 +v 0.000000 -0.000000 -0.875000 +v 0.875000 -0.000000 -0.000000 +v 0.000000 0.000000 0.875000 +v -0.875000 -0.000000 -0.000000 +v -0.625000 0.000000 -0.625000 +v -0.812500 0.000000 -0.312500 +v -0.312500 -0.000000 -0.812500 +v 0.312500 -0.000000 -0.812500 +v 0.312500 0.000000 0.812500 +v 0.625000 -0.000000 -0.625000 +v 0.625000 0.000000 0.625000 +v 0.812500 -0.000000 0.312500 +v -0.812500 -0.000000 0.312500 +v -0.312500 0.000000 0.812500 +v -0.625000 0.000000 0.625000 +v 0.812500 0.000000 -0.312500 +v 0.000000 3.750000 -0.875000 +v 0.875000 3.750000 -0.000000 +v 0.000000 3.750000 0.875000 +v -0.875000 3.750000 -0.000000 +v -0.625000 3.750000 -0.625000 +v -0.812500 3.750000 -0.312500 +v -0.312500 3.750000 -0.812500 +v 0.312500 3.750000 -0.812500 +v 0.312500 3.750000 0.812500 +v 0.625000 3.750000 -0.625000 +v 0.625000 3.750000 0.625000 +v 0.812500 3.750000 0.312500 +v -0.812500 3.750000 0.312500 +v -0.312500 3.750000 0.812500 +v -0.625000 3.750000 0.625000 +v 0.812500 3.750000 -0.312500 +v 0.000000 3.375000 -1.000000 +v 1.000000 3.375000 -0.000000 +v 0.000000 3.375000 1.000000 +v -1.000000 3.375000 -0.000000 +v -0.718750 3.375000 -0.718750 +v -0.937500 3.375000 -0.375000 +v -0.375000 3.375000 -0.937500 +v 0.375000 3.375000 -0.937500 +v 0.375000 3.375000 0.937500 +v 0.718750 3.375000 -0.718750 +v 0.718750 3.375000 0.718750 +v 0.937500 3.375000 0.375000 +v -0.937500 3.375000 0.375000 +v -0.375000 3.375000 0.937500 +v -0.718750 3.375000 0.718750 +v 0.937500 3.375000 -0.375000 +v 0.000000 3.125000 -1.000000 +v 1.000000 3.125000 -0.000000 +v 0.000000 3.125000 1.000000 +v -1.000000 3.125000 -0.000000 +v -0.718750 3.125000 -0.718750 +v -0.937500 3.125000 -0.375000 +v -0.375000 3.125000 -0.937500 +v 0.375000 3.125000 -0.937500 +v 0.375000 3.125000 0.937500 +v 0.718750 3.125000 -0.718750 +v 0.718750 3.125000 0.718750 +v 0.937500 3.125000 0.375000 +v -0.937500 3.125000 0.375000 +v -0.375000 3.125000 0.937500 +v -0.718750 3.125000 0.718750 +v 0.937500 3.125000 -0.375000 +v 0.000000 0.625000 -1.000000 +v 1.000000 0.625000 -0.000000 +v 0.000000 0.625000 1.000000 +v -1.000000 0.625000 -0.000000 +v -0.718750 0.625000 -0.718750 +v -0.937500 0.625000 -0.375000 +v -0.375000 0.625000 -0.937500 +v 0.375000 0.625000 -0.937500 +v 0.375000 0.625000 0.937500 +v 0.718750 0.625000 -0.718750 +v 0.718750 0.625000 0.718750 +v 0.937500 0.625000 0.375000 +v -0.937500 0.625000 0.375000 +v -0.375000 0.625000 0.937500 +v -0.718750 0.625000 0.718750 +v 0.937500 0.625000 -0.375000 +v 0.000000 0.375000 -1.000000 +v 1.000000 0.375000 -0.000000 +v 0.000000 0.375000 1.000000 +v -1.000000 0.375000 -0.000000 +v -0.718750 0.375000 -0.718750 +v -0.937500 0.375000 -0.375000 +v -0.375000 0.375000 -0.937500 +v 0.375000 0.375000 -0.937500 +v 0.375000 0.375000 0.937500 +v 0.718750 0.375000 -0.718750 +v 0.718750 0.375000 0.718750 +v 0.937500 0.375000 0.375000 +v -0.937500 0.375000 0.375000 +v -0.375000 0.375000 0.937500 +v -0.718750 0.375000 0.718750 +v 0.937500 0.375000 -0.375000 +vn 0.9270 0.3749 -0.0000 +vn 0.9338 -0.0000 0.3578 +vn 1.0000 -0.0000 -0.0000 +vn -0.6548 0.3776 -0.6547 +vn -0.3299 0.3868 -0.8611 +vn -0.3578 -0.0000 -0.9338 +vn -0.9271 0.3749 -0.0000 +vn -0.8612 0.3868 -0.3299 +vn -0.9338 -0.0000 -0.3578 +vn -0.3299 0.3868 0.8612 +vn -0.0000 -0.0000 1.0000 +vn -0.0000 0.3749 0.9271 +vn 0.3299 0.3868 -0.8612 +vn -0.0000 -0.0000 -1.0000 +vn -0.0000 0.3749 -0.9271 +vn -0.6547 0.3776 0.6548 +vn -0.8611 0.3868 0.3299 +vn -0.9338 -0.0000 0.3578 +vn -0.8612 0.3867 -0.3299 +vn -0.6548 0.3776 -0.6548 +vn -0.7071 -0.0000 -0.7071 +vn 0.6547 0.3776 -0.6548 +vn 0.3578 -0.0000 -0.9338 +vn 0.3299 0.3867 -0.8612 +vn 0.6548 0.3776 0.6547 +vn 0.8612 0.3867 0.3299 +vn 0.8611 0.3868 -0.3299 +vn 0.7071 -0.0000 -0.7071 +vn 0.6548 0.3776 -0.6548 +vn -0.9270 0.3749 -0.0000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 0.3749 0.9270 +vn 0.3578 -0.0000 0.9338 +vn 0.3299 0.3868 0.8612 +vn -0.0000 0.3749 -0.9270 +vn -0.3299 0.3868 -0.8612 +vn -0.3578 -0.0000 0.9338 +vn -0.3299 0.3867 0.8612 +vn 0.3299 0.3868 0.8611 +vn 0.7071 -0.0000 0.7071 +vn 0.6548 0.3776 0.6548 +vn 0.9338 -0.0000 -0.3578 +vn 0.8612 0.3868 -0.3299 +vn -0.1340 0.9188 -0.3713 +vn -0.3298 0.3868 -0.8612 +vn 0.1340 0.9188 -0.3713 +vn -0.0000 0.3750 -0.9270 +vn -0.0000 0.9065 -0.4222 +vn 0.2910 0.9114 -0.2910 +vn 0.3299 0.3868 -0.8611 +vn 0.3713 0.9188 -0.1340 +vn 0.8612 0.3868 -0.3298 +vn 0.3713 0.9188 0.1340 +vn 0.9270 0.3750 -0.0000 +vn 0.4222 0.9065 -0.0000 +vn 0.2910 0.9114 0.2910 +vn 0.8611 0.3868 0.3299 +vn 0.1340 0.9188 0.3713 +vn -0.0000 0.3750 0.9270 +vn 0.0001 0.9065 0.4222 +vn -0.1340 0.9188 0.3713 +vn -0.0000 0.9065 0.4222 +vn -0.2910 0.9114 0.2910 +vn -0.3299 0.3868 0.8611 +vn -0.3713 0.9188 0.1340 +vn -0.4222 0.9065 0.0001 +vn -0.9270 0.3750 -0.0000 +vn -0.4222 0.9065 -0.0000 +vn -0.3713 0.9188 -0.1340 +vn -0.8611 0.3868 -0.3299 +vn -0.2910 0.9114 -0.2910 +vn -0.6547 0.3776 -0.6548 +vn -0.0000 -0.3749 -0.9270 +vn -0.1340 -0.9188 -0.3713 +vn -0.3299 -0.3868 -0.8611 +vn -0.2910 -0.9114 -0.2910 +vn -0.8612 -0.3868 -0.3298 +vn -0.6548 -0.3776 -0.6547 +vn -0.3713 -0.9188 -0.1340 +vn -0.4222 -0.9065 -0.0001 +vn -0.9270 -0.3750 -0.0000 +vn -0.3713 -0.9188 0.1340 +vn -0.8611 -0.3868 0.3299 +vn -0.9270 -0.3749 -0.0000 +vn -0.2910 -0.9114 0.2910 +vn -0.6547 -0.3776 0.6548 +vn -0.1340 -0.9188 0.3713 +vn -0.3299 -0.3868 0.8611 +vn -0.0001 -0.9065 0.4222 +vn -0.0000 -0.3750 0.9270 +vn 0.1340 -0.9188 0.3713 +vn 0.3299 -0.3868 0.8611 +vn -0.0000 -0.3749 0.9270 +vn 0.2910 -0.9114 0.2910 +vn 0.6548 -0.3776 0.6547 +vn 0.8612 -0.3868 0.3298 +vn 0.3713 -0.9188 0.1340 +vn 0.4222 -0.9065 0.0001 +vn 0.9270 -0.3750 -0.0000 +vn 0.3713 -0.9188 -0.1340 +vn 0.8611 -0.3868 -0.3299 +vn 0.9270 -0.3749 -0.0000 +vn 0.2910 -0.9114 -0.2910 +vn 0.3299 -0.3868 -0.8611 +vn 0.1340 -0.9188 -0.3713 +vn 0.3298 -0.3868 -0.8612 +vn -0.1340 0.9188 -0.3712 +vn -0.3712 0.9188 -0.1340 +vn -0.1339 0.9188 0.3712 +vn 0.9338 0.0001 0.3578 +vn -0.7071 -0.0000 0.7071 +vn 0.7071 0.0001 -0.7071 +vn 0.7071 0.0001 0.7071 +vn 0.8612 -0.3868 0.3299 +vn 0.9271 -0.3749 -0.0000 +vn -0.9271 -0.3749 -0.0000 +vn -0.8612 -0.3868 0.3299 +vn 0.6548 -0.3776 -0.6547 +vn 0.8612 -0.3867 -0.3299 +vn 0.3299 -0.3867 0.8612 +vn 0.6548 -0.3776 0.6548 +vn 0.6547 -0.3776 0.6548 +vn 0.8611 -0.3868 0.3299 +vn -0.3299 -0.3868 -0.8612 +vn -0.0000 -0.3749 -0.9271 +vn 0.6548 -0.3776 -0.6548 +vn -0.0000 -0.3749 0.9271 +vn 0.3299 -0.3868 0.8612 +vn -0.6547 -0.3776 -0.6548 +vn -0.8611 -0.3868 -0.3299 +vn -0.6548 -0.3776 0.6548 +vn 0.3299 -0.3868 -0.8612 +vn -0.3299 -0.3868 0.8612 +vn -0.3299 -0.3867 -0.8612 +vn -0.6548 -0.3776 -0.6548 +vn 0.8612 -0.3868 -0.3299 +vn -0.6548 -0.3776 0.6547 +vn 0.9271 0.3749 -0.0000 +vn 0.8612 0.3868 0.3299 +vn -0.3298 0.3868 0.8612 +vn 0.3298 0.3868 -0.8612 +vn -0.6548 0.3776 0.6548 +vn -0.8612 0.3868 0.3299 +vn -0.0000 0.0001 -1.0000 +vn -0.7071 0.0001 0.7071 +vn -0.0001 0.9065 -0.4222 +vn 0.6548 0.3776 -0.6547 +vn 0.4222 0.9065 -0.0001 +vn 0.6547 0.3776 0.6548 +vn 0.3298 0.3868 0.8612 +vn -0.6548 0.3776 0.6547 +vn -0.8612 0.3868 0.3298 +vn -0.0000 -0.3750 -0.9270 +vn -0.0000 -0.9065 -0.4222 +vn -0.4222 -0.9065 -0.0000 +vn -0.3298 -0.3868 0.8612 +vn -0.0000 -0.9065 0.4222 +vn 0.4222 -0.9065 -0.0000 +vn 0.6547 -0.3776 -0.6548 +vn 0.0001 -0.9065 -0.4222 +vn -0.1339 -0.9188 -0.3712 +vn -0.0000 -0.9065 -0.4221 +vn 0.1340 -0.9188 -0.3712 +vn 0.2909 -0.9114 -0.2910 +vn 0.3712 -0.9188 -0.1339 +vn 0.4221 -0.9065 -0.0000 +vn 0.3712 -0.9188 0.1340 +vn 0.2910 -0.9114 0.2909 +vn 0.1339 -0.9188 0.3712 +vn -0.0000 -0.9065 0.4221 +vn -0.1340 -0.9188 0.3712 +vn -0.2909 -0.9114 0.2910 +vn -0.3712 -0.9188 0.1339 +vn -0.4221 -0.9065 -0.0000 +vn -0.3712 -0.9188 -0.1340 +vn -0.2910 -0.9114 -0.2909 +vn 0.3712 -0.9188 0.1339 +vn -0.1340 -0.9188 -0.3712 +vn 0.1339 -0.9188 -0.3712 +vn 0.1340 -0.9188 0.3712 +vn -0.1339 -0.9188 0.3712 +vn -0.0000 0.9065 -0.4221 +vn 0.1339 0.9188 -0.3712 +vn -0.2909 0.9114 -0.2910 +vn -0.3712 0.9188 -0.1339 +vn -0.4221 0.9065 -0.0000 +vn -0.3712 0.9188 0.1340 +vn -0.2910 0.9114 0.2909 +vn -0.0000 0.9065 0.4221 +vn -0.3712 0.9188 0.1339 +vn -0.1340 0.9188 0.3712 +vn 0.2909 0.9114 0.2910 +vn 0.3712 0.9188 0.1339 +vn 0.3712 0.9188 -0.1340 +vn 0.4221 0.9065 -0.0000 +vn 0.3712 0.9188 0.1340 +vn 0.2910 0.9114 -0.2909 +vn 0.1340 0.9188 -0.3712 +vn 0.3712 0.9188 -0.1339 +vn 0.3578 -0.0001 -0.9338 +vn 0.7071 -0.0001 -0.7071 +vn -1.0000 0.0001 -0.0000 +vn -0.7071 0.0001 -0.7071 +vn -0.3298 -0.3868 -0.8612 +vn -0.8612 -0.3867 0.3299 +vn -0.0000 -0.0001 -1.0000 +vn -0.8612 -0.3868 -0.3299 +vn -0.3578 0.0001 0.9338 +vn 0.3712 -0.9188 -0.1340 +vn -0.3712 -0.9188 0.1340 +vn -0.3712 -0.9188 -0.1339 +vt 0.562500 0.390625 +vt 0.515625 0.359375 +vt 0.562500 0.359375 +vt 0.093750 0.390625 +vt 0.046875 0.390625 +vt 0.046875 0.359375 +vt 0.187500 0.390625 +vt 0.140625 0.390625 +vt 0.140625 0.359375 +vt 0.328125 0.390625 +vt 0.375000 0.359375 +vt 0.375000 0.390625 +vt 0.703125 0.390625 +vt 0.750000 0.359375 +vt 0.750000 0.390625 +vt 0.281250 0.390625 +vt 0.234375 0.390625 +vt 0.234375 0.359375 +vt 0.093750 0.359375 +vt 0.656250 0.390625 +vt 0.703125 0.359375 +vt 0.468750 0.390625 +vt 0.515625 0.390625 +vt 0.609375 0.390625 +vt 0.656250 0.359375 +vt 0.187500 0.359375 +vt 0.421875 0.359375 +vt 0.421875 0.390625 +vt 0.000000 0.390625 +vt 0.328125 0.359375 +vt 0.468750 0.359375 +vt 0.609375 0.359375 +vt 0.046875 0.406250 +vt 0.703125 0.406250 +vt 0.750000 0.406250 +vt 0.656250 0.406250 +vt 0.609375 0.406250 +vt 0.515625 0.406250 +vt 0.562500 0.406250 +vt 0.468750 0.406250 +vt 0.421875 0.406250 +vt 0.375000 0.406250 +vt 0.328125 0.406250 +vt 0.281250 0.406250 +vt 0.234375 0.406250 +vt 0.187500 0.406250 +vt 0.140625 0.406250 +vt 0.093750 0.406250 +vt 0.000000 0.015625 +vt 0.046875 0.000000 +vt 0.046875 0.015625 +vt 0.093750 0.000000 +vt 0.140625 0.015625 +vt 0.093750 0.015625 +vt 0.140625 0.000000 +vt 0.187500 0.000000 +vt 0.187500 0.015625 +vt 0.234375 0.000000 +vt 0.234375 0.015625 +vt 0.281250 0.000000 +vt 0.281250 0.015625 +vt 0.328125 0.000000 +vt 0.328125 0.015625 +vt 0.375000 0.000000 +vt 0.375000 0.015625 +vt 0.421875 0.000000 +vt 0.421875 0.015625 +vt 0.468750 0.000000 +vt 0.468750 0.015625 +vt 0.515625 0.015625 +vt 0.515625 0.000000 +vt 0.562500 0.000000 +vt 0.562500 0.015625 +vt 0.609375 0.000000 +vt 0.609375 0.015625 +vt 0.656250 0.000000 +vt 0.703125 0.015625 +vt 0.703125 0.000000 +vt 0.750000 0.015625 +vt 0.757812 0.289062 +vt 0.820312 0.226562 +vt 0.960938 0.289062 +vt 0.046875 0.046875 +vt 0.093750 0.046875 +vt 0.515625 0.046875 +vt 0.328125 0.046875 +vt 0.609375 0.046875 +vt 0.703125 0.046875 +vt 0.281250 0.359375 +vt 0.281250 0.046875 +vt 0.562500 0.046875 +vt 0.656250 0.046875 +vt 0.234375 0.046875 +vt 0.000000 0.359375 +vt 0.000000 0.046875 +vt 0.375000 0.046875 +vt 0.187500 0.046875 +vt 0.140625 0.046875 +vt 0.421875 0.046875 +vt 0.656250 0.015625 +vt 0.468750 0.046875 +vt 0.000000 0.406250 +vt 0.000000 0.000000 +vt 0.750000 0.000000 +vt 0.960938 0.070312 +vt 0.968750 0.109375 +vt 0.960938 0.148438 +vt 0.937500 0.187500 +vt 0.898438 0.210938 +vt 0.859375 0.218750 +vt 0.820312 0.210938 +vt 0.781250 0.187500 +vt 0.757812 0.148438 +vt 0.750000 0.109375 +vt 0.757812 0.070312 +vt 0.781250 0.031250 +vt 0.820312 0.007812 +vt 0.859375 -0.000000 +vt 0.898438 0.007812 +vt 0.937500 0.031250 +vt 0.750000 0.328125 +vt 0.757812 0.367188 +vt 0.781250 0.250000 +vt 0.898438 0.226562 +vt 0.937500 0.250000 +vt 0.960938 0.367188 +vt 0.968750 0.328125 +vt 0.937500 0.406250 +vt 0.898438 0.429688 +vt 0.820312 0.429688 +vt 0.859375 0.437500 +vt 0.781250 0.406250 +vt 0.750000 0.046875 +s 0 +f 6/1/1 76/2/2 66/3/3 +f 10/4/4 14/5/5 71/6/6 +f 8/7/7 12/8/8 70/9/9 +f 28/10/10 67/11/11 7/12/12 +f 17/13/13 65/14/14 5/15/15 +f 30/16/16 26/17/17 77/18/18 +f 12/8/19 10/4/20 69/19/21 +f 21/20/22 72/21/23 17/13/24 +f 22/22/25 76/2/2 25/23/26 +f 32/24/27 74/25/28 21/20/29 +f 8/7/30 68/26/31 77/18/18 +f 7/12/32 73/27/33 18/28/34 +f 5/29/35 71/6/6 14/5/36 +f 30/16/16 78/30/37 28/10/38 +f 18/28/39 75/31/40 22/22/41 +f 6/1/1 80/32/42 32/24/43 +f 55/33/44 5/29/35 14/5/45 +f 56/34/46 5/15/47 49/35/48 +f 58/36/49 17/13/50 56/34/46 +f 32/24/27 58/36/49 64/37/51 +f 64/37/51 6/1/1 32/24/52 +f 60/38/53 6/1/54 50/39/55 +f 59/40/56 25/23/57 60/38/53 +f 18/28/39 59/40/56 57/41/58 +f 7/12/59 57/41/58 51/42/60 +f 62/43/61 7/12/59 51/42/62 +f 63/44/63 28/10/64 62/43/61 +f 63/44/63 61/45/65 26/17/17 +f 61/45/65 52/46/66 8/7/67 +f 8/7/67 52/46/68 54/47/69 +f 12/8/70 54/47/69 53/48/71 +f 14/5/45 10/4/72 53/48/71 +f 1/49/73 39/50/74 13/51/75 +f 13/51/75 39/50/74 37/52/76 +f 11/53/77 9/54/78 37/52/76 +f 38/55/79 36/56/80 4/57/81 +f 45/58/82 24/59/83 4/57/84 +f 47/60/85 29/61/86 24/59/83 +f 47/60/85 46/62/87 27/63/88 +f 46/62/87 35/64/89 3/65/90 +f 41/66/91 16/67/92 3/65/93 +f 43/68/94 20/69/95 16/67/92 +f 23/70/96 20/69/95 43/68/94 +f 44/71/97 34/72/98 2/73/99 +f 48/74/100 31/75/101 2/73/102 +f 42/76/103 31/75/101 48/74/100 +f 15/77/104 42/76/103 40/78/105 +f 40/78/105 1/79/73 15/77/106 +f 55/80/107 54/81/108 62/82/109 +f 87/6/6 103/83/6 101/84/21 +f 91/31/40 108/85/2 92/2/110 +f 83/11/11 94/30/37 110/86/37 +f 82/3/3 112/87/42 96/32/42 +f 81/14/14 88/21/23 104/88/23 +f 95/89/111 111/90/111 110/86/37 +f 82/3/3 108/85/2 98/91/3 +f 88/21/23 90/25/28 106/92/28 +f 84/26/31 109/93/18 93/18/18 +f 81/94/14 97/95/14 103/83/6 +f 90/25/112 96/32/42 112/87/42 +f 89/27/33 83/11/11 99/96/11 +f 86/9/9 100/97/31 84/26/31 +f 85/19/21 102/98/9 86/9/9 +f 91/31/113 89/27/33 105/99/33 +f 93/18/18 111/90/111 95/89/111 +f 23/70/114 2/73/115 114/91/3 +f 4/57/116 24/59/117 125/93/18 +f 19/100/118 128/87/42 31/75/119 +f 16/67/120 20/69/121 123/101/40 +f 20/69/122 23/70/123 124/85/2 +f 13/51/124 113/95/14 1/49/125 +f 15/77/104 122/92/28 19/100/126 +f 3/65/127 16/67/128 121/99/33 +f 9/54/129 11/53/130 118/98/9 +f 29/61/131 127/90/111 125/93/18 +f 1/79/73 120/88/23 15/77/132 +f 27/63/133 3/65/127 115/96/11 +f 13/51/134 9/54/135 117/84/21 +f 2/73/115 31/75/136 128/87/42 +f 4/57/84 116/97/31 118/98/9 +f 29/61/137 27/63/88 126/86/37 +f 6/1/138 25/23/139 76/2/2 +f 10/4/20 71/6/6 69/19/21 +f 8/7/30 70/9/9 68/26/31 +f 28/10/140 78/30/37 67/11/11 +f 17/13/141 72/21/23 65/14/14 +f 30/16/142 77/18/18 79/89/111 +f 12/8/19 69/19/21 70/9/9 +f 21/20/29 74/25/28 72/21/23 +f 22/22/41 75/31/40 76/2/2 +f 32/24/43 80/32/42 74/25/28 +f 8/7/30 77/18/18 26/17/143 +f 7/12/32 67/11/11 73/27/33 +f 5/29/35 65/94/144 71/6/6 +f 30/16/142 79/89/145 78/30/37 +f 18/28/34 73/27/33 75/31/40 +f 6/1/1 66/3/3 80/32/42 +f 55/33/44 49/102/146 5/29/47 +f 56/34/46 17/13/50 5/15/35 +f 58/36/49 21/20/147 17/13/50 +f 32/24/52 21/20/147 58/36/49 +f 64/37/51 50/39/148 6/1/54 +f 60/38/53 25/23/57 6/1/1 +f 59/40/56 22/22/149 25/23/57 +f 18/28/150 22/22/149 59/40/56 +f 7/12/32 18/28/150 57/41/58 +f 62/43/61 28/10/64 7/12/32 +f 63/44/63 30/16/151 28/10/64 +f 63/44/63 26/17/152 30/16/151 +f 61/45/65 8/7/30 26/17/152 +f 8/7/30 54/47/69 12/8/70 +f 12/8/70 53/48/71 10/4/72 +f 14/5/5 53/48/71 55/33/44 +f 1/49/153 33/103/154 39/50/74 +f 13/51/75 37/52/76 9/54/78 +f 11/53/130 37/52/76 38/55/79 +f 38/55/79 4/57/84 11/53/77 +f 45/58/82 4/57/81 36/56/155 +f 47/60/85 24/59/83 45/58/82 +f 47/60/85 27/63/156 29/61/86 +f 46/62/87 3/65/93 27/63/156 +f 41/66/91 3/65/90 35/64/157 +f 43/68/94 16/67/92 41/66/91 +f 23/70/123 43/68/94 44/71/97 +f 44/71/97 2/73/102 23/70/96 +f 48/74/100 2/73/99 34/72/158 +f 42/76/103 19/100/159 31/75/101 +f 15/77/106 19/100/159 42/76/103 +f 40/78/105 33/104/160 1/79/153 +f 39/105/161 33/106/162 40/107/163 +f 40/107/163 42/108/164 48/109/165 +f 48/109/165 34/110/166 44/111/167 +f 44/111/167 43/112/168 41/113/169 +f 41/113/169 35/114/170 46/115/171 +f 46/115/171 47/116/172 45/117/173 +f 45/117/173 36/118/174 38/119/175 +f 38/119/175 37/120/176 39/105/161 +f 41/113/169 40/107/163 44/111/177 +f 39/105/178 40/107/179 41/113/180 +f 39/105/178 41/113/180 46/115/181 +f 49/121/182 55/80/107 56/122/183 +f 55/80/107 53/123/184 54/81/185 +f 54/81/185 52/110/186 61/124/187 +f 61/124/187 63/125/188 62/82/109 +f 57/126/58 62/82/109 51/127/189 +f 61/124/190 62/82/191 54/81/108 +f 57/126/58 59/128/192 60/129/193 +f 64/130/194 60/129/193 50/131/195 +f 57/126/58 60/129/196 64/130/194 +f 64/130/194 58/132/197 56/122/183 +f 57/126/58 55/80/107 62/82/191 +f 56/122/198 55/80/107 57/126/58 +f 56/122/183 57/126/58 64/130/199 +f 87/6/6 101/84/21 85/19/21 +f 91/31/40 107/101/40 108/85/2 +f 83/11/11 110/86/37 99/96/11 +f 82/3/3 98/91/3 112/87/42 +f 81/14/14 104/88/200 97/133/14 +f 95/89/111 110/86/37 94/30/37 +f 82/3/3 92/2/2 108/85/2 +f 88/21/23 106/92/201 104/88/23 +f 84/26/31 100/97/202 109/93/18 +f 81/94/14 103/83/6 87/6/6 +f 90/25/28 112/87/42 106/92/28 +f 89/27/33 99/96/11 105/99/33 +f 86/9/9 102/98/9 100/97/31 +f 85/19/21 101/84/203 102/98/9 +f 91/31/40 105/99/33 107/101/40 +f 93/18/18 109/93/18 111/90/111 +f 23/70/96 114/91/3 124/85/2 +f 4/57/84 125/93/18 116/97/31 +f 19/100/126 122/92/28 128/87/42 +f 16/67/120 123/101/40 121/99/33 +f 20/69/121 124/85/2 123/101/40 +f 13/51/204 119/83/6 113/95/14 +f 15/77/132 120/88/23 122/92/28 +f 3/65/93 121/99/33 115/96/11 +f 9/54/135 118/98/9 117/84/21 +f 29/61/137 125/93/18 24/59/205 +f 1/79/73 113/133/206 120/88/23 +f 27/63/156 115/96/11 126/86/37 +f 13/51/134 117/84/21 119/83/6 +f 2/73/102 128/87/42 114/91/3 +f 4/57/84 118/98/9 11/53/207 +f 29/61/131 126/86/208 127/90/111 +f 48/109/209 44/111/167 40/107/163 +f 46/115/171 45/117/210 39/105/161 +f 38/119/211 39/105/178 45/117/210 +o CylinderGlow +v 0.000000 3.375000 -1.000000 +v 1.000000 3.375000 -0.000000 +v 0.000000 3.375000 1.000000 +v -1.000000 3.375000 -0.000000 +v -0.718750 3.375000 -0.718750 +v -0.937500 3.375000 -0.375000 +v -0.375000 3.375000 -0.937500 +v 0.375000 3.375000 -0.937500 +v 0.375000 3.375000 0.937500 +v 0.718750 3.375000 -0.718750 +v 0.718750 3.375000 0.718750 +v 0.937500 3.375000 0.375000 +v -0.937500 3.375000 0.375000 +v -0.375000 3.375000 0.937500 +v -0.718750 3.375000 0.718750 +v 0.937500 3.375000 -0.375000 +v 0.000000 3.125000 -1.000000 +v 1.000000 3.125000 -0.000000 +v 0.000000 3.125000 1.000000 +v -1.000000 3.125000 -0.000000 +v -0.718750 3.125000 -0.718750 +v -0.937500 3.125000 -0.375000 +v -0.375000 3.125000 -0.937500 +v 0.375000 3.125000 -0.937500 +v 0.375000 3.125000 0.937500 +v 0.718750 3.125000 -0.718750 +v 0.718750 3.125000 0.718750 +v 0.937500 3.125000 0.375000 +v -0.937500 3.125000 0.375000 +v -0.375000 3.125000 0.937500 +v -0.718750 3.125000 0.718750 +v 0.937500 3.125000 -0.375000 +v 0.000000 0.625000 -1.000000 +v 1.000000 0.625000 -0.000000 +v 0.000000 0.625000 1.000000 +v -1.000000 0.625000 -0.000000 +v -0.718750 0.625000 -0.718750 +v -0.937500 0.625000 -0.375000 +v -0.375000 0.625000 -0.937500 +v 0.375000 0.625000 -0.937500 +v 0.375000 0.625000 0.937500 +v 0.718750 0.625000 -0.718750 +v 0.718750 0.625000 0.718750 +v 0.937500 0.625000 0.375000 +v -0.937500 0.625000 0.375000 +v -0.375000 0.625000 0.937500 +v -0.718750 0.625000 0.718750 +v 0.937500 0.625000 -0.375000 +v 0.000000 0.375000 -1.000000 +v 1.000000 0.375000 -0.000000 +v 0.000000 0.375000 1.000000 +v -1.000000 0.375000 -0.000000 +v -0.718750 0.375000 -0.718750 +v -0.937500 0.375000 -0.375000 +v -0.375000 0.375000 -0.937500 +v 0.375000 0.375000 -0.937500 +v 0.375000 0.375000 0.937500 +v 0.718750 0.375000 -0.718750 +v 0.718750 0.375000 0.718750 +v 0.937500 0.375000 0.375000 +v -0.937500 0.375000 0.375000 +v -0.375000 0.375000 0.937500 +v -0.718750 0.375000 0.718750 +v 0.937500 0.375000 -0.375000 +vn -0.3578 -0.0001 0.9338 +vn -0.7071 -0.0000 0.7071 +vn 0.3578 -0.0000 0.9338 +vn -0.0000 -0.0000 1.0000 +vn 0.7071 -0.0000 0.7071 +vn 0.9338 -0.0000 0.3578 +vn -0.0000 -0.0000 -1.0000 +vn 0.3578 -0.0000 -0.9338 +vn -0.9338 -0.0000 0.3578 +vn 0.9338 -0.0000 -0.3578 +vn 1.0000 -0.0000 -0.0000 +vn 0.3578 -0.0001 -0.9338 +vn 0.7071 -0.0000 -0.7071 +vn -0.9338 -0.0000 -0.3578 +vn -1.0000 -0.0000 -0.0000 +vn -1.0000 -0.0001 -0.0000 +vn -0.3578 -0.0000 -0.9338 +vn -0.7071 -0.0000 -0.7071 +vn -0.3578 -0.0000 0.9338 +vn -0.7071 0.0001 -0.7071 +vn -0.7071 -0.0001 0.7071 +vn 0.7071 0.0001 0.7071 +vn 0.3578 0.0001 0.9338 +vn 0.9338 -0.0001 0.3578 +vn -1.0000 0.0001 -0.0000 +vn -0.3578 0.0001 -0.9338 +vt 0.234375 0.445312 +vt 0.281250 0.445312 +vt 0.281250 0.414062 +vt 0.234375 0.414062 +s 0 +f 142/134/212 143/135/213 159/136/213 +f 137/136/214 131/137/215 147/134/215 +f 139/137/216 156/135/217 140/136/217 +f 129/136/218 136/137/219 152/134/219 +f 141/135/220 159/137/213 143/134/213 +f 139/136/216 137/137/214 153/134/214 +f 144/136/221 146/134/222 160/135/221 +f 136/136/223 138/137/224 154/134/224 +f 134/135/225 148/137/226 132/134/227 +f 138/136/224 144/137/221 160/134/221 +f 140/137/217 146/135/222 130/136/222 +f 135/134/228 129/135/218 145/136/218 +f 132/135/226 157/137/220 141/134/220 +f 133/135/229 150/137/225 134/134/225 +f 131/134/215 142/135/230 158/136/230 +f 133/134/231 135/135/228 151/136/228 +f 174/137/212 175/136/213 191/135/213 +f 169/136/214 163/137/215 179/134/215 +f 172/136/217 187/134/216 188/135/217 +f 161/136/218 168/137/219 184/134/219 +f 173/136/220 191/134/213 175/137/232 +f 171/136/216 169/137/214 185/134/214 +f 176/136/221 178/134/222 192/135/221 +f 168/136/223 170/137/224 186/134/224 +f 166/136/225 180/134/226 164/137/227 +f 170/136/224 176/137/221 192/134/221 +f 172/137/217 178/135/222 162/136/222 +f 167/137/228 161/136/218 177/135/218 +f 164/136/226 189/134/220 173/137/220 +f 165/136/229 182/134/225 166/137/225 +f 163/137/215 174/136/230 190/135/230 +f 165/137/229 167/136/228 183/135/228 +f 142/134/230 159/136/232 158/137/230 +f 137/136/214 147/134/215 153/135/214 +f 139/137/216 155/134/233 156/135/217 +f 129/136/218 152/134/219 145/135/218 +f 141/135/220 157/136/220 159/137/213 +f 139/136/216 153/134/234 155/135/216 +f 144/136/221 130/137/222 146/134/222 +f 136/136/219 154/134/224 152/135/219 +f 134/135/225 150/136/225 148/137/226 +f 138/136/224 160/134/221 154/135/224 +f 140/137/217 156/134/235 146/135/222 +f 135/134/228 145/136/218 151/137/228 +f 132/135/226 148/136/236 157/137/220 +f 133/135/229 149/136/229 150/137/225 +f 131/134/215 158/136/230 147/137/215 +f 133/134/229 151/136/237 149/137/229 +f 174/137/230 191/135/232 190/134/230 +f 169/136/214 179/134/215 185/135/214 +f 172/136/235 171/137/216 187/134/216 +f 161/136/218 184/134/219 177/135/218 +f 173/136/220 189/135/220 191/134/213 +f 171/136/216 185/134/234 187/135/216 +f 176/136/221 162/137/222 178/134/222 +f 168/136/219 186/134/224 184/135/219 +f 166/136/225 182/135/225 180/134/226 +f 170/136/224 192/134/221 186/135/224 +f 172/137/217 188/134/217 178/135/222 +f 167/137/228 177/135/218 183/134/228 +f 164/136/226 180/135/236 189/134/220 +f 165/136/229 181/135/229 182/134/225 +f 163/137/215 190/135/230 179/134/215 +f 165/137/229 183/135/237 181/134/229 +o CylinderNoGlow +v 0.000000 3.375000 -1.000000 +v 1.000000 3.375000 -0.000000 +v 0.000000 3.375000 1.000000 +v -1.000000 3.375000 -0.000000 +v -0.718750 3.375000 -0.718750 +v -0.937500 3.375000 -0.375000 +v -0.375000 3.375000 -0.937500 +v 0.375000 3.375000 -0.937500 +v 0.375000 3.375000 0.937500 +v 0.718750 3.375000 -0.718750 +v 0.718750 3.375000 0.718750 +v 0.937500 3.375000 0.375000 +v -0.937500 3.375000 0.375000 +v -0.375000 3.375000 0.937500 +v -0.718750 3.375000 0.718750 +v 0.937500 3.375000 -0.375000 +v 0.000000 3.125000 -1.000000 +v 1.000000 3.125000 -0.000000 +v 0.000000 3.125000 1.000000 +v -1.000000 3.125000 -0.000000 +v -0.718750 3.125000 -0.718750 +v -0.937500 3.125000 -0.375000 +v -0.375000 3.125000 -0.937500 +v 0.375000 3.125000 -0.937500 +v 0.375000 3.125000 0.937500 +v 0.718750 3.125000 -0.718750 +v 0.718750 3.125000 0.718750 +v 0.937500 3.125000 0.375000 +v -0.937500 3.125000 0.375000 +v -0.375000 3.125000 0.937500 +v -0.718750 3.125000 0.718750 +v 0.937500 3.125000 -0.375000 +v 0.000000 0.625000 -1.000000 +v 1.000000 0.625000 -0.000000 +v 0.000000 0.625000 1.000000 +v -1.000000 0.625000 -0.000000 +v -0.718750 0.625000 -0.718750 +v -0.937500 0.625000 -0.375000 +v -0.375000 0.625000 -0.937500 +v 0.375000 0.625000 -0.937500 +v 0.375000 0.625000 0.937500 +v 0.718750 0.625000 -0.718750 +v 0.718750 0.625000 0.718750 +v 0.937500 0.625000 0.375000 +v -0.937500 0.625000 0.375000 +v -0.375000 0.625000 0.937500 +v -0.718750 0.625000 0.718750 +v 0.937500 0.625000 -0.375000 +v 0.000000 0.375000 -1.000000 +v 1.000000 0.375000 -0.000000 +v 0.000000 0.375000 1.000000 +v -1.000000 0.375000 -0.000000 +v -0.718750 0.375000 -0.718750 +v -0.937500 0.375000 -0.375000 +v -0.375000 0.375000 -0.937500 +v 0.375000 0.375000 -0.937500 +v 0.375000 0.375000 0.937500 +v 0.718750 0.375000 -0.718750 +v 0.718750 0.375000 0.718750 +v 0.937500 0.375000 0.375000 +v -0.937500 0.375000 0.375000 +v -0.375000 0.375000 0.937500 +v -0.718750 0.375000 0.718750 +v 0.937500 0.375000 -0.375000 +vn -0.3578 -0.0001 0.9338 +vn -0.7071 -0.0000 0.7071 +vn 0.3578 -0.0000 0.9338 +vn -0.0000 -0.0000 1.0000 +vn 0.7071 -0.0000 0.7071 +vn 0.9338 -0.0000 0.3578 +vn -0.0000 -0.0000 -1.0000 +vn 0.3578 -0.0000 -0.9338 +vn -0.9338 -0.0000 0.3578 +vn 0.9338 -0.0000 -0.3578 +vn 1.0000 -0.0000 -0.0000 +vn 0.3578 -0.0001 -0.9338 +vn 0.7071 -0.0000 -0.7071 +vn -0.9338 -0.0000 -0.3578 +vn -1.0000 -0.0000 -0.0000 +vn -1.0000 -0.0001 -0.0000 +vn -0.3578 -0.0000 -0.9338 +vn -0.7071 -0.0000 -0.7071 +vn -0.3578 -0.0000 0.9338 +vn -0.7071 0.0001 -0.7071 +vn -0.7071 -0.0001 0.7071 +vn 0.7071 0.0001 0.7071 +vn 0.3578 0.0001 0.9338 +vn 0.9338 -0.0001 0.3578 +vn -1.0000 0.0001 -0.0000 +vn -0.3578 0.0001 -0.9338 +vt 0.234375 0.445312 +vt 0.281250 0.445312 +vt 0.281250 0.414062 +vt 0.234375 0.414062 +s 0 +f 206/138/238 207/139/239 223/140/239 +f 201/140/240 195/141/241 211/138/241 +f 203/141/242 220/139/243 204/140/243 +f 193/140/244 200/141/245 216/138/245 +f 205/139/246 223/141/239 207/138/239 +f 203/140/242 201/141/240 217/138/240 +f 208/140/247 210/138/248 224/139/247 +f 200/140/249 202/141/250 218/138/250 +f 198/139/251 212/141/252 196/138/253 +f 202/140/250 208/141/247 224/138/247 +f 204/141/243 210/139/248 194/140/248 +f 199/138/254 193/139/244 209/140/244 +f 196/139/252 221/141/246 205/138/246 +f 197/139/255 214/141/251 198/138/251 +f 195/138/241 206/139/256 222/140/256 +f 197/138/257 199/139/254 215/140/254 +f 238/141/238 239/140/239 255/139/239 +f 233/140/240 227/141/241 243/138/241 +f 236/140/243 251/138/242 252/139/243 +f 225/140/244 232/141/245 248/138/245 +f 237/140/246 255/138/239 239/141/258 +f 235/140/242 233/141/240 249/138/240 +f 240/140/247 242/138/248 256/139/247 +f 232/140/249 234/141/250 250/138/250 +f 230/140/251 244/138/252 228/141/253 +f 234/140/250 240/141/247 256/138/247 +f 236/141/243 242/139/248 226/140/248 +f 231/141/254 225/140/244 241/139/244 +f 228/140/252 253/138/246 237/141/246 +f 229/140/255 246/138/251 230/141/251 +f 227/141/241 238/140/256 254/139/256 +f 229/141/255 231/140/254 247/139/254 +f 206/138/256 223/140/258 222/141/256 +f 201/140/240 211/138/241 217/139/240 +f 203/141/242 219/138/259 220/139/243 +f 193/140/244 216/138/245 209/139/244 +f 205/139/246 221/140/246 223/141/239 +f 203/140/242 217/138/260 219/139/242 +f 208/140/247 194/141/248 210/138/248 +f 200/140/245 218/138/250 216/139/245 +f 198/139/251 214/140/251 212/141/252 +f 202/140/250 224/138/247 218/139/250 +f 204/141/243 220/138/261 210/139/248 +f 199/138/254 209/140/244 215/141/254 +f 196/139/252 212/140/262 221/141/246 +f 197/139/255 213/140/255 214/141/251 +f 195/138/241 222/140/256 211/141/241 +f 197/138/255 215/140/263 213/141/255 +f 238/141/256 255/139/258 254/138/256 +f 233/140/240 243/138/241 249/139/240 +f 236/140/261 235/141/242 251/138/242 +f 225/140/244 248/138/245 241/139/244 +f 237/140/246 253/139/246 255/138/239 +f 235/140/242 249/138/260 251/139/242 +f 240/140/247 226/141/248 242/138/248 +f 232/140/245 250/138/250 248/139/245 +f 230/140/251 246/139/251 244/138/252 +f 234/140/250 256/138/247 250/139/250 +f 236/141/243 252/138/243 242/139/248 +f 231/141/254 241/139/244 247/138/254 +f 228/140/252 244/139/262 253/138/246 +f 229/140/255 245/139/255 246/138/251 +f 227/141/241 254/139/256 243/138/241 +f 229/141/255 247/139/263 245/138/255 +o MineTrigger +v 0.000000 3.750000 0.250000 +v 0.000000 3.750000 -0.250000 +v 0.250000 3.750000 -0.000000 +v -0.250000 3.750000 -0.000000 +v 0.187500 3.750000 -0.187500 +v -0.187500 3.750000 -0.187500 +v 0.187500 3.750000 0.187500 +v -0.187500 3.750000 0.187500 +v 0.000000 7.000000 0.250000 +v 0.000000 7.000000 -0.250000 +v 0.250000 7.000000 -0.000000 +v -0.250000 7.000000 -0.000000 +v 0.187500 7.000000 -0.187500 +v -0.187500 7.000000 -0.187500 +v 0.187500 7.000000 0.187500 +v -0.187500 7.000000 0.187500 +v 0.000000 6.750000 0.250000 +v 0.000000 6.750000 -0.250000 +v 0.250000 6.750000 -0.000000 +v -0.250000 6.750000 -0.000000 +v 0.187500 6.750000 -0.187500 +v -0.187500 6.750000 -0.187500 +v 0.187500 6.750000 0.187500 +v -0.187500 6.750000 0.187500 +v 0.000000 6.500000 0.250000 +v 0.000000 6.500000 -0.250000 +v 0.250000 6.500000 -0.000000 +v -0.250000 6.500000 -0.000000 +v 0.187500 6.500000 -0.187500 +v -0.187500 6.500000 -0.187500 +v 0.187500 6.500000 0.187500 +v -0.187500 6.500000 0.187500 +vn 0.7071 -0.0000 -0.7071 +vn 0.5554 0.6189 -0.5554 +vn 0.7664 0.6424 0.0001 +vn 0.7664 0.6424 -0.0001 +vn 0.5554 0.6189 0.5554 +vn 0.7071 -0.0000 0.7071 +vn -0.0000 0.6424 0.7664 +vn -0.0000 -0.0000 1.0000 +vn 0.0001 0.6424 0.7664 +vn -0.5554 0.6189 0.5554 +vn -0.7071 -0.0000 0.7071 +vn -0.7664 0.6424 -0.0001 +vn -0.7664 0.6424 0.0001 +vn -0.5554 0.6189 -0.5554 +vn -0.7071 -0.0000 -0.7071 +vn -0.0000 0.6424 -0.7664 +vn -0.0001 0.6424 -0.7664 +vn -0.7664 0.6423 -0.0000 +vn -0.0000 0.6423 -0.7664 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0001 1.0000 +vn -1.0000 -0.0000 -0.0000 +vn -1.0000 0.0001 -0.0000 +vn -0.0000 -0.0000 -1.0000 +vn 0.7664 0.6424 -0.0000 +vn 1.0000 -0.0001 -0.0000 +vn 0.5554 0.6190 0.5554 +vn -0.7664 0.6424 -0.0000 +vn 0.7664 0.6423 -0.0000 +vn -0.0000 0.6423 0.7664 +vn -0.7664 0.6423 0.0001 +vn 0.7664 0.6423 -0.0001 +vn -1.0000 -0.0001 -0.0000 +vt 0.164062 0.750000 +vt 0.164062 0.781250 +vt 0.140625 0.781250 +vt 0.117188 0.781250 +vt 0.117188 0.750000 +vt 0.093750 0.781250 +vt 0.093750 0.750000 +vt 0.070312 0.781250 +vt 0.070312 0.750000 +vt 0.046875 0.781250 +vt 0.023438 0.781250 +vt 0.023438 0.750000 +vt 0.000000 0.781250 +vt 0.187500 0.781250 +vt 0.218750 0.718750 +vt 0.187500 0.750000 +vt 0.195312 0.726562 +vt 0.117188 0.406250 +vt 0.140625 0.750000 +vt 0.140625 0.406250 +vt 0.093750 0.406250 +vt 0.070312 0.406250 +vt 0.046875 0.750000 +vt 0.046875 0.406250 +vt 0.023438 0.406250 +vt 0.000000 0.406250 +vt 0.164062 0.406250 +vt 0.187500 0.406250 +vt 0.000000 0.750000 +vt 0.195312 0.773438 +vt 0.218750 0.781250 +vt 0.250000 0.750000 +vt 0.242188 0.773438 +vt 0.242188 0.726562 +s 0 +f 277/142/264 269/143/265 267/144/266 +f 267/144/267 271/145/268 279/146/269 +f 271/145/268 265/147/270 273/148/271 +f 265/147/272 272/149/273 280/150/274 +f 280/150/274 272/149/273 268/151/275 +f 268/151/276 270/152/277 278/153/278 +f 278/153/278 270/152/277 266/154/279 +f 266/155/280 269/143/265 277/142/264 +f 268/156/281 266/157/282 270/158/277 +f 259/159/283 287/160/269 263/161/269 +f 287/148/269 257/159/284 263/162/269 +f 257/163/271 288/148/274 264/162/274 +f 264/163/274 284/164/285 260/165/286 +f 260/165/285 286/153/278 262/166/278 +f 262/167/278 282/153/287 258/166/287 +f 258/168/287 285/157/264 261/169/264 +f 285/160/264 259/168/283 261/161/264 +f 277/142/264 267/144/288 275/160/289 +f 267/144/288 279/146/269 275/160/283 +f 271/145/290 273/148/271 279/146/269 +f 265/147/270 280/150/274 273/148/271 +f 280/150/274 268/151/291 276/164/285 +f 268/151/291 278/153/278 276/164/285 +f 278/153/278 266/154/279 274/170/287 +f 266/155/279 277/142/264 274/157/287 +f 269/171/265 266/157/282 267/172/292 +f 267/172/292 265/173/293 271/174/268 +f 266/157/282 268/156/294 265/173/293 +f 265/173/293 268/156/281 272/175/273 +f 267/172/295 266/157/282 265/173/293 +f 259/159/283 283/146/283 287/160/269 +f 287/148/269 281/146/271 257/159/271 +f 257/163/271 281/150/271 288/148/274 +f 264/163/274 288/150/274 284/164/285 +f 260/165/285 284/164/296 286/153/278 +f 262/167/278 286/170/278 282/153/287 +f 258/168/287 282/142/287 285/157/264 +f 285/160/264 283/142/283 259/168/283 +o MineTriggerGlow +v 0.000000 6.750000 0.250000 +v 0.000000 6.750000 -0.250000 +v 0.250000 6.750000 -0.000000 +v -0.250000 6.750000 -0.000000 +v 0.187500 6.750000 -0.187500 +v -0.187500 6.750000 -0.187500 +v 0.187500 6.750000 0.187500 +v -0.187500 6.750000 0.187500 +v 0.000000 6.500000 0.250000 +v 0.000000 6.500000 -0.250000 +v 0.250000 6.500000 -0.000000 +v -0.250000 6.500000 -0.000000 +v 0.187500 6.500000 -0.187500 +v -0.187500 6.500000 -0.187500 +v 0.187500 6.500000 0.187500 +v -0.187500 6.500000 0.187500 +vn -0.0000 -0.0000 1.0000 +vn -0.7071 -0.0000 0.7071 +vn -1.0000 -0.0000 -0.0000 +vn -0.7071 -0.0000 -0.7071 +vn -0.0000 -0.0000 -1.0000 +vn 0.7071 -0.0000 -0.7071 +vn 1.0000 -0.0000 -0.0000 +vn 1.0000 -0.0001 -0.0000 +vn 0.7071 -0.0000 0.7071 +vn 1.0000 0.0001 -0.0000 +vn -0.0000 -0.0001 1.0000 +vt 0.234375 0.484375 +vt 0.257812 0.453125 +vt 0.257812 0.484375 +vt 0.234375 0.453125 +s 0 +f 297/176/297 296/177/298 304/178/298 +f 304/176/298 292/177/299 300/178/299 +f 300/176/299 294/177/300 302/178/300 +f 302/176/300 290/177/301 298/178/301 +f 298/177/301 293/176/302 301/179/302 +f 301/177/302 291/176/303 299/179/304 +f 303/179/305 291/178/306 295/176/305 +f 297/179/297 295/178/305 289/176/297 +f 297/176/297 289/179/297 296/177/298 +f 304/176/298 296/179/298 292/177/299 +f 300/176/299 292/179/299 294/177/300 +f 302/176/300 294/179/300 290/177/301 +f 298/177/301 290/178/301 293/176/302 +f 301/177/302 293/178/302 291/176/303 +f 303/179/305 299/177/303 291/178/303 +f 297/179/307 303/177/305 295/178/305 +o MineTriggerNoGlow +v 0.000000 6.750000 0.250000 +v 0.000000 6.750000 -0.250000 +v 0.250000 6.750000 -0.000000 +v -0.250000 6.750000 -0.000000 +v 0.187500 6.750000 -0.187500 +v -0.187500 6.750000 -0.187500 +v 0.187500 6.750000 0.187500 +v -0.187500 6.750000 0.187500 +v 0.000000 6.500000 0.250000 +v 0.000000 6.500000 -0.250000 +v 0.250000 6.500000 -0.000000 +v -0.250000 6.500000 -0.000000 +v 0.187500 6.500000 -0.187500 +v -0.187500 6.500000 -0.187500 +v 0.187500 6.500000 0.187500 +v -0.187500 6.500000 0.187500 +vn -0.0000 -0.0000 1.0000 +vn -0.7071 -0.0000 0.7071 +vn -1.0000 -0.0000 -0.0000 +vn -0.7071 -0.0000 -0.7071 +vn -0.0000 -0.0000 -1.0000 +vn 0.7071 -0.0000 -0.7071 +vn 1.0000 -0.0000 -0.0000 +vn 1.0000 -0.0001 -0.0000 +vn 0.7071 -0.0000 0.7071 +vn 1.0000 0.0001 -0.0000 +vn -0.0000 -0.0001 1.0000 +vt 0.234375 0.484375 +vt 0.257812 0.453125 +vt 0.257812 0.484375 +vt 0.234375 0.453125 +s 0 +f 313/180/308 312/181/309 320/182/309 +f 320/180/309 308/181/310 316/182/310 +f 316/180/310 310/181/311 318/182/311 +f 318/180/311 306/181/312 314/182/312 +f 314/181/312 309/180/313 317/183/313 +f 317/181/313 307/180/314 315/183/315 +f 319/183/316 307/182/317 311/180/316 +f 313/183/308 311/182/316 305/180/308 +f 313/180/308 305/183/308 312/181/309 +f 320/180/309 312/183/309 308/181/310 +f 316/180/310 308/183/310 310/181/311 +f 318/180/311 310/183/311 306/181/312 +f 314/181/312 306/182/312 309/180/313 +f 317/181/313 309/182/313 307/180/314 +f 319/183/316 315/181/314 307/182/314 +f 313/183/318 319/181/316 311/182/316 diff --git a/src/main/resources/assets/hbm/models/machines/chemical_plant.obj b/src/main/resources/assets/hbm/models/machines/chemical_plant.obj index 7fa2d561f..a7db83f49 100644 --- a/src/main/resources/assets/hbm/models/machines/chemical_plant.obj +++ b/src/main/resources/assets/hbm/models/machines/chemical_plant.obj @@ -3249,39 +3249,39 @@ vt 0.620192 1.000000 vt 0.620192 0.971429 vt 0.625000 0.957143 vt 0.625000 0.985714 -vt 0.451923 0.771429 -vt 0.509615 0.785714 -vt 0.451923 0.785714 -vt 0.451923 0.814286 -vt 0.509615 0.828571 -vt 0.451923 0.828571 -vt 0.451923 0.842857 -vt 0.509615 0.857143 -vt 0.451923 0.857143 -vt 0.451923 0.757143 -vt 0.509615 0.771429 -vt 0.509615 0.800000 -vt 0.451923 0.800000 -vt 0.509615 0.814286 -vt 0.509615 0.842857 -vt 0.451923 0.742857 -vt 0.509615 0.757143 -vt 0.514423 0.771429 -vt 0.524038 0.757143 -vt 0.524038 0.771429 -vt 0.524038 0.785714 -vt 0.524038 0.800000 -vt 0.524038 0.814286 -vt 0.514423 0.828571 -vt 0.524038 0.842857 -vt 0.519231 0.842857 -vt 0.524038 0.828571 -vt 0.538462 0.814286 -vt 0.533654 0.828571 -vt 0.533654 0.771429 -vt 0.538462 0.800000 -vt 0.528846 0.842857 -vt 0.538462 0.785714 +vt 0.884615 0.028571 +vt 0.971154 0.042857 +vt 0.884615 0.042857 +vt 0.884615 0.071429 +vt 0.971154 0.085714 +vt 0.884615 0.085714 +vt 0.884615 0.100000 +vt 0.971154 0.114286 +vt 0.884615 0.114286 +vt 0.884615 0.014286 +vt 0.971154 0.028571 +vt 0.971154 0.057143 +vt 0.884615 0.057143 +vt 0.971154 0.071429 +vt 0.971154 0.100000 +vt 0.884615 0.000000 +vt 0.971154 0.014286 +vt 0.975962 0.028571 +vt 0.985577 0.014286 +vt 0.985577 0.028571 +vt 0.985577 0.042857 +vt 0.985577 0.057143 +vt 0.985577 0.071429 +vt 0.975962 0.085714 +vt 0.985577 0.100000 +vt 0.980769 0.100000 +vt 0.985577 0.085714 +vt 1.000000 0.071429 +vt 0.995192 0.085714 +vt 0.995192 0.028571 +vt 1.000000 0.057143 +vt 0.990385 0.100000 +vt 1.000000 0.042857 vt 0.298077 0.714286 vt 0.197115 0.714286 vt 0.326923 0.714286 @@ -3304,39 +3304,39 @@ vt 0.177885 0.714286 vt 0.168269 0.714286 vt 0.293269 0.714286 vt 0.283654 0.714286 -vt 0.509615 0.700000 -vt 0.451923 0.714286 -vt 0.451923 0.700000 -vt 0.509615 0.657143 -vt 0.451923 0.671429 -vt 0.451923 0.657143 -vt 0.509615 0.628571 -vt 0.451923 0.642857 -vt 0.451923 0.628571 -vt 0.509615 0.714286 -vt 0.451923 0.728571 -vt 0.509615 0.685714 -vt 0.451923 0.685714 -vt 0.509615 0.671429 -vt 0.509615 0.642857 -vt 0.509615 0.728571 -vt 0.451923 0.742857 -vt 0.514423 0.714286 -vt 0.524038 0.728571 -vt 0.519231 0.728571 -vt 0.524038 0.685714 -vt 0.524038 0.671429 -vt 0.524038 0.642857 -vt 0.514423 0.657143 -vt 0.519231 0.642857 -vt 0.524038 0.714286 -vt 0.524038 0.657143 -vt 0.538462 0.671429 -vt 0.533654 0.714286 -vt 0.538462 0.685714 -vt 0.524038 0.700000 -vt 0.533654 0.657143 -vt 0.538462 0.700000 +vt 0.971154 0.071429 +vt 0.884615 0.085714 +vt 0.884615 0.071429 +vt 0.971154 0.028571 +vt 0.884615 0.042857 +vt 0.884615 0.028571 +vt 0.971154 -0.000000 +vt 0.884615 0.014286 +vt 0.884615 0.000000 +vt 0.971154 0.085714 +vt 0.884615 0.100000 +vt 0.971154 0.057143 +vt 0.884615 0.057143 +vt 0.971154 0.042857 +vt 0.971154 0.014286 +vt 0.971154 0.100000 +vt 0.884615 0.114286 +vt 0.975962 0.085714 +vt 0.985577 0.100000 +vt 0.980769 0.100000 +vt 0.985577 0.057143 +vt 0.985577 0.042857 +vt 0.985577 0.014286 +vt 0.975962 0.028571 +vt 0.980769 0.014286 +vt 0.985577 0.085714 +vt 0.985577 0.028571 +vt 1.000000 0.042857 +vt 0.995192 0.085714 +vt 1.000000 0.057143 +vt 0.985577 0.071429 +vt 0.995192 0.028571 +vt 1.000000 0.071429 vt 0.144231 0.314286 vt 0.115385 0.314286 vt 0.557692 0.542857 @@ -3410,14 +3410,14 @@ vt 0.903846 0.428571 vt 0.932692 0.428571 vt 0.961538 0.371429 vt 0.961538 0.428571 -vt 0.524038 0.857143 -vt 0.519231 0.757143 -vt 0.524038 0.742857 -vt 0.528846 0.757143 -vt 0.524038 0.742857 -vt 0.528846 0.728571 -vt 0.524038 0.628571 -vt 0.528846 0.642857 +vt 0.985577 0.114286 +vt 0.980769 0.014286 +vt 0.985577 -0.000000 +vt 0.990385 0.014286 +vt 0.985577 0.114286 +vt 0.990385 0.100000 +vt 0.985577 -0.000000 +vt 0.990385 0.014286 vt 0.230769 0.200000 vt 0.461538 0.000000 vt 0.000000 0.885714 @@ -3451,7 +3451,7 @@ vt 0.817308 1.000000 vt 0.557692 0.885714 vt 0.605769 1.000000 vt 0.629808 0.885714 -vt 0.509615 0.742857 +vt 0.971154 -0.000000 vt 0.307692 0.714286 vt 0.206731 0.714286 vt 0.336538 0.714286 @@ -3460,7 +3460,7 @@ vt 0.221154 0.714286 vt 0.365385 0.714286 vt 0.250000 0.714286 vt 0.264423 0.714286 -vt 0.509615 0.742857 +vt 0.971154 0.114286 vt 0.211538 0.628571 vt 0.153846 0.628571 vn 0.0000 -1.0000 0.0000 diff --git a/src/main/resources/assets/hbm/textures/models/bombs/n2.png b/src/main/resources/assets/hbm/textures/models/bombs/n2.png index f8d6f2089..f3965352d 100644 Binary files a/src/main/resources/assets/hbm/textures/models/bombs/n2.png and b/src/main/resources/assets/hbm/textures/models/bombs/n2.png differ diff --git a/src/main/resources/assets/hbm/textures/models/machines/chemical_plant.png b/src/main/resources/assets/hbm/textures/models/machines/chemical_plant.png index d821919c1..6c34eebf6 100644 Binary files a/src/main/resources/assets/hbm/textures/models/machines/chemical_plant.png and b/src/main/resources/assets/hbm/textures/models/machines/chemical_plant.png differ