From d7aae80bdd6728798ca9cb1796838d4b54eed533 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 28 Sep 2014 18:35:49 -0700 Subject: [PATCH] Made codechicken fully optional, not included in jars. --- build.gradle | 3 +++ src/main/java/forestry/core/gui/GuiForestry.java | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/build.gradle b/build.gradle index ea5401bce..c95e1c937 100755 --- a/build.gradle +++ b/build.gradle @@ -211,6 +211,7 @@ task mainJar ( type: Zip, dependsOn: mainJarSigned ) { from (zipTree(jar.getArchivePath())) { include '**' + exclude '**/codechicken/**' } duplicatesStrategy = DuplicatesStrategy.EXCLUDE @@ -247,10 +248,12 @@ task devJar ( type: Zip, dependsOn: devJarSigned ) { from(sourceSets.main.allSource) { include '**' + exclude '**/codechicken/**' } from(sourceSets.main.output) { include '**' + exclude '**/codechicken/**' } from { diff --git a/src/main/java/forestry/core/gui/GuiForestry.java b/src/main/java/forestry/core/gui/GuiForestry.java index 7a9c15c2d..02d49fc82 100755 --- a/src/main/java/forestry/core/gui/GuiForestry.java +++ b/src/main/java/forestry/core/gui/GuiForestry.java @@ -18,6 +18,8 @@ import codechicken.nei.VisiblityData; import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.TaggedInventoryArea; +import cpw.mods.fml.common.Optional; + import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.OpenGlHelper; @@ -49,6 +51,7 @@ import forestry.core.interfaces.IPowerHandler; import forestry.core.proxy.Proxies; import forestry.core.utils.FontColour; +@Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") public abstract class GuiForestry extends GuiContainer implements INEIGuiHandler { /* WIDGETS */ @@ -579,15 +582,23 @@ public abstract class GuiForestry extends GuiContainer i /* NEI */ @Override + @Optional.Method(modid = "NotEnoughItems") public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) { return null; } + @Override + @Optional.Method(modid = "NotEnoughItems") public Iterable getItemSpawnSlots(GuiContainer gui, ItemStack item) { return null; } + @Override + @Optional.Method(modid = "NotEnoughItems") public List getInventoryAreas(GuiContainer gui) { return null; } + @Override + @Optional.Method(modid = "NotEnoughItems") public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button) { return false; } @Override + @Optional.Method(modid = "NotEnoughItems") public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) { if (gui instanceof GuiForestry) return ((GuiForestry)gui).ledgerManager.ledgerOverlaps(x, y, w, h);