diff --git a/gradle.properties b/gradle.properties index 10ca8e7f9..19907b656 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mcversion=1.12 -forgeversion=14.21.0.2363 -mcp_mappings=snapshot_20170624 +forgeversion=14.21.1.2387 +mcp_mappings=snapshot_20170702 tesla_version=1.0.60 jei_version=4.7.0.67 diff --git a/src/main/java/forestry/core/config/ForestryGuiConfigFactory.java b/src/main/java/forestry/core/config/ForestryGuiConfigFactory.java index 3266a0268..359147f55 100644 --- a/src/main/java/forestry/core/config/ForestryGuiConfigFactory.java +++ b/src/main/java/forestry/core/config/ForestryGuiConfigFactory.java @@ -35,18 +35,8 @@ public class ForestryGuiConfigFactory implements IModGuiFactory { return new ForestryGuiConfig(parentScreen); } - @Override - public Class mainConfigGuiClass() { - return ForestryGuiConfig.class; - } - @Override public Set runtimeGuiCategories() { return null; } - - @Override - public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) { - return null; - } } diff --git a/src/main/java/forestry/core/items/ItemFertilizer.java b/src/main/java/forestry/core/items/ItemFertilizer.java index b98f9b9d8..6468fd5b7 100644 --- a/src/main/java/forestry/core/items/ItemFertilizer.java +++ b/src/main/java/forestry/core/items/ItemFertilizer.java @@ -28,7 +28,7 @@ public class ItemFertilizer extends ItemForestry { return EnumActionResult.FAIL; } - if (ItemDye.applyBonemeal(heldItem, worldIn, pos, player)) { + if (ItemDye.applyBonemeal(heldItem, worldIn, pos, player, hand)) { if (!worldIn.isRemote) { worldIn.playEvent(2005, pos, 0); } diff --git a/src/main/java/forestry/core/render/TextureMapForestry.java b/src/main/java/forestry/core/render/TextureMapForestry.java index d43a51086..b664dfa58 100755 --- a/src/main/java/forestry/core/render/TextureMapForestry.java +++ b/src/main/java/forestry/core/render/TextureMapForestry.java @@ -59,7 +59,7 @@ public class TextureMapForestry extends TextureMap { IResource iresource = null; if (textureatlassprite.hasCustomLoader(resourceManager, resourcelocation)) { - if (textureatlassprite.load(resourceManager, resourcelocation)) { + if (textureatlassprite.load(resourceManager, resourcelocation, l -> mapRegisteredSprites.get(l.toString()))) { continue; } } else