From 72ea6b71be61132874a875f3fbce6791bdbea124 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 26 Aug 2017 13:39:33 -0700 Subject: [PATCH] Update dependencies --- core/src/main/java/binnie/core/BinnieCore.java | 4 ++-- .../binnie/genetics/integration/jei/GeneticsJeiPlugin.java | 6 ++---- gradle.properties | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/binnie/core/BinnieCore.java b/core/src/main/java/binnie/core/BinnieCore.java index 76a23652..015291e5 100644 --- a/core/src/main/java/binnie/core/BinnieCore.java +++ b/core/src/main/java/binnie/core/BinnieCore.java @@ -59,8 +59,8 @@ import binnie.core.modules.ModuleManager; version = "@VERSION@", acceptedMinecraftVersions = "[1.12, 1.12.1]", dependencies = "required-after:forge@[13.20.0.2279,);" + - "required-after:forestry@[5.3.4.102,);" + - "after:jei@[4.3.1,);" + "required-after:forestry@[5.5.0.176,);" + + "after:jei@[4.7.8,);" ) public final class BinnieCore extends AbstractMod { diff --git a/genetics/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java b/genetics/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java index 94017c45..e610040b 100644 --- a/genetics/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java +++ b/genetics/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java @@ -1,6 +1,5 @@ package binnie.genetics.integration.jei; -import javax.annotation.Nullable; import java.util.Arrays; import java.util.List; @@ -103,9 +102,8 @@ public class GeneticsJeiPlugin implements IModPlugin { } private static class ChargeableSubtypeInterpreter implements ISubtypeRegistry.ISubtypeInterpreter { - @Nullable @Override - public String getSubtypeInfo(ItemStack itemStack) { + public String apply(ItemStack itemStack) { Item item = itemStack.getItem(); if (item instanceof IItemChargeable) { IItemChargeable itemChargeable = (IItemChargeable) item; @@ -117,7 +115,7 @@ public class GeneticsJeiPlugin implements IModPlugin { } } - return null; + return ISubtypeRegistry.ISubtypeInterpreter.NONE; } } } diff --git a/gradle.properties b/gradle.properties index 89a6800a..ee5542b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx4G mcversion=1.12.1 -forgeversion=14.22.0.2459 -mcp_mappings=snapshot_20170818 +forgeversion=14.22.0.2462 +mcp_mappings=snapshot_20170826 curse_project_id=223525 forestry_version=5.5.0.176 @@ -15,7 +15,7 @@ version_major=2 version_minor=3 version_patch=0 -jei_version=4.7.5.88 +jei_version=4.7.8.91 jei_mcversion=1.12.1 jeibees_version=0.9.0.2 jeibees_mcversion=1.12