From 0cdaf8cff860ebe481a71ed53dd0e83a9b7b7d50 Mon Sep 17 00:00:00 2001 From: Richard Hendricks Date: Mon, 9 Dec 2019 22:07:26 -0600 Subject: [PATCH] Add new limiting crafting time function. --- gradle.properties | 2 +- .../forestry/factory/tiles/TileWorktable.java | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4ee121ae7..b3acca9ea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,4 +2,4 @@ mcversion=1.7.10 forgeversion=10.13.4.1614-1.7.10 version_major=4 version_minor=2 -version_patch=20 +version_patch=21 diff --git a/src/main/java/forestry/factory/tiles/TileWorktable.java b/src/main/java/forestry/factory/tiles/TileWorktable.java index 9c9924162..6e9852c0e 100644 --- a/src/main/java/forestry/factory/tiles/TileWorktable.java +++ b/src/main/java/forestry/factory/tiles/TileWorktable.java @@ -41,6 +41,12 @@ public class TileWorktable extends TileBase implements ICrafterWorktable { private final RecipeMemory recipeMemory; private final InventoryAdapterTile craftingDisplay; private MemorizedRecipe currentRecipe; + private long savedTick = 0; + private long savedSystemTimeExpiration = 0; + private boolean isDirty=true; + + // Maximum crafting time of 750ms before ejecting out and stop hard-locking the server + static long WORKTABLE_MAX_CRAFT_TIME = 750 * 1000 * 1000; public TileWorktable() { super("worktable"); @@ -121,9 +127,28 @@ public class TileWorktable extends TileBase implements ICrafterWorktable { return false; } + long currentTick = worldObj.getTotalWorldTime(); + if (currentTick == savedTick){ + // Processing in the same tick, second call, start expiration timer + long currentTime = System.nanoTime(); + if(currentTime > savedSystemTimeExpiration) { + // Time to craft has expired, stop crafting loop + return false; + } + + } else { + // New tick has arrived, so reset data & mark as dirty so recipe is rechecked. + savedTick=currentTick; + savedSystemTimeExpiration = System.nanoTime() + WORKTABLE_MAX_CRAFT_TIME; + isDirty = true; + } + ItemStack[] recipeItems = InventoryUtil.getStacks(currentRecipe.getCraftMatrix()); ItemStack[] inventory = InventoryUtil.getStacks(this); InventoryCraftingForestry crafting = RecipeUtil.getCraftRecipe(recipeItems, inventory, worldObj, currentRecipe.getRecipeOutput()); + + // Craft is validated, mark as clean + isDirty = false; return crafting != null; }