From e2e08b93d80eecd854f7c500b3af0e64f7c6d738 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 29 Jan 2016 00:19:55 -0800 Subject: [PATCH] Move JEI items out of the way of GuiMultiModule modules --- build.gradle | 6 +++ build.properties | 3 +- .../mantle/client/gui/GuiModule.java | 5 ++ .../mantle/client/gui/GuiMultiModule.java | 10 ++++ .../slimeknights/mantle/util/JeiPlugin.java | 48 +++++++++++++++++++ 5 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 src/main/java/slimeknights/mantle/util/JeiPlugin.java diff --git a/build.gradle b/build.gradle index 894dae1..1e877cc 100644 --- a/build.gradle +++ b/build.gradle @@ -36,6 +36,10 @@ repositories { name 'CB Maven FS' url "http://chickenbones.net/maven/" } + maven { + name 'DVS1 Maven FS' + url 'http://dvs1.progwml6.com/files/maven' + } maven { name 'forge' url 'http://files.minecraftforge.net/maven' @@ -87,6 +91,7 @@ minecraft { version = config.minecraft_version + "-" + config.forge_version mappings = config.mappings runDir = 'run' + useDepAts = true replace '${version}', project.version } @@ -99,6 +104,7 @@ dependencies { //compile "codechicken:CodeChickenLib:${config.minecraft_version}-${config.CCLIB_version}:dev" //compile "codechicken:CodeChickenCore:${config.minecraft_version}-${config.ccc_version}:dev" //compile "codechicken:NotEnoughItems:${config.minecraft_version}-${config.NEI_version}:dev" + deobfCompile "mezz.jei:jei_${config.minecraft_version}:${config.jei_version}" // Configuration shade "ninja.leaping.configurate:configurate-hocon:${config.configurate_version}" shade "ninja.leaping.configurate:configurate-gson:${config.configurate_version}" diff --git a/build.properties b/build.properties index 7ab6431..8ef2b68 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,10 @@ mod_version=0.7 minecraft_version=1.8.9 -forge_version=11.15.0.1663 +forge_version=11.15.1.1722 mappings=snapshot_20151212 CCLIB_version=1.1.2.133 ccc_version=1.0.5.36 NEI_version=1.0.5.104 +jei_version=2.24.+ configurate_version=2.0 diff --git a/src/main/java/slimeknights/mantle/client/gui/GuiModule.java b/src/main/java/slimeknights/mantle/client/gui/GuiModule.java index 21e2e4c..a700f7e 100644 --- a/src/main/java/slimeknights/mantle/client/gui/GuiModule.java +++ b/src/main/java/slimeknights/mantle/client/gui/GuiModule.java @@ -6,6 +6,7 @@ import net.minecraft.inventory.Slot; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import java.awt.Rectangle; import java.io.IOException; import java.util.List; @@ -39,6 +40,10 @@ public abstract class GuiModule extends GuiContainer { return guiTop + ySize; } + public Rectangle getArea() { + return new Rectangle(guiLeft, guiTop, xSize, ySize); + } + @Override public void initGui() { this.guiLeft = (this.width - this.xSize) / 2; diff --git a/src/main/java/slimeknights/mantle/client/gui/GuiMultiModule.java b/src/main/java/slimeknights/mantle/client/gui/GuiMultiModule.java index 49cea12..0365eed 100644 --- a/src/main/java/slimeknights/mantle/client/gui/GuiMultiModule.java +++ b/src/main/java/slimeknights/mantle/client/gui/GuiMultiModule.java @@ -14,8 +14,10 @@ import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import java.awt.Rectangle; import java.io.IOException; import java.lang.reflect.Field; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -57,6 +59,14 @@ public class GuiMultiModule extends GuiContainer { //implements INEIGuiHandler { modules.add(module); } + public List getModuleAreas() { + List areas = new ArrayList<>(modules.size()); + for (GuiModule module : modules) { + areas.add(module.getArea()); + } + return areas; + } + @Override public void initGui() { if(realWidth > -1) { diff --git a/src/main/java/slimeknights/mantle/util/JeiPlugin.java b/src/main/java/slimeknights/mantle/util/JeiPlugin.java new file mode 100644 index 0000000..889eb71 --- /dev/null +++ b/src/main/java/slimeknights/mantle/util/JeiPlugin.java @@ -0,0 +1,48 @@ +package slimeknights.mantle.util; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.awt.Rectangle; +import java.util.List; + +import mezz.jei.api.IItemRegistry; +import mezz.jei.api.IJeiHelpers; +import mezz.jei.api.IJeiRuntime; +import mezz.jei.api.IModPlugin; +import mezz.jei.api.IModRegistry; +import mezz.jei.api.IRecipeRegistry; +import mezz.jei.api.JEIPlugin; +import mezz.jei.api.gui.IAdvancedGuiHandler; +import slimeknights.mantle.client.gui.GuiMultiModule; + +@JEIPlugin +public class JeiPlugin implements IModPlugin { + @Override + public void onJeiHelpersAvailable(IJeiHelpers jeiHelpers) {} + + @Override + public void onItemRegistryAvailable(IItemRegistry itemRegistry) {} + + @Override + public void register(IModRegistry registry) { + registry.addAdvancedGuiHandlers(new IAdvancedGuiHandler() { + @Nonnull + @Override + public Class getGuiContainerClass() { + return GuiMultiModule.class; + } + + @Nullable + @Override + public List getGuiExtraAreas(@Nonnull GuiMultiModule guiContainer) { + return guiContainer.getModuleAreas(); + } + }); + } + + @Override + public void onRecipeRegistryAvailable(IRecipeRegistry recipeRegistry) {} + + @Override + public void onRuntimeAvailable(IJeiRuntime jeiRuntime) {} +}