From e22d9bab7cc8f45d773b553ce2892738050f7305 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 4 Jun 2016 19:34:14 +0200 Subject: [PATCH] Added quartz enriched iron block --- CHANGELOG.md | 1 + .../refinedstorage/RefinedStorageBlocks.java | 1 + .../block/BlockQuartzEnrichedIron.java | 7 +++++ .../refinedstorage/proxy/ClientProxy.java | 1 + .../refinedstorage/proxy/CommonProxy.java | 11 +++++++ .../quartz_enriched_iron_block.json | 30 +++++++++++++++++++ .../assets/refinedstorage/lang/en_US.lang | 1 + .../assets/refinedstorage/lang/fr_FR.lang | 1 + .../assets/refinedstorage/lang/nl_NL.lang | 1 + 9 files changed, 54 insertions(+) create mode 100755 src/main/java/refinedstorage/block/BlockQuartzEnrichedIron.java create mode 100755 src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_iron_block.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 7579f1880..64b13b90d 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ **Features** - Added the Stack Upgrade +- Added Quartz Enriched Iron Block - Added French translation by Leventovitch ### 0.7.6 diff --git a/src/main/java/refinedstorage/RefinedStorageBlocks.java b/src/main/java/refinedstorage/RefinedStorageBlocks.java index d9f376622..86694fc9e 100755 --- a/src/main/java/refinedstorage/RefinedStorageBlocks.java +++ b/src/main/java/refinedstorage/RefinedStorageBlocks.java @@ -22,4 +22,5 @@ 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/BlockQuartzEnrichedIron.java b/src/main/java/refinedstorage/block/BlockQuartzEnrichedIron.java new file mode 100755 index 000000000..5db421ec7 --- /dev/null +++ b/src/main/java/refinedstorage/block/BlockQuartzEnrichedIron.java @@ -0,0 +1,7 @@ +package refinedstorage.block; + +public class BlockQuartzEnrichedIron extends BlockBase { + public BlockQuartzEnrichedIron() { + super("quartz_enriched_iron_block"); + } +} diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java index 5ad4f3f4d..cf562f81a 100755 --- a/src/main/java/refinedstorage/proxy/ClientProxy.java +++ b/src/main/java/refinedstorage/proxy/ClientProxy.java @@ -132,5 +132,6 @@ 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 66b8327c1..b6748fec6 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -103,6 +103,7 @@ public class CommonProxy { registerBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER); registerBlock(RefinedStorageBlocks.MACHINE_CASING); registerBlock(RefinedStorageBlocks.CABLE); + registerBlock(RefinedStorageBlocks.QUARTZ_ENRICHED_IRON); registerItem(RefinedStorageItems.QUARTZ_ENRICHED_IRON); registerItem(RefinedStorageItems.STORAGE_DISK); @@ -139,6 +140,16 @@ 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/quartz_enriched_iron_block.json b/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_iron_block.json new file mode 100755 index 000000000..fef72be24 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/quartz_enriched_iron_block.json @@ -0,0 +1,30 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "refinedstorage:blocks/quartz_enriched_iron_block" + } + }, + "variants": { + "inventory": [ + { + "transform": "forge:default-block" + } + ], + "direction": { + "north": { + }, + "east": { + }, + "south": { + }, + "west": { + }, + "up": { + }, + "down": { + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index 148ec259a..82f74cbbe 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -107,6 +107,7 @@ 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 8f240a78c..2ef8b0d28 100755 --- a/src/main/resources/assets/refinedstorage/lang/fr_FR.lang +++ b/src/main/resources/assets/refinedstorage/lang/fr_FR.lang @@ -107,6 +107,7 @@ 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 88011ddb2..6c7848c20 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang @@ -107,6 +107,7 @@ 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