From d4a6fa43be2ee65048629a1825b376fb7e6692c2 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Thu, 19 May 2016 22:31:38 +0100 Subject: [PATCH] IConfigurable capability and PoC for transmitter render --- .../common/capabilities/Capabilities.java | 2 + .../common/capabilities/Configurable.java | 32 +++ .../capabilities/StrictEnergyStorage.java | 1 - .../common/item/ItemConfigurator.java | 5 +- .../common/multipart/PartSidedPipe.java | 103 ++++++++- .../blockstates/universal_cable_advanced.json | 215 ++++++++++++++++++ .../blockstates/universal_cable_basic.json | 215 ++++++++++++++++++ .../blockstates/universal_cable_elite.json | 215 ++++++++++++++++++ .../blockstates/universal_cable_ultimate.json | 215 ++++++++++++++++++ .../models/block/transmitter_none.json | 18 ++ .../models/block/transmitter_normal.json | 21 ++ .../models/block/transmitter_pull.json | 21 ++ .../models/block/transmitter_push.json | 21 ++ 13 files changed, 1075 insertions(+), 9 deletions(-) create mode 100644 src/main/java/mekanism/common/capabilities/Configurable.java create mode 100644 src/main/resources/assets/mekanism/blockstates/universal_cable_advanced.json create mode 100644 src/main/resources/assets/mekanism/blockstates/universal_cable_basic.json create mode 100644 src/main/resources/assets/mekanism/blockstates/universal_cable_elite.json create mode 100644 src/main/resources/assets/mekanism/blockstates/universal_cable_ultimate.json create mode 100644 src/main/resources/assets/mekanism/models/block/transmitter_none.json create mode 100644 src/main/resources/assets/mekanism/models/block/transmitter_normal.json create mode 100644 src/main/resources/assets/mekanism/models/block/transmitter_pull.json create mode 100644 src/main/resources/assets/mekanism/models/block/transmitter_push.json diff --git a/src/main/java/mekanism/common/capabilities/Capabilities.java b/src/main/java/mekanism/common/capabilities/Capabilities.java index ef096d49b..0b4f09343 100644 --- a/src/main/java/mekanism/common/capabilities/Capabilities.java +++ b/src/main/java/mekanism/common/capabilities/Capabilities.java @@ -61,5 +61,7 @@ public class Capabilities GridTransmitterTile.register(); LogisticalTransporter.register(); + + Configurable.register(); } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/capabilities/Configurable.java b/src/main/java/mekanism/common/capabilities/Configurable.java new file mode 100644 index 000000000..f710dcde9 --- /dev/null +++ b/src/main/java/mekanism/common/capabilities/Configurable.java @@ -0,0 +1,32 @@ +package mekanism.common.capabilities; + +import mekanism.api.IConfigurable; +import mekanism.common.capabilities.StorageHelper.NullStorage; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.CapabilityManager; + +/** + * Created by ben on 19/05/16. + */ +public class Configurable implements IConfigurable +{ + + @Override + public boolean onSneakRightClick(EntityPlayer player, EnumFacing side) + { + return false; + } + + @Override + public boolean onRightClick(EntityPlayer player, EnumFacing side) + { + return false; + } + + public static void register() + { + CapabilityManager.INSTANCE.register(IConfigurable.class, new NullStorage(), Configurable.class); + } +} diff --git a/src/main/java/mekanism/common/capabilities/StrictEnergyStorage.java b/src/main/java/mekanism/common/capabilities/StrictEnergyStorage.java index 44dd379ab..6c88ce76e 100644 --- a/src/main/java/mekanism/common/capabilities/StrictEnergyStorage.java +++ b/src/main/java/mekanism/common/capabilities/StrictEnergyStorage.java @@ -61,6 +61,5 @@ public class StrictEnergyStorage implements IStrictEnergyStorage, INBTSerializab public static void register() { CapabilityManager.INSTANCE.register(IStrictEnergyStorage.class, new DefaultStorage<>(), StrictEnergyStorage.class); - } } diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 222f7cbb8..02f9e9856 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -14,6 +14,7 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.SideData; import mekanism.common.base.ISideConfiguration; +import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityContainerBlock; @@ -108,9 +109,9 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool return true; } - else if(tile instanceof IConfigurable) + else if(MekanismUtils.hasCapability(tile, Capabilities.CONFIGURABLE_CAPABILITY, side)) { - IConfigurable config = (IConfigurable)tile; + IConfigurable config = MekanismUtils.getCapability(tile, Capabilities.CONFIGURABLE_CAPABILITY, side); if(SecurityUtils.canAccess(player, tile)) { diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index 394167ec0..ee92b5781 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -23,6 +23,7 @@ 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; import mcmultipart.multipart.IOccludingPart; @@ -39,11 +40,19 @@ import mekanism.api.transmitters.ITransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.common.MekanismItems; import mekanism.common.Tier; +import mekanism.common.Tier.CableTier; import mekanism.common.base.ITileNetwork; +import mekanism.common.block.states.BlockStateFacing; import mekanism.common.capabilities.Capabilities; +import mekanism.common.capabilities.StrictEnergyAcceptor; import mekanism.common.multipart.TransmitterType.Size; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyBool; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -56,9 +65,14 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; //import net.minecraft.util.IIcon; +import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.IStringSerializable; import net.minecraft.util.ITickable; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.property.ExtendedBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; public abstract class PartSidedPipe extends Multipart implements IOccludingPart, /*ISlotOccludingPart, ISidedHollowConnect, JIconHitEffects, INeighborTileChange,*/ ITileNetwork, IBlockableConnection, IConfigurable, ITransmitter, ITickable { @@ -82,6 +96,13 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart, public ConnectionType[] connectionTypes = {ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL}; public TileEntity[] cachedAcceptors = new TileEntity[6]; + public PropertyEnum DOWN_PROPERTY = PropertyEnum.create("down", ConnectionType.class), + UP_PROPERTY = PropertyEnum.create("up", ConnectionType.class), + NORTH_PROPERTY = PropertyEnum.create("north", ConnectionType.class), + SOUTH_PROPERTY = PropertyEnum.create("south", ConnectionType.class), + WEST_PROPERTY = PropertyEnum.create("west", ConnectionType.class), + EAST_PROPERTY = PropertyEnum.create("east", ConnectionType.class); + static { smallSides[0] = new AxisAlignedBB(0.3, 0.0, 0.3, 0.7, 0.3, 0.7); @@ -421,7 +442,24 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart, @Override public void addCollisionBoxes(AxisAlignedBB mask, List list, Entity collidingEntity) { - addSelectionBoxes(list); + if(getContainer() != null) + { + for(EnumFacing side : EnumFacing.values()) + { + int ord = side.ordinal(); + byte connections = getAllCurrentConnections(); + + if(connectionMapContainsSide(connections, side) || side == testingSide) + { + AxisAlignedBB box = getTransmitterType().getSize() == Size.SMALL ? smallSides[ord] : largeSides[ord]; + if(box.intersectsWith(mask)) list.add(box); + } + } + } + + AxisAlignedBB box = getTransmitterType().getSize() == Size.SMALL ? smallSides[6] : largeSides[6]; + if(box.intersectsWith(mask)) list.add(box); + } @Override @@ -862,7 +900,58 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart, return true; } - public static enum ConnectionType + @Override + public String getModelPath() + { + return getType(); + } + + @Override + public BlockState createBlockState() + { + return new BlockState(MCMultiPartMod.multipart, DOWN_PROPERTY, UP_PROPERTY, NORTH_PROPERTY, SOUTH_PROPERTY, WEST_PROPERTY, EAST_PROPERTY); + } + + @Override + public IBlockState getExtendedState(IBlockState state) + { + return state + .withProperty(DOWN_PROPERTY, getConnectionType(EnumFacing.DOWN)) + .withProperty(UP_PROPERTY, getConnectionType(EnumFacing.UP)) + .withProperty(NORTH_PROPERTY, getConnectionType(EnumFacing.NORTH)) + .withProperty(SOUTH_PROPERTY, getConnectionType(EnumFacing.SOUTH)) + .withProperty(WEST_PROPERTY, getConnectionType(EnumFacing.WEST)) + .withProperty(EAST_PROPERTY, getConnectionType(EnumFacing.EAST)); + } + + @Override + public boolean canRenderInLayer(EnumWorldBlockLayer layer) { + + return layer == EnumWorldBlockLayer.TRANSLUCENT; + } + + + public void notifyTileChange() + { + MekanismUtils.notifyLoadedNeighborsOfTileChange(getWorld(), new Coord4D(getPos(), getWorld())); + } + + @Override + public boolean hasCapability(Capability capability, EnumFacing facing) + { + return capability == Capabilities.CONFIGURABLE_CAPABILITY + || super.hasCapability(capability, facing); + } + + @Override + public T getCapability(Capability capability, EnumFacing facing) + { + if(capability == Capabilities.CONFIGURABLE_CAPABILITY) + return (T) this; + return super.getCapability(capability, facing); + } + + public static enum ConnectionType implements IStringSerializable { NORMAL, PUSH, @@ -878,10 +967,12 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart, return values()[ordinal()+1]; } + + public String getName() + { + return name().toLowerCase(); + } } - public void notifyTileChange() - { - MekanismUtils.notifyLoadedNeighborsOfTileChange(getWorld(), new Coord4D(getPos(), getWorld())); - } + } diff --git a/src/main/resources/assets/mekanism/blockstates/universal_cable_advanced.json b/src/main/resources/assets/mekanism/blockstates/universal_cable_advanced.json new file mode 100644 index 000000000..60265c474 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/universal_cable_advanced.json @@ -0,0 +1,215 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "side": "mekanism:blocks/models/multipart/UniversalCableVerticalAdvanced", + "center": "mekanism:blocks/models/multipart/UniversalCableAdvanced" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "multipart": [{}], + "down": { + "none": { + "submodel": { + "down": { + "model": "mekanism:transmitter_none", + "x": 180 + } + } + }, + "normal": { + "submodel": { + "down": { + "model": "mekanism:transmitter_normal", + "x": 180 + } + } + }, + "push": { + "submodel": { + "down": { + "model": "mekanism:transmitter_push", + "x": 180 + } + } + }, + "pull": { + "submodel": { + "down": { + "model": "mekanism:transmitter_pull", + "x": 180 + } + } + } + }, + "up": { + "none": { + "submodel": { + "up": { + "model": "mekanism:transmitter_none" + } + } + }, + "normal": { + "submodel": { + "up": { + "model": "mekanism:transmitter_normal" + } + } + }, + "push": { + "submodel": { + "up": { + "model": "mekanism:transmitter_push" + } + } + }, + "pull": { + "submodel": { + "up": { + "model": "mekanism:transmitter_pull" + } + } + } + }, + "north": { + "none": { + "submodel": { + "north": { + "model": "mekanism:transmitter_none", + "x": 270, "y": 180 + } + } + }, + "normal": { + "submodel": { + "north": { + "model": "mekanism:transmitter_normal", + "x": 270, "y": 180 + } + } + }, + "push": { + "submodel": { + "north": { + "model": "mekanism:transmitter_push", + "x": 270, "y": 180 + } + } + }, + "pull": { + "submodel": { + "north": { + "model": "mekanism:transmitter_pull", + "x": 270, "y": 180 + } + } + } + }, + "south": { + "none": { + "submodel": { + "south": { + "model": "mekanism:transmitter_none", + "x": 270 + } + } + }, + "normal": { + "submodel": { + "south": { + "model": "mekanism:transmitter_normal", + "x": 270 + } + } + }, + "push": { + "submodel": { + "south": { + "model": "mekanism:transmitter_push", + "x": 270 + } + } + }, + "pull": { + "submodel": { + "south": { + "model": "mekanism:transmitter_pull", + "x": 270 + } + } + } + }, + "west": { + "none": { + "submodel": { + "west": { + "model": "mekanism:transmitter_none", + "x": 270, "y": 90 + } + } + }, + "normal": { + "submodel": { + "west": { + "model": "mekanism:transmitter_normal", + "x": 270, "y": 90 + } + } + }, + "push": { + "submodel": { + "west": { + "model": "mekanism:transmitter_push", + "x": 270, "y": 90 + } + } + }, + "pull": { + "submodel": { + "west": { + "model": "mekanism:transmitter_pull", + "x": 270, "y": 90 + } + } + } + }, + "east": { + "none": { + "submodel": { + "east": { + "model": "mekanism:transmitter_none", + "x": 270, "y": 270 + } + } + }, + "normal": { + "submodel": { + "east": { + "model": "mekanism:transmitter_normal", + "x": 270, "y": 270 + } + } + }, + "push": { + "submodel": { + "east": { + "model": "mekanism:transmitter_push", + "x": 270, "y": 270 + } + } + }, + "pull": { + "submodel": { + "east": { + "model": "mekanism:transmitter_pull", + "x": 270, "y": 270 + } + } + } + } + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/universal_cable_basic.json b/src/main/resources/assets/mekanism/blockstates/universal_cable_basic.json new file mode 100644 index 000000000..172a623a8 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/universal_cable_basic.json @@ -0,0 +1,215 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "side": "mekanism:blocks/models/multipart/UniversalCableVerticalBasic", + "center": "mekanism:blocks/models/multipart/UniversalCableBasic" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "multipart": [{}], + "down": { + "none": { + "submodel": { + "down": { + "model": "mekanism:transmitter_none", + "x": 180 + } + } + }, + "normal": { + "submodel": { + "down": { + "model": "mekanism:transmitter_normal", + "x": 180 + } + } + }, + "push": { + "submodel": { + "down": { + "model": "mekanism:transmitter_push", + "x": 180 + } + } + }, + "pull": { + "submodel": { + "down": { + "model": "mekanism:transmitter_pull", + "x": 180 + } + } + } + }, + "up": { + "none": { + "submodel": { + "up": { + "model": "mekanism:transmitter_none" + } + } + }, + "normal": { + "submodel": { + "up": { + "model": "mekanism:transmitter_normal" + } + } + }, + "push": { + "submodel": { + "up": { + "model": "mekanism:transmitter_push" + } + } + }, + "pull": { + "submodel": { + "up": { + "model": "mekanism:transmitter_pull" + } + } + } + }, + "north": { + "none": { + "submodel": { + "north": { + "model": "mekanism:transmitter_none", + "x": 270, "y": 180 + } + } + }, + "normal": { + "submodel": { + "north": { + "model": "mekanism:transmitter_normal", + "x": 270, "y": 180 + } + } + }, + "push": { + "submodel": { + "north": { + "model": "mekanism:transmitter_push", + "x": 270, "y": 180 + } + } + }, + "pull": { + "submodel": { + "north": { + "model": "mekanism:transmitter_pull", + "x": 270, "y": 180 + } + } + } + }, + "south": { + "none": { + "submodel": { + "south": { + "model": "mekanism:transmitter_none", + "x": 270 + } + } + }, + "normal": { + "submodel": { + "south": { + "model": "mekanism:transmitter_normal", + "x": 270 + } + } + }, + "push": { + "submodel": { + "south": { + "model": "mekanism:transmitter_push", + "x": 270 + } + } + }, + "pull": { + "submodel": { + "south": { + "model": "mekanism:transmitter_pull", + "x": 270 + } + } + } + }, + "west": { + "none": { + "submodel": { + "west": { + "model": "mekanism:transmitter_none", + "x": 270, "y": 90 + } + } + }, + "normal": { + "submodel": { + "west": { + "model": "mekanism:transmitter_normal", + "x": 270, "y": 90 + } + } + }, + "push": { + "submodel": { + "west": { + "model": "mekanism:transmitter_push", + "x": 270, "y": 90 + } + } + }, + "pull": { + "submodel": { + "west": { + "model": "mekanism:transmitter_pull", + "x": 270, "y": 90 + } + } + } + }, + "east": { + "none": { + "submodel": { + "east": { + "model": "mekanism:transmitter_none", + "x": 270, "y": 270 + } + } + }, + "normal": { + "submodel": { + "east": { + "model": "mekanism:transmitter_normal", + "x": 270, "y": 270 + } + } + }, + "push": { + "submodel": { + "east": { + "model": "mekanism:transmitter_push", + "x": 270, "y": 270 + } + } + }, + "pull": { + "submodel": { + "east": { + "model": "mekanism:transmitter_pull", + "x": 270, "y": 270 + } + } + } + } + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/universal_cable_elite.json b/src/main/resources/assets/mekanism/blockstates/universal_cable_elite.json new file mode 100644 index 000000000..a497e4500 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/universal_cable_elite.json @@ -0,0 +1,215 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "side": "mekanism:blocks/models/multipart/UniversalCableVerticalElite", + "center": "mekanism:blocks/models/multipart/UniversalCableElite" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "multipart": [{}], + "down": { + "none": { + "submodel": { + "down": { + "model": "mekanism:transmitter_none", + "x": 180 + } + } + }, + "normal": { + "submodel": { + "down": { + "model": "mekanism:transmitter_normal", + "x": 180 + } + } + }, + "push": { + "submodel": { + "down": { + "model": "mekanism:transmitter_push", + "x": 180 + } + } + }, + "pull": { + "submodel": { + "down": { + "model": "mekanism:transmitter_pull", + "x": 180 + } + } + } + }, + "up": { + "none": { + "submodel": { + "up": { + "model": "mekanism:transmitter_none" + } + } + }, + "normal": { + "submodel": { + "up": { + "model": "mekanism:transmitter_normal" + } + } + }, + "push": { + "submodel": { + "up": { + "model": "mekanism:transmitter_push" + } + } + }, + "pull": { + "submodel": { + "up": { + "model": "mekanism:transmitter_pull" + } + } + } + }, + "north": { + "none": { + "submodel": { + "north": { + "model": "mekanism:transmitter_none", + "x": 270, "y": 180 + } + } + }, + "normal": { + "submodel": { + "north": { + "model": "mekanism:transmitter_normal", + "x": 270, "y": 180 + } + } + }, + "push": { + "submodel": { + "north": { + "model": "mekanism:transmitter_push", + "x": 270, "y": 180 + } + } + }, + "pull": { + "submodel": { + "north": { + "model": "mekanism:transmitter_pull", + "x": 270, "y": 180 + } + } + } + }, + "south": { + "none": { + "submodel": { + "south": { + "model": "mekanism:transmitter_none", + "x": 270 + } + } + }, + "normal": { + "submodel": { + "south": { + "model": "mekanism:transmitter_normal", + "x": 270 + } + } + }, + "push": { + "submodel": { + "south": { + "model": "mekanism:transmitter_push", + "x": 270 + } + } + }, + "pull": { + "submodel": { + "south": { + "model": "mekanism:transmitter_pull", + "x": 270 + } + } + } + }, + "west": { + "none": { + "submodel": { + "west": { + "model": "mekanism:transmitter_none", + "x": 270, "y": 90 + } + } + }, + "normal": { + "submodel": { + "west": { + "model": "mekanism:transmitter_normal", + "x": 270, "y": 90 + } + } + }, + "push": { + "submodel": { + "west": { + "model": "mekanism:transmitter_push", + "x": 270, "y": 90 + } + } + }, + "pull": { + "submodel": { + "west": { + "model": "mekanism:transmitter_pull", + "x": 270, "y": 90 + } + } + } + }, + "east": { + "none": { + "submodel": { + "east": { + "model": "mekanism:transmitter_none", + "x": 270, "y": 270 + } + } + }, + "normal": { + "submodel": { + "east": { + "model": "mekanism:transmitter_normal", + "x": 270, "y": 270 + } + } + }, + "push": { + "submodel": { + "east": { + "model": "mekanism:transmitter_push", + "x": 270, "y": 270 + } + } + }, + "pull": { + "submodel": { + "east": { + "model": "mekanism:transmitter_pull", + "x": 270, "y": 270 + } + } + } + } + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/universal_cable_ultimate.json b/src/main/resources/assets/mekanism/blockstates/universal_cable_ultimate.json new file mode 100644 index 000000000..eb4382014 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/universal_cable_ultimate.json @@ -0,0 +1,215 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "side": "mekanism:blocks/models/multipart/UniversalCableVerticalUltimate", + "center": "mekanism:blocks/models/multipart/UniversalCableUltimate" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "multipart": [{}], + "down": { + "none": { + "submodel": { + "down": { + "model": "mekanism:transmitter_none", + "x": 180 + } + } + }, + "normal": { + "submodel": { + "down": { + "model": "mekanism:transmitter_normal", + "x": 180 + } + } + }, + "push": { + "submodel": { + "down": { + "model": "mekanism:transmitter_push", + "x": 180 + } + } + }, + "pull": { + "submodel": { + "down": { + "model": "mekanism:transmitter_pull", + "x": 180 + } + } + } + }, + "up": { + "none": { + "submodel": { + "up": { + "model": "mekanism:transmitter_none" + } + } + }, + "normal": { + "submodel": { + "up": { + "model": "mekanism:transmitter_normal" + } + } + }, + "push": { + "submodel": { + "up": { + "model": "mekanism:transmitter_push" + } + } + }, + "pull": { + "submodel": { + "up": { + "model": "mekanism:transmitter_pull" + } + } + } + }, + "north": { + "none": { + "submodel": { + "north": { + "model": "mekanism:transmitter_none", + "x": 270, "y": 180 + } + } + }, + "normal": { + "submodel": { + "north": { + "model": "mekanism:transmitter_normal", + "x": 270, "y": 180 + } + } + }, + "push": { + "submodel": { + "north": { + "model": "mekanism:transmitter_push", + "x": 270, "y": 180 + } + } + }, + "pull": { + "submodel": { + "north": { + "model": "mekanism:transmitter_pull", + "x": 270, "y": 180 + } + } + } + }, + "south": { + "none": { + "submodel": { + "south": { + "model": "mekanism:transmitter_none", + "x": 270 + } + } + }, + "normal": { + "submodel": { + "south": { + "model": "mekanism:transmitter_normal", + "x": 270 + } + } + }, + "push": { + "submodel": { + "south": { + "model": "mekanism:transmitter_push", + "x": 270 + } + } + }, + "pull": { + "submodel": { + "south": { + "model": "mekanism:transmitter_pull", + "x": 270 + } + } + } + }, + "west": { + "none": { + "submodel": { + "west": { + "model": "mekanism:transmitter_none", + "x": 270, "y": 90 + } + } + }, + "normal": { + "submodel": { + "west": { + "model": "mekanism:transmitter_normal", + "x": 270, "y": 90 + } + } + }, + "push": { + "submodel": { + "west": { + "model": "mekanism:transmitter_push", + "x": 270, "y": 90 + } + } + }, + "pull": { + "submodel": { + "west": { + "model": "mekanism:transmitter_pull", + "x": 270, "y": 90 + } + } + } + }, + "east": { + "none": { + "submodel": { + "east": { + "model": "mekanism:transmitter_none", + "x": 270, "y": 270 + } + } + }, + "normal": { + "submodel": { + "east": { + "model": "mekanism:transmitter_normal", + "x": 270, "y": 270 + } + } + }, + "push": { + "submodel": { + "east": { + "model": "mekanism:transmitter_push", + "x": 270, "y": 270 + } + } + }, + "pull": { + "submodel": { + "east": { + "model": "mekanism:transmitter_pull", + "x": 270, "y": 270 + } + } + } + } + } +} + diff --git a/src/main/resources/assets/mekanism/models/block/transmitter_none.json b/src/main/resources/assets/mekanism/models/block/transmitter_none.json new file mode 100644 index 000000000..cb05b8a15 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/transmitter_none.json @@ -0,0 +1,18 @@ +{ + "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 new file mode 100644 index 000000000..9fba2e699 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/transmitter_normal.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 000000000..9fba2e699 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/transmitter_pull.json @@ -0,0 +1,21 @@ +{ + "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 new file mode 100644 index 000000000..9fba2e699 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/transmitter_push.json @@ -0,0 +1,21 @@ +{ + "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 ] + } + } +} +