From fa46db4ce66d8e53c1dc31d99b0ddf9e019f1a56 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 24 May 2016 18:47:43 -0400 Subject: [PATCH] Removed unused mtl and obj commands, got heat network (and conductors) working with capabilities --- .../java/mekanism/common/HeatNetwork.java | 14 ++-- src/main/java/mekanism/common/Mekanism.java | 2 +- .../common/item/ItemNetworkReader.java | 17 ++-- .../multipart/BlockToMultipartModel.java | 73 ----------------- .../common/multipart/MultipartMekanism.java | 31 ------- .../multipart/PartThermodynamicConductor.java | 82 ++++++++++++------- .../common/network/PacketTileEntity.java | 10 ++- .../common/tile/TileEntityBoilerCasing.java | 19 +++++ .../common/tile/TileEntityFuelwoodHeater.java | 18 ++++ .../tile/TileEntityQuantumEntangloporter.java | 5 +- .../tile/TileEntityResistiveHeater.java | 18 ++++ .../TileEntityThermalEvaporationValve.java | 19 +++++ .../common/tile/TileEntityHeatGenerator.java | 18 ++++ .../tile/reactor/TileEntityReactorPort.java | 5 +- .../models/block/transmitter_large.mtl | 4 - .../models/block/transmitter_large.obj.mek | 24 ------ .../models/block/transmitter_small.mtl | 4 - .../models/block/transmitter_small.obj.mek | 24 ------ .../mekanism/models/transmitter_contents.obj | 24 ------ 19 files changed, 179 insertions(+), 232 deletions(-) delete mode 100644 src/main/java/mekanism/common/multipart/BlockToMultipartModel.java diff --git a/src/main/java/mekanism/common/HeatNetwork.java b/src/main/java/mekanism/common/HeatNetwork.java index f8b149325..e630389f5 100644 --- a/src/main/java/mekanism/common/HeatNetwork.java +++ b/src/main/java/mekanism/common/HeatNetwork.java @@ -7,6 +7,8 @@ import mekanism.api.IHeatTransfer; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; +import mekanism.common.capabilities.Capabilities; +import mekanism.common.multipart.MultipartTransmitter; //import mekanism.common.multipart.MultipartTransmitter; import mekanism.common.util.MekanismUtils; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -77,26 +79,22 @@ public class HeatNetwork extends DynamicNetwork { for(IGridTransmitter transmitter : transmitters) { - /* - if(transmitter instanceof MultipartTransmitter && ((MultipartTransmitter)transmitter).getPart() instanceof IHeatTransfer) + if(transmitter instanceof MultipartTransmitter && ((MultipartTransmitter)transmitter).getPart().hasCapability(Capabilities.HEAT_TRANSFER_CAPABILITY, null)) { - IHeatTransfer heatTransmitter = (IHeatTransfer)((MultipartTransmitter)transmitter).getPart(); + IHeatTransfer heatTransmitter = (IHeatTransfer)((MultipartTransmitter)transmitter).getPart().getCapability(Capabilities.HEAT_TRANSFER_CAPABILITY, null); double[] d = heatTransmitter.simulateHeat(); newHeatTransferred += d[0]; newHeatLost += d[1]; } - */ } for(IGridTransmitter transmitter : transmitters) { -/* - if(transmitter instanceof MultipartTransmitter && ((MultipartTransmitter)transmitter).getPart() instanceof IHeatTransfer) + if(transmitter instanceof MultipartTransmitter && ((MultipartTransmitter)transmitter).getPart().hasCapability(Capabilities.HEAT_TRANSFER_CAPABILITY, null)) { - IHeatTransfer heatTransmitter = (IHeatTransfer)((MultipartTransmitter)transmitter).getPart(); + IHeatTransfer heatTransmitter = (IHeatTransfer)((MultipartTransmitter)transmitter).getPart().getCapability(Capabilities.HEAT_TRANSFER_CAPABILITY, null); newSumTemp += heatTransmitter.applyTemperatureChange(); } -*/ } } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 389a38891..79c5c4a92 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1308,7 +1308,7 @@ public class Mekanism MekanismBlocks.register(); //Set up multiparts - MinecraftForge.EVENT_BUS.register(new MultipartMekanism()); + new MultipartMekanism(); Mekanism.proxy.preInit(); diff --git a/src/main/java/mekanism/common/item/ItemNetworkReader.java b/src/main/java/mekanism/common/item/ItemNetworkReader.java index 0390be50d..5b7083227 100644 --- a/src/main/java/mekanism/common/item/ItemNetworkReader.java +++ b/src/main/java/mekanism/common/item/ItemNetworkReader.java @@ -52,24 +52,29 @@ public class ItemNetworkReader extends ItemEnergized player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Buffer: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkBuffer())); player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Throughput: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkFlow())); player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Capacity: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkCapacity())); - if(transmitter instanceof IHeatTransfer) - player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Temperature: " + EnumColor.DARK_GREY + ((IHeatTransfer)transmitter).getTemp() + "K above ambient")); + + if(MekanismUtils.hasCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite())) + { + IHeatTransfer transfer = MekanismUtils.getCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()); + player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Temperature: " + EnumColor.DARK_GREY + transfer.getTemp() + "K above ambient")); + } + player.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); return true; } - else if(tileEntity instanceof IHeatTransfer) + else if(MekanismUtils.hasCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite())) { if(drain) setEnergy(stack, getEnergy(stack)-ENERGY_PER_USE); + IHeatTransfer transfer = MekanismUtils.getCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()); player.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); - player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Temperature: " + EnumColor.DARK_GREY + ((IHeatTransfer)tileEntity).getTemp() + "K above ambient")); + player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Temperature: " + EnumColor.DARK_GREY + transfer.getTemp() + "K above ambient")); player.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); return true; } - else - { + else { if(drain) setEnergy(stack, getEnergy(stack)-ENERGY_PER_USE); Set iteratedNetworks = new HashSet<>(); diff --git a/src/main/java/mekanism/common/multipart/BlockToMultipartModel.java b/src/main/java/mekanism/common/multipart/BlockToMultipartModel.java deleted file mode 100644 index 268f4770a..000000000 --- a/src/main/java/mekanism/common/multipart/BlockToMultipartModel.java +++ /dev/null @@ -1,73 +0,0 @@ -package mekanism.common.multipart; - -import java.util.List; - -import mcmultipart.client.multipart.ISmartMultipartModel; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.client.model.ISmartBlockModel; - -/** - * Created by ben on 21/05/16. - */ -public class BlockToMultipartModel implements ISmartMultipartModel -{ - ISmartBlockModel parent; - - public BlockToMultipartModel(ISmartBlockModel model) - { - parent = model; - } - - @Override - public IBakedModel handlePartState(IBlockState state) - { - return parent.handleBlockState(state); - } - - @Override - public List getFaceQuads(EnumFacing facing) - { - return parent.getFaceQuads(facing); - } - - @Override - public List getGeneralQuads() - { - return parent.getGeneralQuads(); - } - - @Override - public boolean isAmbientOcclusion() - { - return parent.isAmbientOcclusion(); - } - - @Override - public boolean isGui3d() - { - return parent.isGui3d(); - } - - @Override - public boolean isBuiltInRenderer() - { - return parent.isBuiltInRenderer(); - } - - @Override - public TextureAtlasSprite getParticleTexture() - { - return parent.getParticleTexture(); - } - - @Override - public ItemCameraTransforms getItemCameraTransforms() - { - return parent.getItemCameraTransforms(); - } -} diff --git a/src/main/java/mekanism/common/multipart/MultipartMekanism.java b/src/main/java/mekanism/common/multipart/MultipartMekanism.java index 104778a34..573335e01 100644 --- a/src/main/java/mekanism/common/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/multipart/MultipartMekanism.java @@ -11,9 +11,7 @@ import mekanism.common.Tier; import mekanism.common.block.states.BlockStateMachine.MachineType; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; -import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.fml.common.event.FMLInterModComms; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class MultipartMekanism implements IPartFactory { @@ -192,33 +190,4 @@ public class MultipartMekanism implements IPartFactory dropItem(stack, multipart); } } - - @SubscribeEvent - public void onModelBake(ModelBakeEvent event) - { - /*String[] names = new String[] { - "mekanism:universal_cable_basic", "mekanism:universal_cable_advanced", - "mekanism:universal_cable_elite", "mekanism:universal_cable_ultimate", - "mekanism:mechanical_pipe_basic", "mekanism:mechanical_pipe_advanced", - "mekanism:mechanical_pipe_elite", "mekanism:mechanical_pipe_ultimate", - "mekanism:pressurized_tube_basic", "mekanism:pressurized_tube_advanced", - "mekanism:pressurized_tube_elite", "mekanism:pressurized_tube_ultimate", - "mekanism:logistical_transporter_basic", "mekanism:logistical_transporter_advanced", - "mekanism:logistical_transporter_elite", "mekanism:logistical_transporter_ultimate", - "mekanism:restrictive_transporter", "mekanism:diversion_transporter", - "mekanism:thermodynamic_conductor_basic", "mekanism:thermodynamic_conductor_advanced", - "mekanism:thermodynamic_conductor_elite", "mekanism:thermodynamic_conductor_ultimate"}; - - for(String s : names) - { - ModelResourceLocation mrl = new ModelResourceLocation(s, "multipart"); - IBakedModel model = event.modelRegistry.getObject(mrl); - - if(model instanceof ISmartBlockModel) - { - System.out.println(model.getClass()); - event.modelRegistry.putObject(mrl, new BlockToMultipartModel((ISmartBlockModel)model)); - } - }*/ - } } diff --git a/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java b/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java index 1c36bb031..04371c057 100644 --- a/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java +++ b/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java @@ -1,21 +1,29 @@ package mekanism.common.multipart; +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; import java.util.Collection; +import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; +import mekanism.api.Range4D; import mekanism.api.transmitters.TransmissionType; import mekanism.common.ColourRGBA; import mekanism.common.HeatNetwork; +import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.ConductorTier; import mekanism.common.capabilities.Capabilities; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.HeatUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; public class PartThermodynamicConductor extends PartTransmitter implements IHeatTransfer { @@ -24,8 +32,6 @@ public class PartThermodynamicConductor extends PartTransmitter getNetworkedData(ArrayList data) + { + data.add(temperature); + + return data; } @Override public void writeUpdatePacket(PacketBuffer packet) { - if(renderUpdate) - { - packet.writeBoolean(true); - packet.writeDouble(temperature); - - renderUpdate = false; - } - else { - packet.writeBoolean(false); - - super.writeUpdatePacket(packet); - - packet.writeInt(tier.ordinal()); - } + packet.writeInt(tier.ordinal()); + + super.writeUpdatePacket(packet); } @Override public void readUpdatePacket(PacketBuffer packet) { - if(packet.readBoolean()) - { - temperature = packet.readDouble(); - } - else { - super.readUpdatePacket(packet); - - tier = ConductorTier.values()[packet.readInt()]; - } + tier = ConductorTier.values()[packet.readInt()]; + + super.readUpdatePacket(packet); } public ColourRGBA getBaseColour() @@ -214,6 +223,23 @@ public class PartThermodynamicConductor extends PartTransmitter capability, EnumFacing side) + { + return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side); + } + + @Override + public T getCapability(Capability capability, EnumFacing side) + { + if(capability == Capabilities.HEAT_TRANSFER_CAPABILITY) + { + return (T)this; + } + + return super.getCapability(capability, side); + } + @Override public boolean upgrade(int tierOrdinal) { diff --git a/src/main/java/mekanism/common/network/PacketTileEntity.java b/src/main/java/mekanism/common/network/PacketTileEntity.java index f8acda10c..4ddade2d2 100644 --- a/src/main/java/mekanism/common/network/PacketTileEntity.java +++ b/src/main/java/mekanism/common/network/PacketTileEntity.java @@ -10,6 +10,7 @@ import mekanism.common.base.ITileNetwork; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -23,7 +24,14 @@ public class PacketTileEntity implements IMessageHandler capability, EnumFacing side) + { + return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side); + } + + @Override + public T getCapability(Capability capability, EnumFacing side) + { + if(capability == Capabilities.HEAT_TRANSFER_CAPABILITY) + { + return (T)this; + } + + return super.getCapability(capability, side); + } + @Override public String getName() { diff --git a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java index 3635e7b44..877c2eedb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java @@ -21,6 +21,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implements IHeatTransfer, ISecurityTile, IActiveState @@ -278,6 +279,23 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implement return null; } + @Override + public boolean hasCapability(Capability capability, EnumFacing side) + { + return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side); + } + + @Override + public T getCapability(Capability capability, EnumFacing side) + { + if(capability == Capabilities.HEAT_TRANSFER_CAPABILITY) + { + return (T)this; + } + + return super.getCapability(capability, side); + } + @Override public TileComponentSecurity getSecurity() { diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index ffb8ddd38..d22ffd629 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -661,13 +661,14 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp public boolean hasCapability(Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY - || super.hasCapability(capability, side); + || capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side); } @Override public T getCapability(Capability capability, EnumFacing side) { - if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY) + if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY + || capability == Capabilities.HEAT_TRANSFER_CAPABILITY) { return (T)this; } diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 5df7c3172..4fdb444bb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -24,6 +24,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock implements IHeatTransfer, IComputerIntegration, IRedstoneControl, ISecurityTile @@ -270,6 +271,23 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl return null; } + @Override + public boolean hasCapability(Capability capability, EnumFacing side) + { + return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side); + } + + @Override + public T getCapability(Capability capability, EnumFacing side) + { + if(capability == Capabilities.HEAT_TRANSFER_CAPABILITY) + { + return (T)this; + } + + return super.getCapability(capability, side); + } + @Override public void setActive(boolean active) { diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java index 0c7344f80..89fb5a78d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java @@ -2,8 +2,10 @@ package mekanism.common.tile; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; +import mekanism.common.capabilities.Capabilities; import mekanism.common.util.PipeUtils; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -149,4 +151,21 @@ public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporat { return null; } + + @Override + public boolean hasCapability(Capability capability, EnumFacing side) + { + return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side); + } + + @Override + public T getCapability(Capability capability, EnumFacing side) + { + if(capability == Capabilities.HEAT_TRANSFER_CAPABILITY) + { + return (T)this; + } + + return super.getCapability(capability, side); + } } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index 1c37d694b..b534c3900 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -24,6 +24,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; @@ -467,4 +468,21 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu return null; } + + @Override + public boolean hasCapability(Capability capability, EnumFacing side) + { + return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side); + } + + @Override + public T getCapability(Capability capability, EnumFacing side) + { + if(capability == Capabilities.HEAT_TRANSFER_CAPABILITY) + { + return (T)this; + } + + return super.getCapability(capability, side); + } } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index bc2ffbb2c..af0c12c97 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -168,13 +168,14 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl public boolean hasCapability(Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY - || super.hasCapability(capability, side); + || capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side); } @Override public T getCapability(Capability capability, EnumFacing side) { - if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY) + if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY + || capability == Capabilities.HEAT_TRANSFER_CAPABILITY) { return (T)this; } diff --git a/src/main/resources/assets/mekanism/models/block/transmitter_large.mtl b/src/main/resources/assets/mekanism/models/block/transmitter_large.mtl index 4b15f7cab..cbd6117df 100644 --- a/src/main/resources/assets/mekanism/models/block/transmitter_large.mtl +++ b/src/main/resources/assets/mekanism/models/block/transmitter_large.mtl @@ -4,15 +4,11 @@ newmtl None Ka 0.000000 0.000000 0.000000 Kd 0.8 0.8 0.8 -Ks 0.8 0.8 0.8 d 1 -illum 2 map_Kd #side newmtl None_Center Ka 0.000000 0.000000 0.000000 Kd 0.8 0.8 0.8 -Ks 0.8 0.8 0.8 d 1 -illum 2 map_Kd #center diff --git a/src/main/resources/assets/mekanism/models/block/transmitter_large.obj.mek b/src/main/resources/assets/mekanism/models/block/transmitter_large.obj.mek index 7cac47816..658b06300 100644 --- a/src/main/resources/assets/mekanism/models/block/transmitter_large.obj.mek +++ b/src/main/resources/assets/mekanism/models/block/transmitter_large.obj.mek @@ -47,7 +47,6 @@ vn -0.000000 0.000000 -1.000000 vn 0.000000 -1.000000 -0.000000 vn -0.000000 1.000000 0.000000 usemtl None -s off f 7/1/1 13/2/1 16/3/1 3/4/1 f 14/5/1 8/6/1 4/7/1 15/8/1 f 13/3/2 7/4/2 6/1/2 10/2/2 @@ -114,7 +113,6 @@ vn -0.000000 1.000000 -0.000000 vn -0.000000 0.000000 -1.000000 vn 0.000000 0.000000 1.000000 usemtl None -s off f 31/15/7 37/16/7 40/17/7 27/18/7 f 38/19/7 32/20/7 28/21/7 39/22/7 f 37/17/8 31/18/8 30/15/8 34/16/8 @@ -181,7 +179,6 @@ vn -0.000000 1.000000 -0.000000 vn 0.000000 -0.000000 1.000000 vn -0.000000 0.000000 -1.000000 usemtl None -s off f 55/29/13 61/30/13 64/31/13 51/32/13 f 62/33/13 56/34/13 52/35/13 63/36/13 f 61/31/14 55/32/14 54/29/14 58/30/14 @@ -248,7 +245,6 @@ vn 0.000000 -1.000000 0.000000 vn -1.000000 -0.000000 0.000000 vn 1.000000 0.000000 -0.000000 usemtl None -s off f 79/43/19 85/44/19 88/45/19 75/46/19 f 86/47/19 80/48/19 76/49/19 87/50/19 f 85/45/20 79/46/20 78/43/20 82/44/20 @@ -315,7 +311,6 @@ vn 0.000000 -1.000000 0.000000 vn 1.000000 0.000000 0.000000 vn -1.000000 0.000000 0.000000 usemtl None -s off f 103/57/25 109/58/25 112/59/25 99/60/25 f 110/61/25 104/62/25 100/63/25 111/64/25 f 109/59/26 103/60/26 102/57/26 106/58/26 @@ -388,7 +383,6 @@ vn 0.164400 -0.986400 0.000000 vn -0.000000 -0.986400 0.164400 vn -0.164400 -0.986400 -0.000000 usemtl None -s off f 133/71/31 124/72/31 122/73/31 134/74/31 f 123/73/32 125/74/32 130/71/32 121/72/32 f 121/73/33 130/74/33 134/71/33 122/72/33 @@ -461,7 +455,6 @@ vn -0.986400 -0.164400 -0.000000 vn -0.986400 0.000000 0.164400 vn -0.986400 0.164400 -0.000000 usemtl None -s off f 157/88/40 148/89/40 146/90/40 158/91/40 f 147/90/41 149/91/41 154/88/41 145/89/41 f 145/90/42 154/91/42 158/88/42 146/89/42 @@ -534,7 +527,6 @@ vn 0.986400 -0.164400 0.000000 vn 0.986400 -0.000000 -0.164400 vn 0.986400 0.164400 0.000000 usemtl None -s off f 181/105/49 172/106/49 170/107/49 182/108/49 f 171/107/50 173/108/50 178/105/50 169/106/50 f 169/107/51 178/108/51 182/105/51 170/106/51 @@ -607,7 +599,6 @@ vn -0.000000 0.164400 -0.986400 vn 0.164400 0.000000 -0.986400 vn -0.000000 -0.164400 -0.986400 usemtl None -s off f 205/122/58 196/123/58 194/124/58 206/125/58 f 195/124/59 197/125/59 202/122/59 193/123/59 f 193/124/60 202/125/60 206/122/60 194/123/60 @@ -680,7 +671,6 @@ vn 0.000000 0.164400 0.986400 vn -0.164400 0.000000 0.986400 vn 0.000000 -0.164400 0.986400 usemtl None -s off f 229/139/67 220/140/67 218/141/67 230/142/67 f 219/141/68 221/142/68 226/139/68 217/140/68 f 217/141/69 226/142/69 230/139/69 218/140/69 @@ -719,7 +709,6 @@ vn 0.000000 0.000000 1.000000 vn -1.000000 0.000000 0.000000 vn 1.000000 0.000000 0.000000 usemtl None -s off f 245/156/76 246/157/76 242/158/76 241/159/76 f 247/158/77 248/159/77 244/156/77 243/157/77 f 241/156/78 242/157/78 243/158/78 244/159/78 @@ -770,7 +759,6 @@ vn 1.000000 0.000000 0.000000 vn 0.000000 1.000000 0.000000 vn 0.000000 -1.000000 0.000000 usemtl None -s off f 255/160/80 261/161/80 264/162/80 251/163/80 f 262/164/80 256/165/80 252/166/80 263/167/80 f 261/162/81 255/163/81 254/160/81 258/161/81 @@ -809,7 +797,6 @@ vn -1.000000 0.000000 0.000000 vn 0.000000 -1.000000 0.000000 vn 0.000000 1.000000 0.000000 usemtl None -s off f 277/174/86 278/175/86 274/176/86 273/177/86 f 279/176/87 280/177/87 276/174/87 275/175/87 f 273/174/88 274/175/88 275/176/88 276/177/88 @@ -832,7 +819,6 @@ vn 0.000000 0.000000 -1.000000 vn 0.000000 -1.000000 0.000000 vn 0.000000 1.000000 0.000000 usemtl None -s off f 285/178/90 286/179/90 282/180/90 281/181/90 f 287/180/91 288/181/91 284/178/91 283/179/91 f 281/178/92 282/179/92 283/180/92 284/181/92 @@ -855,7 +841,6 @@ vn 1.000000 0.000000 0.000000 vn 0.000000 -1.000000 0.000000 vn 0.000000 1.000000 0.000000 usemtl None -s off f 293/182/94 294/183/94 290/184/94 289/185/94 f 295/184/95 296/185/95 292/182/95 291/183/95 f 289/182/96 290/183/96 291/184/96 292/185/96 @@ -878,7 +863,6 @@ vn 0.000000 0.000000 1.000000 vn 0.000000 -1.000000 0.000000 vn 0.000000 1.000000 0.000000 usemtl None -s off f 301/186/98 302/187/98 298/188/98 297/189/98 f 303/188/99 304/189/99 300/186/99 299/187/99 f 297/186/100 298/187/100 299/188/100 300/189/100 @@ -894,7 +878,6 @@ vt 0.000000 1.000000 vt 0.000000 0.000000 vn -0.000000 -0.000000 1.000000 usemtl None_Center -s off f 305/190/102 307/191/102 308/192/102 306/193/102 o westNONE v 0.250000 0.250000 0.750000 @@ -907,7 +890,6 @@ vt 0.000000 1.000000 vt 0.000000 0.000000 vn -1.000000 -0.000000 -0.000000 usemtl None_Center -s off f 309/194/103 311/195/103 312/196/103 310/197/103 o northNONE v 0.250000 0.250000 0.250000 @@ -920,7 +902,6 @@ vt 0.000000 1.000000 vt 0.000000 0.000000 vn 0.000000 -0.000000 -1.000000 usemtl None_Center -s off f 313/198/104 315/199/104 316/200/104 314/201/104 o eastNONE v 0.750000 0.750000 0.250000 @@ -933,7 +914,6 @@ vt 0.000000 1.000000 vt 0.000000 0.000000 vn 1.000000 0.000000 -0.000000 usemtl None_Center -s off f 319/202/105 317/203/105 318/204/105 320/205/105 o upNONE v 0.750000 0.750000 0.750000 @@ -946,7 +926,6 @@ vt 0.000000 1.000000 vt 0.000000 0.000000 vn 0.000000 1.000000 0.000000 usemtl None_Center -s off f 321/206/106 324/207/106 323/208/106 322/209/106 o downNONE v 0.250000 0.250000 0.750000 @@ -959,7 +938,6 @@ vt 0.000000 1.000000 vt 0.000000 0.000000 vn 0.000000 -1.000000 0.000000 usemtl None_Center -s off f 325/210/107 326/211/107 327/212/107 328/213/107 o upPUSH v 0.750000 0.750000 0.250000 @@ -1012,7 +990,6 @@ vn 0.000000 0.986400 -0.164400 vn -0.164400 0.986400 0.000000 vn 0.000000 0.986400 0.164400 usemtl None -s off f 341/214/108 332/215/108 330/216/108 342/217/108 f 331/216/109 333/217/109 338/214/109 329/215/109 f 329/216/110 338/217/110 342/214/110 330/215/110 @@ -1051,7 +1028,6 @@ vn 0.000000 -0.000000 -1.000000 vn -1.000000 -0.000000 0.000000 vn 1.000000 0.000000 0.000000 usemtl None -s off f 357/230/117 358/231/117 354/232/117 353/233/117 f 359/232/118 360/233/118 356/230/118 355/231/118 f 353/230/119 354/231/119 355/232/119 356/233/119 diff --git a/src/main/resources/assets/mekanism/models/block/transmitter_small.mtl b/src/main/resources/assets/mekanism/models/block/transmitter_small.mtl index e5d213851..996535e70 100644 --- a/src/main/resources/assets/mekanism/models/block/transmitter_small.mtl +++ b/src/main/resources/assets/mekanism/models/block/transmitter_small.mtl @@ -4,15 +4,11 @@ newmtl CentreMaterial Ka 1.000000 1.000000 1.000000 Kd 0.8 0.8 0.8 -Ks 0.8 0.8 0.8 d 1 -illum 2 map_Kd #center newmtl None Ka 0.000000 0.000000 0.000000 Kd 0.8 0.8 0.8 -Ks 0.8 0.8 0.8 d 1 -illum 2 map_Kd #side diff --git a/src/main/resources/assets/mekanism/models/block/transmitter_small.obj.mek b/src/main/resources/assets/mekanism/models/block/transmitter_small.obj.mek index 8831558cf..fa55d59c1 100644 --- a/src/main/resources/assets/mekanism/models/block/transmitter_small.obj.mek +++ b/src/main/resources/assets/mekanism/models/block/transmitter_small.obj.mek @@ -12,7 +12,6 @@ vt 0.000000 1.000000 vt 0.000000 0.000000 vn 0.000000 -1.000000 0.000000 usemtl CentreMaterial -s off f 1/1/1 3/2/1 4/3/1 2/4/1 o upNONE v 0.687500 0.687500 0.687500 @@ -25,7 +24,6 @@ vt 0.000000 1.000000 vt 0.000000 0.000000 vn -0.000000 1.000000 0.000000 usemtl CentreMaterial -s off f 5/5/2 7/6/2 8/7/2 6/8/2 o southNONE v 0.687500 0.312500 0.687500 @@ -38,7 +36,6 @@ vt 0.000000 1.000000 vt 0.000000 0.000000 vn -0.000000 -0.000000 1.000000 usemtl CentreMaterial -s off f 9/9/3 11/10/3 12/11/3 10/12/3 o eastPUSH v 0.687500 0.312500 0.687500 @@ -95,7 +92,6 @@ vn 1.000000 0.000000 0.000000 vn -0.000000 0.000000 -1.000000 vn 0.000000 -1.000000 0.000000 usemtl None -s off f 13/13/4 18/14/4 20/15/4 14/16/4 f 19/15/5 16/16/5 14/13/5 20/14/5 f 23/17/6 22/18/6 33/19/6 34/20/6 @@ -134,7 +130,6 @@ vn 1.000000 0.000000 0.000000 vn 0.000000 -1.000000 0.000000 vn 0.000000 1.000000 0.000000 usemtl None -s off f 41/37/9 42/38/9 38/39/9 37/40/9 f 43/37/10 44/38/10 40/39/10 39/40/10 f 37/37/11 38/38/11 39/39/11 40/40/11 @@ -187,7 +182,6 @@ vn 0.000000 -0.000000 1.000000 vn -1.000000 -0.000000 0.000000 vn 1.000000 -0.000000 -0.000000 usemtl None -s off f 54/41/13 48/42/13 46/43/13 55/44/13 f 47/43/14 49/44/14 52/41/14 45/42/14 f 56/44/14 53/45/14 51/46/14 50/41/14 @@ -256,7 +250,6 @@ vn 1.000000 0.000000 -0.000000 vn 0.000000 0.000000 1.000000 vn 0.000000 0.000000 -1.000000 usemtl None -s off f 78/57/19 72/58/19 70/59/19 79/60/19 f 71/59/20 73/60/20 76/57/20 69/58/20 f 80/60/20 77/61/20 75/62/20 74/57/20 @@ -332,7 +325,6 @@ vn 0.000000 0.000000 1.000000 vn 1.000000 0.000000 -0.000000 vn 0.000000 -1.000000 -0.000000 usemtl None -s off f 93/73/25 98/74/25 100/75/25 94/76/25 f 99/75/26 96/76/26 94/73/26 100/74/26 f 103/77/27 102/78/27 113/79/27 114/80/27 @@ -408,7 +400,6 @@ vn 0.000000 -1.000000 0.000000 vn 1.000000 0.000000 -0.000000 vn -0.000000 -0.000000 -1.000000 usemtl None -s off f 117/97/30 122/98/30 124/99/30 118/100/30 f 123/99/31 120/100/31 118/97/31 124/98/31 f 127/101/32 126/102/32 137/103/32 138/104/32 @@ -477,7 +468,6 @@ vn 1.000000 0.000000 -0.000000 vn 0.000000 -1.000000 0.000000 vn -0.000000 1.000000 0.000000 usemtl None -s off f 150/121/35 144/122/35 142/123/35 151/124/35 f 143/123/36 145/124/36 148/121/36 141/122/36 f 152/124/36 149/125/36 147/126/36 146/121/36 @@ -546,7 +536,6 @@ vn -0.000000 1.000000 0.000000 vn 1.000000 0.000000 -0.000000 vn -1.000000 -0.000000 0.000000 usemtl None -s off f 174/137/41 168/138/41 166/139/41 175/140/41 f 167/139/42 169/140/42 172/137/42 165/138/42 f 176/140/42 173/141/42 171/142/42 170/137/42 @@ -622,7 +611,6 @@ vn -1.000000 0.000000 0.000000 vn -0.000000 0.000000 1.000000 vn 0.000000 -1.000000 0.000000 usemtl None -s off f 189/153/47 194/154/47 196/155/47 190/156/47 f 195/155/48 192/156/48 190/153/48 196/154/48 f 199/157/49 198/158/49 209/159/49 210/160/49 @@ -691,7 +679,6 @@ vn -1.000000 0.000000 0.000000 vn -0.000000 0.000000 -1.000000 vn 0.000000 0.000000 1.000000 usemtl None -s off f 222/177/52 216/178/52 214/179/52 223/180/52 f 215/179/53 217/180/53 220/177/53 213/178/53 f 224/180/53 221/181/53 219/182/53 218/177/53 @@ -767,7 +754,6 @@ vn 0.000000 0.000000 -1.000000 vn -1.000000 0.000000 0.000000 vn 0.000000 -1.000000 0.000000 usemtl None -s off f 237/193/58 242/194/58 244/195/58 238/196/58 f 243/195/59 240/196/59 238/193/59 244/194/59 f 247/197/60 246/198/60 257/199/60 258/200/60 @@ -806,7 +792,6 @@ vn 0.000000 0.000000 1.000000 vn -1.000000 -0.000000 0.000000 vn 1.000000 0.000000 -0.000000 usemtl None -s off f 265/217/63 266/218/63 262/219/63 261/220/63 f 267/219/64 268/220/64 264/217/64 263/218/64 f 261/217/65 262/218/65 263/219/65 264/220/65 @@ -866,7 +851,6 @@ vn 0.000000 1.000000 0.000000 vn -1.000000 0.000000 0.000000 vn 0.000000 0.000000 -1.000000 usemtl None -s off f 269/221/67 274/222/67 276/223/67 270/224/67 f 275/223/68 272/224/68 270/221/68 276/222/68 f 279/225/69 278/226/69 289/227/69 290/228/69 @@ -905,7 +889,6 @@ vn -1.000000 0.000000 0.000000 vn 0.000000 -1.000000 0.000000 vn 0.000000 1.000000 -0.000000 usemtl None -s off f 297/245/72 298/246/72 294/247/72 293/248/72 f 299/245/73 300/246/73 296/247/73 295/248/73 f 293/247/74 294/248/74 295/245/74 296/246/74 @@ -928,7 +911,6 @@ vn 0.000000 0.000000 -1.000000 vn 0.000000 -1.000000 0.000000 vn 0.000000 1.000000 0.000000 usemtl None -s off f 305/249/76 306/250/76 302/251/76 301/252/76 f 307/249/77 308/250/77 304/251/77 303/252/77 f 301/251/78 302/252/78 303/249/78 304/250/78 @@ -951,7 +933,6 @@ vn 0.000000 0.000000 1.000000 vn 0.000000 -1.000000 0.000000 vn 0.000000 1.000000 0.000000 usemtl None -s off f 313/253/80 314/254/80 310/255/80 309/256/80 f 315/253/81 316/254/81 312/255/81 311/256/81 f 309/253/82 310/254/82 311/255/82 312/256/82 @@ -967,7 +948,6 @@ vt 0.000000 1.000000 vt 0.000000 0.000000 vn -1.000000 -0.000000 -0.000000 usemtl CentreMaterial -s off f 317/257/84 319/258/84 320/259/84 318/260/84 o northNONE v 0.312500 0.312500 0.312500 @@ -980,7 +960,6 @@ vt 0.000000 1.000000 vt 0.000000 0.000000 vn 0.000000 -0.000000 -1.000000 usemtl CentreMaterial -s off f 321/261/85 323/262/85 324/263/85 322/264/85 o eastNONE v 0.687500 0.687500 0.312500 @@ -993,7 +972,6 @@ vt 0.000000 1.000000 vt 0.000000 0.000000 vn 1.000000 -0.000000 -0.000000 usemtl CentreMaterial -s off f 327/265/86 325/266/86 326/267/86 328/268/86 o upPULL v 0.687500 0.687500 0.312500 @@ -1043,7 +1021,6 @@ vn -1.000000 0.000000 0.000000 vn 0.000000 1.000000 0.000000 vn 0.000000 -1.000000 0.000000 usemtl None -s off f 338/269/87 332/270/87 330/271/87 339/272/87 f 331/271/88 333/272/88 336/269/88 329/270/88 f 340/272/88 337/273/88 335/274/88 334/269/88 @@ -1082,7 +1059,6 @@ vn 0.000000 0.000000 1.000000 vn 1.000000 0.000000 -0.000000 vn -1.000000 0.000000 0.000000 usemtl None -s off f 357/285/93 358/286/93 354/287/93 353/288/93 f 359/287/94 360/288/94 356/285/94 355/286/94 f 353/285/95 354/286/95 355/287/95 356/288/95 diff --git a/src/main/resources/assets/mekanism/models/transmitter_contents.obj b/src/main/resources/assets/mekanism/models/transmitter_contents.obj index 17114275f..d15e15dd9 100644 --- a/src/main/resources/assets/mekanism/models/transmitter_contents.obj +++ b/src/main/resources/assets/mekanism/models/transmitter_contents.obj @@ -47,7 +47,6 @@ vn -1.000000 0.000000 0.000000 vn 1.000000 -0.000000 -0.000000 vn 0.000000 0.000000 1.000000 vn -0.000000 0.000000 -1.000000 -s off f 10/1/1 4/2/1 2/3/1 11/4/1 f 3/3/2 5/4/2 8/1/2 1/2/2 f 12/4/2 9/5/2 7/6/2 6/1/2 @@ -117,7 +116,6 @@ vt 0.000000 0.666667 vt 1.000000 0.666667 vt 1.000000 0.916667 vt 0.000000 0.916667 -s off f 25/17/3 30/18/3 32/19/3 26/20/3 f 31/19/1 28/20/1 26/17/1 32/18/1 f 35/21/5 34/22/5 45/23/5 46/24/5 @@ -189,7 +187,6 @@ vt 1.000000 0.916667 vt 0.000000 0.916667 vn 0.000001 -0.000000 1.000000 vn -0.000001 0.000000 -1.000000 -s off f 49/41/3 54/42/3 56/43/3 50/44/3 f 55/43/7 52/44/7 50/41/7 56/42/7 f 59/45/2 58/46/2 69/47/2 70/48/2 @@ -251,7 +248,6 @@ vt 0.750000 0.333333 vt 0.250000 0.333333 vt 0.750000 0.666667 vt 0.250000 0.666667 -s off f 82/65/7 76/66/7 74/67/7 83/68/7 f 75/67/8 77/68/8 80/65/8 73/66/8 f 84/68/6 81/69/6 79/70/6 78/65/6 @@ -315,7 +311,6 @@ vt 0.750000 0.666667 vt 0.250000 0.666667 vn 1.000000 0.000000 -0.000001 vn -1.000000 -0.000000 0.000001 -s off f 106/81/5 100/82/5 98/83/5 107/84/5 f 99/83/6 101/84/6 104/81/6 97/82/6 f 108/84/6 105/85/6 103/86/6 102/81/6 @@ -386,7 +381,6 @@ vt 1.000000 0.666667 vt 1.000000 0.916667 vt 0.000000 0.916667 vn 1.000000 0.000001 -0.000001 -s off f 121/97/2 126/98/2 128/99/2 122/100/2 f 127/99/5 124/100/5 122/97/5 128/98/5 f 131/101/9 130/102/9 141/103/9 142/104/9 @@ -456,7 +450,6 @@ vt 0.000000 0.666667 vt 1.000000 0.666667 vt 1.000000 0.916667 vt 0.000000 0.916667 -s off f 145/121/6 150/122/6 152/123/6 146/124/6 f 151/123/1 148/124/1 146/121/1 152/122/1 f 155/125/3 154/126/3 165/127/3 166/128/3 @@ -518,7 +511,6 @@ vt 0.750000 0.333333 vt 0.250000 0.333333 vt 0.750000 0.666667 vt 0.250000 0.666667 -s off f 178/145/1 172/146/1 170/147/1 179/148/1 f 171/147/2 173/148/2 176/145/2 169/146/2 f 180/148/2 177/149/2 175/150/2 174/145/2 @@ -580,7 +572,6 @@ vt 0.750000 0.333333 vt 0.250000 0.333333 vt 0.750000 0.666667 vt 0.250000 0.666667 -s off f 202/161/1 196/162/1 194/163/1 203/164/1 f 195/163/2 197/164/2 200/161/2 193/162/2 f 204/164/2 201/165/2 199/166/2 198/161/2 @@ -650,7 +641,6 @@ vt 0.000000 0.666667 vt 1.000000 0.666667 vt 1.000000 0.916667 vt 0.000000 0.916667 -s off f 217/177/4 222/178/4 224/179/4 218/180/4 f 223/179/1 220/180/1 218/177/1 224/178/1 f 227/181/6 226/182/6 237/183/6 238/184/6 @@ -684,7 +674,6 @@ vt 0.000000 0.916667 vt 0.000000 0.083333 vt 1.000000 0.083333 vt 1.000000 0.916667 -s off f 245/201/6 246/202/6 242/203/6 241/204/6 f 247/203/5 248/204/5 244/201/5 243/202/5 f 241/201/3 242/202/3 243/203/3 244/204/3 @@ -738,7 +727,6 @@ vt 0.000000 0.666667 vt 1.000000 0.666667 vt 1.000000 0.916667 vt 0.000000 0.916667 -s off f 249/205/4 254/206/4 256/207/4 250/208/4 f 255/207/5 252/208/5 250/205/5 256/206/5 f 259/209/1 258/210/1 269/211/1 270/212/1 @@ -772,7 +760,6 @@ vt 1.000000 0.083333 vt 1.000000 0.916667 vt 0.000000 0.916667 vt 0.000000 0.083333 -s off f 277/229/9 278/230/9 274/231/9 273/232/9 f 279/231/10 280/232/10 276/229/10 275/230/10 f 273/229/2 274/230/2 275/231/2 276/232/2 @@ -790,7 +777,6 @@ vt 0.000000 0.916667 vt 0.000000 0.083333 vt 1.000000 0.083333 vt 1.000000 0.916667 -s off f 285/233/5 286/234/5 282/235/5 281/236/5 f 287/235/6 288/236/6 284/233/6 283/234/6 f 281/233/2 282/234/2 283/235/2 284/236/2 @@ -808,7 +794,6 @@ vt 0.000000 0.916667 vt 0.000000 0.083333 vt 1.000000 0.083333 vt 1.000000 0.916667 -s off f 293/237/3 294/238/3 290/239/3 289/240/3 f 295/239/4 296/240/4 292/237/4 291/238/4 f 289/237/2 290/238/2 291/239/2 292/240/2 @@ -826,7 +811,6 @@ vt 1.000000 0.083333 vt 1.000000 0.916667 vt 0.000000 0.916667 vt 0.000000 0.083333 -s off f 301/241/6 302/242/6 298/243/6 297/244/6 f 303/243/5 304/244/5 300/241/5 299/242/5 f 297/241/2 298/242/2 299/243/2 300/244/2 @@ -840,7 +824,6 @@ vt 1.000000 0.000000 vt 1.000000 1.000000 vt 0.000000 1.000000 vt 0.000000 0.000000 -s off f 305/245/5 307/246/5 308/247/5 306/248/5 g westNONE v -0.168750 -0.168750 0.168750 @@ -851,7 +834,6 @@ vt 1.000000 0.000000 vt 1.000000 1.000000 vt 0.000000 1.000000 vt 0.000000 0.000000 -s off f 309/249/3 311/250/3 312/251/3 310/252/3 g northNONE v -0.168750 -0.168750 -0.168750 @@ -862,7 +844,6 @@ vt 1.000000 0.000000 vt 1.000000 1.000000 vt 0.000000 1.000000 vt 0.000000 0.000000 -s off f 313/253/6 315/254/6 316/255/6 314/256/6 g eastNONE v 0.168750 0.168750 -0.168750 @@ -873,7 +854,6 @@ vt 1.000000 0.000000 vt 1.000000 1.000000 vt 0.000000 1.000000 vt 0.000000 0.000000 -s off f 319/257/4 317/258/4 318/259/4 320/260/4 g upNONE v 0.168750 0.168750 0.168750 @@ -884,7 +864,6 @@ vt 1.000000 0.000000 vt 1.000000 1.000000 vt 0.000000 1.000000 vt 0.000000 0.000000 -s off f 321/261/1 324/262/1 323/263/1 322/264/1 g downNONE v -0.168750 -0.168750 0.168750 @@ -895,7 +874,6 @@ vt 1.000000 0.000000 vt 1.000000 1.000000 vt 0.000000 1.000000 vt 0.000000 0.000000 -s off f 325/265/2 326/266/2 327/267/2 328/268/2 g upPULL v 0.168750 0.168750 -0.168750 @@ -938,7 +916,6 @@ vt 0.750000 0.333333 vt 0.250000 0.333333 vt 0.750000 0.666667 vt 0.250000 0.666667 -s off f 338/269/5 332/270/5 330/271/5 339/272/5 f 331/271/6 333/272/6 336/269/6 329/270/6 f 340/272/6 337/273/6 335/274/6 334/269/6 @@ -972,7 +949,6 @@ vt 1.000000 0.083333 vt 1.000000 0.916667 vt 0.000000 0.916667 vt 0.000000 0.083333 -s off f 357/285/6 358/286/6 354/287/6 353/288/6 f 359/287/5 360/288/5 356/285/5 355/286/5 f 353/285/4 354/286/4 355/287/4 356/288/4