From ee66211ee5f7dbde199ebbafa253806b333de94a Mon Sep 17 00:00:00 2001 From: cech12 Date: Sun, 27 Oct 2024 11:41:37 +0100 Subject: [PATCH] fixed JEI loading errors since 15.20.0.100 --- CHANGELOG.md | 4 ++++ gradle.properties | 6 +++--- .../brickfurnace/jei/BrickBlastingCategory.java | 15 ++++----------- .../brickfurnace/jei/BrickSmeltingCategory.java | 15 ++++----------- .../brickfurnace/jei/BrickSmokingCategory.java | 15 ++++----------- 5 files changed, 19 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9e3b15..6a9291a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Forge Recommended Versioning](https://mcforge.readthedocs.io/en/latest/conventions/versioning/). +## [1.20.1-2.1.2.0] - 2024-10-27 +### Fixed +- fixed JEI loading errors since 15.20.0.100 + ## [1.20.1-2.1.1.3] - 2024-03-31 ### Fixed - fuel consumption of Brick Smoker & Brick Blast Furnace were incorrect (thanks to t3chdelicious for the report) diff --git a/gradle.properties b/gradle.properties index f7bcc1d..7666db8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ loader_version_range=[47,) ## Mod Properties mod_id=brickfurnace -mod_version=2.1.1.3 +mod_version=2.1.2.0 mod_group_id=cech12.brickfurnace mod_name=Brick Furnace mod_authors=Cech12 @@ -22,8 +22,8 @@ mod_issue_tracker=https://github.com/cech12/BrickFurnace/issues mod_description=A mod which adds Brick Furnaces. # jei -jei_version=15.2.0.23 -jei_version_range=[15.2.0.23,) +jei_version=15.20.0.100 +jei_version_range=[15.20.0.100,) #the one probe top_version=1.20.0-9.0.0-1 diff --git a/src/main/java/cech12/brickfurnace/jei/BrickBlastingCategory.java b/src/main/java/cech12/brickfurnace/jei/BrickBlastingCategory.java index 708cc6b..8f27200 100644 --- a/src/main/java/cech12/brickfurnace/jei/BrickBlastingCategory.java +++ b/src/main/java/cech12/brickfurnace/jei/BrickBlastingCategory.java @@ -1,25 +1,18 @@ package cech12.brickfurnace.jei; -import cech12.brickfurnace.init.ModBlocks; -import cech12.brickfurnace.init.ModRecipeTypes; import cech12.brickfurnace.config.ServerConfig; import cech12.brickfurnace.crafting.BrickBlastingRecipe; +import cech12.brickfurnace.init.ModBlocks; +import cech12.brickfurnace.init.ModRecipeTypes; import mezz.jei.api.helpers.IGuiHelper; import mezz.jei.api.recipe.RecipeType; import mezz.jei.library.plugins.vanilla.cooking.AbstractCookingCategory; -import javax.annotation.Nonnull; - public class BrickBlastingCategory extends AbstractCookingCategory { public BrickBlastingCategory(IGuiHelper guiHelper) { - super(guiHelper, ModBlocks.BRICK_BLAST_FURNACE.get(), "gui.jei.category.blasting", (int) (100 * ServerConfig.COOK_TIME_FACTOR.get())); - } - - @Override - @Nonnull - public RecipeType getRecipeType() { - return new RecipeType<>(ModRecipeTypes.BLASTING.getId(), BrickBlastingRecipe.class); + super(guiHelper, new RecipeType<>(ModRecipeTypes.BLASTING.getId(), BrickBlastingRecipe.class), + ModBlocks.BRICK_BLAST_FURNACE.get(), "gui.jei.category.blasting", (int) (100 * ServerConfig.COOK_TIME_FACTOR.get())); } } diff --git a/src/main/java/cech12/brickfurnace/jei/BrickSmeltingCategory.java b/src/main/java/cech12/brickfurnace/jei/BrickSmeltingCategory.java index 0e83c31..c8d37da 100644 --- a/src/main/java/cech12/brickfurnace/jei/BrickSmeltingCategory.java +++ b/src/main/java/cech12/brickfurnace/jei/BrickSmeltingCategory.java @@ -1,25 +1,18 @@ package cech12.brickfurnace.jei; -import cech12.brickfurnace.init.ModBlocks; -import cech12.brickfurnace.init.ModRecipeTypes; import cech12.brickfurnace.config.ServerConfig; import cech12.brickfurnace.crafting.BrickSmeltingRecipe; +import cech12.brickfurnace.init.ModBlocks; +import cech12.brickfurnace.init.ModRecipeTypes; import mezz.jei.api.helpers.IGuiHelper; import mezz.jei.api.recipe.RecipeType; import mezz.jei.library.plugins.vanilla.cooking.AbstractCookingCategory; -import javax.annotation.Nonnull; - public class BrickSmeltingCategory extends AbstractCookingCategory { public BrickSmeltingCategory(IGuiHelper guiHelper) { - super(guiHelper, ModBlocks.BRICK_FURNACE.get(), "gui.jei.category.smelting", (int) (200 * ServerConfig.COOK_TIME_FACTOR.get())); - } - - @Override - @Nonnull - public RecipeType getRecipeType() { - return new RecipeType<>(ModRecipeTypes.SMELTING.getId(), BrickSmeltingRecipe.class); + super(guiHelper, new RecipeType<>(ModRecipeTypes.SMELTING.getId(), BrickSmeltingRecipe.class), + ModBlocks.BRICK_FURNACE.get(), "gui.jei.category.smelting", (int) (200 * ServerConfig.COOK_TIME_FACTOR.get())); } } diff --git a/src/main/java/cech12/brickfurnace/jei/BrickSmokingCategory.java b/src/main/java/cech12/brickfurnace/jei/BrickSmokingCategory.java index a0b89da..e14154e 100644 --- a/src/main/java/cech12/brickfurnace/jei/BrickSmokingCategory.java +++ b/src/main/java/cech12/brickfurnace/jei/BrickSmokingCategory.java @@ -1,25 +1,18 @@ package cech12.brickfurnace.jei; -import cech12.brickfurnace.init.ModBlocks; -import cech12.brickfurnace.init.ModRecipeTypes; import cech12.brickfurnace.config.ServerConfig; import cech12.brickfurnace.crafting.BrickSmokingRecipe; +import cech12.brickfurnace.init.ModBlocks; +import cech12.brickfurnace.init.ModRecipeTypes; import mezz.jei.api.helpers.IGuiHelper; import mezz.jei.api.recipe.RecipeType; import mezz.jei.library.plugins.vanilla.cooking.AbstractCookingCategory; -import javax.annotation.Nonnull; - public class BrickSmokingCategory extends AbstractCookingCategory { public BrickSmokingCategory(IGuiHelper guiHelper) { - super(guiHelper, ModBlocks.BRICK_SMOKER.get(), "gui.jei.category.smoking", (int) (100 * ServerConfig.COOK_TIME_FACTOR.get())); - } - - @Override - @Nonnull - public RecipeType getRecipeType() { - return new RecipeType<>(ModRecipeTypes.SMOKING.getId(), BrickSmokingRecipe.class); + super(guiHelper, new RecipeType<>(ModRecipeTypes.SMOKING.getId(), BrickSmokingRecipe.class), + ModBlocks.BRICK_SMOKER.get(), "gui.jei.category.smoking", (int) (100 * ServerConfig.COOK_TIME_FACTOR.get())); } }