Update dependencies

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)

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 {

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<? extends GuiScreen> mainConfigGuiClass() {
         return ModGuiConfig.class;

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);
 

src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeHandlerSolderer.java

@@ -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<RecipeWrapperSolderer> {
-    @Override
-    @Nonnull
-    public Class<RecipeWrapperSolderer> 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;
-    }
-}

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());
     }
 }