Add the ability to force recipe/usage handlers to run in serial. Should fix the BM CME.

This commit is contained in:
Jason Mitchell authored and Jason Mitchell committed 2021-04-13 20:54:11 -07:00
1 parent 2e786d1807
commit 8bdcf65250
5 files changed
+39 -16

No files matched your search

+2 -2
View File
@@ -20,9 +20,9 @@ We've tested this against all of the mods included in GTNH, as well as a limited
* ItemList is no longer regenerated from the ItemRegistry on every inventory load
* JEI (Or Creative) Style tabs [Optional] Note: Requires explicit support to be added for an ItemStack to render, otherwise falls back to the first two letters of the handler name.
* Tabs/Handlers are loaded from a CSV config in the JAR (or optionally from the config folder). NBT IMCEvents `registerHandlerInfo` and `removeHandlerInfo` are available for mod authors to add handler information, using the same fields as the CSV file
* `@[Mod]->[item]` searching. ex: `@Gregtech->iron ingot`
* `@[Mod]->[item]` searching. ex: `@Mod.gregtech->iron ingot`
* Cycle between Recipe, Utility, and Cheat mode by ctrl clicking on the Wrench Icon
* GT5u Tools/Items should now properly work with the Overlay Recipe Transfer
* GT5u Tools/Items and GT6 tools should now properly work with the Overlay Recipe Transfer
## Other items of note:
+1 -1
View File
@@ -2,4 +2,4 @@ mc_version=1.7.10
forge_version=10.13.4.1614-1.7.10
ccl_version=1.1.3.138
ccc_version=1.0.7.+
mod_version=2.1.0-GTNH
mod_version=2.1.1-GTNH
@@ -7,6 +7,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
@@ -24,10 +25,14 @@ public class GuiCraftingRecipe extends GuiRecipe
FuelRecipeHandler.findFuelsOnceParallel();
try {
handlers = ItemList.forkJoinPool.submit(() -> craftinghandlers.parallelStream()
handlers = serialCraftingHandlers.stream().map(h -> h.getRecipeHandler(outputId, results))
.filter(h -> h.numRecipes() > 0)
.collect(Collectors.toCollection(ArrayList::new));
handlers.addAll(ItemList.forkJoinPool.submit(() -> craftinghandlers.parallelStream()
.map(h -> h.getRecipeHandler(outputId, results))
.filter(h -> h.numRecipes() > 0)
.collect(Collectors.toCollection(ArrayList::new))).get();
.collect(Collectors.toCollection(ArrayList::new))).get());
} catch (InterruptedException | ExecutionException e) {
e.printStackTrace();
return false;
@@ -48,11 +53,15 @@ public class GuiCraftingRecipe extends GuiRecipe
}
public static void registerRecipeHandler(ICraftingHandler handler) {
for (ICraftingHandler handler1 : craftinghandlers)
if (handler1.getClass() == handler.getClass())
return;
final Class<? extends ICraftingHandler> handlerClass = handler.getClass();
if(craftinghandlers.stream().anyMatch(h -> h.getClass() == handlerClass) || serialCraftingHandlers.stream().anyMatch(h -> h.getClass() == handlerClass))
return;
craftinghandlers.add(handler);
final String handlerClassStr = handlerClass.getName();
if(Arrays.asList(serialHandlers).contains(handlerClassStr))
serialCraftingHandlers.add(handler);
else
craftinghandlers.add(handler);
}
public ArrayList<? extends IRecipeHandler> getCurrentRecipeHandlers() {
@@ -62,4 +71,5 @@ public class GuiCraftingRecipe extends GuiRecipe
public ArrayList<ICraftingHandler> currenthandlers;
public static ArrayList<ICraftingHandler> craftinghandlers = new ArrayList<>();
public static ArrayList<ICraftingHandler> serialCraftingHandlers = new ArrayList<>();
}
@@ -36,6 +36,10 @@ import java.util.Collections;
import java.util.List;
public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOverlay, IGuiClientSide, IGuiHandleMouseWheel, IContainerTooltipHandler, INEIGuiHandler {
// List of handlers that need to be run in serial
protected static final String[] serialHandlers = {
"WayofTime.alchemicalWizardry.client.nei.NEIAlchemyRecipeHandler"
};
// Background image calculations
private static final int BG_TOP_HEIGHT = 6;
private static final int BG_MIDDLE_HEIGHT = 154;
+16 -7
View File
@@ -7,6 +7,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.inventory.GuiContainer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
@@ -24,10 +25,14 @@ public class GuiUsageRecipe extends GuiRecipe
profiler.start("recipe.concurrent.usage");
try {
handlers = ItemList.forkJoinPool.submit(() -> usagehandlers.parallelStream()
handlers = serialUsageHandlers.stream().map(h -> h.getUsageHandler(inputId, ingredients))
.filter(h -> h.numRecipes() > 0)
.collect(Collectors.toCollection(ArrayList::new));
handlers.addAll(ItemList.forkJoinPool.submit(() -> usagehandlers.parallelStream()
.map(h -> h.getUsageHandler(inputId, ingredients))
.filter(h -> h.numRecipes() > 0)
.collect(Collectors.toCollection(ArrayList::new))).get();
.collect(Collectors.toCollection(ArrayList::new))).get());
} catch (InterruptedException | ExecutionException e) {
e.printStackTrace();
return false;
@@ -48,12 +53,15 @@ public class GuiUsageRecipe extends GuiRecipe
}
public static void registerUsageHandler(IUsageHandler handler) {
for (IUsageHandler handler1 : usagehandlers) {
if (handler1.getClass() == handler.getClass())
return;
}
final Class<? extends IUsageHandler> handlerClass = handler.getClass();
if(usagehandlers.stream().anyMatch(h -> h.getClass() == handlerClass) || serialUsageHandlers.stream().anyMatch(h -> h.getClass() == handlerClass))
return;
usagehandlers.add(handler);
final String handlerClassStr = handlerClass.getName();
if(Arrays.asList(serialHandlers).contains(handlerClassStr))
serialUsageHandlers.add(handler);
else
usagehandlers.add(handler);
}
public ArrayList<? extends IRecipeHandler> getCurrentRecipeHandlers() {
@@ -63,4 +71,5 @@ public class GuiUsageRecipe extends GuiRecipe
public ArrayList<IUsageHandler> currenthandlers;
public static ArrayList<IUsageHandler> usagehandlers = new ArrayList<>();
public static ArrayList<IUsageHandler> serialUsageHandlers = new ArrayList<>();
}