tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Registered Machine Part Block

Browse source
This commit is contained in:
Calclavia 2014-01-05 04:10:47 +08:00
parent 3d7328b520
commit f41aa679e8
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Calclavia-Core

@ -1 +1 @@
Subproject commit 2a97648bcc98a8d55f47389b49c5459388853484
Subproject commit 4c126b0b3f1e9f811e9e579736f47275ee1cfc99

1
src/main/java/resonantinduction/ResonantInduction.java
View file

@ -208,6 +208,7 @@ public class ResonantInduction
GameRegistry.registerItem(itemTransformer, itemTransformer.getUnlocalizedName());
GameRegistry.registerItem(itemDust, itemDust.getUnlocalizedName());
GameRegistry.registerBlock(blockMachinePart, blockMachinePart.getUnlocalizedName());
GameRegistry.registerBlock(blockTesla, blockTesla.getUnlocalizedName());
GameRegistry.registerBlock(blockEMContractor, ItemBlockContractor.class, blockEMContractor.getUnlocalizedName());
GameRegistry.registerBlock(blockBattery, ItemBlockBattery.class, blockBattery.getUnlocalizedName());

11
src/main/java/resonantinduction/machine/crusher/ItemDust.java
View file

@ -49,13 +49,6 @@ public class ItemDust extends ItemBase
this.setTextureName(ResonantInduction.PREFIX + "dust");
}
// @Override
// public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4)
// {
// String dustName = getDustFromStack(itemStack);
// par3List.add("Type: " + dustName.substring(0, 1).toUpperCase() + dustName.substring(1));
// }
//
@Override
public String getItemDisplayName(ItemStack is)
{
@ -63,7 +56,7 @@ public class ItemDust extends ItemBase
ItemStack type = OreDictionary.getOres("ingot" + dustName.substring(0, 1).toUpperCase() + dustName.substring(1)).get(0);
String name = type.getDisplayName().replace(TranslationHelper.getLocal("misc.resonantinduction.ingot"), "");
return (TranslationHelper.getLocal(this.getUnlocalizedName() + ".name")).replace("%v", name).replace(" ", " ");
return (TranslationHelper.getLocal(this.getUnlocalizedName() + ".name")).replace("%v", name).replace(" ", " ");
}
@ForgeSubscribe
@ -75,7 +68,7 @@ public class ItemDust extends ItemBase
ingotNames.add(ingotName.toLowerCase());
}
}
@ForgeSubscribe
@SideOnly(Side.CLIENT)
public void reloadTextures(TextureStitchEvent.Post e)