From d46e3e28b2b289e00142441a8cf0f3c68d2c019f Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 24 May 2016 00:17:01 -0400 Subject: [PATCH] Cleanup, fixed transmitter wrench --- .../client/render/obj/GlowPanelModel.java | 39 ++++++++++------- .../multipart/BlockToMultipartModel.java | 4 +- .../common/multipart/ColorProperty.java | 42 ++++++++++++++++++ .../common/multipart/GlowPanelBlockState.java | 41 +----------------- .../common/multipart/MultipartMekanism.java | 43 +++++++------------ .../common/multipart/PartGlowPanel.java | 26 ++--------- .../common/multipart/PartSidedPipe.java | 38 ++++++++-------- .../multipart/PartThermodynamicConductor.java | 9 ---- .../models/block/transmitter_none.json | 18 -------- .../models/block/transmitter_normal.json | 21 --------- .../models/block/transmitter_pull.json | 21 --------- .../models/block/transmitter_push.json | 21 --------- 12 files changed, 106 insertions(+), 217 deletions(-) create mode 100644 src/main/java/mekanism/common/multipart/ColorProperty.java delete mode 100644 src/main/resources/assets/mekanism/models/block/transmitter_none.json delete mode 100644 src/main/resources/assets/mekanism/models/block/transmitter_normal.json delete mode 100644 src/main/resources/assets/mekanism/models/block/transmitter_pull.json delete mode 100644 src/main/resources/assets/mekanism/models/block/transmitter_push.json diff --git a/src/main/java/mekanism/client/render/obj/GlowPanelModel.java b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java index c60603624..c34aa5d5d 100644 --- a/src/main/java/mekanism/client/render/obj/GlowPanelModel.java +++ b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java @@ -14,7 +14,7 @@ import javax.vecmath.Matrix4f; import mcmultipart.client.multipart.ISmartMultipartModel; import mekanism.api.EnumColor; import mekanism.client.render.ctm.CTMModelFactory; -import mekanism.common.multipart.GlowPanelBlockState; +import mekanism.common.multipart.ColorProperty; import mekanism.common.multipart.PartGlowPanel; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -65,12 +65,14 @@ public class GlowPanelModel extends OBJBakedModel implements ISmartMultipartMode private IBlockState tempState; private TextureAtlasSprite tempSprite; private ItemStack tempStack; + private ImmutableMap textureMap; public GlowPanelModel(IBakedModel base, OBJModel model, IModelState state, VertexFormat format, ImmutableMap textures, HashMap transform) { model.super(model, state, format, textures); baseModel = base; transformationMap = transform; + textureMap = textures; } public static void forceRebake() @@ -88,7 +90,7 @@ public class GlowPanelModel extends OBJBakedModel implements ISmartMultipartMode if(tempState != null) { - return ((IExtendedBlockState)tempState).getValue(GlowPanelBlockState.colorState).color; + return ((IExtendedBlockState)tempState).getValue(ColorProperty.INSTANCE).color; } return EnumColor.WHITE; @@ -98,7 +100,7 @@ public class GlowPanelModel extends OBJBakedModel implements ISmartMultipartMode public OBJBakedModel handlePartState(IBlockState state) { int hash = PartGlowPanel.hash((IExtendedBlockState)state); - EnumColor color = ((IExtendedBlockState)state).getValue(GlowPanelBlockState.colorState).color; + EnumColor color = ((IExtendedBlockState)state).getValue(ColorProperty.INSTANCE).color; if(!glowPanelCache.containsKey(hash)) { @@ -114,7 +116,9 @@ public class GlowPanelModel extends OBJBakedModel implements ISmartMultipartMode public IBakedModel handleItemState(ItemStack stack) { if(glowPanelItemCache.containsKey(stack.getItemDamage())) + { return glowPanelItemCache.get(stack.getItemDamage()); + } ImmutableMap.Builder builder = ImmutableMap.builder(); builder.put(ModelLoader.White.loc.toString(), ModelLoader.White.instance); @@ -124,10 +128,15 @@ public class GlowPanelModel extends OBJBakedModel implements ISmartMultipartMode { TextureAtlasSprite sprite = null; - if(sprite==null) + if(sprite == null) + { sprite = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(getModel().getMatLib().getMaterial(s).getTexture().getTextureLocation().toString()); - if(sprite==null) + } + + if(sprite == null) + { sprite = missing; + } builder.put(s, sprite); } @@ -190,16 +199,16 @@ public class GlowPanelModel extends OBJBakedModel implements ISmartMultipartMode { for(Vertex v : f.getVertices()) { - if(!v.getMaterial().equals(this.getModel().getMatLib().getMaterial(v.getMaterial().getName()))) + if(!v.getMaterial().equals(getModel().getMatLib().getMaterial(v.getMaterial().getName()))) { - v.setMaterial(this.getModel().getMatLib().getMaterial(v.getMaterial().getName())); + v.setMaterial(getModel().getMatLib().getMaterial(v.getMaterial().getName())); } } tempSprite = ModelLoader.White.instance; } else { - tempSprite = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(this.getModel().getMatLib().getMaterial(f.getMaterialName()).getTexture().getTextureLocation().toString()); + tempSprite = textureMap.get(f.getMaterialName()); } float[] color = new float[] { 1, 1, 1, 1 }; @@ -216,10 +225,10 @@ public class GlowPanelModel extends OBJBakedModel implements ISmartMultipartMode builder.setQuadTint(0); Normal faceNormal = f.getNormal(); - putVertexData(builder, f.getVertices()[0], faceNormal, TextureCoordinate.getDefaultUVs()[0], tempSprite, color); - putVertexData(builder, f.getVertices()[1], faceNormal, TextureCoordinate.getDefaultUVs()[1], tempSprite, color); - putVertexData(builder, f.getVertices()[2], faceNormal, TextureCoordinate.getDefaultUVs()[2], tempSprite, color); - putVertexData(builder, f.getVertices()[3], faceNormal, TextureCoordinate.getDefaultUVs()[3], tempSprite, color); + putVertexData(builder, f.getVertices()[0], faceNormal, TextureCoordinate.getDefaultUVs()[0], tempSprite, getFormat(), color); + putVertexData(builder, f.getVertices()[1], faceNormal, TextureCoordinate.getDefaultUVs()[1], tempSprite, getFormat(), color); + putVertexData(builder, f.getVertices()[2], faceNormal, TextureCoordinate.getDefaultUVs()[2], tempSprite, getFormat(), color); + putVertexData(builder, f.getVertices()[3], faceNormal, TextureCoordinate.getDefaultUVs()[3], tempSprite, getFormat(), color); bakedQuads.add(builder.build()); } @@ -230,11 +239,11 @@ public class GlowPanelModel extends OBJBakedModel implements ISmartMultipartMode return quadList; } - private final void putVertexData(UnpackedBakedQuad.Builder builder, Vertex v, Normal faceNormal, TextureCoordinate defUV, TextureAtlasSprite sprite, float[] color) + private static final void putVertexData(UnpackedBakedQuad.Builder builder, Vertex v, Normal faceNormal, TextureCoordinate defUV, TextureAtlasSprite sprite, VertexFormat format, float[] color) { - for(int e = 0; e < getFormat().getElementCount(); e++) + for(int e = 0; e < format.getElementCount(); e++) { - switch(getFormat().getElement(e).getUsage()) + switch(format.getElement(e).getUsage()) { case POSITION: builder.put(e, v.getPos().x, v.getPos().y, v.getPos().z, v.getPos().w); diff --git a/src/main/java/mekanism/common/multipart/BlockToMultipartModel.java b/src/main/java/mekanism/common/multipart/BlockToMultipartModel.java index b6e82c4f3..268f4770a 100644 --- a/src/main/java/mekanism/common/multipart/BlockToMultipartModel.java +++ b/src/main/java/mekanism/common/multipart/BlockToMultipartModel.java @@ -2,17 +2,15 @@ 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; -import mcmultipart.client.multipart.ISmartMultipartModel; - /** * Created by ben on 21/05/16. */ diff --git a/src/main/java/mekanism/common/multipart/ColorProperty.java b/src/main/java/mekanism/common/multipart/ColorProperty.java new file mode 100644 index 000000000..890f10cb3 --- /dev/null +++ b/src/main/java/mekanism/common/multipart/ColorProperty.java @@ -0,0 +1,42 @@ +package mekanism.common.multipart; + +import mekanism.api.EnumColor; +import net.minecraftforge.common.property.IUnlistedProperty; + +public class ColorProperty implements IUnlistedProperty +{ + public static ColorProperty INSTANCE = new ColorProperty(); + + public EnumColor color; + + public ColorProperty() {} + + public ColorProperty(EnumColor c) + { + color = c; + } + + @Override + public String getName() + { + return "color"; + } + + @Override + public boolean isValid(ColorProperty value) + { + return true; + } + + @Override + public Class getType() + { + return getClass(); + } + + @Override + public String valueToString(ColorProperty value) + { + return color.getName(); + } +} \ No newline at end of file diff --git a/src/main/java/mekanism/common/multipart/GlowPanelBlockState.java b/src/main/java/mekanism/common/multipart/GlowPanelBlockState.java index 906060f55..caaa8b5f6 100644 --- a/src/main/java/mekanism/common/multipart/GlowPanelBlockState.java +++ b/src/main/java/mekanism/common/multipart/GlowPanelBlockState.java @@ -1,7 +1,6 @@ package mekanism.common.multipart; import mcmultipart.MCMultiPartMod; -import mekanism.api.EnumColor; import mekanism.common.block.states.BlockStateFacing; import net.minecraft.block.properties.IProperty; import net.minecraftforge.common.property.ExtendedBlockState; @@ -9,46 +8,8 @@ import net.minecraftforge.common.property.IUnlistedProperty; public class GlowPanelBlockState extends ExtendedBlockState { - public static GlowPanelColorProperty colorState = new GlowPanelColorProperty(); - public GlowPanelBlockState() { - super(MCMultiPartMod.multipart, new IProperty[] {BlockStateFacing.facingProperty}, new IUnlistedProperty[] {colorState}); - } - - public static class GlowPanelColorProperty implements IUnlistedProperty - { - public EnumColor color; - - public GlowPanelColorProperty() {} - - public GlowPanelColorProperty(EnumColor c) - { - color = c; - } - - @Override - public String getName() - { - return "color"; - } - - @Override - public boolean isValid(GlowPanelColorProperty value) - { - return true; - } - - @Override - public Class getType() - { - return getClass(); - } - - @Override - public String valueToString(GlowPanelColorProperty value) - { - return color.getName(); - } + super(MCMultiPartMod.multipart, new IProperty[] {BlockStateFacing.facingProperty}, new IUnlistedProperty[] {ColorProperty.INSTANCE}); } } diff --git a/src/main/java/mekanism/common/multipart/MultipartMekanism.java b/src/main/java/mekanism/common/multipart/MultipartMekanism.java index bb100a294..5c3b8d444 100644 --- a/src/main/java/mekanism/common/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/multipart/MultipartMekanism.java @@ -1,43 +1,22 @@ package mekanism.common.multipart; -import java.io.IOException; -import java.util.List; - -import static mekanism.client.ClientProxy.CUSTOM_RENDERS; import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_1; import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_2; - -import mcmultipart.client.multipart.ISmartMultipartModel; import mcmultipart.multipart.IMultipart; import mcmultipart.multipart.IPartFactory; +import mcmultipart.multipart.Multipart; import mcmultipart.multipart.MultipartRegistry; import mekanism.common.MekanismBlocks; import mekanism.common.Tier; import mekanism.common.block.states.BlockStateMachine.MachineType; - -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.client.resources.model.ModelResourceLocation; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.ISmartBlockModel; import net.minecraftforge.fml.common.event.FMLInterModComms; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -/* -import codechicken.microblock.BlockMicroMaterial; -import codechicken.microblock.MicroMaterialRegistry; -import codechicken.multipart.MultiPartRegistry; -import codechicken.multipart.MultiPartRegistry.IPartFactory; -import codechicken.multipart.MultipartGenerator; -import codechicken.multipart.TMultiPart; -*/ public class MultipartMekanism implements IPartFactory { @@ -199,14 +178,22 @@ public class MultipartMekanism implements IPartFactory FMLInterModComms.sendMessage("ForgeMicroblock", "microMaterial", new ItemStack(MekanismBlocks.CardboardBox)); } - public static void dropItem(ItemStack stack, World world, Vec3 pos) + public static void dropItem(ItemStack stack, Multipart multipart) { - EntityItem item = new EntityItem(world, pos.xCoord, pos.yCoord, pos.zCoord, stack); - item.motionX = world.rand.nextGaussian() * 0.05; - item.motionY = world.rand.nextGaussian() * 0.05 + 0.2; - item.motionZ = world.rand.nextGaussian() * 0.05; + EntityItem item = new EntityItem(multipart.getWorld(), multipart.getPos().getX()+0.5, multipart.getPos().getY()+0.5, multipart.getPos().getZ()+0.5, stack); + item.motionX = multipart.getWorld().rand.nextGaussian() * 0.05; + item.motionY = multipart.getWorld().rand.nextGaussian() * 0.05 + 0.2; + item.motionZ = multipart.getWorld().rand.nextGaussian() * 0.05; item.setDefaultPickupDelay(); - world.spawnEntityInWorld(item); + multipart.getWorld().spawnEntityInWorld(item); + } + + public static void dropItems(Multipart multipart) + { + for(ItemStack stack : multipart.getDrops()) + { + dropItem(stack, multipart); + } } @SubscribeEvent diff --git a/src/main/java/mekanism/common/multipart/PartGlowPanel.java b/src/main/java/mekanism/common/multipart/PartGlowPanel.java index d20016586..5d9c6f7e5 100644 --- a/src/main/java/mekanism/common/multipart/PartGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/PartGlowPanel.java @@ -12,10 +12,8 @@ import mcmultipart.raytrace.PartMOP; import mcmultipart.util.TransformationHelper; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.Pos3D; import mekanism.common.MekanismItems; import mekanism.common.block.states.BlockStateFacing; -import mekanism.common.multipart.GlowPanelBlockState.GlowPanelColorProperty; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -27,22 +25,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraft.util.Vec3; import net.minecraftforge.common.property.IExtendedBlockState; -/* -import codechicken.lib.data.MCDataInput; -import codechicken.lib.data.MCDataOutput; -import codechicken.lib.vec.AxisAlignedBB; -import codechicken.lib.vec.Rotation; -import codechicken.lib.vec.Translation; -import codechicken.lib.vec.Vector3; -import codechicken.microblock.HollowMicroblock; -import codechicken.multipart.IconHitEffects; -import codechicken.multipart.JCuboidPart; -import codechicken.multipart.JIconHitEffects; -import codechicken.multipart.JNormalOcclusion; -import codechicken.multipart.NormalOcclusionTest; -import codechicken.multipart.TMultiPart; -import codechicken.multipart.TileMultipart; -*/ public class PartGlowPanel extends Multipart implements IOccludingPart { @@ -101,7 +83,7 @@ public class PartGlowPanel extends Multipart implements IOccludingPart { if(!getWorld().isRemote && !canStay()) { - MultipartMekanism.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), getWorld(), new Pos3D(getPos()).translate(0.5, 0.5, 0.5)); + MultipartMekanism.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), this); getContainer().removePart(this); } } @@ -111,7 +93,7 @@ public class PartGlowPanel extends Multipart implements IOccludingPart { if(!getWorld().isRemote && !canStay()) { - MultipartMekanism.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), getWorld(), new Pos3D(getPos()).translate(0.5, 0.5, 0.5)); + MultipartMekanism.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), this); getContainer().removePart(this); } } @@ -193,7 +175,7 @@ public class PartGlowPanel extends Multipart implements IOccludingPart if(state instanceof IExtendedBlockState) { - return ((IExtendedBlockState)state).withProperty(GlowPanelBlockState.colorState, new GlowPanelColorProperty(colour)); + return ((IExtendedBlockState)state).withProperty(ColorProperty.INSTANCE, new ColorProperty(colour)); } return state; @@ -202,7 +184,7 @@ public class PartGlowPanel extends Multipart implements IOccludingPart public static int hash(IExtendedBlockState state) { int hash = 1; - hash = 31 * hash + state.getValue(GlowPanelBlockState.colorState).color.ordinal(); + hash = 31 * hash + state.getValue(ColorProperty.INSTANCE).color.ordinal(); hash = 31 * hash + state.getValue(BlockStateFacing.facingProperty).ordinal(); return hash; diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index 16132832d..0714e9cd1 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -6,23 +6,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -/*import codechicken.lib.data.MCDataInput; -import codechicken.lib.data.MCDataOutput; -import codechicken.lib.raytracer.ExtendedMOP; -import codechicken.lib.raytracer.AxisAlignedBB; -import codechicken.lib.raytracer.RayTracer; -import codechicken.lib.render.CCModel; -import codechicken.lib.vec.Cuboid6; -import codechicken.lib.vec.Vector3; -import codechicken.microblock.ISidedHollowConnect; -import codechicken.multipart.INeighborTileChange; -import codechicken.multipart.IconHitEffects; -import codechicken.multipart.JIconHitEffects; -import codechicken.multipart.JNormalOcclusion; -import codechicken.multipart.NormalOcclusionTest; -import codechicken.multipart.PartMap; -import codechicken.multipart.IMultipart; -import codechicken.multipart.TSlottedPart;*/ import mcmultipart.MCMultiPartMod; import mcmultipart.block.TileMultipart; import mcmultipart.multipart.IMultipart; @@ -71,6 +54,23 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; +/*import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.lib.raytracer.ExtendedMOP; +import codechicken.lib.raytracer.AxisAlignedBB; +import codechicken.lib.raytracer.RayTracer; +import codechicken.lib.render.CCModel; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.ISidedHollowConnect; +import codechicken.multipart.INeighborTileChange; +import codechicken.multipart.IconHitEffects; +import codechicken.multipart.JIconHitEffects; +import codechicken.multipart.JNormalOcclusion; +import codechicken.multipart.NormalOcclusionTest; +import codechicken.multipart.PartMap; +import codechicken.multipart.IMultipart; +import codechicken.multipart.TSlottedPart;*/ public abstract class PartSidedPipe extends Multipart implements IOccludingPart, /*ISlotOccludingPart, ISidedHollowConnect, JIconHitEffects, INeighborTileChange,*/ ITileNetwork, IBlockableConnection, IConfigurable, ITransmitter, ITickable { @@ -647,7 +647,7 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart, { if(!getWorld().isRemote) { - //TODO tile().dropItems(getDrops()); + MultipartMekanism.dropItems(this); getContainer().removePart(this); } @@ -935,7 +935,7 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart, @Override public BlockState createBlockState() { - return new ExtendedBlockState(MCMultiPartMod.multipart, new IProperty[0], new IUnlistedProperty[] {OBJProperty.instance}); + return new ExtendedBlockState(MCMultiPartMod.multipart, new IProperty[0], new IUnlistedProperty[] {OBJProperty.instance, ColorProperty.INSTANCE}); } public List getVisibleGroups() diff --git a/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java b/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java index e778e4727..73f5dfabc 100644 --- a/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java +++ b/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java @@ -15,20 +15,11 @@ import mekanism.common.util.MekanismUtils; //import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; //import net.minecraft.util.IIcon; import net.minecraft.util.EnumFacing; -/* -import codechicken.lib.colour.ColourRGBA; -import codechicken.lib.data.MCDataInput; -import codechicken.lib.data.MCDataOutput; -import codechicken.lib.vec.Vector3; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -*/ public class PartThermodynamicConductor extends PartTransmitter implements IHeatTransfer { diff --git a/src/main/resources/assets/mekanism/models/block/transmitter_none.json b/src/main/resources/assets/mekanism/models/block/transmitter_none.json deleted file mode 100644 index cb05b8a15..000000000 --- a/src/main/resources/assets/mekanism/models/block/transmitter_none.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "elements": [ - { "from": [ 5, 11, 5 ], - "to": [ 11, 11, 11 ], - "faces": { - "up": { "texture": "#center"} - } - } - ], - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/mekanism/models/block/transmitter_normal.json b/src/main/resources/assets/mekanism/models/block/transmitter_normal.json deleted file mode 100644 index 9fba2e699..000000000 --- a/src/main/resources/assets/mekanism/models/block/transmitter_normal.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "elements": [ - { "from": [ 5, 11, 5 ], - "to": [ 11, 16, 11 ], - "faces": { - "north": { "texture": "#side"}, - "south": { "texture": "#side"}, - "west": { "texture": "#side"}, - "east": { "texture": "#side"} - } - } - ], - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/mekanism/models/block/transmitter_pull.json b/src/main/resources/assets/mekanism/models/block/transmitter_pull.json deleted file mode 100644 index 9fba2e699..000000000 --- a/src/main/resources/assets/mekanism/models/block/transmitter_pull.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "elements": [ - { "from": [ 5, 11, 5 ], - "to": [ 11, 16, 11 ], - "faces": { - "north": { "texture": "#side"}, - "south": { "texture": "#side"}, - "west": { "texture": "#side"}, - "east": { "texture": "#side"} - } - } - ], - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} - diff --git a/src/main/resources/assets/mekanism/models/block/transmitter_push.json b/src/main/resources/assets/mekanism/models/block/transmitter_push.json deleted file mode 100644 index 9fba2e699..000000000 --- a/src/main/resources/assets/mekanism/models/block/transmitter_push.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "elements": [ - { "from": [ 5, 11, 5 ], - "to": [ 11, 16, 11 ], - "faces": { - "north": { "texture": "#side"}, - "south": { "texture": "#side"}, - "west": { "texture": "#side"}, - "east": { "texture": "#side"} - } - } - ], - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} -