From 93aa429cf2c98a97a32c48a8becae8e36ae646ec Mon Sep 17 00:00:00 2001 From: Richard Hendricks Date: Sat, 14 Dec 2019 13:44:27 -0600 Subject: [PATCH] Add config options, remove debug prints --- .../java/forestry/core/config/Config.java | 11 +++ .../forestry/core/recipes/RecipeUtil.java | 75 +++++++++++-------- .../forestry/factory/tiles/TileWorktable.java | 28 +++---- 3 files changed, 67 insertions(+), 47 deletions(-) diff --git a/src/main/java/forestry/core/config/Config.java b/src/main/java/forestry/core/config/Config.java index ee1b292fa..8dd6749e6 100755 --- a/src/main/java/forestry/core/config/Config.java +++ b/src/main/java/forestry/core/config/Config.java @@ -77,6 +77,12 @@ public class Config { // Performance public static boolean enableBackpackResupply = true; + // Optimization + public static boolean enableCraftingTimeout = true; + public static int craftingTimeout = 200; // Time given in ms + public static boolean cacheWorktableRecipes = true; + public static boolean promoteWorktableRecipesToFrontOfGlobalRecipemap = true; + // Customization private static boolean craftingBronzeEnabled = true; @@ -215,6 +221,11 @@ public class Config { enableBackpackResupply = configCommon.getBooleanLocalized("performance", "backpacks.resupply", enableBackpackResupply); + enableCraftingTimeout = configCommon.getBooleanLocalized("optimization","enable.crafting.timeout", enableCraftingTimeout); + craftingTimeout = configCommon.getIntLocalized("optimization","crafting.timeout",craftingTimeout, 50, 2000 ); // min 50ms, default 200ms, max 2000 ms. Integer.MAX_VALUE is ~ 2100 ms because of multiplication by 1,000,000 + cacheWorktableRecipes = configCommon.getBooleanLocalized("optimization","cache.worktable.recipes", cacheWorktableRecipes); + promoteWorktableRecipesToFrontOfGlobalRecipemap = configCommon.getBooleanLocalized("optimization","promote.worktable.recipes",promoteWorktableRecipesToFrontOfGlobalRecipemap); + // move legacy mail property configCommon.moveProperty("tweaks.gui", "mail.alert", "tweaks.gui.mail.alert"); configCommon.renameProperty("tweaks.gui.mail.alert", "mail.alert", "enabled"); diff --git a/src/main/java/forestry/core/recipes/RecipeUtil.java b/src/main/java/forestry/core/recipes/RecipeUtil.java index a16f8fc0f..11685df29 100644 --- a/src/main/java/forestry/core/recipes/RecipeUtil.java +++ b/src/main/java/forestry/core/recipes/RecipeUtil.java @@ -30,6 +30,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.recipes.IDescriptiveRecipe; import forestry.api.recipes.RecipeManagers; +import forestry.core.config.Config; import forestry.core.fluids.Fluids; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; @@ -156,23 +157,25 @@ public abstract class RecipeUtil { List matchingIndex=new ArrayList(); List matchingRecipeMap = new ArrayList(); int index = 0; - // Check across the whole cached recipe map - // Add each recipe to the matchingRecipes list - for (Object recipe : cachedRecipes) { - IRecipe irecipe = (IRecipe) recipe; - if (irecipe.matches(inventory, world)) { - ItemStack result = irecipe.getCraftingResult(inventory); - if (!ItemStackUtil.containsItemStack(matchingRecipes, result)) { - matchingRecipes.add(result); - } - } - } - if( matchingRecipes.size() > 0 ) { - // If we found recipes here, we found all the potential recipes, so we can just return immediately. - return matchingRecipes; - } + if(Config.cacheWorktableRecipes) { + // Check across the whole cached recipe map + // Add each recipe to the matchingRecipes list + for (Object recipe : cachedRecipes) { + IRecipe irecipe = (IRecipe) recipe; + if (irecipe.matches(inventory, world)) { + ItemStack result = irecipe.getCraftingResult(inventory); + if (!ItemStackUtil.containsItemStack(matchingRecipes, result)) { + matchingRecipes.add(result); + } + } + } + if( matchingRecipes.size() > 0 ) { + // If we found recipes here, we found all the potential recipes, so we can just return immediately. + return matchingRecipes; + } + } // Only do this if there were no cached recipes hit for (Object recipe : CraftingManager.getInstance().getRecipeList()) { IRecipe irecipe = (IRecipe) recipe; @@ -181,32 +184,38 @@ public abstract class RecipeUtil { ItemStack result = irecipe.getCraftingResult(inventory); if (!ItemStackUtil.containsItemStack(matchingRecipes, result)) { matchingRecipes.add(result); - // Add to the back of the list. That way when we cycle through the list - // moving items to the front, the index locations for the following items doesn't change - matchingRecipeMap.add(recipe); - matchingIndex.add(new Integer(index)); + if(Config.promoteWorktableRecipesToFrontOfGlobalRecipemap || Config.cacheWorktableRecipes) { + // Add to the back of the list. That way when we cycle through the list + // moving items to the front, the index locations for the following items doesn't change + matchingRecipeMap.add(recipe); + matchingIndex.add(new Integer(index)); + } } } index++; } if (matchingRecipeMap.size() > 0 ) { - // Only move the recipes if the last one was beyond 500 in the recipeMap (in GTNH about 57k recipes) - if (matchingIndex.get(matchingIndex.size()-1) > 500) { - List recipeMap = CraftingManager.getInstance().getRecipeList(); - System.out.println( "Highest recipe found at " + matchingIndex.get(matchingIndex.size()-1) + ", moving " + matchingIndex.size() + " to front" ); - System.out.println("Size of recipe map " + recipeMap.size() ); - for (index = 0; index < matchingIndex.size(); index++) { // index is reused here, it goes through the matching groups. - // Remove recipe and add back at the front - int target = matchingIndex.get(index); // remove requires int - System.out.println("Removing recipe at " + target); - recipeMap.remove(target); - recipeMap.add(0,matchingRecipeMap.get(index)); + if (Config.promoteWorktableRecipesToFrontOfGlobalRecipemap) { + // Only move the recipes if the last one was beyond 500 in the recipeMap (in GTNH about 57k recipes) + if (matchingIndex.get(matchingIndex.size()-1) > 500) { + List recipeMap = CraftingManager.getInstance().getRecipeList(); + System.out.println( "Highest recipe found at " + matchingIndex.get(matchingIndex.size()-1) + ", moving " + matchingIndex.size() + " to front" ); + System.out.println( "Size of recipe map " + recipeMap.size() ); + for (index = 0; index < matchingIndex.size(); index++) { // index is reused here, it goes through the matching groups. + // Remove recipe and add back at the front + int target = matchingIndex.get(index); // remove requires int + System.out.println("Removing recipe at " + target); + recipeMap.remove(target); + recipeMap.add(0,matchingRecipeMap.get(index)); + } } } - // However, we should always add found recipes to the front of the cached recipe map - // Location doesn't matter since we have to scan the whole cached recipe map anyways. - cachedRecipes.addAll(matchingRecipeMap); + if(Config.cacheWorktableRecipes) { + // However, we should always add found recipes the cached recipe map + // Location doesn't matter since we have to scan the whole cached recipe map anyways. + cachedRecipes.addAll(matchingRecipeMap); + } } return matchingRecipes; } diff --git a/src/main/java/forestry/factory/tiles/TileWorktable.java b/src/main/java/forestry/factory/tiles/TileWorktable.java index ce12c3bf6..644e7fb90 100644 --- a/src/main/java/forestry/factory/tiles/TileWorktable.java +++ b/src/main/java/forestry/factory/tiles/TileWorktable.java @@ -21,6 +21,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; +import forestry.core.config.Config; import forestry.core.inventory.InventoryAdapterTile; import forestry.core.inventory.wrappers.InventoryMapper; import forestry.core.network.DataInputStreamForestry; @@ -44,9 +45,6 @@ public class TileWorktable extends TileBase implements ICrafterWorktable { private long savedTick = 0; private long savedSystemTimeExpiration = 0; - // 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"); setInternalInventory(new InventoryWorktable(this)); @@ -126,18 +124,20 @@ public class TileWorktable extends TileBase implements ICrafterWorktable { return false; } - long currentTick = worldObj.getTotalWorldTime(); - if (currentTick == savedTick){ - // Processing in the same tick, second call, check expiration timer - long currentTime = System.nanoTime(); - if(currentTime > savedSystemTimeExpiration) { - // Time to craft has expired, stop crafting loop - return false; + if( Config.enableCraftingTimeout ) { + long currentTick = worldObj.getTotalWorldTime(); + if (currentTick == savedTick){ + // Processing in the same tick, second call, check 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 timer data + savedTick=currentTick; + savedSystemTimeExpiration = System.nanoTime() + Config.craftingTimeout * 1000000; } - } else { - // New tick has arrived, so reset timer data - savedTick=currentTick; - savedSystemTimeExpiration = System.nanoTime() + WORKTABLE_MAX_CRAFT_TIME; } ItemStack[] recipeItems = InventoryUtil.getStacks(currentRecipe.getCraftMatrix());