diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a60f3890..f26f82b3a 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ - Autocrafting bugfixes (way2muchnoise) - Fire event on completion of an autocrafting task (way2muchnoise) - Fire playerCrafting event when shift clicking in the grid (way2muchnoise) +- Fixed controller model warning during launch (raoulvdberge) +- Improved memory usage of some models (raoulvdberge) ### 1.4.1 - Added Storage Monitor (raoulvdberge) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java index 5a135fdca..89d8271a3 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java @@ -12,7 +12,6 @@ import com.raoulvdberge.refinedstorage.proxy.CapabilityNetworkNodeProxy; import com.raoulvdberge.refinedstorage.tile.TileBase; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyDirection; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -28,8 +27,6 @@ import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; public abstract class BlockBase extends Block { - public static final PropertyDirection DIRECTION = PropertyDirection.create("direction"); - private final String name; public BlockBase(String name) { @@ -50,8 +47,8 @@ public abstract class BlockBase extends Block { protected BlockStateContainer.Builder createBlockStateBuilder() { BlockStateContainer.Builder builder = new BlockStateContainer.Builder(this); - if (getPlacementType() != null) { - builder.add(DIRECTION); + if (getDirection() != null) { + builder.add(getDirection().getProperty()); } return builder; @@ -63,7 +60,7 @@ public abstract class BlockBase extends Block { } public Item createItem() { - return new ItemBlockBase(this, getPlacementType(), false); + return new ItemBlockBase(this, getDirection(), false); } @Override @@ -80,11 +77,11 @@ public abstract class BlockBase extends Block { @Override @SuppressWarnings("deprecation") public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { - if (getPlacementType() != null) { + if (getDirection() != null) { TileEntity tile = IntegrationMCMP.isLoaded() ? RSMCMPAddon.unwrapTile(world, pos) : world.getTileEntity(pos); if (tile instanceof TileBase) { - return state.withProperty(DIRECTION, ((TileBase) tile).getDirection()); + return state.withProperty(getDirection().getProperty(), ((TileBase) tile).getDirection()); } } @@ -98,10 +95,10 @@ public abstract class BlockBase extends Block { @Override public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis) { - if (!world.isRemote && getPlacementType() != null) { + if (!world.isRemote && getDirection() != null) { TileBase tile = (TileBase) world.getTileEntity(pos); - tile.setDirection(getPlacementType().cycle(tile.getDirection())); + tile.setDirection(getDirection().cycle(tile.getDirection())); RSUtils.updateBlock(world, pos); @@ -192,7 +189,7 @@ public abstract class BlockBase extends Block { return super.canEntityDestroy(state, world, pos, entity); } - public PlacementType getPlacementType() { - return PlacementType.HORIZONTAL; + public Direction getDirection() { + return Direction.HORIZONTAL; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java index 237c54f09..9decf7e85 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java @@ -60,20 +60,14 @@ public class BlockCable extends BlockNode { @Override protected BlockStateContainer createBlockState() { - BlockStateContainer.Builder builder = super.createBlockStateBuilder(); - - builder.add(NORTH) + return super.createBlockStateBuilder() + .add(NORTH) .add(EAST) .add(SOUTH) .add(WEST) .add(UP) - .add(DOWN); - - if (getPlacementType() != null) { - builder.add(DIRECTION); - } - - return builder.build(); + .add(DOWN) + .build(); } @Override @@ -114,7 +108,7 @@ public class BlockCable extends BlockNode { EnumFacing otherTileSide = direction.getOpposite(); if (otherTile != null && otherTile.hasCapability(CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY, otherTileSide)) { - if (getPlacementType() != null && ((TileNode) tile).getNode().getFacingTile() == otherTile) { + if (getDirection() != null && ((TileNode) tile).getNode().getFacingTile() == otherTile) { return false; } @@ -219,8 +213,8 @@ public class BlockCable extends BlockNode { public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase entity) { IBlockState state = super.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, meta, entity); - if (getPlacementType() != null) { - return state.withProperty(DIRECTION, getPlacementType().getFrom(facing, pos, entity)); + if (getDirection() != null) { + return state.withProperty(getDirection().getProperty(), getDirection().getFrom(facing, pos, entity)); } return state; @@ -232,7 +226,7 @@ public class BlockCable extends BlockNode { } @Override - public PlacementType getPlacementType() { + public Direction getDirection() { return null; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java index 664c828ae..753dfd297 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java @@ -38,7 +38,7 @@ public class BlockConstructor extends BlockCable { public List getNonUnionizedCollisionBoxes(IBlockState state) { List boxes = new ArrayList<>(); - switch (state.getValue(DIRECTION)) { + switch (state.getValue(getDirection().getProperty())) { case NORTH: boxes.add(HOLDER_NORTH_AABB); boxes.add(HEAD_NORTH_AABB); @@ -92,7 +92,7 @@ public class BlockConstructor extends BlockCable { } @Override - public PlacementType getPlacementType() { - return PlacementType.ANY; + public Direction getDirection() { + return Direction.ANY; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java index 895debe24..1a1f57817 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java @@ -30,8 +30,8 @@ public class BlockCrafter extends BlockNode { } @Override - public PlacementType getPlacementType() { - return PlacementType.ANY_FACE_PLAYER; + public Direction getDirection() { + return Direction.ANY_FACE_PLAYER; } public boolean hasConnectivityState() { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java index a11084da9..27e50ea0f 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java @@ -48,7 +48,7 @@ public class BlockDestructor extends BlockCable { } @Override - public PlacementType getPlacementType() { - return PlacementType.ANY; + public Direction getDirection() { + return Direction.ANY; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java index a79482ed5..c000c6e0f 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java @@ -87,7 +87,7 @@ public class BlockDetector extends BlockNode { } @Override - public PlacementType getPlacementType() { + public Direction getDirection() { return null; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java index 7d60b06f1..f89800833 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java @@ -64,9 +64,4 @@ public class BlockDiskManipulator extends BlockNode { public boolean hasConnectivityState() { return true; } - - @Override - public PlacementType getPlacementType() { - return PlacementType.HORIZONTAL; - } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java index a048ce3c8..90177ae22 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java @@ -43,7 +43,7 @@ public class BlockExporter extends BlockCable { public List getNonUnionizedCollisionBoxes(IBlockState state) { List boxes = new ArrayList<>(); - switch (state.getValue(DIRECTION)) { + switch (state.getValue(getDirection().getProperty())) { case NORTH: boxes.add(LINE_NORTH_1_AABB); boxes.add(LINE_NORTH_2_AABB); @@ -98,7 +98,7 @@ public class BlockExporter extends BlockCable { } @Override - public PlacementType getPlacementType() { - return PlacementType.ANY; + public Direction getDirection() { + return Direction.ANY; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java index aa385173b..c1e61c20a 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java @@ -33,7 +33,7 @@ public class BlockExternalStorage extends BlockCable { public List getNonUnionizedCollisionBoxes(IBlockState state) { List boxes = new ArrayList<>(); - switch (state.getValue(DIRECTION)) { + switch (state.getValue(getDirection().getProperty())) { case NORTH: boxes.add(BlockConstructor.HOLDER_NORTH_AABB); boxes.add(HEAD_NORTH_AABB); @@ -96,7 +96,7 @@ public class BlockExternalStorage extends BlockCable { } @Override - public PlacementType getPlacementType() { - return PlacementType.ANY; + public Direction getDirection() { + return Direction.ANY; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidInterface.java index 7f1d27042..bcc369885 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidInterface.java @@ -36,7 +36,7 @@ public class BlockFluidInterface extends BlockNode { } @Override - public PlacementType getPlacementType() { + public Direction getDirection() { return null; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java index f992a5f2c..f5382f947 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java @@ -112,7 +112,7 @@ public class BlockFluidStorage extends BlockNode { } @Override - public PlacementType getPlacementType() { + public Direction getDirection() { return null; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java index b75df5a02..c058a3d1c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java @@ -69,6 +69,6 @@ public class BlockGrid extends BlockNode { @Override public Item createItem() { - return new ItemBlockBase(this, getPlacementType(), true); + return new ItemBlockBase(this, getDirection(), true); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java index 81f02c2de..512811df7 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java @@ -43,7 +43,7 @@ public class BlockImporter extends BlockCable { public List getNonUnionizedCollisionBoxes(IBlockState state) { List boxes = new ArrayList<>(); - switch (state.getValue(DIRECTION)) { + switch (state.getValue(getDirection().getProperty())) { case NORTH: boxes.add(LINE_NORTH_1_AABB); boxes.add(LINE_NORTH_2_AABB); @@ -98,7 +98,7 @@ public class BlockImporter extends BlockCable { } @Override - public PlacementType getPlacementType() { - return PlacementType.ANY; + public Direction getDirection() { + return Direction.ANY; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockInterface.java index 42f0a3e5a..fbc344d05 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockInterface.java @@ -36,7 +36,7 @@ public class BlockInterface extends BlockNode { } @Override - public PlacementType getPlacementType() { + public Direction getDirection() { return null; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockMachineCasing.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockMachineCasing.java index 6f3cbc4bd..bee74e449 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockMachineCasing.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockMachineCasing.java @@ -6,7 +6,7 @@ public class BlockMachineCasing extends BlockBase { } @Override - public PlacementType getPlacementType() { + public Direction getDirection() { return null; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java index 01c614059..22131fe71 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java @@ -16,7 +16,7 @@ public class BlockNetworkReceiver extends BlockNode { } @Override - public PlacementType getPlacementType() { + public Direction getDirection() { return null; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java index 8d0794b29..6d15e09fe 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java @@ -30,7 +30,7 @@ public class BlockNetworkTransmitter extends BlockNode { } @Override - public PlacementType getPlacementType() { + public Direction getDirection() { return null; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockProcessingPatternEncoder.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockProcessingPatternEncoder.java index 22771953f..301cac8d4 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockProcessingPatternEncoder.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockProcessingPatternEncoder.java @@ -49,7 +49,7 @@ public class BlockProcessingPatternEncoder extends BlockBase { } @Override - public PlacementType getPlacementType() { + public Direction getDirection() { return null; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockQuartzEnrichedIron.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockQuartzEnrichedIron.java index 62e5587dd..6f227180e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockQuartzEnrichedIron.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockQuartzEnrichedIron.java @@ -6,7 +6,7 @@ public class BlockQuartzEnrichedIron extends BlockBase { } @Override - public PlacementType getPlacementType() { + public Direction getDirection() { return null; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java index 3f9e63150..e71801b52 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java @@ -70,7 +70,7 @@ public class BlockReader extends BlockCable { } @Override - public PlacementType getPlacementType() { - return PlacementType.ANY_FACE_PLAYER; + public Direction getDirection() { + return Direction.ANY_FACE_PLAYER; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java index cdcd0b51e..5a28b9b1c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java @@ -30,7 +30,7 @@ public class BlockRelay extends BlockNode { } @Override - public PlacementType getPlacementType() { + public Direction getDirection() { return null; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java index 489d5f06c..73cc993c9 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java @@ -61,7 +61,7 @@ public class BlockSolderer extends BlockNode { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileSolderer && ((TileSolderer) tile).isWorking()) { - EnumFacing direction = getActualState(state, world, pos).getValue(DIRECTION); + EnumFacing direction = getActualState(state, world, pos).getValue(getDirection().getProperty()); double x = 0; double y = (double) pos.getY() + 0.6D + rand.nextDouble() / 32F; @@ -108,9 +108,4 @@ public class BlockSolderer extends BlockNode { public boolean isFullCube(IBlockState state) { return false; } - - @Override - public PlacementType getPlacementType() { - return PlacementType.HORIZONTAL; - } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java index 6ab3c6ca4..8f6edbad8 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java @@ -112,7 +112,7 @@ public class BlockStorage extends BlockNode { } @Override - public PlacementType getPlacementType() { + public Direction getDirection() { return null; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java index 4c2cfba4e..9d76f7218 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java @@ -85,7 +85,7 @@ public class BlockWirelessTransmitter extends BlockNode { } @Override - public PlacementType getPlacementType() { + public Direction getDirection() { return null; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java index 53f91cc3f..b0e6bbf09 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java @@ -91,7 +91,7 @@ public class BlockWriter extends BlockCable { } @Override - public PlacementType getPlacementType() { - return PlacementType.ANY_FACE_PLAYER; + public Direction getDirection() { + return Direction.ANY_FACE_PLAYER; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/PlacementType.java b/src/main/java/com/raoulvdberge/refinedstorage/block/Direction.java similarity index 66% rename from src/main/java/com/raoulvdberge/refinedstorage/block/PlacementType.java rename to src/main/java/com/raoulvdberge/refinedstorage/block/Direction.java index 9789db30e..5e7e2635d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/PlacementType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/Direction.java @@ -1,27 +1,24 @@ package com.raoulvdberge.refinedstorage.block; +import net.minecraft.block.properties.PropertyDirection; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import scala.actors.threadpool.Arrays; -public enum PlacementType { - ANY( - EnumFacing.VALUES - ), - ANY_FACE_PLAYER( - EnumFacing.VALUES - ), - HORIZONTAL( - EnumFacing.NORTH, - EnumFacing.EAST, - EnumFacing.SOUTH, - EnumFacing.WEST - ); +public enum Direction { + ANY(EnumFacing.VALUES), + ANY_FACE_PLAYER(EnumFacing.VALUES), + HORIZONTAL(EnumFacing.NORTH, EnumFacing.EAST, EnumFacing.SOUTH, EnumFacing.WEST); - final EnumFacing[] allowed; + private final PropertyDirection property; - PlacementType(EnumFacing... allowed) { - this.allowed = allowed; + Direction(EnumFacing... allowed) { + this.property = PropertyDirection.create("direction", Arrays.asList(allowed)); + } + + public PropertyDirection getProperty() { + return property; } public EnumFacing getFrom(EnumFacing facing, BlockPos pos, EntityLivingBase entity) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockBase.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockBase.java index c2d35206c..f6478b4ec 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockBase.java @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.item; -import com.raoulvdberge.refinedstorage.block.PlacementType; +import com.raoulvdberge.refinedstorage.block.Direction; import com.raoulvdberge.refinedstorage.tile.TileBase; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -13,14 +13,14 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ItemBlockBase extends ItemBlock { - private PlacementType placementType; + private Direction direction; - public ItemBlockBase(Block block, PlacementType placementType, boolean subtypes) { + public ItemBlockBase(Block block, Direction direction, boolean subtypes) { super(block); setRegistryName(block.getRegistryName()); - this.placementType = placementType; + this.direction = direction; if (subtypes) { setMaxDamage(0); @@ -46,11 +46,11 @@ public class ItemBlockBase extends ItemBlock { public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) { boolean result = super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, newState); - if (result && placementType != null) { + if (result && direction != null) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileBase) { - ((TileBase) tile).setDirection(placementType.getFrom(side, pos, player)); + ((TileBase) tile).setDirection(direction.getFrom(side, pos, player)); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockController.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockController.java index 1fa90a7c5..10190d544 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockController.java @@ -14,7 +14,7 @@ import java.util.List; public class ItemBlockController extends ItemBlockBase { public ItemBlockController() { - super(RSBlocks.CONTROLLER, RSBlocks.CONTROLLER.getPlacementType(), true); + super(RSBlocks.CONTROLLER, RSBlocks.CONTROLLER.getDirection(), true); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockFluidStorage.java index ceba92049..cb3b67303 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockFluidStorage.java @@ -20,7 +20,7 @@ import java.util.List; public class ItemBlockFluidStorage extends ItemBlockBase { public ItemBlockFluidStorage() { - super(RSBlocks.FLUID_STORAGE, RSBlocks.FLUID_STORAGE.getPlacementType(), true); + super(RSBlocks.FLUID_STORAGE, RSBlocks.FLUID_STORAGE.getDirection(), true); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockStorage.java index fdb7a9554..8aa40abdc 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockStorage.java @@ -20,7 +20,7 @@ import java.util.List; public class ItemBlockStorage extends ItemBlockBase { public ItemBlockStorage() { - super(RSBlocks.STORAGE, RSBlocks.STORAGE.getPlacementType(), true); + super(RSBlocks.STORAGE, RSBlocks.STORAGE.getDirection(), true); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java index a347bc107..27b086561 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java @@ -161,6 +161,7 @@ public class ProxyCommon { registerBlock(RSBlocks.GRID); registerBlock(RSBlocks.CRAFTING_MONITOR); registerBlock(RSBlocks.STORAGE_MONITOR); + registerBlock(RSBlocks.SECURITY_MANAGER); registerBlock(RSBlocks.CRAFTER); registerBlock(RSBlocks.PROCESSING_PATTERN_ENCODER); registerBlock(RSBlocks.DISK_DRIVE); @@ -173,7 +174,6 @@ public class ProxyCommon { registerBlock(RSBlocks.EXTERNAL_STORAGE); registerBlock(RSBlocks.CONSTRUCTOR); registerBlock(RSBlocks.DESTRUCTOR); - registerBlock(RSBlocks.SECURITY_MANAGER); registerBlock(RSBlocks.READER); registerBlock(RSBlocks.WRITER); @@ -840,7 +840,7 @@ public class ProxyCommon { private void registerBlock(BlockCable cable) { GameRegistry.register(cable); - GameRegistry.register(new ItemBlockBase(cable, cable.getPlacementType(), false)); + GameRegistry.register(new ItemBlockBase(cable, cable.getDirection(), false)); cableTypes.add(cable); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskDrive.java index 6cf3b2de9..6564a419e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskDrive.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskDrive.java @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.render; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import com.raoulvdberge.refinedstorage.block.BlockBase; +import com.raoulvdberge.refinedstorage.RSBlocks; import com.raoulvdberge.refinedstorage.block.BlockDiskDrive; import com.raoulvdberge.refinedstorage.tile.TileDiskDrive; import net.minecraft.block.state.IBlockState; @@ -71,7 +71,7 @@ public class BakedModelDiskDrive implements IBakedModel { private LoadingCache> cache = CacheBuilder.newBuilder().build(new CacheLoader>() { @Override public List load(CacheKey key) throws Exception { - EnumFacing facing = key.state.getValue(BlockBase.DIRECTION); + EnumFacing facing = key.state.getValue(RSBlocks.DISK_DRIVE.getDirection().getProperty()); List quads = models.get(facing).getQuads(key.state, key.side, 0); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskManipulator.java index f9e7efaf7..5125475f5 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelDiskManipulator.java @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.render; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import com.raoulvdberge.refinedstorage.block.BlockBase; +import com.raoulvdberge.refinedstorage.RSBlocks; import com.raoulvdberge.refinedstorage.block.BlockDiskManipulator; import com.raoulvdberge.refinedstorage.tile.TileDiskDrive; import net.minecraft.block.state.IBlockState; @@ -72,7 +72,7 @@ public class BakedModelDiskManipulator implements IBakedModel { private LoadingCache> cache = CacheBuilder.newBuilder().build(new CacheLoader>() { @Override public List load(CacheKey key) throws Exception { - EnumFacing facing = key.state.getValue(BlockBase.DIRECTION); + EnumFacing facing = key.state.getValue(RSBlocks.DISK_MANIPULATOR.getDirection().getProperty()); List quads = (key.state.getValue(BlockDiskManipulator.CONNECTED) ? modelsConnected : modelsDisconnected).get(facing).getQuads(key.state, key.side, 0); diff --git a/src/main/resources/assets/refinedstorage/blockstates/controller.json b/src/main/resources/assets/refinedstorage/blockstates/controller.json index 006b358b4..a89ecf1b5 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/controller.json +++ b/src/main/resources/assets/refinedstorage/blockstates/controller.json @@ -10,6 +10,11 @@ } }, "variants": { + "inventory": [ + { + "transform": "forge:default-block" + } + ], "energy": { "0": { "textures": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json b/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json index d06778647..7b6ad923c 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json @@ -40,12 +40,6 @@ }, "west": { "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 } } } diff --git a/src/main/resources/assets/refinedstorage/blockstates/grid.json b/src/main/resources/assets/refinedstorage/blockstates/grid.json index e6b273bbb..8ecb0356f 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/grid.json +++ b/src/main/resources/assets/refinedstorage/blockstates/grid.json @@ -70,12 +70,6 @@ }, "west": { "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 } } } diff --git a/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json b/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json index a3c98690b..64c04521f 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json +++ b/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json @@ -15,8 +15,7 @@ "variants": { "inventory": [ { - "transform": "forge:default-block", - "y": 0 + "transform": "forge:default-block" } ], "normal": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/security_manager.json b/src/main/resources/assets/refinedstorage/blockstates/security_manager.json index 7dccd4117..2fed83c38 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/security_manager.json +++ b/src/main/resources/assets/refinedstorage/blockstates/security_manager.json @@ -43,12 +43,6 @@ }, "west": { "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 } } } diff --git a/src/main/resources/assets/refinedstorage/blockstates/solderer.json b/src/main/resources/assets/refinedstorage/blockstates/solderer.json index 0b5a7a7b9..dfa7b6798 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/solderer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/solderer.json @@ -31,12 +31,6 @@ }, "west": { "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 } } } diff --git a/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json b/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json index a1599018c..662f82b36 100644 --- a/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json @@ -34,12 +34,6 @@ }, "west": { "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 } } }