From bc75b92d8d7a438c3505fca7bd7b0676808f8457 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 21 Apr 2017 23:16:01 +0200 Subject: [PATCH] Update dependencies --- CHANGELOG.md | 3 ++ build.gradle | 8 ++--- .../gui/config/ModGuiFactory.java | 10 ++++++ .../integration/jei/RSJEIPlugin.java | 4 +-- .../jei/RecipeHandlerSolderer.java | 31 ------------------- .../integration/mcmp/PartCable.java | 2 +- 6 files changed, 20 insertions(+), 38 deletions(-) delete mode 100755 src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeHandlerSolderer.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bfd737b7..9859ea765 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Refined Storage Changelog ### 1.4.3 +- Updated Forge to 2282 (raoulvdberge) +- Updated JEI version (raoulvdberge) +- Updated MCMultiPart version (raoulvdberge) - Storage Monitors don't render any quantity text when no item is specified to monitor anymore (raoulvdberge) - Fixed bug where disks in Disk Drive didn't respect access type or void excess stacks option (raoulvdberge) - Fixed crash in Disk Manipulator (raoulvdberge) diff --git a/build.gradle b/build.gradle index 325f0a230..b25a79342 100755 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 minecraft { - version = "1.11.2-13.20.0.2261" + version = "1.11.2-13.20.0.2282" runDir = "run" useDepAts = true mappings = "snapshot_20170401" @@ -51,12 +51,12 @@ repositories { } dependencies { - deobfCompile "mezz.jei:jei_1.11.2:4.2.10.248:api" - runtime "mezz.jei:jei_1.11.2:4.2.10.248" + deobfCompile "mezz.jei:jei_1.11.2:4.3.3.266:api" + runtime "mezz.jei:jei_1.11.2:4.3.3.266" deobfCompile "net.darkhax.tesla:Tesla:1.11-1.3.0.51" deobfCompile "org.cyclops.cyclopscore:CyclopsCore:1.11.2-0.10.0-516" deobfCompile "org.cyclops.commoncapabilities:CommonCapabilities:1.11.2-1.3.1-95" - deobfCompile "MCMultiPart2:MCMultiPart-exp:2.0.0_16" + deobfCompile "MCMultiPart2:MCMultiPart-exp:2.0.0_18" } processResources { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiFactory.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiFactory.java index ce077401b..731aa47fb 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiFactory.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiFactory.java @@ -12,6 +12,16 @@ public class ModGuiFactory implements IModGuiFactory { // NO OP } + @Override + public boolean hasConfigGui() { + return true; + } + + @Override + public GuiScreen createConfigGui(GuiScreen parentScreen) { + return new ModGuiConfig(parentScreen); + } + @Override public Class mainConfigGuiClass() { return ModGuiConfig.class; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJEIPlugin.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJEIPlugin.java index d767c4a97..ca0b1e259 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJEIPlugin.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJEIPlugin.java @@ -25,9 +25,9 @@ public class RSJEIPlugin extends BlankModPlugin { registry.addRecipeCategories(new RecipeCategorySolderer(registry.getJeiHelpers().getGuiHelper())); - registry.addRecipeHandlers(new RecipeHandlerSolderer()); + registry.handleRecipes(RecipeWrapperSolderer.class, recipe -> recipe, RecipeCategorySolderer.ID); - registry.addRecipes(RecipeMakerSolderer.getRecipes()); + registry.addRecipes(RecipeMakerSolderer.getRecipes(), RecipeCategorySolderer.ID); registry.addRecipeCategoryCraftingItem(new ItemStack(RSBlocks.SOLDERER), RecipeCategorySolderer.ID); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeHandlerSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeHandlerSolderer.java deleted file mode 100755 index 800c53a25..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeHandlerSolderer.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.raoulvdberge.refinedstorage.integration.jei; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -import javax.annotation.Nonnull; - -public class RecipeHandlerSolderer implements IRecipeHandler { - @Override - @Nonnull - public Class getRecipeClass() { - return RecipeWrapperSolderer.class; - } - - @Override - @Nonnull - public String getRecipeCategoryUid(@Nonnull RecipeWrapperSolderer recipe) { - return RecipeCategorySolderer.ID; - } - - @Override - @Nonnull - public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeWrapperSolderer recipe) { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull RecipeWrapperSolderer recipe) { - return true; - } -} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/PartCable.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/PartCable.java index 0b8faa58b..aaffae8f1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/PartCable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/PartCable.java @@ -52,6 +52,6 @@ public class PartCable implements IMultipart { @Override public void onPartChanged(IPartInfo part, IPartInfo otherPart) { - API.instance().discoverNode(part.getWorld(), part.getContainer().getPos()); + API.instance().discoverNode(part.getActualWorld(), part.getContainer().getPartPos()); } }