コミットしろやっていわれたので

diff --git a/common/pcc/chemicraft/base/ChemiCraftBase.java b/common/pcc/chemicraft/base/ChemiCraftBase.java
index 94d6541..e6b9a4c 100644 (file)
--- a/common/pcc/chemicraft/base/ChemiCraftBase.java
+++ b/common/pcc/chemicraft/base/ChemiCraftBase.java
@@ -18,13 +18,14 @@ import pcc.chemicraft.base.system.CommonProxy;
 import pcc.chemicraft.base.system.PacketHandler;
 import pcc.chemicraft.core.ChemiCraftAPI;
 import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.LoaderState.ModState;
 import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.ModContainer;
+import cpw.mods.fml.common.LoaderState.ModState;
 import cpw.mods.fml.common.Mod.Instance;
 import cpw.mods.fml.common.Mod.PostInit;
 import cpw.mods.fml.common.Mod.PreInit;
-import cpw.mods.fml.common.ModContainer;
 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;
 import cpw.mods.fml.common.network.NetworkMod;

diff --git a/common/pcc/chemicraft/core/container/ContainerChemicalCombinationTable.java b/common/pcc/chemicraft/core/container/ContainerChemicalCombinationTable.java
index ac7912e..5e566ac 100644 (file)
--- a/common/pcc/chemicraft/core/container/ContainerChemicalCombinationTable.java
+++ b/common/pcc/chemicraft/core/container/ContainerChemicalCombinationTable.java
@@ -151,22 +151,6 @@ public class ContainerChemicalCombinationTable extends Container {
        public void onCraftGuiClosed(EntityPlayer par1EntityPlayer)
        {
                super.onCraftGuiClosed(par1EntityPlayer);
-
-               if (!this.worldObj.isRemote)
-               {
-                       for (int var2 = 0; var2 < 18; var2++){
-                               ItemStack var3 = null;
-                               if (var2 < 15){
-                                       var3 = this.invm.getStackInSlotOnClosing(var2);
-                               } else if (var2 < 16) {
-                                       var3 = this.invr.getStackInSlotOnClosing(var2 - 15);
-                               }
-
-                               if (var3 != null){
-                                       par1EntityPlayer.dropPlayerItem(var3);
-                               }
-                       }
-               }
        }
 
 }

diff --git a/common/pcc/chemicraft/core/system/PacketHandler.java b/common/pcc/chemicraft/core/system/PacketHandler.java
index 3485915..2eb7796 100644 (file)
--- a/common/pcc/chemicraft/core/system/PacketHandler.java
+++ b/common/pcc/chemicraft/core/system/PacketHandler.java
@@ -33,7 +33,7 @@ public class PacketHandler implements IPacketHandler {
 
        @Override
        public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player) {
-               if (packet.channel.equals("chemicraft")) {
+               if (packet.channel.equals("chemicraftcore")) {
                        ByteArrayDataInput badi = ByteStreams.newDataInput(packet.data);
 
                        World worldClient;
@@ -94,7 +94,7 @@ public class PacketHandler implements IPacketHandler {
 
                // パケットの作成
                Packet250CustomPayload packet = new Packet250CustomPayload();
-               packet.channel = "chemicraft";
+               packet.channel = "chemicraftcore";
                packet.data = var1.toByteArray();
                packet.length = var1.size();
                packet.isChunkDataPacket = true;
@@ -125,7 +125,7 @@ public class PacketHandler implements IPacketHandler {
 
                // パケットの作成
                Packet250CustomPayload packet = new Packet250CustomPayload();
-               packet.channel = "chemicraft";
+               packet.channel = "chemicraftcore";
                packet.data = var1.toByteArray();
                packet.length = var1.size();
                packet.isChunkDataPacket = true;
@@ -156,7 +156,7 @@ public class PacketHandler implements IPacketHandler {
 
                // パケットの作成
                Packet250CustomPayload packet = new Packet250CustomPayload();
-               packet.channel = "chemicraft";
+               packet.channel = "chemicraftcore";
                packet.data = var1.toByteArray();
                packet.length = var1.size();
                packet.isChunkDataPacket = true;
@@ -187,7 +187,7 @@ public class PacketHandler implements IPacketHandler {
 
                // パケットの作成
                Packet250CustomPayload packet = new Packet250CustomPayload();
-               packet.channel = "chemicraft";
+               packet.channel = "chemicraftcore";
                packet.data = var1.toByteArray();
                packet.length = var1.size();
                packet.isChunkDataPacket = true;
@@ -220,7 +220,7 @@ public class PacketHandler implements IPacketHandler {
 
                // パケットの作成
                Packet250CustomPayload packet = new Packet250CustomPayload();
-               packet.channel = "chemicraft";
+               packet.channel = "chemicraftcore";
                packet.data = var1.toByteArray();
                packet.length = var1.size();
                packet.isChunkDataPacket = true;

diff --git a/common/pcc/chemicraft/util/FormulaTest.java b/common/pcc/chemicraft/util/FormulaTest.java
new file mode 100644 (file)
index 0000000..41c9189
--- /dev/null
+++ b/common/pcc/chemicraft/util/FormulaTest.java
@@ -0,0 +1,26 @@
+package pcc.chemicraft.util;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class FormulaTest extends Formula {
+
+       public FormulaTest() {
+               super("");
+       }
+
+       @Test
+       public void test() {
+               Formula formula = new Formula("C64Si16");
+               assertEquals("変換がおかしいです(元素)",
+                               formula.getAtoms(),
+                               new String[] {"C", "Si"});
+
+               assertEquals("変換がおかしいです(元素数)",
+                               formula.getAmonts(),
+                               new Integer[] {64, 16});
+
+       }
+
+}