diff --git a/build.gradle b/build.gradle old mode 100755 new mode 100644 index 20fbe8eb8..ba9bea2cf --- a/build.gradle +++ b/build.gradle @@ -62,9 +62,9 @@ repositories { } dependencies { - deobfCompile "net.darkhax.tesla:Tesla-${mcversion}:${tesla_version}" - deobfCompile "mezz.jei:jei_${mcversion}:${jei_version}:api" - runtime "mezz.jei:jei_${mcversion}:${jei_version}" + deobfCompile "net.darkhax.tesla:Tesla-${tesla_mcversion}:${tesla_version}" + deobfCompile "mezz.jei:jei_${jei_mcversion}:${jei_version}:api" + runtime "mezz.jei:jei_${jei_mcversion}:${jei_version}" deobfCompile "net.industrial-craft:industrialcraft-2:${ic2_version}:api" } @@ -157,11 +157,11 @@ task makeChangelog(type: se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask) { curseforge { apiKey = project.hasProperty('curseforge_apikey') ? project.curseforge_apikey : '0' project { - id = '59751' + id = curse_project_id changelog = file('changelog.html') changelogType = 'html' releaseType = 'beta' - addGameVersion '1.12.1' + addGameVersion '1.12' } } diff --git a/gradle.properties b/gradle.properties index 5ce626953..3988a9682 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,13 @@ -mcversion=1.12 -forgeversion=14.21.1.2424 -mcp_mappings=snapshot_20170703 +mcversion=1.12.1 +forgeversion=14.22.0.2459 +mcp_mappings=snapshot_20170817 +curse_project_id=59751 tesla_version=1.0.60 -jei_version=4.7.2.77 -ic2_version=2.7.30-ex111 +tesla_mcversion=1.12 +jei_version=4.7.5.88 +jei_mcversion=1.12.1 +ic2_version=2.8.17-ex112 version_major=5 version_minor=5 diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index e095373f0..cc76d3448 100755 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -18,7 +18,6 @@ import java.io.File; import forestry.plugins.compat.PluginNatura; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.Mod; diff --git a/src/main/java/forestry/plugins/compat/PluginNatura.java b/src/main/java/forestry/plugins/compat/PluginNatura.java index 8d12417a4..396ed30ad 100644 --- a/src/main/java/forestry/plugins/compat/PluginNatura.java +++ b/src/main/java/forestry/plugins/compat/PluginNatura.java @@ -209,9 +209,13 @@ public class PluginNatura extends BlankForestryPlugin { try { maxAge = (int)block.getClass().getDeclaredMethod("getMaxAge").invoke(block); seedItem = block.getPickBlock(block.getBlockState().getBaseState(), null, null, null, null); - } catch (Exception _) {return;} // if this fails just ignore the error. + } catch (Exception ignored) { + return; + } Log.info("[PluginNatura] Addding crop '{}'", itemStack); - if(seedItem == null) return; + if (seedItem.isEmpty()) { + return; + } FarmRegistry.getInstance().registerFarmables("farmWheat", new FarmableAgingCrop(