From c611633b1c969da63c8d872fee10f4c04da69d6f Mon Sep 17 00:00:00 2001 From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com> Date: Mon, 25 Mar 2024 18:07:24 -0700 Subject: [PATCH 1/2] Add compressed hammer item and recipe code --- .../exdeorum/item/CompressedHammerItem.java | 53 +++++++++++++++++++ .../exdeorum/item/HammerItem.java | 9 ++-- .../exdeorum/recipe/RecipeUtil.java | 11 +++- .../recipe/hammer/CompressedHammerRecipe.java | 51 ++++++++++++++++++ .../FinishedCompressedHammerRecipe.java | 37 +++++++++++++ .../exdeorum/recipe/hammer/HammerRecipe.java | 12 ++--- .../exdeorum/registry/EItems.java | 14 +++++ .../exdeorum/registry/ERecipeSerializers.java | 2 + .../exdeorum/registry/ERecipeTypes.java | 2 + 9 files changed, 180 insertions(+), 11 deletions(-) create mode 100644 src/main/java/thedarkcolour/exdeorum/item/CompressedHammerItem.java create mode 100644 src/main/java/thedarkcolour/exdeorum/recipe/hammer/CompressedHammerRecipe.java create mode 100644 src/main/java/thedarkcolour/exdeorum/recipe/hammer/FinishedCompressedHammerRecipe.java diff --git a/src/main/java/thedarkcolour/exdeorum/item/CompressedHammerItem.java b/src/main/java/thedarkcolour/exdeorum/item/CompressedHammerItem.java new file mode 100644 index 00000000..84c102ff --- /dev/null +++ b/src/main/java/thedarkcolour/exdeorum/item/CompressedHammerItem.java @@ -0,0 +1,53 @@ +/* + * Ex Deorum + * Copyright (c) 2024 thedarkcolour + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package thedarkcolour.exdeorum.item; + +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.common.util.Lazy; +import org.jetbrains.annotations.Nullable; +import thedarkcolour.exdeorum.recipe.RecipeUtil; +import thedarkcolour.exdeorum.registry.EItems; + +import java.util.Set; + +// todo implement +public class CompressedHammerItem extends HammerItem { + public static Lazy> validBlocks = Lazy.of(() -> HammerItem.computeValidBlocks(RecipeUtil.getCachedCompressedHammerRecipes())); + + public static void refreshValidBlocks() { + validBlocks = Lazy.of(() -> HammerItem.computeValidBlocks(RecipeUtil.getCachedCompressedHammerRecipes())); + } + + public CompressedHammerItem(Tier tier, Properties properties) { + super(tier, properties); + } + + @Override + protected Set getValidBlocks() { + return validBlocks.get(); + } + + @Override + public int getBurnTime(ItemStack stack, @Nullable RecipeType recipeType) { + return this == EItems.WOODEN_COMPRESSED_HAMMER.get() ? 200 : 0; + } +} diff --git a/src/main/java/thedarkcolour/exdeorum/item/HammerItem.java b/src/main/java/thedarkcolour/exdeorum/item/HammerItem.java index 6014e1f7..af42cfaa 100644 --- a/src/main/java/thedarkcolour/exdeorum/item/HammerItem.java +++ b/src/main/java/thedarkcolour/exdeorum/item/HammerItem.java @@ -30,19 +30,20 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.common.util.Lazy; import org.jetbrains.annotations.Nullable; import thedarkcolour.exdeorum.recipe.RecipeUtil; +import thedarkcolour.exdeorum.recipe.hammer.HammerRecipe; import thedarkcolour.exdeorum.registry.EItems; +import java.util.Collection; import java.util.Set; public class HammerItem extends DiggerItem { - public static Lazy> validBlocks = Lazy.of(HammerItem::computeValidBlocks); + public static Lazy> validBlocks = Lazy.of(() -> computeValidBlocks(RecipeUtil.getCachedHammerRecipes())); public HammerItem(Tier tier, Properties properties) { super(1.0f, -2.8f, tier, null, properties); } - public static Set computeValidBlocks() { - var hammerRecipes = RecipeUtil.getCachedHammerRecipes(); + public static Set computeValidBlocks(Collection hammerRecipes) { var validBlocks = new ObjectOpenHashSet(hammerRecipes.size()); for (var recipe : hammerRecipes) { @@ -57,7 +58,7 @@ public class HammerItem extends DiggerItem { } public static void refreshValidBlocks() { - validBlocks = Lazy.of(HammerItem::computeValidBlocks); + validBlocks = Lazy.of(() -> computeValidBlocks(RecipeUtil.getCachedHammerRecipes())); } protected Set getValidBlocks() { diff --git a/src/main/java/thedarkcolour/exdeorum/recipe/RecipeUtil.java b/src/main/java/thedarkcolour/exdeorum/recipe/RecipeUtil.java index cbb4cda3..9d73955e 100644 --- a/src/main/java/thedarkcolour/exdeorum/recipe/RecipeUtil.java +++ b/src/main/java/thedarkcolour/exdeorum/recipe/RecipeUtil.java @@ -55,6 +55,7 @@ import net.minecraftforge.registries.ForgeRegistries; import org.jetbrains.annotations.Nullable; import thedarkcolour.exdeorum.ExDeorum; import thedarkcolour.exdeorum.compat.PreferredOres; +import thedarkcolour.exdeorum.item.CompressedHammerItem; import thedarkcolour.exdeorum.item.HammerItem; import thedarkcolour.exdeorum.loot.SummationGenerator; import thedarkcolour.exdeorum.recipe.barrel.BarrelCompostRecipe; @@ -64,6 +65,7 @@ import thedarkcolour.exdeorum.recipe.barrel.BarrelMixingRecipe; import thedarkcolour.exdeorum.recipe.cache.*; import thedarkcolour.exdeorum.recipe.crook.CrookRecipe; import thedarkcolour.exdeorum.recipe.crucible.CrucibleRecipe; +import thedarkcolour.exdeorum.recipe.hammer.CompressedHammerRecipe; import thedarkcolour.exdeorum.recipe.hammer.HammerRecipe; import thedarkcolour.exdeorum.recipe.sieve.CompressedSieveRecipe; import thedarkcolour.exdeorum.recipe.sieve.SieveRecipe; @@ -87,6 +89,7 @@ public final class RecipeUtil { private static SingleIngredientRecipeCache lavaCrucibleRecipeCache; private static SingleIngredientRecipeCache waterCrucibleRecipeCache; private static SingleIngredientRecipeCache hammerRecipeCache; + private static SingleIngredientRecipeCache compressedHammerRecipeCache; private static SieveRecipeCache sieveRecipeCache; private static SieveRecipeCache compressedSieveRecipeCache; private static BarrelFluidMixingRecipeCache barrelFluidMixingRecipeCache; @@ -99,6 +102,7 @@ public final class RecipeUtil { lavaCrucibleRecipeCache = new SingleIngredientRecipeCache<>(recipes, ERecipeTypes.LAVA_CRUCIBLE); waterCrucibleRecipeCache = new SingleIngredientRecipeCache<>(recipes, ERecipeTypes.WATER_CRUCIBLE); hammerRecipeCache = new SingleIngredientRecipeCache<>(recipes, ERecipeTypes.HAMMER).trackAllRecipes(); + compressedHammerRecipeCache = new SingleIngredientRecipeCache<>(recipes, ERecipeTypes.COMPRESSED_HAMMER).trackAllRecipes(); sieveRecipeCache = new SieveRecipeCache<>(recipes, ERecipeTypes.SIEVE); compressedSieveRecipeCache = new SieveRecipeCache<>(recipes, ERecipeTypes.COMPRESSED_SIEVE); barrelFluidMixingRecipeCache = new BarrelFluidMixingRecipeCache(recipes); @@ -106,6 +110,7 @@ public final class RecipeUtil { crookRecipeCache = new CrookRecipeCache(recipes); crucibleHeatRecipeCache = new CrucibleHeatRecipeCache(recipes); HammerItem.refreshValidBlocks(); + CompressedHammerItem.refreshValidBlocks(); } public static void unload() { @@ -113,6 +118,7 @@ public final class RecipeUtil { lavaCrucibleRecipeCache = null; waterCrucibleRecipeCache = null; hammerRecipeCache = null; + compressedHammerRecipeCache = null; sieveRecipeCache = null; barrelFluidMixingRecipeCache = null; fluidTransformationRecipeCache = null; @@ -152,6 +158,10 @@ public final class RecipeUtil { return hammerRecipeCache.getAllRecipes(); } + public static Collection getCachedCompressedHammerRecipes() { + return compressedHammerRecipeCache.getAllRecipes(); + } + public static > Collection byType(RecipeManager manager, RecipeType type) { return manager.byType(type).values(); } @@ -315,7 +325,6 @@ public final class RecipeUtil { return barrelCompostRecipeCache != null && barrelCompostRecipeCache.getRecipe(stack) != null; } - // todo stop using the RecipeManager @Nullable public static BarrelMixingRecipe getBarrelMixingRecipe(RecipeManager recipes, ItemStack stack, FluidStack fluid) { for (var recipe : byType(recipes, ERecipeTypes.BARREL_MIXING.get())) { diff --git a/src/main/java/thedarkcolour/exdeorum/recipe/hammer/CompressedHammerRecipe.java b/src/main/java/thedarkcolour/exdeorum/recipe/hammer/CompressedHammerRecipe.java new file mode 100644 index 00000000..2b697f4a --- /dev/null +++ b/src/main/java/thedarkcolour/exdeorum/recipe/hammer/CompressedHammerRecipe.java @@ -0,0 +1,51 @@ +/* + * Ex Deorum + * Copyright (c) 2024 thedarkcolour + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package thedarkcolour.exdeorum.recipe.hammer; + +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.item.crafting.RecipeSerializer; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.world.level.storage.loot.providers.number.NumberProvider; +import thedarkcolour.exdeorum.registry.ERecipeSerializers; +import thedarkcolour.exdeorum.registry.ERecipeTypes; + +public class CompressedHammerRecipe extends HammerRecipe { + public CompressedHammerRecipe(ResourceLocation id, Ingredient ingredient, Item result, NumberProvider resultAmount) { + super(id, ingredient, result, resultAmount); + } + + @Override + public RecipeSerializer getSerializer() { + return ERecipeSerializers.COMPRESSED_HAMMER.get(); + } + + @Override + public RecipeType getType() { + return ERecipeTypes.COMPRESSED_HAMMER.get(); + } + + public static class Serializer extends HammerRecipe.AbstractSerializer { + @Override + protected CompressedHammerRecipe createHammerRecipe(ResourceLocation id, Ingredient ingredient, Item result, NumberProvider resultAmount) { + return new CompressedHammerRecipe(id, ingredient, result, resultAmount); + } + } +} diff --git a/src/main/java/thedarkcolour/exdeorum/recipe/hammer/FinishedCompressedHammerRecipe.java b/src/main/java/thedarkcolour/exdeorum/recipe/hammer/FinishedCompressedHammerRecipe.java new file mode 100644 index 00000000..960771e5 --- /dev/null +++ b/src/main/java/thedarkcolour/exdeorum/recipe/hammer/FinishedCompressedHammerRecipe.java @@ -0,0 +1,37 @@ +/* + * Ex Deorum + * Copyright (c) 2024 thedarkcolour + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package thedarkcolour.exdeorum.recipe.hammer; + +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.item.crafting.RecipeSerializer; +import net.minecraft.world.level.storage.loot.providers.number.NumberProvider; +import thedarkcolour.exdeorum.registry.ERecipeSerializers; + +public class FinishedCompressedHammerRecipe extends FinishedHammerRecipe { + public FinishedCompressedHammerRecipe(ResourceLocation id, Ingredient ingredient, Item result, NumberProvider resultAmount) { + super(id, ingredient, result, resultAmount); + } + + @Override + public RecipeSerializer getType() { + return ERecipeSerializers.COMPRESSED_HAMMER.get(); + } +} diff --git a/src/main/java/thedarkcolour/exdeorum/recipe/hammer/HammerRecipe.java b/src/main/java/thedarkcolour/exdeorum/recipe/hammer/HammerRecipe.java index 265fe8d1..1c981c1b 100644 --- a/src/main/java/thedarkcolour/exdeorum/recipe/hammer/HammerRecipe.java +++ b/src/main/java/thedarkcolour/exdeorum/recipe/hammer/HammerRecipe.java @@ -49,11 +49,11 @@ public class HammerRecipe extends ProbabilityRecipe { return ERecipeTypes.HAMMER.get(); } - public static abstract class AbstractSerializer implements RecipeSerializer { - protected abstract HammerRecipe createHammerRecipe(ResourceLocation id, Ingredient ingredient, Item result, NumberProvider resultAmount); + public static abstract class AbstractSerializer implements RecipeSerializer { + protected abstract T createHammerRecipe(ResourceLocation id, Ingredient ingredient, Item result, NumberProvider resultAmount); @Override - public HammerRecipe fromJson(ResourceLocation name, JsonObject json) { + public T fromJson(ResourceLocation name, JsonObject json) { Ingredient ingredient = RecipeUtil.readIngredient(json, "ingredient"); Item result = RecipeUtil.readItem(json, "result"); NumberProvider resultAmount = RecipeUtil.readNumberProvider(json, "result_amount"); @@ -62,7 +62,7 @@ public class HammerRecipe extends ProbabilityRecipe { @Override @SuppressWarnings("deprecation") - public HammerRecipe fromNetwork(ResourceLocation name, FriendlyByteBuf buffer) { + public T fromNetwork(ResourceLocation name, FriendlyByteBuf buffer) { Ingredient ingredient = Ingredient.fromNetwork(buffer); Item result = Objects.requireNonNull(buffer.readById(BuiltInRegistries.ITEM)); NumberProvider resultAmount = RecipeUtil.fromNetworkNumberProvider(buffer); @@ -71,14 +71,14 @@ public class HammerRecipe extends ProbabilityRecipe { @Override @SuppressWarnings("deprecation") - public void toNetwork(FriendlyByteBuf buffer, HammerRecipe recipe) { + public void toNetwork(FriendlyByteBuf buffer, T recipe) { recipe.getIngredient().toNetwork(buffer); buffer.writeId(BuiltInRegistries.ITEM, recipe.result); RecipeUtil.toNetworkNumberProvider(buffer, recipe.resultAmount); } } - public static class Serializer extends AbstractSerializer { + public static class Serializer extends AbstractSerializer { @Override protected HammerRecipe createHammerRecipe(ResourceLocation id, Ingredient ingredient, Item result, NumberProvider resultAmount) { return new HammerRecipe(id, ingredient, result, resultAmount); diff --git a/src/main/java/thedarkcolour/exdeorum/registry/EItems.java b/src/main/java/thedarkcolour/exdeorum/registry/EItems.java index 33768eca..1cc3bcc2 100644 --- a/src/main/java/thedarkcolour/exdeorum/registry/EItems.java +++ b/src/main/java/thedarkcolour/exdeorum/registry/EItems.java @@ -70,6 +70,14 @@ public class EItems { public static final RegistryObject DIAMOND_HAMMER = ITEMS.register("diamond_hammer", () -> new HammerItem(Tiers.DIAMOND, props())); public static final RegistryObject NETHERITE_HAMMER = ITEMS.register("netherite_hammer", () -> new HammerItem(Tiers.NETHERITE, props())); + // Compressed Hammers + public static final RegistryObject WOODEN_COMPRESSED_HAMMER = ITEMS.register("wooden_compressed_hammer", () -> new CompressedHammerItem(Tiers.WOOD, props())); + public static final RegistryObject STONE_COMPRESSED_HAMMER = ITEMS.register("stone_compressed_hammer", () -> new CompressedHammerItem(Tiers.STONE, props())); + public static final RegistryObject GOLDEN_COMPRESSED_HAMMER = ITEMS.register("golden_compressed_hammer", () -> new CompressedHammerItem(Tiers.GOLD, props())); + public static final RegistryObject IRON_COMPRESSED_HAMMER = ITEMS.register("iron_compressed_hammer", () -> new CompressedHammerItem(Tiers.IRON, props())); + public static final RegistryObject DIAMOND_COMPRESSED_HAMMER = ITEMS.register("diamond_compressed_hammer", () -> new CompressedHammerItem(Tiers.DIAMOND, props())); + public static final RegistryObject NETHERITE_COMPRESSED_HAMMER = ITEMS.register("netherite_compressed_hammer", () -> new CompressedHammerItem(Tiers.NETHERITE, props())); + // Ore Chunks public static final RegistryObject IRON_ORE_CHUNK = registerSimpleItem("iron_ore_chunk"); public static final RegistryObject COPPER_ORE_CHUNK = registerSimpleItem("copper_ore_chunk"); @@ -224,6 +232,12 @@ public class EItems { output.accept(IRON_HAMMER.get()); output.accept(DIAMOND_HAMMER.get()); output.accept(NETHERITE_HAMMER.get()); + output.accept(WOODEN_COMPRESSED_HAMMER.get()); + output.accept(STONE_COMPRESSED_HAMMER.get()); + output.accept(GOLDEN_COMPRESSED_HAMMER.get()); + output.accept(IRON_COMPRESSED_HAMMER.get()); + output.accept(DIAMOND_COMPRESSED_HAMMER.get()); + output.accept(NETHERITE_COMPRESSED_HAMMER.get()); output.accept(IRON_ORE_CHUNK.get()); output.accept(COPPER_ORE_CHUNK.get()); output.accept(GOLD_ORE_CHUNK.get()); diff --git a/src/main/java/thedarkcolour/exdeorum/registry/ERecipeSerializers.java b/src/main/java/thedarkcolour/exdeorum/registry/ERecipeSerializers.java index 3d32caae..bbdb63da 100644 --- a/src/main/java/thedarkcolour/exdeorum/registry/ERecipeSerializers.java +++ b/src/main/java/thedarkcolour/exdeorum/registry/ERecipeSerializers.java @@ -31,6 +31,7 @@ import thedarkcolour.exdeorum.recipe.barrel.BarrelMixingRecipe; import thedarkcolour.exdeorum.recipe.crook.CrookRecipe; import thedarkcolour.exdeorum.recipe.crucible.CrucibleHeatRecipe; import thedarkcolour.exdeorum.recipe.crucible.CrucibleRecipe; +import thedarkcolour.exdeorum.recipe.hammer.CompressedHammerRecipe; import thedarkcolour.exdeorum.recipe.hammer.HammerRecipe; import thedarkcolour.exdeorum.recipe.sieve.CompressedSieveRecipe; import thedarkcolour.exdeorum.recipe.sieve.SieveRecipe; @@ -44,6 +45,7 @@ public class ERecipeSerializers { public static final RegistryObject> BARREL_FLUID_TRANSFORMATION = RECIPE_SERIALIZERS.register("barrel_fluid_transformation", FluidTransformationRecipe.Serializer::new); public static final RegistryObject> HAMMER = RECIPE_SERIALIZERS.register("hammer", HammerRecipe.Serializer::new); + public static final RegistryObject> COMPRESSED_HAMMER = RECIPE_SERIALIZERS.register("compressed_hammer", CompressedHammerRecipe.Serializer::new); public static final RegistryObject> CROOK = RECIPE_SERIALIZERS.register("crook", CrookRecipe.Serializer::new); public static final RegistryObject> CRUCIBLE_HEAT_SOURCE = RECIPE_SERIALIZERS.register("crucible_heat_source", CrucibleHeatRecipe.Serializer::new); diff --git a/src/main/java/thedarkcolour/exdeorum/registry/ERecipeTypes.java b/src/main/java/thedarkcolour/exdeorum/registry/ERecipeTypes.java index 8446e748..3c94a7e2 100644 --- a/src/main/java/thedarkcolour/exdeorum/registry/ERecipeTypes.java +++ b/src/main/java/thedarkcolour/exdeorum/registry/ERecipeTypes.java @@ -30,6 +30,7 @@ import thedarkcolour.exdeorum.recipe.barrel.BarrelMixingRecipe; import thedarkcolour.exdeorum.recipe.crook.CrookRecipe; import thedarkcolour.exdeorum.recipe.crucible.CrucibleHeatRecipe; import thedarkcolour.exdeorum.recipe.crucible.CrucibleRecipe; +import thedarkcolour.exdeorum.recipe.hammer.CompressedHammerRecipe; import thedarkcolour.exdeorum.recipe.hammer.HammerRecipe; import thedarkcolour.exdeorum.recipe.sieve.CompressedSieveRecipe; import thedarkcolour.exdeorum.recipe.sieve.SieveRecipe; @@ -46,6 +47,7 @@ public class ERecipeTypes { public static final RegistryObject> WATER_CRUCIBLE = RECIPE_TYPES.register("water_crucible", () -> RecipeType.simple(ERecipeTypes.WATER_CRUCIBLE.getId())); public static final RegistryObject> HAMMER = RECIPE_TYPES.register("hammer", () -> RecipeType.simple(ERecipeTypes.HAMMER.getId())); + public static final RegistryObject> COMPRESSED_HAMMER = RECIPE_TYPES.register("compressed_hammer", () -> RecipeType.simple(ERecipeTypes.COMPRESSED_SIEVE.getId())); public static final RegistryObject> CROOK = RECIPE_TYPES.register("crook", () -> RecipeType.simple(ERecipeTypes.CROOK.getId())); public static final RegistryObject> CRUCIBLE_HEAT_SOURCE = RECIPE_TYPES.register("crucible_heat_source", () -> RecipeType.simple(ERecipeTypes.CRUCIBLE_HEAT_SOURCE.getId())); From f11074d72e27c00b9c31c70f9eccb39f3ca62727 Mon Sep 17 00:00:00 2001 From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com> Date: Sat, 6 Apr 2024 20:02:11 -0700 Subject: [PATCH 2/2] Fully implement compressed hammer --- .../221483d9edeccdc82e726e39216c875f3fc356d3 | 23 ++- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 11 +- .../711e6e4ef0ec2176e93c58a9656c8098f7158439 | 4 +- .../93943142017732f21fbc4fa325d116c728b69767 | 4 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 131 +++++++++++++----- .../fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd | 17 ++- .../fc41039380e20c0de816b178c0dd0b68eb0f1d50 | 20 ++- .../blockstates/compressed_andesite.json | 7 + .../blockstates/compressed_blackstone.json | 7 + .../compressed_cobbled_deepslate.json | 7 + .../blockstates/compressed_cobblestone.json | 7 + .../blockstates/compressed_deepslate.json | 7 + .../blockstates/compressed_diorite.json | 7 + .../blockstates/compressed_end_stone.json | 7 + .../blockstates/compressed_granite.json | 7 + .../blockstates/compressed_netherrack.json | 7 + .../resources/assets/exdeorum/lang/en_us.json | 16 +++ .../models/block/compressed_andesite.json | 24 ++++ .../models/block/compressed_blackstone.json | 24 ++++ .../block/compressed_cobbled_deepslate.json | 24 ++++ .../models/block/compressed_cobblestone.json | 24 ++++ .../models/block/compressed_deepslate.json | 24 ++++ .../models/block/compressed_diorite.json | 24 ++++ .../models/block/compressed_end_stone.json | 24 ++++ .../models/block/compressed_granite.json | 24 ++++ .../models/block/compressed_netherrack.json | 24 ++++ .../models/item/compressed_andesite.json | 3 + .../models/item/compressed_blackstone.json | 3 + .../item/compressed_cobbled_deepslate.json | 3 + .../models/item/compressed_cobblestone.json | 3 + .../models/item/compressed_deepslate.json | 3 + .../item/compressed_diamond_hammer.json | 6 + .../models/item/compressed_diorite.json | 3 + .../models/item/compressed_end_stone.json | 3 + .../models/item/compressed_golden_hammer.json | 6 + .../models/item/compressed_granite.json | 3 + .../models/item/compressed_iron_hammer.json | 6 + .../item/compressed_netherite_hammer.json | 6 + .../models/item/compressed_netherrack.json | 3 + .../models/item/compressed_stone_hammer.json | 6 + .../models/item/compressed_wooden_hammer.json | 6 + .../building_blocks/compressed_sand.json | 35 ----- .../building_blocks/compressed_soul_sand.json | 35 ----- .../recipes/misc/acacia_compressed_sieve.json | 4 +- .../recipes/misc/birch_compressed_sieve.json | 4 +- .../recipes/misc/cherry_compressed_sieve.json | 4 +- .../misc/crimson_compressed_sieve.json | 4 +- .../misc/dark_oak_compressed_sieve.json | 4 +- .../recipes/misc/jungle_compressed_sieve.json | 4 +- .../misc/mangrove_compressed_sieve.json | 4 +- .../recipes/misc/oak_compressed_sieve.json | 4 +- .../recipes/misc/spruce_compressed_sieve.json | 4 +- .../recipes/misc/warped_compressed_sieve.json | 4 +- .../tools/compressed_diamond_hammer.json | 35 +++++ .../compressed_golden_hammer.json} | 6 +- .../compressed_iron_hammer.json} | 6 +- .../tools/compressed_netherite_hammer.json | 35 +++++ .../compressed_stone_hammer.json} | 6 +- .../compressed_wooden_hammer.json} | 6 +- .../blocks/compressed_andesite.json | 21 +++ .../blocks/compressed_blackstone.json | 21 +++ .../blocks/compressed_cobbled_deepslate.json | 21 +++ .../blocks/compressed_cobblestone.json | 21 +++ .../blocks/compressed_deepslate.json | 21 +++ .../blocks/compressed_diorite.json | 21 +++ .../blocks/compressed_end_stone.json | 21 +++ .../blocks/compressed_granite.json | 21 +++ .../blocks/compressed_netherrack.json | 21 +++ .../recipes/acacia_compressed_sieve.json | 2 +- .../recipes/birch_compressed_sieve.json | 2 +- .../blue_archwood_compressed_sieve.json | 37 +++++ .../recipes/bluebright_compressed_sieve.json | 37 +++++ .../recipes/cherry_compressed_sieve.json | 2 +- .../recipes/comet_compressed_sieve.json | 37 +++++ .../exdeorum/recipes/compressed_andesite.json | 41 ++++++ .../recipes/compressed_blackstone.json | 34 +++++ .../recipes/compressed_cobbled_deepslate.json | 34 +++++ .../recipes/compressed_cobblestone.json | 41 ++++++ .../recipes/compressed_deepslate.json | 34 +++++ .../recipes/compressed_diamond_hammer.json | 18 +++ .../exdeorum/recipes/compressed_diorite.json | 41 ++++++ .../exdeorum/recipes/compressed_dirt.json | 53 +++++-- .../recipes/compressed_end_stone.json | 34 +++++ .../recipes/compressed_golden_hammer.json | 18 +++ .../exdeorum/recipes/compressed_granite.json | 41 ++++++ .../exdeorum/recipes/compressed_gravel.json | 53 +++++-- .../compressed_hammer/crushed_blackstone.json | 8 ++ .../compressed_hammer/crushed_deepslate.json | 13 ++ .../compressed_hammer/crushed_end_stone.json | 8 ++ .../compressed_hammer/crushed_netherrack.json | 8 ++ .../recipes/compressed_hammer/dust.json | 8 ++ .../recipes/compressed_hammer/gravel.json | 19 +++ .../recipes/compressed_hammer/red_sand.json | 8 ++ .../recipes/compressed_hammer/sand.json | 8 ++ .../recipes/compressed_iron_hammer.json | 18 +++ .../recipes/compressed_moss_block.json | 46 ++++-- .../recipes/compressed_netherite_hammer.json | 18 +++ .../recipes/compressed_netherrack.json | 41 ++++++ .../exdeorum/recipes/compressed_red_sand.json | 53 +++++-- .../exdeorum/recipes/compressed_sand.json | 53 +++++-- .../recipes/compressed_soul_sand.json | 53 +++++-- .../recipes/compressed_stone_hammer.json | 18 +++ .../recipes/compressed_wooden_hammer.json | 18 +++ .../recipes/crimson_compressed_sieve.json | 2 +- .../crystallized_compressed_sieve.json | 37 +++++ .../recipes/dark_oak_compressed_sieve.json | 2 +- .../recipes/dead_compressed_sieve.json | 37 +++++ .../recipes/dusk_compressed_sieve.json | 37 +++++ .../recipes/fir_compressed_sieve.json | 37 +++++ .../recipes/frostbright_compressed_sieve.json | 37 +++++ .../recipes/golden_oak_compressed_sieve.json | 37 +++++ .../green_archwood_compressed_sieve.json | 37 +++++ .../recipes/hellbark_compressed_sieve.json | 37 +++++ .../recipes/jacaranda_compressed_sieve.json | 37 +++++ .../recipes/jungle_compressed_sieve.json | 2 +- .../recipes/lunar_compressed_sieve.json | 37 +++++ .../recipes/magic_compressed_sieve.json | 37 +++++ .../recipes/mahogany_compressed_sieve.json | 37 +++++ .../recipes/mangrove_compressed_sieve.json | 2 +- .../recipes/maple_compressed_sieve.json | 37 +++++ .../recipes/oak_compressed_sieve.json | 2 +- .../recipes/palm_compressed_sieve.json | 37 +++++ .../purple_archwood_compressed_sieve.json | 37 +++++ .../red_archwood_compressed_sieve.json | 37 +++++ .../recipes/redwood_compressed_sieve.json | 37 +++++ .../recipes/skyroot_compressed_sieve.json | 37 +++++ .../recipes/spruce_compressed_sieve.json | 2 +- .../recipes/starlit_compressed_sieve.json | 37 +++++ .../recipes/umbran_compressed_sieve.json | 37 +++++ .../recipes/warped_compressed_sieve.json | 2 +- .../recipes/willow_compressed_sieve.json | 37 +++++ .../tags/items/compressed/andesite.json | 13 ++ .../tags/items/compressed/blackstone.json | 9 ++ .../items/compressed/cobbled_deepslate.json | 9 ++ .../tags/items/compressed/cobblestone.json | 17 +++ .../tags/items/compressed/deepslate.json | 9 ++ .../tags/items/compressed/diorite.json | 13 ++ .../exdeorum/tags/items/compressed/dirt.json | 4 + .../tags/items/compressed/end_stone.json | 9 ++ .../tags/items/compressed/granite.json | 13 ++ .../tags/items/compressed/gravel.json | 4 + .../tags/items/compressed/netherrack.json | 13 ++ .../tags/items/compressed/red_sand.json | 4 + .../exdeorum/tags/items/compressed/sand.json | 4 + .../exdeorum/tags/items/compressed/sands.json | 6 + .../tags/items/compressed/soul_sand.json | 4 + .../tags/items/compressed_hammers.json | 10 ++ .../andesite_from_compressed_andesite.json | 35 +++++ ...blackstone_from_compressed_blackstone.json | 35 +++++ ...ate_from_compressed_cobbled_deepslate.json | 35 +++++ ...bblestone_from_compressed_cobblestone.json | 35 +++++ .../deepslate_from_compressed_deepslate.json | 35 +++++ .../misc/diorite_from_compressed_diorite.json | 35 +++++ .../end_stone_from_compressed_end_stone.json | 35 +++++ .../misc/granite_from_compressed_granite.json | 35 +++++ ...netherrack_from_compressed_netherrack.json | 35 +++++ .../andesite_from_compressed_andesite.json | 13 ++ ...blackstone_from_compressed_blackstone.json | 13 ++ ...ate_from_compressed_cobbled_deepslate.json | 13 ++ ...bblestone_from_compressed_cobblestone.json | 13 ++ .../deepslate_from_compressed_deepslate.json | 13 ++ .../diorite_from_compressed_diorite.json | 13 ++ .../end_stone_from_compressed_end_stone.json | 13 ++ .../granite_from_compressed_granite.json | 13 ++ ...netherrack_from_compressed_netherrack.json | 13 ++ .../tags/blocks/mineable/pickaxe.json | 11 +- .../exdeorum/block/CompressedBlockType.java | 102 ++++++++++++++ .../thedarkcolour/exdeorum/compat/ModIds.java | 1 + .../compat/jei/ExDeorumJeiPlugin.java | 15 +- .../exdeorum/compat/jei/HammerCategory.java | 13 +- .../exdeorum/data/BlockModels.java | 15 +- .../thedarkcolour/exdeorum/data/English.java | 1 + .../exdeorum/data/ModCompatData.java | 18 --- .../thedarkcolour/exdeorum/data/ModTags.java | 47 ++++--- .../exdeorum/data/TranslationKeys.java | 1 + .../exdeorum/data/recipe/Recipes.java | 85 +++++++++--- .../exdeorum/data/recipe/SieveRecipes.java | 23 +-- .../exdeorum/item/CompressedHammerItem.java | 2 +- .../loot/CompressedHammerLootModifier.java | 47 +++++++ .../exdeorum/loot/HammerLootModifier.java | 13 +- .../exdeorum/recipe/RecipeUtil.java | 5 + .../exdeorum/registry/EBlocks.java | 24 +--- .../exdeorum/registry/ECompressedBlocks.java | 70 ++++++++++ .../registry/EGlobalLootModifiers.java | 2 + .../exdeorum/registry/EItems.java | 67 +++++---- .../thedarkcolour/exdeorum/tag/EItemTags.java | 15 +- .../item/compressed_diamond_hammer.png | Bin 0 -> 271 bytes .../item/compressed_golden_hammer.png | Bin 0 -> 271 bytes .../textures/item/compressed_iron_hammer.png | Bin 0 -> 271 bytes .../item/compressed_netherite_hammer.png | Bin 0 -> 278 bytes .../textures/item/compressed_stone_hammer.png | Bin 0 -> 271 bytes .../item/compressed_wooden_hammer.png | Bin 0 -> 273 bytes .../loot_modifiers/compressed_hammer.json | 19 ++- .../data/exdeorum/loot_modifiers/hammer.json | 1 - .../loot_modifiers/global_loot_modifiers.json | 3 +- 195 files changed, 3475 insertions(+), 407 deletions(-) create mode 100644 src/generated/resources/assets/exdeorum/blockstates/compressed_andesite.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/compressed_blackstone.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/compressed_cobbled_deepslate.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/compressed_cobblestone.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/compressed_deepslate.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/compressed_diorite.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/compressed_end_stone.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/compressed_granite.json create mode 100644 src/generated/resources/assets/exdeorum/blockstates/compressed_netherrack.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/compressed_andesite.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/compressed_blackstone.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/compressed_cobbled_deepslate.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/compressed_cobblestone.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/compressed_deepslate.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/compressed_diorite.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/compressed_end_stone.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/compressed_granite.json create mode 100644 src/generated/resources/assets/exdeorum/models/block/compressed_netherrack.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/compressed_andesite.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/compressed_blackstone.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/compressed_cobbled_deepslate.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/compressed_cobblestone.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/compressed_deepslate.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/compressed_diamond_hammer.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/compressed_diorite.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/compressed_end_stone.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/compressed_golden_hammer.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/compressed_granite.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/compressed_iron_hammer.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/compressed_netherite_hammer.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/compressed_netherrack.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/compressed_stone_hammer.json create mode 100644 src/generated/resources/assets/exdeorum/models/item/compressed_wooden_hammer.json delete mode 100644 src/generated/resources/data/exdeorum/advancements/recipes/building_blocks/compressed_sand.json delete mode 100644 src/generated/resources/data/exdeorum/advancements/recipes/building_blocks/compressed_soul_sand.json create mode 100644 src/generated/resources/data/exdeorum/advancements/recipes/tools/compressed_diamond_hammer.json rename src/generated/resources/data/exdeorum/advancements/recipes/{building_blocks/compressed_moss_block.json => tools/compressed_golden_hammer.json} (79%) rename src/generated/resources/data/exdeorum/advancements/recipes/{building_blocks/compressed_dirt.json => tools/compressed_iron_hammer.json} (79%) create mode 100644 src/generated/resources/data/exdeorum/advancements/recipes/tools/compressed_netherite_hammer.json rename src/generated/resources/data/exdeorum/advancements/recipes/{building_blocks/compressed_gravel.json => tools/compressed_stone_hammer.json} (79%) rename src/generated/resources/data/exdeorum/advancements/recipes/{building_blocks/compressed_red_sand.json => tools/compressed_wooden_hammer.json} (79%) create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_andesite.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_blackstone.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_cobbled_deepslate.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_cobblestone.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_deepslate.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_diorite.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_end_stone.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_granite.json create mode 100644 src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_netherrack.json create mode 100644 src/generated/resources/data/exdeorum/recipes/blue_archwood_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/bluebright_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/comet_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_andesite.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_blackstone.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_cobbled_deepslate.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_cobblestone.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_deepslate.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_diamond_hammer.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_diorite.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_end_stone.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_golden_hammer.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_granite.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_hammer/crushed_blackstone.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_hammer/crushed_deepslate.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_hammer/crushed_end_stone.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_hammer/crushed_netherrack.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_hammer/dust.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_hammer/gravel.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_hammer/red_sand.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_hammer/sand.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_iron_hammer.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_netherite_hammer.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_netherrack.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_stone_hammer.json create mode 100644 src/generated/resources/data/exdeorum/recipes/compressed_wooden_hammer.json create mode 100644 src/generated/resources/data/exdeorum/recipes/crystallized_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/dead_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/dusk_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/fir_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/frostbright_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/golden_oak_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/green_archwood_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/hellbark_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/jacaranda_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/lunar_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/magic_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/mahogany_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/maple_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/palm_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/purple_archwood_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/red_archwood_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/redwood_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/skyroot_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/starlit_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/umbran_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/recipes/willow_compressed_sieve.json create mode 100644 src/generated/resources/data/exdeorum/tags/items/compressed/andesite.json create mode 100644 src/generated/resources/data/exdeorum/tags/items/compressed/blackstone.json create mode 100644 src/generated/resources/data/exdeorum/tags/items/compressed/cobbled_deepslate.json create mode 100644 src/generated/resources/data/exdeorum/tags/items/compressed/cobblestone.json create mode 100644 src/generated/resources/data/exdeorum/tags/items/compressed/deepslate.json create mode 100644 src/generated/resources/data/exdeorum/tags/items/compressed/diorite.json create mode 100644 src/generated/resources/data/exdeorum/tags/items/compressed/end_stone.json create mode 100644 src/generated/resources/data/exdeorum/tags/items/compressed/granite.json create mode 100644 src/generated/resources/data/exdeorum/tags/items/compressed/netherrack.json create mode 100644 src/generated/resources/data/exdeorum/tags/items/compressed/sands.json create mode 100644 src/generated/resources/data/exdeorum/tags/items/compressed_hammers.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/misc/andesite_from_compressed_andesite.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/misc/blackstone_from_compressed_blackstone.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/misc/cobbled_deepslate_from_compressed_cobbled_deepslate.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/misc/cobblestone_from_compressed_cobblestone.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/misc/deepslate_from_compressed_deepslate.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/misc/diorite_from_compressed_diorite.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/misc/end_stone_from_compressed_end_stone.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/misc/granite_from_compressed_granite.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/misc/netherrack_from_compressed_netherrack.json create mode 100644 src/generated/resources/data/minecraft/recipes/andesite_from_compressed_andesite.json create mode 100644 src/generated/resources/data/minecraft/recipes/blackstone_from_compressed_blackstone.json create mode 100644 src/generated/resources/data/minecraft/recipes/cobbled_deepslate_from_compressed_cobbled_deepslate.json create mode 100644 src/generated/resources/data/minecraft/recipes/cobblestone_from_compressed_cobblestone.json create mode 100644 src/generated/resources/data/minecraft/recipes/deepslate_from_compressed_deepslate.json create mode 100644 src/generated/resources/data/minecraft/recipes/diorite_from_compressed_diorite.json create mode 100644 src/generated/resources/data/minecraft/recipes/end_stone_from_compressed_end_stone.json create mode 100644 src/generated/resources/data/minecraft/recipes/granite_from_compressed_granite.json create mode 100644 src/generated/resources/data/minecraft/recipes/netherrack_from_compressed_netherrack.json create mode 100644 src/main/java/thedarkcolour/exdeorum/block/CompressedBlockType.java create mode 100644 src/main/java/thedarkcolour/exdeorum/loot/CompressedHammerLootModifier.java create mode 100644 src/main/java/thedarkcolour/exdeorum/registry/ECompressedBlocks.java create mode 100644 src/main/resources/assets/exdeorum/textures/item/compressed_diamond_hammer.png create mode 100644 src/main/resources/assets/exdeorum/textures/item/compressed_golden_hammer.png create mode 100644 src/main/resources/assets/exdeorum/textures/item/compressed_iron_hammer.png create mode 100644 src/main/resources/assets/exdeorum/textures/item/compressed_netherite_hammer.png create mode 100644 src/main/resources/assets/exdeorum/textures/item/compressed_stone_hammer.png create mode 100644 src/main/resources/assets/exdeorum/textures/item/compressed_wooden_hammer.png diff --git a/src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3 b/src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3 index 333d86b2..0304c543 100644 --- a/src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3 +++ b/src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3 @@ -1,16 +1,27 @@ -// 1.20.1 2024-03-23T14:02:41.4025399 Tags for minecraft:item mod id exdeorum +// 1.20.1 2024-04-06T19:42:13.2636741 Tags for minecraft:item mod id exdeorum 6c72957356b1d59a27be736fa1da54a5a9795ef7 data/exdeorum/tags/items/barrels.json +6afa16b45f76c0defa1675d07586e2c6e6b0be69 data/exdeorum/tags/items/compressed/andesite.json +31b46613766e4cdc53196850495ab1019f61cb48 data/exdeorum/tags/items/compressed/blackstone.json +241fb4154cfac70be491c9f8789b4aef7f8bdeaf data/exdeorum/tags/items/compressed/cobbled_deepslate.json +f181b77f0646ffa6e081251c5bb6f95c16820c32 data/exdeorum/tags/items/compressed/cobblestone.json cc7cee07f9fa87bf7fbc0fd5b4df7a3244bbf680 data/exdeorum/tags/items/compressed/crushed_blackstone.json e58dd8e5f1f5cb2c41668d4cb4ce1db72143c2b8 data/exdeorum/tags/items/compressed/crushed_deepslate.json ef7e37e3485ee372cd2694f600aaa9344d9fc367 data/exdeorum/tags/items/compressed/crushed_end_stone.json aa975842d0be23880ff7da7db82834399ec12f51 data/exdeorum/tags/items/compressed/crushed_netherrack.json -ff59212998df057f20208252c9432dfe824c5b93 data/exdeorum/tags/items/compressed/dirt.json +816a2366b97ed96df3f28964010dcce93fa4704c data/exdeorum/tags/items/compressed/deepslate.json +91e5dcaf660df8a6f0fcf9fd511e5bc6c9e4b242 data/exdeorum/tags/items/compressed/diorite.json +19acb0b43e4b234ba97720ead3edcd9f9bc8eb52 data/exdeorum/tags/items/compressed/dirt.json 6ab1d13f60054975647d63ba73cfbaeffbac3277 data/exdeorum/tags/items/compressed/dust.json -8f67a58aa43d6b80f47e94a6b56a8ab8434c9cf5 data/exdeorum/tags/items/compressed/gravel.json +c90c72293f2b2c6375e827010f1b10bc96310ffd data/exdeorum/tags/items/compressed/end_stone.json +73574cc72476b53160760644b77300f854509a12 data/exdeorum/tags/items/compressed/granite.json +629a309119dd42068ed4edd74bb9cd69a5c7990c data/exdeorum/tags/items/compressed/gravel.json faaac47fa919125335614c875ffc220e737977bc data/exdeorum/tags/items/compressed/moss_block.json -32749540e9055fb7f1153c84486747ba4ea3a6e4 data/exdeorum/tags/items/compressed/red_sand.json -ec11bf0ea816e15a35082c5d935b0865c8260f9e data/exdeorum/tags/items/compressed/sand.json -7a86fc912a7e9665d238b96b30f0fff96c905919 data/exdeorum/tags/items/compressed/soul_sand.json +bb17667dfb3fc023a80ca4ef0a96ed41545f6029 data/exdeorum/tags/items/compressed/netherrack.json +fc279d9fa656ad00c5504b3f313586ca34fc4477 data/exdeorum/tags/items/compressed/red_sand.json +34876a108ba8da4125a273e83324dbb4685618a1 data/exdeorum/tags/items/compressed/sand.json +2de46f3e2e91a340f1b71ea5b600f8383a7ce875 data/exdeorum/tags/items/compressed/sands.json +874b33131f557d077ab366fc6506c41369151a40 data/exdeorum/tags/items/compressed/soul_sand.json +dad00c75d1a0b74a2f843bead336ee278e9cecba data/exdeorum/tags/items/compressed_hammers.json 5feb54ce68fa657af5ce696f75b8c7a6d04cc7a7 data/exdeorum/tags/items/crooks.json 74eefeb986d633d26ad42202c4a6b5e71463c425 data/exdeorum/tags/items/end_cake_materials.json be46bf2abe731d5ee5bd15ce72f222b2b9a49385 data/exdeorum/tags/items/hammers.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 2efe5c3a..4f46dab9 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.20.1 2024-03-24T13:45:21.3656208 Loot Tables +// 1.20.1 2024-04-06T12:34:19.1629579 Loot Tables 105d8a61ea7145d7798146d385d4aad24fd1588d data/exdeorum/loot_tables/blocks/acacia_barrel.json 83d50cbd5e45dfa72bf102fd4c0103a388cff9c4 data/exdeorum/loot_tables/blocks/acacia_compressed_sieve.json 1e77127a82cbba0937bb02694f65cf1893aeffcb data/exdeorum/loot_tables/blocks/acacia_crucible.json @@ -27,14 +27,23 @@ d27d5d53011436ca54dd604846ce467a9e857aef data/exdeorum/loot_tables/blocks/bluebr 6a8b5787991a5f75c34902b180e80af6ad50429b data/exdeorum/loot_tables/blocks/comet_compressed_sieve.json 8f2d837af622df791fefe3a981a35a6243f1252e data/exdeorum/loot_tables/blocks/comet_crucible.json 9ed892d74409a4bbb41f4f277a7fdf9c58a5e011 data/exdeorum/loot_tables/blocks/comet_sieve.json +fc2ca675c56f0bb72a9105281213d03e3c6be523 data/exdeorum/loot_tables/blocks/compressed_andesite.json +e4451d1873f5d58ea0306d98e6a4eadcfc7d4a36 data/exdeorum/loot_tables/blocks/compressed_blackstone.json +fb73c431b37207abfdbd09ea9f31a2ebe15862ca data/exdeorum/loot_tables/blocks/compressed_cobbled_deepslate.json +75e58d8b536d12695b865a199ba42b2514489082 data/exdeorum/loot_tables/blocks/compressed_cobblestone.json 385dd21f01f94b5c9779d0175ed7c55c6293f6fa data/exdeorum/loot_tables/blocks/compressed_crushed_blackstone.json afa390561ea6064beb9d3cbfe3d0e38d77874aa8 data/exdeorum/loot_tables/blocks/compressed_crushed_deepslate.json 55f3ec691a9781e3a78247ad2fe6ed62f56b4003 data/exdeorum/loot_tables/blocks/compressed_crushed_end_stone.json a88d8bfe8fd5709cdac242398c76778ace96b396 data/exdeorum/loot_tables/blocks/compressed_crushed_netherrack.json +a28d6030f130c94099d1bfae1768da79b09bb16b data/exdeorum/loot_tables/blocks/compressed_deepslate.json +2b8077667c55f8c286295aec253f5e5b08bb01a5 data/exdeorum/loot_tables/blocks/compressed_diorite.json 8f63eb222b96fcbc203cacb41a9d060bdf26da4c data/exdeorum/loot_tables/blocks/compressed_dirt.json e41e003ce25de576f2e7b8b2219a81aab18c937b data/exdeorum/loot_tables/blocks/compressed_dust.json +a11f4a96d36ca342ec42c90026028d2b146d5802 data/exdeorum/loot_tables/blocks/compressed_end_stone.json +76f7d221ee6901c658957b67dab3fb390be75aff data/exdeorum/loot_tables/blocks/compressed_granite.json c94e5720fa4d0f32dd020af0d0de93d3d00f8694 data/exdeorum/loot_tables/blocks/compressed_gravel.json 747f0c4b06fffdde042371b3bc1e007e12a48358 data/exdeorum/loot_tables/blocks/compressed_moss_block.json +bc67108510d9d23556b5391e54c8330af29f9a6b data/exdeorum/loot_tables/blocks/compressed_netherrack.json 8fc4f6d575f3b928361cd30e8b9bff56d3f2d46b data/exdeorum/loot_tables/blocks/compressed_red_sand.json 02cefa46c308728b57a2ea98c46d4dcf61af7d16 data/exdeorum/loot_tables/blocks/compressed_sand.json eac0516f45763b43fc30b56f36447ac52bd16e9e data/exdeorum/loot_tables/blocks/compressed_soul_sand.json diff --git a/src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 b/src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 index f86d570a..77cb3afe 100644 --- a/src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 +++ b/src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 @@ -1,7 +1,7 @@ -// 1.20.1 2024-03-24T15:00:28.1731531 Tags for minecraft:block mod id exdeorum +// 1.20.1 2024-04-06T19:42:13.2566754 Tags for minecraft:block mod id exdeorum 77dfab311d3714c77bcac2df0397d23d4707f03b data/exdeorum/tags/blocks/watering_can_tickable.json f6a9610ebae09549baf17e27200037cd17318055 data/minecraft/tags/blocks/leaves.json 133e5ec65e3916d03320a67e2f4a475188028d08 data/minecraft/tags/blocks/mineable/axe.json 6eacf4b84abd2ad9b9671966c74f22d02d8208d6 data/minecraft/tags/blocks/mineable/hoe.json -1193daf0dafc5f481e1e47528d89e59876e2ce7b data/minecraft/tags/blocks/mineable/pickaxe.json +ef50fd58cd0831ca14958819cfb6af97d4dabee8 data/minecraft/tags/blocks/mineable/pickaxe.json 7a2ffab44cdf6dca9d9c3a0f3a610d2af88700bf data/minecraft/tags/blocks/mineable/shovel.json diff --git a/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 b/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 index f470a2e2..352a5e6f 100644 --- a/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 +++ b/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 @@ -1,2 +1,2 @@ -// 1.20.1 2024-03-24T13:45:21.353088 ModKit Language: en_us for mod 'exdeorum' -5e6a83850878d393c5ca110eb4e47fe760b12046 assets/exdeorum/lang/en_us.json +// 1.20.1 2024-04-06T13:10:03.6022487 ModKit Language: en_us for mod 'exdeorum' +4b68dbaeed3f208ea57105e1c24d1284ed62ebae assets/exdeorum/lang/en_us.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index d36ab56d..9dbe647d 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,19 +1,13 @@ -// 1.20.1 2024-03-24T13:45:21.3687434 Recipes +// 1.20.1 2024-04-06T19:57:06.8812402 Recipes 825a24c8f9f1feb2d92e9a5d43b4445275f98a4d data/exdeorum/advancements/recipes/building_blocks/compressed_crushed_blackstone.json ee98248148569129e0d4e14d7de03108e51a6dac data/exdeorum/advancements/recipes/building_blocks/compressed_crushed_deepslate.json b7ee636abe5154ab8bb5a6ad5cde13ea8375ae3e data/exdeorum/advancements/recipes/building_blocks/compressed_crushed_end_stone.json 1580f56582dcab38a4e015e35bd2a8d4c0090948 data/exdeorum/advancements/recipes/building_blocks/compressed_crushed_netherrack.json -5035f15e15d9a2b567d7470d5d423fda06ba8396 data/exdeorum/advancements/recipes/building_blocks/compressed_dirt.json 780f6911e8e6fd9a6b3674af3762d9d8414714cd data/exdeorum/advancements/recipes/building_blocks/compressed_dust.json -842a9b7fbb38972b4311e9decf8f341886e22ae8 data/exdeorum/advancements/recipes/building_blocks/compressed_gravel.json -72c205f15bc05f6602c23db97885a4e2ed8803de data/exdeorum/advancements/recipes/building_blocks/compressed_moss_block.json -74e239473b011154f22c01a72248e99cae2b0fa1 data/exdeorum/advancements/recipes/building_blocks/compressed_red_sand.json -aec2a09ee6e9ba7eba26be32b168f0cff1866e99 data/exdeorum/advancements/recipes/building_blocks/compressed_sand.json -bca5a2f6285dd5ce68e3815266f7c5659b2ea6c0 data/exdeorum/advancements/recipes/building_blocks/compressed_soul_sand.json e37b64428f17e304e91539ac0513456d7ce40cd1 data/exdeorum/advancements/recipes/building_blocks/sponge.json 5ad481a0c376c1a1785a5d3b992064d0ec0bf3b0 data/exdeorum/advancements/recipes/food/end_cake.json 25dd027e844a72b03c95dbe5e3c3dd8c738ceb00 data/exdeorum/advancements/recipes/misc/acacia_barrel.json -f3b11319161583fdf6ef7795b315335afd3aeee2 data/exdeorum/advancements/recipes/misc/acacia_compressed_sieve.json +ddf7ea622893baf78483ce13fac05d6a2229d9d3 data/exdeorum/advancements/recipes/misc/acacia_compressed_sieve.json 376be94a64c9ca97a9ea2346547b6e617f13a815 data/exdeorum/advancements/recipes/misc/acacia_crucible.json 86b1150c5bede51c643602bf2b574428ff10ed9a data/exdeorum/advancements/recipes/misc/acacia_sieve.json 4a6a48c32915239e2e3ad4a667c2f2b6e7819234 data/exdeorum/advancements/recipes/misc/andesite.json @@ -23,13 +17,13 @@ a5a98b6bf3ee6e3d3c173342454f05a8ae061d65 data/exdeorum/advancements/recipes/misc eb51378747bee8387f0fb657b7e9ce61a92a285d data/exdeorum/advancements/recipes/misc/bamboo_sieve.json 34576270f5e6851b4a33c917191cc2cc27a9d11c data/exdeorum/advancements/recipes/misc/basalt.json 46f4cf0e15aca426d44f5e76372fdf806db53e5a data/exdeorum/advancements/recipes/misc/birch_barrel.json -beb3fa978ead5733334e26d5e830ea79416d8fd8 data/exdeorum/advancements/recipes/misc/birch_compressed_sieve.json +5085002fcdea233e09d9079fa05086ca68ef1209 data/exdeorum/advancements/recipes/misc/birch_compressed_sieve.json b58090f1a1dec665f11024e4d7774a53f3e4392c data/exdeorum/advancements/recipes/misc/birch_crucible.json 649b99631b50123d3543581665fd266f003cfb5e data/exdeorum/advancements/recipes/misc/birch_sieve.json 0ca623bad0741401dfc32f18e7937123c0053386 data/exdeorum/advancements/recipes/misc/blackstone.json cc58d4d52bc2c4f0cedc498fb3d9a6bda1fa5ae5 data/exdeorum/advancements/recipes/misc/calcite.json fe4ae2d53dd076fc967a62ede6fff78ed8e460ad data/exdeorum/advancements/recipes/misc/cherry_barrel.json -4edfecc58ec691cc9d777a163965e2c969f197a5 data/exdeorum/advancements/recipes/misc/cherry_compressed_sieve.json +9964e6d065684b40da925e1c73012f9bb1149acc data/exdeorum/advancements/recipes/misc/cherry_compressed_sieve.json 78ab62bb7b76699615b5dce962945ff704c866a4 data/exdeorum/advancements/recipes/misc/cherry_crucible.json f5cc5cff25906891478e0f4d3b188f3769735f73 data/exdeorum/advancements/recipes/misc/cherry_sieve.json 9787797e5d5a36780a7548b576fd76e96c262710 data/exdeorum/advancements/recipes/misc/cobbled_deepslate.json @@ -39,7 +33,7 @@ dbee171562739e3ab561da0bf52a8566c383c1c2 data/exdeorum/advancements/recipes/misc 8d39730c76983574ba84d5b0a9a6c02783b5de06 data/exdeorum/advancements/recipes/misc/cooked_silk_worm_from_smoking.json a113ba4101974ad78c3ecfd3b29b129579183e23 data/exdeorum/advancements/recipes/misc/copper_ore.json c35a2f9e0a97888cfa35cd07f365ae60b2de4b68 data/exdeorum/advancements/recipes/misc/crimson_barrel.json -ddda0ddd49767e5d3fad019c737210749f57ddec data/exdeorum/advancements/recipes/misc/crimson_compressed_sieve.json +27852e44f9f7cb2d3b4c12a5bf84f5c5ad00d97c data/exdeorum/advancements/recipes/misc/crimson_compressed_sieve.json d36191b13459b513f67e09a00f26dd79317b5d96 data/exdeorum/advancements/recipes/misc/crimson_crucible.json cf30753819f21a29082554871fa4617a060eb11c data/exdeorum/advancements/recipes/misc/crimson_sieve.json bfb4f007653197b80db2a0ffa6c431c891c0931b data/exdeorum/advancements/recipes/misc/crushed_blackstone_from_compressed_crushed_blackstone.json @@ -47,7 +41,7 @@ e9649f718593d7517ae027e16573afd74ac0b873 data/exdeorum/advancements/recipes/misc 6e8e6c72321377f367ab9f7b3dde6bf407896892 data/exdeorum/advancements/recipes/misc/crushed_end_stone_from_compressed_crushed_end_stone.json d4884fcdf44ec68f6dcc01af6abbf6f925e52985 data/exdeorum/advancements/recipes/misc/crushed_netherrack_from_compressed_crushed_netherrack.json 21c64e319bcd1468eb05aaee89505fbf570273d0 data/exdeorum/advancements/recipes/misc/dark_oak_barrel.json -1a35f38d528f25dd40b405acf037ed61660e1f55 data/exdeorum/advancements/recipes/misc/dark_oak_compressed_sieve.json +859c15f6d1e2851bb8efdaeb9db17b5bd21cf011 data/exdeorum/advancements/recipes/misc/dark_oak_compressed_sieve.json 6fa805a246c424ea651fff9003e11f3c8632cd3c data/exdeorum/advancements/recipes/misc/dark_oak_crucible.json ce387be36edacdb259a5ea4564ad4b14ccec7950 data/exdeorum/advancements/recipes/misc/dark_oak_sieve.json 05ed034071a2c7df228c235fa1104052aca23ebc data/exdeorum/advancements/recipes/misc/diamond_mesh.json @@ -64,11 +58,11 @@ f3d25fad0818f06ed341008daa157732a41702f0 data/exdeorum/advancements/recipes/misc 2bc30374479baadb359411edd929ebf0fb1e9a37 data/exdeorum/advancements/recipes/misc/iron_mesh_from_flint_mesh.json 2f2e4e3f4893390b7248a1fd9fd405d628aaa69c data/exdeorum/advancements/recipes/misc/iron_ore.json 13ae44cb8da590953fc295c730e3606ab8c8ef7e data/exdeorum/advancements/recipes/misc/jungle_barrel.json -8d48bfac82621d8daea27efe23d6809165a3cc1f data/exdeorum/advancements/recipes/misc/jungle_compressed_sieve.json +d8a3fb6fac436be0629e4d85318a665d7c381057 data/exdeorum/advancements/recipes/misc/jungle_compressed_sieve.json 4e23fd62963a608c73565d61966cd700537b48a7 data/exdeorum/advancements/recipes/misc/jungle_crucible.json 3bd0ba3d3e51aff232087d325270f1c07c9e9e9d data/exdeorum/advancements/recipes/misc/jungle_sieve.json ef344cd03adefba1ff628f494569cb1e61ff5a5f data/exdeorum/advancements/recipes/misc/mangrove_barrel.json -6df2b41dce12dc0871d60796d1071586b6ce150e data/exdeorum/advancements/recipes/misc/mangrove_compressed_sieve.json +7d3e3a2e24e0bce4cd6dc6cb006af4107c786c55 data/exdeorum/advancements/recipes/misc/mangrove_compressed_sieve.json a4325e653eba3a2cd86fa5055414c0b8f391d80d data/exdeorum/advancements/recipes/misc/mangrove_crucible.json 47657db106b7291a5fc2ebf281daa03dc7ec71c0 data/exdeorum/advancements/recipes/misc/mangrove_sieve.json 9073425076ced5fc311a87ebb614669bb680d715 data/exdeorum/advancements/recipes/misc/mechanical_hammer.json @@ -76,7 +70,7 @@ a4325e653eba3a2cd86fa5055414c0b8f391d80d data/exdeorum/advancements/recipes/misc 8cde46d6245da58277653bb9877518f099150e3d data/exdeorum/advancements/recipes/misc/moss_block.json a21315f6c45ed3300ae2dd79b1dbdbecce9d1305 data/exdeorum/advancements/recipes/misc/netherite_mesh.json d85bf493287a94e61ee13f713625b3dec0624706 data/exdeorum/advancements/recipes/misc/oak_barrel.json -87b504a8da7857be764cad2fa67c411a26b2cbd7 data/exdeorum/advancements/recipes/misc/oak_compressed_sieve.json +d4576d4d94860dff3f622350ad82c8e6220e6117 data/exdeorum/advancements/recipes/misc/oak_compressed_sieve.json 83cb594324378aa27e88363a95b95389045f6bb5 data/exdeorum/advancements/recipes/misc/oak_crucible.json 24d790eac1a1dafd023859cce63b2e3647730ffb data/exdeorum/advancements/recipes/misc/oak_sieve.json cb476801fffaa7fe555e75984cbcdc6afd275b84 data/exdeorum/advancements/recipes/misc/ores/aluminum_tag.json @@ -99,7 +93,7 @@ f971f07a474e979defc404208492e4e1cc5d7475 data/exdeorum/advancements/recipes/misc 43b9432f719e43b3b05a58eca0b423d2dce83885 data/exdeorum/advancements/recipes/misc/porcelain_crucible.json 2d4981b49378b19087c8e4e76155e3cb3b19de88 data/exdeorum/advancements/recipes/misc/sculk_core.json 5b83976b43f495d759b62d31e8645e503aa11eae data/exdeorum/advancements/recipes/misc/spruce_barrel.json -b58f4181c8b2f6eecf8bd089661a2b7ab189fdbb data/exdeorum/advancements/recipes/misc/spruce_compressed_sieve.json +ada5a3434505d9368b5af205ae45f39f4a6931fb data/exdeorum/advancements/recipes/misc/spruce_compressed_sieve.json 4f82465369cb3da80c9740a2aac5a5c310f10093 data/exdeorum/advancements/recipes/misc/spruce_crucible.json e3be05ed69a32ef49586a025228e516d2fed50a3 data/exdeorum/advancements/recipes/misc/spruce_sieve.json 6b4786a5f840e458ec918714716b440525a03d59 data/exdeorum/advancements/recipes/misc/stone_barrel.json @@ -108,10 +102,16 @@ e3be05ed69a32ef49586a025228e516d2fed50a3 data/exdeorum/advancements/recipes/misc bdfb96be5fba1ad04a86ceda6025ffd7354b154c data/exdeorum/advancements/recipes/misc/unfired_porcelain_bucket.json e83c9672f6250f553f9ec48df0263bf92148e990 data/exdeorum/advancements/recipes/misc/unfired_porcelain_crucible.json ce13aea7f3706df6ee4380e09d8cec9de3b28a95 data/exdeorum/advancements/recipes/misc/warped_barrel.json -1335764dc919b1fa21977f39b6ea4e9357a6c3f1 data/exdeorum/advancements/recipes/misc/warped_compressed_sieve.json +5e80b2b77caae019165a032e37ee622a4d996233 data/exdeorum/advancements/recipes/misc/warped_compressed_sieve.json c348b3f289fdd42b66154680447c14da2fb8b8d8 data/exdeorum/advancements/recipes/misc/warped_crucible.json 60f7dc1fadae2a188ffef360e6fb1466f88df0f2 data/exdeorum/advancements/recipes/misc/warped_sieve.json 3bc88052ecc7287952e17c8c7d9ff51be8f8efe5 data/exdeorum/advancements/recipes/tools/bone_crook.json +b77583028c91673b2670198afcb4ece4329448f1 data/exdeorum/advancements/recipes/tools/compressed_diamond_hammer.json +4bf271bb7763bd6b9064b5fc24d6c2e7f7bb09fa data/exdeorum/advancements/recipes/tools/compressed_golden_hammer.json +c6ec16082a7232398cd4c6dffcd44ac94bf5d904 data/exdeorum/advancements/recipes/tools/compressed_iron_hammer.json +4a29f59a0f8efd21e6782718269a1198fd7c32c7 data/exdeorum/advancements/recipes/tools/compressed_netherite_hammer.json +3c39c33f94562e50f0154ebb0394f055d3520abb data/exdeorum/advancements/recipes/tools/compressed_stone_hammer.json +a9e375e7e999e5019aac57e726a089f1e0d84d0d data/exdeorum/advancements/recipes/tools/compressed_wooden_hammer.json ed5a600dde175bdc931fb8d5100a4951598a6138 data/exdeorum/advancements/recipes/tools/crook.json 8f8c706547ffbd7db1e9b513f6eab5224630cc53 data/exdeorum/advancements/recipes/tools/diamond_hammer.json 9d319c46fbab930c721eefcb645d351b53bbb445 data/exdeorum/advancements/recipes/tools/diamond_watering_can.json @@ -126,7 +126,7 @@ dd9cb9835fecf1effb5ac6a96e3221ef3477492f data/exdeorum/advancements/recipes/tool 70d5cb939e74abcca37710a67394063abbd11e37 data/exdeorum/advancements/recipes/tools/wooden_hammer.json 752f037a88e20aa57f0a5316cd82afc3ca287e85 data/exdeorum/advancements/recipes/tools/wooden_watering_can.json 1a3ad55e158322407ec6b00dfdd775ae9a590980 data/exdeorum/recipes/acacia_barrel.json -992ce7ea14ae3d459f5ef45ee1991dee6456e398 data/exdeorum/recipes/acacia_compressed_sieve.json +18440929322e7e535ba2013b4762647d2dd3c50c data/exdeorum/recipes/acacia_compressed_sieve.json b04a381b3dc085153b5acc8085792297be9f5abb data/exdeorum/recipes/acacia_crucible.json 48aac07942300d20924474f3b71f2b746a43fc3c data/exdeorum/recipes/acacia_sieve.json 3e5a3df68bb27ef2b83fa9bdbd2f29f053781c2c data/exdeorum/recipes/andesite.json @@ -214,35 +214,59 @@ bdcdeae9d06028ce943d06c367b58677efe03fa8 data/exdeorum/recipes/barrel_mixing/cla 173f8cfa024c85c843c27a8acc36285e7cd34d03 data/exdeorum/recipes/barrel_mixing/soul_soil.json 7da00b96ebc2fed2bee34e97e4663f701e624e79 data/exdeorum/recipes/basalt.json 86419d8f205f3756c57a5701407b78d21cec595c data/exdeorum/recipes/birch_barrel.json -90f3f5306972e0479b56652a0a6ee3b17cd22b8c data/exdeorum/recipes/birch_compressed_sieve.json +f02eb087669b4aa12af6993864dd0305d1be59e1 data/exdeorum/recipes/birch_compressed_sieve.json a9b16fe05fac026f5fc6e843165ac6b3c4e49ad9 data/exdeorum/recipes/birch_crucible.json 9e8f62fdc13f7ee00270e5a145511a2126446de5 data/exdeorum/recipes/birch_sieve.json 64a7f60b466125e4c69919b65306414540386688 data/exdeorum/recipes/blackstone.json 933afd9d49d8105e035ddeaf4699144b0c59d8fb data/exdeorum/recipes/bluebright_barrel.json +b525f30754046fb7ef0c85763999aaff6aa146a7 data/exdeorum/recipes/bluebright_compressed_sieve.json 4498a2719a6fde620e885a36db9810616fe5b00e data/exdeorum/recipes/bluebright_crucible.json a17158c9265e3c2a2757218ecc5661edd6e55389 data/exdeorum/recipes/bluebright_sieve.json +de661fa46da84b12ea6030494d0828c7ca17f135 data/exdeorum/recipes/blue_archwood_compressed_sieve.json 876e11e8194543322606195b37bc7d48231076c7 data/exdeorum/recipes/blue_archwood_crucible.json e2747b1a78ad7e24daa1457cd42727d4e557e601 data/exdeorum/recipes/bone_crook.json d4226d4489481ade3466dd77412ce086b54566ea data/exdeorum/recipes/calcite.json 00792e2958a9c8017228b1a85444f864c67df820 data/exdeorum/recipes/cherry_barrel.json -4b71ed12e0793c6a0e7f3a1155187df240cfacb3 data/exdeorum/recipes/cherry_compressed_sieve.json +f4eedca7cf15a5a2d29152c3ee52f9d91cbf2071 data/exdeorum/recipes/cherry_compressed_sieve.json b2e3bb4ec8706924dae30712573f269cff310f6f data/exdeorum/recipes/cherry_crucible.json 8eb7cc61d49e09d60961b3563957b0643400ba01 data/exdeorum/recipes/cherry_sieve.json b39efa0032946e54274f8b45a654f7e55ff23673 data/exdeorum/recipes/cobbled_deepslate.json ba90fbda213e52dc15ea532c8f10c63ea47747de data/exdeorum/recipes/cobblestone.json 95f25315f53bdbc7db29cabdda0272a5482cc8d2 data/exdeorum/recipes/comet_barrel.json +83013e041862fa7511434bc47e42e3fc733e43d5 data/exdeorum/recipes/comet_compressed_sieve.json 526976257819a8daa86c0b89156794987aa7f615 data/exdeorum/recipes/comet_crucible.json 73ba7e02ac0e754e9525d3bdf8ad1a2756b32c3f data/exdeorum/recipes/comet_sieve.json +0b21f619a2a285d62c1b9eb51483841565ffff32 data/exdeorum/recipes/compressed_andesite.json +a6fc3df9d089be3525490b352c71b940ca05ac09 data/exdeorum/recipes/compressed_blackstone.json +c4526287e8eefa0ab25d59f6bd141ee23ddd4ea1 data/exdeorum/recipes/compressed_cobbled_deepslate.json +5c5e315f04441bfba2126785d12a573d1761114f data/exdeorum/recipes/compressed_cobblestone.json 96ae3a565fe1fa4188179791081aa751c71e05d5 data/exdeorum/recipes/compressed_crushed_blackstone.json 13a1ca320879f6956d48ec34983a3f7e2391f5da data/exdeorum/recipes/compressed_crushed_deepslate.json 4f2517b3fc90f09479d5bdb7c8674fa0939249d8 data/exdeorum/recipes/compressed_crushed_end_stone.json ef3ff25c8dd7160a1c5ed5de3caa309d812ac06c data/exdeorum/recipes/compressed_crushed_netherrack.json -a6e8d4b252cffa5c496f2dcbe7c41cddf35d44b4 data/exdeorum/recipes/compressed_dirt.json +4f5c63e79b2876fc1996c3150aaf0b70cc5bebe1 data/exdeorum/recipes/compressed_deepslate.json +447b571ccd67f699839b379f4f93ccadd3880afb data/exdeorum/recipes/compressed_diamond_hammer.json +3249a942e485b74faea454d53f16eb2ff47e6ff6 data/exdeorum/recipes/compressed_diorite.json +0dd6ae05ea697d642da599126a997f01f67ca127 data/exdeorum/recipes/compressed_dirt.json 1a8f0ee95ef19a6fbb60e5ff9c1b48e0c2b1989a data/exdeorum/recipes/compressed_dust.json -808b3aec7b3c40dae0c81daa9a00dec5296959b7 data/exdeorum/recipes/compressed_gravel.json -05b103a73f380a45bb1cf5c8f8be5a1c076132a2 data/exdeorum/recipes/compressed_moss_block.json -8a22b36eecc2546f7d35147a8835ffecc450968f data/exdeorum/recipes/compressed_red_sand.json -5562157c4fe1f2bf7ddb51c7c61948d2a15e7c42 data/exdeorum/recipes/compressed_sand.json +527542a72b56b757df9e37fc276dd89eb263f2de data/exdeorum/recipes/compressed_end_stone.json +747ecebc093531bcdbd6ee0d38453a7bfd5513d2 data/exdeorum/recipes/compressed_golden_hammer.json +58e8bd55100c3d54f75b93e180acd3e34d79d9cb data/exdeorum/recipes/compressed_granite.json +68e8887940908a160cd45e2834003f368eaa1248 data/exdeorum/recipes/compressed_gravel.json +f891b1ee65ba8d2005ffe2b45e68a4c91c62ee72 data/exdeorum/recipes/compressed_hammer/crushed_blackstone.json +87f12e5364581b5551548310fcc1c2be2e84942a data/exdeorum/recipes/compressed_hammer/crushed_deepslate.json +4c6959b42b836eefc7af62c21f584c0a10c4a906 data/exdeorum/recipes/compressed_hammer/crushed_end_stone.json +b26280a7502204ecbb197906f6ca6f56664ce9c9 data/exdeorum/recipes/compressed_hammer/crushed_netherrack.json +999236092073f9241a1e52a06eb6d8bd858d899d data/exdeorum/recipes/compressed_hammer/dust.json +d3ef19837721bc8e320a9ef7b3fff280e48314a0 data/exdeorum/recipes/compressed_hammer/gravel.json +8acf1a9216e97195098cb05e94940e63e37bc51c data/exdeorum/recipes/compressed_hammer/red_sand.json +261e8dc8e50fd89735fb5d86652c5a5686f49204 data/exdeorum/recipes/compressed_hammer/sand.json +9494c64af47c9c83fd655b591e90d4ee59c38c27 data/exdeorum/recipes/compressed_iron_hammer.json +f67416068af77c28d6ee737da8a435e6fd99b1d4 data/exdeorum/recipes/compressed_moss_block.json +fc987b37ca7deab45b447129b6159dea9c7f670b data/exdeorum/recipes/compressed_netherite_hammer.json +36f86298d89128e3be03423e57847797daa73cb1 data/exdeorum/recipes/compressed_netherrack.json +dd3fb07156e5dd62062496d100537c5d9305fc5d data/exdeorum/recipes/compressed_red_sand.json +f0d52617f126581a89e0ff5a76ecf834c6328edf data/exdeorum/recipes/compressed_sand.json 64242affcac8e8b8a0402c596277cfdf6b7d2c03 data/exdeorum/recipes/compressed_sieve/crushed_blackstone/diamond/ancient_debris.json 4959034b031d858d4cabd62b575923e6f69e5fc5 data/exdeorum/recipes/compressed_sieve/crushed_blackstone/diamond/blackstone_pebble.json f9a13edd31f38e8ac13766414d07ca97b909e98c data/exdeorum/recipes/compressed_sieve/crushed_blackstone/diamond/gold_nugget.json @@ -1095,13 +1119,15 @@ eea2f3a13873fec9f3db9d026c431f2263373cbc data/exdeorum/recipes/compressed_sieve/ 9956dd67a5d7d2313a17820ed6a7c95c0fa8835e data/exdeorum/recipes/compressed_sieve/soul_sand/string/gunpowder.json 7a279d26e6dcbe765ef9f6a2d26a8c732db1a873 data/exdeorum/recipes/compressed_sieve/soul_sand/string/nether_wart.json 6ce6fa1f03d84c0151ea4f5c112e659d566576b4 data/exdeorum/recipes/compressed_sieve/soul_sand/string/quartz.json -b897156ed433dcfc4b9706d045241031165156a2 data/exdeorum/recipes/compressed_soul_sand.json +1959f436bf3c877d6b3e6b6e1b4c9641c56bd520 data/exdeorum/recipes/compressed_soul_sand.json +7962d873fec3adb29c282fc25bdc5f98a3f92de0 data/exdeorum/recipes/compressed_stone_hammer.json +4ff92d20860b1b489f62ab28d2abc77d5b6a8c8e data/exdeorum/recipes/compressed_wooden_hammer.json 0f7fa8aac7b5e0a3a882db3ca0f6e46b1731f672 data/exdeorum/recipes/cooked_silk_worm.json 508acb3340451e047f94a07759649fa81f0e6c06 data/exdeorum/recipes/cooked_silk_worm_from_campfire_cooking.json 0843aa55ea02679d6cd055e469a8dc980aed84b0 data/exdeorum/recipes/cooked_silk_worm_from_smoking.json 520186c74048b30a5fc6ab424d2717944b6624e2 data/exdeorum/recipes/copper_ore.json 33acd21d80389c29b42ec1d4247bb34d5a10e740 data/exdeorum/recipes/crimson_barrel.json -8daa20866f07210f40e22aba7238241bd5ea4631 data/exdeorum/recipes/crimson_compressed_sieve.json +f355ecd5c79af1f5e272b5687bc95ecb4f0f7a63 data/exdeorum/recipes/crimson_compressed_sieve.json 20ddd97165d2b2c1c9c04f364ddec810ca7d73d6 data/exdeorum/recipes/crimson_crucible.json 21057c2afeda8c54e808b82818c93c8102326f98 data/exdeorum/recipes/crimson_sieve.json f6a9036c1bbc4fa0cdc25ef4c851de5ddac0a4ff data/exdeorum/recipes/crook.json @@ -1125,13 +1151,15 @@ b26788db68e036ad7de74a6dda50dafe19f535ea data/exdeorum/recipes/crushed_deepslate 36919a5685a0a2bf616b8880271e54d9d39e452a data/exdeorum/recipes/crushed_end_stone_from_compressed_crushed_end_stone.json 95a050591860bed4414e2377838a93f6609cc7f3 data/exdeorum/recipes/crushed_netherrack_from_compressed_crushed_netherrack.json c81379fe022f3667ce506e4927aac97d1b66999f data/exdeorum/recipes/crystallized_barrel.json +ba4f5d8c69bb7f72464fc90820e19597ed4054ab data/exdeorum/recipes/crystallized_compressed_sieve.json 77cf611f4e10c507fc4ec116ba0a9d9d1ce58273 data/exdeorum/recipes/crystallized_crucible.json 324b6222287940a7fb008b9c6a1e9caecada8af3 data/exdeorum/recipes/crystallized_sieve.json f41b9a2782302d6684a89127b90f47ba432b35f1 data/exdeorum/recipes/dark_oak_barrel.json -3a47fe28c3030a40c9c9de9e80e9a71e30c3b8e5 data/exdeorum/recipes/dark_oak_compressed_sieve.json +9f1ade7557ad22159f5ab2a47ad8200a40e2b32e data/exdeorum/recipes/dark_oak_compressed_sieve.json 88de5b2df3c7cbb668195ebff7d60235fa897cdf data/exdeorum/recipes/dark_oak_crucible.json b14283dd10c79ddb507aa849a9a432266b615f19 data/exdeorum/recipes/dark_oak_sieve.json 4dd77f3c2a9995562882de58c014882b846c0e46 data/exdeorum/recipes/dead_barrel.json +9bc369d4ea87b53efd4f44443b8c38da791eb839 data/exdeorum/recipes/dead_compressed_sieve.json 1d146b95340c76f0f79202dd81fb4f29bb6d074f data/exdeorum/recipes/dead_crucible.json 49db33903b6892db0f17ce50e9a3ca78aef007ed data/exdeorum/recipes/dead_sieve.json 0558034d3940e2bd4046ad2af07c42068852dc76 data/exdeorum/recipes/diamond_hammer.json @@ -1140,25 +1168,30 @@ e8b0389a7d980e745bc8df86c2d3d35b0792cad4 data/exdeorum/recipes/diamond_mesh_from 8244864c8c0fb88af380c18bb593a8cb3982abbd data/exdeorum/recipes/diamond_watering_can.json 596e6fb9a4c633938b7b3c778baad53cdd9fd2ed data/exdeorum/recipes/diorite.json 44da784210aab9a5035b77cb1fa71761b025ef62 data/exdeorum/recipes/dusk_barrel.json +c1263f9d34e556a061f6ff1ada9a084605b4080c data/exdeorum/recipes/dusk_compressed_sieve.json dab9bb66c9b292265cba8bcce75c33f306d04df2 data/exdeorum/recipes/dusk_crucible.json 838ecf522b90ab1e78699f2343500ddb9a396090 data/exdeorum/recipes/dusk_sieve.json 890d0fde217d2dc044c51fc97a851b19814b50ef data/exdeorum/recipes/dust_from_compressed_dust.json 04ae3d6df1f7ed4d376c3f95bc4924651a1148e8 data/exdeorum/recipes/end_cake.json a3b9f47a73b9cbb4d908ac0b8ad90b308271c04c data/exdeorum/recipes/fir_barrel.json +192371de6a9e9a832d06f8138e9471b7943d1480 data/exdeorum/recipes/fir_compressed_sieve.json 7f7a034824513701aa0493267f7f8219d8fdef89 data/exdeorum/recipes/fir_crucible.json 8821d420a2f1dae54a0276cf33f94b5689eda056 data/exdeorum/recipes/fir_sieve.json fafeef8c11df81d877166ba0d4add3823515dad3 data/exdeorum/recipes/flint_mesh.json 31d74ecb43dbcc5b40a1ef4694974166d21f4781 data/exdeorum/recipes/flint_mesh_from_string_mesh.json c778aaf0af19417cab77cc60852725c871190ad3 data/exdeorum/recipes/frostbright_barrel.json +ed1654959b59c4850e9423bbf52d945daf6a4a81 data/exdeorum/recipes/frostbright_compressed_sieve.json 3023dca367b5b56ef41c2819c9169bb961f0c9a8 data/exdeorum/recipes/frostbright_crucible.json 500a5175a3660f37899b652a3c18c3d867f7c504 data/exdeorum/recipes/frostbright_sieve.json 4adddee39d6ff6ee58dedfdeb32265a051f9a722 data/exdeorum/recipes/golden_hammer.json a32f858ab7b6b5d5546b8474175a44a93d85f8bc data/exdeorum/recipes/golden_mesh.json 58896fb67b08a41479546cd64f6e97ea9afbe013 data/exdeorum/recipes/golden_mesh_from_iron_mesh.json +a77dbedf43f5423395d166dc04d8fb0458d1b2a0 data/exdeorum/recipes/golden_oak_compressed_sieve.json a119064052e4bb6873c6dc10c50b36e52e9dc58c data/exdeorum/recipes/golden_oak_crucible.json e77acbd0878f662f441d590287e71e66593ef928 data/exdeorum/recipes/golden_watering_can.json 44ed0e97591833c39e32847f22edf333ae551b22 data/exdeorum/recipes/gold_ore.json 959cdac69e6907157e75b38b098cff21609f4869 data/exdeorum/recipes/granite.json +af1ee8632c4781014d95d444a9993f3e0930e6ce data/exdeorum/recipes/green_archwood_compressed_sieve.json 218076981c4ca8cc99c003c34394b0530c473c31 data/exdeorum/recipes/green_archwood_crucible.json bda55a01228a6ad8f75521dd13397e94fba5009d data/exdeorum/recipes/hammer/basalt.json e69619aa6bc3479aeb1abc8406d85ea9edb1e041 data/exdeorum/recipes/hammer/brain_coral.json @@ -1187,6 +1220,7 @@ b592554bc00ab20d8affdfd1627406858ac10797 data/exdeorum/recipes/hammer/sand.json f9654d25e05276b2bce6445e2cf7c1f2d9170124 data/exdeorum/recipes/hammer/tube_coral_fan.json f6b16e8168c798bc433e19edf5ede3a7703865f5 data/exdeorum/recipes/hammer/wood_chippings.json 89bc76bd0dd2350b25ac8981f3597e0119dff939 data/exdeorum/recipes/hellbark_barrel.json +cf7b3487cccd2e28ecffed5a41db48830852ab57 data/exdeorum/recipes/hellbark_compressed_sieve.json 4c3b4daf2bed2d4ee662e2e80f4547b3f0b2a271 data/exdeorum/recipes/hellbark_crucible.json 2995ec75979bfb8b0415b8a1da7db7001b9ae433 data/exdeorum/recipes/hellbark_sieve.json 3067ccffd037b6d16ba09ae181813be6471d2050 data/exdeorum/recipes/iron_hammer.json @@ -1195,10 +1229,11 @@ a1a0885f28b2cbe72251d6db69df22a4e8e47d97 data/exdeorum/recipes/iron_mesh_from_fl 6f06b4d91979afc8000988cd20519379152a373b data/exdeorum/recipes/iron_ore.json f4ea515ec72c867b9c0b54df162bd07c62e1a7ce data/exdeorum/recipes/iron_watering_can.json 4d7d68580f0271eea4728062fa608b87aa04570f data/exdeorum/recipes/jacaranda_barrel.json +78a17db0a03540c7382f2065104f73d122c239ca data/exdeorum/recipes/jacaranda_compressed_sieve.json 15db77ae5c82626af0a52a96b71aef0a55754de5 data/exdeorum/recipes/jacaranda_crucible.json f1368be282014a882ece8c28d43ea1d3f8c19ad2 data/exdeorum/recipes/jacaranda_sieve.json 332d5396af038b56047e88fcad713478e45cbd97 data/exdeorum/recipes/jungle_barrel.json -787b17713d3100c23475d9b3f3a2191d3d61d208 data/exdeorum/recipes/jungle_compressed_sieve.json +44804d05d887ed0ea26d379fe321670e06949d28 data/exdeorum/recipes/jungle_compressed_sieve.json 7239040d0cee42fe9077c89eaa3d768a07db0557 data/exdeorum/recipes/jungle_crucible.json bffa756563ac5aa791f299ae6d7d042813c2614a data/exdeorum/recipes/jungle_sieve.json 83f2a9b35dbee148a7f74e2bd3d85daa8f276c74 data/exdeorum/recipes/lava_crucible/cobblestone.json @@ -1206,19 +1241,23 @@ bffa756563ac5aa791f299ae6d7d042813c2614a data/exdeorum/recipes/jungle_sieve.json f6c2801f5410a26fba7ff632b5c7ce80d2df3042 data/exdeorum/recipes/lava_crucible/netherrack.json 6dd34eedb61a5063e283739ee1e033f52cfb6607 data/exdeorum/recipes/lava_crucible/stone.json de4aec27404547b2cc9a709e54eba1459c210149 data/exdeorum/recipes/lunar_barrel.json +07e78ccc04523bc7da18699517200a56e6a506ef data/exdeorum/recipes/lunar_compressed_sieve.json 848e724409a1ade08e1d40a28b6d570e0362cb45 data/exdeorum/recipes/lunar_crucible.json 6760d41983e3553c785f251c1ab4813db7312b32 data/exdeorum/recipes/lunar_sieve.json eefb8d9a0b49405d1a9788425df1c9c7937458e4 data/exdeorum/recipes/magic_barrel.json +ec9cbb494a97be1cb2ee023aff06d452c1b64923 data/exdeorum/recipes/magic_compressed_sieve.json 19ccb45f92da97401ef10f7def8d7b439d683910 data/exdeorum/recipes/magic_crucible.json 10c7971c338d0079d1125a7b320fe407ceabe089 data/exdeorum/recipes/magic_sieve.json b012c1b39678d3e560365bc01a59c9a88182388e data/exdeorum/recipes/mahogany_barrel.json +1d30ed4304314db4b1d2ced32ed8bf8c7a573cdb data/exdeorum/recipes/mahogany_compressed_sieve.json 49cb4e7d62855ef0b42a98c6b3b03a7b2acfe8f5 data/exdeorum/recipes/mahogany_crucible.json 6c10f7034e705ed28d9e9342e18e0675ed14d546 data/exdeorum/recipes/mahogany_sieve.json 8efa8d7c8da52d42d8e1a831004dfc080423a500 data/exdeorum/recipes/mangrove_barrel.json -45f0c2448df567574d237e7c3dddfb665def4a17 data/exdeorum/recipes/mangrove_compressed_sieve.json +04f4b2f793501db4077fd2af726610698bce0f4a data/exdeorum/recipes/mangrove_compressed_sieve.json 95edd369ab19abd17ef56cfa2350a2dc185c7747 data/exdeorum/recipes/mangrove_crucible.json 9c38235abb08f3cdd8838c0a0efb98154dee97e3 data/exdeorum/recipes/mangrove_sieve.json e288683a0ad5496b43667307e9a22b35a0482d77 data/exdeorum/recipes/maple_barrel.json +e6ecd76ae995021b72bf024936132c7fa236bbfd data/exdeorum/recipes/maple_compressed_sieve.json c6ab33d03646b9af8b2d624e28b7d21083772dda data/exdeorum/recipes/maple_crucible.json f1b143b0f52102366fd79d608540e67e9909c43f data/exdeorum/recipes/maple_sieve.json dd1b8a3eb6bcdf27034d1a456df4164b831b9fde data/exdeorum/recipes/mechanical_hammer.json @@ -1228,7 +1267,7 @@ f92abca4ddd5f75b770e81fc745a735a7fd0ee68 data/exdeorum/recipes/netherite_hammer. c7d0c0109b34ee2e325c42b6664d5fe6b8ea5117 data/exdeorum/recipes/netherite_mesh.json a73d1813a804c37490e498646509b3c0d91a23a0 data/exdeorum/recipes/netherite_watering_can.json 62209674f4ca94b379d4e67c7480285b5390b6ca data/exdeorum/recipes/oak_barrel.json -9fed916ff2b234604c5047fda82d6a908a846480 data/exdeorum/recipes/oak_compressed_sieve.json +45f47e26d7941dd47ea5f5b06fbe403bfbb67c3f data/exdeorum/recipes/oak_compressed_sieve.json 97bd28265ca9481edddebd8f274d2f07791b2528 data/exdeorum/recipes/oak_crucible.json da14c2579ad2e91b9ee70b84e3be1df51243944c data/exdeorum/recipes/oak_sieve.json 4a3c5509da26ba4e8244b69c13f0524dfeeaca11 data/exdeorum/recipes/ores/aluminum_tag.json @@ -1247,15 +1286,19 @@ e50e0f6fb83cd233214ca62718e0c9155f29d7c1 data/exdeorum/recipes/ores/tin_tag.json ece0731639c9063416fb0183309fdf8252d774eb data/exdeorum/recipes/ores/uranium_tag.json 56600e7db58d4c74326a2f38bc014a47ddbeb731 data/exdeorum/recipes/ores/zinc_tag.json bbe74a530536071b2bb8e94563ae8ae426b45188 data/exdeorum/recipes/palm_barrel.json +20889eff8733f5268926200acea824866860c32a data/exdeorum/recipes/palm_compressed_sieve.json 44f3f267ac2e7de4aa22e2647e4a68736041b039 data/exdeorum/recipes/palm_crucible.json ec53c60562bd39028e9fe497b73efdc7af562263 data/exdeorum/recipes/palm_sieve.json fd95c29e2e4f6eb08729c3c821e8f1dad427aef8 data/exdeorum/recipes/porcelain_bucket.json a2d4a9158c46bf81649e0a16621302cbf3754582 data/exdeorum/recipes/porcelain_clay_ball.json 53adc0da4d944ac57a437a38e14fec0f6563e9b2 data/exdeorum/recipes/porcelain_crucible.json +086396e1c6697618f9f11f2083c68e1a04fb3931 data/exdeorum/recipes/purple_archwood_compressed_sieve.json f1cacab8cc61f3eb2c21e89fe33d974b96464793 data/exdeorum/recipes/purple_archwood_crucible.json 7e0e860075ea2ed301be1b52babac09130b4ddc5 data/exdeorum/recipes/redwood_barrel.json +338e207fe562967558203c0afbc74e70b5eb71c1 data/exdeorum/recipes/redwood_compressed_sieve.json 586e9a05cc04d028912f40d41bcd067976005dd8 data/exdeorum/recipes/redwood_crucible.json 7c5a28c2621a975df088f28c00729f7495bcf773 data/exdeorum/recipes/redwood_sieve.json +1d7709960b3cad2ac9e00d0366fbb32af8043698 data/exdeorum/recipes/red_archwood_compressed_sieve.json b09680ed23f9c5f3ac4a2cbcd2488b44f367831e data/exdeorum/recipes/red_archwood_crucible.json 45050ac51fb86e362cec2d35e0a03ec1e5ab51c1 data/exdeorum/recipes/sculk_core.json 9520f7f3b42fb795748c715cb402133fca4b9ce3 data/exdeorum/recipes/sieve/crushed_blackstone/diamond/ancient_debris.json @@ -2111,14 +2154,16 @@ efa24078ae05e89dcaf7869ed7973e9688456c90 data/exdeorum/recipes/sieve/soul_sand/s e5079fc3f8c018c7f2895eacecba955c2be1ef09 data/exdeorum/recipes/sieve/soul_sand/string/nether_wart.json fe809175ad8570b7338b3aff029c040ca0fe5095 data/exdeorum/recipes/sieve/soul_sand/string/quartz.json 9ab74f344d31bf2bde6ce9c2aad2d739e7b5f234 data/exdeorum/recipes/skyroot_barrel.json +8a25e4f46b719637cc0c21f99cf1d20321ea0ad1 data/exdeorum/recipes/skyroot_compressed_sieve.json 8e724e34a3107b459a0f6be31c2acd7e9782be97 data/exdeorum/recipes/skyroot_crucible.json 80b9df7f6ed4c5fb23f5d79cdd7dfbd1a79253e7 data/exdeorum/recipes/skyroot_sieve.json afdb75127a9ece3ba346b78155877b35135cc9f8 data/exdeorum/recipes/sponge.json 5fada017bfccd7c672986d436e390ed5799b185a data/exdeorum/recipes/spruce_barrel.json -8343f90435dc198f31b658367e800f8a494e4274 data/exdeorum/recipes/spruce_compressed_sieve.json +d4aefd49dab39f7b8962b8a29cbb3073c7982490 data/exdeorum/recipes/spruce_compressed_sieve.json 3a2654f08af2014451533d7168c29ed866c0788f data/exdeorum/recipes/spruce_crucible.json b4531ee1e1478da1145f099271cff9a9c2069c46 data/exdeorum/recipes/spruce_sieve.json d2603bba921c88282b027e8fde26cb6f19293099 data/exdeorum/recipes/starlit_barrel.json +6cf025258a4a40cdad597143002ee81458c9de63 data/exdeorum/recipes/starlit_compressed_sieve.json 8746ef0a00dab2133a2fc3a2e2af17030d77112b data/exdeorum/recipes/starlit_crucible.json 2b8a0cc7d6ba4c1787ac8e0e55cde14ba2d38e6e data/exdeorum/recipes/starlit_sieve.json 5c0a2619af428a12b5669976c8d489e4c87c7a47 data/exdeorum/recipes/stone_barrel.json @@ -2127,12 +2172,13 @@ d2603bba921c88282b027e8fde26cb6f19293099 data/exdeorum/recipes/starlit_barrel.js 09df4d1fa4f1e079f6190b943fc45085cc6d6596 data/exdeorum/recipes/string_mesh.json ba8d21134dd2e019a9dd579a765d12685c19380d data/exdeorum/recipes/tuff.json f3f7e1c6aac0f738e2c68b07628d0c793bbf4118 data/exdeorum/recipes/umbran_barrel.json +ee637d94c3eb6e6831321d57f41230085a3b6713 data/exdeorum/recipes/umbran_compressed_sieve.json 4065e6de49bd7618c9f133cc62123181ed76b99d data/exdeorum/recipes/umbran_crucible.json 390a33dc92677248f4c2d3a6a21d5e553f6df243 data/exdeorum/recipes/umbran_sieve.json 480cf1a3e2f5476e7aa9fc8a9ad310adef9e25e9 data/exdeorum/recipes/unfired_porcelain_bucket.json e6ff95b6fbc43c73a537174e01c9eb519e8fdef1 data/exdeorum/recipes/unfired_porcelain_crucible.json 346b70c2d2516f6e735fd1f156e22a649175813d data/exdeorum/recipes/warped_barrel.json -e94e47bacd143d89fc0cc13a4c12393d9ac7329f data/exdeorum/recipes/warped_compressed_sieve.json +36ef0a38e904073f4f7ffb7483a5a04d95b3220d data/exdeorum/recipes/warped_compressed_sieve.json 1ae1b311f2e370c924041da80fea01ac8da870c5 data/exdeorum/recipes/warped_crucible.json 7d589e398d803bc7a30614f6ee4aa0d48ca3540e data/exdeorum/recipes/warped_sieve.json 869c22919d2e8004a4d673b02006254bb5d5be03 data/exdeorum/recipes/water_crucible/apple.json @@ -2162,19 +2208,38 @@ ab3ae2221e47670534c49837620fcc61e088aa90 data/exdeorum/recipes/water_crucible/su 3ba422c14ce1396e1686ac41045be16f2ef9c7e8 data/exdeorum/recipes/water_crucible/tall_flowers.json ae732ce5e5c70e4b5b44396b1db432c22c2dd561 data/exdeorum/recipes/water_crucible/vine.json 05c12b51cdd74a0619df2b35d4d6fafffb84ee0c data/exdeorum/recipes/willow_barrel.json +355a29fed30762d0f4b842a3ef5f4c969d11c378 data/exdeorum/recipes/willow_compressed_sieve.json c1dd98278720c97caccca82449d769c6a8a0f5e0 data/exdeorum/recipes/willow_crucible.json 24e72702e3ae9d0832deac8917603c4565f7aed2 data/exdeorum/recipes/willow_sieve.json 8356651dbd67d7c3b820a78d0720afa5a1ee5713 data/exdeorum/recipes/wooden_hammer.json 20b1ab005d3c3d552d4300f53444a931b230cb3b data/exdeorum/recipes/wooden_watering_can.json +89b86eaec102ac8affba48ccc04fa6c232f12058 data/minecraft/advancements/recipes/misc/andesite_from_compressed_andesite.json +cffadb728cc65949a35710df9d1c678cdf7b934d data/minecraft/advancements/recipes/misc/blackstone_from_compressed_blackstone.json +c72f11e3dd15840374e2748446d6ff92801d2655 data/minecraft/advancements/recipes/misc/cobbled_deepslate_from_compressed_cobbled_deepslate.json +595b9dc2254ac03b65d3c3296e72c2ae7223a03f data/minecraft/advancements/recipes/misc/cobblestone_from_compressed_cobblestone.json +e6ff626a2d008577749e5d6a706fab10f2d2c683 data/minecraft/advancements/recipes/misc/deepslate_from_compressed_deepslate.json +4a2aae4ab33575741ca0920dbaf1664b65a4f766 data/minecraft/advancements/recipes/misc/diorite_from_compressed_diorite.json f8c8a25869cf43d682fb6b6ef3845f94af7eb208 data/minecraft/advancements/recipes/misc/dirt_from_compressed_dirt.json +8e9d7e68c74f99d5b7a052b357dde357c0123de3 data/minecraft/advancements/recipes/misc/end_stone_from_compressed_end_stone.json +436266162e9cd4e6e2f4f7195119128f2681831c data/minecraft/advancements/recipes/misc/granite_from_compressed_granite.json b666109bb417d911353baafd1261f08b8dacd6e7 data/minecraft/advancements/recipes/misc/gravel_from_compressed_gravel.json 483e0612d2b51adc4272efcee34d58b1c29d9d5d data/minecraft/advancements/recipes/misc/moss_block_from_compressed_moss_block.json +e50a1d95413b41c75f5f145f078a6a6ce732a4cf data/minecraft/advancements/recipes/misc/netherrack_from_compressed_netherrack.json 8d6bde94b316b88db9ac4bd4d395e7c116fc4d00 data/minecraft/advancements/recipes/misc/red_sand_from_compressed_red_sand.json 3d247e766365408e12fd897282761ec8892b5e9d data/minecraft/advancements/recipes/misc/sand_from_compressed_sand.json dfe9477343f2f4990fa4dc77cfb781ba48e017e3 data/minecraft/advancements/recipes/misc/soul_sand_from_compressed_soul_sand.json +293f4dae854e386a4e670a489583448c9115adf6 data/minecraft/recipes/andesite_from_compressed_andesite.json +21b742cd5fa792a8c94a58abe7b6a89963878e46 data/minecraft/recipes/blackstone_from_compressed_blackstone.json +d8aece20b5468789587100804d9dc24a29f6019b data/minecraft/recipes/cobbled_deepslate_from_compressed_cobbled_deepslate.json +495b8dd46c8269d8976b72531212185356a20dd4 data/minecraft/recipes/cobblestone_from_compressed_cobblestone.json +d4672b3b26e5d1cab9de6d2d4e30d5d9d958376a data/minecraft/recipes/deepslate_from_compressed_deepslate.json +a2310cbfea516d93f4325e775fb3ad27e4653bd3 data/minecraft/recipes/diorite_from_compressed_diorite.json c87ff76f86d021ad0dc6e778095611b7f84675f7 data/minecraft/recipes/dirt_from_compressed_dirt.json +0389ec88783e57a2731fae5a6140c8a7eaf56a6c data/minecraft/recipes/end_stone_from_compressed_end_stone.json +efd17ad8968defca090f56ea8a067c46982a7582 data/minecraft/recipes/granite_from_compressed_granite.json aef3cfa0246556552ca32d94746e4428c3d6012c data/minecraft/recipes/gravel_from_compressed_gravel.json ea4e51cb8870c9bb9737866c2df5b7d0a823187c data/minecraft/recipes/moss_block_from_compressed_moss_block.json +766fd6a42080c59e0261c3bada4a14d0629ba6eb data/minecraft/recipes/netherrack_from_compressed_netherrack.json 96d14caa8d32ecd3b4db989a830732bf254b4c26 data/minecraft/recipes/red_sand_from_compressed_red_sand.json c198aed0f94b8d5e2e53d347708477b83755c35a data/minecraft/recipes/sand_from_compressed_sand.json 59ec602536b883b6d5ba18a1a505d42f936cc16f data/minecraft/recipes/soul_sand_from_compressed_soul_sand.json diff --git a/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd b/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd index fe68abe0..278a1354 100644 --- a/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd +++ b/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd @@ -1,4 +1,4 @@ -// 1.20.1 2024-03-24T13:45:21.3570989 ModKit Item Models for mod 'exdeorum' +// 1.20.1 2024-04-06T12:34:19.1569586 ModKit Item Models for mod 'exdeorum' 4ba3bb2c6174ac3728a4b85e34681f118ec8eb34 assets/exdeorum/models/item/acacia_barrel.json 8ddbf3f507fc1ee45e3aa4db98d7f7d2e53adff1 assets/exdeorum/models/item/acacia_compressed_sieve.json c03ce41f7c071498fcbd5f5225e91dcb2f365fbb assets/exdeorum/models/item/acacia_crucible.json @@ -35,17 +35,32 @@ dbd3c1898984f6aab278ffb78760a5a8850da789 assets/exdeorum/models/item/comet_barre fe2dced8ace6add466694aad60d43aabfde136c9 assets/exdeorum/models/item/comet_compressed_sieve.json 42ef0c6e4a6f3fd8efcfba24f3ad6fdfb071bdca assets/exdeorum/models/item/comet_crucible.json ab256ed56e23571c5f80e930c6dbc90c04b2eb01 assets/exdeorum/models/item/comet_sieve.json +f0deab2952ec340baa1f06e4367c20e15a03c392 assets/exdeorum/models/item/compressed_andesite.json +f79d0955746d3e54387fc782333927d43bf902e9 assets/exdeorum/models/item/compressed_blackstone.json +4bd6f5946086cb33df838ba9780b6c4e521767dc assets/exdeorum/models/item/compressed_cobbled_deepslate.json +95a68e3685aa20d34554239030073dde1cd2961c assets/exdeorum/models/item/compressed_cobblestone.json 201eee4f81190b76d8e784d1144605fd857eac19 assets/exdeorum/models/item/compressed_crushed_blackstone.json 024f82fbe591c80e8887a5ea8e9615d82cce81af assets/exdeorum/models/item/compressed_crushed_deepslate.json 0c7b48c2ee78791e0025ff0b25228a870e6d0af4 assets/exdeorum/models/item/compressed_crushed_end_stone.json f3a8575800bd26cec708e5014314936073c8f8b5 assets/exdeorum/models/item/compressed_crushed_netherrack.json +a3549b8f6e40c70211504dd55edf4b08edb59b93 assets/exdeorum/models/item/compressed_deepslate.json +449ddf5ede27161c63b78187a814844bfade0dc5 assets/exdeorum/models/item/compressed_diamond_hammer.json +6e39bfb4193aaa390f112ad829cc345ed3268b7c assets/exdeorum/models/item/compressed_diorite.json 65dba2dfc4c9e3915742aea42d18889f69d6e238 assets/exdeorum/models/item/compressed_dirt.json ab38a5f0af566d3a1655e69f48caafb125c52a3b assets/exdeorum/models/item/compressed_dust.json +09329ed566778a57f4513f2d888e9a8ec00f10b4 assets/exdeorum/models/item/compressed_end_stone.json +7c638e3b59a247d6307d2e5f774637bb94fae532 assets/exdeorum/models/item/compressed_golden_hammer.json +3d9fdf2e455465e6390b58c49cabde2ff0dd52fd assets/exdeorum/models/item/compressed_granite.json 6236e7676986ba1e3b800d191171058c006ddd6f assets/exdeorum/models/item/compressed_gravel.json +9d3b33adb96273983456bb799eca60f5aaaf9789 assets/exdeorum/models/item/compressed_iron_hammer.json 835626486f6be78a12662a08fe0cefab40ee1d5b assets/exdeorum/models/item/compressed_moss_block.json +88e04f88f25929b38d1a94599ab748645bd72f55 assets/exdeorum/models/item/compressed_netherite_hammer.json +240d6c1764ba52a9fc9a5f08ab99eabc5ff6c022 assets/exdeorum/models/item/compressed_netherrack.json 400dacff28f7573c54ce184464cf7ac139d97b59 assets/exdeorum/models/item/compressed_red_sand.json 173f7476e29235ece5efb1181b1b75907f7a79dc assets/exdeorum/models/item/compressed_sand.json 1a8815784b5be8bef9fdc83a47f44fbc21e6c642 assets/exdeorum/models/item/compressed_soul_sand.json +35e67ae49dfbfe2711c32ded0bdb3b84438b0e0c assets/exdeorum/models/item/compressed_stone_hammer.json +f25714602249f2828d165b5b953d91a6a551b8d0 assets/exdeorum/models/item/compressed_wooden_hammer.json e0a5c7f6e6ec0cd9aa99175d3bca27b88ac299d4 assets/exdeorum/models/item/cooked_silk_worm.json a24ee1ee422f8460afec77474608b988d52ea42d assets/exdeorum/models/item/copper_ore_chunk.json d6109df4904776aca591e7dfc8ee8da50664e1df assets/exdeorum/models/item/crimson_barrel.json diff --git a/src/generated/resources/.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 b/src/generated/resources/.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 index 5b7f9be3..ec8ab335 100644 --- a/src/generated/resources/.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 +++ b/src/generated/resources/.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 @@ -1,4 +1,4 @@ -// 1.20.1 2024-03-24T15:08:44.0694484 ModKit Block Models for mod 'exdeorum' +// 1.20.1 2024-04-06T12:36:53.4151731 ModKit Block Models for mod 'exdeorum' c73197f2dc770a353883c387b2b1f0b082283576 assets/exdeorum/blockstates/acacia_barrel.json e36a3d22e00c0eae2336a39f3d0c904ef1d89119 assets/exdeorum/blockstates/acacia_compressed_sieve.json a3ef4562a4c7833439d8d66ff9c210406d317995 assets/exdeorum/blockstates/acacia_crucible.json @@ -27,14 +27,23 @@ a7af62e0deedaca41a7ea2d12b53a25aef4b5f6b assets/exdeorum/blockstates/cherry_siev 5d4a5be7011ce818133329764b43e7bf034e1592 assets/exdeorum/blockstates/comet_compressed_sieve.json 9283c15b68736b006fc39486568aeaca3382235a assets/exdeorum/blockstates/comet_crucible.json d8bf04064bb0899c4d19a1e750a5db178ec391dd assets/exdeorum/blockstates/comet_sieve.json +f99f46c75d1744674d7246c1ce7402d5e85bcb99 assets/exdeorum/blockstates/compressed_andesite.json +a181ba08f9067a96e05e88ebf7b1663977cd57b0 assets/exdeorum/blockstates/compressed_blackstone.json +c8850a8a7bd7d0de1ba356ca168b47e2ad1917fb assets/exdeorum/blockstates/compressed_cobbled_deepslate.json +456233e2e6c5d8b3e39eacb755e2c3d5a84ddaf2 assets/exdeorum/blockstates/compressed_cobblestone.json d7130b012ad87a4970a381f281effbb979f16826 assets/exdeorum/blockstates/compressed_crushed_blackstone.json d2bf32400674650c3131eb3abd6d18d17d06c336 assets/exdeorum/blockstates/compressed_crushed_deepslate.json 40147fc4e9f458439513c628702dbfa2de64d214 assets/exdeorum/blockstates/compressed_crushed_end_stone.json a1f876bb74658b7aa97407c61bfb84d224febfda assets/exdeorum/blockstates/compressed_crushed_netherrack.json +b9abfeed5b4b0c4bfbd91260f5ef05d20d6dcf20 assets/exdeorum/blockstates/compressed_deepslate.json +fb9f33bf8ce67b7afeef97886829222d15abd085 assets/exdeorum/blockstates/compressed_diorite.json bc349197df2973ebd739d6d69f1e1670baf9e118 assets/exdeorum/blockstates/compressed_dirt.json 39a42873c735e6634bb3b159a6051c169ac2f2b9 assets/exdeorum/blockstates/compressed_dust.json +2ae162bc78e1f68f8167f8ecc9b7bdc1bee10ba4 assets/exdeorum/blockstates/compressed_end_stone.json +c16788193240459d3699b5f0aed330677d0d247a assets/exdeorum/blockstates/compressed_granite.json 12bba9e6187704359f07a89d39a5d736fd3f105c assets/exdeorum/blockstates/compressed_gravel.json 2e4707a88836185b5eb2d813f39d986a970e54b8 assets/exdeorum/blockstates/compressed_moss_block.json +3e66de2627a9379b9b7c2fa0ee2d6213af54c450 assets/exdeorum/blockstates/compressed_netherrack.json 28b8930b7469228ce8c3f579c5e116d891a2b621 assets/exdeorum/blockstates/compressed_red_sand.json 28b67c1d0b23dfdab56fa5ee68d6b85747d0a3fe assets/exdeorum/blockstates/compressed_sand.json 9757be8df242461037319bebd904914c68e85f29 assets/exdeorum/blockstates/compressed_soul_sand.json @@ -178,14 +187,23 @@ faab9f9cc9d1e7e780238c2333b43bedad5699d0 assets/exdeorum/models/block/cherry_cru 639e45082e1dbf1021cbb6db5dd613c1210f6260 assets/exdeorum/models/block/comet_compressed_sieve.json 8989a71ac3dafa4b8e3dde539a4c503b5eddc1f6 assets/exdeorum/models/block/comet_crucible.json c8999b232152bf8b207a053ce4504a1344ec72cf assets/exdeorum/models/block/comet_sieve.json +28e35c2d2990f743dbb6bae0f1ebf35c2f083dea assets/exdeorum/models/block/compressed_andesite.json +fdf0eb8595105dc25bbff3678c29accfe4f195cd assets/exdeorum/models/block/compressed_blackstone.json +ff247bb828b60aa46cef56bc8f79b6b08c2f7678 assets/exdeorum/models/block/compressed_cobbled_deepslate.json +d5daabc0a1e3c866ee99e57dd858ea4d6a9aa464 assets/exdeorum/models/block/compressed_cobblestone.json 5aa977dd6386fad02b19f9cd166d7fc43d9a2d8b assets/exdeorum/models/block/compressed_crushed_blackstone.json 90489fb65b7f8c9c9d13d28b504b412fedc06e9c assets/exdeorum/models/block/compressed_crushed_deepslate.json 0d0e2c0226863b76b34ef28b1a60eb54c849fad3 assets/exdeorum/models/block/compressed_crushed_end_stone.json a58cc694d7745b12328b0bb7aa905a31146a2151 assets/exdeorum/models/block/compressed_crushed_netherrack.json +8d27f50862dc95f38dc517a3c9343304bf56c130 assets/exdeorum/models/block/compressed_deepslate.json +d4bd1065331b8e4a786539a1ebfba60a8b5587cb assets/exdeorum/models/block/compressed_diorite.json c584718556479783188648c3cacd2de016ac1e69 assets/exdeorum/models/block/compressed_dirt.json debe9b8664d37f2bccbb39bfd82e4b72d091b94b assets/exdeorum/models/block/compressed_dust.json +3d9cb1d31505757d95b7aec3fbe6ede7f5962d9b assets/exdeorum/models/block/compressed_end_stone.json +495e432dcb1e9503227e4191226526bdb47f6a2e assets/exdeorum/models/block/compressed_granite.json 87c4c4120ace5903a80d443dafaa4992c42f4bd8 assets/exdeorum/models/block/compressed_gravel.json 50b82746c3445decd81440b9305de86c4c601c21 assets/exdeorum/models/block/compressed_moss_block.json +82e9321f004d7cf7be7a677284d950ace2ca2153 assets/exdeorum/models/block/compressed_netherrack.json 524bbac2b9157018278b8a531ff546258cd7f41f assets/exdeorum/models/block/compressed_red_sand.json 2d61849e480f8ebf77bc3f7e93fe1449f009e3e6 assets/exdeorum/models/block/compressed_sand.json 2dde6518c771e0c4fd7f567e4f718bc70a310bed assets/exdeorum/models/block/compressed_soul_sand.json diff --git a/src/generated/resources/assets/exdeorum/blockstates/compressed_andesite.json b/src/generated/resources/assets/exdeorum/blockstates/compressed_andesite.json new file mode 100644 index 00000000..3156646f --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/compressed_andesite.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/compressed_andesite" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/compressed_blackstone.json b/src/generated/resources/assets/exdeorum/blockstates/compressed_blackstone.json new file mode 100644 index 00000000..b3bd48a7 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/compressed_blackstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/compressed_blackstone" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/compressed_cobbled_deepslate.json b/src/generated/resources/assets/exdeorum/blockstates/compressed_cobbled_deepslate.json new file mode 100644 index 00000000..851101b3 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/compressed_cobbled_deepslate.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/compressed_cobbled_deepslate" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/compressed_cobblestone.json b/src/generated/resources/assets/exdeorum/blockstates/compressed_cobblestone.json new file mode 100644 index 00000000..f1551c0a --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/compressed_cobblestone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/compressed_cobblestone" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/compressed_deepslate.json b/src/generated/resources/assets/exdeorum/blockstates/compressed_deepslate.json new file mode 100644 index 00000000..f2e567f6 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/compressed_deepslate.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/compressed_deepslate" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/compressed_diorite.json b/src/generated/resources/assets/exdeorum/blockstates/compressed_diorite.json new file mode 100644 index 00000000..8ba23b92 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/compressed_diorite.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/compressed_diorite" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/compressed_end_stone.json b/src/generated/resources/assets/exdeorum/blockstates/compressed_end_stone.json new file mode 100644 index 00000000..06666313 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/compressed_end_stone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/compressed_end_stone" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/compressed_granite.json b/src/generated/resources/assets/exdeorum/blockstates/compressed_granite.json new file mode 100644 index 00000000..84b382e2 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/compressed_granite.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/compressed_granite" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/blockstates/compressed_netherrack.json b/src/generated/resources/assets/exdeorum/blockstates/compressed_netherrack.json new file mode 100644 index 00000000..447fdcdd --- /dev/null +++ b/src/generated/resources/assets/exdeorum/blockstates/compressed_netherrack.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "exdeorum:block/compressed_netherrack" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/lang/en_us.json b/src/generated/resources/assets/exdeorum/lang/en_us.json index 38d55891..71d75b5a 100644 --- a/src/generated/resources/assets/exdeorum/lang/en_us.json +++ b/src/generated/resources/assets/exdeorum/lang/en_us.json @@ -37,14 +37,23 @@ "block.exdeorum.comet_compressed_sieve": "Comet Compressed Sieve", "block.exdeorum.comet_crucible": "Comet Crucible", "block.exdeorum.comet_sieve": "Comet Sieve", + "block.exdeorum.compressed_andesite": "Compressed Andesite", + "block.exdeorum.compressed_blackstone": "Compressed Blackstone", + "block.exdeorum.compressed_cobbled_deepslate": "Compressed Cobbled Deepslate", + "block.exdeorum.compressed_cobblestone": "Compressed Cobblestone", "block.exdeorum.compressed_crushed_blackstone": "Compressed Crushed Blackstone", "block.exdeorum.compressed_crushed_deepslate": "Compressed Crushed Deepslate", "block.exdeorum.compressed_crushed_end_stone": "Compressed Crushed End Stone", "block.exdeorum.compressed_crushed_netherrack": "Compressed Crushed Netherrack", + "block.exdeorum.compressed_deepslate": "Compressed Deepslate", + "block.exdeorum.compressed_diorite": "Compressed Diorite", "block.exdeorum.compressed_dirt": "Compressed Dirt", "block.exdeorum.compressed_dust": "Compressed Dust", + "block.exdeorum.compressed_end_stone": "Compressed End Stone", + "block.exdeorum.compressed_granite": "Compressed Granite", "block.exdeorum.compressed_gravel": "Compressed Gravel", "block.exdeorum.compressed_moss_block": "Compressed Moss Block", + "block.exdeorum.compressed_netherrack": "Compressed Netherrack", "block.exdeorum.compressed_red_sand": "Compressed Red Sand", "block.exdeorum.compressed_sand": "Compressed Sand", "block.exdeorum.compressed_soul_sand": "Compressed Soul Sand", @@ -179,6 +188,7 @@ "gui.exdeorum.category.barrel_fluid_mixing": "Barrel Fluid Mixing", "gui.exdeorum.category.barrel_fluid_mixing.contents_are_consumed": "Contents are consumed", "gui.exdeorum.category.barrel_mixing": "Barrel Mixing", + "gui.exdeorum.category.compressed_hammer": "Compressed Hammer", "gui.exdeorum.category.crook": "Crook", "gui.exdeorum.category.crook.requires_state": "Requires properties:", "gui.exdeorum.category.crucible_heat_source": "Crucible Heat Sources", @@ -218,6 +228,12 @@ "item.exdeorum.boron_ore_chunk": "Boron Ore Chunk", "item.exdeorum.calcite_pebble": "Calcite Pebble", "item.exdeorum.cobalt_ore_chunk": "Cobalt Ore Chunk", + "item.exdeorum.compressed_diamond_hammer": "Compressed Diamond Hammer", + "item.exdeorum.compressed_golden_hammer": "Compressed Golden Hammer", + "item.exdeorum.compressed_iron_hammer": "Compressed Iron Hammer", + "item.exdeorum.compressed_netherite_hammer": "Compressed Netherite Hammer", + "item.exdeorum.compressed_stone_hammer": "Compressed Stone Hammer", + "item.exdeorum.compressed_wooden_hammer": "Compressed Wooden Hammer", "item.exdeorum.cooked_silk_worm": "Cooked Silk Worm", "item.exdeorum.copper_ore_chunk": "Copper Ore Chunk", "item.exdeorum.crimson_nylium_spores": "Crimson Nylium Spores", diff --git a/src/generated/resources/assets/exdeorum/models/block/compressed_andesite.json b/src/generated/resources/assets/exdeorum/models/block/compressed_andesite.json new file mode 100644 index 00000000..80f0ab44 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/compressed_andesite.json @@ -0,0 +1,24 @@ +{ + "parent": "minecraft:block/block", + "children": { + "base": { + "parent": "minecraft:block/andesite", + "render_type": "minecraft:solid" + }, + "overlay": { + "parent": "minecraft:block/cube_all", + "render_type": "minecraft:translucent", + "textures": { + "all": "exdeorum:block/compressed_overlay" + } + } + }, + "item_render_order": [ + "base", + "overlay" + ], + "loader": "forge:composite", + "textures": { + "particle": "minecraft:block/andesite" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/compressed_blackstone.json b/src/generated/resources/assets/exdeorum/models/block/compressed_blackstone.json new file mode 100644 index 00000000..46b88976 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/compressed_blackstone.json @@ -0,0 +1,24 @@ +{ + "parent": "minecraft:block/block", + "children": { + "base": { + "parent": "minecraft:block/blackstone", + "render_type": "minecraft:solid" + }, + "overlay": { + "parent": "minecraft:block/cube_all", + "render_type": "minecraft:translucent", + "textures": { + "all": "exdeorum:block/compressed_overlay" + } + } + }, + "item_render_order": [ + "base", + "overlay" + ], + "loader": "forge:composite", + "textures": { + "particle": "minecraft:block/blackstone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/compressed_cobbled_deepslate.json b/src/generated/resources/assets/exdeorum/models/block/compressed_cobbled_deepslate.json new file mode 100644 index 00000000..bd35d82f --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/compressed_cobbled_deepslate.json @@ -0,0 +1,24 @@ +{ + "parent": "minecraft:block/block", + "children": { + "base": { + "parent": "minecraft:block/cobbled_deepslate", + "render_type": "minecraft:solid" + }, + "overlay": { + "parent": "minecraft:block/cube_all", + "render_type": "minecraft:translucent", + "textures": { + "all": "exdeorum:block/compressed_overlay" + } + } + }, + "item_render_order": [ + "base", + "overlay" + ], + "loader": "forge:composite", + "textures": { + "particle": "minecraft:block/cobbled_deepslate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/compressed_cobblestone.json b/src/generated/resources/assets/exdeorum/models/block/compressed_cobblestone.json new file mode 100644 index 00000000..cf88ec6e --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/compressed_cobblestone.json @@ -0,0 +1,24 @@ +{ + "parent": "minecraft:block/block", + "children": { + "base": { + "parent": "minecraft:block/cobblestone", + "render_type": "minecraft:solid" + }, + "overlay": { + "parent": "minecraft:block/cube_all", + "render_type": "minecraft:translucent", + "textures": { + "all": "exdeorum:block/compressed_overlay" + } + } + }, + "item_render_order": [ + "base", + "overlay" + ], + "loader": "forge:composite", + "textures": { + "particle": "minecraft:block/cobblestone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/compressed_deepslate.json b/src/generated/resources/assets/exdeorum/models/block/compressed_deepslate.json new file mode 100644 index 00000000..4c60cea1 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/compressed_deepslate.json @@ -0,0 +1,24 @@ +{ + "parent": "minecraft:block/block", + "children": { + "base": { + "parent": "minecraft:block/deepslate", + "render_type": "minecraft:solid" + }, + "overlay": { + "parent": "minecraft:block/cube_all", + "render_type": "minecraft:translucent", + "textures": { + "all": "exdeorum:block/compressed_overlay" + } + } + }, + "item_render_order": [ + "base", + "overlay" + ], + "loader": "forge:composite", + "textures": { + "particle": "minecraft:block/deepslate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/compressed_diorite.json b/src/generated/resources/assets/exdeorum/models/block/compressed_diorite.json new file mode 100644 index 00000000..54b1d457 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/compressed_diorite.json @@ -0,0 +1,24 @@ +{ + "parent": "minecraft:block/block", + "children": { + "base": { + "parent": "minecraft:block/diorite", + "render_type": "minecraft:solid" + }, + "overlay": { + "parent": "minecraft:block/cube_all", + "render_type": "minecraft:translucent", + "textures": { + "all": "exdeorum:block/compressed_overlay" + } + } + }, + "item_render_order": [ + "base", + "overlay" + ], + "loader": "forge:composite", + "textures": { + "particle": "minecraft:block/diorite" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/compressed_end_stone.json b/src/generated/resources/assets/exdeorum/models/block/compressed_end_stone.json new file mode 100644 index 00000000..f1b60df4 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/compressed_end_stone.json @@ -0,0 +1,24 @@ +{ + "parent": "minecraft:block/block", + "children": { + "base": { + "parent": "minecraft:block/end_stone", + "render_type": "minecraft:solid" + }, + "overlay": { + "parent": "minecraft:block/cube_all", + "render_type": "minecraft:translucent", + "textures": { + "all": "exdeorum:block/compressed_overlay" + } + } + }, + "item_render_order": [ + "base", + "overlay" + ], + "loader": "forge:composite", + "textures": { + "particle": "minecraft:block/end_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/compressed_granite.json b/src/generated/resources/assets/exdeorum/models/block/compressed_granite.json new file mode 100644 index 00000000..c72fcf87 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/compressed_granite.json @@ -0,0 +1,24 @@ +{ + "parent": "minecraft:block/block", + "children": { + "base": { + "parent": "minecraft:block/granite", + "render_type": "minecraft:solid" + }, + "overlay": { + "parent": "minecraft:block/cube_all", + "render_type": "minecraft:translucent", + "textures": { + "all": "exdeorum:block/compressed_overlay" + } + } + }, + "item_render_order": [ + "base", + "overlay" + ], + "loader": "forge:composite", + "textures": { + "particle": "minecraft:block/granite" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/block/compressed_netherrack.json b/src/generated/resources/assets/exdeorum/models/block/compressed_netherrack.json new file mode 100644 index 00000000..5ba3c143 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/block/compressed_netherrack.json @@ -0,0 +1,24 @@ +{ + "parent": "minecraft:block/block", + "children": { + "base": { + "parent": "minecraft:block/netherrack", + "render_type": "minecraft:solid" + }, + "overlay": { + "parent": "minecraft:block/cube_all", + "render_type": "minecraft:translucent", + "textures": { + "all": "exdeorum:block/compressed_overlay" + } + } + }, + "item_render_order": [ + "base", + "overlay" + ], + "loader": "forge:composite", + "textures": { + "particle": "minecraft:block/netherrack" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/compressed_andesite.json b/src/generated/resources/assets/exdeorum/models/item/compressed_andesite.json new file mode 100644 index 00000000..82a3bfea --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/compressed_andesite.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/compressed_andesite" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/compressed_blackstone.json b/src/generated/resources/assets/exdeorum/models/item/compressed_blackstone.json new file mode 100644 index 00000000..a18b80a0 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/compressed_blackstone.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/compressed_blackstone" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/compressed_cobbled_deepslate.json b/src/generated/resources/assets/exdeorum/models/item/compressed_cobbled_deepslate.json new file mode 100644 index 00000000..8b11452e --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/compressed_cobbled_deepslate.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/compressed_cobbled_deepslate" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/compressed_cobblestone.json b/src/generated/resources/assets/exdeorum/models/item/compressed_cobblestone.json new file mode 100644 index 00000000..a72b55f2 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/compressed_cobblestone.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/compressed_cobblestone" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/compressed_deepslate.json b/src/generated/resources/assets/exdeorum/models/item/compressed_deepslate.json new file mode 100644 index 00000000..3203fa2f --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/compressed_deepslate.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/compressed_deepslate" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/compressed_diamond_hammer.json b/src/generated/resources/assets/exdeorum/models/item/compressed_diamond_hammer.json new file mode 100644 index 00000000..1a1f3f09 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/compressed_diamond_hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "exdeorum:item/compressed_diamond_hammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/compressed_diorite.json b/src/generated/resources/assets/exdeorum/models/item/compressed_diorite.json new file mode 100644 index 00000000..59f61c4b --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/compressed_diorite.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/compressed_diorite" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/compressed_end_stone.json b/src/generated/resources/assets/exdeorum/models/item/compressed_end_stone.json new file mode 100644 index 00000000..bc12adfb --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/compressed_end_stone.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/compressed_end_stone" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/compressed_golden_hammer.json b/src/generated/resources/assets/exdeorum/models/item/compressed_golden_hammer.json new file mode 100644 index 00000000..7f546cdd --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/compressed_golden_hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "exdeorum:item/compressed_golden_hammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/compressed_granite.json b/src/generated/resources/assets/exdeorum/models/item/compressed_granite.json new file mode 100644 index 00000000..277b5bd8 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/compressed_granite.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/compressed_granite" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/compressed_iron_hammer.json b/src/generated/resources/assets/exdeorum/models/item/compressed_iron_hammer.json new file mode 100644 index 00000000..9844c7de --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/compressed_iron_hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "exdeorum:item/compressed_iron_hammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/compressed_netherite_hammer.json b/src/generated/resources/assets/exdeorum/models/item/compressed_netherite_hammer.json new file mode 100644 index 00000000..e6df00fa --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/compressed_netherite_hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "exdeorum:item/compressed_netherite_hammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/compressed_netherrack.json b/src/generated/resources/assets/exdeorum/models/item/compressed_netherrack.json new file mode 100644 index 00000000..85882ae3 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/compressed_netherrack.json @@ -0,0 +1,3 @@ +{ + "parent": "exdeorum:block/compressed_netherrack" +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/compressed_stone_hammer.json b/src/generated/resources/assets/exdeorum/models/item/compressed_stone_hammer.json new file mode 100644 index 00000000..bed15b23 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/compressed_stone_hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "exdeorum:item/compressed_stone_hammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/exdeorum/models/item/compressed_wooden_hammer.json b/src/generated/resources/assets/exdeorum/models/item/compressed_wooden_hammer.json new file mode 100644 index 00000000..dec3dd65 --- /dev/null +++ b/src/generated/resources/assets/exdeorum/models/item/compressed_wooden_hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "exdeorum:item/compressed_wooden_hammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/building_blocks/compressed_sand.json b/src/generated/resources/data/exdeorum/advancements/recipes/building_blocks/compressed_sand.json deleted file mode 100644 index dad4f8bd..00000000 --- a/src/generated/resources/data/exdeorum/advancements/recipes/building_blocks/compressed_sand.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:sand" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "exdeorum:compressed_sand" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "exdeorum:compressed_sand" - ] - }, - "sends_telemetry_event": true -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/building_blocks/compressed_soul_sand.json b/src/generated/resources/data/exdeorum/advancements/recipes/building_blocks/compressed_soul_sand.json deleted file mode 100644 index ab1de467..00000000 --- a/src/generated/resources/data/exdeorum/advancements/recipes/building_blocks/compressed_soul_sand.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:soul_sand" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "exdeorum:compressed_soul_sand" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "exdeorum:compressed_soul_sand" - ] - }, - "sends_telemetry_event": true -} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/misc/acacia_compressed_sieve.json b/src/generated/resources/data/exdeorum/advancements/recipes/misc/acacia_compressed_sieve.json index dd27680a..61e9ead2 100644 --- a/src/generated/resources/data/exdeorum/advancements/recipes/misc/acacia_compressed_sieve.json +++ b/src/generated/resources/data/exdeorum/advancements/recipes/misc/acacia_compressed_sieve.json @@ -5,7 +5,9 @@ "conditions": { "items": [ { - "tag": "minecraft:acacia_logs" + "items": [ + "minecraft:acacia_log" + ] } ] }, diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/misc/birch_compressed_sieve.json b/src/generated/resources/data/exdeorum/advancements/recipes/misc/birch_compressed_sieve.json index 853fd68b..f69e12db 100644 --- a/src/generated/resources/data/exdeorum/advancements/recipes/misc/birch_compressed_sieve.json +++ b/src/generated/resources/data/exdeorum/advancements/recipes/misc/birch_compressed_sieve.json @@ -5,7 +5,9 @@ "conditions": { "items": [ { - "tag": "minecraft:birch_logs" + "items": [ + "minecraft:birch_log" + ] } ] }, diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/misc/cherry_compressed_sieve.json b/src/generated/resources/data/exdeorum/advancements/recipes/misc/cherry_compressed_sieve.json index 20420bec..6228f844 100644 --- a/src/generated/resources/data/exdeorum/advancements/recipes/misc/cherry_compressed_sieve.json +++ b/src/generated/resources/data/exdeorum/advancements/recipes/misc/cherry_compressed_sieve.json @@ -5,7 +5,9 @@ "conditions": { "items": [ { - "tag": "minecraft:cherry_logs" + "items": [ + "minecraft:cherry_log" + ] } ] }, diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/misc/crimson_compressed_sieve.json b/src/generated/resources/data/exdeorum/advancements/recipes/misc/crimson_compressed_sieve.json index 1b5a9934..c9da35e6 100644 --- a/src/generated/resources/data/exdeorum/advancements/recipes/misc/crimson_compressed_sieve.json +++ b/src/generated/resources/data/exdeorum/advancements/recipes/misc/crimson_compressed_sieve.json @@ -5,7 +5,9 @@ "conditions": { "items": [ { - "tag": "minecraft:crimson_stems" + "items": [ + "minecraft:crimson_stem" + ] } ] }, diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/misc/dark_oak_compressed_sieve.json b/src/generated/resources/data/exdeorum/advancements/recipes/misc/dark_oak_compressed_sieve.json index 1397e92a..c7015297 100644 --- a/src/generated/resources/data/exdeorum/advancements/recipes/misc/dark_oak_compressed_sieve.json +++ b/src/generated/resources/data/exdeorum/advancements/recipes/misc/dark_oak_compressed_sieve.json @@ -5,7 +5,9 @@ "conditions": { "items": [ { - "tag": "minecraft:dark_oak_logs" + "items": [ + "minecraft:dark_oak_log" + ] } ] }, diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/misc/jungle_compressed_sieve.json b/src/generated/resources/data/exdeorum/advancements/recipes/misc/jungle_compressed_sieve.json index 0a66279b..0d5d77af 100644 --- a/src/generated/resources/data/exdeorum/advancements/recipes/misc/jungle_compressed_sieve.json +++ b/src/generated/resources/data/exdeorum/advancements/recipes/misc/jungle_compressed_sieve.json @@ -5,7 +5,9 @@ "conditions": { "items": [ { - "tag": "minecraft:jungle_logs" + "items": [ + "minecraft:jungle_log" + ] } ] }, diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/misc/mangrove_compressed_sieve.json b/src/generated/resources/data/exdeorum/advancements/recipes/misc/mangrove_compressed_sieve.json index 5bf22ce4..44130280 100644 --- a/src/generated/resources/data/exdeorum/advancements/recipes/misc/mangrove_compressed_sieve.json +++ b/src/generated/resources/data/exdeorum/advancements/recipes/misc/mangrove_compressed_sieve.json @@ -5,7 +5,9 @@ "conditions": { "items": [ { - "tag": "minecraft:mangrove_logs" + "items": [ + "minecraft:mangrove_log" + ] } ] }, diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/misc/oak_compressed_sieve.json b/src/generated/resources/data/exdeorum/advancements/recipes/misc/oak_compressed_sieve.json index d2cbdbf6..256064ca 100644 --- a/src/generated/resources/data/exdeorum/advancements/recipes/misc/oak_compressed_sieve.json +++ b/src/generated/resources/data/exdeorum/advancements/recipes/misc/oak_compressed_sieve.json @@ -5,7 +5,9 @@ "conditions": { "items": [ { - "tag": "minecraft:oak_logs" + "items": [ + "minecraft:oak_log" + ] } ] }, diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/misc/spruce_compressed_sieve.json b/src/generated/resources/data/exdeorum/advancements/recipes/misc/spruce_compressed_sieve.json index 4d29e353..22c833d5 100644 --- a/src/generated/resources/data/exdeorum/advancements/recipes/misc/spruce_compressed_sieve.json +++ b/src/generated/resources/data/exdeorum/advancements/recipes/misc/spruce_compressed_sieve.json @@ -5,7 +5,9 @@ "conditions": { "items": [ { - "tag": "minecraft:spruce_logs" + "items": [ + "minecraft:spruce_log" + ] } ] }, diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/misc/warped_compressed_sieve.json b/src/generated/resources/data/exdeorum/advancements/recipes/misc/warped_compressed_sieve.json index 8558b01c..6bcc64db 100644 --- a/src/generated/resources/data/exdeorum/advancements/recipes/misc/warped_compressed_sieve.json +++ b/src/generated/resources/data/exdeorum/advancements/recipes/misc/warped_compressed_sieve.json @@ -5,7 +5,9 @@ "conditions": { "items": [ { - "tag": "minecraft:warped_stems" + "items": [ + "minecraft:warped_stem" + ] } ] }, diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/tools/compressed_diamond_hammer.json b/src/generated/resources/data/exdeorum/advancements/recipes/tools/compressed_diamond_hammer.json new file mode 100644 index 00000000..18c33710 --- /dev/null +++ b/src/generated/resources/data/exdeorum/advancements/recipes/tools/compressed_diamond_hammer.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "exdeorum:diamond_hammer" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "exdeorum:compressed_diamond_hammer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "exdeorum:compressed_diamond_hammer" + ] + }, + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/building_blocks/compressed_moss_block.json b/src/generated/resources/data/exdeorum/advancements/recipes/tools/compressed_golden_hammer.json similarity index 79% rename from src/generated/resources/data/exdeorum/advancements/recipes/building_blocks/compressed_moss_block.json rename to src/generated/resources/data/exdeorum/advancements/recipes/tools/compressed_golden_hammer.json index bb863d84..866d033a 100644 --- a/src/generated/resources/data/exdeorum/advancements/recipes/building_blocks/compressed_moss_block.json +++ b/src/generated/resources/data/exdeorum/advancements/recipes/tools/compressed_golden_hammer.json @@ -6,7 +6,7 @@ "items": [ { "items": [ - "minecraft:moss_block" + "exdeorum:golden_hammer" ] } ] @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "exdeorum:compressed_moss_block" + "recipe": "exdeorum:compressed_golden_hammer" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "exdeorum:compressed_moss_block" + "exdeorum:compressed_golden_hammer" ] }, "sends_telemetry_event": true diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/building_blocks/compressed_dirt.json b/src/generated/resources/data/exdeorum/advancements/recipes/tools/compressed_iron_hammer.json similarity index 79% rename from src/generated/resources/data/exdeorum/advancements/recipes/building_blocks/compressed_dirt.json rename to src/generated/resources/data/exdeorum/advancements/recipes/tools/compressed_iron_hammer.json index fd2bb0a2..1138f932 100644 --- a/src/generated/resources/data/exdeorum/advancements/recipes/building_blocks/compressed_dirt.json +++ b/src/generated/resources/data/exdeorum/advancements/recipes/tools/compressed_iron_hammer.json @@ -6,7 +6,7 @@ "items": [ { "items": [ - "minecraft:dirt" + "exdeorum:iron_hammer" ] } ] @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "exdeorum:compressed_dirt" + "recipe": "exdeorum:compressed_iron_hammer" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "exdeorum:compressed_dirt" + "exdeorum:compressed_iron_hammer" ] }, "sends_telemetry_event": true diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/tools/compressed_netherite_hammer.json b/src/generated/resources/data/exdeorum/advancements/recipes/tools/compressed_netherite_hammer.json new file mode 100644 index 00000000..bbed539e --- /dev/null +++ b/src/generated/resources/data/exdeorum/advancements/recipes/tools/compressed_netherite_hammer.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "exdeorum:netherite_hammer" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "exdeorum:compressed_netherite_hammer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "exdeorum:compressed_netherite_hammer" + ] + }, + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/building_blocks/compressed_gravel.json b/src/generated/resources/data/exdeorum/advancements/recipes/tools/compressed_stone_hammer.json similarity index 79% rename from src/generated/resources/data/exdeorum/advancements/recipes/building_blocks/compressed_gravel.json rename to src/generated/resources/data/exdeorum/advancements/recipes/tools/compressed_stone_hammer.json index 9393b99a..4f104995 100644 --- a/src/generated/resources/data/exdeorum/advancements/recipes/building_blocks/compressed_gravel.json +++ b/src/generated/resources/data/exdeorum/advancements/recipes/tools/compressed_stone_hammer.json @@ -6,7 +6,7 @@ "items": [ { "items": [ - "minecraft:gravel" + "exdeorum:stone_hammer" ] } ] @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "exdeorum:compressed_gravel" + "recipe": "exdeorum:compressed_stone_hammer" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "exdeorum:compressed_gravel" + "exdeorum:compressed_stone_hammer" ] }, "sends_telemetry_event": true diff --git a/src/generated/resources/data/exdeorum/advancements/recipes/building_blocks/compressed_red_sand.json b/src/generated/resources/data/exdeorum/advancements/recipes/tools/compressed_wooden_hammer.json similarity index 79% rename from src/generated/resources/data/exdeorum/advancements/recipes/building_blocks/compressed_red_sand.json rename to src/generated/resources/data/exdeorum/advancements/recipes/tools/compressed_wooden_hammer.json index 1ee9d51c..e9b590b8 100644 --- a/src/generated/resources/data/exdeorum/advancements/recipes/building_blocks/compressed_red_sand.json +++ b/src/generated/resources/data/exdeorum/advancements/recipes/tools/compressed_wooden_hammer.json @@ -6,7 +6,7 @@ "items": [ { "items": [ - "minecraft:red_sand" + "exdeorum:wooden_hammer" ] } ] @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "exdeorum:compressed_red_sand" + "recipe": "exdeorum:compressed_wooden_hammer" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "exdeorum:compressed_red_sand" + "exdeorum:compressed_wooden_hammer" ] }, "sends_telemetry_event": true diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_andesite.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_andesite.json new file mode 100644 index 00000000..14499f84 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_andesite.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:compressed_andesite" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/compressed_andesite" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_blackstone.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_blackstone.json new file mode 100644 index 00000000..0c905796 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_blackstone.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:compressed_blackstone" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/compressed_blackstone" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_cobbled_deepslate.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_cobbled_deepslate.json new file mode 100644 index 00000000..152ba754 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_cobbled_deepslate.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:compressed_cobbled_deepslate" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/compressed_cobbled_deepslate" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_cobblestone.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_cobblestone.json new file mode 100644 index 00000000..23ea276a --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_cobblestone.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:compressed_cobblestone" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/compressed_cobblestone" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_deepslate.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_deepslate.json new file mode 100644 index 00000000..6af07c2d --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_deepslate.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:compressed_deepslate" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/compressed_deepslate" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_diorite.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_diorite.json new file mode 100644 index 00000000..b560b4d0 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_diorite.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:compressed_diorite" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/compressed_diorite" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_end_stone.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_end_stone.json new file mode 100644 index 00000000..7913a36e --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_end_stone.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:compressed_end_stone" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/compressed_end_stone" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_granite.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_granite.json new file mode 100644 index 00000000..945b1d08 --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_granite.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:compressed_granite" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/compressed_granite" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_netherrack.json b/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_netherrack.json new file mode 100644 index 00000000..3e0347cd --- /dev/null +++ b/src/generated/resources/data/exdeorum/loot_tables/blocks/compressed_netherrack.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "exdeorum:compressed_netherrack" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "exdeorum:blocks/compressed_netherrack" +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/acacia_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/acacia_compressed_sieve.json index 9f890b5a..46614eaa 100644 --- a/src/generated/resources/data/exdeorum/recipes/acacia_compressed_sieve.json +++ b/src/generated/resources/data/exdeorum/recipes/acacia_compressed_sieve.json @@ -6,7 +6,7 @@ "tag": "forge:rods/wooden" }, "O": { - "tag": "minecraft:acacia_logs" + "item": "minecraft:acacia_log" }, "_": { "tag": "forge:ingots/iron" diff --git a/src/generated/resources/data/exdeorum/recipes/birch_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/birch_compressed_sieve.json index f3d2cb2b..6ee04949 100644 --- a/src/generated/resources/data/exdeorum/recipes/birch_compressed_sieve.json +++ b/src/generated/resources/data/exdeorum/recipes/birch_compressed_sieve.json @@ -6,7 +6,7 @@ "tag": "forge:rods/wooden" }, "O": { - "tag": "minecraft:birch_logs" + "item": "minecraft:birch_log" }, "_": { "tag": "forge:ingots/iron" diff --git a/src/generated/resources/data/exdeorum/recipes/blue_archwood_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/blue_archwood_compressed_sieve.json new file mode 100644 index 00000000..cd70660f --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/blue_archwood_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ars_nouveau" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "ars_nouveau:blue_archwood_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:blue_archwood_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/bluebright_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/bluebright_compressed_sieve.json new file mode 100644 index 00000000..b2fcd503 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/bluebright_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "blue_skies" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "blue_skies:bluebright_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:bluebright_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/cherry_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/cherry_compressed_sieve.json index 6f42cf3c..53a1e5c8 100644 --- a/src/generated/resources/data/exdeorum/recipes/cherry_compressed_sieve.json +++ b/src/generated/resources/data/exdeorum/recipes/cherry_compressed_sieve.json @@ -6,7 +6,7 @@ "tag": "forge:rods/wooden" }, "O": { - "tag": "minecraft:cherry_logs" + "item": "minecraft:cherry_log" }, "_": { "tag": "forge:ingots/iron" diff --git a/src/generated/resources/data/exdeorum/recipes/comet_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/comet_compressed_sieve.json new file mode 100644 index 00000000..0a89e087 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/comet_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "blue_skies" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "blue_skies:comet_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:comet_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_andesite.json b/src/generated/resources/data/exdeorum/recipes/compressed_andesite.json new file mode 100644 index 00000000..e28afa0c --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_andesite.json @@ -0,0 +1,41 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "allthecompressed" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "compressium" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "minecraft:andesite" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_andesite" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_blackstone.json b/src/generated/resources/data/exdeorum/recipes/compressed_blackstone.json new file mode 100644 index 00000000..fea9213c --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_blackstone.json @@ -0,0 +1,34 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "allthecompressed" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "minecraft:blackstone" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_blackstone" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_cobbled_deepslate.json b/src/generated/resources/data/exdeorum/recipes/compressed_cobbled_deepslate.json new file mode 100644 index 00000000..1f7782d4 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_cobbled_deepslate.json @@ -0,0 +1,34 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "allthecompressed" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "minecraft:cobbled_deepslate" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_cobbled_deepslate" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_cobblestone.json b/src/generated/resources/data/exdeorum/recipes/compressed_cobblestone.json new file mode 100644 index 00000000..f27a70e4 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_cobblestone.json @@ -0,0 +1,41 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "allthecompressed" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "compressium" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "minecraft:cobblestone" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_cobblestone" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_deepslate.json b/src/generated/resources/data/exdeorum/recipes/compressed_deepslate.json new file mode 100644 index 00000000..0a985ba5 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_deepslate.json @@ -0,0 +1,34 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "allthecompressed" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "minecraft:deepslate" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_deepslate" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_diamond_hammer.json b/src/generated/resources/data/exdeorum/recipes/compressed_diamond_hammer.json new file mode 100644 index 00000000..f9015a14 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_diamond_hammer.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "exdeorum:diamond_hammer" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_diamond_hammer" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_diorite.json b/src/generated/resources/data/exdeorum/recipes/compressed_diorite.json new file mode 100644 index 00000000..f35a9dfa --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_diorite.json @@ -0,0 +1,41 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "allthecompressed" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "compressium" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "minecraft:diorite" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_diorite" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_dirt.json b/src/generated/resources/data/exdeorum/recipes/compressed_dirt.json index a6ca71e0..cd31f3da 100644 --- a/src/generated/resources/data/exdeorum/recipes/compressed_dirt.json +++ b/src/generated/resources/data/exdeorum/recipes/compressed_dirt.json @@ -1,18 +1,41 @@ { - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "#": { - "item": "minecraft:dirt" + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "allthecompressed" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "compressium" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "minecraft:dirt" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_dirt" + }, + "show_notification": true + } } - }, - "pattern": [ - "###", - "###", - "###" - ], - "result": { - "item": "exdeorum:compressed_dirt" - }, - "show_notification": true + ] } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_end_stone.json b/src/generated/resources/data/exdeorum/recipes/compressed_end_stone.json new file mode 100644 index 00000000..581a85ae --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_end_stone.json @@ -0,0 +1,34 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "allthecompressed" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "minecraft:end_stone" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_end_stone" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_golden_hammer.json b/src/generated/resources/data/exdeorum/recipes/compressed_golden_hammer.json new file mode 100644 index 00000000..5dfbd282 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_golden_hammer.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "exdeorum:golden_hammer" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_golden_hammer" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_granite.json b/src/generated/resources/data/exdeorum/recipes/compressed_granite.json new file mode 100644 index 00000000..8e0e6845 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_granite.json @@ -0,0 +1,41 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "allthecompressed" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "compressium" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "minecraft:granite" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_granite" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_gravel.json b/src/generated/resources/data/exdeorum/recipes/compressed_gravel.json index b7941003..94a3f031 100644 --- a/src/generated/resources/data/exdeorum/recipes/compressed_gravel.json +++ b/src/generated/resources/data/exdeorum/recipes/compressed_gravel.json @@ -1,18 +1,41 @@ { - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "#": { - "item": "minecraft:gravel" + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "allthecompressed" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "compressium" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "minecraft:gravel" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_gravel" + }, + "show_notification": true + } } - }, - "pattern": [ - "###", - "###", - "###" - ], - "result": { - "item": "exdeorum:compressed_gravel" - }, - "show_notification": true + ] } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_hammer/crushed_blackstone.json b/src/generated/resources/data/exdeorum/recipes/compressed_hammer/crushed_blackstone.json new file mode 100644 index 00000000..f1acbaac --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_hammer/crushed_blackstone.json @@ -0,0 +1,8 @@ +{ + "type": "exdeorum:compressed_hammer", + "ingredient": { + "tag": "exdeorum:compressed/blackstone" + }, + "result": "exdeorum:crushed_blackstone", + "result_amount": 9.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_hammer/crushed_deepslate.json b/src/generated/resources/data/exdeorum/recipes/compressed_hammer/crushed_deepslate.json new file mode 100644 index 00000000..414983e3 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_hammer/crushed_deepslate.json @@ -0,0 +1,13 @@ +{ + "type": "exdeorum:compressed_hammer", + "ingredient": [ + { + "tag": "exdeorum:compressed/deepslate" + }, + { + "tag": "exdeorum:compressed/cobbled_deepslate" + } + ], + "result": "exdeorum:crushed_deepslate", + "result_amount": 9.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_hammer/crushed_end_stone.json b/src/generated/resources/data/exdeorum/recipes/compressed_hammer/crushed_end_stone.json new file mode 100644 index 00000000..e0153e75 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_hammer/crushed_end_stone.json @@ -0,0 +1,8 @@ +{ + "type": "exdeorum:compressed_hammer", + "ingredient": { + "tag": "exdeorum:compressed/end_stone" + }, + "result": "exdeorum:crushed_end_stone", + "result_amount": 9.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_hammer/crushed_netherrack.json b/src/generated/resources/data/exdeorum/recipes/compressed_hammer/crushed_netherrack.json new file mode 100644 index 00000000..c6535b34 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_hammer/crushed_netherrack.json @@ -0,0 +1,8 @@ +{ + "type": "exdeorum:compressed_hammer", + "ingredient": { + "tag": "exdeorum:compressed/netherrack" + }, + "result": "exdeorum:crushed_netherrack", + "result_amount": 9.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_hammer/dust.json b/src/generated/resources/data/exdeorum/recipes/compressed_hammer/dust.json new file mode 100644 index 00000000..aee5b597 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_hammer/dust.json @@ -0,0 +1,8 @@ +{ + "type": "exdeorum:compressed_hammer", + "ingredient": { + "tag": "exdeorum:compressed/sands" + }, + "result": "exdeorum:dust", + "result_amount": 9.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_hammer/gravel.json b/src/generated/resources/data/exdeorum/recipes/compressed_hammer/gravel.json new file mode 100644 index 00000000..abf21f94 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_hammer/gravel.json @@ -0,0 +1,19 @@ +{ + "type": "exdeorum:compressed_hammer", + "ingredient": [ + { + "tag": "exdeorum:compressed/cobblestone" + }, + { + "tag": "exdeorum:compressed/diorite" + }, + { + "tag": "exdeorum:compressed/granite" + }, + { + "tag": "exdeorum:compressed/andesite" + } + ], + "result": "minecraft:gravel", + "result_amount": 9.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_hammer/red_sand.json b/src/generated/resources/data/exdeorum/recipes/compressed_hammer/red_sand.json new file mode 100644 index 00000000..38d9e417 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_hammer/red_sand.json @@ -0,0 +1,8 @@ +{ + "type": "exdeorum:compressed_hammer", + "ingredient": { + "tag": "exdeorum:compressed/crushed_netherrack" + }, + "result": "minecraft:red_sand", + "result_amount": 9.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_hammer/sand.json b/src/generated/resources/data/exdeorum/recipes/compressed_hammer/sand.json new file mode 100644 index 00000000..05767070 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_hammer/sand.json @@ -0,0 +1,8 @@ +{ + "type": "exdeorum:compressed_hammer", + "ingredient": { + "tag": "exdeorum:compressed/gravel" + }, + "result": "minecraft:sand", + "result_amount": 9.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_iron_hammer.json b/src/generated/resources/data/exdeorum/recipes/compressed_iron_hammer.json new file mode 100644 index 00000000..b0b43fec --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_iron_hammer.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "exdeorum:iron_hammer" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_iron_hammer" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_moss_block.json b/src/generated/resources/data/exdeorum/recipes/compressed_moss_block.json index ad696f1b..c755c278 100644 --- a/src/generated/resources/data/exdeorum/recipes/compressed_moss_block.json +++ b/src/generated/resources/data/exdeorum/recipes/compressed_moss_block.json @@ -1,18 +1,34 @@ { - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "#": { - "item": "minecraft:moss_block" + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "allthecompressed" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "minecraft:moss_block" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_moss_block" + }, + "show_notification": true + } } - }, - "pattern": [ - "###", - "###", - "###" - ], - "result": { - "item": "exdeorum:compressed_moss_block" - }, - "show_notification": true + ] } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_netherite_hammer.json b/src/generated/resources/data/exdeorum/recipes/compressed_netherite_hammer.json new file mode 100644 index 00000000..36f04d07 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_netherite_hammer.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "exdeorum:netherite_hammer" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_netherite_hammer" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_netherrack.json b/src/generated/resources/data/exdeorum/recipes/compressed_netherrack.json new file mode 100644 index 00000000..3660277b --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_netherrack.json @@ -0,0 +1,41 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "allthecompressed" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "compressium" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "minecraft:netherrack" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_netherrack" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_red_sand.json b/src/generated/resources/data/exdeorum/recipes/compressed_red_sand.json index 3024dd03..e08ca3a9 100644 --- a/src/generated/resources/data/exdeorum/recipes/compressed_red_sand.json +++ b/src/generated/resources/data/exdeorum/recipes/compressed_red_sand.json @@ -1,18 +1,41 @@ { - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "#": { - "item": "minecraft:red_sand" + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "allthecompressed" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "compressium" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "minecraft:red_sand" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_red_sand" + }, + "show_notification": true + } } - }, - "pattern": [ - "###", - "###", - "###" - ], - "result": { - "item": "exdeorum:compressed_red_sand" - }, - "show_notification": true + ] } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_sand.json b/src/generated/resources/data/exdeorum/recipes/compressed_sand.json index 1089dc30..27df9000 100644 --- a/src/generated/resources/data/exdeorum/recipes/compressed_sand.json +++ b/src/generated/resources/data/exdeorum/recipes/compressed_sand.json @@ -1,18 +1,41 @@ { - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "#": { - "item": "minecraft:sand" + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "allthecompressed" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "compressium" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "minecraft:sand" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_sand" + }, + "show_notification": true + } } - }, - "pattern": [ - "###", - "###", - "###" - ], - "result": { - "item": "exdeorum:compressed_sand" - }, - "show_notification": true + ] } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_soul_sand.json b/src/generated/resources/data/exdeorum/recipes/compressed_soul_sand.json index f1ae826c..68aba118 100644 --- a/src/generated/resources/data/exdeorum/recipes/compressed_soul_sand.json +++ b/src/generated/resources/data/exdeorum/recipes/compressed_soul_sand.json @@ -1,18 +1,41 @@ { - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "#": { - "item": "minecraft:soul_sand" + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "allthecompressed" + } + }, + { + "type": "forge:not", + "value": { + "type": "forge:mod_loaded", + "modid": "compressium" + } + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "minecraft:soul_sand" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_soul_sand" + }, + "show_notification": true + } } - }, - "pattern": [ - "###", - "###", - "###" - ], - "result": { - "item": "exdeorum:compressed_soul_sand" - }, - "show_notification": true + ] } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_stone_hammer.json b/src/generated/resources/data/exdeorum/recipes/compressed_stone_hammer.json new file mode 100644 index 00000000..bc0fc474 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_stone_hammer.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "exdeorum:stone_hammer" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_stone_hammer" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/compressed_wooden_hammer.json b/src/generated/resources/data/exdeorum/recipes/compressed_wooden_hammer.json new file mode 100644 index 00000000..3e7b44d1 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/compressed_wooden_hammer.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "exdeorum:wooden_hammer" + } + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "item": "exdeorum:compressed_wooden_hammer" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/crimson_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/crimson_compressed_sieve.json index 822d126c..5abb9fb3 100644 --- a/src/generated/resources/data/exdeorum/recipes/crimson_compressed_sieve.json +++ b/src/generated/resources/data/exdeorum/recipes/crimson_compressed_sieve.json @@ -6,7 +6,7 @@ "tag": "forge:rods/wooden" }, "O": { - "tag": "minecraft:crimson_stems" + "item": "minecraft:crimson_stem" }, "_": { "tag": "forge:ingots/iron" diff --git a/src/generated/resources/data/exdeorum/recipes/crystallized_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/crystallized_compressed_sieve.json new file mode 100644 index 00000000..604f60a7 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/crystallized_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "blue_skies" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "blue_skies:crystallized_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:crystallized_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/dark_oak_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/dark_oak_compressed_sieve.json index cd3c7259..9fe1b4e0 100644 --- a/src/generated/resources/data/exdeorum/recipes/dark_oak_compressed_sieve.json +++ b/src/generated/resources/data/exdeorum/recipes/dark_oak_compressed_sieve.json @@ -6,7 +6,7 @@ "tag": "forge:rods/wooden" }, "O": { - "tag": "minecraft:dark_oak_logs" + "item": "minecraft:dark_oak_log" }, "_": { "tag": "forge:ingots/iron" diff --git a/src/generated/resources/data/exdeorum/recipes/dead_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/dead_compressed_sieve.json new file mode 100644 index 00000000..2dab76d3 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/dead_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "biomesoplenty:dead_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:dead_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/dusk_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/dusk_compressed_sieve.json new file mode 100644 index 00000000..e06b04f7 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/dusk_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "blue_skies" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "blue_skies:dusk_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:dusk_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/fir_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/fir_compressed_sieve.json new file mode 100644 index 00000000..2682787d --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/fir_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "biomesoplenty:fir_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:fir_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/frostbright_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/frostbright_compressed_sieve.json new file mode 100644 index 00000000..e0fb0c29 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/frostbright_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "blue_skies" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "blue_skies:frostbright_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:frostbright_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/golden_oak_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/golden_oak_compressed_sieve.json new file mode 100644 index 00000000..d6779f0d --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/golden_oak_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "aether:golden_oak_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:golden_oak_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/green_archwood_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/green_archwood_compressed_sieve.json new file mode 100644 index 00000000..66712804 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/green_archwood_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ars_nouveau" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "ars_nouveau:green_archwood_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:green_archwood_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/hellbark_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/hellbark_compressed_sieve.json new file mode 100644 index 00000000..5de0e735 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/hellbark_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "biomesoplenty:hellbark_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:hellbark_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/jacaranda_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/jacaranda_compressed_sieve.json new file mode 100644 index 00000000..beca6263 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/jacaranda_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "biomesoplenty:jacaranda_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:jacaranda_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/jungle_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/jungle_compressed_sieve.json index f704d67f..1c9f110f 100644 --- a/src/generated/resources/data/exdeorum/recipes/jungle_compressed_sieve.json +++ b/src/generated/resources/data/exdeorum/recipes/jungle_compressed_sieve.json @@ -6,7 +6,7 @@ "tag": "forge:rods/wooden" }, "O": { - "tag": "minecraft:jungle_logs" + "item": "minecraft:jungle_log" }, "_": { "tag": "forge:ingots/iron" diff --git a/src/generated/resources/data/exdeorum/recipes/lunar_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/lunar_compressed_sieve.json new file mode 100644 index 00000000..91dc197a --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/lunar_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "blue_skies" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "blue_skies:lunar_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:lunar_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/magic_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/magic_compressed_sieve.json new file mode 100644 index 00000000..e14452df --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/magic_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "biomesoplenty:magic_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:magic_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/mahogany_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/mahogany_compressed_sieve.json new file mode 100644 index 00000000..5c2d74d3 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/mahogany_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "biomesoplenty:mahogany_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:mahogany_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/mangrove_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/mangrove_compressed_sieve.json index a83a44c3..7797b07c 100644 --- a/src/generated/resources/data/exdeorum/recipes/mangrove_compressed_sieve.json +++ b/src/generated/resources/data/exdeorum/recipes/mangrove_compressed_sieve.json @@ -6,7 +6,7 @@ "tag": "forge:rods/wooden" }, "O": { - "tag": "minecraft:mangrove_logs" + "item": "minecraft:mangrove_log" }, "_": { "tag": "forge:ingots/iron" diff --git a/src/generated/resources/data/exdeorum/recipes/maple_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/maple_compressed_sieve.json new file mode 100644 index 00000000..17fdda67 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/maple_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "blue_skies" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "blue_skies:maple_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:maple_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/oak_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/oak_compressed_sieve.json index 338bf01e..4d82a7b2 100644 --- a/src/generated/resources/data/exdeorum/recipes/oak_compressed_sieve.json +++ b/src/generated/resources/data/exdeorum/recipes/oak_compressed_sieve.json @@ -6,7 +6,7 @@ "tag": "forge:rods/wooden" }, "O": { - "tag": "minecraft:oak_logs" + "item": "minecraft:oak_log" }, "_": { "tag": "forge:ingots/iron" diff --git a/src/generated/resources/data/exdeorum/recipes/palm_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/palm_compressed_sieve.json new file mode 100644 index 00000000..1a415ddc --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/palm_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "biomesoplenty:palm_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:palm_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/purple_archwood_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/purple_archwood_compressed_sieve.json new file mode 100644 index 00000000..b62392c1 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/purple_archwood_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ars_nouveau" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "ars_nouveau:purple_archwood_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:purple_archwood_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/red_archwood_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/red_archwood_compressed_sieve.json new file mode 100644 index 00000000..e5cdac88 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/red_archwood_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ars_nouveau" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "ars_nouveau:red_archwood_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:red_archwood_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/redwood_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/redwood_compressed_sieve.json new file mode 100644 index 00000000..6cf4d20e --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/redwood_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "biomesoplenty:redwood_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:redwood_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/skyroot_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/skyroot_compressed_sieve.json new file mode 100644 index 00000000..fd5e1f71 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/skyroot_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "aether" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "aether:skyroot_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:skyroot_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/spruce_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/spruce_compressed_sieve.json index c34b4df9..5f9ddae1 100644 --- a/src/generated/resources/data/exdeorum/recipes/spruce_compressed_sieve.json +++ b/src/generated/resources/data/exdeorum/recipes/spruce_compressed_sieve.json @@ -6,7 +6,7 @@ "tag": "forge:rods/wooden" }, "O": { - "tag": "minecraft:spruce_logs" + "item": "minecraft:spruce_log" }, "_": { "tag": "forge:ingots/iron" diff --git a/src/generated/resources/data/exdeorum/recipes/starlit_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/starlit_compressed_sieve.json new file mode 100644 index 00000000..35194054 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/starlit_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "blue_skies" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "blue_skies:starlit_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:starlit_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/umbran_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/umbran_compressed_sieve.json new file mode 100644 index 00000000..fe14bc20 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/umbran_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "biomesoplenty:umbran_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:umbran_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/recipes/warped_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/warped_compressed_sieve.json index e3fabdc0..239a18c4 100644 --- a/src/generated/resources/data/exdeorum/recipes/warped_compressed_sieve.json +++ b/src/generated/resources/data/exdeorum/recipes/warped_compressed_sieve.json @@ -6,7 +6,7 @@ "tag": "forge:rods/wooden" }, "O": { - "tag": "minecraft:warped_stems" + "item": "minecraft:warped_stem" }, "_": { "tag": "forge:ingots/iron" diff --git a/src/generated/resources/data/exdeorum/recipes/willow_compressed_sieve.json b/src/generated/resources/data/exdeorum/recipes/willow_compressed_sieve.json new file mode 100644 index 00000000..27454c30 --- /dev/null +++ b/src/generated/resources/data/exdeorum/recipes/willow_compressed_sieve.json @@ -0,0 +1,37 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "biomesoplenty" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "forge:rods/wooden" + }, + "O": { + "item": "biomesoplenty:willow_log" + }, + "_": { + "tag": "forge:ingots/iron" + } + }, + "pattern": [ + "O O", + "O_O", + "I I" + ], + "result": { + "item": "exdeorum:willow_compressed_sieve" + }, + "show_notification": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/tags/items/compressed/andesite.json b/src/generated/resources/data/exdeorum/tags/items/compressed/andesite.json new file mode 100644 index 00000000..f3e63b23 --- /dev/null +++ b/src/generated/resources/data/exdeorum/tags/items/compressed/andesite.json @@ -0,0 +1,13 @@ +{ + "values": [ + "exdeorum:compressed_andesite", + { + "id": "allthecompressed:andesite_1x", + "required": false + }, + { + "id": "compressium:andesite_1", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/tags/items/compressed/blackstone.json b/src/generated/resources/data/exdeorum/tags/items/compressed/blackstone.json new file mode 100644 index 00000000..31b28222 --- /dev/null +++ b/src/generated/resources/data/exdeorum/tags/items/compressed/blackstone.json @@ -0,0 +1,9 @@ +{ + "values": [ + "exdeorum:compressed_blackstone", + { + "id": "allthecompressed:blackstone_1x", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/tags/items/compressed/cobbled_deepslate.json b/src/generated/resources/data/exdeorum/tags/items/compressed/cobbled_deepslate.json new file mode 100644 index 00000000..8a9c105e --- /dev/null +++ b/src/generated/resources/data/exdeorum/tags/items/compressed/cobbled_deepslate.json @@ -0,0 +1,9 @@ +{ + "values": [ + "exdeorum:compressed_cobbled_deepslate", + { + "id": "allthecompressed:cobbled_deepslate_1x", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/tags/items/compressed/cobblestone.json b/src/generated/resources/data/exdeorum/tags/items/compressed/cobblestone.json new file mode 100644 index 00000000..9d041c2b --- /dev/null +++ b/src/generated/resources/data/exdeorum/tags/items/compressed/cobblestone.json @@ -0,0 +1,17 @@ +{ + "values": [ + { + "id": "cyclic:compressed_cobblestone", + "required": false + }, + "exdeorum:compressed_cobblestone", + { + "id": "allthecompressed:cobblestone_1x", + "required": false + }, + { + "id": "compressium:cobblestone_1", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/tags/items/compressed/deepslate.json b/src/generated/resources/data/exdeorum/tags/items/compressed/deepslate.json new file mode 100644 index 00000000..02eb8c53 --- /dev/null +++ b/src/generated/resources/data/exdeorum/tags/items/compressed/deepslate.json @@ -0,0 +1,9 @@ +{ + "values": [ + "exdeorum:compressed_deepslate", + { + "id": "allthecompressed:deepslate_1x", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/tags/items/compressed/diorite.json b/src/generated/resources/data/exdeorum/tags/items/compressed/diorite.json new file mode 100644 index 00000000..4cc5b660 --- /dev/null +++ b/src/generated/resources/data/exdeorum/tags/items/compressed/diorite.json @@ -0,0 +1,13 @@ +{ + "values": [ + "exdeorum:compressed_diorite", + { + "id": "allthecompressed:diorite_1x", + "required": false + }, + { + "id": "compressium:diorite_1", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/tags/items/compressed/dirt.json b/src/generated/resources/data/exdeorum/tags/items/compressed/dirt.json index fa2ebbc1..4d8991b1 100644 --- a/src/generated/resources/data/exdeorum/tags/items/compressed/dirt.json +++ b/src/generated/resources/data/exdeorum/tags/items/compressed/dirt.json @@ -4,6 +4,10 @@ { "id": "allthecompressed:dirt_1x", "required": false + }, + { + "id": "compressium:dirt_1", + "required": false } ] } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/tags/items/compressed/end_stone.json b/src/generated/resources/data/exdeorum/tags/items/compressed/end_stone.json new file mode 100644 index 00000000..e42a5784 --- /dev/null +++ b/src/generated/resources/data/exdeorum/tags/items/compressed/end_stone.json @@ -0,0 +1,9 @@ +{ + "values": [ + "exdeorum:compressed_end_stone", + { + "id": "allthecompressed:end_stone_1x", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/tags/items/compressed/granite.json b/src/generated/resources/data/exdeorum/tags/items/compressed/granite.json new file mode 100644 index 00000000..f0ab6661 --- /dev/null +++ b/src/generated/resources/data/exdeorum/tags/items/compressed/granite.json @@ -0,0 +1,13 @@ +{ + "values": [ + "exdeorum:compressed_granite", + { + "id": "allthecompressed:granite_1x", + "required": false + }, + { + "id": "compressium:granite_1", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/tags/items/compressed/gravel.json b/src/generated/resources/data/exdeorum/tags/items/compressed/gravel.json index c01cebaa..0493c18d 100644 --- a/src/generated/resources/data/exdeorum/tags/items/compressed/gravel.json +++ b/src/generated/resources/data/exdeorum/tags/items/compressed/gravel.json @@ -4,6 +4,10 @@ { "id": "allthecompressed:gravel_1x", "required": false + }, + { + "id": "compressium:gravel_1", + "required": false } ] } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/tags/items/compressed/netherrack.json b/src/generated/resources/data/exdeorum/tags/items/compressed/netherrack.json new file mode 100644 index 00000000..98702b7c --- /dev/null +++ b/src/generated/resources/data/exdeorum/tags/items/compressed/netherrack.json @@ -0,0 +1,13 @@ +{ + "values": [ + "exdeorum:compressed_netherrack", + { + "id": "allthecompressed:netherrack_1x", + "required": false + }, + { + "id": "compressium:netherrack_1", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/tags/items/compressed/red_sand.json b/src/generated/resources/data/exdeorum/tags/items/compressed/red_sand.json index d00258c0..21aad0c5 100644 --- a/src/generated/resources/data/exdeorum/tags/items/compressed/red_sand.json +++ b/src/generated/resources/data/exdeorum/tags/items/compressed/red_sand.json @@ -4,6 +4,10 @@ { "id": "allthecompressed:red_sand_1x", "required": false + }, + { + "id": "compressium:red_sand_1", + "required": false } ] } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/tags/items/compressed/sand.json b/src/generated/resources/data/exdeorum/tags/items/compressed/sand.json index 487b44bd..99646cc7 100644 --- a/src/generated/resources/data/exdeorum/tags/items/compressed/sand.json +++ b/src/generated/resources/data/exdeorum/tags/items/compressed/sand.json @@ -4,6 +4,10 @@ { "id": "allthecompressed:sand_1x", "required": false + }, + { + "id": "compressium:sand_1", + "required": false } ] } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/tags/items/compressed/sands.json b/src/generated/resources/data/exdeorum/tags/items/compressed/sands.json new file mode 100644 index 00000000..031d51ba --- /dev/null +++ b/src/generated/resources/data/exdeorum/tags/items/compressed/sands.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#exdeorum:compressed/sand", + "#exdeorum:compressed/red_sand" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/tags/items/compressed/soul_sand.json b/src/generated/resources/data/exdeorum/tags/items/compressed/soul_sand.json index 5490b48b..28b9185b 100644 --- a/src/generated/resources/data/exdeorum/tags/items/compressed/soul_sand.json +++ b/src/generated/resources/data/exdeorum/tags/items/compressed/soul_sand.json @@ -4,6 +4,10 @@ { "id": "allthecompressed:soul_sand_1x", "required": false + }, + { + "id": "compressium:soul_sand_1", + "required": false } ] } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/tags/items/compressed_hammers.json b/src/generated/resources/data/exdeorum/tags/items/compressed_hammers.json new file mode 100644 index 00000000..dd829048 --- /dev/null +++ b/src/generated/resources/data/exdeorum/tags/items/compressed_hammers.json @@ -0,0 +1,10 @@ +{ + "values": [ + "exdeorum:compressed_wooden_hammer", + "exdeorum:compressed_stone_hammer", + "exdeorum:compressed_golden_hammer", + "exdeorum:compressed_iron_hammer", + "exdeorum:compressed_diamond_hammer", + "exdeorum:compressed_netherite_hammer" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/andesite_from_compressed_andesite.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/andesite_from_compressed_andesite.json new file mode 100644 index 00000000..699aaaa0 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/andesite_from_compressed_andesite.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "exdeorum:compressed_andesite" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:andesite_from_compressed_andesite" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:andesite_from_compressed_andesite" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/blackstone_from_compressed_blackstone.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/blackstone_from_compressed_blackstone.json new file mode 100644 index 00000000..083a6b78 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/blackstone_from_compressed_blackstone.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "exdeorum:compressed_blackstone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:blackstone_from_compressed_blackstone" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:blackstone_from_compressed_blackstone" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/cobbled_deepslate_from_compressed_cobbled_deepslate.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/cobbled_deepslate_from_compressed_cobbled_deepslate.json new file mode 100644 index 00000000..5124723b --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/cobbled_deepslate_from_compressed_cobbled_deepslate.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "exdeorum:compressed_cobbled_deepslate" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cobbled_deepslate_from_compressed_cobbled_deepslate" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cobbled_deepslate_from_compressed_cobbled_deepslate" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/cobblestone_from_compressed_cobblestone.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/cobblestone_from_compressed_cobblestone.json new file mode 100644 index 00000000..d7f9321c --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/cobblestone_from_compressed_cobblestone.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "exdeorum:compressed_cobblestone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cobblestone_from_compressed_cobblestone" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cobblestone_from_compressed_cobblestone" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/deepslate_from_compressed_deepslate.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/deepslate_from_compressed_deepslate.json new file mode 100644 index 00000000..d2682136 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/deepslate_from_compressed_deepslate.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "exdeorum:compressed_deepslate" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:deepslate_from_compressed_deepslate" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:deepslate_from_compressed_deepslate" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/diorite_from_compressed_diorite.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/diorite_from_compressed_diorite.json new file mode 100644 index 00000000..5a470310 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/diorite_from_compressed_diorite.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "exdeorum:compressed_diorite" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:diorite_from_compressed_diorite" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:diorite_from_compressed_diorite" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/end_stone_from_compressed_end_stone.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/end_stone_from_compressed_end_stone.json new file mode 100644 index 00000000..ec9c20f4 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/end_stone_from_compressed_end_stone.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "exdeorum:compressed_end_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:end_stone_from_compressed_end_stone" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:end_stone_from_compressed_end_stone" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/granite_from_compressed_granite.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/granite_from_compressed_granite.json new file mode 100644 index 00000000..1593d4fd --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/granite_from_compressed_granite.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "exdeorum:compressed_granite" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:granite_from_compressed_granite" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:granite_from_compressed_granite" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/netherrack_from_compressed_netherrack.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/netherrack_from_compressed_netherrack.json new file mode 100644 index 00000000..bf2bfd98 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/netherrack_from_compressed_netherrack.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "exdeorum:compressed_netherrack" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:netherrack_from_compressed_netherrack" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:netherrack_from_compressed_netherrack" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/andesite_from_compressed_andesite.json b/src/generated/resources/data/minecraft/recipes/andesite_from_compressed_andesite.json new file mode 100644 index 00000000..c7ba4e0a --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/andesite_from_compressed_andesite.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "exdeorum:compressed_andesite" + } + ], + "result": { + "count": 9, + "item": "minecraft:andesite" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/blackstone_from_compressed_blackstone.json b/src/generated/resources/data/minecraft/recipes/blackstone_from_compressed_blackstone.json new file mode 100644 index 00000000..e6ec685e --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/blackstone_from_compressed_blackstone.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "exdeorum:compressed_blackstone" + } + ], + "result": { + "count": 9, + "item": "minecraft:blackstone" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/cobbled_deepslate_from_compressed_cobbled_deepslate.json b/src/generated/resources/data/minecraft/recipes/cobbled_deepslate_from_compressed_cobbled_deepslate.json new file mode 100644 index 00000000..ea2c596d --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/cobbled_deepslate_from_compressed_cobbled_deepslate.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "exdeorum:compressed_cobbled_deepslate" + } + ], + "result": { + "count": 9, + "item": "minecraft:cobbled_deepslate" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/cobblestone_from_compressed_cobblestone.json b/src/generated/resources/data/minecraft/recipes/cobblestone_from_compressed_cobblestone.json new file mode 100644 index 00000000..d5a9aad4 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/cobblestone_from_compressed_cobblestone.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "exdeorum:compressed_cobblestone" + } + ], + "result": { + "count": 9, + "item": "minecraft:cobblestone" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/deepslate_from_compressed_deepslate.json b/src/generated/resources/data/minecraft/recipes/deepslate_from_compressed_deepslate.json new file mode 100644 index 00000000..a044016f --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/deepslate_from_compressed_deepslate.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "exdeorum:compressed_deepslate" + } + ], + "result": { + "count": 9, + "item": "minecraft:deepslate" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/diorite_from_compressed_diorite.json b/src/generated/resources/data/minecraft/recipes/diorite_from_compressed_diorite.json new file mode 100644 index 00000000..d2cf6136 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/diorite_from_compressed_diorite.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "exdeorum:compressed_diorite" + } + ], + "result": { + "count": 9, + "item": "minecraft:diorite" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/end_stone_from_compressed_end_stone.json b/src/generated/resources/data/minecraft/recipes/end_stone_from_compressed_end_stone.json new file mode 100644 index 00000000..0e95fbea --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/end_stone_from_compressed_end_stone.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "exdeorum:compressed_end_stone" + } + ], + "result": { + "count": 9, + "item": "minecraft:end_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/granite_from_compressed_granite.json b/src/generated/resources/data/minecraft/recipes/granite_from_compressed_granite.json new file mode 100644 index 00000000..49b4dadc --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/granite_from_compressed_granite.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "exdeorum:compressed_granite" + } + ], + "result": { + "count": 9, + "item": "minecraft:granite" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/netherrack_from_compressed_netherrack.json b/src/generated/resources/data/minecraft/recipes/netherrack_from_compressed_netherrack.json new file mode 100644 index 00000000..84dcd135 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/netherrack_from_compressed_netherrack.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "exdeorum:compressed_netherrack" + } + ], + "result": { + "count": 9, + "item": "minecraft:netherrack" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 37557147..855e9337 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -7,6 +7,15 @@ "exdeorum:crystallized_barrel", "exdeorum:crystallized_sieve", "exdeorum:porcelain_crucible", - "exdeorum:crystallized_crucible" + "exdeorum:crystallized_crucible", + "exdeorum:compressed_cobblestone", + "exdeorum:compressed_diorite", + "exdeorum:compressed_granite", + "exdeorum:compressed_andesite", + "exdeorum:compressed_deepslate", + "exdeorum:compressed_cobbled_deepslate", + "exdeorum:compressed_netherrack", + "exdeorum:compressed_blackstone", + "exdeorum:compressed_end_stone" ] } \ No newline at end of file diff --git a/src/main/java/thedarkcolour/exdeorum/block/CompressedBlockType.java b/src/main/java/thedarkcolour/exdeorum/block/CompressedBlockType.java new file mode 100644 index 00000000..58e0c39e --- /dev/null +++ b/src/main/java/thedarkcolour/exdeorum/block/CompressedBlockType.java @@ -0,0 +1,102 @@ +/* + * Ex Deorum + * Copyright (c) 2024 thedarkcolour + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package thedarkcolour.exdeorum.block; + +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.ItemLike; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraftforge.registries.RegistryObject; +import thedarkcolour.exdeorum.compat.ModIds; +import thedarkcolour.exdeorum.registry.EBlocks; +import thedarkcolour.exdeorum.registry.EItems; +import thedarkcolour.exdeorum.tag.EItemTags; + +import java.util.function.Supplier; + +public class CompressedBlockType implements ItemLike { + private final RegistryObject block; + private final RegistryObject item; + private final TagKey itemTag; + private final Supplier base; + + private boolean hasAtc, hasCompressium; + + public CompressedBlockType(String name, Supplier base) { + this.block = EBlocks.BLOCKS.register("compressed_" + name, this::createBlock); + this.item = EItems.registerItemBlock(this.block); + this.itemTag = EItemTags.tag("compressed/" + name); + this.base = base; + } + + private Block createBlock() { + return new Block(BlockBehaviour.Properties.copy(this.base.get())); + } + + public Block getBlock() { + return this.block.get(); + } + + public BlockItem getItem() { + return this.item.get(); + } + + @Override + public Item asItem() { + return this.item.get(); + } + + public TagKey getTag() { + return this.itemTag; + } + + public CompressedBlockType withAtc() { + this.hasAtc = true; + return this; + } + + public CompressedBlockType withCompressium() { + this.hasCompressium = true; + return this; + } + + public boolean hasAtc() { + return this.hasAtc; + } + + public boolean hasCompressium() { + return this.hasCompressium; + } + + public ResourceLocation getAtc() { + return new ResourceLocation(ModIds.ALL_THE_COMPRESSED, BuiltInRegistries.BLOCK.getKey(this.base.get()).getPath() + "_1x"); + } + + public ResourceLocation getCompressium() { + return new ResourceLocation(ModIds.COMPRESSIUM, BuiltInRegistries.BLOCK.getKey(this.base.get()).getPath() + "_1"); + } + + public Block getBase() { + return this.base.get(); + } +} diff --git a/src/main/java/thedarkcolour/exdeorum/compat/ModIds.java b/src/main/java/thedarkcolour/exdeorum/compat/ModIds.java index 9ad32d80..171bd2ec 100644 --- a/src/main/java/thedarkcolour/exdeorum/compat/ModIds.java +++ b/src/main/java/thedarkcolour/exdeorum/compat/ModIds.java @@ -46,4 +46,5 @@ public class ModIds { public static final String JEI = "jei"; public static final String INVENTORY_SORTER = "inventorysorter"; public static final String REI_PC = "rei_plugin_compatibilities"; + public static final String CYCLIC = "cyclic"; } diff --git a/src/main/java/thedarkcolour/exdeorum/compat/jei/ExDeorumJeiPlugin.java b/src/main/java/thedarkcolour/exdeorum/compat/jei/ExDeorumJeiPlugin.java index 78d89dec..a403d4c0 100644 --- a/src/main/java/thedarkcolour/exdeorum/compat/jei/ExDeorumJeiPlugin.java +++ b/src/main/java/thedarkcolour/exdeorum/compat/jei/ExDeorumJeiPlugin.java @@ -43,6 +43,7 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.block.WallTorchBlock; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.registries.RegistryObject; import thedarkcolour.exdeorum.ExDeorum; import thedarkcolour.exdeorum.client.screen.MechanicalHammerScreen; import thedarkcolour.exdeorum.client.screen.MechanicalSieveScreen; @@ -55,6 +56,7 @@ import thedarkcolour.exdeorum.recipe.barrel.BarrelCompostRecipe; import thedarkcolour.exdeorum.recipe.barrel.BarrelFluidMixingRecipe; import thedarkcolour.exdeorum.recipe.barrel.BarrelMixingRecipe; import thedarkcolour.exdeorum.recipe.crucible.CrucibleRecipe; +import thedarkcolour.exdeorum.recipe.hammer.CompressedHammerRecipe; import thedarkcolour.exdeorum.recipe.hammer.HammerRecipe; import thedarkcolour.exdeorum.registry.EFluids; import thedarkcolour.exdeorum.registry.EItems; @@ -80,6 +82,7 @@ public class ExDeorumJeiPlugin implements IModPlugin { static final RecipeType SIEVE = RecipeType.create(ExDeorum.ID, "sieve", GroupedSieveRecipe.class); static final RecipeType COMPRESSED_SIEVE = RecipeType.create(ExDeorum.ID, "compressed_sieve", GroupedSieveRecipe.class); static final RecipeType HAMMER = RecipeType.create(ExDeorum.ID, "hammer", HammerRecipe.class); + static final RecipeType COMPRESSED_HAMMER = RecipeType.create(ExDeorum.ID, "compressed_hammer", CompressedHammerRecipe.class); static final RecipeType CROOK = RecipeType.create(ExDeorum.ID, "crook", CrookJeiRecipe.class); @Override @@ -101,7 +104,8 @@ public class ExDeorumJeiPlugin implements IModPlugin { registration.addRecipeCategories(new CrucibleHeatSourcesCategory(registration.getJeiHelpers())); registration.addRecipeCategories(new SieveCategory(helper)); registration.addRecipeCategories(new CompressedSieveCategory(helper)); - registration.addRecipeCategories(new HammerCategory(helper, arrow)); + registration.addRecipeCategories(new HammerCategory(helper, arrow, EItems.DIAMOND_HAMMER, Component.translatable(TranslationKeys.HAMMER_CATEGORY_TITLE), HAMMER)); + registration.addRecipeCategories(new HammerCategory(helper, arrow, EItems.COMPRESSED_DIAMOND_HAMMER, Component.translatable(TranslationKeys.COMPRESSED_HAMMER_CATEGORY_TITLE), COMPRESSED_HAMMER)); registration.addRecipeCategories(new CrookCategory(registration.getJeiHelpers(), arrow)); } @@ -136,6 +140,13 @@ public class ExDeorumJeiPlugin implements IModPlugin { registration.addRecipeCatalyst(new ItemStack(EItems.NETHERITE_HAMMER.get()), HAMMER); registration.addRecipeCatalyst(new ItemStack(EItems.MECHANICAL_HAMMER.get()), HAMMER); + registration.addRecipeCatalyst(new ItemStack(EItems.COMPRESSED_WOODEN_HAMMER.get()), COMPRESSED_HAMMER); + registration.addRecipeCatalyst(new ItemStack(EItems.COMPRESSED_STONE_HAMMER.get()), COMPRESSED_HAMMER); + registration.addRecipeCatalyst(new ItemStack(EItems.COMPRESSED_GOLDEN_HAMMER.get()), COMPRESSED_HAMMER); + registration.addRecipeCatalyst(new ItemStack(EItems.COMPRESSED_IRON_HAMMER.get()), COMPRESSED_HAMMER); + registration.addRecipeCatalyst(new ItemStack(EItems.COMPRESSED_DIAMOND_HAMMER.get()), COMPRESSED_HAMMER); + registration.addRecipeCatalyst(new ItemStack(EItems.COMPRESSED_NETHERITE_HAMMER.get()), COMPRESSED_HAMMER); + registration.addRecipeCatalyst(new ItemStack(EItems.CROOK.get()), CROOK); registration.addRecipeCatalyst(new ItemStack(EItems.BONE_CROOK.get()), CROOK); } @@ -185,6 +196,8 @@ public class ExDeorumJeiPlugin implements IModPlugin { addRecipes(registration, LAVA_CRUCIBLE, ERecipeTypes.LAVA_CRUCIBLE); addRecipes(registration, WATER_CRUCIBLE, ERecipeTypes.WATER_CRUCIBLE); addRecipes(registration, HAMMER, ERecipeTypes.HAMMER); + //noinspection rawtypes,unchecked + addRecipes(registration, COMPRESSED_HAMMER, ((RegistryObject) ERecipeTypes.COMPRESSED_HAMMER)); var crookRecipes = new ArrayList(); for (var recipe : Objects.requireNonNull(Minecraft.getInstance().level).getRecipeManager().getAllRecipesFor(ERecipeTypes.CROOK.get())) { crookRecipes.add(CrookJeiRecipe.create(recipe)); diff --git a/src/main/java/thedarkcolour/exdeorum/compat/jei/HammerCategory.java b/src/main/java/thedarkcolour/exdeorum/compat/jei/HammerCategory.java index a6792e6d..904c9209 100644 --- a/src/main/java/thedarkcolour/exdeorum/compat/jei/HammerCategory.java +++ b/src/main/java/thedarkcolour/exdeorum/compat/jei/HammerCategory.java @@ -23,19 +23,26 @@ import mezz.jei.api.gui.drawable.IDrawable; import mezz.jei.api.helpers.IGuiHelper; import mezz.jei.api.recipe.RecipeType; import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import thedarkcolour.exdeorum.data.TranslationKeys; import thedarkcolour.exdeorum.recipe.hammer.HammerRecipe; import thedarkcolour.exdeorum.registry.EItems; +import java.util.function.Supplier; + class HammerCategory extends OneToOneCategory { - public HammerCategory(IGuiHelper helper, IDrawable arrow) { - super(helper, arrow, helper.createDrawableItemStack(new ItemStack(EItems.DIAMOND_HAMMER.get())), Component.translatable(TranslationKeys.HAMMER_CATEGORY_TITLE)); + private final RecipeType recipeType; + + public HammerCategory(IGuiHelper helper, IDrawable arrow, Supplier icon, Component title, RecipeType recipeType) { + super(helper, arrow, helper.createDrawableItemStack(new ItemStack(icon.get())), title); + + this.recipeType = recipeType; } @Override public RecipeType getRecipeType() { - return ExDeorumJeiPlugin.HAMMER; + return this.recipeType; } @Override diff --git a/src/main/java/thedarkcolour/exdeorum/data/BlockModels.java b/src/main/java/thedarkcolour/exdeorum/data/BlockModels.java index 5a11b9d1..9b40257c 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/BlockModels.java +++ b/src/main/java/thedarkcolour/exdeorum/data/BlockModels.java @@ -28,6 +28,7 @@ import net.minecraftforge.client.model.generators.loaders.CompositeModelBuilder; import net.minecraftforge.registries.ForgeRegistries; import thedarkcolour.exdeorum.material.DefaultMaterials; import thedarkcolour.exdeorum.registry.EBlocks; +import thedarkcolour.exdeorum.registry.ECompressedBlocks; import thedarkcolour.modkit.data.MKBlockModelProvider; import java.util.Objects; @@ -40,17 +41,9 @@ class BlockModels { models.simpleBlock(EBlocks.CRUSHED_DEEPSLATE.get()); models.simpleBlock(EBlocks.CRUSHED_BLACKSTONE.get()); - compressedBlock(models, EBlocks.COMPRESSED_DIRT.get(), Blocks.DIRT); - compressedBlock(models, EBlocks.COMPRESSED_GRAVEL.get(), Blocks.GRAVEL); - compressedBlock(models, EBlocks.COMPRESSED_SAND.get(), Blocks.SAND); - compressedBlock(models, EBlocks.COMPRESSED_DUST.get(), EBlocks.DUST.get()); - compressedBlock(models, EBlocks.COMPRESSED_RED_SAND.get(), Blocks.RED_SAND); - compressedBlock(models, EBlocks.COMPRESSED_CRUSHED_DEEPSLATE.get(), EBlocks.CRUSHED_DEEPSLATE.get()); - compressedBlock(models, EBlocks.COMPRESSED_CRUSHED_BLACKSTONE.get(), EBlocks.CRUSHED_BLACKSTONE.get()); - compressedBlock(models, EBlocks.COMPRESSED_CRUSHED_NETHERRACK.get(), EBlocks.CRUSHED_NETHERRACK.get()); - compressedBlock(models, EBlocks.COMPRESSED_SOUL_SAND.get(), Blocks.SOUL_SAND); - compressedBlock(models, EBlocks.COMPRESSED_CRUSHED_END_STONE.get(), EBlocks.CRUSHED_END_STONE.get()); - compressedBlock(models, EBlocks.COMPRESSED_MOSS_BLOCK.get(), Blocks.MOSS_BLOCK); + for (var variant : ECompressedBlocks.ALL_VARIANTS) { + compressedBlock(models, variant.getBlock(), variant.getBase()); + } // Barrels barrel(models, DefaultMaterials.OAK_BARREL.getBlock(), Blocks.OAK_PLANKS); diff --git a/src/main/java/thedarkcolour/exdeorum/data/English.java b/src/main/java/thedarkcolour/exdeorum/data/English.java index 192c95e1..052f6213 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/English.java +++ b/src/main/java/thedarkcolour/exdeorum/data/English.java @@ -70,6 +70,7 @@ class English { english.add(TranslationKeys.CRUCIBLE_HEAT_SOURCE_CATEGORY_TITLE, "Crucible Heat Sources"); english.add(TranslationKeys.CRUCIBLE_HEAT_SOURCE_CATEGORY_MULTIPLIER, "Melt Rate: %sx"); english.add(TranslationKeys.HAMMER_CATEGORY_TITLE, "Hammer"); + english.add(TranslationKeys.COMPRESSED_HAMMER_CATEGORY_TITLE, "Compressed Hammer"); english.add(TranslationKeys.CROOK_CATEGORY_TITLE, "Crook"); english.add(TranslationKeys.CROOK_CATEGORY_REQUIRES_STATE, "Requires properties:"); english.add(TranslationKeys.SIEVE_CATEGORY_TITLE, "Sieve"); diff --git a/src/main/java/thedarkcolour/exdeorum/data/ModCompatData.java b/src/main/java/thedarkcolour/exdeorum/data/ModCompatData.java index 4e684b06..4a1daf71 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/ModCompatData.java +++ b/src/main/java/thedarkcolour/exdeorum/data/ModCompatData.java @@ -34,7 +34,6 @@ import java.util.Map; // Mocks modded items so that data generation can reference modded items without needing those mods installed. public class ModCompatData { - // Identity maps because keys are just constants from ModIds private static final Map> itemRegistries = new HashMap<>(); private static final Map> blockRegistries = new HashMap<>(); @@ -212,23 +211,6 @@ public class ModCompatData { DUSK_LOG_ITEM = item(ModIds.BLUE_SKIES, "dusk_log"), MAPLE_LOG_ITEM = item(ModIds.BLUE_SKIES, "maple_log"), CRYSTALLIZED_LOG_ITEM = item(ModIds.BLUE_SKIES, "crystallized_log"); - // Compressium - public static final RegistryObject - COMPRESSED_DIRT_COMPRESSIUM = item(ModIds.COMPRESSIUM, "dirt_1"), - COMPRESSED_COBBLESTONE_COMPRESSIUM = item(ModIds.COMPRESSIUM, "cobblestone_1"), - COMPRESSED_GRAVEL_COMPRESSIUM = item(ModIds.COMPRESSIUM, "gravel_1"), - COMPRESSED_SAND_COMPRESSIUM = item(ModIds.COMPRESSIUM, "sand_1"), - COMPRESSED_RED_SAND_COMPRESSIUM = item(ModIds.COMPRESSIUM, "redsand_1"), - COMPRESSED_SOUL_SAND_COMPRESSIUM = item(ModIds.COMPRESSIUM, "soulsand_1"); - // AllTheCompressed - public static final RegistryObject - COMPRESSED_DIRT_ATC = item(ModIds.ALL_THE_COMPRESSED, "dirt_1x"), - COMPRESSED_COBBLESTONE_ATC = item(ModIds.ALL_THE_COMPRESSED, "cobblestone_1x"), - COMPRESSED_GRAVEL_ATC = item(ModIds.ALL_THE_COMPRESSED, "gravel_1x"), - COMPRESSED_SAND_ATC = item(ModIds.ALL_THE_COMPRESSED, "sand_1x"), - COMPRESSED_RED_SAND_ATC = item(ModIds.ALL_THE_COMPRESSED, "red_sand_1x"), - COMPRESSED_SOUL_SAND_ATC = item(ModIds.ALL_THE_COMPRESSED, "soul_sand_1x"), - COMPRESSED_MOSS_BLOCK_ATC = item(ModIds.ALL_THE_COMPRESSED, "moss_block_1x"); public static final ResourceLocation[] PAMS_CROPS; diff --git a/src/main/java/thedarkcolour/exdeorum/data/ModTags.java b/src/main/java/thedarkcolour/exdeorum/data/ModTags.java index 6ed3ec70..fa81e145 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/ModTags.java +++ b/src/main/java/thedarkcolour/exdeorum/data/ModTags.java @@ -32,13 +32,17 @@ import net.minecraft.world.level.levelgen.structure.BuiltinStructureSets; import net.minecraft.world.level.levelgen.structure.StructureSet; import net.minecraft.world.level.material.Fluid; import thedarkcolour.exdeorum.ExDeorum; +import thedarkcolour.exdeorum.block.CompressedBlockType; +import thedarkcolour.exdeorum.compat.ModIds; import thedarkcolour.exdeorum.material.*; import thedarkcolour.exdeorum.registry.EBlocks; +import thedarkcolour.exdeorum.registry.ECompressedBlocks; import thedarkcolour.exdeorum.registry.EFluids; import thedarkcolour.exdeorum.registry.EItems; import thedarkcolour.exdeorum.tag.EBlockTags; import thedarkcolour.exdeorum.tag.EItemTags; import thedarkcolour.exdeorum.tag.EStructureSetTags; +import thedarkcolour.modkit.data.DirectTagAppender; import thedarkcolour.modkit.data.MKTagsProvider; import java.util.ArrayList; @@ -71,14 +75,20 @@ class ModTags { .add(DefaultMaterials.COMPRESSED_SIEVES.stream().filter(material -> material != DefaultMaterials.CRYSTALLIZED_COMPRESSED_SIEVE).map(CompressedSieveMaterial::getBlock).toArray(Block[]::new)); tags.tag(BlockTags.MINEABLE_WITH_PICKAXE) .add(EBlocks.UNFIRED_PORCELAIN_CRUCIBLE, EBlocks.MECHANICAL_SIEVE, EBlocks.MECHANICAL_HAMMER) - .add(DefaultMaterials.STONE_BARREL.getBlock(), DefaultMaterials.CRYSTALLIZED_BARREL.getBlock(), DefaultMaterials.CRYSTALLIZED_SIEVE.getBlock(), DefaultMaterials.PORCELAIN_CRUCIBLE.getBlock(), DefaultMaterials.CRYSTALLIZED_CRUCIBLE.getBlock()); - tags.tag(BlockTags.MINEABLE_WITH_SHOVEL).add(EBlocks.DUST, EBlocks.CRUSHED_NETHERRACK, EBlocks.CRUSHED_END_STONE, EBlocks.CRUSHED_DEEPSLATE, EBlocks.CRUSHED_BLACKSTONE, EBlocks.COMPRESSED_DIRT, EBlocks.COMPRESSED_GRAVEL, EBlocks.COMPRESSED_SAND, EBlocks.COMPRESSED_DUST, EBlocks.COMPRESSED_RED_SAND, EBlocks.COMPRESSED_CRUSHED_DEEPSLATE, EBlocks.COMPRESSED_CRUSHED_BLACKSTONE, EBlocks.COMPRESSED_CRUSHED_NETHERRACK, EBlocks.COMPRESSED_SOUL_SAND, EBlocks.COMPRESSED_CRUSHED_END_STONE); - tags.tag(BlockTags.MINEABLE_WITH_HOE).add(EBlocks.INFESTED_LEAVES, EBlocks.COMPRESSED_MOSS_BLOCK); + .add(DefaultMaterials.STONE_BARREL.getBlock(), DefaultMaterials.CRYSTALLIZED_BARREL.getBlock(), DefaultMaterials.CRYSTALLIZED_SIEVE.getBlock(), DefaultMaterials.PORCELAIN_CRUCIBLE.getBlock(), DefaultMaterials.CRYSTALLIZED_CRUCIBLE.getBlock()) + .add(ECompressedBlocks.COMPRESSED_COBBLESTONE.getBlock(), ECompressedBlocks.COMPRESSED_DIORITE.getBlock(), ECompressedBlocks.COMPRESSED_GRANITE.getBlock(), ECompressedBlocks.COMPRESSED_ANDESITE.getBlock(), ECompressedBlocks.COMPRESSED_DEEPSLATE.getBlock(), ECompressedBlocks.COMPRESSED_COBBLED_DEEPSLATE.getBlock(), ECompressedBlocks.COMPRESSED_NETHERRACK.getBlock(), ECompressedBlocks.COMPRESSED_BLACKSTONE.getBlock(), ECompressedBlocks.COMPRESSED_END_STONE.getBlock()); + tags.tag(BlockTags.MINEABLE_WITH_SHOVEL) + .add(EBlocks.DUST, EBlocks.CRUSHED_NETHERRACK, EBlocks.CRUSHED_END_STONE, EBlocks.CRUSHED_DEEPSLATE, EBlocks.CRUSHED_BLACKSTONE) + .add(ECompressedBlocks.COMPRESSED_DIRT.getBlock(), ECompressedBlocks.COMPRESSED_GRAVEL.getBlock(), ECompressedBlocks.COMPRESSED_SAND.getBlock(), ECompressedBlocks.COMPRESSED_DUST.getBlock(), ECompressedBlocks.COMPRESSED_RED_SAND.getBlock(), ECompressedBlocks.COMPRESSED_CRUSHED_DEEPSLATE.getBlock(), ECompressedBlocks.COMPRESSED_CRUSHED_BLACKSTONE.getBlock(), ECompressedBlocks.COMPRESSED_CRUSHED_NETHERRACK.getBlock(), ECompressedBlocks.COMPRESSED_SOUL_SAND.getBlock(), ECompressedBlocks.COMPRESSED_CRUSHED_END_STONE.getBlock()); + tags.tag(BlockTags.MINEABLE_WITH_HOE) + .add(EBlocks.INFESTED_LEAVES) + .add(ECompressedBlocks.COMPRESSED_MOSS_BLOCK.getBlock()); tags.tag(BlockTags.LEAVES).add(EBlocks.INFESTED_LEAVES); } public static void createItemTags(MKTagsProvider tags) { tags.tag(EItemTags.HAMMERS).add(EItems.WOODEN_HAMMER, EItems.STONE_HAMMER, EItems.GOLDEN_HAMMER, EItems.IRON_HAMMER, EItems.DIAMOND_HAMMER, EItems.NETHERITE_HAMMER); + tags.tag(EItemTags.COMPRESSED_HAMMERS).add(EItems.COMPRESSED_WOODEN_HAMMER, EItems.COMPRESSED_STONE_HAMMER, EItems.COMPRESSED_GOLDEN_HAMMER, EItems.COMPRESSED_IRON_HAMMER, EItems.COMPRESSED_DIAMOND_HAMMER, EItems.COMPRESSED_NETHERITE_HAMMER); tags.tag(EItemTags.CROOKS).add(EItems.CROOK, EItems.BONE_CROOK); tags.tag(EItemTags.SIEVE_MESHES).add(EItems.STRING_MESH, EItems.FLINT_MESH, EItems.IRON_MESH, EItems.GOLDEN_MESH, EItems.DIAMOND_MESH, EItems.NETHERITE_MESH); tags.tag(EItemTags.PEBBLES).add(EItems.STONE_PEBBLE, EItems.DIORITE_PEBBLE, EItems.GRANITE_PEBBLE, EItems.ANDESITE_PEBBLE, EItems.DEEPSLATE_PEBBLE, EItems.TUFF_PEBBLE, EItems.CALCITE_PEBBLE, EItems.BLACKSTONE_PEBBLE, EItems.BASALT_PEBBLE); @@ -87,23 +97,20 @@ class ModTags { tags.tag(EItemTags.STONE_BARRELS).add(DefaultMaterials.STONE_BARREL.getItem(), DefaultMaterials.CRYSTALLIZED_BARREL.getItem()); tags.tag(EItemTags.BARRELS).addTags(EItemTags.WOODEN_BARRELS, EItemTags.STONE_BARRELS); - tags.tag(EItemTags.COMPRESSED_DIRT).add(EItems.COMPRESSED_DIRT) - .addOptional(ModCompatData.COMPRESSED_DIRT_ATC.getId()); - tags.tag(EItemTags.COMPRESSED_GRAVEL).add(EItems.COMPRESSED_GRAVEL) - .addOptional(ModCompatData.COMPRESSED_GRAVEL_ATC.getId()); - tags.tag(EItemTags.COMPRESSED_SAND).add(EItems.COMPRESSED_SAND) - .addOptional(ModCompatData.COMPRESSED_SAND_ATC.getId()); - tags.tag(EItemTags.COMPRESSED_DUST).add(EItems.COMPRESSED_DUST); - tags.tag(EItemTags.COMPRESSED_RED_SAND).add(EItems.COMPRESSED_RED_SAND) - .addOptional(ModCompatData.COMPRESSED_RED_SAND_ATC.getId()); - tags.tag(EItemTags.COMPRESSED_CRUSHED_DEEPSLATE).add(EItems.COMPRESSED_CRUSHED_DEEPSLATE); - tags.tag(EItemTags.COMPRESSED_CRUSHED_BLACKSTONE).add(EItems.COMPRESSED_CRUSHED_BLACKSTONE); - tags.tag(EItemTags.COMPRESSED_CRUSHED_NETHERRACK).add(EItems.COMPRESSED_CRUSHED_NETHERRACK); - tags.tag(EItemTags.COMPRESSED_SOUL_SAND).add(EItems.COMPRESSED_SOUL_SAND) - .addOptional(ModCompatData.COMPRESSED_SOUL_SAND_ATC.getId()); - tags.tag(EItemTags.COMPRESSED_CRUSHED_END_STONE).add(EItems.COMPRESSED_CRUSHED_END_STONE); - tags.tag(EItemTags.COMPRESSED_MOSS_BLOCK).add(EItems.COMPRESSED_MOSS_BLOCK) - .addOptional(ModCompatData.COMPRESSED_MOSS_BLOCK_ATC.getId()); + // Cyclic adds ONE compressed block :) + tags.tag(ECompressedBlocks.COMPRESSED_COBBLESTONE.getTag()).addOptional(new ResourceLocation(ModIds.CYCLIC, "compressed_cobblestone")); + + for (var variant : ECompressedBlocks.ALL_VARIANTS) { + var builder = tags.tag(variant.getTag()).add(variant.getItem()); + if (variant.hasAtc()) { + builder.addOptional(variant.getAtc()); + } + if (variant.hasCompressium()) { + builder.addOptional(variant.getCompressium()); + } + } + + tags.tag(EItemTags.COMPRESSED_SANDS).addTags(ECompressedBlocks.COMPRESSED_SAND.getTag(), ECompressedBlocks.COMPRESSED_RED_SAND.getTag()); } public static void createStructureSetTags(MKTagsProvider tags) { diff --git a/src/main/java/thedarkcolour/exdeorum/data/TranslationKeys.java b/src/main/java/thedarkcolour/exdeorum/data/TranslationKeys.java index e3948e2a..6f440b5e 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/TranslationKeys.java +++ b/src/main/java/thedarkcolour/exdeorum/data/TranslationKeys.java @@ -70,6 +70,7 @@ public class TranslationKeys { public static final String CRUCIBLE_HEAT_SOURCE_CATEGORY_TITLE = "gui." + ExDeorum.ID + ".category.crucible_heat_source"; public static final String CRUCIBLE_HEAT_SOURCE_CATEGORY_MULTIPLIER = "gui." + ExDeorum.ID + ".category.crucible_heat_source.multiplier"; public static final String HAMMER_CATEGORY_TITLE = "gui." + ExDeorum.ID + ".category.hammer"; + public static final String COMPRESSED_HAMMER_CATEGORY_TITLE = "gui." + ExDeorum.ID + ".category.compressed_hammer"; public static final String CROOK_CATEGORY_TITLE = "gui." + ExDeorum.ID + ".category.crook"; public static final String CROOK_CATEGORY_REQUIRES_STATE = "gui." + ExDeorum.ID + ".category.crook.requires_state"; public static final String SIEVE_CATEGORY_TITLE = "gui." + ExDeorum.ID + ".category.sieve"; diff --git a/src/main/java/thedarkcolour/exdeorum/data/recipe/Recipes.java b/src/main/java/thedarkcolour/exdeorum/data/recipe/Recipes.java index ad2b990f..07353e6d 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/recipe/Recipes.java +++ b/src/main/java/thedarkcolour/exdeorum/data/recipe/Recipes.java @@ -22,6 +22,7 @@ import net.minecraft.advancements.critereon.StatePropertiesPredicate; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.data.recipes.ShapelessRecipeBuilder; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; @@ -61,22 +62,25 @@ import thedarkcolour.exdeorum.recipe.BlockPredicate; import thedarkcolour.exdeorum.recipe.crook.FinishedCrookRecipe; import thedarkcolour.exdeorum.recipe.crucible.FinishedCrucibleHeatRecipe; import thedarkcolour.exdeorum.recipe.crucible.FinishedCrucibleRecipe; +import thedarkcolour.exdeorum.recipe.hammer.FinishedCompressedHammerRecipe; import thedarkcolour.exdeorum.recipe.hammer.FinishedHammerRecipe; import thedarkcolour.exdeorum.registry.EBlocks; +import thedarkcolour.exdeorum.registry.ECompressedBlocks; import thedarkcolour.exdeorum.registry.EFluids; import thedarkcolour.exdeorum.registry.EItems; import thedarkcolour.exdeorum.registry.ERecipeSerializers; import thedarkcolour.exdeorum.tag.EItemTags; import thedarkcolour.modkit.data.MKRecipeProvider; +import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; import java.util.function.Supplier; import static net.minecraft.world.level.storage.loot.providers.number.BinomialDistributionGenerator.binomial; +import static net.minecraft.world.level.storage.loot.providers.number.ConstantValue.exactly; import static net.minecraft.world.level.storage.loot.providers.number.UniformGenerator.between; -import static thedarkcolour.modkit.data.MKRecipeProvider.ingredient; -import static thedarkcolour.modkit.data.MKRecipeProvider.path; +import static thedarkcolour.modkit.data.MKRecipeProvider.*; public class Recipes { private static final Ingredient SPORES_AND_SEEDS = ingredient(EItems.GRASS_SEEDS, EItems.MYCELIUM_SPORES, EItems.WARPED_NYLIUM_SPORES, EItems.CRIMSON_NYLIUM_SPORES); @@ -87,6 +91,7 @@ public class Recipes { SieveRecipes.sieveRecipes(writer); crucibleRecipes(writer); hammerRecipes(writer); + compressedHammerRecipes(writer); crookRecipes(writer); crucibleHeatSources(writer); barrelCompostRecipes(writer); @@ -199,18 +204,40 @@ public class Recipes { recipes.grid2x2(Items.COPPER_ORE, ingredient(EItems.COPPER_ORE_CHUNK)); recipes.grid2x2(Items.MOSS_BLOCK, ingredient(EItems.GRASS_SEEDS)); + // Compressed hammers + recipes.grid3x3(RecipeCategory.TOOLS, EItems.COMPRESSED_WOODEN_HAMMER.get(), ingredient(EItems.WOODEN_HAMMER)); + recipes.grid3x3(RecipeCategory.TOOLS, EItems.COMPRESSED_STONE_HAMMER.get(), ingredient(EItems.STONE_HAMMER)); + recipes.grid3x3(RecipeCategory.TOOLS, EItems.COMPRESSED_GOLDEN_HAMMER.get(), ingredient(EItems.GOLDEN_HAMMER)); + recipes.grid3x3(RecipeCategory.TOOLS, EItems.COMPRESSED_IRON_HAMMER.get(), ingredient(EItems.IRON_HAMMER)); + recipes.grid3x3(RecipeCategory.TOOLS, EItems.COMPRESSED_DIAMOND_HAMMER.get(), ingredient(EItems.DIAMOND_HAMMER)); + recipes.grid3x3(RecipeCategory.TOOLS, EItems.COMPRESSED_NETHERITE_HAMMER.get(), ingredient(EItems.NETHERITE_HAMMER)); + // Compressed blocks - recipes.storage3x3(EBlocks.COMPRESSED_DIRT.get(), Items.DIRT); - recipes.storage3x3(EBlocks.COMPRESSED_GRAVEL.get(), Items.GRAVEL); - recipes.storage3x3(EBlocks.COMPRESSED_SAND.get(), Items.SAND); - recipes.storage3x3(EBlocks.COMPRESSED_DUST.get(), EItems.DUST.get()); - recipes.storage3x3(EBlocks.COMPRESSED_RED_SAND.get(), Items.RED_SAND); - recipes.storage3x3(EBlocks.COMPRESSED_CRUSHED_DEEPSLATE.get(), EItems.CRUSHED_DEEPSLATE.get()); - recipes.storage3x3(EBlocks.COMPRESSED_CRUSHED_BLACKSTONE.get(), EItems.CRUSHED_BLACKSTONE.get()); - recipes.storage3x3(EBlocks.COMPRESSED_CRUSHED_NETHERRACK.get(), EItems.CRUSHED_NETHERRACK.get()); - recipes.storage3x3(EBlocks.COMPRESSED_SOUL_SAND.get(), Items.SOUL_SAND); - recipes.storage3x3(EBlocks.COMPRESSED_CRUSHED_END_STONE.get(), EItems.CRUSHED_END_STONE.get()); - recipes.storage3x3(EBlocks.COMPRESSED_MOSS_BLOCK.get(), Items.MOSS_BLOCK); + for (var variant : ECompressedBlocks.ALL_VARIANTS) { + var storage = variant.getBlock(); + var material = variant.getBase(); + + // Auto disable my recipe when other "compressed" mods are present + if (variant.hasCompressium() || variant.hasAtc()) { + var conditions = new ArrayList(); + if (variant.hasAtc()) { + conditions.add(modNotInstalled(ModIds.ALL_THE_COMPRESSED)); + } + if (variant.hasCompressium()) { + conditions.add(modNotInstalled(ModIds.COMPRESSIUM)); + } + recipes.conditional(path(storage), conditions, newWriter -> { + recipes.grid3x3(RecipeCategory.BUILDING_BLOCKS, storage, Ingredient.of(material)); + }); + } else { + recipes.grid3x3(RecipeCategory.BUILDING_BLOCKS, storage, Ingredient.of(material)); + } + // still allow uncrafting + ShapelessRecipeBuilder fromStorage = new ShapelessRecipeBuilder(RecipeCategory.MISC, material, 9); + unlockedByHaving(fromStorage, storage); + fromStorage.requires(storage); + fromStorage.save(writer, id(material).withSuffix("_from_" + id(storage).getPath())); + } // Compressed sieves compressedSieve(recipes, DefaultMaterials.OAK_COMPRESSED_SIEVE, ingredient(Items.OAK_LOG)); @@ -351,7 +378,7 @@ public class Recipes { recipe.pattern("WCW"); recipe.pattern("CSC"); recipe.pattern("WCW"); - MKRecipeProvider.unlockedByHaving(recipe, EItems.WOOD_CHIPPINGS.get()); + unlockedByHaving(recipe, EItems.WOOD_CHIPPINGS.get()); }); recipes.shapedCrafting(RecipeCategory.MISC, EItems.MECHANICAL_SIEVE.get(), recipe -> { recipe.define('#', Items.IRON_BLOCK); @@ -361,7 +388,7 @@ public class Recipes { recipe.pattern("#G#"); recipe.pattern("IHI"); recipe.pattern("I I"); - MKRecipeProvider.unlockedByHaving(recipe, Items.HOPPER); + unlockedByHaving(recipe, Items.HOPPER); }); recipes.shapedCrafting(RecipeCategory.MISC, EItems.MECHANICAL_HAMMER.get(), recipe -> { recipe.define('#', Items.IRON_BLOCK); @@ -371,7 +398,7 @@ public class Recipes { recipe.pattern("III"); recipe.pattern("ITI"); recipe.pattern("#H#"); - MKRecipeProvider.unlockedByHaving(recipe, Items.HOPPER); + unlockedByHaving(recipe, Items.HOPPER); }); } @@ -551,9 +578,9 @@ public class Recipes { hammerRecipe(writer, "crushing_red_sandstone", ingredient(Items.RED_SANDSTONE, Items.CUT_RED_SANDSTONE, Items.CHISELED_RED_SANDSTONE, Items.SMOOTH_RED_SANDSTONE), Items.RED_SAND); hammerRecipe(writer, "crushing_stone_bricks", ingredient(Items.STONE_BRICKS), Items.CRACKED_STONE_BRICKS); - hammerRecipe(writer, "stone_pebbles", ingredient(Items.STONE, Items.STONE_BRICKS, Items.CHISELED_STONE_BRICKS, Items.CRACKED_STONE_BRICKS), EItems.STONE_PEBBLE.get(), new UniformGenerator(ConstantValue.exactly(1), ConstantValue.exactly(6))); + hammerRecipe(writer, "stone_pebbles", ingredient(Items.STONE, Items.STONE_BRICKS, Items.CHISELED_STONE_BRICKS, Items.CRACKED_STONE_BRICKS), EItems.STONE_PEBBLE.get(), new UniformGenerator(exactly(1), exactly(6))); hammerRecipe(writer, "basalt", ingredient(Items.POLISHED_BASALT, Items.SMOOTH_BASALT), Items.BASALT); - hammerRecipe(writer, "wood_chippings", ingredient(ItemTags.LOGS), EItems.WOOD_CHIPPINGS.get(), new UniformGenerator(ConstantValue.exactly(3), ConstantValue.exactly(8))); + hammerRecipe(writer, "wood_chippings", ingredient(ItemTags.LOGS), EItems.WOOD_CHIPPINGS.get(), new UniformGenerator(exactly(3), exactly(8))); hammerRecipe(writer, "tube_coral", ingredient(Items.TUBE_CORAL_BLOCK), Items.TUBE_CORAL); hammerRecipe(writer, "brain_coral", ingredient(Items.BRAIN_CORAL_BLOCK), Items.BRAIN_CORAL); @@ -570,8 +597,24 @@ public class Recipes { hammerRecipe(writer, "pointed_dripstone", ingredient(Items.DRIPSTONE_BLOCK), Items.POINTED_DRIPSTONE, between(2, 4)); } + private static void compressedHammerRecipes(Consumer writer) { + compressedHammerRecipe(writer, Items.GRAVEL, ingredient(ECompressedBlocks.COMPRESSED_COBBLESTONE.getTag(), ECompressedBlocks.COMPRESSED_DIORITE.getTag(), ECompressedBlocks.COMPRESSED_GRANITE.getTag(), ECompressedBlocks.COMPRESSED_ANDESITE.getTag())); + compressedHammerRecipe(writer, Items.SAND, ingredient(ECompressedBlocks.COMPRESSED_GRAVEL.getTag())); + compressedHammerRecipe(writer, EItems.DUST.get(), ingredient(EItemTags.COMPRESSED_SANDS)); + + compressedHammerRecipe(writer, EItems.CRUSHED_DEEPSLATE.get(), ingredient(ECompressedBlocks.COMPRESSED_DEEPSLATE.getTag(), ECompressedBlocks.COMPRESSED_COBBLED_DEEPSLATE.getTag())); + compressedHammerRecipe(writer, EItems.CRUSHED_NETHERRACK.get(), ingredient(ECompressedBlocks.COMPRESSED_NETHERRACK.getTag())); + compressedHammerRecipe(writer, EItems.CRUSHED_BLACKSTONE.get(), ingredient(ECompressedBlocks.COMPRESSED_BLACKSTONE.getTag())); + compressedHammerRecipe(writer, EItems.CRUSHED_END_STONE.get(), ingredient(ECompressedBlocks.COMPRESSED_END_STONE.getTag())); + compressedHammerRecipe(writer, Items.RED_SAND, ingredient(ECompressedBlocks.COMPRESSED_CRUSHED_NETHERRACK.getTag())); + } + + private static void compressedHammerRecipe(Consumer writer, ItemLike result, Ingredient block) { + writer.accept(new FinishedCompressedHammerRecipe(modLoc("compressed_hammer/" + path(result)), block, result.asItem(), exactly(9))); + } + private static void hammerRecipe(Consumer writer, String name, Ingredient block, ItemLike result) { - hammerRecipe(writer, name, block, result, ConstantValue.exactly(1f)); + hammerRecipe(writer, name, block, result, exactly(1f)); } private static void hammerRecipe(Consumer writer, String name, Ingredient block, ItemLike result, NumberProvider resultAmount) { @@ -736,6 +779,10 @@ public class Recipes { return new ModLoadedCondition(modid); } + static ICondition modNotInstalled(String modid) { + return new NotCondition(modInstalled(modid)); + } + static final ICondition AE2 = modInstalled(ModIds.APPLIED_ENERGISTICS_2); static final ICondition ENDERIO = modInstalled(ModIds.ENDERIO); static final ICondition EXTREME_REACTORS = modInstalled(ModIds.EXTREME_REACTORS); diff --git a/src/main/java/thedarkcolour/exdeorum/data/recipe/SieveRecipes.java b/src/main/java/thedarkcolour/exdeorum/data/recipe/SieveRecipes.java index 9de55d42..67f6b0c1 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/recipe/SieveRecipes.java +++ b/src/main/java/thedarkcolour/exdeorum/data/recipe/SieveRecipes.java @@ -34,6 +34,7 @@ import thedarkcolour.exdeorum.compat.ModIds; import thedarkcolour.exdeorum.data.ModCompatData; import thedarkcolour.exdeorum.recipe.sieve.FinishedCompressedSieveRecipe; import thedarkcolour.exdeorum.recipe.sieve.FinishedSieveRecipe; +import thedarkcolour.exdeorum.registry.ECompressedBlocks; import thedarkcolour.exdeorum.registry.EItems; import thedarkcolour.exdeorum.tag.EItemTags; @@ -61,17 +62,17 @@ class SieveRecipes { MOSS_BLOCK = ingredient(Items.MOSS_BLOCK); // mod condition is null for ex deorum blocks (ex deorum is always last priority) private static final Map COMPRESSED_VARIANTS = ImmutableMap.builder() - .put(DIRT, ingredient(EItemTags.COMPRESSED_DIRT)) - .put(GRAVEL, ingredient(EItemTags.COMPRESSED_GRAVEL)) - .put(SAND, ingredient(EItemTags.COMPRESSED_SAND)) - .put(DUST, ingredient(EItemTags.COMPRESSED_DUST)) - .put(RED_SAND, ingredient(EItemTags.COMPRESSED_RED_SAND)) - .put(CRUSHED_DEEPSLATE, ingredient(EItemTags.COMPRESSED_CRUSHED_DEEPSLATE)) - .put(CRUSHED_BLACKSTONE, ingredient(EItemTags.COMPRESSED_CRUSHED_BLACKSTONE)) - .put(CRUSHED_NETHERRACK, ingredient(EItemTags.COMPRESSED_CRUSHED_NETHERRACK)) - .put(SOUL_SAND, ingredient(EItemTags.COMPRESSED_SOUL_SAND)) - .put(CRUSHED_END_STONE, ingredient(EItemTags.COMPRESSED_CRUSHED_END_STONE)) - .put(MOSS_BLOCK, ingredient(EItemTags.COMPRESSED_MOSS_BLOCK)) + .put(DIRT, ingredient(ECompressedBlocks.COMPRESSED_DIRT.getTag())) + .put(GRAVEL, ingredient(ECompressedBlocks.COMPRESSED_GRAVEL.getTag())) + .put(SAND, ingredient(ECompressedBlocks.COMPRESSED_SAND.getTag())) + .put(DUST, ingredient(ECompressedBlocks.COMPRESSED_DUST.getTag())) + .put(RED_SAND, ingredient(ECompressedBlocks.COMPRESSED_RED_SAND.getTag())) + .put(CRUSHED_DEEPSLATE, ingredient(ECompressedBlocks.COMPRESSED_CRUSHED_DEEPSLATE.getTag())) + .put(CRUSHED_BLACKSTONE, ingredient(ECompressedBlocks.COMPRESSED_CRUSHED_BLACKSTONE.getTag())) + .put(CRUSHED_NETHERRACK, ingredient(ECompressedBlocks.COMPRESSED_CRUSHED_NETHERRACK.getTag())) + .put(SOUL_SAND, ingredient(ECompressedBlocks.COMPRESSED_SOUL_SAND.getTag())) + .put(CRUSHED_END_STONE, ingredient(ECompressedBlocks.COMPRESSED_CRUSHED_END_STONE.getTag())) + .put(MOSS_BLOCK, ingredient(ECompressedBlocks.COMPRESSED_MOSS_BLOCK.getTag())) .build(); static void sieveRecipes(Consumer writer) { diff --git a/src/main/java/thedarkcolour/exdeorum/item/CompressedHammerItem.java b/src/main/java/thedarkcolour/exdeorum/item/CompressedHammerItem.java index 84c102ff..fb174cd6 100644 --- a/src/main/java/thedarkcolour/exdeorum/item/CompressedHammerItem.java +++ b/src/main/java/thedarkcolour/exdeorum/item/CompressedHammerItem.java @@ -48,6 +48,6 @@ public class CompressedHammerItem extends HammerItem { @Override public int getBurnTime(ItemStack stack, @Nullable RecipeType recipeType) { - return this == EItems.WOODEN_COMPRESSED_HAMMER.get() ? 200 : 0; + return this == EItems.COMPRESSED_WOODEN_HAMMER.get() ? 200 : 0; } } diff --git a/src/main/java/thedarkcolour/exdeorum/loot/CompressedHammerLootModifier.java b/src/main/java/thedarkcolour/exdeorum/loot/CompressedHammerLootModifier.java new file mode 100644 index 00000000..7e9aa4a7 --- /dev/null +++ b/src/main/java/thedarkcolour/exdeorum/loot/CompressedHammerLootModifier.java @@ -0,0 +1,47 @@ +/* + * Ex Deorum + * Copyright (c) 2024 thedarkcolour + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package thedarkcolour.exdeorum.loot; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; +import net.minecraftforge.common.loot.IGlobalLootModifier; +import net.minecraftforge.common.loot.LootModifier; +import org.jetbrains.annotations.Nullable; +import thedarkcolour.exdeorum.recipe.RecipeUtil; +import thedarkcolour.exdeorum.recipe.hammer.HammerRecipe; + +public class CompressedHammerLootModifier extends HammerLootModifier { + public static final Codec CODEC = RecordCodecBuilder.create(inst -> LootModifier.codecStart(inst).apply(inst, CompressedHammerLootModifier::new)); + + protected CompressedHammerLootModifier(LootItemCondition[] conditionsIn) { + super(conditionsIn); + } + + @Override + public Codec codec() { + return CODEC; + } + + @Override + protected @Nullable HammerRecipe getRecipe(Item itemForm) { + return RecipeUtil.getCompressedHammerRecipe(itemForm); + } +} diff --git a/src/main/java/thedarkcolour/exdeorum/loot/HammerLootModifier.java b/src/main/java/thedarkcolour/exdeorum/loot/HammerLootModifier.java index 2c71ca66..f78b0081 100644 --- a/src/main/java/thedarkcolour/exdeorum/loot/HammerLootModifier.java +++ b/src/main/java/thedarkcolour/exdeorum/loot/HammerLootModifier.java @@ -22,6 +22,7 @@ import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import net.minecraft.util.RandomSource; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.enchantment.Enchantments; @@ -30,9 +31,9 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; import net.minecraftforge.common.loot.IGlobalLootModifier; import net.minecraftforge.common.loot.LootModifier; +import org.jetbrains.annotations.Nullable; import thedarkcolour.exdeorum.recipe.RecipeUtil; - -import javax.annotation.Nonnull; +import thedarkcolour.exdeorum.recipe.hammer.HammerRecipe; public class HammerLootModifier extends LootModifier { public static final Codec CODEC = RecordCodecBuilder.create(inst -> LootModifier.codecStart(inst).apply(inst, HammerLootModifier::new)); @@ -41,7 +42,6 @@ public class HammerLootModifier extends LootModifier { super(conditionsIn); } - @Nonnull @Override protected ObjectArrayList doApply(ObjectArrayList generatedLoot, LootContext context) { var state = context.getParamOrNull(LootContextParams.BLOCK_STATE); @@ -49,7 +49,7 @@ public class HammerLootModifier extends LootModifier { if (state != null) { var itemForm = state.getBlock().asItem(); if (itemForm != Items.AIR) { - var recipe = RecipeUtil.getHammerRecipe(itemForm); + var recipe = getRecipe(itemForm); if (recipe != null) { ObjectArrayList newLoot = new ObjectArrayList<>(); @@ -72,6 +72,11 @@ public class HammerLootModifier extends LootModifier { return generatedLoot; } + @Nullable + protected HammerRecipe getRecipe(Item itemForm) { + return RecipeUtil.getHammerRecipe(itemForm); + } + @Override public Codec codec() { return CODEC; diff --git a/src/main/java/thedarkcolour/exdeorum/recipe/RecipeUtil.java b/src/main/java/thedarkcolour/exdeorum/recipe/RecipeUtil.java index 9d73955e..ae6c55db 100644 --- a/src/main/java/thedarkcolour/exdeorum/recipe/RecipeUtil.java +++ b/src/main/java/thedarkcolour/exdeorum/recipe/RecipeUtil.java @@ -158,6 +158,11 @@ public final class RecipeUtil { return hammerRecipeCache.getAllRecipes(); } + @Nullable + public static HammerRecipe getCompressedHammerRecipe(Item itemForm) { + return compressedHammerRecipeCache.getRecipe(itemForm); + } + public static Collection getCachedCompressedHammerRecipes() { return compressedHammerRecipeCache.getAllRecipes(); } diff --git a/src/main/java/thedarkcolour/exdeorum/registry/EBlocks.java b/src/main/java/thedarkcolour/exdeorum/registry/EBlocks.java index 835b208b..b40dea57 100644 --- a/src/main/java/thedarkcolour/exdeorum/registry/EBlocks.java +++ b/src/main/java/thedarkcolour/exdeorum/registry/EBlocks.java @@ -36,7 +36,7 @@ import thedarkcolour.exdeorum.block.*; import static net.minecraft.world.level.block.state.BlockBehaviour.Properties.copy; import static net.minecraft.world.level.block.state.BlockBehaviour.Properties.of; -// READER'S NOTE: More blocks are found in DefaultMaterials.java +// READER'S NOTE: More blocks are found in DefaultMaterials.java and ECompressedBlocks.java public class EBlocks { public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, ExDeorum.ID); @@ -58,25 +58,7 @@ public class EBlocks { public static final RegistryObject WITCH_WATER = BLOCKS.register("witch_water", () -> new WitchWaterBlock(EFluids.WITCH_WATER, copy(Blocks.WATER).mapColor(MapColor.COLOR_PURPLE))); public static final RegistryObject END_CAKE = BLOCKS.register("end_cake", () -> new EndCakeBlock(of().noLootTable().mapColor(MapColor.COLOR_BLACK).forceSolidOn().strength(0.5F).sound(SoundType.WOOL).pushReaction(PushReaction.BLOCK))); - // Compressed blocks - public static final RegistryObject COMPRESSED_DIRT = compressed(Blocks.DIRT); - public static final RegistryObject COMPRESSED_GRAVEL = compressed(Blocks.GRAVEL); - public static final RegistryObject COMPRESSED_SAND = compressed(Blocks.SAND); - public static final RegistryObject COMPRESSED_DUST = compressed(DUST); - public static final RegistryObject COMPRESSED_RED_SAND = compressed(Blocks.RED_SAND); - public static final RegistryObject COMPRESSED_CRUSHED_DEEPSLATE = compressed(CRUSHED_DEEPSLATE); - public static final RegistryObject COMPRESSED_CRUSHED_BLACKSTONE = compressed(CRUSHED_BLACKSTONE); - public static final RegistryObject COMPRESSED_CRUSHED_NETHERRACK = compressed(CRUSHED_NETHERRACK); - public static final RegistryObject COMPRESSED_SOUL_SAND = compressed(Blocks.SOUL_SAND); - public static final RegistryObject COMPRESSED_CRUSHED_END_STONE = compressed(CRUSHED_END_STONE); - public static final RegistryObject COMPRESSED_MOSS_BLOCK = compressed(Blocks.MOSS_BLOCK); - - @SuppressWarnings("deprecation") - private static RegistryObject compressed(Block block) { - return BLOCKS.register("compressed_" + BuiltInRegistries.BLOCK.getKey(block).getPath(), () -> new Block(copy(block))); - } - - private static RegistryObject compressed(RegistryObject block) { - return BLOCKS.register("compressed_" + block.getId().getPath(), () -> new Block(copy(block.get()))); + static { + ECompressedBlocks.register(); } } diff --git a/src/main/java/thedarkcolour/exdeorum/registry/ECompressedBlocks.java b/src/main/java/thedarkcolour/exdeorum/registry/ECompressedBlocks.java new file mode 100644 index 00000000..96225867 --- /dev/null +++ b/src/main/java/thedarkcolour/exdeorum/registry/ECompressedBlocks.java @@ -0,0 +1,70 @@ +/* + * Ex Deorum + * Copyright (c) 2024 thedarkcolour + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package thedarkcolour.exdeorum.registry; + +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraftforge.registries.RegistryObject; +import thedarkcolour.exdeorum.block.CompressedBlockType; + +import java.util.ArrayList; +import java.util.List; + +public class ECompressedBlocks { + public static final List ALL_VARIANTS = new ArrayList<>(); + + public static final CompressedBlockType COMPRESSED_DIRT = register(Blocks.DIRT).withCompressium(); + public static final CompressedBlockType COMPRESSED_COBBLESTONE = register(Blocks.COBBLESTONE).withCompressium(); + public static final CompressedBlockType COMPRESSED_DIORITE = register(Blocks.DIORITE).withCompressium(); + public static final CompressedBlockType COMPRESSED_GRANITE = register(Blocks.GRANITE).withCompressium(); + public static final CompressedBlockType COMPRESSED_ANDESITE = register(Blocks.ANDESITE).withCompressium(); + public static final CompressedBlockType COMPRESSED_GRAVEL = register(Blocks.GRAVEL).withCompressium(); + public static final CompressedBlockType COMPRESSED_SAND = register(Blocks.SAND).withCompressium(); + public static final CompressedBlockType COMPRESSED_DUST = register(EBlocks.DUST); + public static final CompressedBlockType COMPRESSED_RED_SAND = register(Blocks.RED_SAND).withCompressium(); + public static final CompressedBlockType COMPRESSED_DEEPSLATE = register(Blocks.DEEPSLATE); + public static final CompressedBlockType COMPRESSED_COBBLED_DEEPSLATE = register(Blocks.COBBLED_DEEPSLATE); + public static final CompressedBlockType COMPRESSED_NETHERRACK = register(Blocks.NETHERRACK).withCompressium(); + public static final CompressedBlockType COMPRESSED_BLACKSTONE = register(Blocks.BLACKSTONE); + public static final CompressedBlockType COMPRESSED_END_STONE = register(Blocks.END_STONE); + public static final CompressedBlockType COMPRESSED_CRUSHED_DEEPSLATE = register(EBlocks.CRUSHED_DEEPSLATE); + public static final CompressedBlockType COMPRESSED_CRUSHED_BLACKSTONE = register(EBlocks.CRUSHED_BLACKSTONE); + public static final CompressedBlockType COMPRESSED_CRUSHED_NETHERRACK = register(EBlocks.CRUSHED_NETHERRACK); + public static final CompressedBlockType COMPRESSED_SOUL_SAND = register(Blocks.SOUL_SAND).withCompressium(); + public static final CompressedBlockType COMPRESSED_CRUSHED_END_STONE = register(EBlocks.CRUSHED_END_STONE); + public static final CompressedBlockType COMPRESSED_MOSS_BLOCK = register(Blocks.MOSS_BLOCK); + + private static CompressedBlockType register(Block vanillaBase) { + CompressedBlockType type = new CompressedBlockType(BuiltInRegistries.BLOCK.getKey(vanillaBase).getPath(), () -> vanillaBase); + // AllTheCompressed has every vanilla block that Ex Deorum uses so far + type.withAtc(); + ALL_VARIANTS.add(type); + return type; + } + + private static CompressedBlockType register(RegistryObject base) { + CompressedBlockType type = new CompressedBlockType(base.getId().getPath(), base); + ALL_VARIANTS.add(type); + return type; + } + + public static void register() { + } +} diff --git a/src/main/java/thedarkcolour/exdeorum/registry/EGlobalLootModifiers.java b/src/main/java/thedarkcolour/exdeorum/registry/EGlobalLootModifiers.java index 55bbb174..c11036bf 100644 --- a/src/main/java/thedarkcolour/exdeorum/registry/EGlobalLootModifiers.java +++ b/src/main/java/thedarkcolour/exdeorum/registry/EGlobalLootModifiers.java @@ -24,6 +24,7 @@ import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; import thedarkcolour.exdeorum.ExDeorum; +import thedarkcolour.exdeorum.loot.CompressedHammerLootModifier; import thedarkcolour.exdeorum.loot.CrookLootModifier; import thedarkcolour.exdeorum.loot.HammerLootModifier; @@ -32,4 +33,5 @@ public class EGlobalLootModifiers { public static final RegistryObject> CROOK = GLOBAL_LOOT_MODIFIERS.register("crook", () -> CrookLootModifier.CODEC); public static final RegistryObject> HAMMER = GLOBAL_LOOT_MODIFIERS.register("hammer", () -> HammerLootModifier.CODEC); + public static final RegistryObject> COMPRESSED_HAMMER = GLOBAL_LOOT_MODIFIERS.register("compressed_hammer", () -> CompressedHammerLootModifier.CODEC); } diff --git a/src/main/java/thedarkcolour/exdeorum/registry/EItems.java b/src/main/java/thedarkcolour/exdeorum/registry/EItems.java index 1cc3bcc2..94f20c5a 100644 --- a/src/main/java/thedarkcolour/exdeorum/registry/EItems.java +++ b/src/main/java/thedarkcolour/exdeorum/registry/EItems.java @@ -71,12 +71,12 @@ public class EItems { public static final RegistryObject NETHERITE_HAMMER = ITEMS.register("netherite_hammer", () -> new HammerItem(Tiers.NETHERITE, props())); // Compressed Hammers - public static final RegistryObject WOODEN_COMPRESSED_HAMMER = ITEMS.register("wooden_compressed_hammer", () -> new CompressedHammerItem(Tiers.WOOD, props())); - public static final RegistryObject STONE_COMPRESSED_HAMMER = ITEMS.register("stone_compressed_hammer", () -> new CompressedHammerItem(Tiers.STONE, props())); - public static final RegistryObject GOLDEN_COMPRESSED_HAMMER = ITEMS.register("golden_compressed_hammer", () -> new CompressedHammerItem(Tiers.GOLD, props())); - public static final RegistryObject IRON_COMPRESSED_HAMMER = ITEMS.register("iron_compressed_hammer", () -> new CompressedHammerItem(Tiers.IRON, props())); - public static final RegistryObject DIAMOND_COMPRESSED_HAMMER = ITEMS.register("diamond_compressed_hammer", () -> new CompressedHammerItem(Tiers.DIAMOND, props())); - public static final RegistryObject NETHERITE_COMPRESSED_HAMMER = ITEMS.register("netherite_compressed_hammer", () -> new CompressedHammerItem(Tiers.NETHERITE, props())); + public static final RegistryObject COMPRESSED_WOODEN_HAMMER = ITEMS.register("compressed_wooden_hammer", () -> new CompressedHammerItem(Tiers.WOOD, props())); + public static final RegistryObject COMPRESSED_STONE_HAMMER = ITEMS.register("compressed_stone_hammer", () -> new CompressedHammerItem(Tiers.STONE, props())); + public static final RegistryObject COMPRESSED_GOLDEN_HAMMER = ITEMS.register("compressed_golden_hammer", () -> new CompressedHammerItem(Tiers.GOLD, props())); + public static final RegistryObject COMPRESSED_IRON_HAMMER = ITEMS.register("compressed_iron_hammer", () -> new CompressedHammerItem(Tiers.IRON, props())); + public static final RegistryObject COMPRESSED_DIAMOND_HAMMER = ITEMS.register("compressed_diamond_hammer", () -> new CompressedHammerItem(Tiers.DIAMOND, props())); + public static final RegistryObject COMPRESSED_NETHERITE_HAMMER = ITEMS.register("compressed_netherite_hammer", () -> new CompressedHammerItem(Tiers.NETHERITE, props())); // Ore Chunks public static final RegistryObject IRON_ORE_CHUNK = registerSimpleItem("iron_ore_chunk"); @@ -153,18 +153,6 @@ public class EItems { public static final RegistryObject CRUSHED_DEEPSLATE = registerItemBlock(EBlocks.CRUSHED_DEEPSLATE); public static final RegistryObject CRUSHED_BLACKSTONE = registerItemBlock(EBlocks.CRUSHED_BLACKSTONE); - public static final RegistryObject COMPRESSED_DIRT = registerItemBlock(EBlocks.COMPRESSED_DIRT); - public static final RegistryObject COMPRESSED_GRAVEL = registerItemBlock(EBlocks.COMPRESSED_GRAVEL); - public static final RegistryObject COMPRESSED_SAND = registerItemBlock(EBlocks.COMPRESSED_SAND); - public static final RegistryObject COMPRESSED_DUST = registerItemBlock(EBlocks.COMPRESSED_DUST); - public static final RegistryObject COMPRESSED_RED_SAND = registerItemBlock(EBlocks.COMPRESSED_RED_SAND); - public static final RegistryObject COMPRESSED_CRUSHED_DEEPSLATE = registerItemBlock(EBlocks.COMPRESSED_CRUSHED_DEEPSLATE); - public static final RegistryObject COMPRESSED_CRUSHED_BLACKSTONE = registerItemBlock(EBlocks.COMPRESSED_CRUSHED_BLACKSTONE); - public static final RegistryObject COMPRESSED_CRUSHED_NETHERRACK = registerItemBlock(EBlocks.COMPRESSED_CRUSHED_NETHERRACK); - public static final RegistryObject COMPRESSED_SOUL_SAND = registerItemBlock(EBlocks.COMPRESSED_SOUL_SAND); - public static final RegistryObject COMPRESSED_CRUSHED_END_STONE = registerItemBlock(EBlocks.COMPRESSED_CRUSHED_END_STONE); - public static final RegistryObject COMPRESSED_MOSS_BLOCK = registerItemBlock(EBlocks.COMPRESSED_MOSS_BLOCK); - // Mechanical Sieves public static final RegistryObject MECHANICAL_SIEVE = registerItemBlock(EBlocks.MECHANICAL_SIEVE); public static final RegistryObject MECHANICAL_HAMMER = registerItemBlock(EBlocks.MECHANICAL_HAMMER); @@ -194,17 +182,26 @@ public class EItems { output.accept(CRUSHED_DEEPSLATE.get()); output.accept(CRUSHED_BLACKSTONE.get()); - output.accept(COMPRESSED_DIRT.get()); - output.accept(COMPRESSED_GRAVEL.get()); - output.accept(COMPRESSED_SAND.get()); - output.accept(COMPRESSED_DUST.get()); - output.accept(COMPRESSED_RED_SAND.get()); - output.accept(COMPRESSED_CRUSHED_DEEPSLATE.get()); - output.accept(COMPRESSED_CRUSHED_BLACKSTONE.get()); - output.accept(COMPRESSED_CRUSHED_NETHERRACK.get()); - output.accept(COMPRESSED_SOUL_SAND.get()); - output.accept(COMPRESSED_CRUSHED_END_STONE.get()); - output.accept(COMPRESSED_MOSS_BLOCK.get()); + output.accept(ECompressedBlocks.COMPRESSED_DIRT.getItem()); + output.accept(ECompressedBlocks.COMPRESSED_COBBLESTONE.getItem()); + output.accept(ECompressedBlocks.COMPRESSED_DIORITE.getItem()); + output.accept(ECompressedBlocks.COMPRESSED_GRANITE.getItem()); + output.accept(ECompressedBlocks.COMPRESSED_ANDESITE.getItem()); + output.accept(ECompressedBlocks.COMPRESSED_GRAVEL.getItem()); + output.accept(ECompressedBlocks.COMPRESSED_SAND.getItem()); + output.accept(ECompressedBlocks.COMPRESSED_DUST.getItem()); + output.accept(ECompressedBlocks.COMPRESSED_RED_SAND.getItem()); + output.accept(ECompressedBlocks.COMPRESSED_DEEPSLATE.getItem()); + output.accept(ECompressedBlocks.COMPRESSED_COBBLED_DEEPSLATE.getItem()); + output.accept(ECompressedBlocks.COMPRESSED_NETHERRACK.getItem()); + output.accept(ECompressedBlocks.COMPRESSED_BLACKSTONE.getItem()); + output.accept(ECompressedBlocks.COMPRESSED_END_STONE.getItem()); + output.accept(ECompressedBlocks.COMPRESSED_CRUSHED_DEEPSLATE.getItem()); + output.accept(ECompressedBlocks.COMPRESSED_CRUSHED_BLACKSTONE.getItem()); + output.accept(ECompressedBlocks.COMPRESSED_CRUSHED_NETHERRACK.getItem()); + output.accept(ECompressedBlocks.COMPRESSED_SOUL_SAND.getItem()); + output.accept(ECompressedBlocks.COMPRESSED_CRUSHED_END_STONE.getItem()); + output.accept(ECompressedBlocks.COMPRESSED_MOSS_BLOCK.getItem()); output.accept(END_CAKE.get()); output.accept(RANDOM_ARMOR_TRIM.get()); @@ -232,12 +229,12 @@ public class EItems { output.accept(IRON_HAMMER.get()); output.accept(DIAMOND_HAMMER.get()); output.accept(NETHERITE_HAMMER.get()); - output.accept(WOODEN_COMPRESSED_HAMMER.get()); - output.accept(STONE_COMPRESSED_HAMMER.get()); - output.accept(GOLDEN_COMPRESSED_HAMMER.get()); - output.accept(IRON_COMPRESSED_HAMMER.get()); - output.accept(DIAMOND_COMPRESSED_HAMMER.get()); - output.accept(NETHERITE_COMPRESSED_HAMMER.get()); + output.accept(COMPRESSED_WOODEN_HAMMER.get()); + output.accept(COMPRESSED_STONE_HAMMER.get()); + output.accept(COMPRESSED_GOLDEN_HAMMER.get()); + output.accept(COMPRESSED_IRON_HAMMER.get()); + output.accept(COMPRESSED_DIAMOND_HAMMER.get()); + output.accept(COMPRESSED_NETHERITE_HAMMER.get()); output.accept(IRON_ORE_CHUNK.get()); output.accept(COPPER_ORE_CHUNK.get()); output.accept(GOLD_ORE_CHUNK.get()); diff --git a/src/main/java/thedarkcolour/exdeorum/tag/EItemTags.java b/src/main/java/thedarkcolour/exdeorum/tag/EItemTags.java index d3837208..cec5a50e 100644 --- a/src/main/java/thedarkcolour/exdeorum/tag/EItemTags.java +++ b/src/main/java/thedarkcolour/exdeorum/tag/EItemTags.java @@ -23,10 +23,12 @@ import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import thedarkcolour.exdeorum.ExDeorum; +import thedarkcolour.exdeorum.registry.ECompressedBlocks; public class EItemTags { public static final TagKey CROOKS = tag("crooks"); public static final TagKey HAMMERS = tag("hammers"); + public static final TagKey COMPRESSED_HAMMERS = tag("compressed_hammers"); public static final TagKey SIEVE_MESHES = tag("sieve_meshes"); public static final TagKey PEBBLES = tag("pebbles"); public static final TagKey END_CAKE_MATERIAL = tag("end_cake_materials"); @@ -51,18 +53,7 @@ public class EItemTags { public static final TagKey ORES_LITHIUM = forgeTag("ores/lithium"); public static final TagKey ORES_BORON = forgeTag("ores/boron"); - // Compressed tags - public static final TagKey COMPRESSED_DIRT = tag("compressed/dirt"); - public static final TagKey COMPRESSED_GRAVEL = tag("compressed/gravel"); - public static final TagKey COMPRESSED_SAND = tag("compressed/sand"); - public static final TagKey COMPRESSED_DUST = tag("compressed/dust"); - public static final TagKey COMPRESSED_RED_SAND = tag("compressed/red_sand"); - public static final TagKey COMPRESSED_CRUSHED_DEEPSLATE = tag("compressed/crushed_deepslate"); - public static final TagKey COMPRESSED_CRUSHED_BLACKSTONE = tag("compressed/crushed_blackstone"); - public static final TagKey COMPRESSED_CRUSHED_NETHERRACK = tag("compressed/crushed_netherrack"); - public static final TagKey COMPRESSED_SOUL_SAND = tag("compressed/soul_sand"); - public static final TagKey COMPRESSED_CRUSHED_END_STONE = tag("compressed/crushed_end_stone"); - public static final TagKey COMPRESSED_MOSS_BLOCK = tag("compressed/moss_block"); + public static final TagKey COMPRESSED_SANDS = tag("compressed/sands"); public static TagKey tag(String name) { return ItemTags.create(new ResourceLocation(ExDeorum.ID, name)); diff --git a/src/main/resources/assets/exdeorum/textures/item/compressed_diamond_hammer.png b/src/main/resources/assets/exdeorum/textures/item/compressed_diamond_hammer.png new file mode 100644 index 0000000000000000000000000000000000000000..d1365258aa80adea6fbd5d408a164e9a02c7abfc GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}H0G|+7K6^9c*Qd3QuTkGLE5lEYLsh}kOjJXTyE9!KsHFHuMJtfvDhcun z{tp8To6hK*2a0kQctjR6Fz_7)VaDV6D^h@hDV{ElAsWGx@Y;&q1DG@O1TaS?83{1OQ^v BUl0HQ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/exdeorum/textures/item/compressed_golden_hammer.png b/src/main/resources/assets/exdeorum/textures/item/compressed_golden_hammer.png new file mode 100644 index 0000000000000000000000000000000000000000..b2b7b996ec5cf8a47c87e89e95a921c3789a5051 GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}H0G|-ordYAR|I7ZrP<**jG{aBMUXRbyOjJXTyE9!KsAR={+s8nPt0c%T z_&*FVY&xTJ9w^FL;1OBOz`%DHgc*NS%G}H0G|+77Z;cR|Nq~(apT~@gBgBu5)u-gW}+H$+@0y_Kqb7PvU`CPS4ogx zFi;r;Fl;)ba~>$lS>O>_%)r2R7=#&*=dVZs3Z{6vIEH8hhxRlIH7Ia6vv)lE|G$7o zqkH#qgBu$nJNh@Ab!T}ZsF1~ENS%G}T0G|+7FHMKG>bBUhSbrP41QR1=0U>=wC2LD-X9wqES7)HAp3LsIK#IF0 z$S?Rm958tKGkyXJa~60+7BevL9R^{>l+WA^@o?XF?$pIX-b=CtJWVA^8NS%G}H0G|+7PfyQTvu1U6cGlO|XZXoUNJw~^iE7Akcc!ZYm5BG=)&x>qB|(0{ z|6zb((;1!fKvB*DkH}&M2EM}}%y>M1MG8*bv##zu~Mq%M(F`EG8qb0@Gl|%+ukT@}k1(a|OGOIox`9vHh@rTl>SaFJ_zopr02ZTO Aj{pDw literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/exdeorum/textures/item/compressed_wooden_hammer.png b/src/main/resources/assets/exdeorum/textures/item/compressed_wooden_hammer.png new file mode 100644 index 0000000000000000000000000000000000000000..408572c5705360d6f7885da746682f7b6182720d GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}H0G|+7b4`J^RJGCw#q2=&3_m#q2`&veZcj7O&UAI463P9uynqx}NswRg ze;8ocbVlbqP?WR4BeIx*f$uN~Gak=hkpdJ<^K@|x(FhLhW8^!az`@+z(f7Z;LgdCB z55J8U+$^{Y1-DgpG}thutY|nRl(T{_a*1yI(wdNvo)R|=Ww|A?Vzm};QX(Yo_1rr- zN90=yn`Yv9QR}3ZX|+e|@2qh+XWu$&{-Ixc@8<8=!n)gG{W=|>jSQZyelF{r5}E*H CY+EV- literal 0 HcmV?d00001 diff --git a/src/main/resources/data/exdeorum/loot_modifiers/compressed_hammer.json b/src/main/resources/data/exdeorum/loot_modifiers/compressed_hammer.json index 681d9662..7e85eefe 100644 --- a/src/main/resources/data/exdeorum/loot_modifiers/compressed_hammer.json +++ b/src/main/resources/data/exdeorum/loot_modifiers/compressed_hammer.json @@ -1,12 +1,11 @@ { - "type": "exdeorum:hammer", - "reward_recipe_type": "exdeorum:compressed_hammer", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "tag": "exdeorum:compressed_hammers" - } - } - ] + "type": "exdeorum:compressed_hammer", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "tag": "exdeorum:compressed_hammers" + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/data/exdeorum/loot_modifiers/hammer.json b/src/main/resources/data/exdeorum/loot_modifiers/hammer.json index d5205515..6a13dc29 100644 --- a/src/main/resources/data/exdeorum/loot_modifiers/hammer.json +++ b/src/main/resources/data/exdeorum/loot_modifiers/hammer.json @@ -1,6 +1,5 @@ { "type": "exdeorum:hammer", - "reward_recipe_type": "exdeorum:hammer", "conditions": [ { "condition": "minecraft:match_tool", diff --git a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json index ca7f8e0e..ae40e0f9 100644 --- a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json +++ b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json @@ -2,6 +2,7 @@ "replace": false, "entries":[ "exdeorum:crook", - "exdeorum:hammer" + "exdeorum:hammer", + "exdeorum:compressed_hammer" ] } \ No newline at end of file