OSDN Git Service

パッケージわけした
authormozipi <mozipi@users.sourceforge.jp>
Wed, 26 Dec 2012 12:40:21 +0000 (21:40 +0900)
committermozipi <mozipi@users.sourceforge.jp>
Wed, 26 Dec 2012 12:40:21 +0000 (21:40 +0900)
45 files changed:
common/chemicraft/ChemiCraft.java
common/chemicraft/ChemiCraftAPI.java
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/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 [moved from common/chemicraft/ItemCompounds.java with 95% similarity]
common/chemicraft/item/ItemGasCollectingBottle.java [moved from common/chemicraft/ItemGasCollectingBottle.java with 84% 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/CommandDeleteItem.java [new file with mode: 0644]
common/chemicraft/util/CommandSetTile.java [new file with mode: 0644]
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 93% 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]
resources/chemicraft/items/items.png
src/chemicraft/client/ClientProxy.java

index 58ab442..1cc9003 100644 (file)
@@ -7,11 +7,31 @@ 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.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.CommandDeleteItem;\r
+import chemicraft.util.CommandSetTile;\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 +179,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
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
@@ -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 {
 
@@ -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;
 
similarity index 95%
rename from common/chemicraft/ItemCompounds.java
rename to common/chemicraft/item/ItemCompounds.java
index 549a143..3dc1d64 100644 (file)
@@ -1,14 +1,16 @@
-package chemicraft;
+package chemicraft.item;
 
 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;
+import chemicraft.ChemiCraft;
+import chemicraft.ChemiCraftAPI;
+import cpw.mods.fml.common.Side;
+import cpw.mods.fml.common.asm.SideOnly;
 
 public class ItemCompounds extends Item {
 
@@ -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 1a1cdc3..89b99fc 100644 (file)
@@ -1,7 +1,6 @@
-package chemicraft;\r
+package chemicraft.util;\r
 \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
diff --git a/common/chemicraft/util/CommandDeleteItem.java b/common/chemicraft/util/CommandDeleteItem.java
new file mode 100644 (file)
index 0000000..c1c07d2
--- /dev/null
@@ -0,0 +1,62 @@
+package chemicraft.util;
+
+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/util/CommandSetTile.java b/common/chemicraft/util/CommandSetTile.java
new file mode 100644 (file)
index 0000000..ed2709c
--- /dev/null
@@ -0,0 +1,44 @@
+package chemicraft.util;
+
+import net.minecraft.src.Block;
+import net.minecraft.src.CommandBase;
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.ICommandSender;
+import net.minecraft.src.World;
+import setBlockSupport.SetBlockSupport;
+
+public class CommandSetTile extends CommandBase {
+
+       @Override
+       public String getCommandName() {
+               return "setTile";
+       }
+
+       @Override
+       public void processCommand(ICommandSender var1, String[] var2) {
+               try{
+                       EntityPlayer player = (EntityPlayer)var1;
+                       World wolrd = player.worldObj;
+                       if(var2.length > 0){
+                               try{
+                                       if(Integer.parseInt(var2[0]) < 256){
+                                               if(var2.length > 1){
+                                                       SetBlockSupport.square(wolrd, (int)player.posX, (int)player.posY, (int)player.posZ, Integer.parseInt(var2[0]), Integer.parseInt(var2[1]), 12, 12);
+                                               }else{
+                                                       SetBlockSupport.square(wolrd, (int)player.posX, (int)player.posY, (int)player.posZ, Integer.parseInt(var2[0]), 0, 12, 12);
+                                               }
+                                       }else{
+                                               var1.sendChatToPlayer("Over 256 than the Block ID.");
+                                       }
+                               }catch(NumberFormatException e){
+                                       var1.sendChatToPlayer("A given Character is not a number.");
+                               }
+                       }else{
+                               var1.sendChatToPlayer("Please specify the BlockID.(Optional have Metadata)");
+                       }
+               }catch(ClassCastException e){
+
+               }
+       }
+
+}
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 93%
rename from common/chemicraft/ICompoundHandler.java
rename to common/chemicraft/util/ICompoundHandler.java
index 85aad95..2cdbc27 100644 (file)
@@ -1,46 +1,46 @@
-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
+        */\r
+       public void onRightClickHandler(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 ItemStack 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
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 {
 
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 {