From d0892d324d59af461239176b55aa25528b6b7abb Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 17 Jan 2020 14:54:48 +0100 Subject: [PATCH] Re-add JEI integration --- build.gradle | 7 +++++-- ...tHandler.java.off => GhostIngredientHandler.java} | 0 ...ndler.java.off => GridRecipeTransferHandler.java} | 0 ...inerHandler.java.off => GuiContainerHandler.java} | 2 +- .../jei/{RSJeiPlugin.java.off => RSJeiPlugin.java} | 0 .../network/grid/GridTransferMessage.java | 12 ++++++------ .../screen/widget/ScrollbarWidget.java | 5 +++-- .../refinedstorage/screen/widget/SearchWidget.java | 3 ++- 8 files changed, 17 insertions(+), 12 deletions(-) rename src/main/java/com/raoulvdberge/refinedstorage/integration/jei/{GhostIngredientHandler.java.off => GhostIngredientHandler.java} (100%) rename src/main/java/com/raoulvdberge/refinedstorage/integration/jei/{GridRecipeTransferHandler.java.off => GridRecipeTransferHandler.java} (100%) rename src/main/java/com/raoulvdberge/refinedstorage/integration/jei/{GuiContainerHandler.java.off => GuiContainerHandler.java} (88%) rename src/main/java/com/raoulvdberge/refinedstorage/integration/jei/{RSJeiPlugin.java.off => RSJeiPlugin.java} (100%) diff --git a/build.gradle b/build.gradle index a20ec0cc1..b68e04e4f 100755 --- a/build.gradle +++ b/build.gradle @@ -95,10 +95,13 @@ processResources { dependencies { minecraft 'net.minecraftforge:forge:1.15.1-30.0.41' - //compileOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.11:api") + + compileOnly fg.deobf("mezz.jei:jei-1.15.1:6.0.0.1:api") + runtimeOnly fg.deobf("mezz.jei:jei-1.15.1:6.0.0.1") + //compileOnly 'mouse-tweaks:MouseTweaks:2.12:mc1.14.4' + //runtimeOnly fg.deobf('crafting-tweaks:CraftingTweaks_1.14.4:10.1.3') - //runtimeOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.11") } jar { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GhostIngredientHandler.java.off b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GhostIngredientHandler.java similarity index 100% rename from src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GhostIngredientHandler.java.off rename to src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GhostIngredientHandler.java diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GridRecipeTransferHandler.java.off b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GridRecipeTransferHandler.java similarity index 100% rename from src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GridRecipeTransferHandler.java.off rename to src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GridRecipeTransferHandler.java diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GuiContainerHandler.java.off b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GuiContainerHandler.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GuiContainerHandler.java.off rename to src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GuiContainerHandler.java index c84f662cd..717056513 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GuiContainerHandler.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/GuiContainerHandler.java @@ -21,7 +21,7 @@ public class GuiContainerHandler implements IGuiContainerHandler { GridScreen grid = (GridScreen) screen; if (!grid.getSearchField().isFocused() && grid.isOverSlotArea(mouseX, mouseY)) { - return grid.getSlotNumber() >= 0 && grid.getSlotNumber() < grid.getView().getStacks().size() ? grid.getView().getStacks().get(grid.getSlotNumber()).getIngredient() : null; + return (grid.getSlotNumber() >= 0 && grid.getSlotNumber() < grid.getView().getStacks().size()) ? grid.getView().getStacks().get(grid.getSlotNumber()).getIngredient() : null; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJeiPlugin.java.off b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJeiPlugin.java similarity index 100% rename from src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJeiPlugin.java.off rename to src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJeiPlugin.java diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridTransferMessage.java b/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridTransferMessage.java index 9fa63aad1..47c6cbd31 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridTransferMessage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/grid/GridTransferMessage.java @@ -4,6 +4,7 @@ import com.raoulvdberge.refinedstorage.api.network.grid.GridType; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.container.GridContainer; import com.raoulvdberge.refinedstorage.util.StackUtils; +import mezz.jei.api.gui.ingredient.IGuiIngredient; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; @@ -15,9 +16,8 @@ import java.util.List; import java.util.Map; import java.util.function.Supplier; -// TODO public class GridTransferMessage { - //private Map> inputs; + private Map> inputs; private List slots; private ItemStack[][] recipe = new ItemStack[9][]; @@ -25,10 +25,10 @@ public class GridTransferMessage { public GridTransferMessage() { } - /*public GridTransferMessage(Map> inputs, List slots) { + public GridTransferMessage(Map> inputs, List slots) { this.inputs = inputs; this.slots = slots; - }*/ + } public static GridTransferMessage decode(PacketBuffer buf) { GridTransferMessage msg = new GridTransferMessage(); @@ -52,7 +52,7 @@ public class GridTransferMessage { buf.writeInt(message.slots.size()); for (Slot slot : message.slots) { - /*IGuiIngredient ingredient = message.inputs.get(slot.getSlotIndex() + 1); + IGuiIngredient ingredient = message.inputs.get(slot.getSlotIndex() + 1); List ingredients = new ArrayList<>(); @@ -68,7 +68,7 @@ public class GridTransferMessage { for (ItemStack possibleStack : ingredients) { StackUtils.writeItemStack(buf, possibleStack); - }*/ + } } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidget.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidget.java index 8c669df0f..c436b1a82 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidget.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidget.java @@ -3,6 +3,7 @@ package com.raoulvdberge.refinedstorage.screen.widget; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.integration.jei.GridRecipeTransferHandler; import com.raoulvdberge.refinedstorage.integration.jei.JeiIntegration; import com.raoulvdberge.refinedstorage.screen.BaseScreen; import com.raoulvdberge.refinedstorage.util.RenderUtils; @@ -71,9 +72,9 @@ public class ScrollbarWidget implements IGuiEventListener { if (button == 0 && RenderUtils.inBounds(x, y, width, height, mx, my)) { // Prevent accidental scrollbar click after clicking recipe transfer button - /* TODO if (JeiIntegration.isLoaded() && System.currentTimeMillis() - GridRecipeTransferHandler.LAST_TRANSFER_TIME <= GridRecipeTransferHandler.TRANSFER_SCROLLBAR_DELAY_MS) { + if (JeiIntegration.isLoaded() && System.currentTimeMillis() - GridRecipeTransferHandler.LAST_TRANSFER_TIME <= GridRecipeTransferHandler.TRANSFER_SCROLLBAR_DELAY_MS) { return false; - }*/ + } updateOffset(my); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/SearchWidget.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/SearchWidget.java index 90978f377..7741a424a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/SearchWidget.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/SearchWidget.java @@ -3,6 +3,7 @@ package com.raoulvdberge.refinedstorage.screen.widget; import com.raoulvdberge.refinedstorage.RSKeyBindings; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.integration.jei.JeiIntegration; +import com.raoulvdberge.refinedstorage.integration.jei.RSJeiPlugin; import com.raoulvdberge.refinedstorage.render.RenderSettings; import com.raoulvdberge.refinedstorage.screen.BaseScreen; import net.minecraft.client.gui.FontRenderer; @@ -28,7 +29,7 @@ public class SearchWidget extends TextFieldWidget { public void updateJei() { if (JeiIntegration.isLoaded() && (mode == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED || mode == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED)) { - /// TODO RSJeiPlugin.RUNTIME.getIngredientFilter().setFilterText(getText()); + RSJeiPlugin.RUNTIME.getIngredientFilter().setFilterText(getText()); } }