Mainly fixed resource stuff.

Aroma1997 · Mar 2, 2014 · 3ed8f5b · 3ed8f5b
1 parent ed9b072
commit 3ed8f5b
Show file tree

Hide file tree

Showing 11 changed files with 95 additions and 88 deletions.
diff --git a/src/main/java/aroma1997/compactwindmills/ItemCompactWindMill.java b/src/main/java/aroma1997/compactwindmills/ItemCompactWindMill.java
@@ -49,7 +49,7 @@ public int getMetadata(int i) {
 
 	@Override
 	public String getUnlocalizedName(ItemStack itemstack) {
-		return WindType.values()[itemstack.getItemDamage()].name();
+		return WindType.values()[itemstack.getItemDamage()].getUnlocalizedName();
 	}
 
 }
diff --git a/src/main/java/aroma1997/compactwindmills/ItemRotor.java b/src/main/java/aroma1997/compactwindmills/ItemRotor.java
@@ -38,6 +38,8 @@ public class ItemRotor extends Item implements IItemRotor {
 
 	private boolean isInfinite;
 
+	private RotorType type;
+
 	public ItemRotor(RotorType type) {
 		super();
 		setMinMaxTier(type.typeMin, type.typeMax);
@@ -49,6 +51,7 @@ public ItemRotor(RotorType type) {
 
 		setMaxStackSize(1);
 		setNoRepair();
+		this.type = type;
 	}
 
 	@SuppressWarnings({"rawtypes", "unchecked"})
@@ -123,8 +126,7 @@ public boolean isInfinite() {
 	@SideOnly(Side.CLIENT)
 	@Override
 	public ResourceLocation getRenderTexture() {
-		return new ResourceLocation(Reference.ModID + ":textures/renderers/"
-			+ this.getUnlocalizedName() + ".png");
+		return new ResourceLocation(type.getRenderTexture());
 	}
 
 	@Override

diff --git a/src/main/java/aroma1997/compactwindmills/RotorType.java b/src/main/java/aroma1997/compactwindmills/RotorType.java
@@ -81,4 +81,9 @@ public String getTextureName() {
 		return "compactwindmills:item." + unlocalizedName;
 	}
 
+	public String getRenderTexture() {
+		return "compactwindmills:textures/renderers/item."
+				+ this.unlocalizedName + ".png";
+	}
+
 }
diff --git a/src/main/java/aroma1997/compactwindmills/TileEntityWindmill.java b/src/main/java/aroma1997/compactwindmills/TileEntityWindmill.java
@@ -401,7 +401,7 @@ public void drawGuiContainerForegroundLayer(GUIContainer gui, ContainerBasic con
 		int par1, int par2) {
 		gui.getFontRender().drawString("Rotor:", 40, 14, 0x404040);
 		gui.getFontRender().drawSplitString(StatCollector.translateToLocalFormatted("info.compactwindmills:gui.output", 
-				"" + getOutputUntilNexttTick()), 95, 15, 70, 0x404040);
+				"" + getOutputUntilNexttTick()), 95, 10, 70, 0x404040);
 
 	}
 
@@ -424,7 +424,7 @@ public boolean emitsEnergyTo(TileEntity receiver, ForgeDirection direction) {
 
 	@Override
 	public String getInventoryName() {
-		return type.getUnlocalizedName();
+		return type.getUnlocalizedName() + ".name";
 	}
 
 	@Override

diff --git a/src/main/resources/assets/compactwindmills/lang/de_DE.lang b/src/main/resources/assets/compactwindmills/lang/de_DE.lang
@@ -2,11 +2,11 @@
 creativetab.compactwindmills:creativetab.name=CompactWindmills
 
 
-tile.compactwindmills:windmill.name.ELV=Extremniederspannungswindmühle
-tile.compactwindmills:windmill.name.LV=Niederspannungswindmühle
-tile.compactwindmills:windmill.name.MV=Mittelspannungswindmühle
-tile.compactwindmills:windmill.name.HV=Hochspannungswindmühle
-tile.compactwindmills:windmill.name.EV=Extremspannungswindmühle
+tile.compactwindmills:windmill.name.ELV.name=Extremniederspannungswindmühle
+tile.compactwindmills:windmill.name.LV.name=Niederspannungswindmühle
+tile.compactwindmills:windmill.name.MV.name=Mittelspannungswindmühle
+tile.compactwindmills:windmill.name.HV.name=Hochspannungswindmühle
+tile.compactwindmills:windmill.name.EV.name=Extremspannungswindmühle
 
 
 info.compactwindmills:tooltip.ticksleft=%s Ticks übrig auf diesem Rotor.
@@ -17,8 +17,8 @@ info.compactwindmills:tooltip.efficiency=Effizienz: %s
 info.compactwindmills:gui.rotor=Rotor:
 info.compactwindmills:gui.output=Aktueller Output: %s EU/t
 
-item.compactwindmills:rotor.WOOD=Hölzerner Rotor
-item.compactwindmills:rotor.WOOL=Stoffrotor
-item.compactwindmills:rotor.CARBON=Karbonrotor
-item.compactwindmills:rotor.ALLOY=Legierungsrotor
-item.compactwindmills:rotor.IRIDIUM=Iridiumrotor
+item.compactwindmills:rotor.WOOD.name=Hölzerner Rotor
+item.compactwindmills:rotor.WOOL.name=Stoffrotor
+item.compactwindmills:rotor.CARBON.name=Karbonrotor
+item.compactwindmills:rotor.ALLOY.name=Legierungsrotor
+item.compactwindmills:rotor.IRIDIUM.name=Iridiumrotor
diff --git a/src/main/resources/assets/compactwindmills/lang/en_US.lang b/src/main/resources/assets/compactwindmills/lang/en_US.lang
@@ -2,11 +2,11 @@
 creativetab.compactwindmills:creativetab.name=CompactWindmills
 
 
-tile.compactwindmills:windmill.name.ELV=Extreme Low Voltage Windmill
-tile.compactwindmills:windmill.name.LV=Low Voltage Windmill
-tile.compactwindmills:windmill.name.MV=Medium Voltage Windmill
-tile.compactwindmills:windmill.name.HV=High Voltage Windmill
-tile.compactwindmills:windmill.name.EV=Extreme Voltage Windmill
+tile.compactwindmills:windmill.name.ELV.name=Extreme Low Voltage Windmill
+tile.compactwindmills:windmill.name.LV.name=Low Voltage Windmill
+tile.compactwindmills:windmill.name.MV.name=Medium Voltage Windmill
+tile.compactwindmills:windmill.name.HV.name=High Voltage Windmill
+tile.compactwindmills:windmill.name.EV.name=Extreme Voltage Windmill
 
 
 info.compactwindmills:tooltip.ticksleft=%s ticks left over on this rotor.
@@ -17,8 +17,8 @@ info.compactwindmills:tooltip.efficiency=Efficiency: %s
 info.compactwindmills:gui.rotor=Rotor:
 info.compactwindmills:gui.output=Current Output: %s EU/t
 
-item.compactwindmills:rotor.WOOD=Wooden Rotor
-item.compactwindmills:rotor.WOOL=Cloth Rotor
-item.compactwindmills:rotor.CARBON=Carbon Rotor
-item.compactwindmills:rotor.ALLOY=Alloy Rotor
-item.compactwindmills:rotor.IRIDIUM=Iridium Rotor
+item.compactwindmills:rotor.WOOD.name=Wooden Rotor
+item.compactwindmills:rotor.WOOL.name=Cloth Rotor
+item.compactwindmills:rotor.CARBON.name=Carbon Rotor
+item.compactwindmills:rotor.ALLOY.name=Alloy Rotor
+item.compactwindmills:rotor.IRIDIUM.name=Iridium Rotor
diff --git a/src/main/resources/assets/compactwindmills/lang/it_IT.lang b/src/main/resources/assets/compactwindmills/lang/it_IT.lang
@@ -1,11 +1,11 @@
 creativetab.compactwindmills:creativetab.name=CompactWindmills
 
 
-tile.compactwindmills:windmill.name.ELV=Pala eolica a voltaggio estremamente basso
-tile.compactwindmills:windmill.name.LV=Pala eolica a voltaggio basso
-tile.compactwindmills:windmill.name.MV=Pala eolica a voltaggio medio
-tile.compactwindmills:windmill.name.HV=Pala eolica a voltaggio alto
-tile.compactwindmills:windmill.name.EV=Pala eolica a voltaggio estremo
+tile.compactwindmills:windmill.name.ELV.name=Pala eolica a voltaggio estremamente basso
+tile.compactwindmills:windmill.name.LV.name=Pala eolica a voltaggio basso
+tile.compactwindmills:windmill.name.MV.name=Pala eolica a voltaggio medio
+tile.compactwindmills:windmill.name.HV.name=Pala eolica a voltaggio alto
+tile.compactwindmills:windmill.name.EV.name=Pala eolica a voltaggio estremo
 
 
 info.compactwindmills:tooltip.ticksleft=%s tick rimanenti per questo rotore.
@@ -16,8 +16,8 @@ info.compactwindmills:tooltip.efficiency=Efficenza: %s
 info.compactwindmills:gui.rotor=Rotore:
 info.compactwindmills:gui.output=Uscita di corrente: %s EU/t
 
-item.compactwindmills:rotor.WOOD=Rotore di legno
-item.compactwindmills:rotor.WOOL=Rotore di lana
-item.compactwindmills:rotor.CARBON=Rotore di carbone
-item.compactwindmills:rotor.ALLOY=Rotore in lega
-item.compactwindmills:rotor.IRIDIUM=Rotore di iridio
+item.compactwindmills:rotor.WOOD.name=Rotore di legno
+item.compactwindmills:rotor.WOOL.name=Rotore di lana
+item.compactwindmills:rotor.CARBON.name=Rotore di carbone
+item.compactwindmills:rotor.ALLOY.name=Rotore in lega
+item.compactwindmills:rotor.IRIDIUM.name=Rotore di iridio
diff --git a/src/main/resources/assets/compactwindmills/lang/nl_NL.lang b/src/main/resources/assets/compactwindmills/lang/nl_NL.lang
@@ -1,11 +1,11 @@
 creativetab.compactwindmills:creativetab.name=CompactWindmills
 
 
-tile.compactwindmills:windmill.name.ELV=Extreem laag voltage windmolen
-tile.compactwindmills:windmill.name.LV=Laag voltage windmolen
-tile.compactwindmills:windmill.name.MV=Gemiddeld voltage windmolen
-tile.compactwindmills:windmill.name.HV=Hoog voltage windmolen
-tile.compactwindmills:windmill.name.EV=Extreem Voltage Windmolen
+tile.compactwindmills:windmill.name.ELV.name=Extreem laag voltage windmolen
+tile.compactwindmills:windmill.name.LV.name=Laag voltage windmolen
+tile.compactwindmills:windmill.name.MV.name=Gemiddeld voltage windmolen
+tile.compactwindmills:windmill.name.HV.name=Hoog voltage windmolen
+tile.compactwindmills:windmill.name.EV.name=Extreem Voltage Windmolen
 
 
 info.compactwindmills:tooltip.ticksleft=%s ticks over op deze rotor
@@ -16,8 +16,8 @@ info.compactwindmills:tooltip.efficiency=Effficientie: %s
 info.compactwindmills:gui.rotor=Rotor:
 info.compactwindmills:gui.output=Huidige Uitvoer: %s EU/t
 
-item.compactwindmills:rotor.WOOD=Houten Rotor
-item.compactwindmills:rotor.WOOL=Wollen Rotor
-item.compactwindmills:rotor.CARBON=Koolstof Rotor
-item.compactwindmills:rotor.ALLOY=Legering Rotor
-item.compactwindmills:rotor.IRIDIUM=Iridium Rotor
+item.compactwindmills:rotor.WOOD.name=Houten Rotor
+item.compactwindmills:rotor.WOOL.name=Wollen Rotor
+item.compactwindmills:rotor.CARBON.name=Koolstof Rotor
+item.compactwindmills:rotor.ALLOY.name=Legering Rotor
+item.compactwindmills:rotor.IRIDIUM.name=Iridium Rotor
diff --git a/src/main/resources/assets/compactwindmills/lang/ru_RU.lang b/src/main/resources/assets/compactwindmills/lang/ru_RU.lang
@@ -1,23 +1,23 @@
 creativetab.compactwindmills:creativetab.name=CompactWindmills
 
 
-tile.compactwindmills:windmill.name.ELV=Ветряная мельница сверхнизкого напряжения
-tile.compactwindmills:windmill.name.LV=Ветряная мельница низкого напряжения
-tile.compactwindmills:windmill.name.MV=Ветряная мельница среднего напряжения
-tile.compactwindmills:windmill.name.HV=Ветряная мельница высокого напряжения
-tile.compactwindmills:windmill.name.EV=Ветряная мельница экстремального напряжения
+tile.compactwindmills:windmill.name.ELV.name=Ð’ÐµÑ‚Ñ€Ñ�Ð½Ð°Ñ� Ð¼ÐµÐ»ÑŒÐ½Ð¸Ñ†Ð° Ñ�Ð²ÐµÑ€Ñ…Ð½Ð¸Ð·ÐºÐ¾Ð³Ð¾ Ð½Ð°Ð¿Ñ€Ñ�Ð¶ÐµÐ½Ð¸Ñ�
+tile.compactwindmills:windmill.name.LV.name=Ð’ÐµÑ‚Ñ€Ñ�Ð½Ð°Ñ� Ð¼ÐµÐ»ÑŒÐ½Ð¸Ñ†Ð° Ð½Ð¸Ð·ÐºÐ¾Ð³Ð¾ Ð½Ð°Ð¿Ñ€Ñ�Ð¶ÐµÐ½Ð¸Ñ�
+tile.compactwindmills:windmill.name.MV.name=Ð’ÐµÑ‚Ñ€Ñ�Ð½Ð°Ñ� Ð¼ÐµÐ»ÑŒÐ½Ð¸Ñ†Ð° Ñ�Ñ€ÐµÐ´Ð½ÐµÐ³Ð¾ Ð½Ð°Ð¿Ñ€Ñ�Ð¶ÐµÐ½Ð¸Ñ�
+tile.compactwindmills:windmill.name.HV.name=Ð’ÐµÑ‚Ñ€Ñ�Ð½Ð°Ñ� Ð¼ÐµÐ»ÑŒÐ½Ð¸Ñ†Ð° Ð²Ñ‹Ñ�Ð¾ÐºÐ¾Ð³Ð¾ Ð½Ð°Ð¿Ñ€Ñ�Ð¶ÐµÐ½Ð¸Ñ�
+tile.compactwindmills:windmill.name.EV.name=Ð’ÐµÑ‚Ñ€Ñ�Ð½Ð°Ñ� Ð¼ÐµÐ»ÑŒÐ½Ð¸Ñ†Ð° Ñ�ÐºÑ�Ñ‚Ñ€ÐµÐ¼Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ð½Ð°Ð¿Ñ€Ñ�Ð¶ÐµÐ½Ð¸Ñ�
 
 
-info.compactwindmills:tooltip.ticksleft=%s тактов осталось этому ротору.
-info.compactwindmills:tooltip.timeleft=%s часов, %s минут и %s секунд
-info.compactwindmills:tooltip.infinite=Бесконечно
-info.compactwindmills:tooltip.efficiency=Эффективность: %s
+info.compactwindmills:tooltip.ticksleft=%s Ñ‚Ð°ÐºÑ‚Ð¾Ð² Ð¾Ñ�Ñ‚Ð°Ð»Ð¾Ñ�ÑŒ Ñ�Ñ‚Ð¾Ð¼Ñƒ Ñ€Ð¾Ñ‚Ð¾Ñ€Ñƒ.
+info.compactwindmills:tooltip.timeleft=%s Ñ‡Ð°Ñ�Ð¾Ð², %s Ð¼Ð¸Ð½ÑƒÑ‚ Ð¸ %s Ñ�ÐµÐºÑƒÐ½Ð´
+info.compactwindmills:tooltip.infinite=Ð‘ÐµÑ�ÐºÐ¾Ð½ÐµÑ‡Ð½Ð¾
+info.compactwindmills:tooltip.efficiency=ÐÑ„Ñ„ÐµÐºÑ‚Ð¸Ð²Ð½Ð¾Ñ�Ñ‚ÑŒ: %s
 
-info.compactwindmills:gui.rotor=Ротор:
-info.compactwindmills:gui.output=Текущий выход: %s еЭ/т
+info.compactwindmills:gui.rotor=Ð Ð¾Ñ‚Ð¾Ñ€:
+info.compactwindmills:gui.output=Ð¢ÐµÐºÑƒÑ‰Ð¸Ð¹ Ð²Ñ‹Ñ…Ð¾Ð´: %s ÐµÐ/Ñ‚
 
-item.compactwindmills:rotor.WOOD=Деревянный ротор
-item.compactwindmills:rotor.WOOL=Тканевый ротор
-item.compactwindmills:rotor.CARBON=Углепластиковый ротор
-item.compactwindmills:rotor.ALLOY=Сверхпрочный ротор
-item.compactwindmills:rotor.IRIDIUM=Иридиевый ротор
+item.compactwindmills:rotor.WOOD.name=Ð”ÐµÑ€ÐµÐ²Ñ�Ð½Ð½Ñ‹Ð¹ Ñ€Ð¾Ñ‚Ð¾Ñ€
+item.compactwindmills:rotor.WOOL.name=Ð¢ÐºÐ°Ð½ÐµÐ²Ñ‹Ð¹ Ñ€Ð¾Ñ‚Ð¾Ñ€
+item.compactwindmills:rotor.CARBON.name=Ð£Ð³Ð»ÐµÐ¿Ð»Ð°Ñ�Ñ‚Ð¸ÐºÐ¾Ð²Ñ‹Ð¹ Ñ€Ð¾Ñ‚Ð¾Ñ€
+item.compactwindmills:rotor.ALLOY.name=Ð¡Ð²ÐµÑ€Ñ…Ð¿Ñ€Ð¾Ñ‡Ð½Ñ‹Ð¹ Ñ€Ð¾Ñ‚Ð¾Ñ€
+item.compactwindmills:rotor.IRIDIUM.name=Ð˜Ñ€Ð¸Ð´Ð¸ÐµÐ²Ñ‹Ð¹ Ñ€Ð¾Ñ‚Ð¾Ñ€
diff --git a/src/main/resources/assets/compactwindmills/lang/tr_TR.lang b/src/main/resources/assets/compactwindmills/lang/tr_TR.lang
@@ -1,11 +1,11 @@
 creativetab.compactwindmills:creativetab.name=CompactWindmills
 
 
-tile.compactwindmills:windmill.name.ELV=Aşırı Düşük Voltajlı Rüzgar Gülü
-tile.compactwindmills:windmill.name.LV=Düşük Voltajlı Rüzgar Gülü
-tile.compactwindmills:windmill.name.MV=Orta Voltajlı Rüzgar Gülü
-tile.compactwindmills:windmill.name.HV=Yüksek Voltajlı Rüzgar Gülü
-tile.compactwindmills:windmill.name.EV=Aşırı Yüksek Voltajlı Rüzgar Gülü
+tile.compactwindmills:windmill.name.ELV.name=Aşırı Düşük Voltajlı Rüzgar Gülü
+tile.compactwindmills:windmill.name.LV.name=Düşük Voltajlı Rüzgar Gülü
+tile.compactwindmills:windmill.name.MV.name=Orta Voltajlı Rüzgar Gülü
+tile.compactwindmills:windmill.name.HV.name=Yüksek Voltajlı Rüzgar Gülü
+tile.compactwindmills:windmill.name.EV.name=Aşırı Yüksek Voltajlı Rüzgar Gülü
 
 
 info.compactwindmills:tooltip.ticksleft=%s dönüşten sonra kırılacaktır.
@@ -16,8 +16,8 @@ info.compactwindmills:tooltip.efficiency=Verimlilik: %s
 info.compactwindmills:gui.rotor=Pervane:
 info.compactwindmills:gui.output=Güç Çıkışı: %s EU/t
 
-item.compactwindmills:rotor.WOOD=Tahta Pervane
-item.compactwindmills:rotor.WOOL=Yün Pervane
-item.compactwindmills:rotor.CARBON=Karbon Pervane
-item.compactwindmills:rotor.ALLOY=Alaşımlı Pervane
-item.compactwindmills:rotor.IRIDIUM=İridyum Pervane
+item.compactwindmills:rotor.WOOD.name=Tahta Pervane
+item.compactwindmills:rotor.WOOL.name=Yün Pervane
+item.compactwindmills:rotor.CARBON.name=Karbon Pervane
+item.compactwindmills:rotor.ALLOY.name=Alaşımlı Pervane
+item.compactwindmills:rotor.IRIDIUM.name=İridyum Pervane
diff --git a/src/main/resources/assets/compactwindmills/lang/zh_CN.lang b/src/main/resources/assets/compactwindmills/lang/zh_CN.lang
@@ -1,25 +1,25 @@
 #zh_CN
 
-creativetab.compactwindmills:creativetab.name=风力发电阵列
+creativetab.compactwindmills:creativetab.name=é£ŽåŠ›å�‘ç”µé˜µåˆ—
 
 
-tile.compactwindmills:windmill.name.ELV=超低压风力发电阵列
-tile.compactwindmills:windmill.name.LV=低压风力发电阵列
-tile.compactwindmills:windmill.name.MV=中压风力发电阵列
-tile.compactwindmills:windmill.name.HV=高压风力发电阵列
-tile.compactwindmills:windmill.name.EV=超高压风力发电阵列
+tile.compactwindmills:windmill.name.ELV.name=è¶…ä½ŽåŽ‹é£ŽåŠ›å�‘ç”µé˜µåˆ—
+tile.compactwindmills:windmill.name.LV.name=ä½ŽåŽ‹é£ŽåŠ›å�‘ç”µé˜µåˆ—
+tile.compactwindmills:windmill.name.MV.name=ä¸åŽ‹é£ŽåŠ›å�‘ç”µé˜µåˆ—
+tile.compactwindmills:windmill.name.HV.name=é«˜åŽ‹é£ŽåŠ›å�‘ç”µé˜µåˆ—
+tile.compactwindmills:windmill.name.EV.name=è¶…é«˜åŽ‹é£ŽåŠ›å�‘ç”µé˜µåˆ—
 
 
-info.compactwindmills:tooltip.ticksleft=该转子还可继续使用%s ticks.
-info.compactwindmills:tooltip.timeleft=%s 时, %s 分, %s 秒
-info.compactwindmills:tooltip.infinite=无限
-info.compactwindmills:tooltip.efficiency=效率: %s
+info.compactwindmills:tooltip.ticksleft=è¯¥è½¬å�è¿˜å�¯ç»§ç»ä½¿ç”¨%s ticks.
+info.compactwindmills:tooltip.timeleft=%s æ—¶, %s åˆ†, %s ç§’
+info.compactwindmills:tooltip.infinite=æ— é™�
+info.compactwindmills:tooltip.efficiency=æ•ˆçŽ‡: %s
 
-info.compactwindmills:gui.rotor=转子:
-info.compactwindmills:gui.output=当前输出: %s EU/t
+info.compactwindmills:gui.rotor=è½¬å�:
+info.compactwindmills:gui.output=å½“å‰�è¾“å‡º: %s EU/t
 
-item.compactwindmills:rotor.WOOD=木头转子
-item.compactwindmills:rotor.WOOL=羊毛转子
-item.compactwindmills:rotor.CARBON=碳转子
-item.compactwindmills:rotor.ALLOY=合金转子
-item.compactwindmills:rotor.IRIDIUM=铱转子
+item.compactwindmills:rotor.WOOD.name=æœ¨å¤´è½¬å�
+item.compactwindmills:rotor.WOOL.name=ç¾Šæ¯›è½¬å�
+item.compactwindmills:rotor.CARBON.name=ç¢³è½¬å�
+item.compactwindmills:rotor.ALLOY.name=å�ˆé‡‘è½¬å�
+item.compactwindmills:rotor.IRIDIUM.name=é“±è½¬å�