OSDN Git Service

Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft
authormozipi <mozipi@users.sourceforge.jp>
Sat, 15 Dec 2012 22:57:57 +0000 (07:57 +0900)
committermozipi <mozipi@users.sourceforge.jp>
Sat, 15 Dec 2012 22:57:57 +0000 (07:57 +0900)
common/chemicraft/Auxiliary.java
common/chemicraft/ItemAtoms.java
common/chemicraft/ItemCompounds.java
resources/chemicraft/guis/ChemicalCombination.png

index 429d931..5444115 100644 (file)
@@ -1,4 +1,4 @@
-package chemicraft;\r
+package landminecraft;\r
 \r
 import net.minecraft.src.Block;\r
 import net.minecraft.src.Item;\r
@@ -111,6 +111,58 @@ public class Auxiliary {
                        }\r
                }\r
 \r
+               /**\r
+                * 指定された言語にそってメタデータごとに名前を設定します(Block版)\r
+                * また、配列の前に任意の文字列を追加できます。\r
+                * @param object\r
+                * @param name\r
+                */\r
+               public void addName(Block object,String lang, String string, Object[] name){\r
+                       for(int i=0;i<name.length;i++){\r
+                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, string + (String) name[i]);\r
+                       }\r
+               }\r
+\r
+\r
+\r
+               /**\r
+                * 指定された言語にそってメタデータごとに名前を設定します(Item版)\r
+                * また、配列の前に任意の文字列を追加できます。\r
+                * @param object\r
+                * @param name\r
+                */\r
+               public void addName(Item object,String lang, String string, Object[] name){\r
+                       for(int i=0;i<name.length;i++){\r
+                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, string + (String) name[i]);\r
+                       }\r
+               }\r
+\r
+               /**\r
+                * 指定された言語にそってメタデータごとに名前を設定します(Block版)\r
+                * また、配列の後ろに任意の文字列を追加できます。\r
+                * @param object\r
+                * @param name\r
+                */\r
+               public void addName(Block object,String lang, Object[] name, String string){\r
+                       for(int i=0;i<name.length;i++){\r
+                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, (String) name[i] + string);\r
+                       }\r
+               }\r
+\r
+\r
+\r
+               /**\r
+                * 指定された言語にそってメタデータごとに名前を設定します(Item版)\r
+                * また、配列の後ろに任意の文字列を追加できます。\r
+                * @param object\r
+                * @param name\r
+                */\r
+               public void addName(Item object,String lang, Object[] name, String string){\r
+                       for(int i=0;i<name.length;i++){\r
+                               LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, (String) name[i] + string);\r
+                       }\r
+               }\r
+\r
        }\r
 \r
 }\r
index d115044..c5d5293 100644 (file)
@@ -44,7 +44,7 @@ public class ItemAtoms extends Item {
 
        @Override
        public String getTextureFile(){
-               return "/ChemiCraft/items/Atoms.png";
+               return "/resource/chemicraft/items/Atoms.png";
        }
 
 
index 6aa52fc..aac036a 100644 (file)
@@ -56,7 +56,7 @@ public class ItemCompounds extends Item {
 
        @Override
        public String getTextureFile(){
-               return "/ChemiCraft/items/Compounds.png";
+               return "/resource/chemicraft/items/Compounds.png";
        }
 
 
index cd1922d..5f9a66b 100644 (file)
Binary files a/resources/chemicraft/guis/ChemicalCombination.png and b/resources/chemicraft/guis/ChemicalCombination.png differ