OSDN Git Service

仕様書odt版追加(OpenOfficeで編集できないのでできればdocにしてほしい)
authormozipi <mozipi@users.sourceforge.jp>
Thu, 3 Jan 2013 17:30:41 +0000 (02:30 +0900)
committermozipi <mozipi@users.sourceforge.jp>
Thu, 3 Jan 2013 17:30:41 +0000 (02:30 +0900)
化合台をshift移動可能にした

60 files changed:
ChemiCraft仕様書.odt [new file with mode: 0644]
common/chemicraft/ChemiCraft.java
common/chemicraft/ChemiCraftAPI.java
common/chemicraft/block/BlockChemicalCombinationTable.java
common/chemicraft/block/BlockChemicalCraftingTable.java
common/chemicraft/block/BlockDecompositionTable.java
common/chemicraft/block/BlockToolAndWeaponCraftingTable.java
common/chemicraft/compounds/CompoundWater.java
common/chemicraft/container/ContainerChemicalCombinationTable.java
common/chemicraft/container/ContainerChemicalCraftingTable.java
common/chemicraft/container/ContainerDecompositionTable.java
common/chemicraft/container/ContainerToolAndWeaponCraftingTable.java
common/chemicraft/debug/CommandDeleteItem.java
common/chemicraft/debug/CommandGenDebugRoom.java
common/chemicraft/debug/CommandSetTile.java
common/chemicraft/debug/CompoundHandlerTest.java
common/chemicraft/debug/SetBlockSupport.java
common/chemicraft/entity/EntityAtomsGrenade.java
common/chemicraft/gui/GuiChemicalCombinationTable.java
common/chemicraft/gui/GuiChemicalCraftingTable.java
common/chemicraft/gui/GuiDecompositionTable.java
common/chemicraft/gui/GuiToolAndWeaponCraftingTable.java
common/chemicraft/inventory/InventoryChemicalCombinationTableMaterial.java
common/chemicraft/inventory/InventoryChemicalCombinationTableResult.java
common/chemicraft/inventory/InventoryChemicalCraftingMaterial.java
common/chemicraft/inventory/InventoryChemicalCraftingNBT.java
common/chemicraft/inventory/InventoryChemicalCraftingResult.java
common/chemicraft/inventory/InventoryDecompositionTableMaterial.java
common/chemicraft/inventory/InventoryDecompositionTableResult.java
common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableMaterial.java
common/chemicraft/inventory/InventoryToolAndWeaponCraftingTableResult.java
common/chemicraft/item/ItemAtomInfoContainer.java
common/chemicraft/item/ItemAtoms.java
common/chemicraft/item/ItemAtomsGrenade.java
common/chemicraft/item/ItemCompounds.java
common/chemicraft/item/ItemGasCollectingBottle.java
common/chemicraft/render/RenderAtomsGrenade.java
common/chemicraft/slot/SlotChemicalCombinationTableMaterial.java
common/chemicraft/slot/SlotChemicalCombinationTableResult.java
common/chemicraft/slot/SlotChemicalCraftingTableResult.java
common/chemicraft/slot/SlotDecompositionTableMaterial.java
common/chemicraft/slot/SlotDecompositionTableResult.java
common/chemicraft/slot/SlotToolAndWeaponCraftingTableResult.java
common/chemicraft/system/ChemiCraftCraftingManager.java
common/chemicraft/system/CommonProxy.java
common/chemicraft/system/PacketHandler.java
common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
common/chemicraft/tileentity/TileEntityChemicalCraftingTable.java
common/chemicraft/tileentity/TileEntityDecompositionTable.java
common/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java
common/chemicraft/util/AtomInfo.java
common/chemicraft/util/Auxiliary.java
common/chemicraft/util/ChemicalNBTRecipe.java
common/chemicraft/util/ComparatorFormulaPart.java
common/chemicraft/util/ComparatorItemStack.java
common/chemicraft/util/CreativeTabAtoms.java
common/chemicraft/util/ICompoundHandler.java
common/chemicraft/util/MaterialRecipe.java
common/chemicraft/util/NBTRecipeGrenade.java
src/chemicraft/client/ClientProxy.java

diff --git a/ChemiCraft仕様書.odt b/ChemiCraft仕様書.odt
new file mode 100644 (file)
index 0000000..f4cf8bb
Binary files /dev/null and b/ChemiCraft仕様書.odt differ
index 09507f1..471e34d 100644 (file)
@@ -1,10 +1,10 @@
 package chemicraft;\r
 \r
-import net.minecraft.src.Block;\r
-import net.minecraft.src.CreativeTabs;\r
-import net.minecraft.src.Item;\r
-import net.minecraft.src.ItemStack;\r
-import net.minecraft.src.Material;\r
+import net.minecraft.block.Block;\r
+import net.minecraft.block.material.Material;\r
+import net.minecraft.creativetab.CreativeTabs;\r
+import net.minecraft.item.Item;\r
+import net.minecraft.item.ItemStack;\r
 import net.minecraftforge.common.Configuration;\r
 import net.minecraftforge.common.Property;\r
 import chemicraft.block.BlockChemicalCombinationTable;\r
@@ -229,10 +229,10 @@ public class ChemiCraft {
                this.itemAtomGrenade = new ItemAtomsGrenade(this.atomGrenadeID).setItemName("grenade").setIconIndex(1);\r
 \r
                // BlockをMinecraftに登録します\r
-               GameRegistry.registerBlock(this.blockDecompositionTable);\r
-               GameRegistry.registerBlock(this.blockChemicalCombinationTable);\r
-               GameRegistry.registerBlock(this.blockToolAndWeaponCraftingTable);\r
-               GameRegistry.registerBlock(this.blockChemicalCraftingTable);\r
+               GameRegistry.registerBlock(this.blockDecompositionTable, "BlockDecompositionTable");\r
+               GameRegistry.registerBlock(this.blockChemicalCombinationTable, "BlockChemicalCombinationTable");\r
+               GameRegistry.registerBlock(this.blockToolAndWeaponCraftingTable, "BlockToolAndWeaponCraftingTable");\r
+               GameRegistry.registerBlock(this.blockChemicalCraftingTable, "BlockMaterialCraftingTable");\r
 \r
                // Blockの名前を設定します\r
                this.nameAuxiliary.addName(this.blockDecompositionTable, "DecompositionTable");\r
index 89019e1..c04730b 100644 (file)
@@ -3,7 +3,7 @@ package chemicraft;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import net.minecraft.src.ItemStack;
+import net.minecraft.item.ItemStack;
 import chemicraft.system.ChemiCraftCraftingManager;
 import chemicraft.util.ChemicalNBTRecipe;
 import chemicraft.util.ICompoundHandler;
index 8769f9a..4562eda 100644 (file)
@@ -1,13 +1,12 @@
 package chemicraft.block;
 
-import cpw.mods.fml.common.network.PacketDispatcher;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
 import chemicraft.ChemiCraft;
 import chemicraft.tileentity.TileEntityChemicalCombinationTable;
-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;
 
 public class BlockChemicalCombinationTable extends BlockContainer {
 
index 5e45218..7bf1578 100644 (file)
@@ -1,10 +1,10 @@
 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 net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
 import chemicraft.ChemiCraft;
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;
 
index ea44a5d..d04afa8 100644 (file)
@@ -1,12 +1,12 @@
 package chemicraft.block;
 
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
 import chemicraft.ChemiCraft;
 import chemicraft.tileentity.TileEntityDecompositionTable;
-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;
 
 public class BlockDecompositionTable extends BlockContainer {
 
index fa140e6..463d2da 100644 (file)
@@ -1,12 +1,12 @@
 package chemicraft.block;
 
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
 import chemicraft.ChemiCraft;
 import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
-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;
 
 public class BlockToolAndWeaponCraftingTable extends BlockContainer {
 
index 8987a44..a009a6c 100644 (file)
@@ -1,9 +1,9 @@
 package chemicraft.compounds;
 
-import net.minecraft.src.Entity;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.World;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 import chemicraft.util.ICompoundHandler;
 
 public class CompoundWater implements ICompoundHandler {
index f291e81..2244348 100644 (file)
@@ -1,12 +1,12 @@
 package chemicraft.container;
 
-import cpw.mods.fml.common.network.PacketDispatcher;
-import net.minecraft.src.Container;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.Slot;
-import net.minecraft.src.World;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 import chemicraft.ChemiCraft;
 import chemicraft.ChemiCraftAPI;
 import chemicraft.inventory.InventoryChemicalCombinationTableMaterial;
@@ -14,6 +14,7 @@ import chemicraft.inventory.InventoryChemicalCombinationTableResult;
 import chemicraft.slot.SlotChemicalCombinationTableMaterial;
 import chemicraft.slot.SlotChemicalCombinationTableResult;
 import chemicraft.tileentity.TileEntityChemicalCombinationTable;
+import cpw.mods.fml.common.network.PacketDispatcher;
 
 public class ContainerChemicalCombinationTable extends Container {
 
@@ -98,12 +99,48 @@ public class ContainerChemicalCombinationTable extends Container {
        }
 
        @Override
-       public ItemStack transferStackInSlot(int par1){
-               return null;
+       public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) {
+               ItemStack var3 = null;
+               Slot var4 = (Slot)this.inventorySlots.get(par2);
+               Slot var6 = (Slot)this.inventorySlots.get(0);
+
+               if (var4 != null && var4.getHasStack()) {
+                       ItemStack var5 = var4.getStack();
+                       var3 = var5.copy();
+                       if (par2 >= 0 && par2 < 16) {
+                               if (!this.mergeItemStack(var5, 16, 52, false)) {
+                                       return null;
+                               }
+                       } else if (par2 >= 16 && par2 < 53) {
+                               if (var6.isItemValid(var3)) {
+                                       if (!this.mergeItemStack(var5, 0, 15, false)) {
+                                               return null;
+                                       }
+                               }
+                       } else if(par2 == 16) {
+                               if (!this.mergeItemStack(var5, 16, 52, false)) {
+                                       return null;
+                               }
+                       }
+
+                       if (var5.stackSize == 0) {
+                               var4.putStack((ItemStack)null);
+                       } else {
+                               var4.onSlotChanged();
+                       }
+
+                       if (var5.stackSize == var3.stackSize) {
+                               return null;
+                       }
+
+                       var4.onPickupFromSlot(par1EntityPlayer, var5);
+               }
+
+               return var3;
        }
 
        @Override
-       public ItemStack slotClick(int par1, int par2, boolean par3, EntityPlayer par4EntityPlayer) {
+       public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer par4EntityPlayer) {
                if (par1 == 15) {
                        if (this.invr.getStackInSlot(0) != null) {
                                this.tileentity.emptytoAtomsList();
index f31b169..017066f 100644 (file)
@@ -1,11 +1,11 @@
 package chemicraft.container;
 
-import net.minecraft.src.Container;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.Slot;
-import net.minecraft.src.World;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 import chemicraft.ChemiCraft;
 import chemicraft.ChemiCraftAPI;
 import chemicraft.inventory.InventoryChemicalCraftingMaterial;
@@ -93,7 +93,7 @@ public class ContainerChemicalCraftingTable extends Container {
        }
 
        @Override
-       public ItemStack slotClick(int par1, int par2, boolean par3, EntityPlayer par4EntityPlayer)
+       public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer par4EntityPlayer)
        {
                if(par1 == 12){
                        if(this.invr.getStackInSlot(0) == null) return super.slotClick(par1, par2, par3, par4EntityPlayer);
@@ -133,7 +133,7 @@ public class ContainerChemicalCraftingTable extends Container {
 
 
        @Override
-       public ItemStack transferStackInSlot(int par1){
+       public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2){
                return null;
        }
 
index 746fabe..b46340d 100644 (file)
@@ -1,8 +1,8 @@
 package chemicraft.container;
 
-import net.minecraft.src.Container;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.World;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.world.World;
 import chemicraft.ChemiCraft;
 import chemicraft.tileentity.TileEntityDecompositionTable;
 
index ebbd2c2..acadb79 100644 (file)
@@ -1,7 +1,7 @@
 package chemicraft.container;
 
-import net.minecraft.src.Container;
-import net.minecraft.src.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
 import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 
 public class ContainerToolAndWeaponCraftingTable extends Container {
index 83c4251..be3b649 100644 (file)
@@ -3,13 +3,13 @@ package chemicraft.debug;
 import java.util.Iterator;
 import java.util.List;
 
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayerMP;
 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;
+import net.minecraft.world.World;
 
 public class CommandDeleteItem extends CommandBase {
 
index ca944ac..1d95976 100644 (file)
@@ -1,10 +1,10 @@
 package chemicraft.debug;
 
-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 net.minecraft.block.Block;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
 
 public class CommandGenDebugRoom extends CommandBase {
 
index ffbbad5..d7b4bfa 100644 (file)
@@ -1,10 +1,10 @@
 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 net.minecraft.block.Block;\r
+import net.minecraft.command.CommandBase;\r
+import net.minecraft.command.ICommandSender;\r
+import net.minecraft.entity.player.EntityPlayer;\r
+import net.minecraft.world.World;\r
 \r
 public class CommandSetTile extends CommandBase {\r
 \r
index e49e646..3dbe818 100644 (file)
@@ -1,9 +1,9 @@
 package chemicraft.debug;
 
-import net.minecraft.src.Entity;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.World;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 import chemicraft.util.ICompoundHandler;
 
 public class CompoundHandlerTest implements ICompoundHandler {
index 6017990..d9aded8 100644 (file)
@@ -1,7 +1,7 @@
 package chemicraft.debug;\r
 import java.util.Random;\r
 \r
-import net.minecraft.src.World;\r
+import net.minecraft.world.World;\r
 \r
 public class SetBlockSupport\r
 {\r
index ca1e27e..deb72b1 100644 (file)
@@ -2,13 +2,13 @@ package chemicraft.entity;
 
 import java.util.Iterator;
 
-import net.minecraft.src.DamageSource;
-import net.minecraft.src.Entity;
-import net.minecraft.src.EntityLiving;
-import net.minecraft.src.EntityThrowable;
-import net.minecraft.src.MovingObjectPosition;
-import net.minecraft.src.PotionEffect;
-import net.minecraft.src.World;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.projectile.EntityThrowable;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
 
 public class EntityAtomsGrenade extends EntityThrowable
 {
@@ -44,15 +44,15 @@ public class EntityAtomsGrenade extends EntityThrowable
                }
 
                if (par1MovingObjectPosition.entityHit != null) {
-                       par1MovingObjectPosition.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.thrower), 2);
+                       par1MovingObjectPosition.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.func_85052_h()), 2);
                        par1MovingObjectPosition.entityHit.setFire(5);
                }
 
                if (!this.worldObj.isRemote && !isNuke) {
-                       this.worldObj.newExplosion((Entity)null, this.posX, this.posY, this.posZ, explodeSize, onFire);
+                       this.worldObj.createExplosion((Entity)null, this.posX, this.posY, this.posZ, explodeSize, onFire);
                        this.isDead = true;
                }else if(!this.worldObj.isRemote && isNuke){
-                       this.worldObj.newExplosion((Entity)null, this.posX, this.posY, this.posZ, explodeSize, onFire);
+                       this.worldObj.createExplosion((Entity)null, this.posX, this.posY, this.posZ, explodeSize, onFire);
                        Iterator<EntityLiving> itr = this.worldObj.getEntitiesWithinAABB(EntityLiving.class, this.boundingBox.expand(30, 30, 30)).iterator();
                        while(itr.hasNext()){
                                EntityLiving entity = itr.next();
index b6d2114..7daf181 100644 (file)
@@ -1,20 +1,12 @@
 package chemicraft.gui;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import net.minecraft.src.EntityItem;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.GuiButton;
-import net.minecraft.src.GuiContainer;
-import net.minecraft.src.GuiTextField;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.World;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiTextField;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.EntityPlayer;
 import chemicraft.ChemiCraft;
 import chemicraft.container.ContainerChemicalCombinationTable;
 import chemicraft.tileentity.TileEntityChemicalCombinationTable;
-import chemicraft.util.ComparatorItemStack;
 import cpw.mods.fml.common.network.PacketDispatcher;
 
 public class GuiChemicalCombinationTable extends GuiContainer {
@@ -58,7 +50,7 @@ public class GuiChemicalCombinationTable extends GuiContainer {
        }
 
        @Override
-       protected void drawGuiContainerForegroundLayer() {
+       protected void drawGuiContainerForegroundLayer(int par1, int par2) {
                this.atomList.setText(this.tileentity.getAtoms());
                this.atomList.drawTextBox();
        }
index 76f533b..a25ad96 100644 (file)
@@ -1,12 +1,12 @@
 package chemicraft.gui;
 
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.GuiContainer;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.EntityPlayer;
 import chemicraft.ChemiCraft;
 import chemicraft.container.ContainerChemicalCraftingTable;
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.asm.SideOnly;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 @SideOnly(Side.CLIENT)
 public class GuiChemicalCraftingTable extends GuiContainer {
index c8bf8ab..1bef9c4 100644 (file)
@@ -1,7 +1,7 @@
 package chemicraft.gui;
 
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.GuiContainer;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.EntityPlayer;
 import chemicraft.ChemiCraft;
 import chemicraft.container.ContainerDecompositionTable;
 import chemicraft.tileentity.TileEntityDecompositionTable;
index aace07d..d3e9288 100644 (file)
@@ -1,7 +1,7 @@
 package chemicraft.gui;
 
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.GuiContainer;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.EntityPlayer;
 import chemicraft.ChemiCraft;
 import chemicraft.container.ContainerToolAndWeaponCraftingTable;
 import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
index a04c0fb..42f2f05 100644 (file)
@@ -1,9 +1,9 @@
 package chemicraft.inventory;
 
-import net.minecraft.src.Container;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
 
 public class InventoryChemicalCombinationTableMaterial implements IInventory {
 
index b319ba7..a6edc74 100644 (file)
@@ -1,9 +1,9 @@
 package chemicraft.inventory;
 
-import net.minecraft.src.Container;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
 
 public class InventoryChemicalCombinationTableResult implements IInventory {
 
index a976f85..6bd7c4b 100644 (file)
@@ -1,9 +1,9 @@
 package chemicraft.inventory;
 
-import net.minecraft.src.Container;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
 
 public class InventoryChemicalCraftingMaterial implements IInventory {
 
index 9c21cc2..f57eb68 100644 (file)
@@ -1,9 +1,9 @@
 package chemicraft.inventory;
 
-import net.minecraft.src.Container;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
 
 public class InventoryChemicalCraftingNBT implements IInventory {
 
index 418100b..1c6aa6e 100644 (file)
@@ -1,9 +1,9 @@
 package chemicraft.inventory;
 
-import net.minecraft.src.Container;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
 
 public class InventoryChemicalCraftingResult implements IInventory {
 
index cde2931..9326cb6 100644 (file)
@@ -1,9 +1,9 @@
 package chemicraft.inventory;
 
-import net.minecraft.src.Container;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
 
 public class InventoryDecompositionTableMaterial implements IInventory {
 
index bb17ff3..05bd099 100644 (file)
@@ -1,9 +1,9 @@
 package chemicraft.inventory;
 
-import net.minecraft.src.Container;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
 
 public class InventoryDecompositionTableResult implements IInventory {
 
index b72e471..aad5063 100644 (file)
@@ -1,9 +1,9 @@
 package chemicraft.inventory;
 
-import net.minecraft.src.Container;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
 
 public class InventoryToolAndWeaponCraftingTableMaterial implements IInventory {
 
index c6ff3a1..b6743a7 100644 (file)
@@ -1,9 +1,9 @@
 package chemicraft.inventory;
 
-import net.minecraft.src.Container;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
 
 public class InventoryToolAndWeaponCraftingTableResult implements IInventory {
 
index 1effca4..2c2894e 100644 (file)
@@ -1,6 +1,6 @@
 package chemicraft.item;\r
 \r
-import net.minecraft.src.Item;\r
+import net.minecraft.item.Item;\r
 import chemicraft.util.AtomInfo;\r
 \r
 public class ItemAtomInfoContainer extends Item {\r
index 2970d0f..b766426 100644 (file)
@@ -2,12 +2,12 @@ package chemicraft.item;
 
 import java.util.List;
 
-import net.minecraft.src.CreativeTabs;
-import net.minecraft.src.Item;
-import net.minecraft.src.ItemStack;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import chemicraft.ChemiCraft;
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.asm.SideOnly;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemAtoms extends Item {
 
index 1dcfda9..8d33bec 100644 (file)
@@ -2,16 +2,12 @@ package chemicraft.item;
 
 import java.util.List;
 
-import chemicraft.entity.EntityAtomsGrenade;
-
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.Item;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.NBTTagCompound;
-import net.minecraft.src.NBTTagList;
-import net.minecraft.src.World;
-import net.minecraft.src.WorldClient;
-import net.minecraft.src.WorldServer;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.world.World;
 import chemicraft.entity.EntityAtomsGrenade;
 
 public class ItemAtomsGrenade extends Item {
@@ -54,14 +50,14 @@ public class ItemAtomsGrenade extends Item {
        }
 
        @Override
-       public void addInformation(ItemStack par1ItemStack, List par2List) {
+       public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
                ItemStack var2 = new ItemStack(this);
                if(par1ItemStack.hasTagCompound()){
                        NBTTagList var1 = par1ItemStack.getTagCompound().getTagList("Effect");
 
                        for(int i = 0;i < 3;i++){
                                if(!((NBTTagCompound)var1.tagAt(0)).getString("GrenadeEffect" + i).equals("")){
-                                       par2List.add(
+                                       par3List.add(
                                                        ((NBTTagCompound)var1.tagAt(0)).getString("GrenadeEffect" + i)
                                                        );
                                }
index b511e9c..18df605 100644 (file)
@@ -2,16 +2,16 @@ 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 net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 import chemicraft.ChemiCraft;
 import chemicraft.ChemiCraftAPI;
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.asm.SideOnly;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemCompounds extends Item {
 
index 49ef396..f412384 100644 (file)
@@ -1,10 +1,10 @@
 package chemicraft.item;
 
-import net.minecraft.src.Block;
-import net.minecraft.src.BlockFire;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.World;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockFire;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 import chemicraft.ChemiCraft;
 import chemicraft.ChemiCraftAPI;
 import chemicraft.util.MathHelperPlus;
index 52d8815..916a86f 100644 (file)
@@ -1,16 +1,16 @@
 package chemicraft.render;
 
-import net.minecraft.src.Entity;
-import net.minecraft.src.Render;
-import net.minecraft.src.Tessellator;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.entity.Entity;
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
 import chemicraft.ChemiCraft;
 import chemicraft.entity.EntityAtomsGrenade;
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.asm.SideOnly;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 @SideOnly(Side.CLIENT)
 public class RenderAtomsGrenade extends Render {
index 1ae9c97..288775d 100644 (file)
@@ -1,9 +1,9 @@
 package chemicraft.slot;
 
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
 import chemicraft.ChemiCraft;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.Slot;
 
 public class SlotChemicalCombinationTableMaterial extends Slot {
 
index 70976da..52a1837 100644 (file)
@@ -1,8 +1,8 @@
 package chemicraft.slot;
 
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.Slot;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
 
 public class SlotChemicalCombinationTableResult extends Slot {
 
index fd255d5..1611868 100644 (file)
@@ -1,8 +1,8 @@
 package chemicraft.slot;
 
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.Slot;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
 
 public class SlotChemicalCraftingTableResult extends Slot {
 
index b1041d5..4925d0d 100644 (file)
@@ -1,7 +1,7 @@
 package chemicraft.slot;
 
-import net.minecraft.src.IInventory;
-import net.minecraft.src.Slot;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
 
 public class SlotDecompositionTableMaterial extends Slot {
 
index c4b773a..1200f4b 100644 (file)
@@ -1,8 +1,8 @@
 package chemicraft.slot;
 
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.Slot;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
 
 public class SlotDecompositionTableResult extends Slot {
 
index 23d62c0..a49b5f3 100644 (file)
@@ -1,8 +1,8 @@
 package chemicraft.slot;
 
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.Slot;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
 
 public class SlotToolAndWeaponCraftingTableResult extends Slot {
 
index 05bc895..48d177d 100644 (file)
@@ -3,8 +3,8 @@ package chemicraft.system;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
 import chemicraft.ChemiCraftAPI;
 import chemicraft.inventory.InventoryChemicalCraftingMaterial;
 import chemicraft.inventory.InventoryChemicalCraftingNBT;
index da801ea..a2b686b 100644 (file)
@@ -1,8 +1,8 @@
 package chemicraft.system;
 
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.TileEntity;
-import net.minecraft.src.World;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
 import chemicraft.container.ContainerChemicalCombinationTable;
 import chemicraft.container.ContainerChemicalCraftingTable;
 import chemicraft.container.ContainerDecompositionTable;
index 89430f3..6bb2dcb 100644 (file)
@@ -4,12 +4,12 @@ import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;\r
 import java.io.IOException;\r
 \r
-import net.minecraft.src.EntityPlayer;\r
-import net.minecraft.src.NetworkManager;\r
-import net.minecraft.src.Packet;\r
-import net.minecraft.src.Packet250CustomPayload;\r
-import net.minecraft.src.TileEntity;\r
-import net.minecraft.src.World;\r
+import net.minecraft.entity.player.EntityPlayer;\r
+import net.minecraft.network.INetworkManager;\r
+import net.minecraft.network.packet.Packet;\r
+import net.minecraft.network.packet.Packet250CustomPayload;\r
+import net.minecraft.tileentity.TileEntity;\r
+import net.minecraft.world.World;\r
 import chemicraft.ChemiCraft;\r
 import chemicraft.tileentity.TileEntityChemicalCombinationTable;\r
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;\r
@@ -31,7 +31,7 @@ import cpw.mods.fml.common.network.Player;
 public class PacketHandler implements IPacketHandler {\r
 \r
        @Override\r
-       public void onPacketData(NetworkManager manager, Packet250CustomPayload packet, Player player) {\r
+       public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player) {\r
                if (packet.channel.equals("chemicraft")) {\r
                        ByteArrayDataInput badi = ByteStreams.newDataInput(packet.data);\r
 \r
index 8322eb4..35b2dcb 100644 (file)
@@ -4,14 +4,13 @@ import java.io.DataOutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import net.minecraft.src.EntityItem;
-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 net.minecraft.src.WorldServer;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.network.packet.Packet;
+import net.minecraft.tileentity.TileEntity;
 import chemicraft.ChemiCraft;
 import chemicraft.ChemiCraftData;
 import chemicraft.inventory.InventoryChemicalCombinationTableMaterial;
index 3f80541..dfd5a19 100644 (file)
@@ -2,12 +2,12 @@ package chemicraft.tileentity;
 
 import java.io.DataOutputStream;
 
-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 net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.network.packet.Packet;
+import net.minecraft.tileentity.TileEntity;
 import chemicraft.inventory.InventoryChemicalCraftingMaterial;
 import chemicraft.inventory.InventoryChemicalCraftingNBT;
 import chemicraft.inventory.InventoryChemicalCraftingResult;
index cb87c1f..fcb4ee5 100644 (file)
@@ -2,14 +2,13 @@ package chemicraft.tileentity;
 
 import java.io.DataOutputStream;
 
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
 import chemicraft.inventory.InventoryDecompositionTableMaterial;
 import chemicraft.inventory.InventoryDecompositionTableResult;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import net.minecraft.src.NBTTagCompound;
-import net.minecraft.src.TileEntity;
-
 public class TileEntityDecompositionTable extends TileEntity {
 
        private InventoryDecompositionTableMaterial invm = new InventoryDecompositionTableMaterial();
index 87c609b..44bc07e 100644 (file)
@@ -2,9 +2,9 @@ package chemicraft.tileentity;
 
 import java.io.DataOutputStream;
 
-import com.google.common.io.ByteArrayDataInput;
+import net.minecraft.tileentity.TileEntity;
 
-import net.minecraft.src.TileEntity;
+import com.google.common.io.ByteArrayDataInput;
 
 public class TileEntityToolAndWeaponCraftingTable extends TileEntity {
 
index 0cb377a..484fef1 100644 (file)
@@ -1,9 +1,9 @@
 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.World;\r
+import net.minecraft.entity.player.EntityPlayer;\r
+import net.minecraft.world.World;\r
+import cpw.mods.fml.relauncher.Side;\r
+import cpw.mods.fml.relauncher.SideOnly;\r
 \r
 /**\r
  * いろいろなデータを格納しメソッドによってチェックするクラス\r
index 3f33d48..7560c60 100644 (file)
@@ -1,8 +1,8 @@
 package chemicraft.util;\r
 \r
-import net.minecraft.src.Block;\r
-import net.minecraft.src.Item;\r
-import net.minecraft.src.ItemStack;\r
+import net.minecraft.block.Block;\r
+import net.minecraft.item.Item;\r
+import net.minecraft.item.ItemStack;\r
 import cpw.mods.fml.common.registry.LanguageRegistry;\r
 \r
 public class Auxiliary {\r
index 914d194..7fcf71e 100644 (file)
@@ -1,6 +1,6 @@
 package chemicraft.util;
 
-import net.minecraft.src.ItemStack;
+import net.minecraft.item.ItemStack;
 
 public abstract class ChemicalNBTRecipe {
 
index 3b6ab89..d6a7cf6 100644 (file)
@@ -1,6 +1,5 @@
 package chemicraft.util;
 
-import java.util.Arrays;
 import java.util.Comparator;
 
 public class ComparatorFormulaPart implements Comparator<FormulaPart> {
index 8cc5412..8962fd6 100644 (file)
@@ -2,7 +2,7 @@ package chemicraft.util;
 
 import java.util.Comparator;
 
-import net.minecraft.src.ItemStack;
+import net.minecraft.item.ItemStack;
 
 
 public class ComparatorItemStack implements Comparator {
index aa500e9..a71d7c1 100644 (file)
@@ -1,9 +1,9 @@
 package chemicraft.util;
 
-import net.minecraft.src.CreativeTabs;
+import net.minecraft.creativetab.CreativeTabs;
 import chemicraft.ChemiCraft;
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.asm.SideOnly;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class CreativeTabAtoms extends CreativeTabs {
 
index 20a0a98..9e2ac27 100644 (file)
@@ -1,9 +1,9 @@
 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
+import net.minecraft.entity.Entity;\r
+import net.minecraft.entity.player.EntityPlayer;\r
+import net.minecraft.item.ItemStack;\r
+import net.minecraft.world.World;\r
 \r
 public interface ICompoundHandler {\r
 \r
index 2c734ca..872d7bb 100644 (file)
@@ -3,7 +3,7 @@ package chemicraft.util;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import net.minecraft.src.ItemStack;
+import net.minecraft.item.ItemStack;
 import chemicraft.ChemiCraft;
 import chemicraft.inventory.InventoryChemicalCraftingMaterial;
 
index c964506..8d342e0 100644 (file)
@@ -1,8 +1,8 @@
 package chemicraft.util;
 
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.NBTTagCompound;
-import net.minecraft.src.NBTTagList;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import chemicraft.ChemiCraft;
 import chemicraft.ChemiCraftData;
 
index 5f6a436..994d915 100644 (file)
@@ -1,8 +1,8 @@
 package chemicraft.client;
 
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.TileEntity;
-import net.minecraft.src.World;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 import chemicraft.ChemiCraft;
 import chemicraft.entity.EntityAtomsGrenade;