修正・変更

マージ時に起きたエラーを修正
APIのgetInstance()をinstance()変更

diff --git a/common/pcc/chemicraft/ChemiCraft.java b/common/pcc/chemicraft/ChemiCraft.java
index a84acc8..c06acce 100644 (file)
--- a/common/pcc/chemicraft/ChemiCraft.java
+++ b/common/pcc/chemicraft/ChemiCraft.java
@@ -1,32 +1,5 @@
 package pcc.chemicraft;
 
-import pcc.chemicraft.block.BlockChemicalCombinationTable;
-import pcc.chemicraft.block.BlockChemicalCraftingTable;
-import pcc.chemicraft.block.BlockElectrolysisTable;
-import pcc.chemicraft.block.BlockPyrolysisTable;
-import pcc.chemicraft.block.BlockToolAndWeaponCraftingTable;
-import pcc.chemicraft.compounds.CompoundWater;
-import pcc.chemicraft.debug.CommandDeleteItem;
-import pcc.chemicraft.debug.CommandGenDebugRoom;
-import pcc.chemicraft.debug.CommandSetTile;
-import pcc.chemicraft.gen.WorldGenAtomsOre;
-import pcc.chemicraft.item.ItemAtoms;
-import pcc.chemicraft.item.ItemAtomsGrenade;
-import pcc.chemicraft.item.ItemCompounds;
-import pcc.chemicraft.item.ItemGasCollectingBottle;
-import pcc.chemicraft.system.CommonProxy;
-import pcc.chemicraft.system.PacketHandler;
-import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
-import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
-import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
-import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
-import pcc.chemicraft.util.Auxiliary;
-import pcc.chemicraft.util.CreativeTabAtoms;
-import pcc.chemicraft.util.NBTRecipeGrenade;
-import pcc.chemicraft.util.WorldProviderChemical;
-import pcc.chemicraft.util.Auxiliary.ArrayAuxiliary;
-import pcc.chemicraft.util.Auxiliary.NameAuxiliary;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
@@ -44,6 +17,7 @@ import pcc.chemicraft.compounds.CompoundWater;
 import pcc.chemicraft.debug.CommandDeleteItem;
 import pcc.chemicraft.debug.CommandGenDebugRoom;
 import pcc.chemicraft.debug.CommandSetTile;
+import pcc.chemicraft.gen.WorldGenAtomsOre;
 import pcc.chemicraft.item.ItemAtoms;
 import pcc.chemicraft.item.ItemAtomsGrenade;
 import pcc.chemicraft.item.ItemCompounds;

diff --git a/common/pcc/chemicraft/ChemiCraftAPI.java b/common/pcc/chemicraft/ChemiCraftAPI.java
index 94b190f..39e38cf 100644 (file)
--- a/common/pcc/chemicraft/ChemiCraftAPI.java
+++ b/common/pcc/chemicraft/ChemiCraftAPI.java
@@ -3,21 +3,13 @@ package pcc.chemicraft;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import pcc.chemicraft.system.ChemiCraftCraftingManager;
-import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
-import pcc.chemicraft.util.ChemicalNBTRecipe;
-import pcc.chemicraft.util.ICompoundHandler;
-import pcc.chemicraft.util.MaterialRecipe;
-
 import net.minecraft.item.ItemStack;
-<<<<<<< HEAD:common/pcc/chemicraft/ChemiCraftAPI.java
-=======
 import pcc.chemicraft.system.ChemiCraftCraftingManager;
 import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
 import pcc.chemicraft.util.ChemicalNBTRecipe;
 import pcc.chemicraft.util.ICompoundHandler;
 import pcc.chemicraft.util.MaterialRecipe;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/ChemiCraftAPI.java
+
 
 /**
  * ChemiCraftのAPI
@@ -99,7 +91,7 @@ public class ChemiCraftAPI {
        private ChemiCraftCraftingManager chemiCraftCraftingManager = new ChemiCraftCraftingManager();
 
 
-<<<<<<< HEAD:common/pcc/chemicraft/ChemiCraftAPI.java
+
        private ArrayList<Integer> atomsOreIDList = new ArrayList<Integer>();
 
 
@@ -113,7 +105,9 @@ public class ChemiCraftAPI {
 
 
        private ArrayList<Integer> atomsOrePosYList = new ArrayList<Integer>();
-=======
+
+
+
        /**
         * ツール&武器作成台の素材一覧のリスト
         */
@@ -130,7 +124,6 @@ public class ChemiCraftAPI {
         * ツール&武器作成台の不定形であるか
         */
        private ArrayList<Boolean> toolAndWeaponSharpless = new ArrayList<Boolean>();
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/ChemiCraftAPI.java
 
 
 

diff --git a/common/pcc/chemicraft/block/BlockChemicalCombinationTable.java b/common/pcc/chemicraft/block/BlockChemicalCombinationTable.java
index fced8ce..56bcb66 100644 (file)
--- a/common/pcc/chemicraft/block/BlockChemicalCombinationTable.java
+++ b/common/pcc/chemicraft/block/BlockChemicalCombinationTable.java
@@ -1,7 +1,5 @@
 package pcc.chemicraft.block;
 
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;

diff --git a/common/pcc/chemicraft/block/BlockChemicalCraftingTable.java b/common/pcc/chemicraft/block/BlockChemicalCraftingTable.java
index fcbbf04..64fb2bc 100644 (file)
--- a/common/pcc/chemicraft/block/BlockChemicalCraftingTable.java
+++ b/common/pcc/chemicraft/block/BlockChemicalCraftingTable.java
@@ -1,7 +1,5 @@
 package pcc.chemicraft.block;
 
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;

diff --git a/common/pcc/chemicraft/block/BlockElectrolysisTable.java b/common/pcc/chemicraft/block/BlockElectrolysisTable.java
index f54fc35..f0b41f4 100644 (file)
--- a/common/pcc/chemicraft/block/BlockElectrolysisTable.java
+++ b/common/pcc/chemicraft/block/BlockElectrolysisTable.java
@@ -1,8 +1,5 @@
 package pcc.chemicraft.block;
 
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.debug.DebugTick;
-import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;

diff --git a/common/pcc/chemicraft/block/BlockPyrolysisTable.java b/common/pcc/chemicraft/block/BlockPyrolysisTable.java
index 65b591e..cb0c4fe 100644 (file)
--- a/common/pcc/chemicraft/block/BlockPyrolysisTable.java
+++ b/common/pcc/chemicraft/block/BlockPyrolysisTable.java
@@ -1,8 +1,5 @@
 package pcc.chemicraft.block;
 
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.debug.DebugTick;
-import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;

diff --git a/common/pcc/chemicraft/block/BlockToolAndWeaponCraftingTable.java b/common/pcc/chemicraft/block/BlockToolAndWeaponCraftingTable.java
index 72af9e9..399bca8 100644 (file)
--- a/common/pcc/chemicraft/block/BlockToolAndWeaponCraftingTable.java
+++ b/common/pcc/chemicraft/block/BlockToolAndWeaponCraftingTable.java
@@ -1,7 +1,5 @@
 package pcc.chemicraft.block;
 
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;

diff --git a/common/pcc/chemicraft/client/ClientProxy.java b/common/pcc/chemicraft/client/ClientProxy.java
index cbed7bd..128a4fd 100644 (file)
--- a/common/pcc/chemicraft/client/ClientProxy.java
+++ b/common/pcc/chemicraft/client/ClientProxy.java
@@ -1,20 +1,5 @@
 package pcc.chemicraft.client;
 
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.debug.DebugTick;
-import pcc.chemicraft.entity.EntityAtomsGrenade;
-import pcc.chemicraft.gui.GuiChemicalCombinationTable;
-import pcc.chemicraft.gui.GuiChemicalCraftingTable;
-import pcc.chemicraft.gui.GuiElectrolysisTable;
-import pcc.chemicraft.gui.GuiPyrolysisTable;
-import pcc.chemicraft.gui.GuiToolAndWeaponCraftingTable;
-import pcc.chemicraft.render.RenderAtomsGrenade;
-import pcc.chemicraft.system.CommonProxy;
-import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
-import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
-import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
-import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;

diff --git a/common/pcc/chemicraft/container/ContainerChemicalCombinationTable.java b/common/pcc/chemicraft/container/ContainerChemicalCombinationTable.java
index 456dfcf..ada41bc 100644 (file)
--- a/common/pcc/chemicraft/container/ContainerChemicalCombinationTable.java
+++ b/common/pcc/chemicraft/container/ContainerChemicalCombinationTable.java
@@ -1,24 +1,11 @@
 package pcc.chemicraft.container;
 
-<<<<<<< HEAD:common/pcc/chemicraft/container/ContainerChemicalCombinationTable.java
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.ChemiCraftAPI;
-import pcc.chemicraft.inventory.InventoryChemicalCombinationTableMaterial;
-import pcc.chemicraft.inventory.InventoryChemicalCombinationTableResult;
-import pcc.chemicraft.slot.SlotChemicalCombinationTableMaterial;
-import pcc.chemicraft.slot.SlotChemicalCombinationTableResult;
-import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
-import net.minecraft.block.Block;
-=======
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/container/ContainerChemicalCombinationTable.java
 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;
-<<<<<<< HEAD:common/pcc/chemicraft/container/ContainerChemicalCombinationTable.java
-=======
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.ChemiCraftAPI;
 import pcc.chemicraft.inventory.InventoryChemicalCombinationTableMaterial;
@@ -26,7 +13,6 @@ import pcc.chemicraft.inventory.InventoryChemicalCombinationTableResult;
 import pcc.chemicraft.slot.SlotChemicalCombinationTableMaterial;
 import pcc.chemicraft.slot.SlotChemicalCombinationTableResult;
 import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/container/ContainerChemicalCombinationTable.java
 import cpw.mods.fml.common.network.PacketDispatcher;
 
 public class ContainerChemicalCombinationTable extends Container {

diff --git a/common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java b/common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java
index aa66cd0..9492bcd 100644 (file)
--- a/common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java
+++ b/common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java
@@ -1,24 +1,11 @@
 package pcc.chemicraft.container;
 
-<<<<<<< HEAD:common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.ChemiCraftAPI;
-import pcc.chemicraft.inventory.InventoryChemicalCraftingMaterial;
-import pcc.chemicraft.inventory.InventoryChemicalCraftingNBT;
-import pcc.chemicraft.inventory.InventoryChemicalCraftingResult;
-import pcc.chemicraft.slot.SlotChemicalCraftingTableResult;
-import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import pcc.chemicraft.util.ChemicalNBTRecipe;
-=======
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java
 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;
-<<<<<<< HEAD:common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java
-=======
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.ChemiCraftAPI;
 import pcc.chemicraft.inventory.InventoryChemicalCraftingMaterial;
@@ -27,7 +14,6 @@ import pcc.chemicraft.inventory.InventoryChemicalCraftingResult;
 import pcc.chemicraft.slot.SlotChemicalCraftingTableResult;
 import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
 import pcc.chemicraft.util.ChemicalNBTRecipe;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java
 
 public class ContainerChemicalCraftingTable extends Container {
 

diff --git a/common/pcc/chemicraft/container/ContainerElectrolysis.java b/common/pcc/chemicraft/container/ContainerElectrolysis.java
deleted file mode 100644 (file)
index 6d612cc..0000000
--- a/common/pcc/chemicraft/container/ContainerElectrolysis.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package pcc.chemicraft.container;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.Slot;
-import net.minecraft.world.World;
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.inventory.InventoryElectrolysisFuel;
-import pcc.chemicraft.inventory.InventoryElectrolysisMaterial;
-import pcc.chemicraft.inventory.InventoryElectrolysisResult;
-import pcc.chemicraft.slot.SlotElectrolysisMaterial;
-import pcc.chemicraft.slot.SlotElectrolysisResult;
-import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
-
-public class ContainerElectrolysis extends Container
-{
-
-       private World worldObj;
-
-       private int posX;
-       private int posY;
-       private int posZ;
-
-       private TileEntityElectrolysisTable tileEntity;
-
-       private InventoryElectrolysisMaterial invm;
-       private InventoryElectrolysisResult invr;
-       private InventoryElectrolysisFuel invf;
-
-       public ContainerElectrolysis(EntityPlayer par1EntityPlayer, TileEntityElectrolysisTable par2) {
-               super();
-               this.worldObj = par2.worldObj;
-               this.posX = par2.xCoord;
-               this.posY = par2.yCoord;
-               this.posZ = par2.zCoord;
-               this.invm = (InventoryElectrolysisMaterial) this.tileEntity.getInvMaterial();
-               this.invr = (InventoryElectrolysisResult) this.tileEntity.getInvResult();
-               this.invf = (InventoryElectrolysisFuel) this.tileEntity.getInvFuel();
-
-               this.addSlotToContainer(new SlotElectrolysisMaterial(invm, 0, 123, 34));
-               for (int i = 0; i < 16; i++) {
-                       this.addSlotToContainer(new SlotElectrolysisResult(invr, i, 123, 34));
-               }
-               this.addSlotToContainer(new SlotElectrolysisResult(invf, 0, 123, 34));
-
-               int var3;
-               for (var3 = 0; var3 < 3; ++var3)
-               {
-                       for (int var4 = 0; var4 < 9; ++var4)
-                       {
-                               this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var4 + var3 * 9 + 9, 8 + var4 * 18, 85 + var3 * 18));
-                       }
-               }
-
-               for (var3 = 0; var3 < 9; ++var3)
-               {
-                       this.addSlotToContainer(new Slot(par1EntityPlayer.inventory, var3, 8 + var3 * 18, 143));
-               }
-
-       }
-
-       @Override
-       public boolean canInteractWith(EntityPlayer par1EntityPlayer)
-       {
-               return this.worldObj.getBlockId(this.posX, this.posY, this.posZ) != ChemiCraft.instance.electrolysisTableID ? false : par1EntityPlayer.getDistanceSq((double) this.posX + 0.5D, (double) this.posY + 0.5D, (double) this.posZ + 0.5D) <= 64.0D;
-       }
-
-}

diff --git a/common/pcc/chemicraft/container/ContainerElectrolysisTable.java b/common/pcc/chemicraft/container/ContainerElectrolysisTable.java
index c474864..63ab366 100644 (file)
--- a/common/pcc/chemicraft/container/ContainerElectrolysisTable.java
+++ b/common/pcc/chemicraft/container/ContainerElectrolysisTable.java
@@ -1,13 +1,13 @@
 package pcc.chemicraft.container;
 
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.slot.SlotElectrolysisMaterial;
-import pcc.chemicraft.slot.SlotElectrolysisResult;
-import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.world.World;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.slot.SlotElectrolysisMaterial;
+import pcc.chemicraft.slot.SlotElectrolysisResult;
+import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
 
 public class ContainerElectrolysisTable extends Container
 {

diff --git a/common/pcc/chemicraft/container/ContainerPyrolysisTable.java b/common/pcc/chemicraft/container/ContainerPyrolysisTable.java
index badd173..38d6911 100644 (file)
--- a/common/pcc/chemicraft/container/ContainerPyrolysisTable.java
+++ b/common/pcc/chemicraft/container/ContainerPyrolysisTable.java
@@ -1,22 +1,15 @@
 package pcc.chemicraft.container;
 
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.slot.SlotPyrolysisTableFuel;
-import pcc.chemicraft.slot.SlotPyrolysisTableMaterial;
-import pcc.chemicraft.slot.SlotPyrolysisTableResult;
-import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.world.World;
-<<<<<<< HEAD:common/pcc/chemicraft/container/ContainerPyrolysisTable.java
-=======
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.slot.SlotPyrolysisTableFuel;
 import pcc.chemicraft.slot.SlotPyrolysisTableMaterial;
 import pcc.chemicraft.slot.SlotPyrolysisTableResult;
 import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/container/ContainerPyrolysisTable.java
+
 
 public class ContainerPyrolysisTable extends Container {
 

diff --git a/common/pcc/chemicraft/container/ContainerToolAndWeaponCraftingTable.java b/common/pcc/chemicraft/container/ContainerToolAndWeaponCraftingTable.java
index 6f8232f..767c98c 100644 (file)
--- a/common/pcc/chemicraft/container/ContainerToolAndWeaponCraftingTable.java
+++ b/common/pcc/chemicraft/container/ContainerToolAndWeaponCraftingTable.java
@@ -1,8 +1,8 @@
 package pcc.chemicraft.container;
 
-import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
+import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 
 public class ContainerToolAndWeaponCraftingTable extends Container {
 

diff --git a/common/pcc/chemicraft/debug/CompoundHandlerTest.java b/common/pcc/chemicraft/debug/CompoundHandlerTest.java
index 8ebe735..780278a 100644 (file)
--- a/common/pcc/chemicraft/debug/CompoundHandlerTest.java
+++ b/common/pcc/chemicraft/debug/CompoundHandlerTest.java
@@ -1,14 +1,11 @@
 package pcc.chemicraft.debug;
 
-import pcc.chemicraft.util.ICompoundHandler;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
-<<<<<<< HEAD:common/pcc/chemicraft/debug/CompoundHandlerTest.java
-=======
 import pcc.chemicraft.util.ICompoundHandler;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/debug/CompoundHandlerTest.java
+
 
 public class CompoundHandlerTest implements ICompoundHandler {
 

diff --git a/common/pcc/chemicraft/debug/DebugTick.java b/common/pcc/chemicraft/debug/DebugTick.java
index aae6f70..87a6605 100644 (file)
--- a/common/pcc/chemicraft/debug/DebugTick.java
+++ b/common/pcc/chemicraft/debug/DebugTick.java
@@ -1,11 +1,9 @@
 package pcc.chemicraft.debug;
 
-import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
-import java.awt.RenderingHints;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Iterator;

diff --git a/common/pcc/chemicraft/gen/WorldGenAtomsOre.java b/common/pcc/chemicraft/gen/WorldGenAtomsOre.java
index 4191193..fd190c6 100644 (file)
--- a/common/pcc/chemicraft/gen/WorldGenAtomsOre.java
+++ b/common/pcc/chemicraft/gen/WorldGenAtomsOre.java
@@ -2,8 +2,6 @@ package pcc.chemicraft.gen;
 
 import java.util.Random;
 
-import net.minecraft.block.Block;
-import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
 import net.minecraft.world.gen.feature.WorldGenMinable;

diff --git a/common/pcc/chemicraft/gui/GuiChemicalCombinationTable.java b/common/pcc/chemicraft/gui/GuiChemicalCombinationTable.java
index 91df08a..3305f12 100644 (file)
--- a/common/pcc/chemicraft/gui/GuiChemicalCombinationTable.java
+++ b/common/pcc/chemicraft/gui/GuiChemicalCombinationTable.java
@@ -1,18 +1,12 @@
 package pcc.chemicraft.gui;
 
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.container.ContainerChemicalCombinationTable;
-import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
 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;
-<<<<<<< HEAD:common/pcc/chemicraft/gui/GuiChemicalCombinationTable.java
-=======
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.container.ContainerChemicalCombinationTable;
 import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/gui/GuiChemicalCombinationTable.java
 import cpw.mods.fml.common.network.PacketDispatcher;
 
 public class GuiChemicalCombinationTable extends GuiContainer {

diff --git a/common/pcc/chemicraft/gui/GuiChemicalCraftingTable.java b/common/pcc/chemicraft/gui/GuiChemicalCraftingTable.java
index b54bbd2..dfad5cd 100644 (file)
--- a/common/pcc/chemicraft/gui/GuiChemicalCraftingTable.java
+++ b/common/pcc/chemicraft/gui/GuiChemicalCraftingTable.java
@@ -1,16 +1,10 @@
 package pcc.chemicraft.gui;
 
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.container.ContainerChemicalCraftingTable;
-import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.EntityPlayer;
-<<<<<<< HEAD:common/pcc/chemicraft/gui/GuiChemicalCraftingTable.java
-=======
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.container.ContainerChemicalCraftingTable;
 import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/gui/GuiChemicalCraftingTable.java
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

diff --git a/common/pcc/chemicraft/gui/GuiElectrolysisTable.java b/common/pcc/chemicraft/gui/GuiElectrolysisTable.java
index 3fd6b22..a8062c8 100644 (file)
--- a/common/pcc/chemicraft/gui/GuiElectrolysisTable.java
+++ b/common/pcc/chemicraft/gui/GuiElectrolysisTable.java
@@ -1,16 +1,10 @@
 package pcc.chemicraft.gui;
 
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.container.ContainerElectrolysisTable;
-import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.EntityPlayer;
-<<<<<<< HEAD:common/pcc/chemicraft/gui/GuiElectrolysisTable.java
-=======
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.container.ContainerElectrolysisTable;
 import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/gui/GuiElectrolysisTable.java
 
 public class GuiElectrolysisTable extends GuiContainer
 {

diff --git a/common/pcc/chemicraft/gui/GuiPyrolysisTable.java b/common/pcc/chemicraft/gui/GuiPyrolysisTable.java
index 406d55b..7777a5d 100644 (file)
--- a/common/pcc/chemicraft/gui/GuiPyrolysisTable.java
+++ b/common/pcc/chemicraft/gui/GuiPyrolysisTable.java
@@ -1,16 +1,10 @@
 package pcc.chemicraft.gui;
 
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.container.ContainerPyrolysisTable;
-import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.EntityPlayer;
-<<<<<<< HEAD:common/pcc/chemicraft/gui/GuiPyrolysisTable.java
-=======
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.container.ContainerPyrolysisTable;
 import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/gui/GuiPyrolysisTable.java
 
 public class GuiPyrolysisTable extends GuiContainer{
 

diff --git a/common/pcc/chemicraft/gui/GuiToolAndWeaponCraftingTable.java b/common/pcc/chemicraft/gui/GuiToolAndWeaponCraftingTable.java
index 11cdda9..d305318 100644 (file)
--- a/common/pcc/chemicraft/gui/GuiToolAndWeaponCraftingTable.java
+++ b/common/pcc/chemicraft/gui/GuiToolAndWeaponCraftingTable.java
@@ -1,16 +1,10 @@
 package pcc.chemicraft.gui;
 
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.container.ContainerToolAndWeaponCraftingTable;
-import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.EntityPlayer;
-<<<<<<< HEAD:common/pcc/chemicraft/gui/GuiToolAndWeaponCraftingTable.java
-=======
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.container.ContainerToolAndWeaponCraftingTable;
 import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/gui/GuiToolAndWeaponCraftingTable.java
 
 public class GuiToolAndWeaponCraftingTable extends GuiContainer {
 

diff --git a/common/pcc/chemicraft/item/ItemAtomInfoContainer.java b/common/pcc/chemicraft/item/ItemAtomInfoContainer.java
index d1d6dd8..f57e822 100644 (file)
--- a/common/pcc/chemicraft/item/ItemAtomInfoContainer.java
+++ b/common/pcc/chemicraft/item/ItemAtomInfoContainer.java
@@ -1,11 +1,7 @@
 package pcc.chemicraft.item;
 
-import pcc.chemicraft.util.AtomInfo;
 import net.minecraft.item.Item;
-<<<<<<< HEAD:common/pcc/chemicraft/item/ItemAtomInfoContainer.java
-=======
 import pcc.chemicraft.util.AtomInfo;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/item/ItemAtomInfoContainer.java
 
 public class ItemAtomInfoContainer extends Item {
 

diff --git a/common/pcc/chemicraft/item/ItemAtoms.java b/common/pcc/chemicraft/item/ItemAtoms.java
index 1854dbb..ad2ae60 100644 (file)
--- a/common/pcc/chemicraft/item/ItemAtoms.java
+++ b/common/pcc/chemicraft/item/ItemAtoms.java
@@ -2,15 +2,10 @@ package pcc.chemicraft.item;
 
 import java.util.List;
 
-import pcc.chemicraft.ChemiCraft;
-
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-<<<<<<< HEAD:common/pcc/chemicraft/item/ItemAtoms.java
-=======
 import pcc.chemicraft.ChemiCraft;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/item/ItemAtoms.java
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

diff --git a/common/pcc/chemicraft/item/ItemAtomsGrenade.java b/common/pcc/chemicraft/item/ItemAtomsGrenade.java
index 230e1f7..9ce2832 100644 (file)
--- a/common/pcc/chemicraft/item/ItemAtomsGrenade.java
+++ b/common/pcc/chemicraft/item/ItemAtomsGrenade.java
@@ -2,18 +2,13 @@ package pcc.chemicraft.item;
 
 import java.util.List;
 
-import pcc.chemicraft.entity.EntityAtomsGrenade;
-
 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;
-<<<<<<< HEAD:common/pcc/chemicraft/item/ItemAtomsGrenade.java
-=======
 import pcc.chemicraft.entity.EntityAtomsGrenade;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/item/ItemAtomsGrenade.java
 
 public class ItemAtomsGrenade extends Item {
 

diff --git a/common/pcc/chemicraft/item/ItemCompounds.java b/common/pcc/chemicraft/item/ItemCompounds.java
index 14be9bc..e34c3d6 100644 (file)
--- a/common/pcc/chemicraft/item/ItemCompounds.java
+++ b/common/pcc/chemicraft/item/ItemCompounds.java
@@ -2,23 +2,14 @@ package pcc.chemicraft.item;
 
 import java.util.List;
 
-<<<<<<< HEAD
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.ChemiCraftAPI;
-
-=======
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe
 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;
-<<<<<<< HEAD
-=======
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.ChemiCraftAPI;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -33,21 +24,14 @@ public class ItemCompounds extends Item {
 
        @Override
        public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) {
-<<<<<<< HEAD
-               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);
-                       }
-=======
                try {
-                       for(int i=0;i < ChemiCraftAPI.getInstance().getCompoundHandlerItemName().size();i++){
-                               if(ChemiCraftAPI.getInstance().getCompoundsName().get(par1ItemStack.getItemDamage()).equals(ChemiCraftAPI.getInstance().getCompoundHandlerItemName().get(i))){
-                                       return ChemiCraftAPI.getInstance().getCompoundHandler().get(i).onItemUseHandler(par1ItemStack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, 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);
                                }
                        }
                } catch (IndexOutOfBoundsException e) {
                        par1ItemStack.stackSize = 0;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe
                }
                return false;
        }
@@ -56,21 +40,14 @@ public class ItemCompounds extends Item {
        @Override
        public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
        {
-<<<<<<< HEAD
-               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);
-                       }
-=======
                try {
-                       for(int i=0;i < ChemiCraftAPI.getInstance().getCompoundHandlerItemName().size();i++){
-                               if(ChemiCraftAPI.getInstance().getCompoundsName().get(par1ItemStack.getItemDamage()).equals(ChemiCraftAPI.getInstance().getCompoundHandlerItemName().get(i))){
-                                       ChemiCraftAPI.getInstance().getCompoundHandler().get(i).onItemRightClickHandler(par1ItemStack, par2World, 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);
                                }
                        }
                } catch (IndexOutOfBoundsException e) {
                        par1ItemStack.stackSize = 0;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe
                }
                return par1ItemStack;
        }
@@ -79,22 +56,15 @@ public class ItemCompounds extends Item {
 
        @Override
        public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5){
-<<<<<<< HEAD
-               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);
-                       }
-=======
                try {
-                       for(int i=0;i < ChemiCraftAPI.getInstance().getCompoundHandlerItemName().size();i++){
-                               if(ChemiCraftAPI.getInstance().getCompoundsName().get(par1ItemStack.getItemDamage()).equals(ChemiCraftAPI.getInstance().getCompoundHandlerItemName().get(i))){
-                                       ChemiCraftAPI.getInstance().getCompoundHandler().get(i).onUpdateHandler(par1ItemStack, par2World, par3Entity, par4, 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);
                                }
                        }
                } catch (IndexOutOfBoundsException e) {
                        par1ItemStack.stackSize = 0;
                        par1ItemStack = null;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe
                }
        }
 
@@ -104,11 +74,7 @@ public class ItemCompounds extends Item {
        @SideOnly(Side.CLIENT)
        @Override
        public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List){
-<<<<<<< HEAD
                for(int type = 0; type < ChemiCraftAPI.instance().getCompoundsName().toArray().length; type++)
-=======
-               for(int type = 0; type < ChemiCraftAPI.getInstance().getCompoundsName().toArray().length; type++)
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe
                {
                        par3List.add(new ItemStack(par1, 1, type));
                        this.setIconIndex(type);
@@ -119,16 +85,12 @@ public class ItemCompounds extends Item {
 
        @Override
        public String getItemNameIS(ItemStack par1ItemStack){
-<<<<<<< HEAD
-               return super.getItemName() + "." + ChemiCraftAPI.instance().getCompoundsName().toArray()[par1ItemStack.getItemDamage()];
-=======
                try {
-                       return super.getItemName() + "." + ChemiCraftAPI.getInstance().getCompoundsName().toArray()[par1ItemStack.getItemDamage()];
+                       return super.getItemName() + "." + ChemiCraftAPI.instance().getCompoundsName().toArray()[par1ItemStack.getItemDamage()];
                } catch (ArrayIndexOutOfBoundsException e) {
                        par1ItemStack.stackSize = 0;
                }
                return null;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe
        }
 
 
@@ -143,21 +105,14 @@ public class ItemCompounds extends Item {
        @SideOnly(Side.CLIENT)
        @Override
        public int getIconFromDamage(int par1){
-<<<<<<< HEAD
-               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();
-                       }
-=======
                try {
-                       for(int i=0;i < ChemiCraftAPI.getInstance().getCompoundHandlerItemName().size();i++){
-                               if(ChemiCraftAPI.getInstance().getCompoundsName().get(par1).equals(ChemiCraftAPI.getInstance().getCompoundHandlerItemName().get(i))){
-                                       return ChemiCraftAPI.getInstance().getCompoundHandler().get(i).getIconIndexHandler();
+                       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();
                                }
                        }
                } catch (IndexOutOfBoundsException e) {
                        return 0;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe
                }
                return 0;
        }

diff --git a/common/pcc/chemicraft/item/ItemGasCollectingBottle.java b/common/pcc/chemicraft/item/ItemGasCollectingBottle.java
index 1cd62aa..08f39e5 100644 (file)
--- a/common/pcc/chemicraft/item/ItemGasCollectingBottle.java
+++ b/common/pcc/chemicraft/item/ItemGasCollectingBottle.java
@@ -7,11 +7,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.ChemiCraftAPI;
-<<<<<<< HEAD:common/pcc/chemicraft/item/ItemGasCollectingBottle.java
 import pcc.chemicraft.util.Auxiliary.Probability;
-=======
-import pcc.chemicraft.util.MathHelperPlus;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/item/ItemGasCollectingBottle.java
 
 public class ItemGasCollectingBottle extends ItemAtomInfoContainer
 {

diff --git a/common/pcc/chemicraft/render/RenderAtomsGrenade.java b/common/pcc/chemicraft/render/RenderAtomsGrenade.java
index 7fa5568..b9be2fb 100644 (file)
--- a/common/pcc/chemicraft/render/RenderAtomsGrenade.java
+++ b/common/pcc/chemicraft/render/RenderAtomsGrenade.java
@@ -9,10 +9,6 @@ import org.lwjgl.opengl.GL12;
 
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.entity.EntityAtomsGrenade;
-<<<<<<< HEAD:common/pcc/chemicraft/render/RenderAtomsGrenade.java
-
-=======
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/render/RenderAtomsGrenade.java
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

diff --git a/common/pcc/chemicraft/slot/SlotChemicalCombinationTableMaterial.java b/common/pcc/chemicraft/slot/SlotChemicalCombinationTableMaterial.java
index f31de6a..35995f4 100644 (file)
--- a/common/pcc/chemicraft/slot/SlotChemicalCombinationTableMaterial.java
+++ b/common/pcc/chemicraft/slot/SlotChemicalCombinationTableMaterial.java
@@ -1,13 +1,10 @@
 package pcc.chemicraft.slot;
 
-import pcc.chemicraft.ChemiCraft;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
-<<<<<<< HEAD:common/pcc/chemicraft/slot/SlotChemicalCombinationTableMaterial.java
-=======
 import pcc.chemicraft.ChemiCraft;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/slot/SlotChemicalCombinationTableMaterial.java
+
 
 public class SlotChemicalCombinationTableMaterial extends Slot {
 

diff --git a/common/pcc/chemicraft/system/ChemiCraftCraftingManager.java b/common/pcc/chemicraft/system/ChemiCraftCraftingManager.java
index c277404..899fe83 100644 (file)
--- a/common/pcc/chemicraft/system/ChemiCraftCraftingManager.java
+++ b/common/pcc/chemicraft/system/ChemiCraftCraftingManager.java
@@ -4,18 +4,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 
-import pcc.chemicraft.ChemiCraftAPI;
-import pcc.chemicraft.inventory.InventoryChemicalCraftingMaterial;
-import pcc.chemicraft.inventory.InventoryChemicalCraftingNBT;
-import pcc.chemicraft.inventory.InventoryChemicalCraftingResult;
-import pcc.chemicraft.util.ChemicalNBTRecipe;
-import pcc.chemicraft.util.ComparatorFormulaPart;
-import pcc.chemicraft.util.FormulaPart;
-
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
-<<<<<<< HEAD:common/pcc/chemicraft/system/ChemiCraftCraftingManager.java
-=======
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.ChemiCraftAPI;
 import pcc.chemicraft.inventory.InventoryChemicalCraftingMaterial;
@@ -26,12 +16,12 @@ import pcc.chemicraft.util.ChemicalNBTRecipe;
 import pcc.chemicraft.util.ComparatorFormulaPart;
 import pcc.chemicraft.util.ComparatorItemStack;
 import pcc.chemicraft.util.FormulaPart;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/system/ChemiCraftCraftingManager.java
+
 
 public class ChemiCraftCraftingManager {
 
        public ItemStack getToolAndWeaponCraftingResult(InventoryToolAndWeaponCraftingTableMaterial par1IInventory){
-               ChemiCraftAPI api = ChemiCraftAPI.getInstance();
+               ChemiCraftAPI api = ChemiCraftAPI.instance();
                ArrayList<ItemStack[]> materials = api.getToolAndWeaponMaterials();
                ArrayList<ItemStack> result = api.getToolAndWeaponResult();
                ArrayList<Boolean> sharpless = api.getToolAndWeaponSharpless();

diff --git a/common/pcc/chemicraft/system/CommonProxy.java b/common/pcc/chemicraft/system/CommonProxy.java
index 79b30e9..00e2277 100644 (file)
--- a/common/pcc/chemicraft/system/CommonProxy.java
+++ b/common/pcc/chemicraft/system/CommonProxy.java
@@ -1,19 +1,5 @@
 package pcc.chemicraft.system;
 
-<<<<<<< HEAD:common/pcc/chemicraft/system/CommonProxy.java
-import pcc.chemicraft.container.ContainerChemicalCombinationTable;
-import pcc.chemicraft.container.ContainerChemicalCraftingTable;
-import pcc.chemicraft.container.ContainerPyrolysisTable;
-import pcc.chemicraft.container.ContainerToolAndWeaponCraftingTable;
-import pcc.chemicraft.debug.DebugTick;
-import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
-import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
-import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-=======
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
@@ -26,7 +12,6 @@ import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
 import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
 import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
 import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/system/CommonProxy.java
 import cpw.mods.fml.common.network.IGuiHandler;
 import cpw.mods.fml.common.registry.TickRegistry;
 import cpw.mods.fml.relauncher.Side;

diff --git a/common/pcc/chemicraft/system/PacketHandler.java b/common/pcc/chemicraft/system/PacketHandler.java
index acea56c..b6e4f98 100644 (file)
--- a/common/pcc/chemicraft/system/PacketHandler.java
+++ b/common/pcc/chemicraft/system/PacketHandler.java
@@ -4,26 +4,17 @@ import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
-import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
-import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.network.INetworkManager;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-<<<<<<< HEAD:common/pcc/chemicraft/system/PacketHandler.java
-=======
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.tileentity.TileEntityChemicalCombinationTable;
 import pcc.chemicraft.tileentity.TileEntityChemicalCraftingTable;
 import pcc.chemicraft.tileentity.TileEntityPyrolysisTable;
 import pcc.chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/system/PacketHandler.java
 
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteStreams;

diff --git a/common/pcc/chemicraft/tileentity/TileEntityChemicalCombinationTable.java b/common/pcc/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
index 541b8bd..f1fe61c 100644 (file)
--- a/common/pcc/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
+++ b/common/pcc/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
@@ -4,13 +4,6 @@ import java.io.DataOutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.ChemiCraftData;
-import pcc.chemicraft.inventory.InventoryChemicalCombinationTableMaterial;
-import pcc.chemicraft.inventory.InventoryChemicalCombinationTableResult;
-import pcc.chemicraft.system.PacketHandler;
-import pcc.chemicraft.util.ComparatorItemStack;
-
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
@@ -18,15 +11,12 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.tileentity.TileEntity;
-<<<<<<< HEAD:common/pcc/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
-=======
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.ChemiCraftData;
 import pcc.chemicraft.inventory.InventoryChemicalCombinationTableMaterial;
 import pcc.chemicraft.inventory.InventoryChemicalCombinationTableResult;
 import pcc.chemicraft.system.PacketHandler;
 import pcc.chemicraft.util.ComparatorItemStack;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
 
 import com.google.common.io.ByteArrayDataInput;
 

diff --git a/common/pcc/chemicraft/tileentity/TileEntityChemicalCraftingTable.java b/common/pcc/chemicraft/tileentity/TileEntityChemicalCraftingTable.java
index 6caa073..b0ab691 100644 (file)
--- a/common/pcc/chemicraft/tileentity/TileEntityChemicalCraftingTable.java
+++ b/common/pcc/chemicraft/tileentity/TileEntityChemicalCraftingTable.java
@@ -2,24 +2,16 @@ package pcc.chemicraft.tileentity;
 
 import java.io.DataOutputStream;
 
-import pcc.chemicraft.inventory.InventoryChemicalCraftingMaterial;
-import pcc.chemicraft.inventory.InventoryChemicalCraftingNBT;
-import pcc.chemicraft.inventory.InventoryChemicalCraftingResult;
-import pcc.chemicraft.system.PacketHandler;
-
 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;
-<<<<<<< HEAD:common/pcc/chemicraft/tileentity/TileEntityChemicalCraftingTable.java
-=======
 import pcc.chemicraft.inventory.InventoryChemicalCraftingMaterial;
 import pcc.chemicraft.inventory.InventoryChemicalCraftingNBT;
 import pcc.chemicraft.inventory.InventoryChemicalCraftingResult;
 import pcc.chemicraft.system.PacketHandler;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/tileentity/TileEntityChemicalCraftingTable.java
 
 import com.google.common.io.ByteArrayDataInput;
 

diff --git a/common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java b/common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java
index 950fabf..197c9aa 100644 (file)
--- a/common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java
+++ b/common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java
@@ -1,11 +1,11 @@
 package pcc.chemicraft.tileentity;
 
-import pcc.chemicraft.inventory.InventoryElectrolysisTableFuel;
-import pcc.chemicraft.inventory.InventoryElectrolysisTableMaterial;
-import pcc.chemicraft.inventory.InventoryElectrolysisTableResult;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.tileentity.TileEntity;
+import pcc.chemicraft.inventory.InventoryElectrolysisTableFuel;
+import pcc.chemicraft.inventory.InventoryElectrolysisTableMaterial;
+import pcc.chemicraft.inventory.InventoryElectrolysisTableResult;
 
 public class TileEntityElectrolysisTable extends TileEntity
 {

diff --git a/common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java b/common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
index 3f7e43d..315aa53 100644 (file)
--- a/common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
+++ b/common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
@@ -5,26 +5,16 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Random;
 
-import pcc.chemicraft.debug.DebugData;
-import pcc.chemicraft.debug.DebugTick;
-import pcc.chemicraft.inventory.InventoryPyrolysisTableFuel;
-import pcc.chemicraft.inventory.InventoryPyrolysisTableMaterial;
-import pcc.chemicraft.inventory.InventoryPyrolysisTableResult;
-import pcc.chemicraft.system.PacketHandler;
-
 import net.minecraft.block.Block;
 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;
-<<<<<<< HEAD:common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
-=======
 import pcc.chemicraft.inventory.InventoryPyrolysisTableFuel;
 import pcc.chemicraft.inventory.InventoryPyrolysisTableMaterial;
 import pcc.chemicraft.inventory.InventoryPyrolysisTableResult;
 import pcc.chemicraft.system.PacketHandler;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
 
 import com.google.common.io.ByteArrayDataInput;
 

diff --git a/common/pcc/chemicraft/util/Auxiliary.java b/common/pcc/chemicraft/util/Auxiliary.java
index 296da96..2f0946a 100644 (file)
--- a/common/pcc/chemicraft/util/Auxiliary.java
+++ b/common/pcc/chemicraft/util/Auxiliary.java
@@ -1,10 +1,6 @@
 package pcc.chemicraft.util;
-<<<<<<< HEAD:common/pcc/chemicraft/util/Auxiliary.java
 
 import java.util.ArrayList;
-import java.util.Random;
-=======
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/util/Auxiliary.java
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;

diff --git a/common/pcc/chemicraft/util/CreativeTabAtoms.java b/common/pcc/chemicraft/util/CreativeTabAtoms.java
index b439b37..876e61b 100644 (file)
--- a/common/pcc/chemicraft/util/CreativeTabAtoms.java
+++ b/common/pcc/chemicraft/util/CreativeTabAtoms.java
@@ -1,11 +1,7 @@
 package pcc.chemicraft.util;
 
-import pcc.chemicraft.ChemiCraft;
 import net.minecraft.creativetab.CreativeTabs;
-<<<<<<< HEAD:common/pcc/chemicraft/util/CreativeTabAtoms.java
-=======
 import pcc.chemicraft.ChemiCraft;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/util/CreativeTabAtoms.java
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

diff --git a/common/pcc/chemicraft/util/MaterialRecipe.java b/common/pcc/chemicraft/util/MaterialRecipe.java
index a8aba13..eebf6da 100644 (file)
--- a/common/pcc/chemicraft/util/MaterialRecipe.java
+++ b/common/pcc/chemicraft/util/MaterialRecipe.java
@@ -3,15 +3,9 @@ package pcc.chemicraft.util;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.inventory.InventoryChemicalCraftingMaterial;
-
 import net.minecraft.item.ItemStack;
-<<<<<<< HEAD:common/pcc/chemicraft/util/MaterialRecipe.java
-=======
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.inventory.InventoryChemicalCraftingMaterial;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/util/MaterialRecipe.java
 
 public class MaterialRecipe {
 

diff --git a/common/pcc/chemicraft/util/NBTRecipeGrenade.java b/common/pcc/chemicraft/util/NBTRecipeGrenade.java
index 2b5a27f..faa6c5c 100644 (file)
--- a/common/pcc/chemicraft/util/NBTRecipeGrenade.java
+++ b/common/pcc/chemicraft/util/NBTRecipeGrenade.java
@@ -1,15 +1,10 @@
 package pcc.chemicraft.util;
 
-import pcc.chemicraft.ChemiCraft;
-import pcc.chemicraft.ChemiCraftData;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-<<<<<<< HEAD:common/pcc/chemicraft/util/NBTRecipeGrenade.java
-=======
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.ChemiCraftData;
->>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/util/NBTRecipeGrenade.java
 
 public class NBTRecipeGrenade extends ChemicalNBTRecipe {