diff --git a/src/main/java/mekanism/client/gui/element/GuiElement.java b/src/main/java/mekanism/client/gui/element/GuiElement.java index 9203cd240..84dcd6e8a 100644 --- a/src/main/java/mekanism/client/gui/element/GuiElement.java +++ b/src/main/java/mekanism/client/gui/element/GuiElement.java @@ -1,5 +1,6 @@ package mekanism.client.gui.element; +import java.awt.Rectangle; import java.util.List; import mekanism.api.ObfuscatedNames; @@ -13,8 +14,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public abstract class GuiElement { @@ -145,6 +144,7 @@ public abstract class GuiElement public static class Rectangle4i { public int x, y, width, height; + public Rectangle4i(int x, int y, int width, int height) { this.x = x; @@ -152,5 +152,10 @@ public abstract class GuiElement this.width = width; this.height = height; } + + public Rectangle toRectangle() + { + return new Rectangle(x, y, width, height); + } } } diff --git a/src/main/java/mekanism/client/jei/GuiElementHandler.java b/src/main/java/mekanism/client/jei/GuiElementHandler.java new file mode 100644 index 000000000..b6e1bb9ed --- /dev/null +++ b/src/main/java/mekanism/client/jei/GuiElementHandler.java @@ -0,0 +1,39 @@ +package mekanism.client.jei; + +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; + +import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement; +import mezz.jei.api.gui.IAdvancedGuiHandler; +import net.minecraft.client.gui.inventory.GuiContainer; + +public class GuiElementHandler implements IAdvancedGuiHandler +{ + @Override + public Class getGuiContainerClass() + { + return GuiMekanism.class; + } + + @Override + public List getGuiExtraAreas(GuiContainer gui) + { + if(gui instanceof GuiMekanism) + { + List list = new ArrayList(); + + GuiMekanism guiMek = (GuiMekanism)gui; + + for(GuiElement element : guiMek.guiElements) + { + list.add(element.getBounds(guiMek.getXPos(), guiMek.getYPos()).toRectangle()); + } + + return list; + } + + return null; + } +} diff --git a/src/main/java/mekanism/client/jei/MekanismJEI.java b/src/main/java/mekanism/client/jei/MekanismJEI.java index bcb0532d9..12a185c4e 100644 --- a/src/main/java/mekanism/client/jei/MekanismJEI.java +++ b/src/main/java/mekanism/client/jei/MekanismJEI.java @@ -1,5 +1,7 @@ package mekanism.client.jei; +import mekanism.common.MekanismBlocks; +import mekanism.common.MekanismItems; import mezz.jei.api.IItemRegistry; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.IJeiRuntime; @@ -7,6 +9,7 @@ import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.IRecipeRegistry; import mezz.jei.api.JEIPlugin; +import net.minecraft.item.ItemStack; @JEIPlugin public class MekanismJEI implements IModPlugin @@ -14,7 +17,10 @@ public class MekanismJEI implements IModPlugin @Override public void register(IModRegistry registry) { + registry.addAdvancedGuiHandlers(new GuiElementHandler()); + registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(MekanismItems.ItemProxy)); + registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(MekanismBlocks.BoundingBlock)); } @Override @@ -26,7 +32,7 @@ public class MekanismJEI implements IModPlugin @Override public void onJeiHelpersAvailable(IJeiHelpers helpers) { - + } @Override diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 2f505a468..d57937f26 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -161,7 +161,7 @@ import com.mojang.authlib.GameProfile; * */ @Mod(modid = "Mekanism", name = "Mekanism", version = "9.0.0", guiFactory = "mekanism.client.gui.ConfigGuiFactory", - dependencies = "after:ForgeMultipart;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" + + dependencies = "after:JEI;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" + "after:ComputerCraft;after:Galacticraft API;after:MetallurgyCore") public class Mekanism { diff --git a/src/main/resources/assets/mekanism/gui/GuiChemicalInfuser.png b/src/main/resources/assets/mekanism/gui/GuiChemicalInfuser.png index 61388f0e5..61c1d6d62 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiChemicalInfuser.png and b/src/main/resources/assets/mekanism/gui/GuiChemicalInfuser.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiChemicalWasher.png b/src/main/resources/assets/mekanism/gui/GuiChemicalWasher.png index 8a3bb3b4e..eee32554f 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiChemicalWasher.png and b/src/main/resources/assets/mekanism/gui/GuiChemicalWasher.png differ diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalCrystallizer.png b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalCrystallizer.png index cead4ce32..21d34ec73 100644 Binary files a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalCrystallizer.png and b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalCrystallizer.png differ diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalInfuser.png b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalInfuser.png index 30b356997..2bc100a9d 100644 Binary files a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalInfuser.png and b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalInfuser.png differ diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalWasher.png b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalWasher.png index 32c9e1b4a..151b1081b 100644 Binary files a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalWasher.png and b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalWasher.png differ