Compare commits

...
Author SHA1 Message Date
D-Cysteine b4780716ec Add support for custom handler IDs (#154)
* Always show quantity text box

* Increment version

* Properly fix quantity text field

* Add support for custom handler names

* Add overloads
2021-08-25 06:14:34 +02:00
Andrey 52fb89daf6 Add builder for use in NEIRegisterHandlerInfosEvent (#153) 2021-08-22 10:16:15 -07:00
9 changed files with 95 additions and 27 deletions

No files matched your search

+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.10-GTNH
mod_version=2.1.11-GTNH
@@ -36,7 +36,7 @@ public class HandlerDumper extends DataDumper
public Iterable<String[]> dump(int mode) {
LinkedList<String[]> list = new LinkedList<>();
for (IRecipeHandler handler : GuiUsageRecipe.usagehandlers) {
final String handlerName = handler.toString().split("@")[0];
final String handlerName = handler.getHandlerId();
final String handlerId = Objects.firstNonNull(handler instanceof TemplateRecipeHandler ? ((TemplateRecipeHandler)handler).getOverlayIdentifier() : null, "null");
HandlerInfo info = GuiRecipeTab.getHandlerInfo(handlerName, handlerId);
@@ -7,6 +7,8 @@ import codechicken.nei.recipe.IRecipeHandler;
import cpw.mods.fml.common.eventhandler.Event;
import net.minecraftforge.common.MinecraftForge;
import java.util.function.Consumer;
/**
* Event is posted every time the handler infos got registered or reloaded.
* During it, you can safely register your custom handler info.
@@ -16,12 +18,19 @@ import net.minecraftforge.common.MinecraftForge;
* <br>
* This event is fired on the {@link MinecraftForge#EVENT_BUS}.
*/
public class RegisterHandlerInfosEvent extends Event {
public void registerHandlerInfo(Class<? extends IRecipeHandler> handlerClazz, HandlerInfo info) {
if (GuiRecipeTab.handlerMap.put(handlerClazz.getName(), info) != null) {
NEIClientConfig.logger.info("Replaced handler info for {}", handlerClazz.getName());
public class NEIRegisterHandlerInfosEvent extends Event {
public void registerHandlerInfo(String handlerName, String modName, String modId, Consumer<HandlerInfo.Builder> builder) {
HandlerInfo.Builder b = new HandlerInfo.Builder(handlerName, modName, modId);
builder.accept(b);
HandlerInfo info = b.build();
if (GuiRecipeTab.handlerMap.put(info.getHandlerName(), info) != null) {
NEIClientConfig.logger.info("Replaced handler info for {}", info.getHandlerName());
} else {
NEIClientConfig.logger.info("Added handler info for {}", handlerClazz.getName());
NEIClientConfig.logger.info("Added handler info for {}", info.getHandlerName());
}
}
public void registerHandlerInfo(Class<? extends IRecipeHandler> handlerClazz, String modName, String modId, Consumer<HandlerInfo.Builder> builder) {
registerHandlerInfo(handlerClazz.getName(), modName, modId, builder);
}
}
@@ -54,12 +54,11 @@ public class GuiCraftingRecipe extends GuiRecipe
}
public static void registerRecipeHandler(ICraftingHandler handler) {
final Class<? extends ICraftingHandler> handlerClass = handler.getClass();
if(craftinghandlers.stream().anyMatch(h -> h.getClass() == handlerClass) || serialCraftingHandlers.stream().anyMatch(h -> h.getClass() == handlerClass))
final String handlerId = handler.getHandlerId();
if(craftinghandlers.stream().anyMatch(h -> h.getHandlerId().equals(handlerId)) || serialCraftingHandlers.stream().anyMatch(h -> h.getHandlerId().equals(handlerId)))
return;
final String handlerClassStr = handlerClass.getName();
if(NEIClientConfig.serialHandlers.contains(handlerClassStr))
if(NEIClientConfig.serialHandlers.contains(handlerId))
serialCraftingHandlers.add(handler);
else
craftinghandlers.add(handler);
+1 -1
View File
@@ -306,7 +306,7 @@ public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOve
} else {
handlerID = null;
}
HandlerInfo info = GuiRecipeTab.getHandlerInfo(handler.getClass().getName(), handlerID);
HandlerInfo info = GuiRecipeTab.getHandlerInfo(handler.getHandlerId(), handlerID);
if (info == null)
return GuiRecipeTab.DEFAULT_HANDLER_INFO;
+4 -4
View File
@@ -5,7 +5,7 @@ import codechicken.lib.gui.GuiDraw;
import codechicken.nei.NEIClientConfig;
import codechicken.nei.Widget;
import codechicken.nei.drawable.DrawableResource;
import codechicken.nei.event.RegisterHandlerInfosEvent;
import codechicken.nei.event.NEIRegisterHandlerInfosEvent;
import codechicken.nei.guihook.GuiContainerManager;
import cpw.mods.fml.common.Loader;
import net.minecraft.client.gui.FontRenderer;
@@ -60,7 +60,7 @@ public abstract class GuiRecipeTab extends Widget {
this.w = getWidth();
this.h = getHeight();
this.handler = handler;
this.handlerName = handler.toString().split("@")[0];
this.handlerName = handler.getHandlerId();
this.guiRecipe = guiRecipe;
this.selected = false;
@@ -262,8 +262,8 @@ public abstract class GuiRecipeTab extends Widget {
e.printStackTrace();
}
NEIClientConfig.logger.info("Sending {}", RegisterHandlerInfosEvent.class.getSimpleName());
MinecraftForge.EVENT_BUS.post(new RegisterHandlerInfosEvent());
NEIClientConfig.logger.info("Sending {}", NEIRegisterHandlerInfosEvent.class.getSimpleName());
MinecraftForge.EVENT_BUS.post(new NEIRegisterHandlerInfosEvent());
}
private static HandlerInfo getDefaultHandlerInfo() {
@@ -54,12 +54,11 @@ public class GuiUsageRecipe extends GuiRecipe
}
public static void registerUsageHandler(IUsageHandler handler) {
final Class<? extends IUsageHandler> handlerClass = handler.getClass();
if(usagehandlers.stream().anyMatch(h -> h.getClass() == handlerClass) || serialUsageHandlers.stream().anyMatch(h -> h.getClass() == handlerClass))
final String handlerId = handler.getHandlerId();
if(usagehandlers.stream().anyMatch(h -> h.getHandlerId().equals(handlerId)) || serialUsageHandlers.stream().anyMatch(h -> h.getHandlerId().equals(handlerId)))
return;
final String handlerClassStr = handlerClass.getName();
if(NEIClientConfig.serialHandlers.contains(handlerClassStr))
if(NEIClientConfig.serialHandlers.contains(handlerId))
serialUsageHandlers.add(handler);
else
usagehandlers.add(handler);
+59 -7
View File
@@ -10,6 +10,7 @@ import net.minecraft.nbt.JsonToNBT;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTException;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import org.apache.logging.log4j.Level;
public class HandlerInfo {
@@ -17,11 +18,11 @@ public class HandlerInfo {
public static int DEFAULT_WIDTH = 166;
public static int DEFAULT_MAX_PER_PAGE = 2;
private String handler;
private String handlerName;
private String modName;
private String modId;
private boolean requiresMod = true;
private boolean requiresMod;
private String excludedModId;
private String itemId;
@@ -35,8 +36,8 @@ public class HandlerInfo {
private ItemStack itemStack = null;
private DrawableResource image = null;
public HandlerInfo(String handler, String modName, String modId, boolean requiresMod, String excludedModId) {
this.handler = handler;
public HandlerInfo(String handlerName, String modName, String modId, boolean requiresMod, String excludedModId) {
this.handlerName = handlerName;
this.modName = modName;
this.modId = modId;
this.requiresMod = requiresMod;
@@ -55,7 +56,7 @@ public class HandlerInfo {
int meta = -1;
if (!itemId.contains(":")) {
NEIClientConfig.logger.info("Item ID missing colon for handler " + handler + " - " + modName);
NEIClientConfig.logger.info("Item ID missing colon for handler " + handlerName + " - " + modName);
return false;
}
final String[] split = itemId.split(":");
@@ -125,7 +126,6 @@ public class HandlerInfo {
return modId;
}
public int getHeight() {
return height;
}
@@ -142,6 +142,10 @@ public class HandlerInfo {
return yShift;
}
public String getHandlerName() {
return handlerName;
}
public boolean hasImageOrItem() {
if (image != null) return true;
if (itemStack != null) return true;
@@ -149,8 +153,56 @@ public class HandlerInfo {
return false;
}
public void setYShift(int yShift) {
this.yShift = yShift;
}
public static class Builder {
private final HandlerInfo info;
public Builder(String handlerName, String modName, String modId) {
this.info = new HandlerInfo(handlerName, modName, modId, true, null);
setMaxRecipesPerPage(Integer.MAX_VALUE);
}
public Builder(Class<? extends IRecipeHandler> handlerClazz, String modName, String modId) {
this(handlerClazz.getName(), modName, modId);
}
public Builder setDisplayStack(ItemStack stack) {
info.image = null;
info.itemStack = stack;
return this;
}
public Builder setDisplayImage(ResourceLocation location, int imageX, int imageY, int imageWidth, int imageHeight) {
info.itemStack = null;
info.setImage(location.toString(), imageX, imageY, imageWidth, imageHeight);
return this;
}
public Builder setShiftY(int shiftY) {
info.setYShift(shiftY);
return this;
}
public Builder setWidth(int width) {
info.setHandlerDimensions(info.height, width, info.maxRecipesPerPage);
return this;
}
public Builder setHeight(int height) {
info.setHandlerDimensions(height, info.width, info.maxRecipesPerPage);
return this;
}
public Builder setMaxRecipesPerPage(int maxRecipesPerPage) {
info.setHandlerDimensions(info.height, info.width, maxRecipesPerPage);
return this;
}
public HandlerInfo build() {
return info;
}
}
}
@@ -15,6 +15,15 @@ import java.util.List;
*/
public interface IRecipeHandler
{
/**
* For legacy compatibility reasons, this method's default implementation returns the class name.
*
* @return A unique identifier for this handler, used for finding duplicate handlers as well as GUI tab {@link HandlerInfo}.
*/
default String getHandlerId() {
return getClass().getName();
}
/**
*
* @return The name of this inventory.