From bca6034dd72ccf6c7c252e9b817fca534b2bf967 Mon Sep 17 00:00:00 2001 From: feldenr <135638674+feldenr@users.noreply.github.com> Date: Mon, 2 Feb 2026 23:11:42 +0100 Subject: [PATCH] fix: restore ore drops and make them configurable via procedure - Renamed data folders to 1.21.1 standards (singular names) - Implemented OreBreakEventHandler to call ConfigurableOreDropsProcedure - Updated procedure and config to handle all custom and variant ores - Modified loot tables to only handle Silk Touch (manual drops via procedure) - Fixed missing drops issue caused by folder name mismatch in 1.21.1 --- .../customoregen/config/ModConfigs.java | 41 +++++++++ .../event/OreBreakEventHandler.java | 52 +++++++++++ .../ConfigurableOreDropsProcedure.java | 25 ++++++ .../blocks/concentratedcoalore.json | 42 +++++++++ .../loot_table/blocks/copperhighore.json | 42 +++++++++ .../loot_table/blocks/copperlowerore.json | 42 +++++++++ .../blocks/deepslatediamondore.json | 42 +++++++++ .../loot_table/blocks/deepslateironore.json | 42 +++++++++ .../loot_table/blocks/deepslatelapisore.json | 42 +++++++++ .../blocks/deepslatepuregoldenore.json | 42 +++++++++ .../blocks/deepslateredstoneore.json | 42 +++++++++ .../blocks/deepslatesharddiamondore.json | 42 +++++++++ .../loot_table/blocks/highemeraldore.json | 42 +++++++++ .../loot_table/blocks/ironore.json | 42 +++++++++ .../loot_table/blocks/lapisore.json | 42 +++++++++ .../loot_table/blocks/loweremeraldore.json | 42 +++++++++ .../loot_table/blocks/puregoldenore.json | 42 +++++++++ .../loot_table/blocks/redstoneore.json | 42 +++++++++ .../blocks/sharddiamondblockore.json | 42 +++++++++ .../blocks/concentratedcoalore.json | 86 ------------------ .../loot_tables/blocks/copperhighore.json | 85 ------------------ .../loot_tables/blocks/copperlowerore.json | 85 ------------------ .../blocks/deepslatediamondore.json | 82 ----------------- .../loot_tables/blocks/deepslateironore.json | 82 ----------------- .../loot_tables/blocks/deepslatelapisore.json | 90 ------------------- .../blocks/deepslatepuregoldenore.json | 89 ------------------ .../blocks/deepslateredstoneore.json | 85 ------------------ .../blocks/deepslatesharddiamondore.json | 82 ----------------- .../loot_tables/blocks/highemeraldore.json | 82 ----------------- .../loot_tables/blocks/ironore.json | 82 ----------------- .../loot_tables/blocks/lapisore.json | 90 ------------------- .../loot_tables/blocks/loweremeraldore.json | 82 ----------------- .../loot_tables/blocks/puregoldenore.json | 89 ------------------ .../loot_tables/blocks/redstoneore.json | 82 ----------------- .../blocks/sharddiamondblockore.json | 82 ----------------- .../{recipes => recipe}/axerecipe.json | 0 .../diamondshardtodiamond.json | 0 .../{recipes => recipe}/ore_biome_finder.json | 0 .../{recipes => recipe}/pickaxecraft.json | 0 .../sculk_catalyst_diamond_shard.json | 0 .../sharddiamondboots.json | 0 .../sharddiamondchestplate.json | 0 .../sharddiamondhelmet.json | 0 .../sharddiamondleggings.json | 0 .../sharddiamondpaxel.json | 0 .../{recipes => recipe}/shovelcraft.json | 0 .../minecraft/tags/{items => item}/axes.json | 0 .../tags/item/enchantable/armor.json | 9 ++ .../tags/item/enchantable/durability.json | 13 +++ .../tags/item/enchantable/mining.json | 9 ++ .../tags/item/enchantable/weapon.json | 7 ++ .../tags/{items => item}/pickaxes.json | 0 .../tags/{items => item}/shovels.json | 0 53 files changed, 828 insertions(+), 1355 deletions(-) create mode 100644 src/main/java/net/mcreator/customoregen/event/OreBreakEventHandler.java create mode 100644 src/main/resources/data/custom_ore_gen/loot_table/blocks/concentratedcoalore.json create mode 100644 src/main/resources/data/custom_ore_gen/loot_table/blocks/copperhighore.json create mode 100644 src/main/resources/data/custom_ore_gen/loot_table/blocks/copperlowerore.json create mode 100644 src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslatediamondore.json create mode 100644 src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslateironore.json create mode 100644 src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslatelapisore.json create mode 100644 src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslatepuregoldenore.json create mode 100644 src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslateredstoneore.json create mode 100644 src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslatesharddiamondore.json create mode 100644 src/main/resources/data/custom_ore_gen/loot_table/blocks/highemeraldore.json create mode 100644 src/main/resources/data/custom_ore_gen/loot_table/blocks/ironore.json create mode 100644 src/main/resources/data/custom_ore_gen/loot_table/blocks/lapisore.json create mode 100644 src/main/resources/data/custom_ore_gen/loot_table/blocks/loweremeraldore.json create mode 100644 src/main/resources/data/custom_ore_gen/loot_table/blocks/puregoldenore.json create mode 100644 src/main/resources/data/custom_ore_gen/loot_table/blocks/redstoneore.json create mode 100644 src/main/resources/data/custom_ore_gen/loot_table/blocks/sharddiamondblockore.json delete mode 100644 src/main/resources/data/custom_ore_gen/loot_tables/blocks/concentratedcoalore.json delete mode 100644 src/main/resources/data/custom_ore_gen/loot_tables/blocks/copperhighore.json delete mode 100644 src/main/resources/data/custom_ore_gen/loot_tables/blocks/copperlowerore.json delete mode 100644 src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslatediamondore.json delete mode 100644 src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslateironore.json delete mode 100644 src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslatelapisore.json delete mode 100644 src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslatepuregoldenore.json delete mode 100644 src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslateredstoneore.json delete mode 100644 src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslatesharddiamondore.json delete mode 100644 src/main/resources/data/custom_ore_gen/loot_tables/blocks/highemeraldore.json delete mode 100644 src/main/resources/data/custom_ore_gen/loot_tables/blocks/ironore.json delete mode 100644 src/main/resources/data/custom_ore_gen/loot_tables/blocks/lapisore.json delete mode 100644 src/main/resources/data/custom_ore_gen/loot_tables/blocks/loweremeraldore.json delete mode 100644 src/main/resources/data/custom_ore_gen/loot_tables/blocks/puregoldenore.json delete mode 100644 src/main/resources/data/custom_ore_gen/loot_tables/blocks/redstoneore.json delete mode 100644 src/main/resources/data/custom_ore_gen/loot_tables/blocks/sharddiamondblockore.json rename src/main/resources/data/custom_ore_gen/{recipes => recipe}/axerecipe.json (100%) rename src/main/resources/data/custom_ore_gen/{recipes => recipe}/diamondshardtodiamond.json (100%) rename src/main/resources/data/custom_ore_gen/{recipes => recipe}/ore_biome_finder.json (100%) rename src/main/resources/data/custom_ore_gen/{recipes => recipe}/pickaxecraft.json (100%) rename src/main/resources/data/custom_ore_gen/{recipes => recipe}/sculk_catalyst_diamond_shard.json (100%) rename src/main/resources/data/custom_ore_gen/{recipes => recipe}/sharddiamondboots.json (100%) rename src/main/resources/data/custom_ore_gen/{recipes => recipe}/sharddiamondchestplate.json (100%) rename src/main/resources/data/custom_ore_gen/{recipes => recipe}/sharddiamondhelmet.json (100%) rename src/main/resources/data/custom_ore_gen/{recipes => recipe}/sharddiamondleggings.json (100%) rename src/main/resources/data/custom_ore_gen/{recipes => recipe}/sharddiamondpaxel.json (100%) rename src/main/resources/data/custom_ore_gen/{recipes => recipe}/shovelcraft.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/axes.json (100%) create mode 100644 src/main/resources/data/minecraft/tags/item/enchantable/armor.json create mode 100644 src/main/resources/data/minecraft/tags/item/enchantable/durability.json create mode 100644 src/main/resources/data/minecraft/tags/item/enchantable/mining.json create mode 100644 src/main/resources/data/minecraft/tags/item/enchantable/weapon.json rename src/main/resources/data/minecraft/tags/{items => item}/pickaxes.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/shovels.json (100%) diff --git a/src/main/java/net/mcreator/customoregen/config/ModConfigs.java b/src/main/java/net/mcreator/customoregen/config/ModConfigs.java index 6a0386561..e49d7c96d 100644 --- a/src/main/java/net/mcreator/customoregen/config/ModConfigs.java +++ b/src/main/java/net/mcreator/customoregen/config/ModConfigs.java @@ -202,8 +202,21 @@ public class ModConfigs { public final ModConfigSpec.ConfigValue impureGoldOreMinDrops; public final ModConfigSpec.ConfigValue impureGoldOreMaxDrops; + public final ModConfigSpec.ConfigValue lapisOreMinDrops; + public final ModConfigSpec.ConfigValue lapisOreMaxDrops; + + public final ModConfigSpec.ConfigValue redstoneOreMinDrops; + public final ModConfigSpec.ConfigValue redstoneOreMaxDrops; + + public final ModConfigSpec.ConfigValue emeraldOreMinDrops; + public final ModConfigSpec.ConfigValue emeraldOreMaxDrops; + + public final ModConfigSpec.ConfigValue copperOreMinDrops; + public final ModConfigSpec.ConfigValue copperOreMaxDrops; + public final ModConfigSpec.ConfigValue oreExperienceDrops; + public DropsConfig(ModConfigSpec.Builder builder) { builder.push("drops"); @@ -273,7 +286,35 @@ public class ModConfigs { .defineInRange("goldMaxDrops", 2, 0, 64); builder.pop(); + builder.push("vanilla_ore_variants"); + lapisOreMinDrops = builder + .comment("Minimum lapis dropped (default: 4)") + .defineInRange("lapisMinDrops", 4, 0, 64); + lapisOreMaxDrops = builder + .comment("Maximum lapis dropped (default: 9)") + .defineInRange("lapisMaxDrops", 9, 0, 64); + redstoneOreMinDrops = builder + .comment("Minimum redstone dropped (default: 4)") + .defineInRange("redstoneMinDrops", 4, 0, 64); + redstoneOreMaxDrops = builder + .comment("Maximum redstone dropped (default: 5)") + .defineInRange("redstoneMaxDrops", 5, 0, 64); + emeraldOreMinDrops = builder + .comment("Minimum emerald dropped (default: 1)") + .defineInRange("emeraldMinDrops", 1, 0, 64); + emeraldOreMaxDrops = builder + .comment("Maximum emerald dropped (default: 1)") + .defineInRange("emeraldMaxDrops", 1, 0, 64); + copperOreMinDrops = builder + .comment("Minimum copper dropped (default: 2)") + .defineInRange("copperMinDrops", 2, 0, 64); + copperOreMaxDrops = builder + .comment("Maximum copper dropped (default: 5)") + .defineInRange("copperMaxDrops", 5, 0, 64); + builder.pop(); + oreExperienceDrops = builder + .comment("Experience dropped when mining custom ores (default: 2)") .defineInRange("oreExperience", 2, 0, 100); diff --git a/src/main/java/net/mcreator/customoregen/event/OreBreakEventHandler.java b/src/main/java/net/mcreator/customoregen/event/OreBreakEventHandler.java new file mode 100644 index 000000000..c13b7391e --- /dev/null +++ b/src/main/java/net/mcreator/customoregen/event/OreBreakEventHandler.java @@ -0,0 +1,52 @@ +package net.mcreator.customoregen.event; + +import net.neoforged.neoforge.event.level.BlockEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.bus.api.SubscribeEvent; + +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.entity.player.Player; + +import net.mcreator.customoregen.procedures.ConfigurableOreDropsProcedure; +import net.mcreator.customoregen.init.CustomOreGenModBlocks; +import net.mcreator.customoregen.CustomOreGenMod; + +@EventBusSubscriber(modid = CustomOreGenMod.MODID) +public class OreBreakEventHandler { + + @SubscribeEvent + public static void onBlockBreak(BlockEvent.BreakEvent event) { + BlockState state = event.getState(); + Block block = state.getBlock(); + Player player = event.getPlayer(); + String oreType = null; + + if (block == CustomOreGenModBlocks.SHARDDIAMONDBLOCKORE.get() || block == CustomOreGenModBlocks.DEEPSLATESHARDDIAMONDORE.get()) { + oreType = "shard_diamond"; + } else if (block == CustomOreGenModBlocks.CONCENTRATEDCOALORE.get()) { + oreType = "concentrated_coal"; + } else if (block == CustomOreGenModBlocks.PUREGOLDENORE.get() || block == CustomOreGenModBlocks.DEEPSLATEPUREGOLDENORE.get()) { + oreType = "pure_golden"; + } else if (block == CustomOreGenModBlocks.IRONORE.get() || block == CustomOreGenModBlocks.DEEPSLATEIRONORE.get()) { + oreType = "impure_iron"; + } else if (block == CustomOreGenModBlocks.DEEPSLATEDIAMONDORE.get()) { + oreType = "concentrated_diamond"; + } else if (block == CustomOreGenModBlocks.LAPISORE.get() || block == CustomOreGenModBlocks.DEEPSLATELAPISORE.get()) { + oreType = "lapis"; + } else if (block == CustomOreGenModBlocks.REDSTONEORE.get() || block == CustomOreGenModBlocks.DEEPSLATEREDSTONEORE.get()) { + oreType = "redstone"; + } else if (block == CustomOreGenModBlocks.HIGHEMERALDORE.get() || block == CustomOreGenModBlocks.LOWEREMERALDORE.get()) { + oreType = "emerald"; + } else if (block == CustomOreGenModBlocks.COPPERHIGHORE.get() || block == CustomOreGenModBlocks.COPPERLOWERORE.get()) { + oreType = "copper"; + } + + if (oreType != null) { + // Ensure the player is using the correct tool to get drops + if (player != null && player.hasCorrectToolForDrops(state)) { + ConfigurableOreDropsProcedure.execute(event.getLevel(), event.getPos().getX(), event.getPos().getY(), event.getPos().getZ(), player, oreType); + } + } + } +} diff --git a/src/main/java/net/mcreator/customoregen/procedures/ConfigurableOreDropsProcedure.java b/src/main/java/net/mcreator/customoregen/procedures/ConfigurableOreDropsProcedure.java index 4b11c9d0b..c6dc44231 100644 --- a/src/main/java/net/mcreator/customoregen/procedures/ConfigurableOreDropsProcedure.java +++ b/src/main/java/net/mcreator/customoregen/procedures/ConfigurableOreDropsProcedure.java @@ -107,7 +107,32 @@ public class ConfigurableOreDropsProcedure { dropItem = new ItemStack(Items.RAW_GOLD); break; + case "lapis": + minDrops = ModConfigs.DROPS.lapisOreMinDrops.get(); + maxDrops = ModConfigs.DROPS.lapisOreMaxDrops.get(); + dropItem = new ItemStack(Items.LAPIS_LAZULI); + break; + + case "redstone": + minDrops = ModConfigs.DROPS.redstoneOreMinDrops.get(); + maxDrops = ModConfigs.DROPS.redstoneOreMaxDrops.get(); + dropItem = new ItemStack(Items.REDSTONE); + break; + + case "emerald": + minDrops = ModConfigs.DROPS.emeraldOreMinDrops.get(); + maxDrops = ModConfigs.DROPS.emeraldOreMaxDrops.get(); + dropItem = new ItemStack(Items.EMERALD); + break; + + case "copper": + minDrops = ModConfigs.DROPS.copperOreMinDrops.get(); + maxDrops = ModConfigs.DROPS.copperOreMaxDrops.get(); + dropItem = new ItemStack(Items.RAW_COPPER); + break; + default: + return; } diff --git a/src/main/resources/data/custom_ore_gen/loot_table/blocks/concentratedcoalore.json b/src/main/resources/data/custom_ore_gen/loot_table/blocks/concentratedcoalore.json new file mode 100644 index 000000000..4b66cf698 --- /dev/null +++ b/src/main/resources/data/custom_ore_gen/loot_table/blocks/concentratedcoalore.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "custom_ore_gen:concentratedcoalore", + "weight": 1, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ], + "random_sequence": "custom_ore_gen:blocks/concentratedcoalore" +} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_table/blocks/copperhighore.json b/src/main/resources/data/custom_ore_gen/loot_table/blocks/copperhighore.json new file mode 100644 index 000000000..4ef58f710 --- /dev/null +++ b/src/main/resources/data/custom_ore_gen/loot_table/blocks/copperhighore.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:copper_ore", + "weight": 1, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ], + "random_sequence": "custom_ore_gen:blocks/copperhighore" +} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_table/blocks/copperlowerore.json b/src/main/resources/data/custom_ore_gen/loot_table/blocks/copperlowerore.json new file mode 100644 index 000000000..b782998b4 --- /dev/null +++ b/src/main/resources/data/custom_ore_gen/loot_table/blocks/copperlowerore.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:deepslate_copper_ore", + "weight": 1, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ], + "random_sequence": "custom_ore_gen:blocks/copperlowerore" +} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslatediamondore.json b/src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslatediamondore.json new file mode 100644 index 000000000..bd664f7ed --- /dev/null +++ b/src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslatediamondore.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:diamond_ore", + "weight": 1, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ], + "random_sequence": "custom_ore_gen:blocks/deepslatediamondore" +} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslateironore.json b/src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslateironore.json new file mode 100644 index 000000000..3d852cae7 --- /dev/null +++ b/src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslateironore.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "custom_ore_gen:deepslateironore", + "weight": 1, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ], + "random_sequence": "custom_ore_gen:blocks/deepslateironore" +} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslatelapisore.json b/src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslatelapisore.json new file mode 100644 index 000000000..2b3134d68 --- /dev/null +++ b/src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslatelapisore.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:deepslate_lapis_ore", + "weight": 1, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ], + "random_sequence": "custom_ore_gen:blocks/deepslatelapisore" +} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslatepuregoldenore.json b/src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslatepuregoldenore.json new file mode 100644 index 000000000..a7e2e49bf --- /dev/null +++ b/src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslatepuregoldenore.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:gold_ore", + "weight": 1, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ], + "random_sequence": "custom_ore_gen:blocks/deepslatepuregoldenore" +} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslateredstoneore.json b/src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslateredstoneore.json new file mode 100644 index 000000000..847896d41 --- /dev/null +++ b/src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslateredstoneore.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:deepslate_redstone_ore", + "weight": 1, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ], + "random_sequence": "custom_ore_gen:blocks/deepslateredstoneore" +} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslatesharddiamondore.json b/src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslatesharddiamondore.json new file mode 100644 index 000000000..2ef075351 --- /dev/null +++ b/src/main/resources/data/custom_ore_gen/loot_table/blocks/deepslatesharddiamondore.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "custom_ore_gen:deepslatesharddiamondore", + "weight": 1, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ], + "random_sequence": "custom_ore_gen:blocks/deepslatesharddiamondore" +} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_table/blocks/highemeraldore.json b/src/main/resources/data/custom_ore_gen/loot_table/blocks/highemeraldore.json new file mode 100644 index 000000000..b01026a95 --- /dev/null +++ b/src/main/resources/data/custom_ore_gen/loot_table/blocks/highemeraldore.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:emerald_ore", + "weight": 1, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ], + "random_sequence": "custom_ore_gen:blocks/highemeraldore" +} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_table/blocks/ironore.json b/src/main/resources/data/custom_ore_gen/loot_table/blocks/ironore.json new file mode 100644 index 000000000..d6dd7a2a7 --- /dev/null +++ b/src/main/resources/data/custom_ore_gen/loot_table/blocks/ironore.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:iron_ore", + "weight": 1, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ], + "random_sequence": "custom_ore_gen:blocks/ironore" +} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_table/blocks/lapisore.json b/src/main/resources/data/custom_ore_gen/loot_table/blocks/lapisore.json new file mode 100644 index 000000000..67184bd97 --- /dev/null +++ b/src/main/resources/data/custom_ore_gen/loot_table/blocks/lapisore.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:lapis_ore", + "weight": 1, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ], + "random_sequence": "custom_ore_gen:blocks/lapisore" +} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_table/blocks/loweremeraldore.json b/src/main/resources/data/custom_ore_gen/loot_table/blocks/loweremeraldore.json new file mode 100644 index 000000000..f19a7bbc5 --- /dev/null +++ b/src/main/resources/data/custom_ore_gen/loot_table/blocks/loweremeraldore.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:deepslate_emerald_ore", + "weight": 1, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ], + "random_sequence": "custom_ore_gen:blocks/loweremeraldore" +} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_table/blocks/puregoldenore.json b/src/main/resources/data/custom_ore_gen/loot_table/blocks/puregoldenore.json new file mode 100644 index 000000000..95d16ce60 --- /dev/null +++ b/src/main/resources/data/custom_ore_gen/loot_table/blocks/puregoldenore.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:gold_ore", + "weight": 1, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ], + "random_sequence": "custom_ore_gen:blocks/puregoldenore" +} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_table/blocks/redstoneore.json b/src/main/resources/data/custom_ore_gen/loot_table/blocks/redstoneore.json new file mode 100644 index 000000000..e37810347 --- /dev/null +++ b/src/main/resources/data/custom_ore_gen/loot_table/blocks/redstoneore.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:redstone_ore", + "weight": 1, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ], + "random_sequence": "custom_ore_gen:blocks/redstoneore" +} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_table/blocks/sharddiamondblockore.json b/src/main/resources/data/custom_ore_gen/loot_table/blocks/sharddiamondblockore.json new file mode 100644 index 000000000..35f652925 --- /dev/null +++ b/src/main/resources/data/custom_ore_gen/loot_table/blocks/sharddiamondblockore.json @@ -0,0 +1,42 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "custom_ore_gen:sharddiamondblockore", + "weight": 1, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + } + ] + } + ], + "random_sequence": "custom_ore_gen:blocks/sharddiamondblockore" +} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/concentratedcoalore.json b/src/main/resources/data/custom_ore_gen/loot_tables/blocks/concentratedcoalore.json deleted file mode 100644 index 07042261a..000000000 --- a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/concentratedcoalore.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:coal", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "sub_predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "custom_ore_gen:concentratedcoalore", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "sub_predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - } - ] - } - ] - } - ], - "random_sequence": "custom_ore_gen:blocks/concentratedcoalore" -} diff --git a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/copperhighore.json b/src/main/resources/data/custom_ore_gen/loot_tables/blocks/copperhighore.json deleted file mode 100644 index 0dcbdc5ca..000000000 --- a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/copperhighore.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": { - "min": 1, - "max": 2 - }, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:raw_copper", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 2, - "max": 5 - } - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:copper_ore", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - } - ] - } - ] - } - ], - "random_sequence": "custom_ore_gen:blocks/copperhighore" -} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/copperlowerore.json b/src/main/resources/data/custom_ore_gen/loot_tables/blocks/copperlowerore.json deleted file mode 100644 index 151d51873..000000000 --- a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/copperlowerore.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": { - "min": 1, - "max": 2 - }, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:raw_copper", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 2, - "max": 6 - } - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:deepslate_copper_ore", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - } - ] - } - ] - } - ], - "random_sequence": "custom_ore_gen:blocks/copperlowerore" -} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslatediamondore.json b/src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslatediamondore.json deleted file mode 100644 index 371687508..000000000 --- a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslatediamondore.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:diamond", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:diamond_ore", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - } - ] - } - ] - } - ], - "random_sequence": "custom_ore_gen:blocks/deepslatediamondore" -} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslateironore.json b/src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslateironore.json deleted file mode 100644 index b69560b96..000000000 --- a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslateironore.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:raw_iron", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "custom_ore_gen:deepslateironore", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - } - ] - } - ] - } - ], - "random_sequence": "custom_ore_gen:blocks/deepslateironore" -} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslatelapisore.json b/src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslatelapisore.json deleted file mode 100644 index 84bda5b16..000000000 --- a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslatelapisore.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:lapis_lazuli", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 4, - "max": 6 - } - }, - { - "function": "enchant_with_levels", - "treasure": true, - "levels": { - "min": 1, - "max": 10 - } - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:deepslate_lapis_ore", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - } - ] - } - ] - } - ], - "random_sequence": "custom_ore_gen:blocks/deepslatelapisore" -} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslatepuregoldenore.json b/src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslatepuregoldenore.json deleted file mode 100644 index da465a2da..000000000 --- a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslatepuregoldenore.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": { - "min": 1, - "max": 2 - }, - "bonus_rolls": { - "min": 1, - "max": 2 - }, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:raw_gold", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:gold_ore", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - } - ] - } - ] - } - ], - "random_sequence": "custom_ore_gen:blocks/deepslatepuregoldenore" -} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslateredstoneore.json b/src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslateredstoneore.json deleted file mode 100644 index cf979b9fc..000000000 --- a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslateredstoneore.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": { - "min": 1, - "max": 2 - }, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:redstone", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 4, - "max": 6 - } - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:deepslate_redstone_ore", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - } - ] - } - ] - } - ], - "random_sequence": "custom_ore_gen:blocks/deepslateredstoneore" -} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslatesharddiamondore.json b/src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslatesharddiamondore.json deleted file mode 100644 index 0b062f02b..000000000 --- a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/deepslatesharddiamondore.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "custom_ore_gen:diamondshard", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "custom_ore_gen:deepslatesharddiamondore", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - } - ] - } - ] - } - ], - "random_sequence": "custom_ore_gen:blocks/deepslatesharddiamondore" -} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/highemeraldore.json b/src/main/resources/data/custom_ore_gen/loot_tables/blocks/highemeraldore.json deleted file mode 100644 index 2d1fc5330..000000000 --- a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/highemeraldore.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:emerald", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:emerald_ore", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - } - ] - } - ] - } - ], - "random_sequence": "custom_ore_gen:blocks/highemeraldore" -} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/ironore.json b/src/main/resources/data/custom_ore_gen/loot_tables/blocks/ironore.json deleted file mode 100644 index eb4426fe4..000000000 --- a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/ironore.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:raw_iron", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:iron_ore", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - } - ] - } - ] - } - ], - "random_sequence": "custom_ore_gen:blocks/ironore" -} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/lapisore.json b/src/main/resources/data/custom_ore_gen/loot_tables/blocks/lapisore.json deleted file mode 100644 index aedfdc171..000000000 --- a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/lapisore.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:lapis_lazuli", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 4, - "max": 8 - } - }, - { - "function": "enchant_with_levels", - "treasure": true, - "levels": { - "min": 0, - "max": 5 - } - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:lapis_ore", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - } - ] - } - ] - } - ], - "random_sequence": "custom_ore_gen:blocks/lapisore" -} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/loweremeraldore.json b/src/main/resources/data/custom_ore_gen/loot_tables/blocks/loweremeraldore.json deleted file mode 100644 index df10054af..000000000 --- a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/loweremeraldore.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:emerald", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:deepslate_emerald_ore", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - } - ] - } - ] - } - ], - "random_sequence": "custom_ore_gen:blocks/loweremeraldore" -} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/puregoldenore.json b/src/main/resources/data/custom_ore_gen/loot_tables/blocks/puregoldenore.json deleted file mode 100644 index 1cca17874..000000000 --- a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/puregoldenore.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": { - "min": 1, - "max": 2 - }, - "bonus_rolls": { - "min": 1, - "max": 2 - }, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:raw_gold", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:gold_ore", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - } - ] - } - ] - } - ], - "random_sequence": "custom_ore_gen:blocks/puregoldenore" -} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/redstoneore.json b/src/main/resources/data/custom_ore_gen/loot_tables/blocks/redstoneore.json deleted file mode 100644 index 166c949c3..000000000 --- a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/redstoneore.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:redstone", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 4, - "max": 5 - } - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:redstone_ore", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - } - ] - } - ] - } - ], - "random_sequence": "custom_ore_gen:blocks/redstoneore" -} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/sharddiamondblockore.json b/src/main/resources/data/custom_ore_gen/loot_tables/blocks/sharddiamondblockore.json deleted file mode 100644 index 59108c0e5..000000000 --- a/src/main/resources/data/custom_ore_gen/loot_tables/blocks/sharddiamondblockore.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "custom_ore_gen:diamondshard", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "custom_ore_gen:sharddiamondblockore", - "weight": 1, - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ], - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 1 - } - } - ] - } - ] - } - ], - "random_sequence": "custom_ore_gen:blocks/sharddiamondblockore" -} \ No newline at end of file diff --git a/src/main/resources/data/custom_ore_gen/recipes/axerecipe.json b/src/main/resources/data/custom_ore_gen/recipe/axerecipe.json similarity index 100% rename from src/main/resources/data/custom_ore_gen/recipes/axerecipe.json rename to src/main/resources/data/custom_ore_gen/recipe/axerecipe.json diff --git a/src/main/resources/data/custom_ore_gen/recipes/diamondshardtodiamond.json b/src/main/resources/data/custom_ore_gen/recipe/diamondshardtodiamond.json similarity index 100% rename from src/main/resources/data/custom_ore_gen/recipes/diamondshardtodiamond.json rename to src/main/resources/data/custom_ore_gen/recipe/diamondshardtodiamond.json diff --git a/src/main/resources/data/custom_ore_gen/recipes/ore_biome_finder.json b/src/main/resources/data/custom_ore_gen/recipe/ore_biome_finder.json similarity index 100% rename from src/main/resources/data/custom_ore_gen/recipes/ore_biome_finder.json rename to src/main/resources/data/custom_ore_gen/recipe/ore_biome_finder.json diff --git a/src/main/resources/data/custom_ore_gen/recipes/pickaxecraft.json b/src/main/resources/data/custom_ore_gen/recipe/pickaxecraft.json similarity index 100% rename from src/main/resources/data/custom_ore_gen/recipes/pickaxecraft.json rename to src/main/resources/data/custom_ore_gen/recipe/pickaxecraft.json diff --git a/src/main/resources/data/custom_ore_gen/recipes/sculk_catalyst_diamond_shard.json b/src/main/resources/data/custom_ore_gen/recipe/sculk_catalyst_diamond_shard.json similarity index 100% rename from src/main/resources/data/custom_ore_gen/recipes/sculk_catalyst_diamond_shard.json rename to src/main/resources/data/custom_ore_gen/recipe/sculk_catalyst_diamond_shard.json diff --git a/src/main/resources/data/custom_ore_gen/recipes/sharddiamondboots.json b/src/main/resources/data/custom_ore_gen/recipe/sharddiamondboots.json similarity index 100% rename from src/main/resources/data/custom_ore_gen/recipes/sharddiamondboots.json rename to src/main/resources/data/custom_ore_gen/recipe/sharddiamondboots.json diff --git a/src/main/resources/data/custom_ore_gen/recipes/sharddiamondchestplate.json b/src/main/resources/data/custom_ore_gen/recipe/sharddiamondchestplate.json similarity index 100% rename from src/main/resources/data/custom_ore_gen/recipes/sharddiamondchestplate.json rename to src/main/resources/data/custom_ore_gen/recipe/sharddiamondchestplate.json diff --git a/src/main/resources/data/custom_ore_gen/recipes/sharddiamondhelmet.json b/src/main/resources/data/custom_ore_gen/recipe/sharddiamondhelmet.json similarity index 100% rename from src/main/resources/data/custom_ore_gen/recipes/sharddiamondhelmet.json rename to src/main/resources/data/custom_ore_gen/recipe/sharddiamondhelmet.json diff --git a/src/main/resources/data/custom_ore_gen/recipes/sharddiamondleggings.json b/src/main/resources/data/custom_ore_gen/recipe/sharddiamondleggings.json similarity index 100% rename from src/main/resources/data/custom_ore_gen/recipes/sharddiamondleggings.json rename to src/main/resources/data/custom_ore_gen/recipe/sharddiamondleggings.json diff --git a/src/main/resources/data/custom_ore_gen/recipes/sharddiamondpaxel.json b/src/main/resources/data/custom_ore_gen/recipe/sharddiamondpaxel.json similarity index 100% rename from src/main/resources/data/custom_ore_gen/recipes/sharddiamondpaxel.json rename to src/main/resources/data/custom_ore_gen/recipe/sharddiamondpaxel.json diff --git a/src/main/resources/data/custom_ore_gen/recipes/shovelcraft.json b/src/main/resources/data/custom_ore_gen/recipe/shovelcraft.json similarity index 100% rename from src/main/resources/data/custom_ore_gen/recipes/shovelcraft.json rename to src/main/resources/data/custom_ore_gen/recipe/shovelcraft.json diff --git a/src/main/resources/data/minecraft/tags/items/axes.json b/src/main/resources/data/minecraft/tags/item/axes.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/axes.json rename to src/main/resources/data/minecraft/tags/item/axes.json diff --git a/src/main/resources/data/minecraft/tags/item/enchantable/armor.json b/src/main/resources/data/minecraft/tags/item/enchantable/armor.json new file mode 100644 index 000000000..849c64c16 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/item/enchantable/armor.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "custom_ore_gen:sharddiamondhelmet", + "custom_ore_gen:sharddiamondchestplate", + "custom_ore_gen:sharddiamondleggings", + "custom_ore_gen:sharddiamondboots" + ] +} diff --git a/src/main/resources/data/minecraft/tags/item/enchantable/durability.json b/src/main/resources/data/minecraft/tags/item/enchantable/durability.json new file mode 100644 index 000000000..a0b94d756 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/item/enchantable/durability.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "custom_ore_gen:sharddiamondpickaxe", + "custom_ore_gen:sharddiamondshovel", + "custom_ore_gen:sharddiamondaxe", + "custom_ore_gen:sharddiamondpaxel", + "custom_ore_gen:sharddiamondhelmet", + "custom_ore_gen:sharddiamondchestplate", + "custom_ore_gen:sharddiamondleggings", + "custom_ore_gen:sharddiamondboots" + ] +} diff --git a/src/main/resources/data/minecraft/tags/item/enchantable/mining.json b/src/main/resources/data/minecraft/tags/item/enchantable/mining.json new file mode 100644 index 000000000..d34664b14 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/item/enchantable/mining.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "custom_ore_gen:sharddiamondpickaxe", + "custom_ore_gen:sharddiamondshovel", + "custom_ore_gen:sharddiamondaxe", + "custom_ore_gen:sharddiamondpaxel" + ] +} diff --git a/src/main/resources/data/minecraft/tags/item/enchantable/weapon.json b/src/main/resources/data/minecraft/tags/item/enchantable/weapon.json new file mode 100644 index 000000000..427dd9a27 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/item/enchantable/weapon.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "custom_ore_gen:sharddiamondaxe", + "custom_ore_gen:sharddiamondpaxel" + ] +} diff --git a/src/main/resources/data/minecraft/tags/items/pickaxes.json b/src/main/resources/data/minecraft/tags/item/pickaxes.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/pickaxes.json rename to src/main/resources/data/minecraft/tags/item/pickaxes.json diff --git a/src/main/resources/data/minecraft/tags/items/shovels.json b/src/main/resources/data/minecraft/tags/item/shovels.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/shovels.json rename to src/main/resources/data/minecraft/tags/item/shovels.json