OSDN Git Service

Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
authorponkotate <ponkotate@users.sourceforge.jp>
Sat, 29 Dec 2012 02:55:38 +0000 (11:55 +0900)
committerponkotate <ponkotate@users.sourceforge.jp>
Sat, 29 Dec 2012 02:55:38 +0000 (11:55 +0900)
50 files changed:
common/chemicraft/ChemiCraft.java
common/chemicraft/ChemiCraftAPI.java
common/chemicraft/ItemCompounds.java [deleted file]
common/chemicraft/block/BlockChemicalCombinationTable.java [moved from common/chemicraft/BlockChemicalCombinationTable.java with 90% similarity]
common/chemicraft/block/BlockDecompositionTable.java [moved from common/chemicraft/BlockDecompositionTable.java with 90% similarity]
common/chemicraft/block/BlockMaterialCraftingTable.java [moved from common/chemicraft/BlockMaterialCraftingTable.java with 90% similarity]
common/chemicraft/block/BlockToolAndMaterialCraftingTable.java [moved from common/chemicraft/BlockToolAndMaterialCraftingTable.java with 86% similarity]
common/chemicraft/container/ContainerChemicalCombinationTable.java [moved from common/chemicraft/ContainerChemicalCombinationTable.java with 92% similarity]
common/chemicraft/container/ContainerDecompositionTable.java [moved from common/chemicraft/ContainerDecompositionTable.java with 92% similarity]
common/chemicraft/container/ContainerMaterialCraftingTable.java [moved from common/chemicraft/ContainerMaterialCraftingTable.java with 92% similarity]
common/chemicraft/container/ContainerToolAndWeaponCraftingTable.java [moved from common/chemicraft/ContainerToolAndWeaponCraftingTable.java with 92% similarity]
common/chemicraft/debug/CommandDeleteItem.java [new file with mode: 0644]
common/chemicraft/debug/CommandSetTile.java [new file with mode: 0644]
common/chemicraft/debug/CompoundHandlerTest.java [new file with mode: 0644]
common/chemicraft/entity/EntityAtomGrenade.java [moved from common/chemicraft/EntityAtomGrenade.java with 98% similarity]
common/chemicraft/gui/GuiChemicalCombinationTable.java [moved from common/chemicraft/GuiChemicalCombinationTable.java with 86% similarity]
common/chemicraft/gui/GuiDecompositionTable.java [moved from common/chemicraft/GuiDecompositionTable.java with 81% similarity]
common/chemicraft/gui/GuiMaterialCraftingTable.java [moved from common/chemicraft/GuiMaterialCraftingTable.java with 86% similarity]
common/chemicraft/gui/GuiToolAndWeaponCraftingTable.java [moved from common/chemicraft/GuiToolAndWeaponCraftingTable.java with 85% similarity]
common/chemicraft/inventory/InventoryChemicalCombination.java [moved from common/chemicraft/InventoryChemicalCombination.java with 98% similarity]
common/chemicraft/inventory/InventoryDecomposition.java [moved from common/chemicraft/InventoryDecomposition.java with 95% similarity]
common/chemicraft/inventory/InventoryMaterialCrafting.java [moved from common/chemicraft/InventoryMaterialCrafting.java with 98% similarity]
common/chemicraft/inventory/InventoryToolAndWeaponCrafting.java [moved from common/chemicraft/InventoryToolAndWeaponCrafting.java with 97% similarity]
common/chemicraft/item/ItemAtomGrenade.java [moved from common/chemicraft/ItemAtomGrenade.java with 94% similarity]
common/chemicraft/item/ItemAtomInfoContainer.java [moved from common/chemicraft/ItemAtomInfoContainer.java with 75% similarity]
common/chemicraft/item/ItemAtoms.java [moved from common/chemicraft/ItemAtoms.java with 92% similarity]
common/chemicraft/item/ItemCompounds.java [new file with mode: 0644]
common/chemicraft/item/ItemGasCollectingBottle.java [moved from common/chemicraft/ItemGasCollectingBottle.java with 93% similarity]
common/chemicraft/slot/SlotChemicalCombinationResult.java [moved from common/chemicraft/SlotChemicalCombinationResult.java with 94% similarity]
common/chemicraft/slot/SlotDecompositionResult.java [moved from common/chemicraft/SlotDecompositionResult.java with 93% similarity]
common/chemicraft/slot/SlotMaterialCraftingResult.java [moved from common/chemicraft/SlotMaterialCraftingResult.java with 94% similarity]
common/chemicraft/slot/SlotToolAndWeaponCraftingResult.java [moved from common/chemicraft/SlotToolAndWeaponCraftingResult.java with 94% similarity]
common/chemicraft/system/ChemiCraftCraftingManager.java [moved from common/chemicraft/ChemiCraftCraftingManager.java with 96% similarity]
common/chemicraft/system/CommonProxy.java [moved from common/chemicraft/CommonProxy.java with 72% similarity]
common/chemicraft/system/PacketHandler.java [moved from common/chemicraft/PacketHandler.java with 90% similarity]
common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java [moved from common/chemicraft/TileEntityChemicalCombinationTable.java with 94% similarity]
common/chemicraft/tileentity/TileEntityDecompositionTable.java [moved from common/chemicraft/TileEntityDecompositionTable.java with 96% similarity]
common/chemicraft/tileentity/TileEntityMaterialCraftingTable.java [moved from common/chemicraft/TileEntityMaterialCraftingTable.java with 94% similarity]
common/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java [moved from common/chemicraft/TileEntityToolAndWeaponCraftingTable.java with 94% similarity]
common/chemicraft/util/AtomInfo.java [moved from common/chemicraft/AtomInfo.java with 93% similarity]
common/chemicraft/util/Auxiliary.java [moved from common/chemicraft/Auxiliary.java with 95% similarity]
common/chemicraft/util/CreativeTabAtoms.java [moved from common/chemicraft/CreativeTabAtoms.java with 82% similarity]
common/chemicraft/util/ICompoundHandler.java [moved from common/chemicraft/ICompoundHandler.java with 62% similarity]
common/chemicraft/util/NBTRecipe.java [moved from common/chemicraft/NBTRecipe.java with 86% similarity]
common/chemicraft/util/NBTRecipeGrenade.java [moved from common/chemicraft/NBTRecipeGrenade.java with 96% similarity]
license/license_en.txt [new file with mode: 0644]
license/license_ja.txt [new file with mode: 0644]
resources/chemicraft/items/Compounds.png [new file with mode: 0644]
resources/chemicraft/items/items.png
src/chemicraft/client/ClientProxy.java

index afe39c8..5b6adbb 100644 (file)
@@ -7,11 +7,32 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;\r
 import net.minecraftforge.common.Configuration;\r
 import net.minecraftforge.common.Property;\r
-import chemicraft.Auxiliary.NameAuxiliary;\r
+import chemicraft.block.BlockChemicalCombinationTable;\r
+import chemicraft.block.BlockDecompositionTable;\r
+import chemicraft.block.BlockMaterialCraftingTable;\r
+import chemicraft.block.BlockToolAndMaterialCraftingTable;\r
+import chemicraft.debug.CommandDeleteItem;\r
+import chemicraft.debug.CommandSetTile;\r
+import chemicraft.debug.CompoundHandlerTest;\r
+import chemicraft.item.ItemAtomGrenade;\r
+import chemicraft.item.ItemAtoms;\r
+import chemicraft.item.ItemCompounds;\r
+import chemicraft.item.ItemGasCollectingBottle;\r
+import chemicraft.system.CommonProxy;\r
+import chemicraft.system.PacketHandler;\r
+import chemicraft.tileentity.TileEntityChemicalCombinationTable;\r
+import chemicraft.tileentity.TileEntityDecompositionTable;\r
+import chemicraft.tileentity.TileEntityMaterialCraftingTable;\r
+import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;\r
+import chemicraft.util.Auxiliary;\r
+import chemicraft.util.Auxiliary.NameAuxiliary;\r
+import chemicraft.util.CreativeTabAtoms;\r
+import chemicraft.util.NBTRecipeGrenade;\r
 import cpw.mods.fml.common.Mod;\r
 import cpw.mods.fml.common.SidedProxy;\r
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;\r
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;\r
+import cpw.mods.fml.common.event.FMLServerStartingEvent;\r
 import cpw.mods.fml.common.network.NetworkMod;\r
 import cpw.mods.fml.common.network.NetworkRegistry;\r
 import cpw.mods.fml.common.registry.GameRegistry;\r
@@ -159,6 +180,11 @@ public class ChemiCraft {
                proxy.registerRenderInformation();\r
        }\r
 \r
+       @Mod.ServerStarting\r
+       public void serverStarting(FMLServerStartingEvent event){\r
+               event.registerServerCommand(new CommandSetTile());\r
+               event.registerServerCommand(new CommandDeleteItem());\r
+       }\r
 \r
        @Mod.PostInit\r
        public void chemiPostLoadMethod(FMLPostInitializationEvent event) {\r
@@ -167,6 +193,11 @@ public class ChemiCraft {
        }\r
 \r
        private void settingProcessing(FMLPostInitializationEvent event){\r
+\r
+               ChemiCraftAPI.instance.addCompound("Test");\r
+               ChemiCraftAPI.instance.addCompound("Test2");\r
+               ChemiCraftAPI.instance.settingCompoundHandler("Test", new CompoundHandlerTest());\r
+\r
                // Blockを追加します\r
                this.blockDecompositionTable = new BlockDecompositionTable(this.decompositionTableID, 0, Material.ground).setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("DecompositionTable");\r
                this.blockChemicalCombinationTable = new BlockChemicalCombinationTable(this.chemicalConbinationTableID, 0, Material.ground).setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("ChemicalCombinationTable");\r
index 246ce1c..74f5ffa 100644 (file)
@@ -3,6 +3,9 @@ package chemicraft;
 import java.util.ArrayList;
 
 import net.minecraft.src.ItemStack;
+import chemicraft.system.ChemiCraftCraftingManager;
+import chemicraft.util.ICompoundHandler;
+import chemicraft.util.NBTRecipe;
 
 /**
  * ChemiCraftのAPI
diff --git a/common/chemicraft/ItemCompounds.java b/common/chemicraft/ItemCompounds.java
deleted file mode 100644 (file)
index 549a143..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-package 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.instance.creativeTab);
-       }
-
-
-
-       @Override
-       public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5){
-               for(int i=0;i < ChemiCraftAPI.instance.getCompoundsName().size();i++){
-                       for(int j=0;j < ChemiCraftAPI.instance.getCompoundHandlerItemName().size();j++){
-                               if(ChemiCraftAPI.instance.getCompoundsName().get(i).equals(ChemiCraftAPI.instance.getCompoundHandlerItemName().get(i))){
-                                       ChemiCraftAPI.instance.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.instance.getCompoundsName().toArray().length; type++)
-               {
-                       par3List.add(new ItemStack(par1, 1, type));
-                       this.setIconIndex(type);
-               }
-       }
-
-
-
-       @Override
-       public String getItemNameIS(ItemStack par1ItemStack){
-               return super.getItemName() + "." + ChemiCraftAPI.instance.getCompoundsName().toArray()[par1ItemStack.getItemDamage()];
-       }
-
-
-
-       @Override
-       public String getTextureFile(){
-               return ChemiCraft.instance.itemCompoundsTexture;
-       }
-
-
-
-       @SideOnly(Side.CLIENT)
-       @Override
-       public int getIconFromDamage(int par1){
-               return par1;
-       }
-
-}
@@ -1,11 +1,12 @@
-package chemicraft;
+package chemicraft.block;
 
 import net.minecraft.src.BlockContainer;
-import net.minecraft.src.CreativeTabs;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
+import chemicraft.ChemiCraft;
+import chemicraft.tileentity.TileEntityChemicalCombinationTable;
 
 public class BlockChemicalCombinationTable extends BlockContainer {
 
@@ -1,11 +1,12 @@
-package chemicraft;
+package chemicraft.block;
 
 import net.minecraft.src.BlockContainer;
-import net.minecraft.src.CreativeTabs;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
+import chemicraft.ChemiCraft;
+import chemicraft.tileentity.TileEntityDecompositionTable;
 
 public class BlockDecompositionTable extends BlockContainer {
 
@@ -1,10 +1,12 @@
-package chemicraft;
+package chemicraft.block;
 
 import net.minecraft.src.BlockContainer;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
+import chemicraft.ChemiCraft;
+import chemicraft.tileentity.TileEntityMaterialCraftingTable;
 
 public class BlockMaterialCraftingTable extends BlockContainer {
 
@@ -1,16 +1,12 @@
-package chemicraft;
+package chemicraft.block;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import net.minecraft.src.AxisAlignedBB;
 import net.minecraft.src.BlockContainer;
-import net.minecraft.src.Entity;
-import net.minecraft.src.EntityLiving;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
+import chemicraft.ChemiCraft;
+import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 
 public class BlockToolAndMaterialCraftingTable extends BlockContainer {
 
@@ -1,4 +1,4 @@
-package chemicraft;
+package chemicraft.container;
 
 import net.minecraft.src.Container;
 import net.minecraft.src.EntityPlayer;
@@ -6,6 +6,11 @@ import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.Slot;
 import net.minecraft.src.World;
+import chemicraft.ChemiCraft;
+import chemicraft.ChemiCraftAPI;
+import chemicraft.inventory.InventoryChemicalCombination;
+import chemicraft.slot.SlotChemicalCombinationResult;
+import chemicraft.tileentity.TileEntityChemicalCombinationTable;
 
 public class ContainerChemicalCombinationTable extends Container {
 
@@ -1,4 +1,4 @@
-package chemicraft;
+package chemicraft.container;
 
 import net.minecraft.src.Container;
 import net.minecraft.src.EntityPlayer;
@@ -7,6 +7,11 @@ import net.minecraft.src.InventoryPlayer;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.Slot;
 import net.minecraft.src.World;
+import chemicraft.ChemiCraft;
+import chemicraft.ChemiCraftAPI;
+import chemicraft.inventory.InventoryDecomposition;
+import chemicraft.slot.SlotDecompositionResult;
+import chemicraft.tileentity.TileEntityDecompositionTable;
 import cpw.mods.fml.common.network.PacketDispatcher;
 
 public class ContainerDecompositionTable extends Container {
@@ -133,7 +138,7 @@ public class ContainerDecompositionTable extends Container {
 
        public void onButtonClick(int par1){
                if(par1 == 0){
-                       if(this.inv.getStackInSlot(16) != null){
+                       if(this.inv.getStackInSlot(16) != null && this.inv.getStackInSlot(0) != null){
                                for(int loop = 0;loop < this.inv.getStackInSlot(16).stackSize;loop++){
                                        if(this.invp.player.inventory.getFirstEmptyStack() != -1){
                                                this.tileEntity.setItemDrop(false);
@@ -1,4 +1,4 @@
-package chemicraft;
+package chemicraft.container;
 
 import net.minecraft.src.Container;
 import net.minecraft.src.EntityPlayer;
@@ -6,6 +6,11 @@ import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.Slot;
 import net.minecraft.src.World;
+import chemicraft.ChemiCraft;
+import chemicraft.ChemiCraftAPI;
+import chemicraft.inventory.InventoryMaterialCrafting;
+import chemicraft.slot.SlotMaterialCraftingResult;
+import chemicraft.tileentity.TileEntityMaterialCraftingTable;
 
 public class ContainerMaterialCraftingTable extends Container {
 
@@ -1,4 +1,4 @@
-package chemicraft;
+package chemicraft.container;
 
 import net.minecraft.src.Container;
 import net.minecraft.src.EntityPlayer;
@@ -6,6 +6,9 @@ import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.Slot;
 import net.minecraft.src.World;
+import chemicraft.ChemiCraft;
+import chemicraft.slot.SlotToolAndWeaponCraftingResult;
+import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 
 public class ContainerToolAndWeaponCraftingTable extends Container {
 
diff --git a/common/chemicraft/debug/CommandDeleteItem.java b/common/chemicraft/debug/CommandDeleteItem.java
new file mode 100644 (file)
index 0000000..c756818
--- /dev/null
@@ -0,0 +1,62 @@
+package chemicraft.debug;
+
+import java.util.Iterator;
+import java.util.List;
+
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.src.CommandBase;
+import net.minecraft.src.Entity;
+import net.minecraft.src.EntityItem;
+import net.minecraft.src.EntityPlayerMP;
+import net.minecraft.src.ICommandSender;
+import net.minecraft.src.World;
+
+public class CommandDeleteItem extends CommandBase {
+
+       @Override
+       public String getCommandName() {
+               return "delItem";
+       }
+
+       @Override
+       public void processCommand(ICommandSender var1, String[] var2) {
+               MinecraftServer server = null;
+               EntityPlayerMP player = null;
+               try { server = (MinecraftServer)var1; } catch (ClassCastException e) {}
+               try{ player = (EntityPlayerMP)var1;} catch(ClassCastException e) {}
+
+               World world;
+               List list;
+               Iterator itr;
+
+               if(server != null){
+                       if(var2.length > 0){
+                               world = server.worldServerForDimension(Integer.parseInt(var2[0]));
+                               list = world.loadedEntityList;
+                               itr = list.iterator();
+                               while(itr.hasNext()){
+                                       Entity entity = (Entity) itr.next();
+                                       if(entity instanceof EntityItem){
+                                               entity.setDead();
+                                       }
+                               }
+                       }else{
+                               var1.sendChatToPlayer("Please specify the World.");
+                       }
+               }else if(player != null){
+                       world = player.worldObj;
+                       list = world.loadedEntityList;
+                       itr = list.iterator();
+                       while(itr.hasNext()){
+                               Entity entity = (Entity) itr.next();
+                               if(entity instanceof EntityItem){
+                                       entity.setDead();
+                               }
+                       }
+               }else{
+                       var1.sendChatToPlayer("---Command Error---");
+               }
+
+       }
+
+}
diff --git a/common/chemicraft/debug/CommandSetTile.java b/common/chemicraft/debug/CommandSetTile.java
new file mode 100644 (file)
index 0000000..3ac0513
--- /dev/null
@@ -0,0 +1,44 @@
+package chemicraft.debug;\r
+\r
+import net.minecraft.src.Block;\r
+import net.minecraft.src.CommandBase;\r
+import net.minecraft.src.EntityPlayer;\r
+import net.minecraft.src.ICommandSender;\r
+import net.minecraft.src.World;\r
+import setBlockSupport.SetBlockSupport;\r
+\r
+public class CommandSetTile extends CommandBase {\r
+\r
+       @Override\r
+       public String getCommandName() {\r
+               return "setTile";\r
+       }\r
+\r
+       @Override\r
+       public void processCommand(ICommandSender var1, String[] var2) {\r
+               try{\r
+                       EntityPlayer player = (EntityPlayer)var1;\r
+                       World wolrd = player.worldObj;\r
+                       if(var2.length > 0){\r
+                               try{\r
+                                       if(Integer.parseInt(var2[0]) < 4096 && Block.blocksList[Integer.parseInt(var2[0])] != null || Integer.parseInt(var2[0]) == 0){\r
+                                               if(var2.length > 1){\r
+                                                       SetBlockSupport.square(wolrd, (int)player.posX, (int)player.posY, (int)player.posZ, Integer.parseInt(var2[0]), Integer.parseInt(var2[1]), 12, 12);\r
+                                               }else{\r
+                                                       SetBlockSupport.square(wolrd, (int)player.posX, (int)player.posY, (int)player.posZ, Integer.parseInt(var2[0]), 0, 12, 12);\r
+                                               }\r
+                                       }else{\r
+                                               var1.sendChatToPlayer("\u00a7cBlockが存在しないか指定された数が4096を超えています。");\r
+                                       }\r
+                               }catch(NumberFormatException e){\r
+                                       var1.sendChatToPlayer("\u00a7c指定された文字は数値ではありません。");\r
+                               }\r
+                       }else{\r
+                               var1.sendChatToPlayer("\u00a7cBlockIDを指定してください。(Metadataも可能)");\r
+                       }\r
+               }catch(ClassCastException e){\r
+\r
+               }\r
+       }\r
+\r
+}\r
diff --git a/common/chemicraft/debug/CompoundHandlerTest.java b/common/chemicraft/debug/CompoundHandlerTest.java
new file mode 100644 (file)
index 0000000..e49e646
--- /dev/null
@@ -0,0 +1,37 @@
+package chemicraft.debug;
+
+import net.minecraft.src.Entity;
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.ItemStack;
+import net.minecraft.src.World;
+import chemicraft.util.ICompoundHandler;
+
+public class CompoundHandlerTest implements ICompoundHandler {
+
+       @Override
+       public ItemStack onItemRightClickHandler(ItemStack par1ItemStack, World par2World,
+                       EntityPlayer par3EntityPlayer) {
+               System.out.println("onRightClick");
+               return par1ItemStack;
+       }
+
+       @Override
+       public boolean onItemUseHandler(ItemStack par1ItemStack,
+                       EntityPlayer par2EntityPlayer, World par3World, int par4, int par5,
+                       int par6, int par7, float par8, float par9, float par10) {
+               System.out.println("onItemUse");
+               return true;
+       }
+
+       @Override
+       public void onUpdateHandler(ItemStack par1ItemStack, World par2World,
+                       Entity par3Entity, int par4, boolean par5) {
+               System.out.println("onUpdate");
+       }
+
+       @Override
+       public int getIconIndexHandler() {
+               return 0;
+       }
+
+}
@@ -1,11 +1,13 @@
-package chemicraft;
+package chemicraft.gui;
 
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.asm.SideOnly;
-import net.minecraft.src.Container;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.GuiContainer;
 import net.minecraft.src.InventoryPlayer;
+import chemicraft.ChemiCraft;
+import chemicraft.container.ContainerChemicalCombinationTable;
+import chemicraft.tileentity.TileEntityChemicalCombinationTable;
+import cpw.mods.fml.common.Side;
+import cpw.mods.fml.common.asm.SideOnly;
 
 @SideOnly(Side.CLIENT)
 public class GuiChemicalCombinationTable extends GuiContainer {
@@ -1,21 +1,14 @@
-package chemicraft;
+package chemicraft.gui;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import net.minecraft.src.Block;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.GuiButton;
 import net.minecraft.src.GuiContainer;
-import net.minecraft.src.InventoryBasic;
 import net.minecraft.src.InventoryPlayer;
-import net.minecraft.src.Item;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.StatCollector;
+import chemicraft.ChemiCraft;
+import chemicraft.container.ContainerDecompositionTable;
+import chemicraft.tileentity.TileEntityDecompositionTable;
 import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.asm.SideOnly;
-import cpw.mods.fml.common.network.PacketDispatcher;
-import cpw.mods.fml.common.network.Player;
 
 @SideOnly(Side.CLIENT)
 public class GuiDecompositionTable extends GuiContainer {
@@ -1,11 +1,13 @@
-package chemicraft;
+package chemicraft.gui;
 
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.asm.SideOnly;
-import net.minecraft.src.Container;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.GuiContainer;
 import net.minecraft.src.InventoryPlayer;
+import chemicraft.ChemiCraft;
+import chemicraft.container.ContainerMaterialCraftingTable;
+import chemicraft.tileentity.TileEntityMaterialCraftingTable;
+import cpw.mods.fml.common.Side;
+import cpw.mods.fml.common.asm.SideOnly;
 
 @SideOnly(Side.CLIENT)
 public class GuiMaterialCraftingTable extends GuiContainer {
@@ -1,9 +1,11 @@
-package chemicraft;
+package chemicraft.gui;
 
-import net.minecraft.src.Container;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.GuiContainer;
 import net.minecraft.src.InventoryPlayer;
+import chemicraft.ChemiCraft;
+import chemicraft.container.ContainerToolAndWeaponCraftingTable;
+import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 
 public class GuiToolAndWeaponCraftingTable extends GuiContainer {
 
@@ -1,4 +1,4 @@
-package chemicraft;
+package chemicraft.inventory;
 
 import net.minecraft.src.Container;
 import net.minecraft.src.EntityPlayer;
@@ -1,6 +1,5 @@
-package chemicraft;
+package chemicraft.inventory;
 
-import cpw.mods.fml.common.network.PacketDispatcher;
 import net.minecraft.src.Container;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.IInventory;
@@ -1,4 +1,4 @@
-package chemicraft;
+package chemicraft.inventory;
 
 import net.minecraft.src.Container;
 import net.minecraft.src.EntityPlayer;
similarity index 94%
rename from common/chemicraft/ItemAtomGrenade.java
rename to common/chemicraft/item/ItemAtomGrenade.java
index f837ce8..cc94898 100644 (file)
@@ -1,4 +1,4 @@
-package chemicraft;
+package chemicraft.item;
 
 import java.util.List;
 
@@ -8,10 +8,11 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.NBTTagList;
 import net.minecraft.src.World;
+import chemicraft.entity.EntityAtomGrenade;
 
 public class ItemAtomGrenade extends Item {
 
-       protected ItemAtomGrenade(int par1) {
+       public ItemAtomGrenade(int par1) {
                super(par1);
        }
 
@@ -1,6 +1,7 @@
-package chemicraft;\r
+package chemicraft.item;\r
 \r
 import net.minecraft.src.Item;\r
+import chemicraft.util.AtomInfo;\r
 \r
 public class ItemAtomInfoContainer extends Item {\r
 \r
similarity index 92%
rename from common/chemicraft/ItemAtoms.java
rename to common/chemicraft/item/ItemAtoms.java
index 0b7461d..06eaec9 100644 (file)
@@ -1,12 +1,11 @@
-package chemicraft;
+package chemicraft.item;
 
 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 chemicraft.ChemiCraft;
 import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.asm.SideOnly;
 
diff --git a/common/chemicraft/item/ItemCompounds.java b/common/chemicraft/item/ItemCompounds.java
new file mode 100644 (file)
index 0000000..e9112e7
--- /dev/null
@@ -0,0 +1,98 @@
+package chemicraft.item;
+
+import java.util.List;
+
+import net.minecraft.src.CreativeTabs;
+import net.minecraft.src.Entity;
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.Item;
+import net.minecraft.src.ItemStack;
+import net.minecraft.src.World;
+import chemicraft.ChemiCraft;
+import chemicraft.ChemiCraftAPI;
+import cpw.mods.fml.common.Side;
+import cpw.mods.fml.common.asm.SideOnly;
+
+public class ItemCompounds extends Item {
+
+       public ItemCompounds(int par1){
+               super(par1);
+               this.maxStackSize = 1;
+               this.setHasSubtypes(true);
+               this.setMaxDamage(0);
+               this.setCreativeTab(ChemiCraft.instance.creativeTab);
+       }
+
+       @Override
+       public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) {
+               for(int i=0;i < ChemiCraftAPI.instance.getCompoundHandlerItemName().size();i++){
+                       if(ChemiCraftAPI.instance.getCompoundsName().get(par1ItemStack.getItemDamage()).equals(ChemiCraftAPI.instance.getCompoundHandlerItemName().get(i))){
+                               return ChemiCraftAPI.instance.getCompoundHandler().get(i).onItemUseHandler(par1ItemStack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10);
+                       }
+               }
+               return false;
+       }
+
+
+       @Override
+       public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
+       {
+               for(int i=0;i < ChemiCraftAPI.instance.getCompoundHandlerItemName().size();i++){
+                       if(ChemiCraftAPI.instance.getCompoundsName().get(par1ItemStack.getItemDamage()).equals(ChemiCraftAPI.instance.getCompoundHandlerItemName().get(i))){
+                               ChemiCraftAPI.instance.getCompoundHandler().get(i).onItemRightClickHandler(par1ItemStack, par2World, par3EntityPlayer);
+                       }
+               }
+               return par1ItemStack;
+       }
+
+
+
+       @Override
+       public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5){
+               for(int i=0;i < ChemiCraftAPI.instance.getCompoundHandlerItemName().size();i++){
+                       if(ChemiCraftAPI.instance.getCompoundsName().get(par1ItemStack.getItemDamage()).equals(ChemiCraftAPI.instance.getCompoundHandlerItemName().get(i))){
+                               ChemiCraftAPI.instance.getCompoundHandler().get(i).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.instance.getCompoundsName().toArray().length; type++)
+               {
+                       par3List.add(new ItemStack(par1, 1, type));
+                       this.setIconIndex(type);
+               }
+       }
+
+
+
+       @Override
+       public String getItemNameIS(ItemStack par1ItemStack){
+               return super.getItemName() + "." + ChemiCraftAPI.instance.getCompoundsName().toArray()[par1ItemStack.getItemDamage()];
+       }
+
+
+
+       @Override
+       public String getTextureFile(){
+               return ChemiCraft.instance.itemCompoundsTexture;
+       }
+
+
+
+       @SideOnly(Side.CLIENT)
+       @Override
+       public int getIconFromDamage(int par1){
+               for(int i=0;i < ChemiCraftAPI.instance.getCompoundHandlerItemName().size();i++){
+                       if(ChemiCraftAPI.instance.getCompoundsName().get(par1).equals(ChemiCraftAPI.instance.getCompoundHandlerItemName().get(i))){
+                               return ChemiCraftAPI.instance.getCompoundHandler().get(i).getIconIndexHandler();
+                       }
+               }
+               return 0;
+       }
+
+}
@@ -1,8 +1,9 @@
-package chemicraft;
+package chemicraft.item;
 
-import java.util.Random;
-
-import net.minecraft.src.*;
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.ItemStack;
+import net.minecraft.src.World;
+import chemicraft.ChemiCraft;
 
 public class ItemGasCollectingBottle extends ItemAtomInfoContainer
 {
@@ -1,4 +1,4 @@
-package chemicraft;
+package chemicraft.slot;
 
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
@@ -1,4 +1,4 @@
-package chemicraft;
+package chemicraft.slot;
 
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
@@ -1,10 +1,14 @@
-package chemicraft;
+package chemicraft.system;
 
 import java.util.ArrayList;
 import java.util.Collections;
 
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
+import chemicraft.ChemiCraftAPI;
+import chemicraft.inventory.InventoryChemicalCombination;
+import chemicraft.inventory.InventoryDecomposition;
+import chemicraft.inventory.InventoryMaterialCrafting;
 
 public class ChemiCraftCraftingManager {
 
similarity index 72%
rename from common/chemicraft/CommonProxy.java
rename to common/chemicraft/system/CommonProxy.java
index f5e7968..a946870 100644 (file)
@@ -1,9 +1,16 @@
-package chemicraft;
+package chemicraft.system;
 
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import cpw.mods.fml.client.FMLClientHandler;
+import chemicraft.container.ContainerChemicalCombinationTable;
+import chemicraft.container.ContainerDecompositionTable;
+import chemicraft.container.ContainerMaterialCraftingTable;
+import chemicraft.container.ContainerToolAndWeaponCraftingTable;
+import chemicraft.tileentity.TileEntityChemicalCombinationTable;
+import chemicraft.tileentity.TileEntityDecompositionTable;
+import chemicraft.tileentity.TileEntityMaterialCraftingTable;
+import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 import cpw.mods.fml.common.network.IGuiHandler;
 
 public class CommonProxy implements IGuiHandler {
similarity index 90%
rename from common/chemicraft/PacketHandler.java
rename to common/chemicraft/system/PacketHandler.java
index 8665b9a..eac3547 100644 (file)
@@ -1,4 +1,4 @@
-package chemicraft;\r
+package chemicraft.system;\r
 \r
 import java.io.ByteArrayOutputStream;\r
 import java.io.DataOutputStream;\r
@@ -10,6 +10,11 @@ import net.minecraft.src.Packet;
 import net.minecraft.src.Packet250CustomPayload;\r
 import net.minecraft.src.TileEntity;\r
 import net.minecraft.src.World;\r
+import chemicraft.ChemiCraft;\r
+import chemicraft.tileentity.TileEntityChemicalCombinationTable;\r
+import chemicraft.tileentity.TileEntityDecompositionTable;\r
+import chemicraft.tileentity.TileEntityMaterialCraftingTable;\r
+import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;\r
 \r
 import com.google.common.io.ByteArrayDataInput;\r
 import com.google.common.io.ByteStreams;\r
@@ -1,9 +1,6 @@
-package chemicraft;
+package chemicraft.tileentity;
 
 import java.io.DataOutputStream;
-import java.util.ArrayList;
-
-import com.google.common.io.ByteArrayDataInput;
 
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
@@ -11,6 +8,10 @@ import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.NBTTagList;
 import net.minecraft.src.Packet;
 import net.minecraft.src.TileEntity;
+import chemicraft.inventory.InventoryChemicalCombination;
+import chemicraft.system.PacketHandler;
+
+import com.google.common.io.ByteArrayDataInput;
 
 public class TileEntityChemicalCombinationTable extends TileEntity {
 
@@ -1,4 +1,4 @@
-package chemicraft;
+package chemicraft.tileentity;
 
 import java.io.DataOutputStream;
 
@@ -9,12 +9,11 @@ import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.NBTTagList;
 import net.minecraft.src.Packet;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.WorldServer;
+import chemicraft.inventory.InventoryDecomposition;
+import chemicraft.system.PacketHandler;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import cpw.mods.fml.common.network.PacketDispatcher;
-
 public class TileEntityDecompositionTable extends TileEntity {
 
        private IInventory decompositionInv = new InventoryDecomposition();
@@ -1,9 +1,6 @@
-package chemicraft;
+package chemicraft.tileentity;
 
 import java.io.DataOutputStream;
-import java.util.ArrayList;
-
-import com.google.common.io.ByteArrayDataInput;
 
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
@@ -11,6 +8,10 @@ import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.NBTTagList;
 import net.minecraft.src.Packet;
 import net.minecraft.src.TileEntity;
+import chemicraft.inventory.InventoryMaterialCrafting;
+import chemicraft.system.PacketHandler;
+
+import com.google.common.io.ByteArrayDataInput;
 
 public class TileEntityMaterialCraftingTable extends TileEntity {
 
@@ -1,16 +1,18 @@
-package chemicraft;
+package chemicraft.tileentity;
 
 import java.io.DataOutputStream;
 import java.util.ArrayList;
 
-import com.google.common.io.ByteArrayDataInput;
-
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.NBTTagList;
 import net.minecraft.src.Packet;
 import net.minecraft.src.TileEntity;
+import chemicraft.inventory.InventoryToolAndWeaponCrafting;
+import chemicraft.system.PacketHandler;
+
+import com.google.common.io.ByteArrayDataInput;
 
 public class TileEntityToolAndWeaponCraftingTable extends TileEntity {
 
similarity index 93%
rename from common/chemicraft/AtomInfo.java
rename to common/chemicraft/util/AtomInfo.java
index b7921b0..2473ff9 100644 (file)
@@ -1,9 +1,8 @@
-package chemicraft;\r
+package chemicraft.util;\r
 \r
 import cpw.mods.fml.common.Side;\r
 import cpw.mods.fml.common.asm.SideOnly;\r
 import net.minecraft.src.EntityPlayer;\r
-import net.minecraft.src.ItemStack;\r
 import net.minecraft.src.World;\r
 \r
 /**\r
similarity index 95%
rename from common/chemicraft/Auxiliary.java
rename to common/chemicraft/util/Auxiliary.java
index f62fbef..b6e32bc 100644 (file)
@@ -1,4 +1,4 @@
-package chemicraft;\r
+package chemicraft.util;\r
 \r
 import net.minecraft.src.Block;\r
 import net.minecraft.src.Item;\r
@@ -12,7 +12,7 @@ public class Auxiliary {
         * @author mozipi\r
         *\r
         */\r
-       class NameAuxiliary {\r
+       public class NameAuxiliary {\r
 \r
                /**\r
                 * 名前を設定します\r
similarity index 82%
rename from common/chemicraft/CreativeTabAtoms.java
rename to common/chemicraft/util/CreativeTabAtoms.java
index 0d7f224..aa500e9 100644 (file)
@@ -1,6 +1,7 @@
-package chemicraft;
+package chemicraft.util;
 
-import net.minecraft.src.*;
+import net.minecraft.src.CreativeTabs;
+import chemicraft.ChemiCraft;
 import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.asm.SideOnly;
 
similarity index 62%
rename from common/chemicraft/ICompoundHandler.java
rename to common/chemicraft/util/ICompoundHandler.java
index 85aad95..20a0a98 100644 (file)
@@ -1,46 +1,53 @@
-package chemicraft;
-
-import net.minecraft.src.Entity;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.World;
-
-public interface ICompoundHandler {
-
-       /**
-        * 右クリック時のHandler
-        * @param par1ItemStack
-        * @param par2World
-        * @param par3EntityPlayer
-        */
-       public void onRightClickHandler(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer);
-
-
-       /**
-        * Itemを使用したときのHandler
-        * @param par1ItemStack
-        * @param par2EntityPlayer
-        * @param par3World
-        * @param par4
-        * @param par5
-        * @param par6
-        * @param par7
-        * @param par8
-        * @param par9
-        * @param par10
-        * @return
-        */
-       public ItemStack onItemUseHandler(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10);
-
-
-       /**
-        * 毎Tick呼ばれるHandler
-        * @param par1ItemStack
-        * @param par2World
-        * @param par3Entity
-        * @param par4
-        * @param par5
-        */
-       public void onUpdateHandler(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5);
-
-}
+package chemicraft.util;\r
+\r
+import net.minecraft.src.Entity;\r
+import net.minecraft.src.EntityPlayer;\r
+import net.minecraft.src.ItemStack;\r
+import net.minecraft.src.World;\r
+\r
+public interface ICompoundHandler {\r
+\r
+       /**\r
+        * 右クリック時のHandler\r
+        * @param par1ItemStack\r
+        * @param par2World\r
+        * @param par3EntityPlayer\r
+        * @return\r
+        */\r
+       public ItemStack onItemRightClickHandler(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer);\r
+\r
+\r
+       /**\r
+        * Itemを使用したときのHandler\r
+        * @param par1ItemStack\r
+        * @param par2EntityPlayer\r
+        * @param par3World\r
+        * @param par4\r
+        * @param par5\r
+        * @param par6\r
+        * @param par7\r
+        * @param par8\r
+        * @param par9\r
+        * @param par10\r
+        * @return\r
+        */\r
+       public boolean onItemUseHandler(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10);\r
+\r
+\r
+       /**\r
+        * 毎Tick呼ばれるHandler\r
+        * @param par1ItemStack\r
+        * @param par2World\r
+        * @param par3Entity\r
+        * @param par4\r
+        * @param par5\r
+        */\r
+       public void onUpdateHandler(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5);\r
+\r
+       /**\r
+        * iconIndexの指定\r
+        * @return iconIndex\r
+        */\r
+       public int getIconIndexHandler();\r
+\r
+}\r
similarity index 86%
rename from common/chemicraft/NBTRecipe.java
rename to common/chemicraft/util/NBTRecipe.java
index 48f4e4f..f636e76 100644 (file)
@@ -1,4 +1,4 @@
-package chemicraft;
+package chemicraft.util;
 
 import net.minecraft.src.ItemStack;
 
similarity index 96%
rename from common/chemicraft/NBTRecipeGrenade.java
rename to common/chemicraft/util/NBTRecipeGrenade.java
index d718ccf..31a7153 100644 (file)
@@ -1,10 +1,9 @@
-package chemicraft;
-
-import java.util.ArrayList;
+package chemicraft.util;
 
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.NBTTagList;
+import chemicraft.ChemiCraft;
 
 public class NBTRecipeGrenade extends NBTRecipe {
 
diff --git a/license/license_en.txt b/license/license_en.txt
new file mode 100644 (file)
index 0000000..c58b0cb
--- /dev/null
@@ -0,0 +1,14 @@
+Copyright (c) 2012, ProjectChemiCcraft
+ All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Neither the name of the ProjectChemiCcraft nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/license/license_ja.txt b/license/license_ja.txt
new file mode 100644 (file)
index 0000000..ce825f4
--- /dev/null
@@ -0,0 +1,15 @@
+Copyright (c) 2012, ProjectChemiCcraft\r
+All rights reserved.\r
+\r
+\r
+\83\\81[\83X\83R\81[\83h\8c`\8e®\82©\83o\83C\83i\83\8a\8c`\8e®\82©\81A\95Ï\8dX\82·\82é\82©\82µ\82È\82¢\82©\82ð\96â\82í\82¸\81A\88È\89º\82Ì\8fð\8c\8f\82ð\96\9e\82½\82·\8fê\8d\87\82É\8cÀ\82è\81A\8dÄ\94Ð\95z\82¨\82æ\82Ñ\8eg\97p\82ª\8b\96\89Â\82³\82ê\82Ü\82·\81\r
\81E\83\\81[\83X\83R\81[\83h\82ð\8dÄ\94Ð\95z\82·\82é\8fê\8d\87\81A\8fã\8bL\82Ì\92\98\8dì\8c \95\\8e¦\81A\96{\8fð\8c\8f\88ê\97\97\81A\82¨\82æ\82Ñ\89º\8bL\96Æ\90Ó\8fð\8d\80\82ð\8aÜ\82ß\82é\82±\82Æ\81\r
\81E\83o\83C\83i\83\8a\8c`\8e®\82Å\8dÄ\94Ð\95z\82·\82é\8fê\8d\87\81A\94Ð\95z\95¨\82É\95t\91®\82Ì\83h\83L\83\85\83\81\83\93\83g\93\99\82Ì\8e\91\97¿\82É\81A\8fã\8bL\82Ì\92\98\8dì\8c \95\\8e¦\81A\96{\8fð\8c\8f\88ê\97\97\81A\82¨\82æ\82Ñ\89º\8bL\96Æ\90Ó\8fð\8d\80\82ð\8aÜ\82ß\82é\82±\82Æ\81\r
\81E\8f\91\96Ê\82É\82æ\82é\93Á\95Ê\82Ì\8b\96\89Â\82È\82µ\82É\81A\96{\83\\83t\83g\83E\83F\83A\82©\82ç\94h\90\82µ\82½\90»\95i\82Ì\90é\93`\82Ü\82½\82Í\94Ì\94\84\91£\90i\82É\81AProjectChemiCcraft\82Ì\96¼\91O\82Ü\82½\82Í\83R\83\93\83g\83\8a\83r\83\85\81[\83^\81[\82Ì\96¼\91O\82ð\8eg\97p\82µ\82Ä\82Í\82È\82ç\82È\82¢\81\r
+\r
+\96{\83\\83t\83g\83E\83F\83A\82Í\81A\92\98\8dì\8c \8eÒ\82¨\82æ\82Ñ\83R\83\93\83g\83\8a\83r\83\85\81[\83^\81[\82É\82æ\82Á\82Ä\81u\8c»\8fó\82Ì\82Ü\82Ü\81v\92ñ\8b\9f\82³\82ê\82Ä\82¨\82è\81A\96¾\8e¦\96Ù\8e¦\82ð\96â\82í\82¸\81A\8f¤\8bÆ\93I\82È\8eg\97p\89Â\94\\90«\81A\r
+\82¨\82æ\82Ñ\93Á\92è\82Ì\96Ú\93I\82É\91Î\82·\82é\93K\8d\87\90«\82É\8aÖ\82·\82é\88Ã\96Ù\82Ì\95Û\8fØ\82à\8aÜ\82ß\81A\82Ü\82½\82»\82ê\82É\8cÀ\92è\82³\82ê\82È\82¢\81A\82¢\82©\82È\82é\95Û\8fØ\82à\82 \82è\82Ü\82¹\82ñ\81B\92\98\8dì\8c \8eÒ\82à\83R\83\93\83g\83\8a\83r\83\85\81[\83^\81[\82à\81A\r
+\8e\96\97R\82Ì\82¢\82©\82ñ\82ð\96â\82í\82¸\81\91¹\8aQ\94­\90\82Ì\8c´\88ö\82¢\82©\82ñ\82ð\96â\82í\82¸\81A\82©\82Â\90Ó\94C\82Ì\8dª\8b\92\82ª\8c_\96ñ\82Å\82 \82é\82©\8cµ\8ai\90Ó\94C\82Å\82 \82é\82©\81i\89ß\8e¸\82»\82Ì\91¼\82Ì\81j\95s\96@\8ds\88×\82Å\82 \82é\82©\82ð\96â\82í\82¸\81A\r
+\89¼\82É\82»\82Ì\82æ\82¤\82È\91¹\8aQ\82ª\94­\90\82·\82é\89Â\94\\90«\82ð\92m\82ç\82³\82ê\82Ä\82¢\82½\82Æ\82µ\82Ä\82à\81A\96{\83\\83t\83g\83E\83F\83A\82Ì\8eg\97p\82É\82æ\82Á\82Ä\94­\90\82µ\82½\81i\91ã\91Ö\95i\82Ü\82½\82Í\91ã\97p\83T\81[\83r\83X\82Ì\92²\92B\81A\r
+\8eg\97p\82Ì\91r\8e¸\81A\83f\81[\83^\82Ì\91r\8e¸\81A\97\98\89v\82Ì\91r\8e¸\81A\8bÆ\96±\82Ì\92\86\92f\82à\8aÜ\82ß\81A\82Ü\82½\82»\82ê\82É\8cÀ\92è\82³\82ê\82È\82¢\81j\92¼\90Ú\91¹\8aQ\81A\8aÔ\90Ú\91¹\8aQ\81A\8bô\94­\93I\82È\91¹\8aQ\81A\93Á\95Ê\91¹\8aQ\81A\92¦\94±\93I\91¹\8aQ\81A\r
+\82Ü\82½\82Í\8c\8b\89Ê\91¹\8aQ\82É\82Â\82¢\82Ä\81A\88ê\90Ø\90Ó\94C\82ð\95\89\82í\82È\82¢\82à\82Ì\82Æ\82µ\82Ü\82·\81\r
diff --git a/resources/chemicraft/items/Compounds.png b/resources/chemicraft/items/Compounds.png
new file mode 100644 (file)
index 0000000..39484a5
Binary files /dev/null and b/resources/chemicraft/items/Compounds.png differ
index 31c925d..39484a5 100644 (file)
Binary files a/resources/chemicraft/items/items.png and b/resources/chemicraft/items/items.png differ
index 7ffed83..8b75335 100644 (file)
@@ -5,15 +5,15 @@ import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 import chemicraft.ChemiCraft;
-import chemicraft.CommonProxy;
-import chemicraft.GuiChemicalCombinationTable;
-import chemicraft.GuiDecompositionTable;
-import chemicraft.GuiMaterialCraftingTable;
-import chemicraft.GuiToolAndWeaponCraftingTable;
-import chemicraft.TileEntityChemicalCombinationTable;
-import chemicraft.TileEntityDecompositionTable;
-import chemicraft.TileEntityMaterialCraftingTable;
-import chemicraft.TileEntityToolAndWeaponCraftingTable;
+import chemicraft.gui.GuiChemicalCombinationTable;
+import chemicraft.gui.GuiDecompositionTable;
+import chemicraft.gui.GuiMaterialCraftingTable;
+import chemicraft.gui.GuiToolAndWeaponCraftingTable;
+import chemicraft.system.CommonProxy;
+import chemicraft.tileentity.TileEntityChemicalCombinationTable;
+import chemicraft.tileentity.TileEntityDecompositionTable;
+import chemicraft.tileentity.TileEntityMaterialCraftingTable;
+import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 import cpw.mods.fml.client.FMLClientHandler;
 
 public class ClientProxy extends CommonProxy {