diff --git a/src/main/java/mekanism/client/jei/MekanismJEI.java b/src/main/java/mekanism/client/jei/MekanismJEI.java index 987f36179..1001a6ac3 100644 --- a/src/main/java/mekanism/client/jei/MekanismJEI.java +++ b/src/main/java/mekanism/client/jei/MekanismJEI.java @@ -30,60 +30,40 @@ import mekanism.client.jei.crafting.ShapedMekanismRecipeHandler; import mekanism.client.jei.crafting.ShapelessMekanismRecipeHandler; import mekanism.client.jei.gas.GasStackRenderer; import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; -import mekanism.client.jei.machine.AdvancedMachineRecipeHandler; import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper; +import mekanism.client.jei.machine.BaseRecipeHandler; import mekanism.client.jei.machine.ChanceMachineRecipeCategory; -import mekanism.client.jei.machine.ChanceMachineRecipeHandler; import mekanism.client.jei.machine.ChanceMachineRecipeWrapper; import mekanism.client.jei.machine.MachineRecipeCategory; -import mekanism.client.jei.machine.MachineRecipeHandler; import mekanism.client.jei.machine.MachineRecipeWrapper; -import mekanism.client.jei.machine.advanced.ChemicalInjectionChamberRecipeHandler; import mekanism.client.jei.machine.advanced.ChemicalInjectionChamberRecipeWrapper; -import mekanism.client.jei.machine.advanced.CombinerRecipeHandler; import mekanism.client.jei.machine.advanced.CombinerRecipeWrapper; -import mekanism.client.jei.machine.advanced.OsmiumCompressorRecipeHandler; import mekanism.client.jei.machine.advanced.OsmiumCompressorRecipeWrapper; -import mekanism.client.jei.machine.advanced.PurificationChamberRecipeHandler; import mekanism.client.jei.machine.advanced.PurificationChamberRecipeWrapper; -import mekanism.client.jei.machine.basic.CrusherRecipeHandler; import mekanism.client.jei.machine.basic.CrusherRecipeWrapper; -import mekanism.client.jei.machine.basic.EnrichmentRecipeHandler; import mekanism.client.jei.machine.basic.EnrichmentRecipeWrapper; -import mekanism.client.jei.machine.chance.PrecisionSawmillRecipeHandler; import mekanism.client.jei.machine.chance.PrecisionSawmillRecipeWrapper; import mekanism.client.jei.machine.chemical.ChemicalCrystallizerRecipeCategory; -import mekanism.client.jei.machine.chemical.ChemicalCrystallizerRecipeHandler; import mekanism.client.jei.machine.chemical.ChemicalCrystallizerRecipeWrapper; import mekanism.client.jei.machine.chemical.ChemicalDissolutionChamberRecipeCategory; -import mekanism.client.jei.machine.chemical.ChemicalDissolutionChamberRecipeHandler; import mekanism.client.jei.machine.chemical.ChemicalDissolutionChamberRecipeWrapper; import mekanism.client.jei.machine.chemical.ChemicalInfuserRecipeCategory; -import mekanism.client.jei.machine.chemical.ChemicalInfuserRecipeHandler; import mekanism.client.jei.machine.chemical.ChemicalInfuserRecipeWrapper; import mekanism.client.jei.machine.chemical.ChemicalOxidizerRecipeCategory; -import mekanism.client.jei.machine.chemical.ChemicalOxidizerRecipeHandler; 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; @@ -175,64 +155,64 @@ public class MekanismJEI extends BlankModPlugin registry.getJeiHelpers().getIngredientBlacklist().addIngredientToBlacklist(new ItemStack(MekanismBlocks.BoundingBlock)); try { - registerBasicMachine(registry, Recipe.ENRICHMENT_CHAMBER, "tile.MachineBlock.EnrichmentChamber.name", ProgressBar.BLUE, EnrichmentRecipeHandler.class, EnrichmentRecipeWrapper.class); - registerBasicMachine(registry, Recipe.CRUSHER, "tile.MachineBlock.Crusher.name", ProgressBar.CRUSH, CrusherRecipeHandler.class, CrusherRecipeWrapper.class); + registerBasicMachine(registry, Recipe.ENRICHMENT_CHAMBER, "tile.MachineBlock.EnrichmentChamber.name", ProgressBar.BLUE, EnrichmentRecipeWrapper.class); + registerBasicMachine(registry, Recipe.CRUSHER, "tile.MachineBlock.Crusher.name", ProgressBar.CRUSH, CrusherRecipeWrapper.class); - registerAdvancedMachine(registry, Recipe.COMBINER, "tile.MachineBlock.Combiner.name", ProgressBar.STONE, CombinerRecipeHandler.class, CombinerRecipeWrapper.class); - registerAdvancedMachine(registry, Recipe.PURIFICATION_CHAMBER, "tile.MachineBlock.PurificationChamber.name", ProgressBar.RED, PurificationChamberRecipeHandler.class, PurificationChamberRecipeWrapper.class); - registerAdvancedMachine(registry, Recipe.OSMIUM_COMPRESSOR, "tile.MachineBlock.OsmiumCompressor.name", ProgressBar.RED, OsmiumCompressorRecipeHandler.class, OsmiumCompressorRecipeWrapper.class); - registerAdvancedMachine(registry, Recipe.CHEMICAL_INJECTION_CHAMBER, "nei.chemicalInjectionChamber", ProgressBar.YELLOW, ChemicalInjectionChamberRecipeHandler.class, ChemicalInjectionChamberRecipeWrapper.class); + registerAdvancedMachine(registry, Recipe.COMBINER, "tile.MachineBlock.Combiner.name", ProgressBar.STONE, CombinerRecipeWrapper.class); + registerAdvancedMachine(registry, Recipe.PURIFICATION_CHAMBER, "tile.MachineBlock.PurificationChamber.name", ProgressBar.RED, PurificationChamberRecipeWrapper.class); + registerAdvancedMachine(registry, Recipe.OSMIUM_COMPRESSOR, "tile.MachineBlock.OsmiumCompressor.name", ProgressBar.RED, OsmiumCompressorRecipeWrapper.class); + registerAdvancedMachine(registry, Recipe.CHEMICAL_INJECTION_CHAMBER, "nei.chemicalInjectionChamber", ProgressBar.YELLOW, ChemicalInjectionChamberRecipeWrapper.class); - registerChanceMachine(registry, Recipe.PRECISION_SAWMILL, "tile.MachineBlock2.PrecisionSawmill.name", ProgressBar.PURPLE, PrecisionSawmillRecipeHandler.class, PrecisionSawmillRecipeWrapper.class); + registerChanceMachine(registry, Recipe.PRECISION_SAWMILL, "tile.MachineBlock2.PrecisionSawmill.name", ProgressBar.PURPLE, PrecisionSawmillRecipeWrapper.class); MetallurgicInfuserRecipeCategory metallurgicInfuserCategory = new MetallurgicInfuserRecipeCategory(registry.getJeiHelpers().getGuiHelper()); registry.addRecipeCategories(metallurgicInfuserCategory); - registry.addRecipeHandlers(new MetallurgicInfuserRecipeHandler(metallurgicInfuserCategory)); + registry.addRecipeHandlers(new BaseRecipeHandler(metallurgicInfuserCategory, MetallurgicInfuserRecipeWrapper.class)); addRecipes(registry, Recipe.METALLURGIC_INFUSER, metallurgicInfuserCategory, MetallurgicInfuserRecipe.class, MetallurgicInfuserRecipeCategory.class, MetallurgicInfuserRecipeWrapper.class); ChemicalCrystallizerRecipeCategory chemicalCrystallizerCategory = new ChemicalCrystallizerRecipeCategory(registry.getJeiHelpers().getGuiHelper()); registry.addRecipeCategories(chemicalCrystallizerCategory); - registry.addRecipeHandlers(new ChemicalCrystallizerRecipeHandler(chemicalCrystallizerCategory)); + registry.addRecipeHandlers(new BaseRecipeHandler(chemicalCrystallizerCategory, ChemicalCrystallizerRecipeWrapper.class)); addRecipes(registry, Recipe.CHEMICAL_CRYSTALLIZER, chemicalCrystallizerCategory, CrystallizerRecipe.class, ChemicalCrystallizerRecipeCategory.class, ChemicalCrystallizerRecipeWrapper.class); ChemicalDissolutionChamberRecipeCategory chemicalDissolutionChamberCategory = new ChemicalDissolutionChamberRecipeCategory(registry.getJeiHelpers().getGuiHelper()); registry.addRecipeCategories(chemicalDissolutionChamberCategory); - registry.addRecipeHandlers(new ChemicalDissolutionChamberRecipeHandler(chemicalDissolutionChamberCategory)); + registry.addRecipeHandlers(new BaseRecipeHandler(chemicalDissolutionChamberCategory, ChemicalDissolutionChamberRecipeWrapper.class)); addRecipes(registry, Recipe.CHEMICAL_DISSOLUTION_CHAMBER, chemicalDissolutionChamberCategory, DissolutionRecipe.class, ChemicalDissolutionChamberRecipeCategory.class, ChemicalDissolutionChamberRecipeWrapper.class); ChemicalInfuserRecipeCategory chemicalInfuserCategory = new ChemicalInfuserRecipeCategory(registry.getJeiHelpers().getGuiHelper()); registry.addRecipeCategories(chemicalInfuserCategory); - registry.addRecipeHandlers(new ChemicalInfuserRecipeHandler(chemicalInfuserCategory)); + registry.addRecipeHandlers(new BaseRecipeHandler(chemicalInfuserCategory, ChemicalInfuserRecipeWrapper.class)); addRecipes(registry, Recipe.CHEMICAL_INFUSER, chemicalInfuserCategory, ChemicalInfuserRecipe.class, ChemicalInfuserRecipeCategory.class, ChemicalInfuserRecipeWrapper.class); ChemicalOxidizerRecipeCategory chemicalOxidizerCategory = new ChemicalOxidizerRecipeCategory(registry.getJeiHelpers().getGuiHelper()); registry.addRecipeCategories(chemicalOxidizerCategory); - registry.addRecipeHandlers(new ChemicalOxidizerRecipeHandler(chemicalOxidizerCategory)); + registry.addRecipeHandlers(new BaseRecipeHandler(chemicalOxidizerCategory, ChemicalOxidizerRecipeWrapper.class)); addRecipes(registry, Recipe.CHEMICAL_OXIDIZER, chemicalOxidizerCategory, OxidationRecipe.class, ChemicalOxidizerRecipeCategory.class, ChemicalOxidizerRecipeWrapper.class); ChemicalWasherRecipeCategory chemicalWasherCategory = new ChemicalWasherRecipeCategory(registry.getJeiHelpers().getGuiHelper()); registry.addRecipeCategories(chemicalWasherCategory); - registry.addRecipeHandlers(new ChemicalWasherRecipeHandler(chemicalWasherCategory)); + registry.addRecipeHandlers(new BaseRecipeHandler(chemicalWasherCategory, ChemicalWasherRecipeWrapper.class)); 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)); + registry.addRecipeHandlers(new BaseRecipeHandler(solarNeutronCategory, SolarNeutronRecipeWrapper.class)); 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)); + registry.addRecipeHandlers(new BaseRecipeHandler(electrolyticSeparatorCategory, ElectrolyticSeparatorRecipeWrapper.class)); 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)); + registry.addRecipeHandlers(new BaseRecipeHandler(thermalEvaporationCategory, ThermalEvaporationRecipeWrapper.class)); 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)); + registry.addRecipeHandlers(new BaseRecipeHandler(prcCategory, PRCRecipeWrapper.class)); addRecipes(registry, Recipe.PRESSURIZED_REACTION_CHAMBER, prcCategory, PressurizedRecipe.class, PRCRecipeCategory.class, PRCRecipeWrapper.class); } catch(Exception e) { e.printStackTrace(); @@ -242,7 +222,7 @@ public class MekanismJEI extends BlankModPlugin RotaryCondensentratorRecipeCategory rotaryCondensentratorCategory = new RotaryCondensentratorRecipeCategory(registry.getJeiHelpers().getGuiHelper()); registry.addRecipeCategories(rotaryCondensentratorCategory); - registry.addRecipeHandlers(new RotaryCondensentratorRecipeHandler(rotaryCondensentratorCategory)); + registry.addRecipeHandlers(new BaseRecipeHandler(rotaryCondensentratorCategory, RotaryCondensentratorRecipeWrapper.class)); for(Gas gas : GasRegistry.getRegisteredGasses()) { @@ -301,32 +281,32 @@ public class MekanismJEI extends BlankModPlugin registry.addRecipeCategoryCraftingItem(type.getStack(), "mekanism." + type.getName()); } - private void registerBasicMachine(IModRegistry registry, Recipe recipe, String unlocalized, ProgressBar bar, Class handler, Class wrapper) throws Exception + private void registerBasicMachine(IModRegistry registry, Recipe recipe, String unlocalized, ProgressBar bar, Class wrapper) throws Exception { MachineRecipeCategory category = new MachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), recipe.name().toLowerCase(), unlocalized, bar); registry.addRecipeCategories(category); - registry.addRecipeHandlers(handler.getConstructor(MachineRecipeCategory.class).newInstance(category)); + registry.addRecipeHandlers(new BaseRecipeHandler(category, wrapper)); addRecipes(registry, recipe, category, BasicMachineRecipe.class, MachineRecipeCategory.class, wrapper); } - private void registerAdvancedMachine(IModRegistry registry, Recipe recipe, String unlocalized, ProgressBar bar, Class handler, Class wrapper) throws Exception + private void registerAdvancedMachine(IModRegistry registry, Recipe recipe, String unlocalized, ProgressBar bar, Class wrapper) throws Exception { AdvancedMachineRecipeCategory category = new AdvancedMachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), recipe.name().toLowerCase(), unlocalized, bar); registry.addRecipeCategories(category); - registry.addRecipeHandlers(handler.getConstructor(AdvancedMachineRecipeCategory.class).newInstance(category)); + registry.addRecipeHandlers(new BaseRecipeHandler(category, wrapper)); addRecipes(registry, recipe, category, AdvancedMachineRecipe.class, AdvancedMachineRecipeCategory.class, wrapper); } - private void registerChanceMachine(IModRegistry registry, Recipe recipe, String unlocalized, ProgressBar bar, Class handler, Class wrapper) throws Exception + private void registerChanceMachine(IModRegistry registry, Recipe recipe, String unlocalized, ProgressBar bar, Class wrapper) throws Exception { ChanceMachineRecipeCategory category = new ChanceMachineRecipeCategory(registry.getJeiHelpers().getGuiHelper(), recipe.name().toLowerCase(), unlocalized, bar); registry.addRecipeCategories(category); - registry.addRecipeHandlers(handler.getConstructor(ChanceMachineRecipeCategory.class).newInstance(category)); + registry.addRecipeHandlers(new BaseRecipeHandler(category, wrapper)); addRecipes(registry, recipe, category, ChanceMachineRecipe.class, ChanceMachineRecipeCategory.class, wrapper); } diff --git a/src/main/java/mekanism/client/jei/gas/GasStackHelper.java b/src/main/java/mekanism/client/jei/gas/GasStackHelper.java deleted file mode 100644 index 06de01d44..000000000 --- a/src/main/java/mekanism/client/jei/gas/GasStackHelper.java +++ /dev/null @@ -1,29 +0,0 @@ -package mekanism.client.jei.gas; - - -public class GasStackHelper// implements IIngredientHelper -{ - /*@Override - public Collection expandSubtypes(Collection contained) { - return contained; - } - - @Override - public GasStack getMatch(Iterable ingredients, @Nonnull Focus toMatch) { - if (toMatch.getGas() == null) { - return null; - } - for (GasStack GasStack : ingredients) { - if (toMatch.getGas() == GasStack.getGas()) { - return GasStack; - } - } - return null; - } - - @Nonnull - @Override - public Focus createFocus(@Nonnull GasStack ingredient) { - return new Focus(ingredient.getGas()); - }*/ -} diff --git a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeHandler.java deleted file mode 100644 index 9213867f3..000000000 --- a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeHandler.java +++ /dev/null @@ -1,45 +0,0 @@ -package mekanism.client.jei.machine; - -import javax.annotation.Nonnull; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class AdvancedMachineRecipeHandler implements IRecipeHandler -{ - private final AdvancedMachineRecipeCategory category; - - public Class wrapperClass; - - public AdvancedMachineRecipeHandler(AdvancedMachineRecipeCategory c, Class wrapper) - { - category = c; - - wrapperClass = wrapper; - } - - @Override - public Class getRecipeClass() - { - return wrapperClass; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull T recipe) - { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull T recipe) - { - return recipe.category == category; - } - - @Override - public String getRecipeCategoryUid(@Nonnull T recipe) - { - return category.getUid(); - } -} diff --git a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java index 2eea72b09..a26260d83 100644 --- a/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/AdvancedMachineRecipeWrapper.java @@ -1,10 +1,8 @@ package mekanism.client.jei.machine; 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; @@ -12,10 +10,9 @@ import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.machines.AdvancedMachineRecipe; import mekanism.common.recipe.outputs.ItemStackOutput; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.item.ItemStack; -public abstract class AdvancedMachineRecipeWrapper extends BlankRecipeWrapper +public abstract class AdvancedMachineRecipeWrapper extends BaseRecipeWrapper { public AdvancedMachineRecipe recipe; @@ -48,5 +45,11 @@ public abstract class AdvancedMachineRecipeWrapper extends BlankRecipeWrapper return currenttip; } + @Override + public AdvancedMachineRecipeCategory getCategory() + { + return category; + } + public abstract List getFuelStacks(Gas gasType); } diff --git a/src/main/java/mekanism/client/jei/machine/BaseRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/BaseRecipeHandler.java new file mode 100644 index 000000000..5a579fc5f --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/BaseRecipeHandler.java @@ -0,0 +1,46 @@ +package mekanism.client.jei.machine; + +import javax.annotation.Nonnull; + +import mekanism.client.jei.BaseRecipeCategory; +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; + +public class BaseRecipeHandler implements IRecipeHandler +{ + private final CATEGORY category; + + public Class wrapperClass; + + public BaseRecipeHandler(CATEGORY c, Class wrapper) + { + category = c; + + wrapperClass = wrapper; + } + + @Override + public Class getRecipeClass() + { + return wrapperClass; + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull WRAPPER recipe) + { + return recipe; + } + + @Override + public boolean isRecipeValid(@Nonnull WRAPPER recipe) + { + return recipe.getCategory() == category; + } + + @Override + public String getRecipeCategoryUid(@Nonnull WRAPPER recipe) + { + return category.getUid(); + } +} diff --git a/src/main/java/mekanism/client/jei/machine/BaseRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/BaseRecipeWrapper.java new file mode 100644 index 000000000..1bb315840 --- /dev/null +++ b/src/main/java/mekanism/client/jei/machine/BaseRecipeWrapper.java @@ -0,0 +1,9 @@ +package mekanism.client.jei.machine; + +import mekanism.client.jei.BaseRecipeCategory; +import mezz.jei.api.recipe.BlankRecipeWrapper; + +public abstract class BaseRecipeWrapper extends BlankRecipeWrapper +{ + public abstract BaseRecipeCategory getCategory(); +} diff --git a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeHandler.java deleted file mode 100644 index 157e024e6..000000000 --- a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeHandler.java +++ /dev/null @@ -1,45 +0,0 @@ -package mekanism.client.jei.machine; - -import javax.annotation.Nonnull; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class ChanceMachineRecipeHandler implements IRecipeHandler -{ - private final ChanceMachineRecipeCategory category; - - public Class wrapperClass; - - public ChanceMachineRecipeHandler(ChanceMachineRecipeCategory c, Class wrapper) - { - category = c; - - wrapperClass = wrapper; - } - - @Override - public Class getRecipeClass() - { - return wrapperClass; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull T recipe) - { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull T recipe) - { - return recipe.category == category; - } - - @Override - public String getRecipeCategoryUid(@Nonnull T recipe) - { - return category.getUid(); - } -} diff --git a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java index 61db406d5..379ab0035 100644 --- a/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/ChanceMachineRecipeWrapper.java @@ -8,12 +8,11 @@ import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.ChanceMachineRecipe; import mekanism.common.recipe.outputs.ChanceOutput; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; -public class ChanceMachineRecipeWrapper extends BlankRecipeWrapper +public class ChanceMachineRecipeWrapper extends BaseRecipeWrapper { public ChanceMachineRecipe recipe; @@ -44,4 +43,10 @@ public class ChanceMachineRecipeWrapper extends BlankRecipeWrapper fontRendererObj.drawString(Math.round(output.secondaryChance*100) + "%", 104, 41, 0x404040, false); } } + + @Override + public ChanceMachineRecipeCategory getCategory() + { + return category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/MachineRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/MachineRecipeHandler.java deleted file mode 100644 index 66e8de1d5..000000000 --- a/src/main/java/mekanism/client/jei/machine/MachineRecipeHandler.java +++ /dev/null @@ -1,45 +0,0 @@ -package mekanism.client.jei.machine; - -import javax.annotation.Nonnull; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class MachineRecipeHandler implements IRecipeHandler -{ - private final MachineRecipeCategory category; - - public Class wrapperClass; - - public MachineRecipeHandler(MachineRecipeCategory c, Class wrapper) - { - category = c; - - wrapperClass = wrapper; - } - - @Override - public Class getRecipeClass() - { - return wrapperClass; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull T recipe) - { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull T recipe) - { - return recipe.category == category; - } - - @Override - public String getRecipeCategoryUid(@Nonnull T recipe) - { - return category.getUid(); - } -} diff --git a/src/main/java/mekanism/client/jei/machine/MachineRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/MachineRecipeWrapper.java index 44114b809..684c53cb9 100644 --- a/src/main/java/mekanism/client/jei/machine/MachineRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/MachineRecipeWrapper.java @@ -4,10 +4,9 @@ import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.BasicMachineRecipe; import mekanism.common.recipe.outputs.ItemStackOutput; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.item.ItemStack; -public class MachineRecipeWrapper extends BlankRecipeWrapper +public class MachineRecipeWrapper extends BaseRecipeWrapper { public BasicMachineRecipe recipe; @@ -25,4 +24,10 @@ public class MachineRecipeWrapper extends BlankRecipeWrapper ingredients.setInput(ItemStack.class, ((ItemStackInput)recipe.getInput()).ingredient); ingredients.setOutput(ItemStack.class, ((ItemStackOutput)recipe.getOutput()).output); } + + @Override + public MachineRecipeCategory getCategory() + { + return category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeHandler.java deleted file mode 100644 index 6f4d0d573..000000000 --- a/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeHandler.java +++ /dev/null @@ -1,12 +0,0 @@ -package mekanism.client.jei.machine.advanced; - -import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; -import mekanism.client.jei.machine.AdvancedMachineRecipeHandler; - -public class ChemicalInjectionChamberRecipeHandler extends AdvancedMachineRecipeHandler -{ - public ChemicalInjectionChamberRecipeHandler(AdvancedMachineRecipeCategory c) - { - super(c, ChemicalInjectionChamberRecipeWrapper.class); - } -} diff --git a/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeHandler.java deleted file mode 100644 index 109977634..000000000 --- a/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeHandler.java +++ /dev/null @@ -1,12 +0,0 @@ -package mekanism.client.jei.machine.advanced; - -import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; -import mekanism.client.jei.machine.AdvancedMachineRecipeHandler; - -public class CombinerRecipeHandler extends AdvancedMachineRecipeHandler -{ - public CombinerRecipeHandler(AdvancedMachineRecipeCategory c) - { - super(c, CombinerRecipeWrapper.class); - } -} diff --git a/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeHandler.java deleted file mode 100644 index bc3d7bfec..000000000 --- a/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeHandler.java +++ /dev/null @@ -1,12 +0,0 @@ -package mekanism.client.jei.machine.advanced; - -import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; -import mekanism.client.jei.machine.AdvancedMachineRecipeHandler; - -public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler -{ - public OsmiumCompressorRecipeHandler(AdvancedMachineRecipeCategory c) - { - super(c, OsmiumCompressorRecipeWrapper.class); - } -} diff --git a/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeHandler.java deleted file mode 100644 index 482c812e3..000000000 --- a/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeHandler.java +++ /dev/null @@ -1,12 +0,0 @@ -package mekanism.client.jei.machine.advanced; - -import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; -import mekanism.client.jei.machine.AdvancedMachineRecipeHandler; - -public class PurificationChamberRecipeHandler extends AdvancedMachineRecipeHandler -{ - public PurificationChamberRecipeHandler(AdvancedMachineRecipeCategory c) - { - super(c, PurificationChamberRecipeWrapper.class); - } -} diff --git a/src/main/java/mekanism/client/jei/machine/basic/CrusherRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/basic/CrusherRecipeHandler.java deleted file mode 100644 index bce25da89..000000000 --- a/src/main/java/mekanism/client/jei/machine/basic/CrusherRecipeHandler.java +++ /dev/null @@ -1,12 +0,0 @@ -package mekanism.client.jei.machine.basic; - -import mekanism.client.jei.machine.MachineRecipeCategory; -import mekanism.client.jei.machine.MachineRecipeHandler; - -public class CrusherRecipeHandler extends MachineRecipeHandler -{ - public CrusherRecipeHandler(MachineRecipeCategory c) - { - super(c, CrusherRecipeWrapper.class); - } -} diff --git a/src/main/java/mekanism/client/jei/machine/basic/EnrichmentRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/basic/EnrichmentRecipeHandler.java deleted file mode 100644 index 7b62a193d..000000000 --- a/src/main/java/mekanism/client/jei/machine/basic/EnrichmentRecipeHandler.java +++ /dev/null @@ -1,12 +0,0 @@ -package mekanism.client.jei.machine.basic; - -import mekanism.client.jei.machine.MachineRecipeCategory; -import mekanism.client.jei.machine.MachineRecipeHandler; - -public class EnrichmentRecipeHandler extends MachineRecipeHandler -{ - public EnrichmentRecipeHandler(MachineRecipeCategory c) - { - super(c, EnrichmentRecipeWrapper.class); - } -} diff --git a/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeHandler.java deleted file mode 100644 index f97cb37d2..000000000 --- a/src/main/java/mekanism/client/jei/machine/chance/PrecisionSawmillRecipeHandler.java +++ /dev/null @@ -1,12 +0,0 @@ -package mekanism.client.jei.machine.chance; - -import mekanism.client.jei.machine.ChanceMachineRecipeCategory; -import mekanism.client.jei.machine.ChanceMachineRecipeHandler; - -public class PrecisionSawmillRecipeHandler extends ChanceMachineRecipeHandler -{ - public PrecisionSawmillRecipeHandler(ChanceMachineRecipeCategory c) - { - super(c, PrecisionSawmillRecipeWrapper.class); - } -} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeHandler.java deleted file mode 100644 index 3b4c31cb4..000000000 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeHandler.java +++ /dev/null @@ -1,41 +0,0 @@ -package mekanism.client.jei.machine.chemical; - -import javax.annotation.Nonnull; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class ChemicalCrystallizerRecipeHandler implements IRecipeHandler -{ - private final ChemicalCrystallizerRecipeCategory category; - - public ChemicalCrystallizerRecipeHandler(ChemicalCrystallizerRecipeCategory c) - { - category = c; - } - - @Override - public Class getRecipeClass() - { - return ChemicalCrystallizerRecipeWrapper.class; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull ChemicalCrystallizerRecipeWrapper recipe) - { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull ChemicalCrystallizerRecipeWrapper recipe) - { - return recipe.category == category; - } - - @Override - public String getRecipeCategoryUid(@Nonnull ChemicalCrystallizerRecipeWrapper recipe) - { - return category.getUid(); - } -} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java index 982749d12..2d118c3e7 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java @@ -6,13 +6,13 @@ import java.util.List; import javax.annotation.Nullable; import mekanism.api.gas.GasStack; +import mekanism.client.jei.machine.BaseRecipeWrapper; import mekanism.common.recipe.machines.CrystallizerRecipe; import mekanism.common.util.LangUtils; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.item.ItemStack; -public class ChemicalCrystallizerRecipeWrapper extends BlankRecipeWrapper +public class ChemicalCrystallizerRecipeWrapper extends BaseRecipeWrapper { public CrystallizerRecipe recipe; @@ -44,4 +44,10 @@ public class ChemicalCrystallizerRecipeWrapper extends BlankRecipeWrapper return currenttip; } + + @Override + public ChemicalCrystallizerRecipeCategory getCategory() + { + return category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeHandler.java deleted file mode 100644 index 3db319e83..000000000 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeHandler.java +++ /dev/null @@ -1,41 +0,0 @@ -package mekanism.client.jei.machine.chemical; - -import javax.annotation.Nonnull; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class ChemicalDissolutionChamberRecipeHandler implements IRecipeHandler -{ - private final ChemicalDissolutionChamberRecipeCategory category; - - public ChemicalDissolutionChamberRecipeHandler(ChemicalDissolutionChamberRecipeCategory c) - { - category = c; - } - - @Override - public Class getRecipeClass() - { - return ChemicalDissolutionChamberRecipeWrapper.class; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull ChemicalDissolutionChamberRecipeWrapper recipe) - { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull ChemicalDissolutionChamberRecipeWrapper recipe) - { - return recipe.category == category; - } - - @Override - public String getRecipeCategoryUid(@Nonnull ChemicalDissolutionChamberRecipeWrapper recipe) - { - return category.getUid(); - } -} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java index 27933376e..7ad89dba3 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalDissolutionChamberRecipeWrapper.java @@ -6,14 +6,14 @@ import java.util.List; import javax.annotation.Nullable; import mekanism.api.gas.GasStack; +import mekanism.client.jei.machine.BaseRecipeWrapper; import mekanism.common.MekanismFluids; import mekanism.common.recipe.machines.DissolutionRecipe; import mekanism.common.util.LangUtils; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.item.ItemStack; -public class ChemicalDissolutionChamberRecipeWrapper extends BlankRecipeWrapper +public class ChemicalDissolutionChamberRecipeWrapper extends BaseRecipeWrapper { public DissolutionRecipe recipe; @@ -50,4 +50,10 @@ public class ChemicalDissolutionChamberRecipeWrapper extends BlankRecipeWrapper return currenttip; } + + @Override + public ChemicalDissolutionChamberRecipeCategory getCategory() + { + return category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeHandler.java deleted file mode 100644 index 8053a3588..000000000 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeHandler.java +++ /dev/null @@ -1,41 +0,0 @@ -package mekanism.client.jei.machine.chemical; - -import javax.annotation.Nonnull; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class ChemicalInfuserRecipeHandler implements IRecipeHandler -{ - private final ChemicalInfuserRecipeCategory category; - - public ChemicalInfuserRecipeHandler(ChemicalInfuserRecipeCategory c) - { - category = c; - } - - @Override - public Class getRecipeClass() - { - return ChemicalInfuserRecipeWrapper.class; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull ChemicalInfuserRecipeWrapper recipe) - { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull ChemicalInfuserRecipeWrapper recipe) - { - return recipe.category == category; - } - - @Override - public String getRecipeCategoryUid(@Nonnull ChemicalInfuserRecipeWrapper recipe) - { - return category.getUid(); - } -} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java index 1434e07db..46942dd6d 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalInfuserRecipeWrapper.java @@ -4,17 +4,15 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import mekanism.api.gas.GasStack; +import mekanism.client.jei.machine.BaseRecipeWrapper; import mekanism.common.recipe.machines.ChemicalInfuserRecipe; import mekanism.common.util.LangUtils; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; -import net.minecraft.item.ItemStack; -public class ChemicalInfuserRecipeWrapper extends BlankRecipeWrapper +public class ChemicalInfuserRecipeWrapper extends BaseRecipeWrapper { public ChemicalInfuserRecipe recipe; @@ -54,4 +52,10 @@ public class ChemicalInfuserRecipeWrapper extends BlankRecipeWrapper return currenttip; } + + @Override + public ChemicalInfuserRecipeCategory getCategory() + { + return category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeHandler.java deleted file mode 100644 index 12da4634b..000000000 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeHandler.java +++ /dev/null @@ -1,41 +0,0 @@ -package mekanism.client.jei.machine.chemical; - -import javax.annotation.Nonnull; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class ChemicalOxidizerRecipeHandler implements IRecipeHandler -{ - private final ChemicalOxidizerRecipeCategory category; - - public ChemicalOxidizerRecipeHandler(ChemicalOxidizerRecipeCategory c) - { - category = c; - } - - @Override - public Class getRecipeClass() - { - return ChemicalOxidizerRecipeWrapper.class; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull ChemicalOxidizerRecipeWrapper recipe) - { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull ChemicalOxidizerRecipeWrapper recipe) - { - return recipe.category == category; - } - - @Override - public String getRecipeCategoryUid(@Nonnull ChemicalOxidizerRecipeWrapper recipe) - { - return category.getUid(); - } -} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java index 8b566e32c..1017ab8c8 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java @@ -1,22 +1,18 @@ package mekanism.client.jei.machine.chemical; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import mekanism.api.gas.GasStack; +import mekanism.client.jei.machine.BaseRecipeWrapper; import mekanism.common.recipe.machines.OxidationRecipe; import mekanism.common.util.LangUtils; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -public class ChemicalOxidizerRecipeWrapper extends BlankRecipeWrapper +public class ChemicalOxidizerRecipeWrapper extends BaseRecipeWrapper { public OxidationRecipe recipe; @@ -48,4 +44,10 @@ public class ChemicalOxidizerRecipeWrapper extends BlankRecipeWrapper return currenttip; } + + @Override + public ChemicalOxidizerRecipeCategory getCategory() + { + return category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeHandler.java deleted file mode 100644 index a62c7817e..000000000 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeHandler.java +++ /dev/null @@ -1,41 +0,0 @@ -package mekanism.client.jei.machine.chemical; - -import javax.annotation.Nonnull; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class ChemicalWasherRecipeHandler implements IRecipeHandler -{ - private final ChemicalWasherRecipeCategory category; - - public ChemicalWasherRecipeHandler(ChemicalWasherRecipeCategory c) - { - category = c; - } - - @Override - public Class getRecipeClass() - { - return ChemicalWasherRecipeWrapper.class; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull ChemicalWasherRecipeWrapper recipe) - { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull ChemicalWasherRecipeWrapper recipe) - { - return recipe.category == category; - } - - @Override - public String getRecipeCategoryUid(@Nonnull ChemicalWasherRecipeWrapper recipe) - { - return category.getUid(); - } -} diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java index 5e2beaedb..cfd557904 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeWrapper.java @@ -6,14 +6,14 @@ import java.util.List; import javax.annotation.Nullable; import mekanism.api.gas.GasStack; +import mekanism.client.jei.machine.BaseRecipeWrapper; import mekanism.common.recipe.machines.WasherRecipe; import mekanism.common.util.LangUtils; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -public class ChemicalWasherRecipeWrapper extends BlankRecipeWrapper +public class ChemicalWasherRecipeWrapper extends BaseRecipeWrapper { public WasherRecipe recipe; @@ -50,4 +50,10 @@ public class ChemicalWasherRecipeWrapper extends BlankRecipeWrapper return currenttip; } + + @Override + public ChemicalWasherRecipeCategory getCategory() + { + return category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeHandler.java deleted file mode 100644 index 87e54cbbd..000000000 --- a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeHandler.java +++ /dev/null @@ -1,41 +0,0 @@ -package mekanism.client.jei.machine.other; - -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 IRecipeWrapper getRecipeWrapper(@Nonnull ElectrolyticSeparatorRecipeWrapper recipe) - { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull ElectrolyticSeparatorRecipeWrapper recipe) - { - return recipe.category == category; - } - - @Override - public String getRecipeCategoryUid(@Nonnull ElectrolyticSeparatorRecipeWrapper recipe) - { - return category.getUid(); - } -} 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 b8fb75eef..ac707033d 100644 --- a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeWrapper.java @@ -7,12 +7,12 @@ import java.util.List; import javax.annotation.Nullable; import mekanism.api.gas.GasStack; +import mekanism.client.jei.machine.BaseRecipeWrapper; import mekanism.common.recipe.machines.SeparatorRecipe; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraftforge.fluids.FluidStack; -public class ElectrolyticSeparatorRecipeWrapper extends BlankRecipeWrapper +public class ElectrolyticSeparatorRecipeWrapper extends BaseRecipeWrapper { public SeparatorRecipe recipe; @@ -48,4 +48,10 @@ public class ElectrolyticSeparatorRecipeWrapper extends BlankRecipeWrapper return currenttip; } + + @Override + public ElectrolyticSeparatorRecipeCategory getCategory() + { + return category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeHandler.java deleted file mode 100644 index ff3df9d31..000000000 --- a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeHandler.java +++ /dev/null @@ -1,41 +0,0 @@ -package mekanism.client.jei.machine.other; - -import javax.annotation.Nonnull; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; - -public class MetallurgicInfuserRecipeHandler implements IRecipeHandler -{ - private final MetallurgicInfuserRecipeCategory category; - - public MetallurgicInfuserRecipeHandler(MetallurgicInfuserRecipeCategory c) - { - category = c; - } - - @Override - public Class getRecipeClass() - { - return MetallurgicInfuserRecipeWrapper.class; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull MetallurgicInfuserRecipeWrapper recipe) - { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull MetallurgicInfuserRecipeWrapper recipe) - { - return recipe.category == category; - } - - @Override - public String getRecipeCategoryUid(@Nonnull MetallurgicInfuserRecipeWrapper recipe) - { - return category.getUid(); - } -} diff --git a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java index 865b26406..d77aefa94 100644 --- a/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/MetallurgicInfuserRecipeWrapper.java @@ -3,12 +3,12 @@ package mekanism.client.jei.machine.other; import java.util.Arrays; import java.util.List; +import mekanism.client.jei.machine.BaseRecipeWrapper; import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.item.ItemStack; -public class MetallurgicInfuserRecipeWrapper extends BlankRecipeWrapper +public class MetallurgicInfuserRecipeWrapper extends BaseRecipeWrapper { public MetallurgicInfuserRecipe recipe; @@ -30,4 +30,10 @@ public class MetallurgicInfuserRecipeWrapper extends BlankRecipeWrapper ingredients.setInputLists(ItemStack.class, Arrays.asList(inputStacks, infuseStacks)); ingredients.setOutput(ItemStack.class, recipe.recipeOutput.output); } + + @Override + public MetallurgicInfuserRecipeCategory getCategory() + { + return 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 deleted file mode 100644 index f583f11d6..000000000 --- a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeHandler.java +++ /dev/null @@ -1,41 +0,0 @@ -package mekanism.client.jei.machine.other; - -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 IRecipeWrapper getRecipeWrapper(@Nonnull PRCRecipeWrapper recipe) - { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull PRCRecipeWrapper recipe) - { - return recipe.category == category; - } - - @Override - public String getRecipeCategoryUid(@Nonnull PRCRecipeWrapper recipe) - { - return category.getUid(); - } -} diff --git a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java index b9c59ab41..bed55c013 100644 --- a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeWrapper.java @@ -6,14 +6,14 @@ import java.util.List; import javax.annotation.Nullable; import mekanism.api.gas.GasStack; +import mekanism.client.jei.machine.BaseRecipeWrapper; import mekanism.common.recipe.machines.PressurizedRecipe; import mekanism.common.util.LangUtils; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -public class PRCRecipeWrapper extends BlankRecipeWrapper +public class PRCRecipeWrapper extends BaseRecipeWrapper { public PressurizedRecipe recipe; @@ -52,4 +52,10 @@ public class PRCRecipeWrapper extends BlankRecipeWrapper return currenttip; } + + @Override + public PRCRecipeCategory getCategory() + { + return 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 deleted file mode 100644 index 585412270..000000000 --- a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeHandler.java +++ /dev/null @@ -1,41 +0,0 @@ -package mekanism.client.jei.machine.other; - -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 IRecipeWrapper getRecipeWrapper(@Nonnull RotaryCondensentratorRecipeWrapper recipe) - { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull RotaryCondensentratorRecipeWrapper recipe) - { - return recipe.category == category; - } - - @Override - public String getRecipeCategoryUid(@Nonnull RotaryCondensentratorRecipeWrapper recipe) - { - return category.getUid(); - } -} 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 5f61d008e..3d3293735 100644 --- a/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/RotaryCondensentratorRecipeWrapper.java @@ -8,15 +8,15 @@ import javax.annotation.Nullable; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; +import mekanism.client.jei.machine.BaseRecipeWrapper; import mekanism.common.util.LangUtils; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -public class RotaryCondensentratorRecipeWrapper extends BlankRecipeWrapper +public class RotaryCondensentratorRecipeWrapper extends BaseRecipeWrapper { public Fluid fluidType; public Gas gasType; @@ -68,4 +68,10 @@ public class RotaryCondensentratorRecipeWrapper extends BlankRecipeWrapper return currenttip; } + + @Override + public RotaryCondensentratorRecipeCategory getCategory() + { + return category; + } } diff --git a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeHandler.java b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeHandler.java deleted file mode 100644 index 03ed6c079..000000000 --- a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeHandler.java +++ /dev/null @@ -1,41 +0,0 @@ -package mekanism.client.jei.machine.other; - -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 IRecipeWrapper getRecipeWrapper(@Nonnull SolarNeutronRecipeWrapper recipe) - { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull SolarNeutronRecipeWrapper recipe) - { - return recipe.category == category; - } - - @Override - public String getRecipeCategoryUid(@Nonnull SolarNeutronRecipeWrapper recipe) - { - return category.getUid(); - } -} 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 c389ea981..ed16c824e 100644 --- a/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/SolarNeutronRecipeWrapper.java @@ -6,12 +6,12 @@ import java.util.List; import javax.annotation.Nullable; import mekanism.api.gas.GasStack; +import mekanism.client.jei.machine.BaseRecipeWrapper; import mekanism.common.recipe.machines.SolarNeutronRecipe; import mekanism.common.util.LangUtils; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; -public class SolarNeutronRecipeWrapper extends BlankRecipeWrapper +public class SolarNeutronRecipeWrapper extends BaseRecipeWrapper { public SolarNeutronRecipe recipe; @@ -47,4 +47,10 @@ public class SolarNeutronRecipeWrapper extends BlankRecipeWrapper return currenttip; } + + @Override + public SolarNeutronRecipeCategory getCategory() + { + return 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 deleted file mode 100644 index 89a22ef99..000000000 --- a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeHandler.java +++ /dev/null @@ -1,41 +0,0 @@ -package mekanism.client.jei.machine.other; - -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 IRecipeWrapper getRecipeWrapper(@Nonnull ThermalEvaporationRecipeWrapper recipe) - { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull ThermalEvaporationRecipeWrapper recipe) - { - return recipe.category == category; - } - - @Override - public String getRecipeCategoryUid(@Nonnull ThermalEvaporationRecipeWrapper recipe) - { - return category.getUid(); - } -} diff --git a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeWrapper.java index f81e3314d..ff22dc42f 100644 --- a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeWrapper.java @@ -1,16 +1,11 @@ package mekanism.client.jei.machine.other; -import java.util.Arrays; -import java.util.List; - -import javax.annotation.Nonnull; - +import mekanism.client.jei.machine.BaseRecipeWrapper; import mekanism.common.recipe.machines.ThermalEvaporationRecipe; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraftforge.fluids.FluidStack; -public class ThermalEvaporationRecipeWrapper extends BlankRecipeWrapper +public class ThermalEvaporationRecipeWrapper extends BaseRecipeWrapper { public ThermalEvaporationRecipe recipe; @@ -28,4 +23,10 @@ public class ThermalEvaporationRecipeWrapper extends BlankRecipeWrapper ingredients.setInput(FluidStack.class, recipe.getInput().ingredient); ingredients.setOutput(FluidStack.class, recipe.getOutput().output); } + + @Override + public ThermalEvaporationRecipeCategory getCategory() + { + return category; + } }