文字コードをSJISからUTF8へ

[chemicraft/chemicraft.git] / src / ChemiCraft.java

diff --git a/src/ChemiCraft.java b/src/ChemiCraft.java
index 905682b..7093007 100644 (file)
--- a/src/ChemiCraft.java
+++ b/src/ChemiCraft.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Properties;\r
 \r
 import net.minecraft.src.Block;\r
 import java.util.Properties;\r
 \r
 import net.minecraft.src.Block;\r

+import net.minecraft.src.CreativeTabs;\r

 import net.minecraft.src.Item;\r
 import net.minecraft.src.ItemStack;\r
 import net.minecraftforge.common.Configuration;\r
 import net.minecraft.src.Item;\r
 import net.minecraft.src.ItemStack;\r
 import net.minecraftforge.common.Configuration;\r


@@ -22,6 +23,8 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
 public class ChemiCraft\r
 {\r
 \r
 public class ChemiCraft\r
 {\r
 \r

+       public static final CreativeTabs tabAtoms = new CreativeTabAtoms("tabAtoms");\r
+\r

        public static final String[] atomsName = {\r
                "Hydrogen", "Helium","Lithium","Beryllium","Boron","Carbon","Nitrogen","Oxygen","Fluorine","Neon",\r
                "Sodium","Magnesium","Aluminium","Silicon","Phosphorus","Sulfur","Chlorine","Argon","Potassium","Calcium",\r
        public static final String[] atomsName = {\r
                "Hydrogen", "Helium","Lithium","Beryllium","Boron","Carbon","Nitrogen","Oxygen","Fluorine","Neon",\r
                "Sodium","Magnesium","Aluminium","Silicon","Phosphorus","Sulfur","Chlorine","Argon","Potassium","Calcium",\r


@@ -38,14 +41,27 @@ public class ChemiCraft
        };\r
 \r
        public static final String[] atomsNameJP = {\r
        };\r
 \r
        public static final String[] atomsNameJP = {\r

-               "\90\85\91f", "\83w\83\8a\83E\83\80"\r
+               "\90\85\91f", "\83w\83\8a\83E\83\80", "\83\8a\83`\83E\83\80", "\83x\83\8a\83E\83\80", "\83z\83E\91f", "\92Y\91f", "\92\82\91f", "\8e_\91f", "\83t\83b\91f", "\83l\83I\83\93",\r
+               "\83i\83g\83\8a\83E\83\80", "\83}\83O\83l\83V\83E\83\80", "\83A\83\8b\83~\83j\83E\83\80", "\83P\83C\91f", "\83\8a\83\93", "\97°\89©", "\89\96\91f", "\83A\83\8b\83S\83\93", "\83J\83\8a\83E\83\80", "\83J\83\8b\83V\83E\83\80",\r
+               "\83X\83J\83\93\83W\83E\83\80", "\83`\83^\83\93", "\83o\83i\83W\83E\83\80", "\83N\83\8d\83\80", "\83}\83\93\83K\83\93", "\93S", "\83R\83o\83\8b\83g", "\83j\83b\83P\83\8b", "\93º", "\88\9f\89\94",\r
+               "\83K\83\8a\83E\83\80", "\83Q\83\8b\83}\83j\83E\83\80", "\83q\91f", "\83Z\83\8c\83\93", "\8fL\91f", "\83N\83\8a\83v\83g\83\93", "\83\8b\83r\83W\83E\83\80", "\83X\83g\83\8d\83\93\83`\83E\83\80", "\83C\83b\83g\83\8a\83E\83\80", "\83W\83\8b\83R\83j\83E\83\80",\r
+               "\83j\83I\83u", "\83\82\83\8a\83u\83f\83\93", "\83e\83N\83l\83`\83E\83\80", "\83\8b\83e\83j\83E\83\80", "\83\8d\83W\83E\83\80", "\83p\83\89\83W\83E\83\80", "\8bâ", "\83J\83h\83~\83E\83\80", "\83C\83\93\83W\83E\83\80", "\83X\83Y",\r
+               "\83A\83\93\83`\83\82\83\93", "\83e\83\8b\83\8b", "\83\88\83E\91f", "\83L\83Z\83m\83\93", "\83Z\83V\83E\83\80", "\83o\83\8a\83E\83\80", "\83\89\83\93\83^\83\93", "\83Z\83\8a\83E\83\80", "\83v\83\89\83Z\83I\83W\83\80", "\83l\83I\83W\83\80",\r
+               "\83v\83\8d\83\81\83`\83E\83\80", "\83T\83}\83\8a\83E\83\80", "\83\86\83E\83\8d\83r\83E\83\80", "\83K\83h\83\8a\83j\83E\83\80", "\83e\83\8b\83r\83E\83\80", "\83W\83X\83v\83\8d\83j\83E\83\80", "\83z\83\8b\83~\83E\83\80", "\83G\83\8b\83r\83E\83\80", "\83c\83\8a\83E\83\80", "\83C\83b\83e\83\8b\83r\83E\83\80",\r
+               "\83\8b\83e\83`\83E\83\80", "\83n\83t\83j\83E\83\80", "\83^\83\93\83^\83\8b", "\83^\83\93\83O\83X\83e\83\93", "\83\8c\83j\83E\83\80", "\83I\83X\83~\83E\83\80", "\83C\83\8a\83W\83E\83\80", "\94\92\8bà", "\8bà", "\90\85\8bâ",\r
+               "\83^\83\8a\83E\83\80", "\89\94", "\83r\83X\83}\83X", "\83|\83\8d\83j\83E\83\80", "\83A\83X\83^\83`\83\93", "\83\89\83h\83\93", "\83t\83\89\83\93\83V\83E\83\80", "\83\89\83W\83E\83\80", "\83A\83N\83`\83j\83E\83\80", "\83g\83\8a\83E\83\80",\r
+               "\83v\83\8d\83g\83A\83N\83`\83E\83\80", "\83E\83\89\83\93", "\83l\83v\83c\83j\83E\83\80", "\83v\83\8b\83g\83j\83E\83\80", "\83A\83\81\83\8a\83V\83E\83\80", "\83L\83\85\83\8a\83E\83\80", "\83o\81[\83N\83\8a\83E\83\80", "\83J\83\8b\83z\83\8b\83j\83E\83\80", "\83A\83C\83\93\83X\83^\83C\83j\83E\83\80", "\83t\83F\83\8b\83~\83E\83\80",\r
+               "\83\81\83\93\83f\83\8c\83r\83E\83\80", "\83m\81[\83x\83\8a\83E\83\80", "\83\8d\81[\83\8c\83\93\83V\83E\83\80", "\83\89\83T\83z\81[\83W\83E\83\80", "\83h\83u\83j\83E\83\80", "\83V\81[\83{\81[\83M\83E\83\80", "\83{\81[\83\8a\83E\83\80", "\83n\83b\83V\83E\83\80", "\83}\83C\83g\83l\83\8a\83E\83\80", "\83_\81[\83\80\83X\83^\83`\83E\83\80",\r
+               "\83\8c\83\93\83g\83Q\83j\83E\83\80", "\83R\83y\83\8b\83j\83V\83E\83\80", "\83E\83\93\83E\83\93\83g\83\8a\83E\83\80", "\83t\83\8c\83\8d\83r\83E\83\80", "\83E\83\93\83E\83\93\83y\83\93\83`\83E\83\80", "\83\8a\83o\83\82\83\8a\83E\83\80", "\83E\83\93\83E\83\93\83Z\83v\83`\83E\83\80", "\83E\83\93\83E\83\93\83I\83N\83`\83E\83\80"\r

        };\r
 \r
        private ChemiCraftAPI chemiCraftAPI = ChemiCraftAPI.instance;\r
 \r
        };\r
 \r
        private ChemiCraftAPI chemiCraftAPI = ChemiCraftAPI.instance;\r
 \r

+       public static int gasCollectingBottleID;\r

        public static int atomsID;\r
        public static int compoundsID;\r
 \r
        public static int atomsID;\r
        public static int compoundsID;\r
 \r

+       public static Item itemGasCollectingBottle;\r

        public static Item itemAtoms;\r
        public static Item itemCompounds;\r
 \r
        public static Item itemAtoms;\r
        public static Item itemCompounds;\r
 \r


@@ -56,8 +72,9 @@ public class ChemiCraft
        @Mod.Init\r
        public void chemiLoadMethod(FMLInitializationEvent event)\r
        {\r
        @Mod.Init\r
        public void chemiLoadMethod(FMLInitializationEvent event)\r
        {\r

+\r

                //\89»\8d\87\95¨\82Ì\92Ç\89Á\r
                //\89»\8d\87\95¨\82Ì\92Ç\89Á\r

-               ChemiCraftAPI.addLangCompound("ja_JP", "Salt", "\89\96(\89\96\89»\83i\83g\83\8a\83E\83\80)");\r
+               ChemiCraftAPI.addLangCompound("ja_JP", "Salt", "\89\96");\r

        }\r
 \r
        @Mod.PreInit  // \91O\8f\88\97\9d\r
        }\r
 \r
        @Mod.PreInit  // \91O\8f\88\97\9d\r


@@ -65,8 +82,10 @@ public class ChemiCraft
        {\r
                Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());\r
                cfg.load();\r
        {\r
                Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());\r
                cfg.load();\r

-               Property atomsIDProp = cfg.getItem("atomsID", 25000);\r
-               Property compoundsIDProp = cfg.getItem("compoundsID", 25001);\r
+               Property gasCollectingBottleIDProp = cfg.getItem("gasCollectingBottleID", 25000);\r
+               Property atomsIDProp = cfg.getItem("atomsID", 25001);\r
+               Property compoundsIDProp = cfg.getItem("compoundsID", 25002);\r
+               gasCollectingBottleID = gasCollectingBottleIDProp.getInt();\r

                atomsID = atomsIDProp.getInt();\r
                compoundsID = compoundsIDProp.getInt();\r
                cfg.save();\r
                atomsID = atomsIDProp.getInt();\r
                compoundsID = compoundsIDProp.getInt();\r
                cfg.save();\r


@@ -75,13 +94,16 @@ public class ChemiCraft
        @Mod.PostInit // ModLoader.load\83\81\83\\83b\83h\82Æ\93¯\93\99\r
        public void chemiPostLoadMethod(FMLPostInitializationEvent event)\r
        {\r
        @Mod.PostInit // ModLoader.load\83\81\83\\83b\83h\82Æ\93¯\93\99\r
        public void chemiPostLoadMethod(FMLPostInitializationEvent event)\r
        {\r

+               itemGasCollectingBottle = new ItemGasCollectingBottle(gasCollectingBottleID).setItemName("gasCollectingBottle");\r

                itemAtoms = new ItemAtoms(atomsID).setItemName("atoms");\r
                itemCompounds = new ItemCompounds(compoundsID).setItemName("compounds");\r
 \r
                itemAtoms = new ItemAtoms(atomsID).setItemName("atoms");\r
                itemCompounds = new ItemCompounds(compoundsID).setItemName("compounds");\r
 \r

-               NameAuxiliary.addForName(itemAtoms, atomsName);\r
-               NameAuxiliary.addForLangName(itemAtoms, "ja_JP", atomsNameJP);\r
-               NameAuxiliary.addForName(itemCompounds, ChemiCraftAPI.getCompoundsName().toArray());\r
-               NameAuxiliary.addForLangName(itemCompounds, "ja_JP", ChemiCraftAPI.getCompoundsLangName().toArray());\r
+               NameAuxiliary.addName(itemAtoms, atomsName);\r
+               NameAuxiliary.addName(itemAtoms, "ja_JP", atomsNameJP);\r
+               NameAuxiliary.addName(itemCompounds, ChemiCraftAPI.getCompoundsName().toArray());\r
+               NameAuxiliary.addName(itemCompounds, "ja_JP", ChemiCraftAPI.getCompoundsLangName().toArray());\r
+               NameAuxiliary.addName(itemGasCollectingBottle, "GasCollectingBottle");\r
+               NameAuxiliary.addName(itemGasCollectingBottle, "ja_JP", "\8fW\8bC\95r");\r

 \r
                ChemiCraftAPI.addCompoundHandler("Salt", new CompoundHandlerTest());\r
 \r
 \r
                ChemiCraftAPI.addCompoundHandler("Salt", new CompoundHandlerTest());\r
 \r