fix cooking devices

- change: 調理器具ブロックの処理速度を上げた
defeatedcrow · Dec 14, 2017 · 491fe93 · 491fe93
1 parent d5fddd5
commit 491fe93
Show file tree

Hide file tree

Showing 8 changed files with 222 additions and 108 deletions.
diff --git a/java/defeatedcrow/hac/food/block/TilePotteryPot.java b/java/defeatedcrow/hac/food/block/TilePotteryPot.java
@@ -4,7 +4,9 @@
 import java.util.Iterator;
 import java.util.List;
 
+import defeatedcrow.hac.api.climate.ClimateAPI;
 import defeatedcrow.hac.api.climate.DCHeatTier;
+import defeatedcrow.hac.api.climate.IClimate;
 import defeatedcrow.hac.api.recipe.RecipeAPI;
 import defeatedcrow.hac.core.util.DCUtil;
 import defeatedcrow.hac.food.gui.ContainerFluidProcessor;
@@ -54,6 +56,12 @@ protected void onServerUpdate() {
 
 	@Override
 	public int getProcessTime() {
+		if (current != null) {
+			if (current.getHeat() == DCHeatTier.OVEN)
+				return 100;
+			else if (current.getHeat().getTier() > DCHeatTier.OVEN.getTier())
+				return 40;
+		}
 		return 200;
 	}
 
@@ -65,8 +73,13 @@ public boolean canRecipeProcess() {
 		List<ItemStack> ins = new ArrayList<ItemStack>(this.getInputs());
 		FluidStack outf = outputT.getFluid();
 		List<ItemStack> outs = new ArrayList<ItemStack>(this.getOutputs());
-		if (currentRecipe == null) {
+		if (currentRecipe == null && current != null) {
 			currentRecipe = RecipeAPI.registerFluidRecipes.getRecipe(current, ins, inf);
+			if (currentRecipe == null && current.getHeat().getTier() > 0) {
+				IClimate clm2 = ClimateAPI.register.getClimateFromParam(current.getHeat().addTier(1),
+						current.getHumidity(), current.getAirflow());
+				currentRecipe = RecipeAPI.registerFluidRecipes.getRecipe(clm2, ins, inf);
+			}
 			return currentRecipe != null && currentRecipe.matchOutput(outs, outf, 3);
 		} else {
 			if (currentRecipe.matchClimate(current) && currentRecipe.matches(ins, inf)) {
@@ -88,6 +101,11 @@ public boolean canStartProcess() {
 		FluidStack outf = outputT.getFluid();
 		List<ItemStack> outs = new ArrayList<ItemStack>(this.getOutputs());
 		currentRecipe = RecipeAPI.registerFluidRecipes.getRecipe(current, ins, inf);
+		if (currentRecipe == null && current.getHeat().getTier() > 0) {
+			IClimate clm2 = ClimateAPI.register.getClimateFromParam(current.getHeat().addTier(1), current.getHumidity(),
+					current.getAirflow());
+			currentRecipe = RecipeAPI.registerFluidRecipes.getRecipe(clm2, ins, inf);
+		}
 		return currentRecipe != null && currentRecipe.matchOutput(outs, outf, 3);
 	}
 

diff --git a/java/defeatedcrow/hac/food/block/TileSteelPot.java b/java/defeatedcrow/hac/food/block/TileSteelPot.java
@@ -4,6 +4,9 @@
 import java.util.Iterator;
 import java.util.List;
 
+import defeatedcrow.hac.api.climate.ClimateAPI;
+import defeatedcrow.hac.api.climate.DCHeatTier;
+import defeatedcrow.hac.api.climate.IClimate;
 import defeatedcrow.hac.api.recipe.RecipeAPI;
 import defeatedcrow.hac.core.util.DCUtil;
 import defeatedcrow.hac.food.gui.ContainerFluidProcessor;
@@ -53,6 +56,12 @@ protected void onServerUpdate() {
 
 	@Override
 	public int getProcessTime() {
+		if (current != null) {
+			if (current.getHeat() == DCHeatTier.KILN)
+				return 8;
+			else if (current.getHeat().getTier() > DCHeatTier.KILN.getTier())
+				return 4;
+		}
 		return 20;
 	}
 
@@ -64,8 +73,13 @@ public boolean canRecipeProcess() {
 		List<ItemStack> ins = new ArrayList<ItemStack>(this.getInputs());
 		FluidStack outf = outputT.getFluid();
 		List<ItemStack> outs = new ArrayList<ItemStack>(this.getOutputs());
-		if (currentRecipe == null) {
+		if (currentRecipe == null && current != null) {
 			currentRecipe = RecipeAPI.registerFluidRecipes.getRecipe(current, ins, inf);
+			if (currentRecipe == null && current.getHeat().getTier() > 0) {
+				IClimate clm2 = ClimateAPI.register.getClimateFromParam(current.getHeat().addTier(1),
+						current.getHumidity(), current.getAirflow());
+				currentRecipe = RecipeAPI.registerFluidRecipes.getRecipe(clm2, ins, inf);
+			}
 			return currentRecipe != null && currentRecipe.matchOutput(outs, outf, 3);
 		} else {
 			if (currentRecipe.matchClimate(current) && currentRecipe.matches(ins, inf)) {
@@ -86,6 +100,11 @@ public boolean canStartProcess() {
 		FluidStack outf = outputT.getFluid();
 		List<ItemStack> outs = new ArrayList<ItemStack>(this.getOutputs());
 		currentRecipe = RecipeAPI.registerFluidRecipes.getRecipe(current, ins, inf);
+		if (currentRecipe == null && current.getHeat().getTier() > 0) {
+			IClimate clm2 = ClimateAPI.register.getClimateFromParam(current.getHeat().addTier(1), current.getHumidity(),
+					current.getAirflow());
+			currentRecipe = RecipeAPI.registerFluidRecipes.getRecipe(clm2, ins, inf);
+		}
 		return currentRecipe != null && currentRecipe.matchOutput(outs, outf, 3);
 	}
 

diff --git a/java/defeatedcrow/hac/food/block/TileTeaPot.java b/java/defeatedcrow/hac/food/block/TileTeaPot.java
@@ -5,6 +5,8 @@
 import java.util.List;
 
 import defeatedcrow.hac.api.climate.ClimateAPI;
+import defeatedcrow.hac.api.climate.DCHeatTier;
+import defeatedcrow.hac.api.climate.IClimate;
 import defeatedcrow.hac.api.recipe.RecipeAPI;
 import defeatedcrow.hac.core.fluid.DCTank;
 import defeatedcrow.hac.core.fluid.FluidIDRegisterDC;
@@ -40,6 +42,12 @@ public class TileTeaPot extends TileFluidProcessorBase {
 
 	@Override
 	public int getProcessTime() {
+		if (current != null) {
+			if (current.getHeat() == DCHeatTier.KILN)
+				return 8;
+			else if (current.getHeat().getTier() > DCHeatTier.KILN.getTier())
+				return 4;
+		}
 		return 20;
 	}
 
@@ -203,9 +211,14 @@ public boolean canRecipeProcess() {
 		List<ItemStack> ins = new ArrayList<ItemStack>(this.getInputs());
 		FluidStack outf = outputT.getFluid();
 		List<ItemStack> outs = new ArrayList<ItemStack>(this.getOutputs());
-		if (currentRecipe == null) {
+		if (currentRecipe == null && current != null) {
 			currentRecipe = RecipeAPI.registerFluidRecipes.getRecipe(current, ins, inf);
-			return currentRecipe != null && currentRecipe.matchOutput(outs, outf, 0);
+			if (currentRecipe == null && current.getHeat().getTier() > 0) {
+				IClimate clm2 = ClimateAPI.register.getClimateFromParam(current.getHeat().addTier(1),
+						current.getHumidity(), current.getAirflow());
+				currentRecipe = RecipeAPI.registerFluidRecipes.getRecipe(clm2, ins, inf);
+			}
+			return currentRecipe != null && currentRecipe.matchOutput(outs, outf, 3);
 		} else {
 			if (currentRecipe.matchClimate(current) && currentRecipe.matches(ins, inf)) {
 				int outAmo = currentRecipe.getOutputFluid() == null ? 0 : currentRecipe.getOutputFluid().amount;
@@ -225,6 +238,11 @@ public boolean canStartProcess() {
 		FluidStack outf = outputT.getFluid();
 		List<ItemStack> outs = new ArrayList<ItemStack>(this.getOutputs());
 		currentRecipe = RecipeAPI.registerFluidRecipes.getRecipe(current, ins, inf);
+		if (currentRecipe == null && current.getHeat().getTier() > 0) {
+			IClimate clm2 = ClimateAPI.register.getClimateFromParam(current.getHeat().addTier(1), current.getHumidity(),
+					current.getAirflow());
+			currentRecipe = RecipeAPI.registerFluidRecipes.getRecipe(clm2, ins, inf);
+		}
 		return currentRecipe != null && currentRecipe.matchOutput(outs, outf, 0);
 	}