diff --git a/.github/workflows/cicd-workflow.yml b/.github/workflows/cicd-workflow.yml index ba9c099..6b97ea2 100644 --- a/.github/workflows/cicd-workflow.yml +++ b/.github/workflows/cicd-workflow.yml @@ -54,7 +54,7 @@ jobs: java-version: 17 curseforge-id: 363593 game-versions: | - 1.19.2 + 1.19.3 release-type: release secrets: curseforge-token: ${{ secrets.CURSEFORGE_API_KEY }} @@ -67,7 +67,7 @@ jobs: java-version: 17 modrinth-id: yzHyAUSI game-versions: | - 1.19.2 + 1.19.3 release-type: release secrets: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 977f355..04d4c99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ 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.19.3-1.9.0.0] - 2022-12-30 +### Changed +- Update mod to Forge 1.19.3-44.0.41 +- Changed the recipes to use the forge tags for brick & iron ingots +- Update compat with The One Probe to 1.19.3-7.0.0 +- Temporary deactivation of JEI & Immersive Engineering support until they are ported to 1.19.3 + ## [1.19.2-1.8.3.0] - 2022-11-04 ### Added - Support for External Heater of Immersive Engineering #16 diff --git a/build.gradle b/build.gradle index 5de607e..b6192dd 100644 --- a/build.gradle +++ b/build.gradle @@ -133,15 +133,15 @@ dependencies { // compile against the JEI API but do not include it at runtime //compileOnly fg.deobf("mezz.jei:jei-${project.minecraft_version}-common-api:${project.jei_version}") - compileOnly fg.deobf("mezz.jei:jei-${project.minecraft_version}-forge:${project.jei_version}") + //compileOnly fg.deobf("mezz.jei:jei-${project.minecraft_version}-forge:${project.jei_version}") // at runtime, use the full JEI jar - runtimeOnly fg.deobf("mezz.jei:jei-${project.minecraft_version}-forge:${project.jei_version}") + //runtimeOnly fg.deobf("mezz.jei:jei-${project.minecraft_version}-forge:${project.jei_version}") implementation fg.deobf("mcjty.theoneprobe:theoneprobe:$top_version") {transitive = false} //Immersive Engineering - runtimeOnly fg.deobf("blusunrize.immersiveengineering:ImmersiveEngineering:${project.immersive_engineering_version}") - compileOnly fg.deobf("blusunrize.immersiveengineering:ImmersiveEngineering:${project.immersive_engineering_version}:api") + //runtimeOnly fg.deobf("blusunrize.immersiveengineering:ImmersiveEngineering:${project.immersive_engineering_version}") + //compileOnly fg.deobf("blusunrize.immersiveengineering:ImmersiveEngineering:${project.immersive_engineering_version}:api") } // Example for how to get properties into the manifest for reading by the runtime.. diff --git a/gradle.properties b/gradle.properties index bfeb959..4362f45 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false mod_id=brickfurnace -mod_version=1.8.3.0 -minecraft_version=1.19.2 -forge_version=43.1.2 +mod_version=1.9.0.0 +minecraft_version=1.19.3 +forge_version=44.0.41 # jei -jei_version=11.2.0.246 +# jei_version=11.2.0.246 #the one probe -top_version=1.19-6.2.0-6 +top_version=1.19.3-7.0.0-2 # immersive engineering -immersive_engineering_version=1.19.2-9.0.0-153 +# immersive_engineering_version=1.19.2-9.0.0-153 diff --git a/src/main/java/cech12/brickfurnace/BrickFurnaceMod.java b/src/main/java/cech12/brickfurnace/BrickFurnaceMod.java index 99b6c9f..e9ddc6f 100644 --- a/src/main/java/cech12/brickfurnace/BrickFurnaceMod.java +++ b/src/main/java/cech12/brickfurnace/BrickFurnaceMod.java @@ -7,7 +7,10 @@ import cech12.brickfurnace.init.ModPoiTypes; import cech12.brickfurnace.init.ModRecipeTypes; import cech12.brickfurnace.config.ServerConfig; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraftforge.event.CreativeModeTabEvent; import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.common.Mod; @@ -19,6 +22,7 @@ import static cech12.brickfurnace.BrickFurnaceMod.MOD_ID; @Mod(MOD_ID) +@Mod.EventBusSubscriber(modid= MOD_ID, bus= Mod.EventBusSubscriber.Bus.MOD) public class BrickFurnaceMod { public static final String MOD_ID = "brickfurnace"; @@ -40,4 +44,13 @@ public BrickFurnaceMod() { } } + @SubscribeEvent + public static void addItemsToTabs(CreativeModeTabEvent.BuildContents event) { + if (event.getTab() == CreativeModeTabs.FUNCTIONAL_BLOCKS) { + event.accept(ModItems.BRICK_FURNACE); + event.accept(ModItems.BRICK_BLAST_FURNACE); + event.accept(ModItems.BRICK_SMOKER); + } + } + } diff --git a/src/main/java/cech12/brickfurnace/compat/EventHandler.java b/src/main/java/cech12/brickfurnace/compat/EventHandler.java index 80136ba..6f4e908 100644 --- a/src/main/java/cech12/brickfurnace/compat/EventHandler.java +++ b/src/main/java/cech12/brickfurnace/compat/EventHandler.java @@ -1,6 +1,6 @@ package cech12.brickfurnace.compat; -import cech12.brickfurnace.compat.immersiveengineering.ImmersiveEngineering; +//import cech12.brickfurnace.compat.immersiveengineering.ImmersiveEngineering; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -15,7 +15,7 @@ public class EventHandler { @SubscribeEvent public static void onCapabilitiesAttachBlockEntity(AttachCapabilitiesEvent event) { if (ModList.get().isLoaded("immersiveengineering")) { - ImmersiveEngineering.onCapabilitiesAttachBlockEntity(event); + //TODO ImmersiveEngineering.onCapabilitiesAttachBlockEntity(event); } } diff --git a/src/main/java/cech12/brickfurnace/compat/immersiveengineering/BrickFurnaceHeater.java b/src/main/java/cech12/brickfurnace/compat/immersiveengineering/BrickFurnaceHeater.java index facc865..03673d9 100644 --- a/src/main/java/cech12/brickfurnace/compat/immersiveengineering/BrickFurnaceHeater.java +++ b/src/main/java/cech12/brickfurnace/compat/immersiveengineering/BrickFurnaceHeater.java @@ -1,5 +1,6 @@ package cech12.brickfurnace.compat.immersiveengineering; +/* import blusunrize.immersiveengineering.api.tool.ExternalHeaterHandler; import cech12.brickfurnace.blockentity.AbstractBrickFurnaceBlockEntity; import cech12.brickfurnace.blockentity.BrickFurnaceBlockEntity; @@ -81,3 +82,4 @@ public void setFurnaceActive() { } } } + */ diff --git a/src/main/java/cech12/brickfurnace/compat/immersiveengineering/ImmersiveEngineering.java b/src/main/java/cech12/brickfurnace/compat/immersiveengineering/ImmersiveEngineering.java index 682c746..ddfbba6 100644 --- a/src/main/java/cech12/brickfurnace/compat/immersiveengineering/ImmersiveEngineering.java +++ b/src/main/java/cech12/brickfurnace/compat/immersiveengineering/ImmersiveEngineering.java @@ -1,5 +1,6 @@ package cech12.brickfurnace.compat.immersiveengineering; +/* import blusunrize.immersiveengineering.api.tool.ExternalHeaterHandler; import blusunrize.immersiveengineering.api.utils.CapabilityUtils; import cech12.brickfurnace.BrickFurnaceMod; @@ -42,3 +43,4 @@ public LazyOptional getCapability(@Nonnull Capability cap, @Nullabl } } + */ diff --git a/src/main/java/cech12/brickfurnace/crafting/BrickBlastingRecipe.java b/src/main/java/cech12/brickfurnace/crafting/BrickBlastingRecipe.java index ed180a4..11632ca 100644 --- a/src/main/java/cech12/brickfurnace/crafting/BrickBlastingRecipe.java +++ b/src/main/java/cech12/brickfurnace/crafting/BrickBlastingRecipe.java @@ -6,6 +6,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.AbstractCookingRecipe; import net.minecraft.world.item.crafting.BlastingRecipe; +import net.minecraft.world.item.crafting.CookingBookCategory; import net.minecraft.world.item.crafting.SimpleCookingSerializer; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.Ingredient; @@ -17,12 +18,12 @@ public class BrickBlastingRecipe extends AbstractCookingRecipe { public static final SimpleCookingSerializer SERIALIZER = new SimpleCookingSerializer<>(BrickBlastingRecipe::new, 100); - public BrickBlastingRecipe(ResourceLocation p_i50031_1_, String p_i50031_2_, Ingredient p_i50031_3_, ItemStack p_i50031_4_, float p_i50031_5_, int p_i50031_6_) { - super(ModRecipeTypes.BLASTING.get(), p_i50031_1_, p_i50031_2_, p_i50031_3_, p_i50031_4_, p_i50031_5_, p_i50031_6_); + public BrickBlastingRecipe(ResourceLocation p_i50031_1_, String p_i50031_2_, CookingBookCategory category, Ingredient p_i50031_3_, ItemStack p_i50031_4_, float p_i50031_5_, int p_i50031_6_) { + super(ModRecipeTypes.BLASTING.get(), p_i50031_1_, p_i50031_2_, category, p_i50031_3_, p_i50031_4_, p_i50031_5_, p_i50031_6_); } public static BrickBlastingRecipe convert(@Nonnull BlastingRecipe recipe) { - return new BrickBlastingRecipe(recipe.getId(), recipe.getGroup(), recipe.getIngredients().get(0), recipe.getResultItem(), recipe.getExperience(), (int) (recipe.getCookingTime() * ServerConfig.COOK_TIME_FACTOR.get())); + return new BrickBlastingRecipe(recipe.getId(), recipe.getGroup(), recipe.category(), recipe.getIngredients().get(0), recipe.getResultItem(), recipe.getExperience(), (int) (recipe.getCookingTime() * ServerConfig.COOK_TIME_FACTOR.get())); } @Override diff --git a/src/main/java/cech12/brickfurnace/crafting/BrickSmeltingRecipe.java b/src/main/java/cech12/brickfurnace/crafting/BrickSmeltingRecipe.java index adca799..0e3c1c6 100644 --- a/src/main/java/cech12/brickfurnace/crafting/BrickSmeltingRecipe.java +++ b/src/main/java/cech12/brickfurnace/crafting/BrickSmeltingRecipe.java @@ -5,6 +5,7 @@ import cech12.brickfurnace.config.ServerConfig; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.AbstractCookingRecipe; +import net.minecraft.world.item.crafting.CookingBookCategory; import net.minecraft.world.item.crafting.SimpleCookingSerializer; import net.minecraft.world.item.crafting.SmeltingRecipe; import net.minecraft.world.item.crafting.RecipeSerializer; @@ -17,12 +18,12 @@ public class BrickSmeltingRecipe extends AbstractCookingRecipe { public static final SimpleCookingSerializer SERIALIZER = new SimpleCookingSerializer<>(BrickSmeltingRecipe::new, 200); - public BrickSmeltingRecipe(ResourceLocation p_i50031_1_, String p_i50031_2_, Ingredient p_i50031_3_, ItemStack p_i50031_4_, float p_i50031_5_, int p_i50031_6_) { - super(ModRecipeTypes.SMELTING.get(), p_i50031_1_, p_i50031_2_, p_i50031_3_, p_i50031_4_, p_i50031_5_, p_i50031_6_); + public BrickSmeltingRecipe(ResourceLocation p_i50031_1_, String p_i50031_2_, CookingBookCategory category, Ingredient p_i50031_3_, ItemStack p_i50031_4_, float p_i50031_5_, int p_i50031_6_) { + super(ModRecipeTypes.SMELTING.get(), p_i50031_1_, p_i50031_2_, category, p_i50031_3_, p_i50031_4_, p_i50031_5_, p_i50031_6_); } public static BrickSmeltingRecipe convert(@Nonnull SmeltingRecipe recipe) { - return new BrickSmeltingRecipe(recipe.getId(), recipe.getGroup(), recipe.getIngredients().get(0), recipe.getResultItem(), recipe.getExperience(), (int) (recipe.getCookingTime() * ServerConfig.COOK_TIME_FACTOR.get())); + return new BrickSmeltingRecipe(recipe.getId(), recipe.getGroup(), recipe.category(), recipe.getIngredients().get(0), recipe.getResultItem(), recipe.getExperience(), (int) (recipe.getCookingTime() * ServerConfig.COOK_TIME_FACTOR.get())); } @Override diff --git a/src/main/java/cech12/brickfurnace/crafting/BrickSmokingRecipe.java b/src/main/java/cech12/brickfurnace/crafting/BrickSmokingRecipe.java index b11ae31..487cfe9 100644 --- a/src/main/java/cech12/brickfurnace/crafting/BrickSmokingRecipe.java +++ b/src/main/java/cech12/brickfurnace/crafting/BrickSmokingRecipe.java @@ -5,6 +5,7 @@ import cech12.brickfurnace.config.ServerConfig; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.AbstractCookingRecipe; +import net.minecraft.world.item.crafting.CookingBookCategory; import net.minecraft.world.item.crafting.SimpleCookingSerializer; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.Ingredient; @@ -17,12 +18,12 @@ public class BrickSmokingRecipe extends AbstractCookingRecipe { public static final SimpleCookingSerializer SERIALIZER = new SimpleCookingSerializer<>(BrickSmokingRecipe::new, 100); - public BrickSmokingRecipe(ResourceLocation p_i50031_1_, String p_i50031_2_, Ingredient p_i50031_3_, ItemStack p_i50031_4_, float p_i50031_5_, int p_i50031_6_) { - super(ModRecipeTypes.SMOKING.get(), p_i50031_1_, p_i50031_2_, p_i50031_3_, p_i50031_4_, p_i50031_5_, p_i50031_6_); + public BrickSmokingRecipe(ResourceLocation p_i50031_1_, String p_i50031_2_, CookingBookCategory category, Ingredient p_i50031_3_, ItemStack p_i50031_4_, float p_i50031_5_, int p_i50031_6_) { + super(ModRecipeTypes.SMOKING.get(), p_i50031_1_, p_i50031_2_, category, p_i50031_3_, p_i50031_4_, p_i50031_5_, p_i50031_6_); } public static BrickSmokingRecipe convert(@Nonnull SmokingRecipe recipe) { - return new BrickSmokingRecipe(recipe.getId(), recipe.getGroup(), recipe.getIngredients().get(0), recipe.getResultItem(), recipe.getExperience(), (int) (recipe.getCookingTime() * ServerConfig.COOK_TIME_FACTOR.get())); + return new BrickSmokingRecipe(recipe.getId(), recipe.getGroup(), recipe.category(), recipe.getIngredients().get(0), recipe.getResultItem(), recipe.getExperience(), (int) (recipe.getCookingTime() * ServerConfig.COOK_TIME_FACTOR.get())); } @Override diff --git a/src/main/java/cech12/brickfurnace/init/ModItems.java b/src/main/java/cech12/brickfurnace/init/ModItems.java index 1fdfd7a..c27b112 100644 --- a/src/main/java/cech12/brickfurnace/init/ModItems.java +++ b/src/main/java/cech12/brickfurnace/init/ModItems.java @@ -2,7 +2,6 @@ import cech12.brickfurnace.BrickFurnaceMod; import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraftforge.registries.DeferredRegister; @@ -13,12 +12,12 @@ public class ModItems { public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, BrickFurnaceMod.MOD_ID); - public static final RegistryObject BRICK_FURNACE = fromBlock(ModBlocks.BRICK_FURNACE, CreativeModeTab.TAB_DECORATIONS); - public static final RegistryObject BRICK_BLAST_FURNACE = fromBlock(ModBlocks.BRICK_BLAST_FURNACE, CreativeModeTab.TAB_DECORATIONS); - public static final RegistryObject BRICK_SMOKER = fromBlock(ModBlocks.BRICK_SMOKER, CreativeModeTab.TAB_DECORATIONS); + public static final RegistryObject BRICK_FURNACE = fromBlock(ModBlocks.BRICK_FURNACE); + public static final RegistryObject BRICK_BLAST_FURNACE = fromBlock(ModBlocks.BRICK_BLAST_FURNACE); + public static final RegistryObject BRICK_SMOKER = fromBlock(ModBlocks.BRICK_SMOKER); - private static RegistryObject fromBlock(RegistryObject block, CreativeModeTab tab) { - return ITEMS.register(block.getId().getPath(), () -> new BlockItem(block.get(), new Item.Properties().tab(tab))); + private static RegistryObject fromBlock(RegistryObject block) { + return ITEMS.register(block.getId().getPath(), () -> new BlockItem(block.get(), new Item.Properties())); } } diff --git a/src/main/java/cech12/brickfurnace/jei/BrickBlastingCategory.java b/src/main/java/cech12/brickfurnace/jei/BrickBlastingCategory.java index 5da6801..998cbcc 100644 --- a/src/main/java/cech12/brickfurnace/jei/BrickBlastingCategory.java +++ b/src/main/java/cech12/brickfurnace/jei/BrickBlastingCategory.java @@ -1,5 +1,6 @@ package cech12.brickfurnace.jei; +/* import cech12.brickfurnace.init.ModBlocks; import cech12.brickfurnace.init.ModRecipeTypes; import cech12.brickfurnace.config.ServerConfig; @@ -23,3 +24,4 @@ public RecipeType getRecipeType() { } } + */ diff --git a/src/main/java/cech12/brickfurnace/jei/BrickFurnaceJEIPlugin.java b/src/main/java/cech12/brickfurnace/jei/BrickFurnaceJEIPlugin.java index 0b79e3f..428d6a6 100644 --- a/src/main/java/cech12/brickfurnace/jei/BrickFurnaceJEIPlugin.java +++ b/src/main/java/cech12/brickfurnace/jei/BrickFurnaceJEIPlugin.java @@ -1,5 +1,6 @@ package cech12.brickfurnace.jei; +/* import cech12.brickfurnace.BrickFurnaceMod; import cech12.brickfurnace.init.ModBlocks; import cech12.brickfurnace.init.ModRecipeTypes; @@ -85,3 +86,4 @@ public void registerRecipeCatalysts(@Nonnull IRecipeCatalystRegistration registr } } + */ diff --git a/src/main/java/cech12/brickfurnace/jei/BrickSmeltingCategory.java b/src/main/java/cech12/brickfurnace/jei/BrickSmeltingCategory.java index 2f50b98..8104095 100644 --- a/src/main/java/cech12/brickfurnace/jei/BrickSmeltingCategory.java +++ b/src/main/java/cech12/brickfurnace/jei/BrickSmeltingCategory.java @@ -1,5 +1,6 @@ package cech12.brickfurnace.jei; +/* import cech12.brickfurnace.init.ModBlocks; import cech12.brickfurnace.init.ModRecipeTypes; import cech12.brickfurnace.config.ServerConfig; @@ -23,3 +24,4 @@ public RecipeType getRecipeType() { } } + */ diff --git a/src/main/java/cech12/brickfurnace/jei/BrickSmokingCategory.java b/src/main/java/cech12/brickfurnace/jei/BrickSmokingCategory.java index 60d1e76..f938760 100644 --- a/src/main/java/cech12/brickfurnace/jei/BrickSmokingCategory.java +++ b/src/main/java/cech12/brickfurnace/jei/BrickSmokingCategory.java @@ -1,5 +1,6 @@ package cech12.brickfurnace.jei; +/* import cech12.brickfurnace.init.ModBlocks; import cech12.brickfurnace.init.ModRecipeTypes; import cech12.brickfurnace.config.ServerConfig; @@ -23,3 +24,4 @@ public RecipeType getRecipeType() { } } + */ diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 5363095..cc7d286 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[43,)" +loaderVersion="[44,)" issueTrackerURL="https://github.com/cech12/BrickFurnace/issues" license="The MIT License (MIT)" [[mods]] @@ -15,13 +15,13 @@ license="The MIT License (MIT)" [[dependencies.brickfurnace]] modId="forge" mandatory=true - versionRange="[43.1.2,)" + versionRange="[44.0.41,)" ordering="NONE" side="BOTH" [[dependencies.brickfurnace]] modId="minecraft" mandatory=true - versionRange="[1.19.2,1.20)" + versionRange="[1.19.3,1.20)" ordering="NONE" side="BOTH" [[dependencies.brickfurnace]] @@ -33,7 +33,7 @@ license="The MIT License (MIT)" [[dependencies.brickfurnace]] modId="theoneprobe" mandatory=false - versionRange="[1.19-6.2.0,)" + versionRange="[1.19.3-7.0.0,)" ordering="NONE" side="BOTH" [[dependencies.brickfurnace]] diff --git a/src/main/resources/data/brickfurnace/advancements/recipes/decorations/brick_blast_furnace.json b/src/main/resources/data/brickfurnace/advancements/recipes/decorations/brick_blast_furnace.json index 228706a..7e97104 100644 --- a/src/main/resources/data/brickfurnace/advancements/recipes/decorations/brick_blast_furnace.json +++ b/src/main/resources/data/brickfurnace/advancements/recipes/decorations/brick_blast_furnace.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "brickfurnace:brick_furnace" + "items": [ + "brickfurnace:brick_furnace" + ] } ] } diff --git a/src/main/resources/data/brickfurnace/advancements/recipes/decorations/brick_furnace.json b/src/main/resources/data/brickfurnace/advancements/recipes/decorations/brick_furnace.json index 00084e2..e32a69d 100644 --- a/src/main/resources/data/brickfurnace/advancements/recipes/decorations/brick_furnace.json +++ b/src/main/resources/data/brickfurnace/advancements/recipes/decorations/brick_furnace.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "item": "minecraft:brick" + "tag": "forge:ingots/brick" } ] } diff --git a/src/main/resources/data/brickfurnace/advancements/recipes/decorations/brick_smoker.json b/src/main/resources/data/brickfurnace/advancements/recipes/decorations/brick_smoker.json index 7147345..569dc69 100644 --- a/src/main/resources/data/brickfurnace/advancements/recipes/decorations/brick_smoker.json +++ b/src/main/resources/data/brickfurnace/advancements/recipes/decorations/brick_smoker.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "brickfurnace:brick_furnace" + "items": [ + "brickfurnace:brick_furnace" + ] } ] } diff --git a/src/main/resources/data/brickfurnace/recipes/brick_blast_furnace.json b/src/main/resources/data/brickfurnace/recipes/brick_blast_furnace.json index 744795d..bafc3ca 100644 --- a/src/main/resources/data/brickfurnace/recipes/brick_blast_furnace.json +++ b/src/main/resources/data/brickfurnace/recipes/brick_blast_furnace.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "category": "misc", "pattern": [ "III", "IXI", @@ -7,13 +8,13 @@ ], "key": { "#": { - "item": "minecraft:bricks" + "tag": "forge:ingots/brick" }, "X": { "item": "brickfurnace:brick_furnace" }, "I": { - "item": "minecraft:iron_ingot" + "tag": "forge:ingots/iron" } }, "result": { diff --git a/src/main/resources/data/brickfurnace/recipes/brick_furnace.json b/src/main/resources/data/brickfurnace/recipes/brick_furnace.json index b85e078..44906dc 100644 --- a/src/main/resources/data/brickfurnace/recipes/brick_furnace.json +++ b/src/main/resources/data/brickfurnace/recipes/brick_furnace.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "category": "misc", "pattern": [ "###", "# #", @@ -7,7 +8,7 @@ ], "key": { "#": { - "item": "minecraft:brick" + "tag": "forge:ingots/brick" } }, "result": { diff --git a/src/main/resources/data/brickfurnace/recipes/brick_smoker.json b/src/main/resources/data/brickfurnace/recipes/brick_smoker.json index dc2440f..067999b 100644 --- a/src/main/resources/data/brickfurnace/recipes/brick_smoker.json +++ b/src/main/resources/data/brickfurnace/recipes/brick_smoker.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "category": "misc", "pattern": [ " # ", "#X#", diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 934cc0c..6640179 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,8 +1,8 @@ { "pack": { "description": "Brick Furnace resources", - "pack_format": 10, - "forge:resource_pack_format": 9, - "forge:data_pack_format": 10 + "pack_format": 12, + "forge:resource_pack_format": 10, + "forge:data_pack_format": 12 } }