diff --git a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java index f697bc8c8..f0ad41dd1 100644 --- a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java +++ b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java @@ -38,6 +38,7 @@ import net.minecraft.util.text.translation.I18n; import reborncore.api.recipe.RecipeHandler; import techreborn.Core; import techreborn.api.generator.EFluidGenerator; +import techreborn.api.generator.FluidGeneratorRecipe; import techreborn.api.generator.GeneratorRecipeHelper; import techreborn.api.reactor.FusionReactorRecipe; import techreborn.api.reactor.FusionReactorRecipeHelper; @@ -75,7 +76,7 @@ import techreborn.compat.jei.extractor.ExtractorRecipeWrapper; import techreborn.compat.jei.fusionReactor.FusionReactorRecipeCategory; import techreborn.compat.jei.fusionReactor.FusionReactorRecipeWrapper; import techreborn.compat.jei.generators.fluid.FluidGeneratorRecipeCategory; -import techreborn.compat.jei.generators.fluid.FluidGeneratorRecipeHandler; +import techreborn.compat.jei.generators.fluid.FluidGeneratorRecipeWrapper; import techreborn.compat.jei.grinder.GrinderRecipeCategory; import techreborn.compat.jei.grinder.GrinderRecipeWrapper; import techreborn.compat.jei.implosionCompressor.ImplosionCompressorRecipeCategory; @@ -137,7 +138,6 @@ public class TechRebornJeiPlugin implements IModPlugin { new AssemblingMachineRecipeCategory(guiHelper), new BlastFurnaceRecipeCategory(guiHelper), new CentrifugeRecipeCategory(guiHelper), - new CompressorRecipeCategory(guiHelper), new ChemicalReactorRecipeCategory(guiHelper), new FusionReactorRecipeCategory(guiHelper), new GrinderRecipeCategory(guiHelper), @@ -153,12 +153,14 @@ public class TechRebornJeiPlugin implements IModPlugin { registry.addRecipeCategories(new FluidGeneratorRecipeCategory(type, guiHelper)); if (!IC2Duplicates.deduplicate()) { - registry.addRecipeCategories(new ExtractorRecipeCategory(guiHelper)); + registry.addRecipeCategories( + new CompressorRecipeCategory(guiHelper), + new ExtractorRecipeCategory(guiHelper)); } - } + @SuppressWarnings("deprecation") @Override public void register( @Nonnull @@ -231,7 +233,6 @@ public class TechRebornJeiPlugin implements IModPlugin { registry.handleRecipes(BlastFurnaceRecipe.class, recipe -> new BlastFurnaceRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.BLAST_FURNACE); registry.handleRecipes(CentrifugeRecipe.class, recipe -> new CentrifugeRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.CENTRIFUGE); registry.handleRecipes(ChemicalReactorRecipe.class, recipe -> new ChemicalReactorRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.CHEMICAL_REACTOR); - registry.handleRecipes(CompressorRecipe.class, recipe -> new CompressorRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.COMPRESSOR); registry.handleRecipes(FusionReactorRecipe.class, FusionReactorRecipeWrapper::new, RecipeCategoryUids.FUSION_REACTOR); registry.handleRecipes(GrinderRecipe.class, recipe -> new GrinderRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.GRINDER); registry.handleRecipes(ImplosionCompressorRecipe.class, recipe -> new ImplosionCompressorRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.IMPLOSION_COMPRESSOR); @@ -240,19 +241,23 @@ public class TechRebornJeiPlugin implements IModPlugin { registry.handleRecipes(IndustrialSawmillRecipe.class, recipe -> new IndustrialSawmillRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.INDUSTRIAL_SAWMILL); registry.handleRecipes(VacuumFreezerRecipe.class, recipe -> new VacuumFreezerRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.VACUUM_FREEZER); registry.handleRecipes(ScrapboxRecipe.class, recipe -> new ScrapboxRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.SCRAPBOX); - + registry.addRecipeHandlers(new RollingMachineRecipeHandler()); + if (!IC2Duplicates.deduplicate()) { + registry.handleRecipes(CompressorRecipe.class, recipe -> new CompressorRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.COMPRESSOR); registry.handleRecipes(ExtractorRecipe.class, recipe -> new ExtractorRecipeWrapper(jeiHelpers, recipe), RecipeCategoryUids.EXTRACTOR); } - registry.addRecipeHandlers(new RollingMachineRecipeHandler(), new FluidGeneratorRecipeHandler(jeiHelpers)); + for (final EFluidGenerator type : EFluidGenerator.values()){ + registry.handleRecipes(FluidGeneratorRecipe.class, recipe -> new FluidGeneratorRecipeWrapper(jeiHelpers, recipe), type.getRecipeID()); + } + registry.addRecipes(RecipeHandler.recipeList); - registry.addRecipes(FusionReactorRecipeHelper.reactorRecipes); - - GeneratorRecipeHelper.fluidRecipes.forEach((type, list) -> registry.addRecipes(list.getRecipes())); + registry.addRecipes(FusionReactorRecipeHelper.reactorRecipes, RecipeCategoryUids.FUSION_REACTOR); + GeneratorRecipeHelper.fluidRecipes.forEach((type, list) -> registry.addRecipes(list.getRecipes(), type.getRecipeID())); try { - registry.addRecipes(RollingMachineRecipeMaker.getRecipes(jeiHelpers)); + registry.addRecipes(RollingMachineRecipeMaker.getRecipes(jeiHelpers), RecipeCategoryUids.ROLLING_MACHINE); } catch (final RuntimeException e) { Core.logHelper .error("Could not register rolling machine recipes. JEI may have changed its internal recipe wrapper locations."); @@ -283,9 +288,14 @@ public class TechRebornJeiPlugin implements IModPlugin { registry.addRecipeClickArea(GuiVacuumFreezer.class, 150, 4, 20, 12, RecipeCategoryUids.VACUUM_FREEZER); registry.addRecipeClickArea(GuiBlastFurnace.class, 150, 4, 20, 12, RecipeCategoryUids.BLAST_FURNACE); registry.addRecipeClickArea(GuiChemicalReactor.class, 150, 4, 20, 12, RecipeCategoryUids.CHEMICAL_REACTOR); + registry.addRecipeClickArea(GuiImplosionCompressor.class, 150, 4, 20, 12, RecipeCategoryUids.IMPLOSION_COMPRESSOR); registry.addRecipeClickArea(GuiIndustrialGrinder.class, 150, 4, 20, 12, RecipeCategoryUids.INDUSTRIAL_GRINDER); registry.addRecipeClickArea(GuiIndustrialSawmill.class, 55, 35, 20, 15, RecipeCategoryUids.INDUSTRIAL_SAWMILL); registry.addRecipeClickArea(GuiIndustrialElectrolyzer.class, 150, 4, 20, 12, RecipeCategoryUids.INDUSTRIAL_ELECTROLYZER); + registry.addRecipeClickArea(GuiSemifluidGenerator.class, 150, 4, 18, 18, EFluidGenerator.SEMIFLUID.getRecipeID()); + registry.addRecipeClickArea(GuiDieselGenerator.class, 150, 4, 18, 18, EFluidGenerator.DIESEL.getRecipeID()); + registry.addRecipeClickArea(GuiGasTurbine.class, 150, 4, 18, 18, EFluidGenerator.GAS.getRecipeID()); + registry.addRecipeClickArea(GuiThermalGenerator.class, 150, 4, 18, 18, EFluidGenerator.THERMAL.getRecipeID()); //OLD ONES registry.addRecipeClickArea(GuiAlloyFurnace.class, 80, 35, 26, 20, RecipeCategoryUids.ALLOY_SMELTER, @@ -293,54 +303,35 @@ public class TechRebornJeiPlugin implements IModPlugin { registry.addRecipeClickArea(GuiAlloySmelter.class, 80, 35, 26, 20, RecipeCategoryUids.ALLOY_SMELTER); registry.addRecipeClickArea(GuiAssemblingMachine.class, 85, 34, 24, 20, RecipeCategoryUids.ASSEMBLING_MACHINE); registry.addRecipeClickArea(GuiFusionReactor.class, 111, 34, 27, 19, RecipeCategoryUids.FUSION_REACTOR); - registry.addRecipeClickArea(GuiImplosionCompressor.class, 150, 4, 20, 12, - RecipeCategoryUids.IMPLOSION_COMPRESSOR); + registry.addRecipeClickArea(GuiRollingMachine.class, 89, 32, 26, 25, RecipeCategoryUids.ROLLING_MACHINE); registry.addRecipeClickArea(GuiIronFurnace.class, 78, 36, 24, 16, VanillaRecipeCategoryUid.SMELTING, VanillaRecipeCategoryUid.FUEL); - registry.addRecipeClickArea(GuiSemifluidGenerator.class, 150, 4, 18, 18, EFluidGenerator.SEMIFLUID.getRecipeID()); - registry.addRecipeClickArea(GuiDieselGenerator.class, 150, 4, 18, 18, EFluidGenerator.DIESEL.getRecipeID()); - registry.addRecipeClickArea(GuiGasTurbine.class, 150, 4, 18, 18, EFluidGenerator.GAS.getRecipeID()); - registry.addRecipeClickArea(GuiThermalGenerator.class, 150, 4, 18, 18, EFluidGenerator.THERMAL.getRecipeID()); - - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.IRON_FURNACE), VanillaRecipeCategoryUid.SMELTING, VanillaRecipeCategoryUid.FUEL); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.IRON_ALLOY_FURNACE), RecipeCategoryUids.ALLOY_SMELTER, VanillaRecipeCategoryUid.FUEL); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.SOLID_FUEL_GENEREATOR), VanillaRecipeCategoryUid.FUEL); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.COMPRESSOR), RecipeCategoryUids.COMPRESSOR); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.EXTRACTOR), RecipeCategoryUids.EXTRACTOR); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.GRINDER), RecipeCategoryUids.GRINDER); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.VACUUM_FREEZER), RecipeCategoryUids.VACUUM_FREEZER); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.ELECTRIC_FURNACE), VanillaRecipeCategoryUid.SMELTING); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.ALLOY_SMELTER), RecipeCategoryUids.ALLOY_SMELTER); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.ASSEMBLY_MACHINE), - RecipeCategoryUids.ASSEMBLING_MACHINE); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.INDUSTRIAL_BLAST_FURNACE), RecipeCategoryUids.BLAST_FURNACE); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.INDUSTRIAL_CENTRIFUGE), RecipeCategoryUids.CENTRIFUGE); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.CHEMICAL_REACTOR), - RecipeCategoryUids.CHEMICAL_REACTOR); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.FUSION_CONTROL_COMPUTER), - RecipeCategoryUids.FUSION_REACTOR); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.IMPLOSION_COMPRESSOR), - RecipeCategoryUids.IMPLOSION_COMPRESSOR); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.INDUSTRIAL_ELECTROLYZER), - RecipeCategoryUids.INDUSTRIAL_ELECTROLYZER); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.INDUSTRIAL_GRINDER), - RecipeCategoryUids.INDUSTRIAL_GRINDER); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.ROLLING_MACHINE), - RecipeCategoryUids.ROLLING_MACHINE); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModItems.SCRAP_BOX), RecipeCategoryUids.SCRAPBOX); - - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.SEMI_FLUID_GENERATOR), - EFluidGenerator.SEMIFLUID.getRecipeID()); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.GAS_TURBINE), - EFluidGenerator.GAS.getRecipeID()); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.DIESEL_GENERATOR), - EFluidGenerator.DIESEL.getRecipeID()); - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.THERMAL_GENERATOR), - EFluidGenerator.THERMAL.getRecipeID()); - - registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.INDUSTRIAL_SAWMILL), RecipeCategoryUids.INDUSTRIAL_SAWMILL); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.IRON_FURNACE), VanillaRecipeCategoryUid.SMELTING, VanillaRecipeCategoryUid.FUEL); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.IRON_ALLOY_FURNACE), RecipeCategoryUids.ALLOY_SMELTER, VanillaRecipeCategoryUid.FUEL); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.SOLID_FUEL_GENEREATOR), VanillaRecipeCategoryUid.FUEL); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.SEMI_FLUID_GENERATOR), EFluidGenerator.SEMIFLUID.getRecipeID()); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.GAS_TURBINE), EFluidGenerator.GAS.getRecipeID()); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.DIESEL_GENERATOR), EFluidGenerator.DIESEL.getRecipeID()); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.THERMAL_GENERATOR), EFluidGenerator.THERMAL.getRecipeID()); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.COMPRESSOR), RecipeCategoryUids.COMPRESSOR); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.EXTRACTOR), RecipeCategoryUids.EXTRACTOR); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.GRINDER), RecipeCategoryUids.GRINDER); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.VACUUM_FREEZER), RecipeCategoryUids.VACUUM_FREEZER); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.ELECTRIC_FURNACE), VanillaRecipeCategoryUid.SMELTING); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.ALLOY_SMELTER), RecipeCategoryUids.ALLOY_SMELTER); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.ASSEMBLY_MACHINE), RecipeCategoryUids.ASSEMBLING_MACHINE); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.CHEMICAL_REACTOR), RecipeCategoryUids.CHEMICAL_REACTOR); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.FUSION_CONTROL_COMPUTER), RecipeCategoryUids.FUSION_REACTOR); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.IMPLOSION_COMPRESSOR), RecipeCategoryUids.IMPLOSION_COMPRESSOR); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.INDUSTRIAL_BLAST_FURNACE), RecipeCategoryUids.BLAST_FURNACE); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.INDUSTRIAL_CENTRIFUGE), RecipeCategoryUids.CENTRIFUGE); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.INDUSTRIAL_ELECTROLYZER), RecipeCategoryUids.INDUSTRIAL_ELECTROLYZER); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.INDUSTRIAL_GRINDER), RecipeCategoryUids.INDUSTRIAL_GRINDER); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.INDUSTRIAL_SAWMILL), RecipeCategoryUids.INDUSTRIAL_SAWMILL); + registry.addRecipeCatalyst(new ItemStack(ModBlocks.ROLLING_MACHINE), RecipeCategoryUids.ROLLING_MACHINE); + registry.addRecipeCatalyst(new ItemStack(ModItems.SCRAP_BOX), RecipeCategoryUids.SCRAPBOX); final IRecipeTransferRegistry recipeTransferRegistry = registry.getRecipeTransferRegistry(); diff --git a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java index 808d1a8c3..a8133d24f 100644 --- a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java @@ -27,7 +27,7 @@ package techreborn.compat.jei.alloySmelter; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.*; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeCategory; +import mezz.jei.api.recipe.IRecipeCategory; import net.minecraft.client.Minecraft; import net.minecraft.util.text.translation.I18n; import techreborn.client.gui.GuiAlloySmelter; @@ -37,7 +37,8 @@ import techreborn.lib.ModInfo; import javax.annotation.Nonnull; -public class AlloySmelterRecipeCategory extends BlankRecipeCategory { +@SuppressWarnings("deprecation") +public class AlloySmelterRecipeCategory implements IRecipeCategory { private static final int[] INPUT_SLOTS = { 0, 1 }; private static final int[] OUTPUT_SLOTS = { 2 }; diff --git a/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java b/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java index c03b4eb30..72e20dd8f 100644 --- a/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeCategory.java @@ -27,17 +27,17 @@ package techreborn.compat.jei.assemblingMachine; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.*; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeCategory; +import mezz.jei.api.recipe.IRecipeCategory; import net.minecraft.client.Minecraft; import net.minecraft.util.text.translation.I18n; import techreborn.client.gui.GuiAssemblingMachine; import techreborn.compat.jei.RecipeCategoryUids; import techreborn.compat.jei.RecipeUtil; import techreborn.lib.ModInfo; - import javax.annotation.Nonnull; -public class AssemblingMachineRecipeCategory extends BlankRecipeCategory { +@SuppressWarnings("deprecation") +public class AssemblingMachineRecipeCategory implements IRecipeCategory { private static final int[] INPUT_SLOTS = { 0, 1 }; private static final int[] OUTPUT_SLOTS = { 2 }; diff --git a/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeCategory.java b/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeCategory.java index 961a79f29..c01ca13c9 100644 --- a/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeCategory.java @@ -29,7 +29,7 @@ import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeCategory; +import mezz.jei.api.recipe.IRecipeCategory; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; import techreborn.compat.jei.RecipeCategoryUids; @@ -38,7 +38,8 @@ import techreborn.lib.ModInfo; import javax.annotation.Nonnull; -public class BlastFurnaceRecipeCategory extends BlankRecipeCategory { +@SuppressWarnings("deprecation") +public class BlastFurnaceRecipeCategory implements IRecipeCategory { public static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/jei.png"); private static final int[] INPUT_SLOTS = { 0, 1 }; private static final int[] OUTPUT_SLOTS = { 2, 3 }; diff --git a/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeCategory.java b/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeCategory.java index 1d83b245a..1e90177af 100644 --- a/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeCategory.java @@ -29,7 +29,7 @@ import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeCategory; +import mezz.jei.api.recipe.IRecipeCategory; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; import techreborn.compat.jei.RecipeCategoryUids; @@ -38,7 +38,8 @@ import techreborn.lib.ModInfo; import javax.annotation.Nonnull; -public class CentrifugeRecipeCategory extends BlankRecipeCategory { +@SuppressWarnings("deprecation") +public class CentrifugeRecipeCategory implements IRecipeCategory { public static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/jei.png"); private static final int[] INPUT_SLOTS = { 0, 1 }; private static final int[] OUTPUT_SLOTS = { 2, 3, 4, 5 }; diff --git a/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java b/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java index dd2f17d3c..e87387fad 100644 --- a/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeCategory.java @@ -29,7 +29,7 @@ import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeCategory; +import mezz.jei.api.recipe.IRecipeCategory; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; import techreborn.compat.jei.RecipeCategoryUids; @@ -38,7 +38,8 @@ import techreborn.lib.ModInfo; import javax.annotation.Nonnull; -public class ChemicalReactorRecipeCategory extends BlankRecipeCategory { +@SuppressWarnings("deprecation") +public class ChemicalReactorRecipeCategory implements IRecipeCategory { public static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/jei.png"); private static final int[] INPUT_SLOTS = { 0, 1 }; private static final int[] OUTPUT_SLOTS = { 2 }; diff --git a/src/main/java/techreborn/compat/jei/compressor/CompressorRecipeCategory.java b/src/main/java/techreborn/compat/jei/compressor/CompressorRecipeCategory.java index e1f84f214..400bea9d6 100644 --- a/src/main/java/techreborn/compat/jei/compressor/CompressorRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/compressor/CompressorRecipeCategory.java @@ -29,7 +29,7 @@ import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeCategory; +import mezz.jei.api.recipe.IRecipeCategory; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; import techreborn.compat.jei.RecipeCategoryUids; @@ -38,7 +38,8 @@ import techreborn.lib.ModInfo; import javax.annotation.Nonnull; -public class CompressorRecipeCategory extends BlankRecipeCategory { +@SuppressWarnings("deprecation") +public class CompressorRecipeCategory implements IRecipeCategory { private static final int[] INPUT_SLOTS = { 0 }; private static final int[] OUTPUT_SLOTS = { 1 }; diff --git a/src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeCategory.java b/src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeCategory.java index e29d19914..1bf900a1e 100644 --- a/src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeCategory.java @@ -29,7 +29,7 @@ import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeCategory; +import mezz.jei.api.recipe.IRecipeCategory; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; import techreborn.compat.jei.RecipeCategoryUids; @@ -38,7 +38,8 @@ import techreborn.lib.ModInfo; import javax.annotation.Nonnull; -public class ExtractorRecipeCategory extends BlankRecipeCategory { +@SuppressWarnings("deprecation") +public class ExtractorRecipeCategory implements IRecipeCategory { public static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/jei.png"); private static final int[] INPUT_SLOTS = { 0 }; private static final int[] OUTPUT_SLOTS = { 1 }; diff --git a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java index 9fe9fef94..708348a7c 100644 --- a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeCategory.java @@ -29,7 +29,7 @@ import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeCategory; +import mezz.jei.api.recipe.IRecipeCategory; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; import techreborn.client.gui.GuiFusionReactor; @@ -38,7 +38,8 @@ import techreborn.lib.ModInfo; import javax.annotation.Nonnull; -public class FusionReactorRecipeCategory extends BlankRecipeCategory { +@SuppressWarnings("deprecation") +public class FusionReactorRecipeCategory implements IRecipeCategory { private static final int inputSlotTop = 0; private static final int inputSlotBottom = 1; diff --git a/src/main/java/techreborn/compat/jei/generators/fluid/FluidGeneratorRecipeCategory.java b/src/main/java/techreborn/compat/jei/generators/fluid/FluidGeneratorRecipeCategory.java index baa7f8236..b6a493bbc 100644 --- a/src/main/java/techreborn/compat/jei/generators/fluid/FluidGeneratorRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/generators/fluid/FluidGeneratorRecipeCategory.java @@ -29,7 +29,7 @@ import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiFluidStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeCategory; +import mezz.jei.api.recipe.IRecipeCategory; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; @@ -37,26 +37,23 @@ import techreborn.api.generator.EFluidGenerator; import techreborn.compat.jei.RecipeUtil; import techreborn.lib.ModInfo; -public class FluidGeneratorRecipeCategory extends BlankRecipeCategory { +@SuppressWarnings("deprecation") +public class FluidGeneratorRecipeCategory implements IRecipeCategory { public static ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/jei_fluid_generator.png"); private static final int[] INPUT_TANKS = { 0 }; - private static final int[] INPUT_SLOTS = { 0 }; private static final int[] OUTPUT_SLOTS = { 1 }; private final IDrawable background; private final String title; - private final IDrawable tankOverlay; - private final EFluidGenerator generatorType; public FluidGeneratorRecipeCategory(EFluidGenerator generatorType, IGuiHelper guiHelper) { background = guiHelper.createDrawable(texture, 42, 16, 102, 60); tankOverlay = guiHelper.createDrawable(texture, 176, 72, 12, 47); title = I18n.translateToLocal("techreborn.jei.category.generator." + generatorType.name().toLowerCase()); - this.generatorType = generatorType; } diff --git a/src/main/java/techreborn/compat/jei/generators/fluid/FluidGeneratorRecipeWrapper.java b/src/main/java/techreborn/compat/jei/generators/fluid/FluidGeneratorRecipeWrapper.java index bc19b4180..fe8b43ac1 100644 --- a/src/main/java/techreborn/compat/jei/generators/fluid/FluidGeneratorRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/generators/fluid/FluidGeneratorRecipeWrapper.java @@ -28,7 +28,7 @@ import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; +import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -36,7 +36,7 @@ import reborncore.common.powerSystem.PowerSystem; import techreborn.api.generator.FluidGeneratorRecipe; import javax.annotation.Nonnull; -public class FluidGeneratorRecipeWrapper extends BlankRecipeWrapper { +public class FluidGeneratorRecipeWrapper implements IRecipeWrapper { private static final int FLUID_GENERATOR_STORAGE = 100_000; @@ -58,10 +58,7 @@ public class FluidGeneratorRecipeWrapper extends BlankRecipeWrapper { @Override public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { - super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY); - energyProduced.draw(minecraft, 73, 26); - minecraft.fontRenderer .drawString(PowerSystem.getLocaliszedPowerFormattedNoSuffix(baseRecipe.getEnergyPerMb() * 1000) + " " + PowerSystem.getDisplayPower().abbreviation, 70, 13, 0x444444); diff --git a/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java index d4f846d48..cadf6917c 100644 --- a/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/grinder/GrinderRecipeCategory.java @@ -29,7 +29,7 @@ import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeCategory; +import mezz.jei.api.recipe.IRecipeCategory; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; import techreborn.compat.jei.RecipeCategoryUids; @@ -38,7 +38,8 @@ import techreborn.lib.ModInfo; import javax.annotation.Nonnull; -public class GrinderRecipeCategory extends BlankRecipeCategory { +@SuppressWarnings("deprecation") +public class GrinderRecipeCategory implements IRecipeCategory { public static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/jei.png"); private static final int[] INPUT_SLOTS = { 0 }; private static final int[] OUTPUT_SLOTS = { 1 }; @@ -84,9 +85,7 @@ public class GrinderRecipeCategory extends BlankRecipeCategory { +@SuppressWarnings("deprecation") +public class ImplosionCompressorRecipeCategory implements IRecipeCategory { public static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/jei.png"); private static final int[] INPUT_SLOTS = {0, 1}; private static final int[] OUTPUT_SLOTS = {2, 3}; diff --git a/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeCategory.java b/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeCategory.java index 490812aeb..76dd1c0f2 100644 --- a/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/industrialGrinder/IndustrialGrinderRecipeCategory.java @@ -30,7 +30,7 @@ import mezz.jei.api.gui.IGuiFluidStackGroup; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeCategory; +import mezz.jei.api.recipe.IRecipeCategory; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; @@ -41,7 +41,8 @@ import techreborn.tiles.multiblock.TileIndustrialGrinder; import javax.annotation.Nonnull; -public class IndustrialGrinderRecipeCategory extends BlankRecipeCategory { +@SuppressWarnings("deprecation") +public class IndustrialGrinderRecipeCategory implements IRecipeCategory { public static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/industrial_grinder.png"); diff --git a/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeCategory.java b/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeCategory.java index 30f3d950d..52fc36fe1 100644 --- a/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeCategory.java @@ -30,7 +30,7 @@ import mezz.jei.api.gui.IGuiFluidStackGroup; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeCategory; +import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.util.Translator; import net.minecraft.util.ResourceLocation; import techreborn.compat.jei.RecipeCategoryUids; @@ -40,7 +40,8 @@ import techreborn.tiles.multiblock.TileIndustrialSawmill; import javax.annotation.Nonnull; -public class IndustrialSawmillRecipeCategory extends BlankRecipeCategory { +@SuppressWarnings("deprecation") +public class IndustrialSawmillRecipeCategory implements IRecipeCategory { private final String title; public static final ResourceLocation texture = new ResourceLocation("techreborn", diff --git a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java index b1bb40493..5362369f5 100644 --- a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeCategory.java @@ -27,7 +27,7 @@ package techreborn.compat.jei.rollingMachine; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.*; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeCategory; +import mezz.jei.api.recipe.IRecipeCategory; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; @@ -37,7 +37,8 @@ import techreborn.lib.ModInfo; import javax.annotation.Nonnull; -public class RollingMachineRecipeCategory extends BlankRecipeCategory { +@SuppressWarnings("deprecation") +public class RollingMachineRecipeCategory implements IRecipeCategory { private static final int[] INPUT_SLOTS = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; private static final int[] OUTPUT_SLOTS = { 10 }; diff --git a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeWrapper.java b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeWrapper.java index 39c79fee5..ada55f19c 100644 --- a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeWrapper.java @@ -24,11 +24,9 @@ package techreborn.compat.jei.rollingMachine; -import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; -import mezz.jei.api.recipe.wrapper.ICraftingRecipeWrapper; +import mezz.jei.api.recipe.IRecipeWrapper; import mezz.jei.plugins.vanilla.crafting.ShapedOreRecipeWrapper; import mezz.jei.plugins.vanilla.crafting.ShapedRecipesWrapper; import mezz.jei.plugins.vanilla.crafting.ShapelessRecipeWrapper; @@ -41,10 +39,10 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import javax.annotation.Nonnull; import javax.annotation.Nullable; -public class RollingMachineRecipeWrapper extends BlankRecipeWrapper implements ICraftingRecipeWrapper { - private final ICraftingRecipeWrapper baseRecipe; +public class RollingMachineRecipeWrapper implements IRecipeWrapper { + private final IRecipeWrapper baseRecipe; - public RollingMachineRecipeWrapper(ICraftingRecipeWrapper baseRecipe) { + public RollingMachineRecipeWrapper(IRecipeWrapper baseRecipe) { this.baseRecipe = baseRecipe; } @@ -52,8 +50,7 @@ public class RollingMachineRecipeWrapper extends BlankRecipeWrapper implements I public static RollingMachineRecipeWrapper create( @Nonnull IJeiHelpers jeiHelpers, IRecipe baseRecipe) { - IGuiHelper guiHelper = jeiHelpers.getGuiHelper(); - ICraftingRecipeWrapper recipeWrapper; + IRecipeWrapper recipeWrapper; if (baseRecipe instanceof ShapelessRecipes) { recipeWrapper = new ShapelessRecipeWrapper(jeiHelpers, baseRecipe); } else if (baseRecipe instanceof ShapedRecipes) { diff --git a/src/main/java/techreborn/compat/jei/scrapbox/ScrapboxRecipeCategory.java b/src/main/java/techreborn/compat/jei/scrapbox/ScrapboxRecipeCategory.java index 5af804515..3b84cb82d 100644 --- a/src/main/java/techreborn/compat/jei/scrapbox/ScrapboxRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/scrapbox/ScrapboxRecipeCategory.java @@ -29,7 +29,7 @@ import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeCategory; +import mezz.jei.api.recipe.IRecipeCategory; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; import techreborn.compat.jei.RecipeCategoryUids; @@ -38,7 +38,8 @@ import techreborn.lib.ModInfo; import javax.annotation.Nonnull; -public class ScrapboxRecipeCategory extends BlankRecipeCategory { +@SuppressWarnings("deprecation") +public class ScrapboxRecipeCategory implements IRecipeCategory { public static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/jei.png"); private static final int[] INPUT_SLOTS = { 0 }; private static final int[] OUTPUT_SLOTS = { 1 }; diff --git a/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java b/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java index 456d31177..a6b8de9b7 100644 --- a/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeCategory.java @@ -29,7 +29,7 @@ import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeCategory; +import mezz.jei.api.recipe.IRecipeCategory; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; import techreborn.compat.jei.RecipeCategoryUids; @@ -38,7 +38,8 @@ import techreborn.lib.ModInfo; import javax.annotation.Nonnull; -public class VacuumFreezerRecipeCategory extends BlankRecipeCategory { +@SuppressWarnings("deprecation") +public class VacuumFreezerRecipeCategory implements IRecipeCategory { public static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/jei.png"); private static final int[] INPUT_SLOTS = { 0 }; private static final int[] OUTPUT_SLOTS = { 1 };