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
private ChemiCraftCraftingManager chemiCraftCraftingManager = new ChemiCraftCraftingManager();
++<<<<<<< HEAD:common/pcc/chemicraft/ChemiCraftAPI.java
+ private ArrayList<Integer> atomsOreIDList = new ArrayList<Integer>();
+
+
+ private ArrayList<Integer> atomsOreMetaList = new ArrayList<Integer>();
+
+
+ private ArrayList<Integer> atomsOreSizeList = new ArrayList<Integer>();
+
+
+ private ArrayList<Integer> atomsOreFrequencyList = new ArrayList<Integer>();
+
+
+ private ArrayList<Integer> atomsOrePosYList = new ArrayList<Integer>();
++=======
+ /**
+ * ツール&武器作成台の素材一覧のリスト
+ */
+ private ArrayList<ItemStack[]> toolAndWeaponMaterials = new ArrayList<ItemStack[]>();
+
+
+ /**
+ * ツール&武器作成台の結果のリスト
+ */
+ private ArrayList<ItemStack> toolAndWeaponResult = new ArrayList<ItemStack>();
+
+
+ /**
+ * ツール&武器作成台の不定形であるか
+ */
+ private ArrayList<Boolean> toolAndWeaponSharpless = new ArrayList<Boolean>();
++>>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe:common/pcc/chemicraft/ChemiCraftAPI.java
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;
+ 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 {
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;
+ 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
public class ContainerChemicalCraftingTable extends Container {
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 {
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 {
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 {
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;
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
{
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{
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 {
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 {
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;
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 {
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;
@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);
+ }
+ }
+ } catch (IndexOutOfBoundsException e) {
+ par1ItemStack.stackSize = 0;
++>>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe
}
return false;
}
@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);
+ }
+ }
+ } catch (IndexOutOfBoundsException e) {
+ par1ItemStack.stackSize = 0;
++>>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe
}
return par1ItemStack;
}
@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);
+ }
+ }
+ } catch (IndexOutOfBoundsException e) {
+ par1ItemStack.stackSize = 0;
+ par1ItemStack = null;
++>>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe
}
}
@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);
@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()];
+ } catch (ArrayIndexOutOfBoundsException e) {
+ par1ItemStack.stackSize = 0;
+ }
+ return null;
++>>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe
}
@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();
+ }
+ }
+ } catch (IndexOutOfBoundsException e) {
+ return 0;
++>>>>>>> a5e4a5c40b9001657f1e36ece533651f63183fbe
}
return 0;
}
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
{
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;
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 {
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;
+ import pcc.chemicraft.inventory.InventoryChemicalCraftingNBT;
+ import pcc.chemicraft.inventory.InventoryChemicalCraftingResult;
+ import pcc.chemicraft.inventory.InventoryToolAndWeaponCraftingTableMaterial;
+ 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 {
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;
+ 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;
++>>>>>>> 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;
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;
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;
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;
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;
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;
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;
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 {
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 {
OSDN Git Service
