summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2014-10-19 18:13:25 +0100
committerDaniel Silverstone <dsilvers@digital-scurf.org>2014-10-19 18:13:25 +0100
commit0c97228aef3b6f723021403decd73c07da2f4266 (patch)
tree0a242cf90f722c08594a62bd83cbdf5ee8826301
parent5ff454d758d951571bc6cb40dca26226fd878671 (diff)
downloadnoctis-0c97228aef3b6f723021403decd73c07da2f4266.tar.bz2
Fix up items, everything working now
-rw-r--r--src/main/java/net/flarn/noctis/item/ItemGlassSword.java2
-rw-r--r--src/main/java/net/flarn/noctis/item/ItemNoctisBase.java5
-rw-r--r--src/main/resources/assets/noctis/lang/en.lang2
-rw-r--r--src/main/resources/assets/noctis/lang/en_GB.lang2
-rw-r--r--src/main/resources/assets/noctis/textures/items/glassSword.pngbin286 -> 281 bytes
5 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/net/flarn/noctis/item/ItemGlassSword.java b/src/main/java/net/flarn/noctis/item/ItemGlassSword.java
index c4895aa..1822355 100644
--- a/src/main/java/net/flarn/noctis/item/ItemGlassSword.java
+++ b/src/main/java/net/flarn/noctis/item/ItemGlassSword.java
@@ -1,5 +1,7 @@
package net.flarn.noctis.item;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.item.Item;
public class ItemGlassSword extends ItemNoctisBase {
diff --git a/src/main/java/net/flarn/noctis/item/ItemNoctisBase.java b/src/main/java/net/flarn/noctis/item/ItemNoctisBase.java
index 5e32d4e..a1165b5 100644
--- a/src/main/java/net/flarn/noctis/item/ItemNoctisBase.java
+++ b/src/main/java/net/flarn/noctis/item/ItemNoctisBase.java
@@ -26,8 +26,9 @@ public class ItemNoctisBase extends Item {
@Override
@SideOnly(Side.CLIENT)
- public void registerIcons(IIconRegister iconRegister) {
- iconRegister.registerIcon(this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf(".") + 1));
+ protected String getIconString()
+ {
+ return this.getUnlocalizedName().substring(this.getUnlocalizedName().indexOf(".") + 1);
}
protected String getUnwrappedUnlocalizedName(String unLocalizedName) {
diff --git a/src/main/resources/assets/noctis/lang/en.lang b/src/main/resources/assets/noctis/lang/en.lang
deleted file mode 100644
index 58833a6..0000000
--- a/src/main/resources/assets/noctis/lang/en.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Item localisations
-item.noctis:glassSword.name=Unattuned Glass Sword
diff --git a/src/main/resources/assets/noctis/lang/en_GB.lang b/src/main/resources/assets/noctis/lang/en_GB.lang
new file mode 100644
index 0000000..6dd5f3f
--- /dev/null
+++ b/src/main/resources/assets/noctis/lang/en_GB.lang
@@ -0,0 +1,2 @@
+# Item localisations
+item.noctis:glassSword.name=Un-attuned Glass Sword
diff --git a/src/main/resources/assets/noctis/textures/items/glassSword.png b/src/main/resources/assets/noctis/textures/items/glassSword.png
index fa84d39..886fa3f 100644
--- a/src/main/resources/assets/noctis/textures/items/glassSword.png
+++ b/src/main/resources/assets/noctis/textures/items/glassSword.png
Binary files differ