要チェック!!!

[chemicraft/ChemiCraftNext.git] / common / pcc / chemicraft / core / tileentity / TileEntityPyrolysisTable.java

diff --git a/common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java b/common/pcc/chemicraft/core/tileentity/TileEntityPyrolysisTable.java
similarity index 91%
rename from common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
rename to common/pcc/chemicraft/core/tileentity/TileEntityPyrolysisTable.java
index 50e2ea9..bb45b91 100644 (file)
--- a/common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
+++ b/common/pcc/chemicraft/core/tileentity/TileEntityPyrolysisTable.java
@@ -1,7 +1,6 @@
-package pcc.chemicraft.tileentity;
+package pcc.chemicraft.core.tileentity;
 
 import java.io.DataOutputStream;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Random;
 
@@ -11,12 +10,11 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.tileentity.TileEntity;
-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 pcc.chemicraft.core.ChemiCraftAPI;
+import pcc.chemicraft.core.inventory.InventoryPyrolysisTableFuel;
+import pcc.chemicraft.core.inventory.InventoryPyrolysisTableMaterial;
+import pcc.chemicraft.core.inventory.InventoryPyrolysisTableResult;
+import pcc.chemicraft.core.system.PacketHandler;
 
 import com.google.common.io.ByteArrayDataInput;
 
@@ -66,16 +64,6 @@ public class TileEntityPyrolysisTable extends TileEntity {
         */
        public static final Random rand = new Random();
 
-       /**
-        * 燃料のリスト。
-        */
-       private static HashMap<ItemStack, Integer> fuelList = new HashMap<ItemStack, Integer>();
-
-       /**
-        * レシピのリスト
-        */
-       private static HashMap<ItemStack, ItemStack[]> recipeList = new HashMap<ItemStack, ItemStack[]>();
-
        @Override
        public void updateEntity() {
 
@@ -114,7 +102,7 @@ public class TileEntityPyrolysisTable extends TileEntity {
                }
 
                if (this.burnTime >= MAX_BURN_TIME) {
-                       Iterator<ItemStack> itMaterial = recipeList.keySet().iterator();
+                       Iterator<ItemStack> itMaterial = ChemiCraftAPI.instance().getPyrolysisRecipeList().keySet().iterator();
                        while (itMaterial.hasNext()) {
                                ItemStack itemstackMaterial = itMaterial.next();
                                ItemStack materialItem = this.invm.getStackInSlot(0);
@@ -138,7 +126,7 @@ public class TileEntityPyrolysisTable extends TileEntity {
 
                boolean var3 = false;
                if (this.heat > MIN_HEAT) {
-                       Iterator<ItemStack> itMaterial = recipeList.keySet().iterator();
+                       Iterator<ItemStack> itMaterial = ChemiCraftAPI.instance().getPyrolysisRecipeList().keySet().iterator();
                        while (itMaterial.hasNext()) {
                                ItemStack itemstackMaterial = itMaterial.next();
                                ItemStack materialItem = this.invm.getStackInSlot(0);
@@ -148,13 +136,13 @@ public class TileEntityPyrolysisTable extends TileEntity {
                                                if (itemstackMaterial.itemID == materialItem.itemID && itemstackMaterial.getItemDamage() == materialItem.getItemDamage()) {
                                                        var3 = true;
                                                        if (this.fuelRestTime <= 0) {
-                                                               Iterator<ItemStack> itFuel = fuelList.keySet().iterator();
+                                                               Iterator<ItemStack> itFuel = ChemiCraftAPI.instance().getPyrolysisFuelList().keySet().iterator();
                                                                while (itFuel.hasNext()) {
                                                                        ItemStack itemstackFuel = itFuel.next();
                                                                        ItemStack fuelItem = this.invf.getStackInSlot(0);
                                                                        if (fuelItem != null) {
                                                                                if (itemstackFuel.itemID == fuelItem.itemID && itemstackFuel.getItemDamage() == fuelItem.getItemDamage()) {
-                                                                                       this.fuelRestTime = fuelList.get(itemstackFuel);
+                                                                                       this.fuelRestTime = ChemiCraftAPI.instance().getPyrolysisFuelList().get(itemstackFuel);
                                                                                        if (fuelItem.stackSize > 1) {
                                                                                                this.invf.setInventorySlotContents(0, new ItemStack(fuelItem.itemID, --fuelItem.stackSize, fuelItem.getItemDamage()));
                                                                                                break;
@@ -417,7 +405,7 @@ public class TileEntityPyrolysisTable extends TileEntity {
        }
 
        public boolean isInItemCheck(ItemStack key) {
-               ItemStack[] results = recipeList.get(key).clone();
+               ItemStack[] results = ChemiCraftAPI.instance().getPyrolysisRecipeList().get(key).clone();
                ItemStack[] containerResults = new ItemStack[this.invr.getSizeInventory()];
                for (int j = 0; j < this.invr.getSizeInventory(); j++) {
                        containerResults[j] = this.invr.getStackInSlot(j);
@@ -458,7 +446,7 @@ public class TileEntityPyrolysisTable extends TileEntity {
        }
 
        public void inItem(ItemStack key) {
-               ItemStack[] results = recipeList.get(key);
+               ItemStack[] results = ChemiCraftAPI.instance().getPyrolysisRecipeList().get(key);
 
                for (int i = 0; i < results.length; i++) {
                        ItemStack[] containerResults = new ItemStack[this.invr.getSizeInventory()];
@@ -491,14 +479,6 @@ public class TileEntityPyrolysisTable extends TileEntity {
                }
        }
 
-       public static void addFuel(ItemStack itemstack, int burnTime) {
-               fuelList.put(itemstack, burnTime);
-       }
-
-       public static void addRecipe(ItemStack material, ItemStack[] result) {
-               recipeList.put(material, result);
-       }
-
        public float getFuelRestTime() {
                return fuelRestTime;
        }