From 1e461abc3c9dd4494e8bf2c2406233d0fca116d9 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 20 May 2016 13:46:52 -0400 Subject: [PATCH] JEI integration is done! --- .../ChemicalWasherRecipeCategory.java | 16 +- .../ElectrolyticSeparatorRecipeCategory.java | 133 ++++++++++++++++- .../ElectrolyticSeparatorRecipeWrapper.java | 5 +- .../jei/machine/other/PRCRecipeCategory.java | 139 +++++++++++++++++- .../RotaryCondensentratorRecipeCategory.java | 75 +++++++++- .../RotaryCondensentratorRecipeWrapper.java | 10 ++ .../other/SolarNeutronRecipeCategory.java | 66 ++++++++- .../other/SolarNeutronRecipeWrapper.java | 4 +- .../ThermalEvaporationRecipeCategory.java | 80 +++++++++- .../mekanism/gui/GuiElectrolyticSeparator.png | Bin 17055 -> 2459 bytes .../gui/nei/GuiRotaryCondensentrator.png | Bin 20537 -> 9813 bytes 11 files changed, 515 insertions(+), 13 deletions(-) diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java index 2780eb9d7..c7e895a9f 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java @@ -1,5 +1,7 @@ package mekanism.client.jei.machine.chemical; +import java.util.List; + import mekanism.client.jei.BaseRecipeCategory; import mekanism.common.recipe.machines.WasherRecipe; import mezz.jei.api.IGuiHelper; @@ -7,9 +9,11 @@ import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiFluidStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.gui.ITooltipCallback; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; public class ChemicalWasherRecipeCategory extends BaseRecipeCategory { @@ -43,9 +47,7 @@ public class ChemicalWasherRecipeCategory extends BaseRecipeCategory super.drawExtras(minecraft); drawTexturedRect(61-xOffset, 39-yOffset, 176, 63, 55, 8); - - //displayGauge(58, 6-xOffset, 5-yOffset, 176, 4, 58, new FluidStack(FluidRegistry.WATER, 1), null); - + if(tempRecipe.getInput().ingredient != null) { displayGauge(58, 27-xOffset, 14-yOffset, 176, 4, 58, null, tempRecipe.getInput().ingredient); @@ -75,5 +77,13 @@ public class ChemicalWasherRecipeCategory extends BaseRecipeCategory fluidStacks.init(0, true, 6-xOffset, 5-yOffset, 16, 58, 1000, false, fluidOverlay); fluidStacks.set(0, recipeWrapper.getFluidInputs()); + fluidStacks.addTooltipCallback(new ITooltipCallback() { + + @Override + public void onTooltip(int slotIndex, boolean input, FluidStack ingredient, List tooltip) + { + tooltip.remove(1); + } + }); } } diff --git a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java index 2823fec6f..a05358924 100644 --- a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java @@ -1,5 +1,136 @@ package mekanism.client.jei.machine.other; -public class ElectrolyticSeparatorRecipeCategory { +import java.util.List; +import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.SeparatorRecipe; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.gui.ITooltipCallback; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; + +public class ElectrolyticSeparatorRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + public IDrawable fluidOverlay; + + public GuiGasGauge leftGas; + public GuiGasGauge rightGas; + + public SeparatorRecipe tempRecipe; + + public ITickTimer timer; + + public ElectrolyticSeparatorRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/GuiElectrolyticSeparator.png", "electrolytic_separator", "tile.MachineBlock2.ElectrolyticSeparator.name", ProgressBar.BI); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 4; + yOffset = 9; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 167, 62); + fluidOverlay = guiHelper.createDrawable(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, GuiGauge.Type.STANDARD.textureLocation), 19, 1, 16, 59); + } + + @Override + public void addGuiElements() + { + guiElements.add(GuiFluidGauge.getDummy(GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 5, 10)); + guiElements.add(leftGas = GuiGasGauge.getDummy(GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 58, 18)); + guiElements.add(rightGas = GuiGasGauge.getDummy(GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 100, 18)); + guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { + @Override + public double getLevel() + { + return 1F; + } + }, MekanismUtils.getResource(ResourceType.GUI, stripTexture()), 164, 15)); + + guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 25, 34)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 58, 51)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 100, 51)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 142, 34).with(SlotOverlay.POWER)); + + guiElements.add(new GuiProgress(new IProgressInfoHandler() + { + @Override + public double getProgress() + { + return 1; + } + }, progressBar, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 78, 29)); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + if(tempRecipe.getOutput().leftGas != null) + { + leftGas.setDummyType(tempRecipe.getOutput().leftGas.getGas()); + leftGas.renderScale(0, 0, -xOffset, -yOffset); + } + + if(tempRecipe.getOutput().rightGas != null) + { + rightGas.setDummyType(tempRecipe.getOutput().rightGas.getGas()); + rightGas.renderScale(0, 0, -xOffset, -yOffset); + } + + changeTexture(guiLocation); + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof ElectrolyticSeparatorRecipeWrapper) + { + tempRecipe = ((ElectrolyticSeparatorRecipeWrapper)recipeWrapper).recipe; + } + + IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); + + fluidStacks.init(0, true, 2, 2, 16, 58, tempRecipe.getInput().ingredient.amount, false, fluidOverlay); + fluidStacks.set(0, recipeWrapper.getFluidInputs()); + fluidStacks.addTooltipCallback(new ITooltipCallback() { + + @Override + public void onTooltip(int slotIndex, boolean input, FluidStack ingredient, List tooltip) + { + tooltip.remove(1); + } + }); + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java index aeed16c3b..6b7a3fe3c 100644 --- a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java @@ -10,7 +10,6 @@ import javax.annotation.Nullable; import mekanism.common.recipe.machines.SeparatorRecipe; import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; public class ElectrolyticSeparatorRecipeWrapper extends BlankRecipeWrapper @@ -52,11 +51,11 @@ public class ElectrolyticSeparatorRecipeWrapper extends BlankRecipeWrapper { List currenttip = new ArrayList(); - if(mouseX >= 59-5 && mouseX <= 75-5 && mouseY >= 19-9 && mouseY <= 47-9) + if(mouseX >= 59-4 && mouseX <= 75-4 && mouseY >= 19-9 && mouseY <= 47-9) { currenttip.add(recipe.getOutput().leftGas.getGas().getLocalizedName()); } - else if(mouseX >= 101-5 && mouseX <= 117-5 && mouseY >= 19-9 && mouseY <= 47-9) + else if(mouseX >= 101-4 && mouseX <= 117-4 && mouseY >= 19-9 && mouseY <= 47-9) { currenttip.add(recipe.getOutput().rightGas.getGas().getLocalizedName()); } diff --git a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java index 86c070caf..d41b2f99a 100644 --- a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java @@ -1,5 +1,142 @@ package mekanism.client.jei.machine.other; -public class PRCRecipeCategory { +import java.util.List; +import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.PressurizedRecipe; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IGuiItemStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.gui.ITooltipCallback; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; + +public class PRCRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + public IDrawable fluidOverlay; + + public GuiGasGauge gasInput; + public GuiGasGauge gasOutput; + + public PressurizedRecipe tempRecipe; + + public ITickTimer timer; + + public PRCRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/nei/GuiPRC.png", "pressurized_reaction_chamber", "tile.MachineBlock2.PressurizedReactionChamber.short.name", ProgressBar.MEDIUM); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 3; + yOffset = 11; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 68); + fluidOverlay = guiHelper.createDrawable(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, GuiGauge.Type.STANDARD.textureLocation), 19, 1, 16, 59); + } + + @Override + public void addGuiElements() + { + guiElements.add(new GuiSlot(SlotType.INPUT, this, guiLocation, 53, 34)); + guiElements.add(new GuiSlot(SlotType.POWER, this, guiLocation, 140, 18).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.OUTPUT, this, guiLocation, 115, 34)); + + guiElements.add(GuiFluidGauge.getDummy(GuiGauge.Type.STANDARD_YELLOW, this, guiLocation, 5, 10)); + guiElements.add(gasInput = GuiGasGauge.getDummy(GuiGauge.Type.STANDARD_RED, this, guiLocation, 28, 10)); + guiElements.add(gasOutput = GuiGasGauge.getDummy(GuiGauge.Type.SMALL_BLUE, this, guiLocation, 140, 40)); + + guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { + @Override + public double getLevel() + { + return 1F; + } + }, guiLocation, 164, 15)); + guiElements.add(new GuiProgress(new IProgressInfoHandler() + { + @Override + public double getProgress() + { + return (float)timer.getValue() / 20F; + } + }, progressBar, this, guiLocation, 75, 37)); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + if(tempRecipe.getInput().getGas() != null) + { + gasInput.setDummyType(tempRecipe.getInput().getGas().getGas()); + gasInput.renderScale(0, 0, -xOffset, -yOffset); + } + + if(tempRecipe.getOutput().getGasOutput() != null) + { + gasOutput.setDummyType(tempRecipe.getOutput().getGasOutput().getGas()); + gasOutput.renderScale(0, 0, -xOffset, -yOffset); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof PRCRecipeWrapper) + { + tempRecipe = ((PRCRecipeWrapper)recipeWrapper).recipe; + } + + IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); + + itemStacks.init(0, true, 53-xOffset, 34-yOffset); + itemStacks.init(1, false, 115-xOffset, 34-yOffset); + + itemStacks.set(0, recipeWrapper.getInputs()); + itemStacks.set(1, recipeWrapper.getOutputs()); + + IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); + + fluidStacks.init(0, true, 3, 0, 16, 58, tempRecipe.getInput().getFluid().amount, false, fluidOverlay); + fluidStacks.set(0, recipeWrapper.getFluidInputs()); + fluidStacks.addTooltipCallback(new ITooltipCallback() { + + @Override + public void onTooltip(int slotIndex, boolean input, FluidStack ingredient, List tooltip) + { + tooltip.remove(1); + } + }); + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java index 180c56f51..bfb7f318d 100644 --- a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeCategory.java @@ -1,5 +1,78 @@ package mekanism.client.jei.machine.other; -public class RotaryCondensentratorRecipeCategory { +import mekanism.api.gas.GasStack; +import mekanism.client.jei.BaseRecipeCategory; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +public class RotaryCondensentratorRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + public IDrawable fluidOverlay; + + public RotaryCondensentratorRecipeWrapper tempRecipe; + + public ITickTimer timer; + + public RotaryCondensentratorRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/nei/GuiRotaryCondensentrator.png", "rotary_condensentrator", "nei.rotaryCondensentrator", null); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 3; + yOffset = 12; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 71); + fluidOverlay = guiHelper.createDrawable(new ResourceLocation(guiTexture), 176, 40, 16, 59); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + if(tempRecipe.condensentrating) + { + drawTexturedRect(64-xOffset, 39-yOffset, 176, 123, 48, 8); + } + else { + drawTexturedRect(64-xOffset, 39-yOffset, 176, 115, 48, 8); + } + + if(tempRecipe.gasType != null) + { + displayGauge(58, 26-xOffset, 14-yOffset, 176, 40, 58, null, new GasStack(tempRecipe.gasType, 1)); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof RotaryCondensentratorRecipeWrapper) + { + tempRecipe = (RotaryCondensentratorRecipeWrapper)recipeWrapper; + } + + IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); + + fluidStacks.init(0, !tempRecipe.condensentrating, 134-xOffset, 14-yOffset, 16, 58, 1000, false, fluidOverlay); + fluidStacks.set(0, tempRecipe.condensentrating ? recipeWrapper.getFluidOutputs() : recipeWrapper.getFluidInputs()); + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java index cdfbd9b94..703de3bdb 100644 --- a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java @@ -8,7 +8,10 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import mekanism.api.gas.Gas; +import mekanism.common.util.LangUtils; import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -71,6 +74,13 @@ public class RotaryCondensentratorRecipeWrapper extends BlankRecipeWrapper } } + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) + { + FontRenderer fontRendererObj = minecraft.fontRendererObj; + fontRendererObj.drawString(condensentrating ? LangUtils.localize("gui.condensentrating") : LangUtils.localize("gui.decondensentrating"), 6-3, 74-12, 0x404040, false); + } + @Nullable @Override public List getTooltipStrings(int mouseX, int mouseY) diff --git a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java index 1d6387b7d..23d5e0d95 100644 --- a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeCategory.java @@ -1,5 +1,69 @@ package mekanism.client.jei.machine.other; -public class SolarNeutronRecipeCategory { +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.SolarNeutronRecipe; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +public class SolarNeutronRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + + public SolarNeutronRecipe tempRecipe; + + public ITickTimer timer; + + public SolarNeutronRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/nei/GuiSolarNeutronActivator.png", "solar_neutron_activator", "tile.MachineBlock3.SolarNeutronActivator.name", null); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 3; + yOffset = 12; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 70); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + drawTexturedRect(64-xOffset, 39-yOffset, 176, 58, 55, 8); + + if(tempRecipe.getInput().ingredient != null) + { + displayGauge(58, 26-xOffset, 14-yOffset, 176, 0, 58, null, tempRecipe.getInput().ingredient); + } + + if(tempRecipe.getOutput().output != null) + { + displayGauge(58, 134-xOffset, 14-yOffset, 176, 0, 58, null, tempRecipe.getOutput().output); + } + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof SolarNeutronRecipeWrapper) + { + tempRecipe = ((SolarNeutronRecipeWrapper)recipeWrapper).recipe; + } + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java index 3a4ad835f..068bfa2d0 100644 --- a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java @@ -43,11 +43,11 @@ public class SolarNeutronRecipeWrapper extends BlankRecipeWrapper { List currenttip = new ArrayList(); - if(mouseX >= 26-5 && mouseX <= 42-5 && mouseY >= 14-12 && mouseY <= 72-12) + if(mouseX >= 26-3 && mouseX <= 42-3 && mouseY >= 14-12 && mouseY <= 72-12) { currenttip.add(LangUtils.localizeGasStack(recipe.getInput().ingredient)); } - else if(mouseX >= 134-5 && mouseX <= 150-5 && mouseY >= 14-12 && mouseY <= 72-12) + else if(mouseX >= 134-3 && mouseX <= 150-3 && mouseY >= 14-12 && mouseY <= 72-12) { currenttip.add(LangUtils.localizeGasStack(recipe.getOutput().output)); } diff --git a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java index b20fbc22f..a191ffbf7 100644 --- a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java +++ b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java @@ -1,5 +1,83 @@ package mekanism.client.jei.machine.other; -public class ThermalEvaporationRecipeCategory { +import java.util.List; +import mekanism.client.jei.BaseRecipeCategory; +import mekanism.common.recipe.machines.ThermalEvaporationRecipe; +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IGuiFluidStackGroup; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.gui.ITickTimer; +import mezz.jei.api.gui.ITooltipCallback; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; + +public class ThermalEvaporationRecipeCategory extends BaseRecipeCategory +{ + public IGuiHelper guiHelper; + + public IDrawable background; + public IDrawable fluidOverlay; + + public ThermalEvaporationRecipe tempRecipe; + + public ITickTimer timer; + + public ThermalEvaporationRecipeCategory(IGuiHelper helper) + { + super("mekanism:gui/nei/GuiThermalEvaporationController.png", "thermal_evaporation_plant", "gui.thermalEvaporationController.short", null); + + guiHelper = helper; + + timer = helper.createTickTimer(20, 20, false); + + xOffset = 3; + yOffset = 12; + + background = guiHelper.createDrawable(new ResourceLocation(guiTexture), xOffset, yOffset, 170, 62); + fluidOverlay = guiHelper.createDrawable(new ResourceLocation(guiTexture), 176, 0, 16, 59); + } + + @Override + public void drawExtras(Minecraft minecraft) + { + super.drawExtras(minecraft); + + drawTexturedRect(49-xOffset, 64-yOffset, 176, 59, 78, 8); + } + + @Override + public IDrawable getBackground() + { + return background; + } + + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) + { + if(recipeWrapper instanceof ThermalEvaporationRecipeWrapper) + { + tempRecipe = ((ThermalEvaporationRecipeWrapper)recipeWrapper).recipe; + } + + IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); + + fluidStacks.init(0, true, 7-xOffset, 14-yOffset, 16, 58, tempRecipe.getInput().ingredient.amount, false, fluidOverlay); + fluidStacks.init(1, false, 153-xOffset, 14-yOffset, 16, 58, tempRecipe.getOutput().output.amount, false, fluidOverlay); + + fluidStacks.set(0, recipeWrapper.getFluidInputs()); + fluidStacks.set(1, recipeWrapper.getFluidOutputs()); + + fluidStacks.addTooltipCallback(new ITooltipCallback() { + + @Override + public void onTooltip(int slotIndex, boolean input, FluidStack ingredient, List tooltip) + { + tooltip.remove(1); + } + }); + } } diff --git a/src/main/resources/assets/mekanism/gui/GuiElectrolyticSeparator.png b/src/main/resources/assets/mekanism/gui/GuiElectrolyticSeparator.png index e40ff5d973c14d425b713800434c1f3d3253dbdb..19970499064348f3b7b921c8c777f3dee5d0585a 100644 GIT binary patch delta 1757 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 literal 20537 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 W3a&RH%h~|^u{2#v&oTD=<$nOaQwOsE