diff --git a/src/main/java/refinedstorage/block/BlockGrid.java b/src/main/java/refinedstorage/block/BlockGrid.java index c45c5b0ad..b2a852313 100755 --- a/src/main/java/refinedstorage/block/BlockGrid.java +++ b/src/main/java/refinedstorage/block/BlockGrid.java @@ -74,4 +74,9 @@ public class BlockGrid extends BlockNode { public boolean hasConnectivityState() { return true; } + + @Override + public EnumPlacementType getPlacementType() { + return EnumPlacementType.ANY; + } } diff --git a/src/main/java/refinedstorage/block/BlockProcessingPatternEncoder.java b/src/main/java/refinedstorage/block/BlockProcessingPatternEncoder.java index 7ee8043ee..d9c0199e7 100755 --- a/src/main/java/refinedstorage/block/BlockProcessingPatternEncoder.java +++ b/src/main/java/refinedstorage/block/BlockProcessingPatternEncoder.java @@ -35,4 +35,9 @@ public class BlockProcessingPatternEncoder extends BlockBase { return true; } + + @Override + public EnumPlacementType getPlacementType() { + return null; + } } diff --git a/src/main/java/refinedstorage/block/BlockSolderer.java b/src/main/java/refinedstorage/block/BlockSolderer.java index ed627cbaa..037a38e73 100755 --- a/src/main/java/refinedstorage/block/BlockSolderer.java +++ b/src/main/java/refinedstorage/block/BlockSolderer.java @@ -8,17 +8,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileSolderer; -import java.util.Random; - public class BlockSolderer extends BlockNode { public static final PropertyBool WORKING = PropertyBool.create("working"); @@ -40,7 +35,6 @@ public class BlockSolderer extends BlockNode { return true; } - @Override protected BlockStateContainer createBlockState() { return super.createBlockStateBuilder() @@ -48,18 +42,6 @@ public class BlockSolderer extends BlockNode { .build(); } - @SideOnly(Side.CLIENT) - public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { - double d0 = (double) pos.getX() + 0.5D; - double d1 = (double) pos.getY() + rand.nextDouble() * 6.0D / 16.0D; - double d2 = (double) pos.getZ() + 0.5D; - double d4 = rand.nextDouble() * 0.6D - 0.3D; - - if (state.getValue(WORKING)) { - world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 - 0.52D, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]); - } - } - @Override public boolean isOpaqueCube(IBlockState state) { return false; 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 706d18e00..fc867cefa 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json +++ b/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json @@ -1,11 +1,15 @@ { "forge_marker": 1, "defaults": { - "model": "orientable", + "model": "cube", "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/processing_pattern_encoder", - "front": "refinedstorage:blocks/side" + "particle": "refinedstorage:blocks/processing_pattern_encoder", + "down": "refinedstorage:blocks/side", + "up": "refinedstorage:blocks/processing_pattern_encoder", + "north": "refinedstorage:blocks/side", + "east": "refinedstorage:blocks/side", + "south": "refinedstorage:blocks/side", + "west": "refinedstorage:blocks/side" } }, "variants": { @@ -15,25 +19,8 @@ "y": 0 } ], - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } + "normal": { + "model": "cube" } } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/cable.png b/src/main/resources/assets/refinedstorage/textures/blocks/cable.png index 114937eb7..4688d64fd 100644 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/cable.png and b/src/main/resources/assets/refinedstorage/textures/blocks/cable.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_powered.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_powered.png index 7625d1989..8d38c9153 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/detector_powered.png and b/src/main/resources/assets/refinedstorage/textures/blocks/detector_powered.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_0.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_0.png index 157bbd049..9fdb281a5 100644 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_0.png and b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_0.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_1.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_1.png index 8282a19ec..90119f5b9 100644 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_1.png and b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_1.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_2.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_2.png index bb95653c4..5f55368bd 100644 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_2.png and b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_2.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_3.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_3.png index 4766d0b5b..818bdea14 100644 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_3.png and b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_3.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_4.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_4.png index 4e6c95b51..f9a6ab451 100644 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_4.png and b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_4.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_5.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_5.png index 4a54a9a95..9a8a900aa 100644 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_5.png and b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_5.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_6.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_6.png index 69c4e0ebe..9e63d02ef 100644 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_6.png and b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_6.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer.png deleted file mode 100755 index db73a6206..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/solderer.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_working.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_working.png deleted file mode 100755 index f088b9cc2..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_working.png and /dev/null differ