X-Git-Url: http://git.sourceforge.jp/view?p=chemicraft%2Fchemicraft.git;a=blobdiff_plain;f=src%2FChemiCraft.java;h=70930071514e628db073bc8c84151d779dd1c739;hp=905682bcdebbecf806358f1a964fad3b88da82e2;hb=790bfd36625cd873213ab1e7b162a39226be5405;hpb=556edcd0ce173618dd6c90bbb6a857d6c1ff64fb;ds=sidebyside

diff --git a/src/ChemiCraft.java b/src/ChemiCraft.java
index 905682b..7093007 100644
--- a/src/ChemiCraft.java
+++ b/src/ChemiCraft.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Properties;
 
 import net.minecraft.src.Block;
+import net.minecraft.src.CreativeTabs;
 import net.minecraft.src.Item;
 import net.minecraft.src.ItemStack;
 import net.minecraftforge.common.Configuration;
@@ -22,6 +23,8 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
 public class ChemiCraft
 {
 
+	public static final CreativeTabs tabAtoms = new CreativeTabAtoms("tabAtoms");
+
 	public static final String[] atomsName = {
 		"Hydrogen", "Helium","Lithium","Beryllium","Boron","Carbon","Nitrogen","Oxygen","Fluorine","Neon",
 		"Sodium","Magnesium","Aluminium","Silicon","Phosphorus","Sulfur","Chlorine","Argon","Potassium","Calcium",
@@ -38,14 +41,27 @@ public class ChemiCraft
 	};
 
 	public static final String[] atomsNameJP = {
-		"f", "wE"
+		"f", "wE", "`E", "xE", "zEf", "Yf", "f", "_f", "tbf", "lI",
+		"igE", "}OlVE", "A~jE", "PCf", "", "°©", "f", "AS", "JE", "JVE",
+		"XJWE", "`^", "oiWE", "N", "}K", "S", "Rog", "jbP", "º", "",
+		"KE", "Q}jE", "qf", "Z", "Lf", "Nvg", "rWE", "Xg`E", "CbgE", "WRjE",
+		"jIu", "uf", "eNl`E", "ejE", "WE", "pWE", "â", "Jh~E", "CWE", "XY",
+		"A`", "e", "Ef", "LZm", "ZVE", "oE", "^", "ZE", "vZIW", "lIW",
+		"v`E", "T}E", "ErE", "KhjE", "erE", "WXvjE", "z~E", "GrE", "cE", "CberE",
+		"e`E", "ntjE", "^^", "^OXe", "jE", "IX~E", "CWE", "à", "à", "â",
+		"^E", "", "rX}X", "|jE", "AX^`", "h", "tVE", "WE", "AN`jE", "gE",
+		"vgAN`E", "E", "lvcjE", "vgjE", "AVE", "LE", "o[NE", "JzjE", "ACX^CjE", "tF~E",
+		"frE", "m[xE", "[VE", "Tz[WE", "hujE", "V[{[ME", "{[E", "nbVE", "}CglE", "_[X^`E",
+		"gQjE", "RyjVE", "EEgE", "trE", "EEy`E", "oE", "EEZv`E", "EEIN`E"
 	};
 
 	private ChemiCraftAPI chemiCraftAPI = ChemiCraftAPI.instance;
 
+	public static int gasCollectingBottleID;
 	public static int atomsID;
 	public static int compoundsID;
 
+	public static Item itemGasCollectingBottle;
 	public static Item itemAtoms;
 	public static Item itemCompounds;
 
@@ -56,8 +72,9 @@ public class ChemiCraft
 	@Mod.Init
 	public void chemiLoadMethod(FMLInitializationEvent event)
 	{
+
 		//»¨ÌÇÁ
-		ChemiCraftAPI.addLangCompound("ja_JP", "Salt", "(»igE)");
+		ChemiCraftAPI.addLangCompound("ja_JP", "Salt", "");
 	}
 
 	@Mod.PreInit  // O
@@ -65,8 +82,10 @@ public class ChemiCraft
 	{
 		Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());
 		cfg.load();
-		Property atomsIDProp = cfg.getItem("atomsID", 25000);
-		Property compoundsIDProp = cfg.getItem("compoundsID", 25001);
+		Property gasCollectingBottleIDProp = cfg.getItem("gasCollectingBottleID", 25000);
+		Property atomsIDProp = cfg.getItem("atomsID", 25001);
+		Property compoundsIDProp = cfg.getItem("compoundsID", 25002);
+		gasCollectingBottleID = gasCollectingBottleIDProp.getInt();
 		atomsID = atomsIDProp.getInt();
 		compoundsID = compoundsIDProp.getInt();
 		cfg.save();
@@ -75,13 +94,16 @@ public class ChemiCraft
 	@Mod.PostInit // ModLoader.load\bhÆ¯
 	public void chemiPostLoadMethod(FMLPostInitializationEvent event)
 	{
+		itemGasCollectingBottle = new ItemGasCollectingBottle(gasCollectingBottleID).setItemName("gasCollectingBottle");
 		itemAtoms = new ItemAtoms(atomsID).setItemName("atoms");
 		itemCompounds = new ItemCompounds(compoundsID).setItemName("compounds");
 
-		NameAuxiliary.addForName(itemAtoms, atomsName);
-		NameAuxiliary.addForLangName(itemAtoms, "ja_JP", atomsNameJP);
-		NameAuxiliary.addForName(itemCompounds, ChemiCraftAPI.getCompoundsName().toArray());
-		NameAuxiliary.addForLangName(itemCompounds, "ja_JP", ChemiCraftAPI.getCompoundsLangName().toArray());
+		NameAuxiliary.addName(itemAtoms, atomsName);
+		NameAuxiliary.addName(itemAtoms, "ja_JP", atomsNameJP);
+		NameAuxiliary.addName(itemCompounds, ChemiCraftAPI.getCompoundsName().toArray());
+		NameAuxiliary.addName(itemCompounds, "ja_JP", ChemiCraftAPI.getCompoundsLangName().toArray());
+		NameAuxiliary.addName(itemGasCollectingBottle, "GasCollectingBottle");
+		NameAuxiliary.addName(itemGasCollectingBottle, "ja_JP", "WCr");
 
 		ChemiCraftAPI.addCompoundHandler("Salt", new CompoundHandlerTest());