mirror of
https://github.com/GTNewHorizons/NotEnoughEnergistics.git
synced 2026-11-20 03:59:53 +00:00
remove reflexion on mods that are required
This commit is contained in:
1 parent
7cd70520ca
commit
215f6a34c5
5 files changed
+10
-35
No files matched your search
@@ -138,11 +138,6 @@ public class NEINeeConfig implements IConfigureNEI {
|
||||
}
|
||||
|
||||
private void installPatternTerminalExSupport(Set<String> identifiers) {
|
||||
try {
|
||||
Class.forName("appeng.client.gui.implementations.GuiPatternTermEx");
|
||||
} catch (ClassNotFoundException e) {
|
||||
return;
|
||||
}
|
||||
identifiers.remove("crafting");
|
||||
identifiers.remove("crafting2x2");
|
||||
// PatternTermEx Support
|
||||
|
||||
@@ -4,6 +4,7 @@ import static com.github.vfyjxf.nee.nei.NEECraftingHandler.INPUT_KEY;
|
||||
|
||||
import appeng.client.gui.implementations.GuiInterface;
|
||||
import appeng.client.gui.implementations.GuiPatternTerm;
|
||||
import appeng.client.gui.implementations.GuiPatternTermEx;
|
||||
import appeng.container.slot.SlotFake;
|
||||
import codechicken.nei.NEIClientConfig;
|
||||
import codechicken.nei.PositionedStack;
|
||||
@@ -33,7 +34,7 @@ public class AppengHelper {
|
||||
public static boolean handleMouseWheelInput(int dWheel) {
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
boolean isPatternTerm =
|
||||
mc.currentScreen instanceof GuiPatternTerm || GuiUtils.isPatternTermExGui(mc.currentScreen);
|
||||
mc.currentScreen instanceof GuiPatternTerm || mc.currentScreen instanceof GuiPatternTermEx;
|
||||
boolean isInterface = mc.currentScreen instanceof GuiInterface;
|
||||
if (isPatternTerm || isInterface) {
|
||||
if (dWheel != 0) {
|
||||
|
||||
@@ -3,6 +3,7 @@ package com.github.vfyjxf.nee.nei;
|
||||
import static com.github.vfyjxf.nee.processor.RecipeProcessor.NULL_IDENTIFIER;
|
||||
|
||||
import appeng.client.gui.implementations.GuiPatternTerm;
|
||||
import appeng.client.gui.implementations.GuiPatternTermEx;
|
||||
import appeng.util.Platform;
|
||||
import codechicken.nei.PositionedStack;
|
||||
import codechicken.nei.api.IOverlayHandler;
|
||||
@@ -16,7 +17,6 @@ import com.github.vfyjxf.nee.network.packet.PacketExtremeRecipe;
|
||||
import com.github.vfyjxf.nee.network.packet.PacketNEIPatternRecipe;
|
||||
import com.github.vfyjxf.nee.processor.IRecipeProcessor;
|
||||
import com.github.vfyjxf.nee.processor.RecipeProcessor;
|
||||
import com.github.vfyjxf.nee.utils.GuiUtils;
|
||||
import com.github.vfyjxf.nee.utils.ItemUtils;
|
||||
import java.util.*;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
@@ -66,7 +66,7 @@ public class NEECraftingHandler implements IOverlayHandler {
|
||||
|
||||
@Override
|
||||
public void overlayRecipe(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex, boolean shift) {
|
||||
if (firstGui instanceof GuiPatternTerm || GuiUtils.isPatternTermExGui(firstGui)) {
|
||||
if (firstGui instanceof GuiPatternTerm || firstGui instanceof GuiPatternTermEx) {
|
||||
NEENetworkHandler.getInstance().sendToServer(packRecipe(recipe, recipeIndex));
|
||||
} else {
|
||||
knowledgeInscriberHandler(firstGui, recipe, recipeIndex);
|
||||
|
||||
@@ -5,6 +5,7 @@ import static com.github.vfyjxf.nee.nei.NEECraftingHandler.OUTPUT_KEY;
|
||||
|
||||
import appeng.client.gui.implementations.GuiCraftingTerm;
|
||||
import appeng.client.gui.implementations.GuiPatternTerm;
|
||||
import appeng.client.gui.implementations.GuiPatternTermEx;
|
||||
import appeng.container.slot.SlotCraftingMatrix;
|
||||
import appeng.container.slot.SlotFakeCraftingMatrix;
|
||||
import appeng.core.AELog;
|
||||
@@ -267,7 +268,7 @@ public class NEECraftingHelper implements IOverlayHandler {
|
||||
if (event.button.id >= OVERLAY_BUTTON_ID_START
|
||||
&& event.button.id < OVERLAY_BUTTON_ID_START + overlayButtons.size()) {
|
||||
boolean isPatternTerm = guiRecipe.firstGui instanceof GuiPatternTerm
|
||||
|| GuiUtils.isPatternTermExGui(guiRecipe.firstGui);
|
||||
|| guiRecipe.firstGui instanceof GuiPatternTermEx;
|
||||
boolean isCraftingTerm = guiRecipe.firstGui instanceof GuiCraftingTerm
|
||||
|| GuiUtils.isGuiWirelessCrafting(guiRecipe.firstGui);
|
||||
if (isCraftingTerm || isPatternTerm) {
|
||||
|
||||
@@ -3,7 +3,9 @@ package com.github.vfyjxf.nee.utils;
|
||||
import appeng.client.gui.implementations.GuiCraftConfirm;
|
||||
import appeng.client.gui.implementations.GuiCraftingTerm;
|
||||
import appeng.client.gui.implementations.GuiPatternTerm;
|
||||
import appeng.client.gui.implementations.GuiPatternTermEx;
|
||||
import appeng.container.implementations.ContainerPatternTerm;
|
||||
import appeng.container.implementations.ContainerPatternTermEx;
|
||||
import appeng.helpers.IContainerCraftingPacket;
|
||||
import com.github.vfyjxf.nee.container.WCTContainerCraftingConfirm;
|
||||
import net.minecraft.client.Minecraft;
|
||||
@@ -17,8 +19,6 @@ import net.minecraft.inventory.Slot;
|
||||
*/
|
||||
public class GuiUtils {
|
||||
|
||||
private static Class<?> guiPatternTermExClass;
|
||||
private static Class<?> containerPatternTermExClass;
|
||||
private static Class<?> guiWirelessCraftingTerminalClass;
|
||||
private static Class<?> containerWirelessCraftingTerminalClass;
|
||||
private static Class<?> wirelessContainerCraftConfirmClass;
|
||||
@@ -26,14 +26,6 @@ public class GuiUtils {
|
||||
private static Class<?> wirelessTerminalGuiObjClass;
|
||||
|
||||
static {
|
||||
try {
|
||||
guiPatternTermExClass = Class.forName("appeng.client.gui.implementations.GuiPatternTermEx");
|
||||
} catch (ClassNotFoundException ignored) {
|
||||
}
|
||||
try {
|
||||
containerPatternTermExClass = Class.forName("appeng.container.implementations.ContainerPatternTermEx");
|
||||
} catch (ClassNotFoundException ignored) {
|
||||
}
|
||||
try {
|
||||
guiWirelessCraftingTerminalClass =
|
||||
Class.forName("net.p455w0rd.wirelesscraftingterminal.client.gui.GuiWirelessCraftingTerminal");
|
||||
@@ -61,20 +53,6 @@ public class GuiUtils {
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean isPatternTermExGui(GuiScreen container) {
|
||||
if (guiPatternTermExClass != null) {
|
||||
return guiPatternTermExClass.isInstance(container);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static boolean isPatternTermExContainer(Container container) {
|
||||
if (containerPatternTermExClass != null) {
|
||||
return containerPatternTermExClass.isInstance(container);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static boolean isGuiWirelessCrafting(GuiScreen gui) {
|
||||
if (guiWirelessCraftingTerminalClass != null) {
|
||||
return guiWirelessCraftingTerminalClass.isInstance(gui);
|
||||
@@ -119,7 +97,7 @@ public class GuiUtils {
|
||||
return false;
|
||||
}
|
||||
Container container = Minecraft.getMinecraft().thePlayer.openContainer;
|
||||
if (!(container instanceof ContainerPatternTerm) && !GuiUtils.isPatternTermExContainer(container)) {
|
||||
if (!(container instanceof ContainerPatternTerm) && !(container instanceof ContainerPatternTermEx)) {
|
||||
return false;
|
||||
}
|
||||
IContainerCraftingPacket cct = (IContainerCraftingPacket) container;
|
||||
@@ -132,7 +110,7 @@ public class GuiUtils {
|
||||
}
|
||||
|
||||
public static boolean isPatternTerm(GuiScreen guiScreen) {
|
||||
return guiScreen instanceof GuiPatternTerm || isPatternTermExGui(guiScreen);
|
||||
return guiScreen instanceof GuiPatternTerm || guiScreen instanceof GuiPatternTermEx;
|
||||
}
|
||||
|
||||
public static boolean isGuiCraftConfirm(GuiScreen gui) {
|
||||
|
||||
Reference in new issue
Block a user