diff --git a/gradle.properties b/gradle.properties index 3988a9682..c892b980f 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ mcversion=1.12.1 -forgeversion=14.22.0.2459 -mcp_mappings=snapshot_20170817 +forgeversion=14.22.0.2462 +mcp_mappings=snapshot_20170826 curse_project_id=59751 tesla_version=1.0.60 tesla_mcversion=1.12 -jei_version=4.7.5.88 +jei_version=4.7.8.91 jei_mcversion=1.12.1 ic2_version=2.8.17-ex112 diff --git a/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java b/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java index ebaa5985e..80b71edca 100644 --- a/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java +++ b/src/main/java/forestry/apiculture/compat/ApicultureJeiPlugin.java @@ -21,7 +21,7 @@ public class ApicultureJeiPlugin implements IModPlugin { ISubtypeRegistry.ISubtypeInterpreter beeSubtypeInterpreter = itemStack -> { IAlleleSpecies species = Genome.getSpeciesDirectly(BeeManager.beeRoot, itemStack); - return species == null ? null : species.getUID(); + return species == null ? ISubtypeRegistry.ISubtypeInterpreter.NONE : species.getUID(); }; subtypeRegistry.registerSubtypeInterpreter(items.beeDroneGE, beeSubtypeInterpreter); diff --git a/src/main/java/forestry/farming/compat/FarmingJeiPlugin.java b/src/main/java/forestry/farming/compat/FarmingJeiPlugin.java index 63d3aabc1..3fc9167bd 100644 --- a/src/main/java/forestry/farming/compat/FarmingJeiPlugin.java +++ b/src/main/java/forestry/farming/compat/FarmingJeiPlugin.java @@ -1,7 +1,5 @@ package forestry.farming.compat; -import com.google.common.base.Preconditions; - import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound;