マージ用にコミット

[chemicraft/chemicraft.git] / common / pcc / chemicraft / system / ChemiCraftCraftingManager.java

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();