Anvilcraft/equivalent-exchange-3
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Renaming the Aludel block to Aludel Base

Browse source
This commit is contained in:
pahimar 2013-05-02 21:16:10 -04:00
parent 15365266b6
commit 4b64ffc4f7
5 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ee3_common/com/pahimar/ee3/block/BlockAludelBase.java
View file

@ -36,7 +36,7 @@ public class BlockAludelBase extends BlockEE {
public BlockAludelBase(int id) { public BlockAludelBase(int id) {
super(id, Material.rock); super(id, Material.anvil);
this.setUnlocalizedName(Strings.ALUDEL_NAME); this.setUnlocalizedName(Strings.ALUDEL_NAME);
this.setCreativeTab(EquivalentExchange3.tabsEE3); this.setCreativeTab(EquivalentExchange3.tabsEE3);
this.setBlockBounds(0.0625F, 0.0F, 0.0625F, 0.9375F, 1.0F, 0.9375F); this.setBlockBounds(0.0625F, 0.0F, 0.0625F, 0.9375F, 1.0F, 0.9375F);

8
ee3_common/com/pahimar/ee3/block/ModBlocks.java
View file

@ -1,6 +1,7 @@
package com.pahimar.ee3.block; package com.pahimar.ee3.block;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import com.pahimar.ee3.lib.BlockIds; import com.pahimar.ee3.lib.BlockIds;
@ -21,7 +22,7 @@ public class ModBlocks {
/* Mod block instances */ /* Mod block instances */
public static Block calcinator; public static Block calcinator;
public static Block aludel; public static Block aludelBase;
public static Block alchemicalChest; public static Block alchemicalChest;
public static Block glassBell; public static Block glassBell;
public static Block redWaterStill; public static Block redWaterStill;
@ -30,14 +31,14 @@ public class ModBlocks {
public static void init() { public static void init() {
calcinator = new BlockCalcinator(BlockIds.CALCINATOR); calcinator = new BlockCalcinator(BlockIds.CALCINATOR);
aludel = new BlockAludelBase(BlockIds.ALUDEL); aludelBase = new BlockAludelBase(BlockIds.ALUDEL_BASE);
alchemicalChest = new BlockAlchemicalChest(BlockIds.ALCHEMICAL_CHEST); alchemicalChest = new BlockAlchemicalChest(BlockIds.ALCHEMICAL_CHEST);
glassBell = new BlockGlassBell(BlockIds.GLASS_BELL); glassBell = new BlockGlassBell(BlockIds.GLASS_BELL);
redWaterStill = new BlockRedWaterStill(BlockIds.RED_WATER_STILL); redWaterStill = new BlockRedWaterStill(BlockIds.RED_WATER_STILL);
redWaterFlowing = new BlockRedWaterFlowing(BlockIds.RED_WATER_STILL - 1); redWaterFlowing = new BlockRedWaterFlowing(BlockIds.RED_WATER_STILL - 1);
GameRegistry.registerBlock(calcinator, Strings.CALCINATOR_NAME); 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(alchemicalChest, Strings.ALCHEMICAL_CHEST_NAME);
GameRegistry.registerBlock(glassBell, Strings.GLASS_BELL_NAME); GameRegistry.registerBlock(glassBell, Strings.GLASS_BELL_NAME);
//GameRegistry.registerBlock(redWaterStill, Strings.RED_WATER_STILL_NAME); //GameRegistry.registerBlock(redWaterStill, Strings.RED_WATER_STILL_NAME);
@ -50,5 +51,6 @@ public class ModBlocks {
private static void initBlockRecipes() { 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(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 });
} }
} }

2
ee3_common/com/pahimar/ee3/configuration/ConfigurationHandler.java
View file

@ -78,7 +78,7 @@ public class ConfigurationHandler {
/* Block configs */ /* Block configs */
BlockIds.CALCINATOR = configuration.getBlock(Strings.CALCINATOR_NAME, BlockIds.CALCINATOR_DEFAULT).getInt(BlockIds.CALCINATOR_DEFAULT); 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.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.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); BlockIds.RED_WATER_STILL = configuration.getBlock(Strings.RED_WATER_STILL_NAME, BlockIds.RED_WATER_STILL_DEFAULT).getInt(BlockIds.RED_WATER_STILL_DEFAULT);

2
ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java
View file

@ -94,7 +94,7 @@ public class ClientProxy extends CommonProxy {
RenderIds.glassBellId = RenderingRegistry.getNextAvailableRenderId(); RenderIds.glassBellId = RenderingRegistry.getNextAvailableRenderId();
MinecraftForgeClient.registerItemRenderer(BlockIds.CALCINATOR, new ItemCalcinatorRenderer()); 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.ALCHEMICAL_CHEST, new ItemAlchemicalChestRenderer());
MinecraftForgeClient.registerItemRenderer(BlockIds.GLASS_BELL, new ItemGlassBellRenderer()); MinecraftForgeClient.registerItemRenderer(BlockIds.GLASS_BELL, new ItemGlassBellRenderer());
} }

4
ee3_common/com/pahimar/ee3/lib/BlockIds.java
View file

@ -14,13 +14,13 @@ public class BlockIds {
/* Default block ids */ /* Default block ids */
public static int CALCINATOR_DEFAULT = 2451; public static int CALCINATOR_DEFAULT = 2451;
public static int RED_WATER_STILL_DEFAULT = 2453; 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 ALCHEMICAL_CHEST_DEFAULT = 2455;
public static int GLASS_BELL_DEFAULT = 2456; public static int GLASS_BELL_DEFAULT = 2456;
/* Current block ids */ /* Current block ids */
public static int CALCINATOR; public static int CALCINATOR;
public static int ALUDEL; public static int ALUDEL_BASE;
public static int ALCHEMICAL_CHEST; public static int ALCHEMICAL_CHEST;
public static int RED_WATER_STILL; public static int RED_WATER_STILL;
public static int GLASS_BELL; public static int GLASS_BELL;