From 4b64ffc4f746ef826fcc77d642f37727da6931c3 Mon Sep 17 00:00:00 2001 From: pahimar Date: Thu, 2 May 2013 21:16:10 -0400 Subject: [PATCH] Renaming the Aludel block to Aludel Base --- ee3_common/com/pahimar/ee3/block/BlockAludelBase.java | 2 +- ee3_common/com/pahimar/ee3/block/ModBlocks.java | 8 +++++--- .../pahimar/ee3/configuration/ConfigurationHandler.java | 2 +- ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java | 2 +- ee3_common/com/pahimar/ee3/lib/BlockIds.java | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ee3_common/com/pahimar/ee3/block/BlockAludelBase.java b/ee3_common/com/pahimar/ee3/block/BlockAludelBase.java index 4847c2e9..aedca633 100644 --- a/ee3_common/com/pahimar/ee3/block/BlockAludelBase.java +++ b/ee3_common/com/pahimar/ee3/block/BlockAludelBase.java @@ -36,7 +36,7 @@ public class BlockAludelBase extends BlockEE { public BlockAludelBase(int id) { - super(id, Material.rock); + super(id, Material.anvil); this.setUnlocalizedName(Strings.ALUDEL_NAME); this.setCreativeTab(EquivalentExchange3.tabsEE3); this.setBlockBounds(0.0625F, 0.0F, 0.0625F, 0.9375F, 1.0F, 0.9375F); diff --git a/ee3_common/com/pahimar/ee3/block/ModBlocks.java b/ee3_common/com/pahimar/ee3/block/ModBlocks.java index 5193f1c0..65d16d23 100644 --- a/ee3_common/com/pahimar/ee3/block/ModBlocks.java +++ b/ee3_common/com/pahimar/ee3/block/ModBlocks.java @@ -1,6 +1,7 @@ package com.pahimar.ee3.block; import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import com.pahimar.ee3.lib.BlockIds; @@ -21,7 +22,7 @@ public class ModBlocks { /* Mod block instances */ public static Block calcinator; - public static Block aludel; + public static Block aludelBase; public static Block alchemicalChest; public static Block glassBell; public static Block redWaterStill; @@ -30,14 +31,14 @@ public class ModBlocks { public static void init() { calcinator = new BlockCalcinator(BlockIds.CALCINATOR); - aludel = new BlockAludelBase(BlockIds.ALUDEL); + aludelBase = new BlockAludelBase(BlockIds.ALUDEL_BASE); alchemicalChest = new BlockAlchemicalChest(BlockIds.ALCHEMICAL_CHEST); glassBell = new BlockGlassBell(BlockIds.GLASS_BELL); redWaterStill = new BlockRedWaterStill(BlockIds.RED_WATER_STILL); redWaterFlowing = new BlockRedWaterFlowing(BlockIds.RED_WATER_STILL - 1); GameRegistry.registerBlock(calcinator, Strings.CALCINATOR_NAME); - GameRegistry.registerBlock(aludel, Strings.ALUDEL_NAME); + GameRegistry.registerBlock(aludelBase, Strings.ALUDEL_NAME); GameRegistry.registerBlock(alchemicalChest, Strings.ALCHEMICAL_CHEST_NAME); GameRegistry.registerBlock(glassBell, Strings.GLASS_BELL_NAME); //GameRegistry.registerBlock(redWaterStill, Strings.RED_WATER_STILL_NAME); @@ -50,5 +51,6 @@ public class ModBlocks { private static void initBlockRecipes() { GameRegistry.addRecipe(new ItemStack(glassBell), new Object[] {"iii", "i i", "i i", Character.valueOf('i'), Block.glass }); + GameRegistry.addRecipe(new ItemStack(aludelBase), new Object[] {"iii", "sis", "iii", Character.valueOf('i'), Item.ingotIron, Character.valueOf('s'), Block.stone }); } } diff --git a/ee3_common/com/pahimar/ee3/configuration/ConfigurationHandler.java b/ee3_common/com/pahimar/ee3/configuration/ConfigurationHandler.java index f4a04043..4b1a52e2 100644 --- a/ee3_common/com/pahimar/ee3/configuration/ConfigurationHandler.java +++ b/ee3_common/com/pahimar/ee3/configuration/ConfigurationHandler.java @@ -78,7 +78,7 @@ public class ConfigurationHandler { /* Block configs */ BlockIds.CALCINATOR = configuration.getBlock(Strings.CALCINATOR_NAME, BlockIds.CALCINATOR_DEFAULT).getInt(BlockIds.CALCINATOR_DEFAULT); - BlockIds.ALUDEL = configuration.getBlock(Strings.ALUDEL_NAME, BlockIds.ALUDEL_DEFAULT).getInt(BlockIds.ALUDEL_DEFAULT); + BlockIds.ALUDEL_BASE = configuration.getBlock(Strings.ALUDEL_NAME, BlockIds.ALUDEL_BASE_DEFAULT).getInt(BlockIds.ALUDEL_BASE_DEFAULT); BlockIds.ALCHEMICAL_CHEST = configuration.getBlock(Strings.ALCHEMICAL_CHEST_NAME, BlockIds.ALCHEMICAL_CHEST_DEFAULT).getInt(BlockIds.ALCHEMICAL_CHEST_DEFAULT); BlockIds.GLASS_BELL = configuration.getBlock(Strings.GLASS_BELL_NAME, BlockIds.GLASS_BELL_DEFAULT).getInt(BlockIds.GLASS_BELL_DEFAULT); BlockIds.RED_WATER_STILL = configuration.getBlock(Strings.RED_WATER_STILL_NAME, BlockIds.RED_WATER_STILL_DEFAULT).getInt(BlockIds.RED_WATER_STILL_DEFAULT); diff --git a/ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java b/ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java index e566cd62..660e8c52 100644 --- a/ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java +++ b/ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java @@ -94,7 +94,7 @@ public class ClientProxy extends CommonProxy { RenderIds.glassBellId = RenderingRegistry.getNextAvailableRenderId(); MinecraftForgeClient.registerItemRenderer(BlockIds.CALCINATOR, new ItemCalcinatorRenderer()); - MinecraftForgeClient.registerItemRenderer(BlockIds.ALUDEL, new ItemAludelRenderer()); + MinecraftForgeClient.registerItemRenderer(BlockIds.ALUDEL_BASE, new ItemAludelRenderer()); MinecraftForgeClient.registerItemRenderer(BlockIds.ALCHEMICAL_CHEST, new ItemAlchemicalChestRenderer()); MinecraftForgeClient.registerItemRenderer(BlockIds.GLASS_BELL, new ItemGlassBellRenderer()); } diff --git a/ee3_common/com/pahimar/ee3/lib/BlockIds.java b/ee3_common/com/pahimar/ee3/lib/BlockIds.java index 74ae7a79..98958c07 100644 --- a/ee3_common/com/pahimar/ee3/lib/BlockIds.java +++ b/ee3_common/com/pahimar/ee3/lib/BlockIds.java @@ -14,13 +14,13 @@ public class BlockIds { /* Default block ids */ public static int CALCINATOR_DEFAULT = 2451; public static int RED_WATER_STILL_DEFAULT = 2453; - public static int ALUDEL_DEFAULT = 2454; + public static int ALUDEL_BASE_DEFAULT = 2454; public static int ALCHEMICAL_CHEST_DEFAULT = 2455; public static int GLASS_BELL_DEFAULT = 2456; /* Current block ids */ public static int CALCINATOR; - public static int ALUDEL; + public static int ALUDEL_BASE; public static int ALCHEMICAL_CHEST; public static int RED_WATER_STILL; public static int GLASS_BELL;