diff --git a/.gradle/8.8/executionHistory/executionHistory.bin b/.gradle/8.8/executionHistory/executionHistory.bin index bedfbc7f5..60c98a41e 100644 Binary files a/.gradle/8.8/executionHistory/executionHistory.bin and b/.gradle/8.8/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.8/executionHistory/executionHistory.lock b/.gradle/8.8/executionHistory/executionHistory.lock index 8f4001426..7a9044021 100644 Binary files a/.gradle/8.8/executionHistory/executionHistory.lock and b/.gradle/8.8/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.8/fileHashes/fileHashes.bin b/.gradle/8.8/fileHashes/fileHashes.bin index 186c2704a..2231dec37 100644 Binary files a/.gradle/8.8/fileHashes/fileHashes.bin and b/.gradle/8.8/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.8/fileHashes/fileHashes.lock b/.gradle/8.8/fileHashes/fileHashes.lock index 1acd4e405..9f30e4e80 100644 Binary files a/.gradle/8.8/fileHashes/fileHashes.lock and b/.gradle/8.8/fileHashes/fileHashes.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 5eed9e033..20bb1a501 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/build/libs/custom_ore_gen-2.1.6.jar b/build/libs/custom_ore_gen-2.1.6.jar index b00d3ced3..ed52328cb 100644 Binary files a/build/libs/custom_ore_gen-2.1.6.jar and b/build/libs/custom_ore_gen-2.1.6.jar differ diff --git a/build/reobfJar/log.txt b/build/reobfJar/log.txt index debec7c48..16f3d12b8 100644 --- a/build/reobfJar/log.txt +++ b/build/reobfJar/log.txt @@ -134,22 +134,22 @@ Adding Libraries to Inheritance Reading Input: D:\custom_ore_gem\build\libs\custom_ore_gen-2.1.6.jar Adding input to inheritance map Processing entries -Conflicting propagated mapping for net/mcreator/customoregen/block/SharddiamondblockoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ -Conflicting propagated mapping for net/mcreator/customoregen/block/DeepslateredstoneoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ -Conflicting propagated mapping for net/mcreator/customoregen/block/PuregoldenoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/CopperhighoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/LoweremeraldoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ Conflicting propagated mapping for net/mcreator/customoregen/block/HighemeraldoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ Conflicting propagated mapping for net/mcreator/customoregen/block/LapisoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ -Conflicting propagated mapping for net/mcreator/customoregen/block/CopperloweroreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ -Conflicting propagated mapping for net/mcreator/customoregen/block/DeepslatesharddiamondoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ -Conflicting propagated mapping for net/mcreator/customoregen/block/ConcentratedcoaloreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ -Conflicting propagated mapping for net/mcreator/customoregen/block/LoweremeraldoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ -Conflicting propagated mapping for net/mcreator/customoregen/block/DeepslatepuregoldenoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ Conflicting propagated mapping for net/mcreator/customoregen/block/IronoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/DeepslatesharddiamondoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/DeepslateredstoneoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/DeepslatepuregoldenoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ Conflicting propagated mapping for net/mcreator/customoregen/block/DeepslateironoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ -Conflicting propagated mapping for net/mcreator/customoregen/block/DeepslatelapisoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/ConcentratedcoaloreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ Conflicting propagated mapping for net/mcreator/customoregen/block/ConcentrateddiamondoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ -Conflicting propagated mapping for net/mcreator/customoregen/block/CopperhighoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/CopperloweroreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/PuregoldenoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/DeepslatelapisoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ Conflicting propagated mapping for net/mcreator/customoregen/block/RedstoneoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ +Conflicting propagated mapping for net/mcreator/customoregen/block/SharddiamondblockoreBlock/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I from net/minecraft/world/level/block/state/BlockBehaviour/getLightBlock(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I: getLightBlock -> m_7753_ Conflicting propagated mapping for net/minecraft/world/entity/LivingEntity/lambda$addAdditionalSaveData$3(Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/nbt/Tag;)V from net/minecraft/world/entity/player/Player/lambda$addAdditionalSaveData$3(Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/nbt/Tag;)V: lambda$addAdditionalSaveData$3 -> m_219754_ Conflicting propagated mapping for net/mcreator/customoregen/item/ShardDiamondArmorMaterial/getRepairIngredient()Lnet/minecraft/world/item/crafting/Ingredient; from net/minecraft/world/item/ArmorMaterial/getRepairIngredient()Lnet/minecraft/world/item/crafting/Ingredient;: getRepairIngredient -> m_6230_ Conflicting propagated mapping for net/mcreator/customoregen/item/ShardDiamondArmorMaterial/getEnchantmentValue()I from net/minecraft/world/item/ArmorMaterial/getEnchantmentValue()I: getEnchantmentValue -> m_6646_ @@ -173,13 +173,13 @@ Conflicting propagated mapping for net/mcreator/customoregen/item/Sharddiamondpa Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondpaxelItem$1/getEnchantmentValue()I from net/minecraft/world/item/Tier/getEnchantmentValue()I: getEnchantmentValue -> m_6601_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondpaxelItem$1/getLevel()I from net/minecraft/world/item/Tier/getLevel()I: getLevel -> m_6604_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondpaxelItem$1/getAttackDamageBonus()F from net/minecraft/world/item/Tier/getAttackDamageBonus()F: getAttackDamageBonus -> m_6631_ +Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondpaxelItem/getDestroySpeed(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/block/state/BlockState;)F from net/minecraft/world/item/DiggerItem/getDestroySpeed(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/block/state/BlockState;)F: getDestroySpeed -> m_8102_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondpickaxeItem$1/getUses()I from net/minecraft/world/item/Tier/getUses()I: getUses -> m_6609_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondpickaxeItem$1/getSpeed()F from net/minecraft/world/item/Tier/getSpeed()F: getSpeed -> m_6624_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondpickaxeItem$1/getRepairIngredient()Lnet/minecraft/world/item/crafting/Ingredient; from net/minecraft/world/item/Tier/getRepairIngredient()Lnet/minecraft/world/item/crafting/Ingredient;: getRepairIngredient -> m_6282_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondpickaxeItem$1/getEnchantmentValue()I from net/minecraft/world/item/Tier/getEnchantmentValue()I: getEnchantmentValue -> m_6601_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondpickaxeItem$1/getLevel()I from net/minecraft/world/item/Tier/getLevel()I: getLevel -> m_6604_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondpickaxeItem$1/getAttackDamageBonus()F from net/minecraft/world/item/Tier/getAttackDamageBonus()F: getAttackDamageBonus -> m_6631_ -Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondpaxelItem/getDestroySpeed(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/block/state/BlockState;)F from net/minecraft/world/item/DiggerItem/getDestroySpeed(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/block/state/BlockState;)F: getDestroySpeed -> m_8102_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondshovelItem$1/getUses()I from net/minecraft/world/item/Tier/getUses()I: getUses -> m_6609_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondshovelItem$1/getSpeed()F from net/minecraft/world/item/Tier/getSpeed()F: getSpeed -> m_6624_ Conflicting propagated mapping for net/mcreator/customoregen/item/SharddiamondshovelItem$1/getRepairIngredient()Lnet/minecraft/world/item/crafting/Ingredient; from net/minecraft/world/item/Tier/getRepairIngredient()Lnet/minecraft/world/item/crafting/Ingredient;: getRepairIngredient -> m_6282_ @@ -341,11 +341,10 @@ Writing Output: D:\custom_ore_gem\build\reobfJar\output.jar data/custom_ore_gen/loot_tables/blocks/puregoldenore.json data/custom_ore_gen/loot_tables/blocks/redstoneore.json data/custom_ore_gen/loot_tables/blocks/sharddiamondblockore.json - data/custom_ore_gen/recipe/ - data/custom_ore_gen/recipe/ore_biome_finder.json data/custom_ore_gen/recipes/ data/custom_ore_gen/recipes/axerecipe.json data/custom_ore_gen/recipes/diamondshardtodiamond.json + data/custom_ore_gen/recipes/ore_biome_finder.json data/custom_ore_gen/recipes/pickaxecraft.json data/custom_ore_gen/recipes/sculk_catalyst_diamond_shard.json data/custom_ore_gen/recipes/sharddiamondboots.json diff --git a/build/reobfJar/output.jar b/build/reobfJar/output.jar index b00d3ced3..ed52328cb 100644 Binary files a/build/reobfJar/output.jar and b/build/reobfJar/output.jar differ diff --git a/build/resources/main/data/custom_ore_gen/recipe/ore_biome_finder.json b/build/resources/main/data/custom_ore_gen/recipes/ore_biome_finder.json similarity index 100% rename from build/resources/main/data/custom_ore_gen/recipe/ore_biome_finder.json rename to build/resources/main/data/custom_ore_gen/recipes/ore_biome_finder.json diff --git a/build/resources/main/data/custom_ore_gen/recipes/sharddiamondpaxel.json b/build/resources/main/data/custom_ore_gen/recipes/sharddiamondpaxel.json index bee1e7d3b..9cdef0bbe 100644 --- a/build/resources/main/data/custom_ore_gen/recipes/sharddiamondpaxel.json +++ b/build/resources/main/data/custom_ore_gen/recipes/sharddiamondpaxel.json @@ -2,14 +2,20 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "pattern": [ - " S ", + "PSA", " T ", " T " ], "key": { - "S": { + "P": { "item": "custom_ore_gen:sharddiamondpickaxe" }, + "S": { + "item": "custom_ore_gen:sharddiamondshovel" + }, + "A": { + "item": "custom_ore_gen:sharddiamondaxe" + }, "T": { "item": "minecraft:stick" } diff --git a/src/main/resources/data/custom_ore_gen/recipe/ore_biome_finder.json b/src/main/resources/data/custom_ore_gen/recipes/ore_biome_finder.json similarity index 100% rename from src/main/resources/data/custom_ore_gen/recipe/ore_biome_finder.json rename to src/main/resources/data/custom_ore_gen/recipes/ore_biome_finder.json diff --git a/src/main/resources/data/custom_ore_gen/recipes/sharddiamondpaxel.json b/src/main/resources/data/custom_ore_gen/recipes/sharddiamondpaxel.json index bee1e7d3b..9cdef0bbe 100644 --- a/src/main/resources/data/custom_ore_gen/recipes/sharddiamondpaxel.json +++ b/src/main/resources/data/custom_ore_gen/recipes/sharddiamondpaxel.json @@ -2,14 +2,20 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "pattern": [ - " S ", + "PSA", " T ", " T " ], "key": { - "S": { + "P": { "item": "custom_ore_gen:sharddiamondpickaxe" }, + "S": { + "item": "custom_ore_gen:sharddiamondshovel" + }, + "A": { + "item": "custom_ore_gen:sharddiamondaxe" + }, "T": { "item": "minecraft:stick" }