From 99ba3f0be8835dac87b506a37f2a62ba89af0ca0 Mon Sep 17 00:00:00 2001 From: Uko Kokņevičs Date: Sat, 27 Jan 2024 03:22:37 +0200 Subject: Add support for a bunch of mods --- build.gradle.kts | 22 +++++-- gradle.properties | 1 + settings.gradle.kts | 7 +- src/main/java/lv/enes/mc/eris_alchemy/Emc.java | 13 ++-- .../mc/eris_alchemy/recipe/SimplifiedRecipe.java | 50 ++++++++++---- .../enes/mc/eris_alchemy/utils/ForeignUtils.java | 14 ++++ .../eris_alchemy/cycle_cut/ad_astra.json | 20 ++++++ .../eris_alchemy/eris_alchemy/cycle_cut/c.json | 4 ++ .../eris_alchemy/cycle_cut/chipped.json | 14 ++++ .../eris_alchemy/cycle_cut/computercraft.json | 3 + .../eris_alchemy/cycle_cut/create.json | 77 ++++++++++++++++++++++ .../eris_alchemy/cycle_cut/farmersdelight.json | 23 +++++++ .../eris_alchemy/cycle_cut/minecraft.json | 39 ++++++++++- .../eris_alchemy/cycle_cut/travelersbackpack.json | 3 + .../eris_alchemy/fake_recipes/farmersdelight.json | 4 ++ .../eris_alchemy/item_emcs/farmersdelight.json | 12 ++++ .../eris_alchemy/item_emcs/porting_lib.json | 3 + .../eris_alchemy/eris_alchemy/item_tag_emcs/c.json | 3 + .../eris_alchemy/item_tag_emcs/minecraft.json | 3 +- .../items/travelersbackpack_sleeping_bags.json | 69 +++++++++++++++++++ 20 files changed, 351 insertions(+), 33 deletions(-) create mode 100644 src/main/java/lv/enes/mc/eris_alchemy/utils/ForeignUtils.java create mode 100644 src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/ad_astra.json create mode 100644 src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/c.json create mode 100644 src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/chipped.json create mode 100644 src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/computercraft.json create mode 100644 src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/create.json create mode 100644 src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/farmersdelight.json create mode 100644 src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/travelersbackpack.json create mode 100644 src/main/resources/data/eris_alchemy/eris_alchemy/fake_recipes/farmersdelight.json create mode 100644 src/main/resources/data/eris_alchemy/eris_alchemy/item_emcs/farmersdelight.json create mode 100644 src/main/resources/data/eris_alchemy/eris_alchemy/item_emcs/porting_lib.json create mode 100644 src/main/resources/data/eris_alchemy/eris_alchemy/item_tag_emcs/c.json create mode 100644 src/main/resources/data/eris_alchemy/tags/items/travelersbackpack_sleeping_bags.json diff --git a/build.gradle.kts b/build.gradle.kts index c804c99..3d19748 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,6 +4,7 @@ plugins { id("org.quiltmc.loom") } +val chippedVersion: String by project val groupid: String by project val jakartaAnnotationVersion: String by project val loaderVersion: String by project @@ -15,11 +16,7 @@ val quiltMappings: String by project val quiltedFabricApiVersion: String by project group = groupid -version = "${modVersion}+${minecraftVersion}" - -base { - archivesName = modid -} +version = modVersion repositories { maven { @@ -28,6 +25,16 @@ repositories { includeGroup("vazkii.patchouli") } } + maven { + url = uri("https://maven.resourcefulbees.com/repository/maven-public/") + content { + includeGroup("com.teamresourceful") + includeGroup("com.teamresourceful.resourcefullib") + includeGroup("com.terraformersmc") + includeGroup("earth.terrarium.athena") + includeGroup("earth.terrarium.chipped") + } + } } loom { @@ -51,6 +58,8 @@ dependencies { exclude(group = "net.fabricmc", module = "fabric-loader") } + modCompileOnly("earth.terrarium.chipped:chipped-fabric-${minecraftVersion}:${chippedVersion}") + compileOnly("jakarta.annotation:jakarta.annotation-api:${jakartaAnnotationVersion}") } @@ -66,7 +75,6 @@ java { publishing { publications { create("maven") { - artifactId = modid from(components["java"]) } } @@ -111,6 +119,6 @@ tasks.javadoc { tasks.jar { from("LICENSE") { - rename { "${it}_${base.archivesName.get()}" } + rename { "${it}_${name}" } } } diff --git a/gradle.properties b/gradle.properties index 61e3753..3728189 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,6 +12,7 @@ quiltMappings = 23 loaderVersion = 0.23.0 quiltedFabricApiVersion = 7.4.0+0.90.0 +chippedVersion = 3.0.1 patchouliVersion = 1.20.1-84-FABRIC jakartaAnnotationVersion = 3.0.0-M1 \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index df4757f..f1ef3c5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -45,4 +45,9 @@ pluginManagement { id("io.freefair.lombok") version "8.4" id("org.quiltmc.loom") version loomPluginVersion } -} \ No newline at end of file +} + +val modid: String by settings +val minecraftVersion: String by settings + +rootProject.name = "${modid}-mc${minecraftVersion}" \ No newline at end of file diff --git a/src/main/java/lv/enes/mc/eris_alchemy/Emc.java b/src/main/java/lv/enes/mc/eris_alchemy/Emc.java index 731ecee..576fdc2 100644 --- a/src/main/java/lv/enes/mc/eris_alchemy/Emc.java +++ b/src/main/java/lv/enes/mc/eris_alchemy/Emc.java @@ -87,9 +87,7 @@ public final class Emc { public static void initClient(Minecraft ignoredClient) { ClientPlayNetworking.registerGlobalReceiver( NetworkingConstants.UPDATE_EMCS, - (client, handler, buf, responseSender) -> { - syncFrom(buf); - } + (client, handler, buf, responseSender) -> syncFrom(buf) ); } @@ -98,9 +96,7 @@ public final class Emc { reinit(); warnOfMissingValues(); - ServerPlayConnectionEvents.JOIN.register((handler, sender, server1) -> { - syncTo(handler.getPlayer()); - }); + ServerPlayConnectionEvents.JOIN.register((handler, sender, server1) -> syncTo(handler.getPlayer())); } public static void reloadData( @@ -192,7 +188,8 @@ public final class Emc { world.getRecipeManager() .getRecipes() .stream() - .map(recipe -> new SimplifiedRecipe(recipe, world.registryAccess())) + .map(recipe -> SimplifiedRecipe.of(recipe, world.registryAccess())) + .flatMap(List::stream) ); } @@ -226,7 +223,7 @@ public final class Emc { var sortedItems = sorted(recipes); sortedItems.stream() .filter(id -> !VALUES.containsKey(id)) - .forEach(id -> VALUES.put(id, calcEmc(id, recipes))); + .forEach(id -> calcEmc(id, recipes).ifPresent(v -> VALUES.put(id, OptionalDouble.of(v)))); ErisAlchemy.LOGGER.info("Done calculating EMC values..."); sync(); diff --git a/src/main/java/lv/enes/mc/eris_alchemy/recipe/SimplifiedRecipe.java b/src/main/java/lv/enes/mc/eris_alchemy/recipe/SimplifiedRecipe.java index 469ed52..6bb1274 100644 --- a/src/main/java/lv/enes/mc/eris_alchemy/recipe/SimplifiedRecipe.java +++ b/src/main/java/lv/enes/mc/eris_alchemy/recipe/SimplifiedRecipe.java @@ -4,13 +4,17 @@ import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonParseException; +import earth.terrarium.chipped.common.recipe.ChippedRecipe; import jakarta.annotation.Nonnull; +import lv.enes.mc.eris_alchemy.utils.ForeignUtils; import lv.enes.mc.eris_alchemy.utils.IngredientProvider; import lv.enes.mc.eris_alchemy.utils.ItemUtils; import lv.enes.mc.eris_alchemy.utils.RecipeUtils; +import net.minecraft.core.Holder; import net.minecraft.core.RegistryAccess; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.Recipe; @@ -21,20 +25,45 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Objects; +import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.Stream; public record SimplifiedRecipe(ItemStack output, List remainder, List> input) { - public SimplifiedRecipe(Recipe recipe, RegistryAccess registryAccess) { - this( + public static List of(Recipe recipe, RegistryAccess registryAccess) { + if (ForeignUtils.IS_CHIPPED_AVAILABLE && recipe instanceof ChippedRecipe chippedRecipe) { + var remainder = List.of(); + return chippedRecipe.tags() + .stream() + .flatMap(tag -> { + var items = tag.stream().map(Holder::value).toList(); + Predicate isOutput = item -> ItemUtils.getId(item).getNamespace().equals("chipped"); + var inputs = items.stream() + .filter(item -> !isOutput.test(item)) + .map(Ingredient::of) + .map(x -> (Supplier) () -> x) + .map(List::of) + .toList(); + var outputs = items.stream().filter(isOutput).map(Item::getDefaultInstance).toList(); + return outputs.stream() + .flatMap( + output -> + inputs.stream() + .map(input -> new SimplifiedRecipe(output, remainder, input)) + ); + }) + .toList(); + } + + return List.of(new SimplifiedRecipe( RecipeUtils.getOutput(recipe, registryAccess), - List.of(), // TODO: + List.of(), // TODO RecipeUtils.getIngredients(recipe) .stream() .filter(ingredient -> !ingredient.isEmpty()) - .map(x -> (Supplier) () -> x) + .map(x -> (Supplier)() -> x) .toList() - ); + )); } public Stream dependencies() { @@ -45,15 +74,8 @@ public record SimplifiedRecipe(ItemStack output, List remainder, List } public boolean hasDuplication() { - var outputId = ItemUtils.getId(output); - var outputsInRemainder = remainder.stream() - .map(ItemUtils::getId) - .anyMatch(id -> Objects.equals(id, outputId)); - if (outputsInRemainder) { - return true; - } - - return input.stream().anyMatch(ingredient -> ingredient.get().test(output)); + return remainder.stream().anyMatch(stack -> ItemStack.isSameItem(stack, output)) + || input.stream().anyMatch(ingredient -> ingredient.get().test(output)); } public boolean isAllowed(BannedRecipe ban) { diff --git a/src/main/java/lv/enes/mc/eris_alchemy/utils/ForeignUtils.java b/src/main/java/lv/enes/mc/eris_alchemy/utils/ForeignUtils.java new file mode 100644 index 0000000..b686a9e --- /dev/null +++ b/src/main/java/lv/enes/mc/eris_alchemy/utils/ForeignUtils.java @@ -0,0 +1,14 @@ +package lv.enes.mc.eris_alchemy.utils; + +public class ForeignUtils { + public static boolean IS_CHIPPED_AVAILABLE = check("earth.terrarium.chipped.Chipped"); + + private static boolean check(String className) { + try { + Class.forName(className); + return true; + } catch (ClassNotFoundException e) { + return false; + } + } +} diff --git a/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/ad_astra.json b/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/ad_astra.json new file mode 100644 index 0000000..396f26d --- /dev/null +++ b/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/ad_astra.json @@ -0,0 +1,20 @@ +[ + "ad_astra:calorite_block -> ad_astra:calorite_ingot", + "ad_astra:calorite_nugget -> ad_astra:calorite_ingot", + "ad_astra:cheese_block -> ad_astra:cheese", + + "ad_astra:desh_block -> ad_astra:desh_ingot", + "ad_astra:desh_nugget -> ad_astra:desh_ingot", + + "ad_astra:ostrum_block -> ad_astra:ostrum_ingot", + "ad_astra:ostrum_nugget -> ad_astra:ostrum_ingot", + + "ad_astra:raw_calorite_block -> ad_astra:raw_calorite", + "ad_astra:raw_desh_block -> ad_astra:raw_desh", + "ad_astra:raw_ostrum_block -> ad_astra:raw_ostrum", + + "ad_astra:steel_block -> ad_astra:steel_ingot", + "ad_astra:steel_nugget -> ad_astra:steel_ingot", + + "ad_astra:venus_sandstone -> ad_astra:venus_sand" +] \ No newline at end of file diff --git a/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/c.json b/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/c.json new file mode 100644 index 0000000..41db69d --- /dev/null +++ b/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/c.json @@ -0,0 +1,4 @@ +[ + "#c:glass_blocks -> #c:glass_blocks", + "#c:glass_panes -> #c:glass_panes" +] \ No newline at end of file diff --git a/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/chipped.json b/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/chipped.json new file mode 100644 index 0000000..bdd88f3 --- /dev/null +++ b/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/chipped.json @@ -0,0 +1,14 @@ +[ + "chipped:ash_sand -> minecraft:soul_sand", + "chipped:course_sand -> minecraft:soul_sand", + "chipped:desert_sand -> minecraft:soul_sand", + "chipped:kelp_sand -> minecraft:soul_sand", + "chipped:lush_red_sand -> minecraft:soul_sand", + "chipped:overgrown_sand -> minecraft:soul_sand", + "chipped:pearl_sand -> minecraft:soul_sand", + "chipped:soft_sand -> minecraft:soul_sand", + "chipped:tar_sand -> minecraft:soul_sand", + "chipped:wet_sand -> minecraft:soul_sand", + "chipped:wet_red_sand -> minecraft:soul_sand", + "chipped:white_sand -> minecraft:soul_sand" +] \ No newline at end of file diff --git a/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/computercraft.json b/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/computercraft.json new file mode 100644 index 0000000..dcbcbd1 --- /dev/null +++ b/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/computercraft.json @@ -0,0 +1,3 @@ +[ + "computercraft:wired_modem_full -> computercraft:wired_modem" +] \ No newline at end of file diff --git a/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/create.json b/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/create.json new file mode 100644 index 0000000..30a221a --- /dev/null +++ b/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/create.json @@ -0,0 +1,77 @@ +[ + "create:andesite_alloy_block -> create:andesite_alloy", + "create:brass_block -> create:brass_ingot", + "create:brass_nugget -> create:brass_ingot", + "create:builders_tea -> minecraft:glass_bottle", + "create:cinder_flour -> minecraft:netherrack", + "create:copper_nugget -> minecraft:copper_ingot", + "create:experience_block -> create:experience_nugget", + "create:raw_zinc_block -> create:raw_zinc", + "create:sail_frame -> create:white_sail", + "create:secondary_linear_chassis -> create:linear_chassis", + "create:small_rose_quartz_tiles -> create:rose_quartz_tiles", + "create:stressometer -> create:speedometer", + "create:vertical_gearbox -> create:gearbox", + "create:zinc_block -> create:zinc_ingot", + "create:zinc_nugget -> create:zinc_ingot", + + "create:cut_andesite_slab -> create:cut_andesite", + "create:cut_asurine_slab -> create:cut_asurine", + "create:cut_calcite_slab -> create:cut_calcite", + "create:cut_crimsite_slab -> create:cut_crimsite", + "create:cut_deepslate_slab -> create:cut_deepslate", + "create:cut_diorite_slab -> create:cut_diorite", + "create:cut_dripstone_slab -> create:cut_dripstone", + "create:cut_granite_slab -> create:cut_granite", + "create:cut_limestone_slab -> create:cut_limestone", + "create:cut_ochrum_slab -> create:cut_ochrum", + "create:cut_scorchia_slab -> create:cut_scorchia", + "create:cut_scoria_slab -> create:cut_scoria", + "create:cut_tuff_slab -> create:cut_tuff", + "create:cut_veridium_slab -> create:cut_veridium", + + "create:cut_andesite_brick_slab -> create:cut_andesite_bricks", + "create:cut_asurine_brick_slab -> create:cut_asurine_bricks", + "create:cut_calcite_brick_slab -> create:cut_calcite_bricks", + "create:cut_crimsite_brick_slab -> create:cut_crimsite_bricks", + "create:cut_deepslate_brick_slab -> create:cut_deepslate_bricks", + "create:cut_diorite_brick_slab -> create:cut_diorite_bricks", + "create:cut_dripstone_brick_slab -> create:cut_dripstone_bricks", + "create:cut_granite_brick_slab -> create:cut_granite_bricks", + "create:cut_limestone_brick_slab -> create:cut_limestone_bricks", + "create:cut_ochrum_brick_slab -> create:cut_ochrum_bricks", + "create:cut_scorchia_brick_slab -> create:cut_scorchia_bricks", + "create:cut_scoria_brick_slab -> create:cut_scoria_bricks", + "create:cut_tuff_brick_slab -> create:cut_tuff_bricks", + "create:cut_veridium_brick_slab -> create:cut_veridium_bricks", + + "create:polished_cut_andesite_slab -> create:polished_cut_andesite", + "create:polished_cut_asurine_slab -> create:polished_cut_asurine", + "create:polished_cut_calcite_slab -> create:polished_cut_calcite", + "create:polished_cut_crimsite_slab -> create:polished_cut_crimsite", + "create:polished_cut_deepslate_slab -> create:polished_cut_deepslate", + "create:polished_cut_diorite_slab -> create:polished_cut_diorite", + "create:polished_cut_dripstone_slab -> create:polished_cut_dripstone", + "create:polished_cut_granite_slab -> create:polished_cut_granite", + "create:polished_cut_limestone_slab -> create:polished_cut_limestone", + "create:polished_cut_ochrum_slab -> create:polished_cut_ochrum", + "create:polished_cut_scorchia_slab -> create:polished_cut_scorchia", + "create:polished_cut_scoria_slab -> create:polished_cut_scoria", + "create:polished_cut_tuff_slab -> create:polished_cut_tuff", + "create:polished_cut_veridium_slab -> create:polished_cut_veridium", + + "create:small_andesite_brick_slab -> create:small_andesite_bricks", + "create:small_asurine_brick_slab -> create:small_asurine_bricks", + "create:small_calcite_brick_slab -> create:small_calcite_bricks", + "create:small_crimsite_brick_slab -> create:small_crimsite_bricks", + "create:small_deepslate_brick_slab -> create:small_deepslate_bricks", + "create:small_diorite_brick_slab -> create:small_diorite_bricks", + "create:small_dripstone_brick_slab -> create:small_dripstone_bricks", + "create:small_granite_brick_slab -> create:small_granite_bricks", + "create:small_limestone_brick_slab -> create:small_limestone_bricks", + "create:small_ochrum_brick_slab -> create:small_ochrum_bricks", + "create:small_scorchia_brick_slab -> create:small_scorchia_bricks", + "create:small_scoria_brick_slab -> create:small_scoria_bricks", + "create:small_tuff_brick_slab -> create:small_tuff_bricks", + "create:small_veridium_brick_slab -> create:small_veridium_bricks" +] \ No newline at end of file diff --git a/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/farmersdelight.json b/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/farmersdelight.json new file mode 100644 index 0000000..0e4b21f --- /dev/null +++ b/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/farmersdelight.json @@ -0,0 +1,23 @@ +[ + "farmersdelight:apple_pie_slice -> farmersdelight:apple_pie", + "farmersdelight:beetroot_crate -> minecraft:beetroot", + "farmersdelight:cabbage_crate -> farmersdelight:cabbage", + "farmersdelight:cabbage_leaf -> farmersdelight:cabbage", + "farmersdelight:cake_slice -> minecraft:cake", + "farmersdelight:canvas_rug -> farmersdelight:canvas", + "farmersdelight:carrot_crate -> minecraft:carrot", + "farmersdelight:chocolate_pie_slice -> farmersdelight:chocolate_pie", + "farmersdelight:full_tatami_mat -> farmersdelight:tatami", + "farmersdelight:half_tatami_mat -> farmersdelight:full_tatami_mat", + "farmersdelight:milk_bottle -> minecraft:glass_bottle", + "farmersdelight:milk_bottle -> minecraft:milk_bucket", + "farmersdelight:onion_crate -> farmersdelight:onion", + "farmersdelight:potato_crate -> minecraft:potato", + "farmersdelight:pumpkin_slice -> minecraft:pumpkin", + "farmersdelight:rice_bag -> farmersdelight:rice", + "farmersdelight:rice_bale -> farmersdelight:rice_panicle", + "farmersdelight:safety_net -> farmersdelight:rope", + "farmersdelight:straw_bale -> farmersdelight:straw", + "farmersdelight:sweet_berry_cheesecake_slice -> farmersdelight:sweet_berry_cheesecake", + "farmersdelight:tomato_crate -> farmersdelight:tomato" +] \ No newline at end of file diff --git a/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/minecraft.json b/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/minecraft.json index 663e70e..62d93fc 100644 --- a/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/minecraft.json +++ b/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/minecraft.json @@ -1,26 +1,42 @@ [ "#minecraft:beds -> #minecraft:beds", + "#minecraft:signs -> #minecraft:planks", + "#minecraft:wooden_doors -> #minecraft:planks", + "#minecraft:wooden_trapdoors -> #minecraft:planks", "#minecraft:wool -> #minecraft:wool", + "#minecraft:wool -> minecraft:string", "#minecraft:wool_carpets -> #minecraft:wool_carpets", + "minecraft:amethyst_block -> minecraft:amethyst_shard", + "minecraft:bone_block -> minecraft:bone_meal", + "minecraft:bricks -> minecraft:brick", "minecraft:chiseled_quartz_block -> minecraft:quartz_slab", "minecraft:chiseled_red_sandstone -> minecraft:red_sandstone_slab", "minecraft:chiseled_sandstone -> minecraft:sandstone_slab", + "minecraft:clay -> minecraft:clay_ball", "minecraft:coal_block -> minecraft:coal", + "minecraft:cobbled_deepslate -> minecraft:deepslate", + "minecraft:cobblestone -> minecraft:andesite", + "minecraft:cobblestone -> minecraft:diorite", + "minecraft:cobblestone -> minecraft:gravel", + "minecraft:cobblestone -> minecraft:stone", "minecraft:copper_block -> minecraft:copper_ingot", "minecraft:diamond_block -> minecraft:diamond", + "minecraft:diamond_horse_armor -> minecraft:diamond", "minecraft:disc_fragment_5 -> minecraft:music_disc_5", "minecraft:dried_kelp_block -> minecraft:dried_kelp", "minecraft:emerald_block -> minecraft:emerald", "minecraft:filled_map -> minecraft:map", - + + "minecraft:glowstone -> minecraft:glowstone_dust", "minecraft:gold_block -> minecraft:gold_ingot", "minecraft:gold_nugget -> minecraft:gold_ingot", + "minecraft:golden_horse_armor -> minecraft:gold_ingot", "minecraft:golden_helmet -> minecraft:gold_nugget", "minecraft:golden_chestplate -> minecraft:gold_nugget", "minecraft:golden_leggings -> minecraft:gold_nugget", @@ -30,12 +46,16 @@ "minecraft:golden_axe -> minecraft:gold_nugget", "minecraft:golden_shovel -> minecraft:gold_nugget", "minecraft:golden_hoe -> minecraft:gold_nugget", + "minecraft:granite -> minecraft:red_sand", + "minecraft:gravel -> minecraft:sand", "minecraft:hay_block -> minecraft:wheat", "minecraft:honey_block -> minecraft:honey_bottle", + "minecraft:honey_bottle -> minecraft:glass_bottle", "minecraft:iron_block -> minecraft:iron_ingot", "minecraft:iron_nugget -> minecraft:iron_ingot", + "minecraft:iron_horse_armor -> minecraft:iron_ingot", "minecraft:iron_helmet -> minecraft:iron_nugget", "minecraft:iron_chestplate -> minecraft:iron_nugget", "minecraft:iron_leggings -> minecraft:iron_nugget", @@ -47,18 +67,33 @@ "minecraft:iron_hoe -> minecraft:iron_nugget", "minecraft:lapis_block -> minecraft:lapis_lazuli", - + "minecraft:leather_horse_armor -> minecraft:leather", + "minecraft:leather_helmet -> minecraft:leather", + "minecraft:leather_chestplate -> minecraft:leather", + "minecraft:leather_leggings -> minecraft:leather", + "minecraft:leather_boots -> minecraft:leather", + + "minecraft:melon -> minecraft:melon_slice", + + "minecraft:nether_bricks -> minecraft:nether_brick", + "minecraft:nether_wart_block -> minecraft:nether_wart", "minecraft:netherite_block -> minecraft:netherite_ingot", "minecraft:redstone_block -> minecraft:redstone", + "minecraft:sandstone -> minecraft:sand", "minecraft:slime_block -> minecraft:slime_ball", "minecraft:purpur_pillar -> minecraft:purpur_slab", + "minecraft:quartz_block -> minecraft:quartz", + "minecraft:quartz -> minecraft:diorite", + "minecraft:raw_copper_block -> minecraft:raw_copper", "minecraft:raw_gold_block -> minecraft:raw_gold", "minecraft:raw_iron_block -> minecraft:raw_iron", + "minecraft:soul_sand -> minecraft:quartz", + "minecraft:waxed_copper_block -> minecraft:copper_ingot" ] \ No newline at end of file diff --git a/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/travelersbackpack.json b/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/travelersbackpack.json new file mode 100644 index 0000000..de92516 --- /dev/null +++ b/src/main/resources/data/eris_alchemy/eris_alchemy/cycle_cut/travelersbackpack.json @@ -0,0 +1,3 @@ +[ + "#eris_alchemy:travelersbackpack_sleeping_bags -> #eris_alchemy:travelersbackpack_sleeping_bags" +] \ No newline at end of file diff --git a/src/main/resources/data/eris_alchemy/eris_alchemy/fake_recipes/farmersdelight.json b/src/main/resources/data/eris_alchemy/eris_alchemy/fake_recipes/farmersdelight.json new file mode 100644 index 0000000..cd41c1b --- /dev/null +++ b/src/main/resources/data/eris_alchemy/eris_alchemy/fake_recipes/farmersdelight.json @@ -0,0 +1,4 @@ +[{ + "output": "farmersdelight:rich_soil", + "input": "farmersdelight:organic_compost" +}] \ No newline at end of file diff --git a/src/main/resources/data/eris_alchemy/eris_alchemy/item_emcs/farmersdelight.json b/src/main/resources/data/eris_alchemy/eris_alchemy/item_emcs/farmersdelight.json new file mode 100644 index 0000000..6e274cf --- /dev/null +++ b/src/main/resources/data/eris_alchemy/eris_alchemy/item_emcs/farmersdelight.json @@ -0,0 +1,12 @@ +{ + "farmersdelight:cabbage": 24, + "farmersdelight:cabbage_seeds": 16, + "farmersdelight:ham": 64, + "farmersdelight:onion": 24, + "farmersdelight:rice": 24, + "farmersdelight:rice_panicle": 16, + "farmersdelight:straw": 16, + "farmersdelight:tomato": 24, + "farmersdelight:tomato_seeds": 16, + "farmersdelight:tree_bark": 16 +} \ No newline at end of file diff --git a/src/main/resources/data/eris_alchemy/eris_alchemy/item_emcs/porting_lib.json b/src/main/resources/data/eris_alchemy/eris_alchemy/item_emcs/porting_lib.json new file mode 100644 index 0000000..c01528d --- /dev/null +++ b/src/main/resources/data/eris_alchemy/eris_alchemy/item_emcs/porting_lib.json @@ -0,0 +1,3 @@ +{ + "porting_lib:area_selector": null +} \ No newline at end of file diff --git a/src/main/resources/data/eris_alchemy/eris_alchemy/item_tag_emcs/c.json b/src/main/resources/data/eris_alchemy/eris_alchemy/item_tag_emcs/c.json new file mode 100644 index 0000000..c95d0cb --- /dev/null +++ b/src/main/resources/data/eris_alchemy/eris_alchemy/item_tag_emcs/c.json @@ -0,0 +1,3 @@ +{ + "c:glass_blocks": 1 +} \ No newline at end of file diff --git a/src/main/resources/data/eris_alchemy/eris_alchemy/item_tag_emcs/minecraft.json b/src/main/resources/data/eris_alchemy/eris_alchemy/item_tag_emcs/minecraft.json index 70e4803..90bc05c 100644 --- a/src/main/resources/data/eris_alchemy/eris_alchemy/item_tag_emcs/minecraft.json +++ b/src/main/resources/data/eris_alchemy/eris_alchemy/item_tag_emcs/minecraft.json @@ -16,5 +16,6 @@ "minecraft:redstone_ores": null, "minecraft:sand": 1, "minecraft:saplings": 32, - "minecraft:wool": 48 + "minecraft:wool": 48, + "minecraft:wool_carpets": 32 } \ No newline at end of file diff --git a/src/main/resources/data/eris_alchemy/tags/items/travelersbackpack_sleeping_bags.json b/src/main/resources/data/eris_alchemy/tags/items/travelersbackpack_sleeping_bags.json new file mode 100644 index 0000000..cd8db7f --- /dev/null +++ b/src/main/resources/data/eris_alchemy/tags/items/travelersbackpack_sleeping_bags.json @@ -0,0 +1,69 @@ +{ + "replace": false, + "values": [ + { + "id": "#travelersbackpack:sleeping_bags", + "required": false + }, + { + "id": "travelersbackpack:blue_sleeping_bag", + "required": false + }, + { + "id": "travelersbackpack:brown_sleeping_bag", + "required": false + }, + { + "id": "travelersbackpack:cyan_sleeping_bag", + "required": false + }, + { + "id": "travelersbackpack:gray_sleeping_bag", + "required": false + }, + { + "id": "travelersbackpack:green_sleeping_bag", + "required": false + }, + { + "id": "travelersbackpack:light_blue_sleeping_bag", + "required": false + }, + { + "id": "travelersbackpack:light_gray_sleeping_bag", + "required": false + }, + { + "id": "travelersbackpack:lime_sleeping_bag", + "required": false + }, + { + "id": "travelersbackpack:magenta_sleeping_bag", + "required": false + }, + { + "id": "travelersbackpack:orange_sleeping_bag", + "required": false + }, + { + "id": "travelersbackpack:pink_sleeping_bag", + "required": false + }, + { + "id": "travelersbackpack:purple_sleeping_bag", + "required": false + }, + { + "id": "travelersbackpack:red_sleeping_bag", + "required": false + }, + { + "id": "travelersbackpack:yellow_sleeping_bag", + "required": false + }, + { + "id": "travelersbackpack:white_sleeping_bag", + "required": false + } + ] +} \ No newline at end of file -- cgit v1.2.3