From 65073e84bd8ee0c897b581cf7b3cfca1337c0acc Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sat, 13 Aug 2022 23:19:44 +0200 Subject: [PATCH] Patch D --- gradle.properties | 2 +- src/main/java/com/simibubi/create/compat/jei/CreateJEI.java | 2 +- .../compat/jei/category/MysteriousItemConversionCategory.java | 4 ++-- .../com/simibubi/create/foundation/utility/RemapHelper.java | 2 ++ src/main/resources/META-INF/mods.toml | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5f273d168..7c4f65984 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ parchment_version = 2022.07.10 # dependency versions registrate_version = MC1.18.2-1.1.3 flywheel_minecraft_version = 1.18.2 -flywheel_version = 0.6.4-90 +flywheel_version = 0.6.5-91 jei_minecraft_version = 1.18.2 jei_version = 9.7.0.209 curios_minecraft_version = 1.18.2 diff --git a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java index ee5664e19..d70a09af5 100644 --- a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java +++ b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java @@ -307,7 +307,7 @@ public class CreateJEI implements IModPlugin { mysteryConversion = builder(ConversionRecipe.class) .addRecipes(() -> MysteriousItemConversionCategory.RECIPES) - .itemIcon(AllItems.CHROMATIC_COMPOUND.get()) + .itemIcon(AllBlocks.PECULIAR_BELL.get()) .emptyBackground(177, 50) .build("mystery_conversion", MysteriousItemConversionCategory::new); diff --git a/src/main/java/com/simibubi/create/compat/jei/category/MysteriousItemConversionCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/MysteriousItemConversionCategory.java index a6b4ef243..bfaf9ec76 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/MysteriousItemConversionCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/MysteriousItemConversionCategory.java @@ -24,8 +24,8 @@ public class MysteriousItemConversionCategory extends CreateRecipeCategory info) { diff --git a/src/main/java/com/simibubi/create/foundation/utility/RemapHelper.java b/src/main/java/com/simibubi/create/foundation/utility/RemapHelper.java index a7a74c928..9c579b473 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/RemapHelper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/RemapHelper.java @@ -167,6 +167,8 @@ public class RemapHelper { remapPaletteBlock("dolomite", "calcite", false); remapPaletteBlock("weathered_limestone", "tuff", false); + reMap.put("natural_scoria", asResource("scoria")); + reMap.put("empty_blueprint", SCHEMATIC.getId()); reMap.put("gold_sheet", GOLDEN_SHEET.getId()); reMap.put("flour", WHEAT_FLOUR.getId()); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 5bdb2b8e7..10430dbe9 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -33,6 +33,6 @@ Technology that empowers the player.''' [[dependencies.create]] modId="flywheel" mandatory=true - versionRange="[0.6.4,0.6.5)" + versionRange="[0.6.5,0.6.6)" ordering="AFTER" side="CLIENT"