diff --git a/CHANGELOG.md b/CHANGELOG.md index f173f8f95..eb0894baa 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - Added model for External Storage - Added model for Importer - Added model for Exporter +- Added model for Detector ### 0.8.5 **Bugfixes** diff --git a/src/main/java/refinedstorage/RefinedStorageBlocks.java b/src/main/java/refinedstorage/RefinedStorageBlocks.java index 86694fc9e..d9f376622 100755 --- a/src/main/java/refinedstorage/RefinedStorageBlocks.java +++ b/src/main/java/refinedstorage/RefinedStorageBlocks.java @@ -22,5 +22,4 @@ public final class RefinedStorageBlocks { public static final BlockWirelessTransmitter WIRELESS_TRANSMITTER = new BlockWirelessTransmitter(); public static final BlockCrafter CRAFTER = new BlockCrafter(); public static final BlockProcessingPatternEncoder PROCESSING_PATTERN_ENCODER = new BlockProcessingPatternEncoder(); - public static final BlockQuartzEnrichedIron QUARTZ_ENRICHED_IRON = new BlockQuartzEnrichedIron(); } diff --git a/src/main/java/refinedstorage/block/BlockDetector.java b/src/main/java/refinedstorage/block/BlockDetector.java index 3b438f9b4..95979a4d5 100755 --- a/src/main/java/refinedstorage/block/BlockDetector.java +++ b/src/main/java/refinedstorage/block/BlockDetector.java @@ -42,13 +42,7 @@ public class BlockDetector extends BlockNode { @Override public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { - TileDetector detector = (TileDetector) world.getTileEntity(pos); - - if (detector.getDirection() == side.getOpposite()) { - return detector.isPowered() ? 15 : 0; - } - - return 0; + return ((TileDetector) world.getTileEntity(pos)).isPowered() ? 15 : 0; } @Override @@ -70,8 +64,18 @@ public class BlockDetector extends BlockNode { return true; } + @Override + public boolean isOpaqueCube(IBlockState state) { + return false; + } + + @Override + public boolean isFullCube(IBlockState state) { + return false; + } + @Override public EnumPlacementType getPlacementType() { - return EnumPlacementType.ANY; + return null; } } diff --git a/src/main/java/refinedstorage/block/BlockQuartzEnrichedIron.java b/src/main/java/refinedstorage/block/BlockQuartzEnrichedIron.java deleted file mode 100755 index c9346d30c..000000000 --- a/src/main/java/refinedstorage/block/BlockQuartzEnrichedIron.java +++ /dev/null @@ -1,12 +0,0 @@ -package refinedstorage.block; - -public class BlockQuartzEnrichedIron extends BlockBase { - public BlockQuartzEnrichedIron() { - super("quartz_enriched_iron_block"); - } - - @Override - public EnumPlacementType getPlacementType() { - return null; - } -} diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java index 5901c622c..c1d5c36b9 100755 --- a/src/main/java/refinedstorage/proxy/ClientProxy.java +++ b/src/main/java/refinedstorage/proxy/ClientProxy.java @@ -137,6 +137,5 @@ public class ClientProxy extends CommonProxy { ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=16k")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=64k")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:storage", "type=creative")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.QUARTZ_ENRICHED_IRON), 0, new ModelResourceLocation("refinedstorage:quartz_enriched_iron_block", "inventory")); } } diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index 0a468e408..66a173bcc 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -98,7 +98,6 @@ public class CommonProxy { registerBlock(RefinedStorageBlocks.INTERFACE); registerBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER); registerBlock(RefinedStorageBlocks.MACHINE_CASING); - registerBlock(RefinedStorageBlocks.QUARTZ_ENRICHED_IRON); registerItem(RefinedStorageItems.QUARTZ_ENRICHED_IRON); registerItem(RefinedStorageItems.STORAGE_DISK); @@ -134,16 +133,6 @@ public class CommonProxy { 'Q', new ItemStack(Items.QUARTZ) ); - GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON, 9), new ItemStack(RefinedStorageBlocks.QUARTZ_ENRICHED_IRON)); - - // Quartz Enriched Iron Block - GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.QUARTZ_ENRICHED_IRON), - "EEE", - "EEE", - "EEE", - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) - ); - // Machine Casing GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.MACHINE_CASING), "EEE", diff --git a/src/main/resources/assets/refinedstorage/blockstates/creative_controller.json b/src/main/resources/assets/refinedstorage/blockstates/creative_controller.json index f2b5ef5a5..8190cba8e 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/creative_controller.json +++ b/src/main/resources/assets/refinedstorage/blockstates/creative_controller.json @@ -5,7 +5,7 @@ "textures": { "side": "refinedstorage:blocks/side", "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/controller_8" + "front": "refinedstorage:blocks/controller_7" } }, "variants": { @@ -31,8 +31,6 @@ "6": { }, "7": { - }, - "8": { } }, "type": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/detector.json b/src/main/resources/assets/refinedstorage/blockstates/detector.json index e0cea4693..a360c78b7 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/detector.json +++ b/src/main/resources/assets/refinedstorage/blockstates/detector.json @@ -1,48 +1,27 @@ { "forge_marker": 1, "defaults": { - "model": "orientable", "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/detector_unpowered" - } + "particle": "refinedstorage:blocks/side_borderless", + "2": "refinedstorage:blocks/detector_unpowered" + }, + "model": "refinedstorage:detector", + "uvlock": true }, "variants": { "inventory": [ { - "y": 0, "transform": "forge:default-block" } ], "powered": { "true": { "textures": { - "front": "refinedstorage:blocks/detector_powered" + "2": "refinedstorage:blocks/detector_powered" } }, "false": { } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_iron_block.json b/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_iron_block.json deleted file mode 100755 index ee7c9a28d..000000000 --- a/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_iron_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "cube_all", - "textures": { - "all": "refinedstorage:blocks/quartz_enriched_iron_block" - } - }, - "variants": { - "inventory": [ - { - "transform": "forge:default-block" - } - ], - "normal": { - "model": "cube_all" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/solderer.json b/src/main/resources/assets/refinedstorage/blockstates/solderer.json index f1f9c1716..b42218f21 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/solderer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/solderer.json @@ -2,7 +2,7 @@ "forge_marker": 1, "defaults": { "textures": { - "particle": "refinedstorage:blocks/quartz_enriched_iron_block" + "particle": "refinedstorage:blocks/side_borderless" }, "model": "refinedstorage:solderer", "uvlock": true diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index bac579909..4b0efcd39 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -110,7 +110,6 @@ block.refinedstorage:crafting_monitor.name=Crafting Monitor block.refinedstorage:wireless_transmitter.name=Wireless Transmitter block.refinedstorage:crafter.name=Crafter block.refinedstorage:processing_pattern_encoder.name=Processing Pattern Encoder -block.refinedstorage:quartz_enriched_iron_block.name=Quartz Enriched Iron Block item.refinedstorage:storage_disk.0.name=1k Storage Disk item.refinedstorage:storage_disk.1.name=4k Storage Disk diff --git a/src/main/resources/assets/refinedstorage/lang/fr_FR.lang b/src/main/resources/assets/refinedstorage/lang/fr_FR.lang index 71f403792..87d64dc37 100755 --- a/src/main/resources/assets/refinedstorage/lang/fr_FR.lang +++ b/src/main/resources/assets/refinedstorage/lang/fr_FR.lang @@ -110,7 +110,6 @@ block.refinedstorage:crafting_monitor.name=Moniteur de Craft block.refinedstorage:wireless_transmitter.name=Transmetteur sans Fil block.refinedstorage:crafter.name=Crafteur block.refinedstorage:processing_pattern_encoder.name=Encodeur de Modèle de Traitement -block.refinedstorage:quartz_enriched_iron_block.name=Fer Enrichi de Quartz Bloc item.refinedstorage:storage_disk.0.name=Disque de Stockage de 1k item.refinedstorage:storage_disk.1.name=Disque de Stockage de 4k diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang index 8aa9c3f09..fe838210b 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang @@ -110,7 +110,6 @@ block.refinedstorage:crafting_monitor.name=Crafting Monitor block.refinedstorage:wireless_transmitter.name=Draadloze Zender block.refinedstorage:crafter.name=Crafter block.refinedstorage:processing_pattern_encoder.name=Verwerkingspatroon Codeerder -block.refinedstorage:quartz_enriched_iron_block.name=Quartz Verrijkte IJzerblok item.refinedstorage:storage_disk.0.name=1k Opslagschijf item.refinedstorage:storage_disk.1.name=4k Opslagschijf diff --git a/src/main/resources/assets/refinedstorage/lang/pt_BR.lang b/src/main/resources/assets/refinedstorage/lang/pt_BR.lang index 7b4b79c0c..7aaece026 100755 --- a/src/main/resources/assets/refinedstorage/lang/pt_BR.lang +++ b/src/main/resources/assets/refinedstorage/lang/pt_BR.lang @@ -110,7 +110,6 @@ block.refinedstorage:crafting_monitor.name=Monitor de Fabricação block.refinedstorage:wireless_transmitter.name=Transmissor Sem Fio block.refinedstorage:crafter.name=Fabricador block.refinedstorage:processing_pattern_encoder.name=Codificador de Padrão de Processamento -block.refinedstorage:quartz_enriched_iron_block.name=Bloco de Ferro Enriquecido com Quartzo item.refinedstorage:storage_disk.0.name=Disco de Armazenamento 1k item.refinedstorage:storage_disk.1.name=Disco de Armazenamento 4k diff --git a/src/main/resources/assets/refinedstorage/models/block/detector.json b/src/main/resources/assets/refinedstorage/models/block/detector.json new file mode 100755 index 000000000..c03b57e87 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/detector.json @@ -0,0 +1,198 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "0": "refinedstorage:blocks/side", + "1": "refinedstorage:blocks/side_borderless" + }, + "elements": [ + { + "name": "base", + "from": [ + 0.0, + 0.0, + 0.0 + ], + "to": [ + 16.0, + 4.0, + 16.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 0.0, + 12.0, + 16.0, + 16.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 12.0, + 16.0, + 16.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 12.0, + 16.0, + 16.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 12.0, + 16.0, + 16.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + } + } + }, + { + "name": "holder", + "from": [ + 7.0, + 4.0, + 7.0 + ], + "to": [ + 9.0, + 9.0, + 9.0 + ], + "faces": { + "north": { + "texture": "#1", + "uv": [ + 0.0, + 0.0, + 4.0, + 1.0 + ] + }, + "east": { + "texture": "#1", + "uv": [ + 4.0, + 0.0, + 8.0, + 1.0 + ] + }, + "south": { + "texture": "#1", + "uv": [ + 7.0, + 0.0, + 11.0, + 1.0 + ] + }, + "west": { + "texture": "#1", + "uv": [ + 12.0, + 0.0, + 16.0, + 1.0 + ] + }, + "up": { + "texture": "#1", + "uv": [ + 2.0, + 2.0, + 6.0, + 6.0 + ] + } + } + }, + { + "name": "redstone", + "from": [ + 6.0, + 9.0, + 6.0 + ], + "to": [ + 10.0, + 13.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#2", + "uv": [ + 0.0, + 0.0, + 4.0, + 1.0 + ] + }, + "east": { + "texture": "#2", + "uv": [ + 4.0, + 0.0, + 8.0, + 1.0 + ] + }, + "south": { + "texture": "#2", + "uv": [ + 8.0, + 0.0, + 12.0, + 1.0 + ] + }, + "west": { + "texture": "#2", + "uv": [ + 12.0, + 0.0, + 16.0, + 1.0 + ] + }, + "up": { + "texture": "#2", + "uv": [ + 10.0, + 2.0, + 14.0, + 6.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/solderer.json b/src/main/resources/assets/refinedstorage/models/block/solderer.json index e74dd6919..d4c9a0667 100755 --- a/src/main/resources/assets/refinedstorage/models/block/solderer.json +++ b/src/main/resources/assets/refinedstorage/models/block/solderer.json @@ -1,9 +1,9 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "textures": { - "0": "refinedstorage:blocks/quartz_enriched_iron_block", + "0": "refinedstorage:blocks/side", "1": "refinedstorage:blocks/side", - "2": "refinedstorage:blocks/quartz_enriched_iron_block", + "2": "refinedstorage:blocks/side_borderless", "3": "blocks/redstone_block", "4": "blocks/redstone_block" }, 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 8d38c9153..7d7a0a151 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/detector_unpowered.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_unpowered.png index da1df4416..d7c097f6f 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/detector_unpowered.png and b/src/main/resources/assets/refinedstorage/textures/blocks/detector_unpowered.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/quartz_enriched_iron_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/quartz_enriched_iron_block.png deleted file mode 100644 index 39b0dc326..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/quartz_enriched_iron_block.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/side_borderless.png b/src/main/resources/assets/refinedstorage/textures/blocks/side_borderless.png new file mode 100755 index 000000000..5dd7d7719 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/side_borderless.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/gui/detector.png b/src/main/resources/assets/refinedstorage/textures/gui/detector.png old mode 100644 new mode 100755