From 2f7f38f32757133d4ace28f0a9ec3e7a2c3e52c8 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 20 May 2016 11:44:30 -0400 Subject: [PATCH] A bit more work. Gotta pause to release v9 for 1.7.10 :) --- .../java/mekanism/client/jei/MekanismJEI.java | 58 +++++++++++++ .../ElectrolyticSeparatorRecipeHandler.java | 39 ++++++++- .../jei/machine/other/PRCRecipeHandler.java | 39 ++++++++- .../RotaryCondensentratorRecipeHandler.java | 39 ++++++++- .../RotaryCondensentratorRecipeWrapper.java | 84 ++++++++++++++++++- .../other/SolarNeutronRecipeHandler.java | 39 ++++++++- .../ThermalEvaporationRecipeHandler.java | 39 ++++++++- 7 files changed, 331 insertions(+), 6 deletions(-) diff --git a/src/main/java/mekanism/client/jei/MekanismJEI.java b/src/main/java/mekanism/client/jei/MekanismJEI.java index 785169c58..5313ad4fc 100644 --- a/src/main/java/mekanism/client/jei/MekanismJEI.java +++ b/src/main/java/mekanism/client/jei/MekanismJEI.java @@ -3,6 +3,8 @@ package mekanism.client.jei; import java.util.ArrayList; import java.util.List; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; import mekanism.client.gui.GuiChemicalCrystallizer; import mekanism.client.gui.GuiChemicalDissolutionChamber; import mekanism.client.gui.GuiChemicalInfuser; @@ -62,9 +64,24 @@ import mekanism.client.jei.machine.chemical.ChemicalOxidizerRecipeWrapper; import mekanism.client.jei.machine.chemical.ChemicalWasherRecipeCategory; import mekanism.client.jei.machine.chemical.ChemicalWasherRecipeHandler; import mekanism.client.jei.machine.chemical.ChemicalWasherRecipeWrapper; +import mekanism.client.jei.machine.other.ElectrolyticSeparatorRecipeCategory; +import mekanism.client.jei.machine.other.ElectrolyticSeparatorRecipeHandler; +import mekanism.client.jei.machine.other.ElectrolyticSeparatorRecipeWrapper; import mekanism.client.jei.machine.other.MetallurgicInfuserRecipeCategory; import mekanism.client.jei.machine.other.MetallurgicInfuserRecipeHandler; import mekanism.client.jei.machine.other.MetallurgicInfuserRecipeWrapper; +import mekanism.client.jei.machine.other.PRCRecipeCategory; +import mekanism.client.jei.machine.other.PRCRecipeHandler; +import mekanism.client.jei.machine.other.PRCRecipeWrapper; +import mekanism.client.jei.machine.other.RotaryCondensentratorRecipeCategory; +import mekanism.client.jei.machine.other.RotaryCondensentratorRecipeHandler; +import mekanism.client.jei.machine.other.RotaryCondensentratorRecipeWrapper; +import mekanism.client.jei.machine.other.SolarNeutronRecipeCategory; +import mekanism.client.jei.machine.other.SolarNeutronRecipeHandler; +import mekanism.client.jei.machine.other.SolarNeutronRecipeWrapper; +import mekanism.client.jei.machine.other.ThermalEvaporationRecipeCategory; +import mekanism.client.jei.machine.other.ThermalEvaporationRecipeHandler; +import mekanism.client.jei.machine.other.ThermalEvaporationRecipeWrapper; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; import mekanism.common.recipe.RecipeHandler.Recipe; @@ -77,6 +94,10 @@ import mekanism.common.recipe.machines.DissolutionRecipe; import mekanism.common.recipe.machines.MachineRecipe; import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; import mekanism.common.recipe.machines.OxidationRecipe; +import mekanism.common.recipe.machines.PressurizedRecipe; +import mekanism.common.recipe.machines.SeparatorRecipe; +import mekanism.common.recipe.machines.SolarNeutronRecipe; +import mekanism.common.recipe.machines.ThermalEvaporationRecipe; import mekanism.common.recipe.machines.WasherRecipe; import mekanism.common.util.ItemDataUtils; import mezz.jei.api.IItemRegistry; @@ -156,6 +177,26 @@ public class MekanismJEI implements IModPlugin registry.addRecipeCategories(chemicalWasherCategory); registry.addRecipeHandlers(new ChemicalWasherRecipeHandler(chemicalWasherCategory)); addRecipes(registry, Recipe.CHEMICAL_WASHER, chemicalWasherCategory, WasherRecipe.class, ChemicalWasherRecipeCategory.class, ChemicalWasherRecipeWrapper.class); + + SolarNeutronRecipeCategory solarNeutronCategory = new SolarNeutronRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(solarNeutronCategory); + registry.addRecipeHandlers(new SolarNeutronRecipeHandler(solarNeutronCategory)); + addRecipes(registry, Recipe.SOLAR_NEUTRON_ACTIVATOR, solarNeutronCategory, SolarNeutronRecipe.class, SolarNeutronRecipeCategory.class, SolarNeutronRecipeWrapper.class); + + ElectrolyticSeparatorRecipeCategory electrolyticSeparatorCategory = new ElectrolyticSeparatorRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(electrolyticSeparatorCategory); + registry.addRecipeHandlers(new ElectrolyticSeparatorRecipeHandler(electrolyticSeparatorCategory)); + addRecipes(registry, Recipe.ELECTROLYTIC_SEPARATOR, electrolyticSeparatorCategory, SeparatorRecipe.class, ElectrolyticSeparatorRecipeCategory.class, ElectrolyticSeparatorRecipeWrapper.class); + + ThermalEvaporationRecipeCategory thermalEvaporationCategory = new ThermalEvaporationRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(thermalEvaporationCategory); + registry.addRecipeHandlers(new ThermalEvaporationRecipeHandler(thermalEvaporationCategory)); + addRecipes(registry, Recipe.THERMAL_EVAPORATION_PLANT, thermalEvaporationCategory, ThermalEvaporationRecipe.class, ThermalEvaporationRecipeCategory.class, ThermalEvaporationRecipeWrapper.class); + + PRCRecipeCategory prcCategory = new PRCRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(prcCategory); + registry.addRecipeHandlers(new PRCRecipeHandler(prcCategory)); + addRecipes(registry, Recipe.PRESSURIZED_REACTION_CHAMBER, prcCategory, PressurizedRecipe.class, PRCRecipeCategory.class, PRCRecipeWrapper.class); } catch(Exception e) { e.printStackTrace(); } @@ -179,6 +220,23 @@ public class MekanismJEI implements IModPlugin registry.addRecipeClickArea(GuiThermalEvaporationController.class, 49, 20, 78, 38, "mekanism.thermal_evaporation_plant"); registry.addRecipeClickArea(GuiPRC.class, 75, 37, 36, 10, "mekanism.pressurized_reaction_chamber"); registry.addRecipeClickArea(GuiRotaryCondensentrator.class, 64, 39, 48, 8, "mekanism.rotary_condensentrator"); + + List condensentratorRecipes = new ArrayList(); + + RotaryCondensentratorRecipeCategory rotaryCondensentratorCategory = new RotaryCondensentratorRecipeCategory(registry.getJeiHelpers().getGuiHelper()); + registry.addRecipeCategories(rotaryCondensentratorCategory); + registry.addRecipeHandlers(new RotaryCondensentratorRecipeHandler(rotaryCondensentratorCategory)); + + for(Gas gas : GasRegistry.getRegisteredGasses()) + { + if(gas.hasFluid()) + { + condensentratorRecipes.add(new RotaryCondensentratorRecipeWrapper(gas.getFluid(), gas, true, rotaryCondensentratorCategory)); + condensentratorRecipes.add(new RotaryCondensentratorRecipeWrapper(gas.getFluid(), gas, false, rotaryCondensentratorCategory)); + } + } + + registry.addRecipes(condensentratorRecipes); } private void registerBasicMachine(IModRegistry registry, Recipe recipe, String unlocalized, ProgressBar bar, Class handler, Class wrapper) throws Exception diff --git a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeHandler.java index 70f2a856d..83c2096c9 100644 --- a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeHandler.java @@ -1,5 +1,42 @@ package mekanism.client.jei.machine.other; -public class ElectrolyticSeparatorRecipeHandler { +import javax.annotation.Nonnull; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class ElectrolyticSeparatorRecipeHandler implements IRecipeHandler +{ + private final ElectrolyticSeparatorRecipeCategory category; + + public ElectrolyticSeparatorRecipeHandler(ElectrolyticSeparatorRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return ElectrolyticSeparatorRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull ElectrolyticSeparatorRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull ElectrolyticSeparatorRecipeWrapper recipe) + { + return recipe.category == category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeHandler.java index 2ee616dfa..947f1b7b4 100644 --- a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeHandler.java @@ -1,5 +1,42 @@ package mekanism.client.jei.machine.other; -public class PRCRecipeHandler { +import javax.annotation.Nonnull; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class PRCRecipeHandler implements IRecipeHandler +{ + private final PRCRecipeCategory category; + + public PRCRecipeHandler(PRCRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return PRCRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull PRCRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull PRCRecipeWrapper recipe) + { + return recipe.category == category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java index 7b0a91bd2..45d9f3dc8 100644 --- a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java @@ -1,5 +1,42 @@ package mekanism.client.jei.machine.other; -public class RotaryCondensentratorRecipeHandler { +import javax.annotation.Nonnull; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class RotaryCondensentratorRecipeHandler implements IRecipeHandler +{ + private final RotaryCondensentratorRecipeCategory category; + + public RotaryCondensentratorRecipeHandler(RotaryCondensentratorRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return RotaryCondensentratorRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RotaryCondensentratorRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull RotaryCondensentratorRecipeWrapper recipe) + { + return recipe.category == category; + } } 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 646d0f306..cdfbd9b94 100644 --- a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java @@ -1,5 +1,87 @@ package mekanism.client.jei.machine.other; -public class RotaryCondensentratorRecipeWrapper { +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import mekanism.api.gas.Gas; +import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + +public class RotaryCondensentratorRecipeWrapper extends BlankRecipeWrapper +{ + public Fluid fluidType; + public Gas gasType; + + public boolean condensentrating = true; + + public RotaryCondensentratorRecipeCategory category; + + public RotaryCondensentratorRecipeWrapper(Fluid fluid, Gas gas, boolean b, RotaryCondensentratorRecipeCategory c) + { + fluidType = fluid; + gasType = gas; + + condensentrating = b; + category = c; + } + + @Nonnull + @Override + public List getInputs() + { + return new ArrayList(); + } + + @Nonnull + @Override + public List getFluidInputs() + { + if(condensentrating) + { + return new ArrayList(); + } + else { + return Arrays.asList(new FluidStack(fluidType, 1000)); + } + } + + @Nonnull + @Override + public List getOutputs() + { + return new ArrayList(); + } + + @Nonnull + @Override + public List getFluidOutputs() + { + if(condensentrating) + { + return Arrays.asList(new FluidStack(fluidType, 1000)); + } + else { + return new ArrayList(); + } + } + + @Nullable + @Override + public List getTooltipStrings(int mouseX, int mouseY) + { + List currenttip = new ArrayList(); + + if(mouseX >= 26-3 && mouseX <= 42-3 && mouseY >= 14-12 && mouseY <= 72-12) + { + currenttip.add(gasType.getLocalizedName()); + } + + return currenttip; + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeHandler.java index d065f8db9..bf366253a 100644 --- a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeHandler.java @@ -1,5 +1,42 @@ package mekanism.client.jei.machine.other; -public class SolarNeutronRecipeHandler { +import javax.annotation.Nonnull; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class SolarNeutronRecipeHandler implements IRecipeHandler +{ + private final SolarNeutronRecipeCategory category; + + public SolarNeutronRecipeHandler(SolarNeutronRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return SolarNeutronRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull SolarNeutronRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull SolarNeutronRecipeWrapper recipe) + { + return recipe.category == category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeHandler.java index 3d0cd7afd..9d1762bba 100644 --- a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeHandler.java +++ b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeHandler.java @@ -1,5 +1,42 @@ package mekanism.client.jei.machine.other; -public class ThermalEvaporationRecipeHandler { +import javax.annotation.Nonnull; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class ThermalEvaporationRecipeHandler implements IRecipeHandler +{ + private final ThermalEvaporationRecipeCategory category; + + public ThermalEvaporationRecipeHandler(ThermalEvaporationRecipeCategory c) + { + category = c; + } + + @Override + public Class getRecipeClass() + { + return ThermalEvaporationRecipeWrapper.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() + { + return category.getUid(); + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull ThermalEvaporationRecipeWrapper recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull ThermalEvaporationRecipeWrapper recipe) + { + return recipe.category == category; + } }