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

Merge branch 'master' of https://github.com/pahimar/Equivalent-Exchange-3

Browse source
This commit is contained in:
André Carvalho 2012-11-07 14:24:54 +00:00
parent 9a49a03bf2 86e01679a3
commit 89c2c8784d
24 changed files with 185 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ee3_client/ee3/client/core/ClientProxy.java
View file

@ -54,8 +54,10 @@ public class ClientProxy extends CommonProxy {
public void initCustomRarityTypes() {
EnumHelperClient.addRarity(JUNK, COLOR_JUNK, DISPLAY_NAME_JUNK);
EnumHelperClient.addRarity(NORMAL, COLOR_NORMAL, DISPLAY_NAME_NORMAL);
EnumHelperClient.addRarity(UNCOMMON, COLOR_UNCOMMON, DISPLAY_NAME_UNCOMMON);
EnumHelperClient.addRarity(MAGICAL, COLOR_MAGICAL, DISPLAY_NAME_MAGICAL);
EnumHelperClient.addRarity(RARE, COLOR_RARE, DISPLAY_NAME_RARE);
EnumHelperClient.addRarity(EPIC, COLOR_EPIC, DISPLAY_NAME_EPIC);
EnumHelperClient.addRarity(LEGENDARY, COLOR_LEGENDARY, DISPLAY_NAME_LEGENDARY);
}

3
ee3_client/ee3/client/gui/GuiCalcinator.java
View file

@ -7,6 +7,7 @@ import cpw.mods.fml.common.asm.SideOnly;
import cpw.mods.fml.common.registry.LanguageRegistry;
import ee3.common.container.ContainerCalcinator;
import ee3.common.lib.Reference;
import ee3.common.lib.Strings;
import ee3.common.tile.TileCalcinator;
import net.minecraft.src.Container;
import net.minecraft.src.GuiContainer;
@ -35,7 +36,7 @@ public class GuiCalcinator extends GuiContainer {
protected void drawGuiContainerForegroundLayer()
{
this.fontRenderer.drawString(LanguageRegistry.instance().getStringLocalization(Reference.GUI_CALCINATOR_NAME), 60, 6, 4210752);
this.fontRenderer.drawString(LanguageRegistry.instance().getStringLocalization(Strings.GUI_CALCINATOR_NAME), 60, 6, 4210752);
this.fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
}

2
ee3_client/ee3/client/render/ModelCalcinator.java
View file

@ -130,7 +130,7 @@ public class ModelCalcinator extends ModelBase {
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glTranslated(x, y, z);
ForgeHooksClient.bindTexture(Reference.SPRITE_SHEET_LOCATION + "calcinator.png", 0);
ForgeHooksClient.bindTexture(Reference.SPRITE_SHEET_LOCATION + Reference.CALCINATOR_TEXTURE_SHEET, 0);
firePotBottom.render(scale);
bowlBottom.render(scale);

2
ee3_client/ee3/client/render/RenderItemCalcinator.java
View file

@ -38,7 +38,7 @@ public class RenderItemCalcinator implements IItemRenderer {
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
switch (type) {
case ENTITY: renderCalcinator(-0.5F, 0.5F, -0.5F); break;
case ENTITY: renderCalcinator(-0.5F, 0F, -0.5F); break;
case EQUIPPED: renderCalcinator(0F, 0.4F, 0F); break;
case INVENTORY: renderCalcinator(1F, 0.65F, 1F); break;
default: break;

5
ee3_common/ee3/common/block/BlockCalcinator.java
View file

@ -3,6 +3,7 @@ package ee3.common.block;
import ee3.common.EquivalentExchange3;
import ee3.common.lib.GuiIds;
import ee3.common.lib.RenderIds;
import ee3.common.lib.Strings;
import ee3.common.tile.TileCalcinator;
import net.minecraft.src.CreativeTabs;
import net.minecraft.src.EntityPlayer;
@ -23,7 +24,9 @@ public class BlockCalcinator extends BlockEE {
public BlockCalcinator(int id) {
super(id, Material.rock);
setHardness(5F);
this.setBlockName(Strings.CALCINATOR_NAME);
this.setCreativeTab(EquivalentExchange3.tabsEE3);
this.setHardness(5F);
}
@Override

6
ee3_common/ee3/common/block/BlockRedWaterFlowing.java
View file

@ -1,5 +1,6 @@
package ee3.common.block;
import ee3.common.EquivalentExchange3;
import ee3.common.lib.Reference;
import net.minecraft.src.BlockFlowing;
import net.minecraft.src.CreativeTabs;
@ -16,10 +17,11 @@ import net.minecraft.src.Material;
*/
public class BlockRedWaterFlowing extends BlockFlowing {
protected BlockRedWaterFlowing(int id, Material material) {
super(id, material);
protected BlockRedWaterFlowing(int id) {
super(id, Material.water);
this.blockHardness = 100F;
this.setLightOpacity(3);
this.setCreativeTab(EquivalentExchange3.tabsEE3);
this.setBlockName("redWaterFlowing");
}

13
ee3_common/ee3/common/block/BlockRedWaterStill.java
View file

@ -1,8 +1,8 @@
package ee3.common.block;
import ee3.common.EquivalentExchange3;
import ee3.common.lib.Reference;
import net.minecraft.src.BlockStationary;
import net.minecraft.src.CreativeTabs;
import net.minecraft.src.Material;
/**
@ -16,13 +16,14 @@ import net.minecraft.src.Material;
*/
public class BlockRedWaterStill extends BlockStationary {
protected BlockRedWaterStill(int id, Material material) {
super(id, material);
protected BlockRedWaterStill(int id) {
super(id, Material.water);
this.blockHardness = 100F;
this.setLightOpacity(3);
setBlockName("redWaterStill");
disableStats();
setRequiresSelfNotify();
this.setBlockName("redWaterStill");
this.setCreativeTab(EquivalentExchange3.tabsEE3);
this.disableStats();
this.setRequiresSelfNotify();
}
@Override

11
ee3_common/ee3/common/block/ModBlocks.java
View file

@ -4,6 +4,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import ee3.common.EquivalentExchange3;
import ee3.common.lib.BlockIds;
import ee3.common.lib.Strings;
import net.minecraft.src.Block;
import net.minecraft.src.Item;
import net.minecraft.src.ItemStack;
@ -19,10 +20,6 @@ import net.minecraft.src.Material;
*
*/
public class ModBlocks {
/* Block name constants */
public static final String CALCINATOR_NAME = "calcinator";
public static final String RED_WATER_STILL_NAME = "redWaterStill";
/* Mod block instances */
public static Block calcinator;
@ -31,9 +28,9 @@ public class ModBlocks {
public static void init() {
calcinator = new BlockCalcinator(BlockIds.CALCINATOR).setBlockName(CALCINATOR_NAME).setCreativeTab(EquivalentExchange3.tabsEE3);
redWaterStill = new BlockRedWaterStill(BlockIds.RED_WATER_STILL, Material.water).setCreativeTab(EquivalentExchange3.tabsEE3);
redWaterFlowing = new BlockRedWaterFlowing(BlockIds.RED_WATER_STILL - 1, Material.water).setCreativeTab(EquivalentExchange3.tabsEE3);
calcinator = new BlockCalcinator(BlockIds.CALCINATOR);
redWaterStill = new BlockRedWaterStill(BlockIds.RED_WATER_STILL);
redWaterFlowing = new BlockRedWaterFlowing(BlockIds.RED_WATER_STILL - 1);
GameRegistry.registerBlock(calcinator);
GameRegistry.registerBlock(redWaterStill);

16
ee3_common/ee3/common/core/handlers/ConfigurationHandler.java
View file

@ -10,6 +10,7 @@ import ee3.common.lib.BlockIds;
import ee3.common.lib.ConfigurationSettings;
import ee3.common.lib.ItemIds;
import ee3.common.lib.Reference;
import ee3.common.lib.Strings;
import net.minecraftforge.common.Configuration;
import static net.minecraftforge.common.Configuration.*;
@ -54,25 +55,28 @@ public class ConfigurationHandler {
.get(CATEGORY_BLOCK, Reference.AUTO_RESOLVE_BLOCK_IDS, ConfigurationSettings.AUTO_RESOLVE_BLOCK_IDS_DEFAULT)
.getBoolean(ConfigurationSettings.AUTO_RESOLVE_BLOCK_IDS_DEFAULT);
BlockIds.CALCINATOR = configuration
.getBlock(ModBlocks.CALCINATOR_NAME, BlockIds.CALCINATOR_DEFAULT)
.getBlock(Strings.CALCINATOR_NAME, BlockIds.CALCINATOR_DEFAULT)
.getInt(BlockIds.CALCINATOR_DEFAULT);
BlockIds.RED_WATER_STILL = configuration
.getBlock(ModBlocks.RED_WATER_STILL_NAME, BlockIds.RED_WATER_STILL_DEFAULT)
.getBlock(Strings.RED_WATER_STILL_NAME, BlockIds.RED_WATER_STILL_DEFAULT)
.getInt(BlockIds.RED_WATER_STILL_DEFAULT);
/* Item Configs */
ItemIds.MINIUM_SHARD = configuration
.getItem(ModItems.MINIUM_SHARD_NAME, ItemIds.MINIUM_SHARD_DEFAULT)
.getItem(Strings.MINIUM_SHARD_NAME, ItemIds.MINIUM_SHARD_DEFAULT)
.getInt(ItemIds.MINIUM_SHARD_DEFAULT);
ItemIds.INERT_STONE = configuration
.getItem(ModItems.INERT_STONE_NAME, ItemIds.INERT_STONE_DEFAULT)
.getItem(Strings.INERT_STONE_NAME, ItemIds.INERT_STONE_DEFAULT)
.getInt(ItemIds.INERT_STONE_DEFAULT);
ItemIds.MINIUM_STONE = configuration
.getItem(ModItems.MINIUM_STONE_NAME, ItemIds.MINIUM_STONE_DEFAULT)
.getItem(Strings.MINIUM_STONE_NAME, ItemIds.MINIUM_STONE_DEFAULT)
.getInt(ItemIds.MINIUM_STONE_DEFAULT);
ItemIds.PHILOSOPHER_STONE = configuration
.getItem(ModItems.PHILOSOPHER_STONE_NAME, ItemIds.PHILOSOPHER_STONE_DEFAULT)
.getItem(Strings.PHILOSOPHER_STONE_NAME, ItemIds.PHILOSOPHER_STONE_DEFAULT)
.getInt(ItemIds.PHILOSOPHER_STONE_DEFAULT);
ItemIds.ALCHEMY_DUST = configuration
.getItem(Strings.ALCHEMY_DUST_NAME, ItemIds.ALCHEMY_DUST_DEFAULT)
.getInt(ItemIds.ALCHEMY_DUST_DEFAULT);
/* KeyBinding Configs */
configuration.addCustomCategoryComment(CATEGORY_KEYBIND, "");

78
ee3_common/ee3/common/item/ItemAlchemyDust.java
View file

@ -1,5 +1,20 @@
package ee3.common.item;
import java.util.List;
import net.minecraft.src.CreativeTabs;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.EnumRarity;
import net.minecraft.src.ItemStack;
import net.minecraft.src.MathHelper;
import net.minecraft.src.StringTranslate;
import cpw.mods.fml.common.Side;
import cpw.mods.fml.common.asm.SideOnly;
import cpw.mods.fml.common.registry.LanguageRegistry;
import ee3.common.EquivalentExchange3;
import ee3.common.lib.CustomItemRarity;
import ee3.common.lib.Strings;
/**
* ItemAlchemyDust
*
@ -11,9 +26,72 @@ package ee3.common.item;
*/
public class ItemAlchemyDust extends ItemEE {
public static final String[] alchemyDustNames = new String[] {"ash", "minium", "verdant", "azure", "amaranthine", "iridescent"};
public ItemAlchemyDust(int id) {
super(id);
this.setHasSubtypes(true);
this.setMaxDamage(0);
this.setIconCoord(0, 3);
this.setItemName(Strings.ALCHEMY_DUST_NAME);
this.setCreativeTab(EquivalentExchange3.tabsEE3);
maxStackSize = 64;
}
@SideOnly(Side.CLIENT)
public int getIconFromDamage(int meta) {
int i = MathHelper.clamp_int(meta, 0, 11);
return (this.iconIndex + i);
}
public String getItemNameIS(ItemStack stack) {
int meta = MathHelper.clamp_int(stack.getItemDamage(), 0, 11);
return super.getItemName() + "." + alchemyDustNames[meta / 2];
}
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
int meta = MathHelper.clamp_int(stack.getItemDamage(), 0, 11);
String key = (meta % 2 == 0) ? Strings.TEXT_IMPURE : Strings.TEXT_PURE;
list.add(LanguageRegistry.instance().getStringLocalization(key));
}
@SideOnly(Side.CLIENT)
public boolean hasEffect(ItemStack stack) {
int meta = MathHelper.clamp_int(stack.getItemDamage(), 0, 11);
if (meta >= 10) {
return true;
}
else {
return false;
}
}
@SideOnly(Side.CLIENT)
public EnumRarity getRarity(ItemStack stack) {
int meta = MathHelper.clamp_int(stack.getItemDamage(), 0, 11);
switch(meta / 2) {
case 0: return EquivalentExchange3.proxy.getCustomRarityType(CustomItemRarity.NORMAL);
case 1: return EquivalentExchange3.proxy.getCustomRarityType(CustomItemRarity.NORMAL);
case 2: return EquivalentExchange3.proxy.getCustomRarityType(CustomItemRarity.UNCOMMON);
case 3: return EquivalentExchange3.proxy.getCustomRarityType(CustomItemRarity.MAGICAL);
case 4: return EquivalentExchange3.proxy.getCustomRarityType(CustomItemRarity.EPIC);
case 5: return EquivalentExchange3.proxy.getCustomRarityType(CustomItemRarity.LEGENDARY);
default: return EnumRarity.common;
}
}
@SideOnly(Side.CLIENT)
public void getSubItems(int id, CreativeTabs creativeTab, List list)
{
for (int meta = 0; meta < 12; ++meta) {
list.add(new ItemStack(id, 1, meta));
}
}
}

6
ee3_common/ee3/common/item/ItemInertStone.java
View file

@ -1,5 +1,8 @@
package ee3.common.item;
import ee3.common.EquivalentExchange3;
import ee3.common.lib.Strings;
/**
* ItemInertStone
*
@ -13,6 +16,9 @@ public class ItemInertStone extends ItemEE {
public ItemInertStone(int id) {
super(id);
this.setIconCoord(1, 0);
this.setItemName(Strings.INERT_STONE_NAME);
this.setCreativeTab(EquivalentExchange3.tabsEE3);
}
}

6
ee3_common/ee3/common/item/ItemMiniumShard.java
View file

@ -1,5 +1,8 @@
package ee3.common.item;
import ee3.common.EquivalentExchange3;
import ee3.common.lib.Strings;
/**
* ItemMiniumShard
*
@ -13,6 +16,9 @@ public class ItemMiniumShard extends ItemEE {
public ItemMiniumShard(int id) {
super(id);
this.setIconCoord(0, 0);
this.setItemName(Strings.MINIUM_SHARD_NAME);
this.setCreativeTab(EquivalentExchange3.tabsEE3);
maxStackSize = 64;
}

6
ee3_common/ee3/common/item/ItemMiniumStone.java
View file

@ -15,6 +15,7 @@ import ee3.common.lib.Colours;
import ee3.common.lib.ConfigurationSettings;
import ee3.common.lib.CustomItemRarity;
import ee3.common.lib.GuiIds;
import ee3.common.lib.Strings;
import ee3.common.network.PacketKeyPressed;
import ee3.common.network.PacketTypeHandler;
@ -31,7 +32,10 @@ public class ItemMiniumStone extends ItemEE implements ITransmutationStone {
public ItemMiniumStone(int id) {
super(id);
setMaxDamage(ConfigurationSettings.MINIUM_STONE_MAX_DURABILITY - 1);
this.setIconCoord(2, 0);
this.setItemName(Strings.MINIUM_STONE_NAME);
this.setCreativeTab(EquivalentExchange3.tabsEE3);
this.setMaxDamage(ConfigurationSettings.MINIUM_STONE_MAX_DURABILITY - 1);
}
@SideOnly(Side.CLIENT)

6
ee3_common/ee3/common/item/ItemPhilosopherStone.java
View file

@ -9,6 +9,7 @@ import ee3.common.core.helper.NBTHelper;
import ee3.common.core.helper.TransmutationHelper;
import ee3.common.lib.CustomItemRarity;
import ee3.common.lib.GuiIds;
import ee3.common.lib.Strings;
import ee3.common.network.PacketKeyPressed;
import ee3.common.network.PacketTypeHandler;
import net.minecraft.src.EntityClientPlayerMP;
@ -33,7 +34,10 @@ public class ItemPhilosopherStone extends ItemEE
public ItemPhilosopherStone(int id) {
super(id);
maxChargeLevel = 4;
this.setIconCoord(3, 0);
this.setItemName(Strings.PHILOSOPHER_STONE_NAME);
this.setCreativeTab(EquivalentExchange3.tabsEE3);
this.maxChargeLevel = 4;
}
@SideOnly(Side.CLIENT)

18
ee3_common/ee3/common/item/ModItems.java
View file

@ -4,6 +4,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import ee3.common.EquivalentExchange3;
import ee3.common.lib.ItemIds;
import ee3.common.lib.Strings;
import net.minecraft.src.Block;
import net.minecraft.src.CreativeTabs;
import net.minecraft.src.Item;
@ -19,13 +20,6 @@ import net.minecraft.src.ItemStack;
*
*/
public class ModItems {
/* Item name constants */
public static final String MINIUM_SHARD_NAME = "miniumShard";
public static final String INERT_STONE_NAME = "inertStone";
public static final String MINIUM_STONE_NAME = "miniumStone";
public static final String PHILOSOPHER_STONE_NAME = "philStone";
public static final String ALCHEMY_DUST_NAME = "alchemyDust";
/* Mod item instances */
public static Item miniumShard;
@ -36,11 +30,11 @@ public class ModItems {
public static void init() {
/* Initialize each mod item individually */
miniumShard = new ItemMiniumShard(ItemIds.MINIUM_SHARD).setIconCoord(0, 0).setItemName(MINIUM_SHARD_NAME).setCreativeTab(EquivalentExchange3.tabsEE3);
inertStone = new ItemInertStone(ItemIds.INERT_STONE).setIconCoord(1, 0).setItemName(INERT_STONE_NAME).setCreativeTab(EquivalentExchange3.tabsEE3);
miniumStone = new ItemMiniumStone(ItemIds.MINIUM_STONE).setIconCoord(2, 0).setItemName(MINIUM_STONE_NAME).setCreativeTab(EquivalentExchange3.tabsEE3);
philStone = new ItemPhilosopherStone(ItemIds.PHILOSOPHER_STONE).setIconCoord(3, 0).setItemName(PHILOSOPHER_STONE_NAME).setCreativeTab(EquivalentExchange3.tabsEE3);
alchemyDust = new ItemAlchemyDust(ItemIds.PHILOSOPHER_STONE + 1).setIconCoord(0, 3).setItemName(ALCHEMY_DUST_NAME).setCreativeTab(EquivalentExchange3.tabsEE3);
miniumShard = new ItemMiniumShard(ItemIds.MINIUM_SHARD);
inertStone = new ItemInertStone(ItemIds.INERT_STONE);
miniumStone = new ItemMiniumStone(ItemIds.MINIUM_STONE);
philStone = new ItemPhilosopherStone(ItemIds.PHILOSOPHER_STONE);
alchemyDust = new ItemAlchemyDust(ItemIds.ALCHEMY_DUST);
miniumStone.setContainerItem(miniumStone);
philStone.setContainerItem(philStone);

4
ee3_common/ee3/common/lib/ConfigurationSettings.java
View file

@ -37,12 +37,12 @@ public class ConfigurationSettings {
*/
// The durability cost for each transmute with the Minium Stone
public static int MINIUM_STONE_TRANSMUTE_COST;
public static final String MINIUM_STONE_TRANSMUTE_COST_CONFIGNAME = ModItems.MINIUM_STONE_NAME + ".transmuteCost";
public static final String MINIUM_STONE_TRANSMUTE_COST_CONFIGNAME = Strings.MINIUM_STONE_NAME + ".transmuteCost";
public static final int MINIUM_STONE_TRANSMUTE_COST_DEFAULT = 1;
// The maximum durability for the Minium Stone
public static int MINIUM_STONE_MAX_DURABILITY;
public static final String MINIUM_STONE_MAX_DURABILITY_CONFIGNAME = ModItems.MINIUM_STONE_NAME + ".maxDurability";
public static final String MINIUM_STONE_MAX_DURABILITY_CONFIGNAME = Strings.MINIUM_STONE_NAME + ".maxDurability";
public static final int MINIUM_STONE_MAX_DURABILITY_DEFAULT = 1521;
}

6
ee3_common/ee3/common/lib/CustomItemRarity.java
View file

@ -31,20 +31,26 @@ public class CustomItemRarity {
public static final int COLOR_JUNK = 7;
public static final int COLOR_NORMAL = 15;
public static final int COLOR_UNCOMMON = 10;
public static final int COLOR_MAGICAL = 9;
public static final int COLOR_RARE = 14;
public static final int COLOR_EPIC = 5;
public static final int COLOR_LEGENDARY = 6;
public static final String JUNK = "custom_junk";
public static final String NORMAL = "custom_normal";
public static final String UNCOMMON = "custom_uncommon";
public static final String MAGICAL = "custom_magical";
public static final String RARE = "custom_rare";
public static final String EPIC = "custom_epic";
public static final String LEGENDARY = "custom_legendary";
public static final String DISPLAY_NAME_JUNK = "Junk";
public static final String DISPLAY_NAME_NORMAL = "Normal";
public static final String DISPLAY_NAME_UNCOMMON = "Uncommon";
public static final String DISPLAY_NAME_MAGICAL = "Magical";
public static final String DISPLAY_NAME_RARE = "Rare";
public static final String DISPLAY_NAME_EPIC = "Epic";
public static final String DISPLAY_NAME_LEGENDARY = "Legendary";
}

2
ee3_common/ee3/common/lib/ItemIds.java
View file

@ -16,11 +16,13 @@ public class ItemIds {
public static int INERT_STONE_DEFAULT = 27001;
public static int MINIUM_STONE_DEFAULT = 27002;
public static int PHILOSOPHER_STONE_DEFAULT = 27003;
public static int ALCHEMY_DUST_DEFAULT = 27004;
/* Current item ids */
public static int MINIUM_SHARD;
public static int INERT_STONE;
public static int MINIUM_STONE;
public static int PHILOSOPHER_STONE;
public static int ALCHEMY_DUST;
}

5
ee3_common/ee3/common/lib/Reference.java
View file

@ -31,7 +31,6 @@ public class Reference {
public static final String AUTO_RESOLVE_BLOCK_IDS = "auto_resolve_block_ids";
/* KeyBinding related constants */
// TODO: Localize keybinding names
public static final String KEYBINDING_EXTRA = "key.extra";
public static final int KEYBINDING_EXTRA_DEFAULT = 46;
public static final String KEYBINDING_RELEASE = "key.release";
@ -47,9 +46,7 @@ public class Reference {
public static final String GUI_SHEET_LOCATION = "/ee3/art/gui/";
public static final String ITEM_SPRITE_SHEET = "ee3_items.png";
public static final String BLOCK_SPRITE_SHEET = "ee3_blocks.png";
/* Gui related constants */
public static final String GUI_CALCINATOR_NAME = "gui.calcinator.name";
public static final String CALCINATOR_TEXTURE_SHEET = "calcinator.png";
/* General Tile Entity related constants */
public static final String TE_GEN_OWNER_NBT_TAG_LABEL = "owner";

23
ee3_common/ee3/common/lib/Strings.java Normal file
View file

@ -0,0 +1,23 @@
package ee3.common.lib;
public class Strings {
/* General text keys */
public static final String TEXT_IMPURE = "text.impure";
public static final String TEXT_PURE = "text.pure";
/* Gui related constants */
public static final String GUI_CALCINATOR_NAME = "gui.calcinator.name";
/* Block name constants */
public static final String CALCINATOR_NAME = "calcinator";
public static final String RED_WATER_STILL_NAME = "redWaterStill";
/* Item name constants */
public static final String MINIUM_SHARD_NAME = "miniumShard";
public static final String INERT_STONE_NAME = "inertStone";
public static final String MINIUM_STONE_NAME = "miniumStone";
public static final String PHILOSOPHER_STONE_NAME = "philStone";
public static final String ALCHEMY_DUST_NAME = "alchemyDust";
}

3
ee3_common/ee3/common/tile/TileCalcinator.java
View file

@ -1,6 +1,7 @@
package ee3.common.tile;
import ee3.common.block.ModBlocks;
import ee3.common.lib.Strings;
import net.minecraft.src.IInventory;
import net.minecraft.src.ItemStack;
import net.minecraft.src.NBTTagCompound;
@ -85,7 +86,7 @@ public class TileCalcinator extends TileEE implements IInventory {
}
public String getInvName() {
return "container." + ModBlocks.CALCINATOR_NAME;
return "container." + Strings.CALCINATOR_NAME;
}
public int getInventoryStackLimit() {

BIN
resources/ee3/art/sprites/ee3_items.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

BIN
resources/ee3/art/sprites/xcf/ee3_items.xcf
View file

Binary file not shown.

8
resources/ee3/lang/en_US.xml
View file

@ -10,11 +10,19 @@
<entry key="item.inertStone.name">Inert Stone</entry>
<entry key="item.miniumStone.name">Minium Stone</entry>
<entry key="item.philStone.name">Philosopher's Stone</entry>
<entry key="item.alchemyDust.ash.name">Ash</entry>
<entry key="item.alchemyDust.minium.name">Minium Dust</entry>
<entry key="item.alchemyDust.verdant.name">Verdant Dust</entry>
<entry key="item.alchemyDust.azure.name">Azure Dust</entry>
<entry key="item.alchemyDust.amaranthine.name">Amaranthine Dust</entry>
<entry key="item.alchemyDust.iridescent.name">Iridescent Dust</entry>
<entry key="tile.redWaterStill.name">Red Water (Still)</entry>
<entry key="tile.redWaterFlowing.name">Red Water (Flowing)</entry>
<entry key="tile.calcinator.name">Calcinator</entry>
<entry key="gui.calcinator.name">Calcinator</entry>
<entry key="itemGroup.EE3">Equivalent Exchange 3</entry>
<entry key="text.impure">Impure</entry>
<entry key="text.pure">Pure</entry>
<entry key="version.init_log_message">Initializing version check against the remote version authority file, located at</entry>
<entry key="version.uninitialized">The version check did not complete successfully (version check did not initialize properly)</entry>
<entry key="version.current">You are currently using the most up to date version for your version of Minecraft</entry>