diff --git a/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java b/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java index 9fb79ed1b..06612c7d4 100644 --- a/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java +++ b/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java @@ -21,7 +21,6 @@ package appeng.client.gui.implementations; import java.util.List; import appeng.mixins.SlotMixin; -import net.minecraft.client.util.InputUtil; import net.minecraft.client.util.math.MatrixStack; import org.lwjgl.glfw.GLFW; @@ -54,7 +53,7 @@ import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.ConfigValuePacket; import appeng.core.sync.packets.SwitchGuisPacket; import appeng.helpers.WirelessTerminalGuiObject; -import appeng.integration.abstraction.JEIFacade; +import appeng.integration.abstraction.ReiFacade; import appeng.parts.reporting.AbstractTerminalPart; import appeng.tile.misc.SecurityStationBlockEntity; import appeng.util.IConfigManagerHost; @@ -242,7 +241,7 @@ public class MEMonitorableScreen extends AEBas this.searchField.setFocused(this.isAutoFocus); if (isJEIEnabled) { - memoryText = JEIFacade.instance().getSearchText(); + memoryText = ReiFacade.instance().getSearchText(); } if (isKeepFilter && memoryText != null && !memoryText.isEmpty()) { diff --git a/src/main/java/appeng/client/me/ItemRepo.java b/src/main/java/appeng/client/me/ItemRepo.java index ba92b0c42..2a259e7f2 100644 --- a/src/main/java/appeng/client/me/ItemRepo.java +++ b/src/main/java/appeng/client/me/ItemRepo.java @@ -39,7 +39,7 @@ import appeng.api.storage.data.IItemList; import appeng.client.gui.widgets.IScrollSource; import appeng.client.gui.widgets.ISortSource; import appeng.core.AEConfig; -import appeng.integration.abstraction.JEIFacade; +import appeng.integration.abstraction.ReiFacade; import appeng.items.storage.ViewCellItem; import appeng.util.ItemSorters; import appeng.util.Platform; @@ -191,7 +191,7 @@ public class ItemRepo { } private void updateJEI(String filter) { - JEIFacade.instance().setSearchText(filter); + ReiFacade.instance().setSearchText(filter); } public int size() { diff --git a/src/main/java/appeng/integration/abstraction/IJEI.java b/src/main/java/appeng/integration/abstraction/IRei.java similarity index 90% rename from src/main/java/appeng/integration/abstraction/IJEI.java rename to src/main/java/appeng/integration/abstraction/IRei.java index 17199941b..005a1db5b 100644 --- a/src/main/java/appeng/integration/abstraction/IJEI.java +++ b/src/main/java/appeng/integration/abstraction/IRei.java @@ -23,7 +23,7 @@ import appeng.integration.IIntegrationModule; /** * Abstracts access to the JEI API functionality. */ -public interface IJEI extends IIntegrationModule { +public interface IRei extends IIntegrationModule { default String getSearchText() { return ""; @@ -32,6 +32,6 @@ public interface IJEI extends IIntegrationModule { default void setSearchText(String searchText) { } - class Stub extends IIntegrationModule.Stub implements IJEI { + class Stub extends IIntegrationModule.Stub implements IRei { } } diff --git a/src/main/java/appeng/integration/abstraction/JEIFacade.java b/src/main/java/appeng/integration/abstraction/JEIFacade.java deleted file mode 100644 index df9b1c2c5..000000000 --- a/src/main/java/appeng/integration/abstraction/JEIFacade.java +++ /dev/null @@ -1,20 +0,0 @@ -package appeng.integration.abstraction; - -import com.google.common.base.Preconditions; - -public final class JEIFacade { - - private JEIFacade() { - } - - private static IJEI instance = new IJEI.Stub(); - - public static IJEI instance() { - return instance; - } - - public static void setInstance(IJEI jei) { - instance = Preconditions.checkNotNull(jei); - } - -} diff --git a/src/main/java/appeng/integration/abstraction/ReiFacade.java b/src/main/java/appeng/integration/abstraction/ReiFacade.java new file mode 100644 index 000000000..f19a4fbe5 --- /dev/null +++ b/src/main/java/appeng/integration/abstraction/ReiFacade.java @@ -0,0 +1,20 @@ +package appeng.integration.abstraction; + +import com.google.common.base.Preconditions; + +public final class ReiFacade { + + private ReiFacade() { + } + + private static IRei instance = new IRei.Stub(); + + public static IRei instance() { + return instance; + } + + public static void setInstance(IRei jei) { + instance = Preconditions.checkNotNull(jei); + } + +} diff --git a/src/main/java/appeng/integration/modules/jei/ReiPlugin.java b/src/main/java/appeng/integration/modules/jei/ReiPlugin.java index adb508b2d..c40d41a4e 100644 --- a/src/main/java/appeng/integration/modules/jei/ReiPlugin.java +++ b/src/main/java/appeng/integration/modules/jei/ReiPlugin.java @@ -29,6 +29,7 @@ import appeng.container.implementations.PatternTermContainer; import appeng.core.AEConfig; import appeng.core.AppEng; import appeng.core.localization.GuiText; +import appeng.integration.abstraction.ReiFacade; import appeng.recipes.handlers.GrinderRecipe; import appeng.recipes.handlers.InscriberRecipe; import com.google.common.collect.ImmutableList; @@ -93,6 +94,8 @@ public class ReiPlugin implements REIPluginV0 { public void postRegister() { IDefinitions definitions = AEApi.instance().definitions(); registerDescriptions(definitions); + + ReiFacade.setInstance(new ReiRuntimeAdapter()); } private void registerWorkingStations(RecipeHelper registration) { diff --git a/src/unported/java/appeng/integration/modules/jei/JeiRuntimeAdapter.java b/src/main/java/appeng/integration/modules/jei/ReiRuntimeAdapter.java similarity index 72% rename from src/unported/java/appeng/integration/modules/jei/JeiRuntimeAdapter.java rename to src/main/java/appeng/integration/modules/jei/ReiRuntimeAdapter.java index c8b7cfc44..2080fafec 100644 --- a/src/unported/java/appeng/integration/modules/jei/JeiRuntimeAdapter.java +++ b/src/main/java/appeng/integration/modules/jei/ReiRuntimeAdapter.java @@ -20,16 +20,16 @@ package appeng.integration.modules.jei; import com.google.common.base.Strings; -import mezz.jei.api.runtime.IJeiRuntime; +import me.shedaniel.rei.api.REIHelper; -import appeng.integration.abstraction.IJEI; +import appeng.integration.abstraction.IRei; -class JeiRuntimeAdapter implements IJEI { +class ReiRuntimeAdapter implements IRei { - private final IReiRuntime runtime; + private final REIHelper runtime; - JeiRuntimeAdapter(IJeiRuntime jeiRuntime) { - this.runtime = jeiRuntime; + ReiRuntimeAdapter() { + this.runtime = REIHelper.getInstance(); } @Override @@ -39,11 +39,11 @@ class JeiRuntimeAdapter implements IJEI { @Override public String getSearchText() { - return Strings.nullToEmpty(this.runtime.getIngredientFilter().getFilterText()); + return Strings.nullToEmpty(this.runtime.getSearchTextField().getText()); } @Override public void setSearchText(String searchText) { - this.runtime.getIngredientFilter().setFilterText(Strings.nullToEmpty(searchText)); + this.runtime.getSearchTextField().setText(Strings.nullToEmpty(searchText)); } } diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index cf9d9c568..beb9ed78c 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -49,7 +49,7 @@ import appeng.core.AELog; import appeng.core.stats.AeStats; import appeng.fluids.util.AEFluidStack; import appeng.hooks.TickHandler; -import appeng.integration.abstraction.JEIFacade; +import appeng.integration.abstraction.ReiFacade; import appeng.me.GridAccessException; import appeng.me.GridNode; import appeng.me.helpers.AENetworkProxy; @@ -90,7 +90,6 @@ import net.minecraft.util.registry.Registry; import net.minecraft.world.RayTraceContext; import net.minecraft.world.World; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.text.DecimalFormat; import java.util.*; @@ -1142,7 +1141,7 @@ public class Platform { public static boolean isSearchModeAvailable(SearchBoxMode mode) { if (mode.isRequiresJei()) { - return JEIFacade.instance().isEnabled(); + return ReiFacade.instance().isEnabled(); } return true; } diff --git a/src/unported/java/appeng/integration/Integrations.java b/src/unported/java/appeng/integration/Integrations.java deleted file mode 100644 index 12a139cab..000000000 --- a/src/unported/java/appeng/integration/Integrations.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of Applied Energistics 2. - * Copyright (c) 2020, AlgorithmX2, All rights reserved. - * - * Applied Energistics 2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Applied Energistics 2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Applied Energistics 2. If not, see . - */ - -package appeng.integration; - -import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; - -import appeng.integration.modules.theoneprobe.TOP; - -public class Integrations { - - public static void enqueueIMC(final InterModEnqueueEvent event) { - TOP.enqueueIMC(event); - } -}