From 937955a20e1f5608cc7526f962297f1a4ea051c6 Mon Sep 17 00:00:00 2001
From: lilly <lillyo_o@users.sourceforge.jp>
Date: Wed, 5 Dec 2012 23:33:52 +0900
Subject: [PATCH] =?utf8?q?=E3=83=91=E3=83=83=E3=82=B1=E3=83=BC=E3=82=B8?=
 =?utf8?q?=E3=81=AE=E5=A4=A7=E5=B9=85=E3=81=AA=E5=A4=89=E6=9B=B4=20?=
 =?utf8?q?=E7=B7=A8=E9=9B=86=E3=81=99=E3=82=8B=E3=81=A8=E3=81=8D=E3=81=AF?=
 =?utf8?q?=E5=BF=85=E3=81=9A=E3=83=97=E3=83=AB=E3=81=97=E3=81=A6=E3=81=8F?=
 =?utf8?q?=E3=81=A0=E3=81=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: lilly <lillyo_o@users.sourceforge.jp>
---
 {chemicraft => common/chemicraft}/AtomInfo.java    |   0
 {chemicraft => common/chemicraft}/Auxiliary.java   |   0
 {chemicraft => common/chemicraft}/ChemiCraft.java  |  10 ++
 .../chemicraft}/ChemiCraftAPI.java                 |   0
 common/chemicraft/CommonProxy.java                 |  31 ++++++
 .../chemicraft}/CompoundHandlerTest.java           |   0
 .../chemicraft}/CreativeTabAtoms.java              |   0
 .../chemicraft}/ICompoundHandler.java              |   0
 {chemicraft => common/chemicraft}/ItemAtoms.java   |   0
 .../chemicraft}/ItemCompounds.java                 |   0
 .../chemicraft}/ItemGasCollectingBottle.java       |   0
 .../chemicraft}/PacketHandler.java                 |  39 +++----
 src/AtomInfo.java                                  |  93 -----------------
 src/Auxiliary.java                                 | 100 ------------------
 src/ChemiCraft.java                                | 112 ---------------------
 src/ChemiCraftAPI.java                             |  59 -----------
 src/CompoundHandlerTest.java                       |  28 ------
 src/CreativeTabAtoms.java                          |  28 ------
 src/ICompoundHandler.java                          |  16 ---
 src/ItemAtoms.java                                 |  54 ----------
 src/ItemCompounds.java                             |  65 ------------
 src/ItemGasCollectingBottle.java                   |  32 ------
 src/chemicraft/client/ClientProxy.java             |  29 ++++++
 23 files changed, 92 insertions(+), 604 deletions(-)
 rename {chemicraft => common/chemicraft}/AtomInfo.java (100%)
 rename {chemicraft => common/chemicraft}/Auxiliary.java (100%)
 rename {chemicraft => common/chemicraft}/ChemiCraft.java (93%)
 rename {chemicraft => common/chemicraft}/ChemiCraftAPI.java (100%)
 create mode 100644 common/chemicraft/CommonProxy.java
 rename {chemicraft => common/chemicraft}/CompoundHandlerTest.java (100%)
 rename {chemicraft => common/chemicraft}/CreativeTabAtoms.java (100%)
 rename {chemicraft => common/chemicraft}/ICompoundHandler.java (100%)
 rename {chemicraft => common/chemicraft}/ItemAtoms.java (100%)
 rename {chemicraft => common/chemicraft}/ItemCompounds.java (100%)
 rename {chemicraft => common/chemicraft}/ItemGasCollectingBottle.java (100%)
 rename {chemicraft => common/chemicraft}/PacketHandler.java (74%)
 delete mode 100644 src/AtomInfo.java
 delete mode 100644 src/Auxiliary.java
 delete mode 100644 src/ChemiCraft.java
 delete mode 100644 src/ChemiCraftAPI.java
 delete mode 100644 src/CompoundHandlerTest.java
 delete mode 100644 src/CreativeTabAtoms.java
 delete mode 100644 src/ICompoundHandler.java
 delete mode 100644 src/ItemAtoms.java
 delete mode 100644 src/ItemCompounds.java
 delete mode 100644 src/ItemGasCollectingBottle.java
 create mode 100644 src/chemicraft/client/ClientProxy.java

diff --git a/chemicraft/AtomInfo.java b/common/chemicraft/AtomInfo.java
similarity index 100%
rename from chemicraft/AtomInfo.java
rename to common/chemicraft/AtomInfo.java
diff --git a/chemicraft/Auxiliary.java b/common/chemicraft/Auxiliary.java
similarity index 100%
rename from chemicraft/Auxiliary.java
rename to common/chemicraft/Auxiliary.java
diff --git a/chemicraft/ChemiCraft.java b/common/chemicraft/ChemiCraft.java
similarity index 93%
rename from chemicraft/ChemiCraft.java
rename to common/chemicraft/ChemiCraft.java
index 591f4da..f9ea799 100644
--- a/chemicraft/ChemiCraft.java
+++ b/common/chemicraft/ChemiCraft.java
@@ -10,6 +10,8 @@ import net.minecraft.src.ItemStack;
 import net.minecraftforge.common.Configuration;
 import net.minecraftforge.common.Property;
 import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.Mod.Instance;
+import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
@@ -55,6 +57,14 @@ public class ChemiCraft
 		"レントゲニウム", "コペルニシウム", "ウンウントリウム", "フレロビウム", "ウンウンペンチウム", "リバモリウム", "ウンウンセプチウム", "ウンウンオクチウム"
 	};
 
+	// プロキシ
+	@SidedProxy(clientSide = "chemicraft.client.ClientProxy", serverSide = "chemicraft.CommonProxy")
+	public static CommonProxy proxy;
+	
+	// このクラスのインスタンス
+	@Instance("chemiCraft")
+	public static ChemiCraft instance;
+	
 	private ChemiCraftAPI chemiCraftAPI = ChemiCraftAPI.instance;
 
 	public static int gasCollectingBottleID;
diff --git a/chemicraft/ChemiCraftAPI.java b/common/chemicraft/ChemiCraftAPI.java
similarity index 100%
rename from chemicraft/ChemiCraftAPI.java
rename to common/chemicraft/ChemiCraftAPI.java
diff --git a/common/chemicraft/CommonProxy.java b/common/chemicraft/CommonProxy.java
new file mode 100644
index 0000000..1dcc5a3
--- /dev/null
+++ b/common/chemicraft/CommonProxy.java
@@ -0,0 +1,31 @@
+package chemicraft;
+
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.World;
+import cpw.mods.fml.common.network.IGuiHandler;
+
+public class CommonProxy implements IGuiHandler
+{
+
+	public void registerRenderInformation()
+	{
+
+	}
+
+	@Override
+	public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
+	{
+		return null;
+	}
+
+	@Override
+	public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
+	{
+		return null;
+	}
+
+	public World getClientWorld()
+	{
+		return null;
+	}
+}
diff --git a/chemicraft/CompoundHandlerTest.java b/common/chemicraft/CompoundHandlerTest.java
similarity index 100%
rename from chemicraft/CompoundHandlerTest.java
rename to common/chemicraft/CompoundHandlerTest.java
diff --git a/chemicraft/CreativeTabAtoms.java b/common/chemicraft/CreativeTabAtoms.java
similarity index 100%
rename from chemicraft/CreativeTabAtoms.java
rename to common/chemicraft/CreativeTabAtoms.java
diff --git a/chemicraft/ICompoundHandler.java b/common/chemicraft/ICompoundHandler.java
similarity index 100%
rename from chemicraft/ICompoundHandler.java
rename to common/chemicraft/ICompoundHandler.java
diff --git a/chemicraft/ItemAtoms.java b/common/chemicraft/ItemAtoms.java
similarity index 100%
rename from chemicraft/ItemAtoms.java
rename to common/chemicraft/ItemAtoms.java
diff --git a/chemicraft/ItemCompounds.java b/common/chemicraft/ItemCompounds.java
similarity index 100%
rename from chemicraft/ItemCompounds.java
rename to common/chemicraft/ItemCompounds.java
diff --git a/chemicraft/ItemGasCollectingBottle.java b/common/chemicraft/ItemGasCollectingBottle.java
similarity index 100%
rename from chemicraft/ItemGasCollectingBottle.java
rename to common/chemicraft/ItemGasCollectingBottle.java
diff --git a/chemicraft/PacketHandler.java b/common/chemicraft/PacketHandler.java
similarity index 74%
rename from chemicraft/PacketHandler.java
rename to common/chemicraft/PacketHandler.java
index f591727..13c01a2 100644
--- a/chemicraft/PacketHandler.java
+++ b/common/chemicraft/PacketHandler.java
@@ -1,17 +1,22 @@
-package chemicraft;
-
-import net.minecraft.src.NetworkManager;
-import net.minecraft.src.Packet250CustomPayload;
-import cpw.mods.fml.common.network.IPacketHandler;
-import cpw.mods.fml.common.network.Player;
-
-public class PacketHandler implements IPacketHandler
-{
-
-	@Override
-	public void onPacketData(NetworkManager manager, Packet250CustomPayload packet, Player player)
-	{
-
-	}
-
-}
+package chemicraft;
+
+import net.minecraft.src.NetworkManager;
+import net.minecraft.src.Packet250CustomPayload;
+import cpw.mods.fml.common.network.IPacketHandler;
+import cpw.mods.fml.common.network.Player;
+
+/**
+ * サーバーとクライアントのデータの同期に必要なクラス
+ * @author Lilly
+ *
+ */
+public class PacketHandler implements IPacketHandler
+{
+
+	@Override
+	public void onPacketData(NetworkManager manager, Packet250CustomPayload packet, Player player)
+	{
+
+	}
+
+}
diff --git a/src/AtomInfo.java b/src/AtomInfo.java
deleted file mode 100644
index c26a475..0000000
--- a/src/AtomInfo.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package net.minecraft.src.ChemiCraft;
-
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.World;
-
-public class AtomInfo {
-
-	protected static int posX;
-	protected static int posY;
-	protected static int posZ;
-	protected static String biomeName;
-	protected static String weather;
-
-	public AtomInfo(World par1World, EntityPlayer par2EntityPlayer){
-
-		this.biomeName = par1World.getBiomeGenForCoords(posX, posZ).biomeName;
-
-		this.posX = (int) par2EntityPlayer.posX; // XÀ•W
-		this.posY = (int) par2EntityPlayer.posY; // YÀ•W
-		this.posZ = (int) par2EntityPlayer.posZ; // ZÀ•W
-
-		boolean rainy = par1World.isRaining();
-		boolean thunder = par1World.isThundering();
-		if (rainy && thunder){ // ‰JŠŽ‚—‹
-			this.weather = "THUNDER";
-		}else if(rainy){ // ‰J‚Ü‚½‚͐á
-			this.weather = "RAINY";
-		}else{ //°‚ê
-			this.weather = "SUNNY";
-		}
-	}
-
-	/**
-	 * YÀ•W‚Æ‚Ì”äŠr
-	 * @param EntityPlayer EntityPlayer
-	 * @param y YÀ•W
-	 * @param biomeName ƒoƒCƒI[ƒ€‚Ì–¼‘O(null‚Å‚à‰Â)
-	 * @param weather “V‹C(null‚Å‚à‰Â)
-	 * @param par1 “üŽè”
-	 * @param par2 Ží—Þ(ƒ_ƒ[ƒW’l)
-	 */
-	private boolean equivalentBiome(String biomeName){
-		boolean ver1 = biomeName != null ? ((this.biomeName == biomeName) ? true : false) : true;
-		return ver1;
-	}
-	private boolean equivalentWeather(String weather){
-		boolean ver1 = weather != null ? ((this.weather == weather) ? true : false) : true;
-		return ver1;
-	}
-
-	protected void overY(EntityPlayer EntityPlayer, int y, String biomeName, String weather, int par1, int par2){
-		if(this.posY >= y && this.equivalentBiome(biomeName) && this.equivalentWeather(weather)){
-			if (!EntityPlayer.inventory.addItemStackToInventory(new ItemStack(ChemiCraft.itemAtoms, par1, par2)))
-			{
-				EntityPlayer.dropPlayerItem(new ItemStack(ChemiCraft.itemAtoms.shiftedIndex, par1, par2));
-			}
-		}
-	}
-	protected void aboveY(EntityPlayer EntityPlayer, int y, String biomeName, String weather, int par1, int par2){
-		if(this.posY > y && this.equivalentBiome(biomeName) && this.equivalentWeather(weather)){
-			if (!EntityPlayer.inventory.addItemStackToInventory(new ItemStack(ChemiCraft.itemAtoms, par1, par2)))
-			{
-				EntityPlayer.dropPlayerItem(new ItemStack(ChemiCraft.itemAtoms.shiftedIndex, par1, par2));
-			}
-		}
-	}
-	protected void equivalentY(EntityPlayer EntityPlayer, int y, String biomeName, String weather, int par1, int par2){
-		if(this.posY == y && this.equivalentBiome(biomeName) && this.equivalentWeather(weather)){
-			if (!EntityPlayer.inventory.addItemStackToInventory(new ItemStack(ChemiCraft.itemAtoms, par1, par2)))
-			{
-				EntityPlayer.dropPlayerItem(new ItemStack(ChemiCraft.itemAtoms.shiftedIndex, par1, par2));
-			}
-		}
-	}
-	protected void lessY(EntityPlayer EntityPlayer, int y, String biomeName, String weather, int par1, int par2){
-		if(this.posY < y && this.equivalentBiome(biomeName) && this.equivalentWeather(weather)){
-			if (!EntityPlayer.inventory.addItemStackToInventory(new ItemStack(ChemiCraft.itemAtoms, par1, par2)))
-			{
-				EntityPlayer.dropPlayerItem(new ItemStack(ChemiCraft.itemAtoms.shiftedIndex, par1, par2));
-			}
-		}
-	}
-	protected void belowY(EntityPlayer EntityPlayer, int y, String biomeName, String weather, int par1, int par2){
-		if(this.posY <= y && this.equivalentBiome(biomeName) && this.equivalentWeather(weather)){
-			if (!EntityPlayer.inventory.addItemStackToInventory(new ItemStack(ChemiCraft.itemAtoms, par1, par2)))
-			{
-				EntityPlayer.dropPlayerItem(new ItemStack(ChemiCraft.itemAtoms.shiftedIndex, par1, par2));
-			}
-		}
-	}
-
-}
diff --git a/src/Auxiliary.java b/src/Auxiliary.java
deleted file mode 100644
index ef6bb52..0000000
--- a/src/Auxiliary.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package net.minecraft.src.ChemiCraft;
-
-import net.minecraft.src.Block;
-import net.minecraft.src.Item;
-import net.minecraft.src.ItemStack;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-
-public class Auxiliary {
-
-	public Auxiliary(){
-	}
-
-	class NameAuxiliary{
-
-		/**
-		 * –¼‘O‚ð’ljÁ‚·‚éB
-		 * @param object
-		 * @param Name
-		 */
-		public void addName(Object object,Object name){
-			LanguageRegistry.addName(object, (String) name);
-		}
-
-		/**
-		 * –¼‘O‚ð’ljÁ‚·‚é(ItemStack”Å)
-		 * @param object
-		 * @param name
-		 * @param meta
-		 */
-		public void addName(ItemStack itemstack,Object name){
-			LanguageRegistry.addName(itemstack, (String) name);
-		}
-		
-
-		/**
-		 * Žw’肵‚½Œ¾Œê‚Å–¼‘O‚ð’ljÁ‚·‚éB
-		 * @param object
-		 * @param name
-		 */
-		public void addName(Object object,String lang,Object name){
-			LanguageRegistry.instance().addNameForObject(object, lang, (String) name);
-		}
-
-		/**
-		 * Žw’肵‚½Œ¾Œê‚Å–¼‘O‚ð’ljÁ‚·‚é(ItemStack”Å)
-		 * @param object
-		 * @param name
-		 */
-
-		public void addName(ItemStack object,String lang,Object name){
-			LanguageRegistry.instance().addNameForObject(object, lang, (String) name);
-		}
-
-		/**
-		 * ƒƒ^ƒf[ƒ^+”z—ñ‚Å–¼‘O‚ð’ljÁ‚·‚é(Block”Å)
-		 * @param object
-		 * @param name
-		 */
-		public void addName(Block object,Object[] name){
-			for(int i=0;i<name.length;i++){
-				LanguageRegistry.addName(new ItemStack(object,0,i), (String) name[i]);
-			}
-		}
-
-		/**
-		 * ƒƒ^ƒf[ƒ^+”z—ñ‚Å–¼‘O‚ð’ljÁ‚·‚é(Item”Å)
-		 * @param object
-		 * @param name
-		 */
-		public void addName(Item object,Object[] name){
-			for(int i=0;i<name.length;i++){
-				LanguageRegistry.addName(new ItemStack(object,0,i), (String) name[i]);
-			}
-		}
-
-		/**
-		 * ƒƒ^ƒf[ƒ^+”z—ñ‚ÅŽw’肵‚½Œ¾Œê‚Å–¼‘O‚ð’ljÁ‚·‚é(Block”Å)
-		 * @param object
-		 * @param name
-		 */
-		public void addName(Block object,String lang,Object[] name){
-			for(int i=0;i<name.length;i++){
-				LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, (String) name[i]);
-			}
-		}
-
-		/**
-		 * ƒƒ^ƒf[ƒ^+”z—ñ‚ÅŽw’肵‚½Œ¾Œê‚Å–¼‘O‚ð’ljÁ‚·‚é(Item”Å)
-		 * @param object
-		 * @param name
-		 */
-		public void addName(Item object,String lang, Object[] name){
-			for(int i=0;i<name.length;i++){
-				LanguageRegistry.instance().addNameForObject(new ItemStack(object,0,i), lang, (String) name[i]);
-			}
-		}
-
-	}
-
-}
diff --git a/src/ChemiCraft.java b/src/ChemiCraft.java
deleted file mode 100644
index 7093007..0000000
--- a/src/ChemiCraft.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package net.minecraft.src.ChemiCraft;
-
-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;
-import net.minecraftforge.common.Property;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.network.NetworkMod;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-
-@Mod( modid = "chemiCraft", name="ChemiCraft", version="ƒeƒXƒg”Å") //ID,–¼‘O,ƒo[ƒWƒ‡ƒ“
-@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "[1.3.2]") //ƒNƒ‰ƒCƒAƒ“ƒgAƒT[ƒo[‹¤‚É•K—v 1.3.2—p
-
-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",
-		"Scandium","Titanium","Vanadium","Chromium","Manganese","Iron","Cobalt","Nickel","Copper","Zinc",
-		"Gallium","Germanium","Arsenic","Selenium","Bromine","Krypton","Rubidium","Strontium","Yttorium","Zirconium",
-		"Niobium","Molybdenum","Technetium","Ruthenium","Rhodium","Palladium","Silver","Cadmium","Indium","Tin",
-		"Antimony","Tellurium","Iodine","Xenon","Caesium","Barium","Lanthanum","Cerium","Praseodymium","Neodymium",
-		"Promethium","Samarium","Europium","Gadolinium","Terbium","Dysprosium","Holmium","Erbium","Thulium","Ytterbium",
-		"Lutetium","Hafnium","Tantalum","Tungsten","Rhenium","Osmium","Iridium","Platinum","Gold","Mercury",
-		"Thallium","Lead","Bismuth","Polonium","Astatine","Radon","Francium","Radium","Actinium","Thorium",
-		"Protactinium","Uranium","Neptunium","Plutonium","Americium","Curium","Berkelium","Californium","Einsteinium","Fermium",
-		"Mendelevium","Nobelium","Lawrencium","Rutherfordium","Dubnium","Seaborgium","Bohrium","Hassium","Meitnerium","Darmstadtium",
-		"Roentgenium","Copernicium","Ununtrium","Ununquadium","Ununpentium","Ununhexium","","Ununoctium"
-	};
-
-	public static final String[] atomsNameJP = {
-		"…‘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;
-
-	private Auxiliary Auxiliary = new Auxiliary();
-	private Auxiliary.NameAuxiliary NameAuxiliary = Auxiliary.new NameAuxiliary();
-
-	// ƒRƒ“ƒXƒgƒ‰ƒNƒ^
-	@Mod.Init
-	public void chemiLoadMethod(FMLInitializationEvent event)
-	{
-
-		//‰»‡•¨‚̒ljÁ
-		ChemiCraftAPI.addLangCompound("ja_JP", "Salt", "‰–");
-	}
-
-	@Mod.PreInit  // ‘Oˆ—
-	public void chemiPreLoadMethod(FMLPreInitializationEvent event)
-	{
-		Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());
-		cfg.load();
-		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();
-	}
-
-	@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.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());
-
-	}
-
-}
\ No newline at end of file
diff --git a/src/ChemiCraftAPI.java b/src/ChemiCraftAPI.java
deleted file mode 100644
index f624aa7..0000000
--- a/src/ChemiCraftAPI.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package net.minecraft.src.ChemiCraft;
-
-import java.util.ArrayList;
-
-public class ChemiCraftAPI {
-
-	public static ChemiCraftAPI instance = new ChemiCraftAPI();
-
-	private boolean addLanguage = false;
-	private static ArrayList<String> compoundsNameList = new ArrayList();
-	private static ArrayList<String> compoundsLangNameList = new ArrayList();
-	private static ArrayList<String> compoundsLangList = new ArrayList();
-	private static ArrayList<ICompoundHandler> compoundHandlers = new ArrayList<ICompoundHandler>();
-	private static ArrayList<String> compoundHandlerItemNames = new ArrayList<String>();
-
-	public static void addCompound(String name){
-		compoundsNameList.add(name);
-		compoundsLangNameList.add("");
-		compoundsLangList.add("");
-	}
-
-	public static void addLangCompound(String lang, String englishName, String langName){
-		compoundsNameList.add(englishName);
-		compoundsLangNameList.add(langName);
-		compoundsLangList.add(lang);
-	}
-
-	public static ArrayList<String> getCompoundsName(){
-		compoundsNameList.trimToSize();
-		return compoundsNameList;
-	}
-
-	public static ArrayList<String> getCompoundsLangName(){
-		compoundsLangNameList.trimToSize();
-		return compoundsLangNameList;
-	}
-
-	public static ArrayList<String> getCompoundsLang(){
-		compoundsLangList.trimToSize();
-		return compoundsLangList;
-	}
-
-	public static void addCompoundHandler(String handlerItemName, ICompoundHandler compoundHandler){
-		ChemiCraftAPI.compoundHandlers.add(compoundHandler);
-		compoundHandlerItemNames.add(handlerItemName);
-	}
-
-	public static ArrayList<ICompoundHandler> getCompoundHandler(){
-		compoundHandlers.trimToSize();
-		return compoundHandlers;
-
-	}
-
-	public static ArrayList<String> getCompoundHandlerItemName(){
-		compoundHandlerItemNames.trimToSize();
-		return compoundHandlerItemNames;
-	}
-
-}
diff --git a/src/CompoundHandlerTest.java b/src/CompoundHandlerTest.java
deleted file mode 100644
index ea9acc8..0000000
--- a/src/CompoundHandlerTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package net.minecraft.src.ChemiCraft;
-
-import net.minecraft.src.Entity;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.World;
-
-public class CompoundHandlerTest implements ICompoundHandler {
-
-	@Override
-	public void onRightClickHandler(ItemStack par1ItemStack, World par2World,
-			EntityPlayer par3EntityPlayer) {
-
-	}
-
-	@Override
-	public ItemStack onItemUseHandler(ItemStack par1ItemStack,
-			EntityPlayer par2EntityPlayer, World par3World, int par4, int par5,
-			int par6, int par7, float par8, float par9, float par10) {
-		return null;
-	}
-
-	@Override
-	public void onUpdateHandler(ItemStack par1ItemStack, World par2World,
-			Entity par3Entity, int par4, boolean par5) {
-	}
-
-}
diff --git a/src/CreativeTabAtoms.java b/src/CreativeTabAtoms.java
deleted file mode 100644
index 58bd78b..0000000
--- a/src/CreativeTabAtoms.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package net.minecraft.src.ChemiCraft;
-
-import net.minecraft.src.*;
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.asm.SideOnly;
-
-public class CreativeTabAtoms extends CreativeTabs{
-
-
-	public CreativeTabAtoms(String type) {
-		super(type);
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int getTabIconItemIndex()
-	{
-		return ChemiCraft.itemGasCollectingBottle.shiftedIndex;
-	}
- 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public String getTranslatedTabLabel()
-	{
-		return "Atoms";
-	}
-
-}
diff --git a/src/ICompoundHandler.java b/src/ICompoundHandler.java
deleted file mode 100644
index d099281..0000000
--- a/src/ICompoundHandler.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package net.minecraft.src.ChemiCraft;
-
-import net.minecraft.src.Entity;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.World;
-
-public interface ICompoundHandler {
-
-	void onRightClickHandler(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer);
-
-	ItemStack onItemUseHandler(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10);
-
-	void onUpdateHandler(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5);
-
-}
diff --git a/src/ItemAtoms.java b/src/ItemAtoms.java
deleted file mode 100644
index 5d7f727..0000000
--- a/src/ItemAtoms.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package net.minecraft.src.ChemiCraft;
-
-import java.util.List;
-
-import net.minecraft.src.CreativeTabs;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.Item;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.World;
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.asm.SideOnly;
-
-public class ItemAtoms extends Item {
-
-    public ItemAtoms(int par1) {
-        super(par1);
-        this.maxStackSize = 1;
-        this.setHasSubtypes(true);
-        this.setMaxDamage(0);
-        this.setCreativeTab(ChemiCraft.tabAtoms);
-    }
-
-    @SideOnly(Side.CLIENT)
-    @Override
-    public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List)
-    {
-        for(int type = 0; type < ChemiCraft.atomsName.length; type++)
-        {
-              par3List.add(new ItemStack(par1, 1, type));
-              this.setIconIndex(type);
-        }
-    }
-
-    @Override
-    public String getItemNameIS(ItemStack par1ItemStack)
-    {
-        return super.getItemName() + "." + ChemiCraft.atomsName[par1ItemStack.getItemDamage()];
-    }
-
-    @Override
-    public String getTextureFile()
-    {
-        this.isDefaultTexture = false;
-        return "/ChemiCraft/Atoms.png";
-    }
-
-    @SideOnly(Side.CLIENT)
-    @Override
-    public int getIconFromDamage(int par1)
-    {
-        return par1;
-    }
-
-}
\ No newline at end of file
diff --git a/src/ItemCompounds.java b/src/ItemCompounds.java
deleted file mode 100644
index 543de67..0000000
--- a/src/ItemCompounds.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package net.minecraft.src.ChemiCraft;
-
-import java.util.List;
-
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.asm.SideOnly;
-import net.minecraft.src.CreativeTabs;
-import net.minecraft.src.Entity;
-import net.minecraft.src.Item;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.World;
-
-public class ItemCompounds extends Item {
-
-	public ItemCompounds(int par1) {
-		super(par1);
-		this.maxStackSize = 1;
-		this.setHasSubtypes(true);
-		this.setMaxDamage(0);
-		this.setCreativeTab(ChemiCraft.tabAtoms);
-	}
-
-	@Override
-	public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5){
-		for(int i=0;i < ChemiCraftAPI.getCompoundsName().size();i++){
-			for(int j=0;j < ChemiCraftAPI.getCompoundHandlerItemName().size();j++){
-				if(ChemiCraftAPI.getCompoundsName().get(i).equals(ChemiCraftAPI.getCompoundHandlerItemName().get(i))){
-					ChemiCraftAPI.getCompoundHandler().get(j).onUpdateHandler(par1ItemStack, par2World, par3Entity, par4, par5);
-				}
-			}
-		}
-	}
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List)
-	{
-		for(int type = 0; type < ChemiCraftAPI.getCompoundsName().toArray().length; type++)
-		{
-			par3List.add(new ItemStack(par1, 1, type));
-			this.setIconIndex(type);
-		}
-	}
-
-	@Override
-	public String getItemNameIS(ItemStack par1ItemStack)
-	{
-		return super.getItemName() + "." + ChemiCraftAPI.getCompoundsName().toArray()[par1ItemStack.getItemDamage()];
-	}
-
-	@Override
-	public String getTextureFile()
-	{
-		this.isDefaultTexture = false;
-		return "/ChemiCraft/Compounds.png";
-	}
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	public int getIconFromDamage(int par1)
-	{
-		return par1;
-	}
-
-}
diff --git a/src/ItemGasCollectingBottle.java b/src/ItemGasCollectingBottle.java
deleted file mode 100644
index db7781e..0000000
--- a/src/ItemGasCollectingBottle.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package net.minecraft.src.ChemiCraft;
-
-import java.util.Random;
-
-import net.minecraft.src.*;
-
-public class ItemGasCollectingBottle extends Item {
-
-	protected ItemGasCollectingBottle(int id) {
-		super(id);
-		this.setMaxStackSize(1);
-		this.setMaxDamage(2);
-		this.setCreativeTab(ChemiCraft.tabAtoms);
-	}
-
-	@Override
-	public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer){
-
-		par1ItemStack.damageItem(1, par3EntityPlayer);
-		AtomInfo AtomInfo = new AtomInfo(par2World, par3EntityPlayer);
-		AtomInfo.aboveY(par3EntityPlayer, 128, null, null, 0, 7);
-		return par1ItemStack;
-	}
-
-	@Override
-    public String getTextureFile()
-    {
-        this.isDefaultTexture = false;
-        return "/ChemiCraft/items.png";
-    }
-
-}
diff --git a/src/chemicraft/client/ClientProxy.java b/src/chemicraft/client/ClientProxy.java
new file mode 100644
index 0000000..66d8dbb
--- /dev/null
+++ b/src/chemicraft/client/ClientProxy.java
@@ -0,0 +1,29 @@
+package chemicraft.client;
+
+import cpw.mods.fml.client.FMLClientHandler;
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.World;
+import chemicraft.CommonProxy;
+
+public class ClientProxy extends CommonProxy
+{
+
+	@Override
+	public void registerRenderInformation()
+	{
+
+	}
+
+	@Override
+	public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
+	{
+		return null;
+	}
+
+	@Override
+	public World getClientWorld()
+	{
+		return FMLClientHandler.instance().getClient().theWorld;
+	}
+
+}
-- 
2.11.0