diff --git a/build.gradle b/build.gradle index 50be51a5..5061f074 100644 --- a/build.gradle +++ b/build.gradle @@ -90,8 +90,8 @@ repositories { } dependencies { - compileOnly "mezz.jei:jei-26.1.1-neoforge-api:${jei_version}" - runtimeOnly "mezz.jei:jei-26.1.1-neoforge:${jei_version}" + compileOnly "mezz.jei:jei-26.1.2-neoforge-api:${jei_version}" + runtimeOnly "mezz.jei:jei-26.1.2-neoforge:${jei_version}" implementation "net.allthemods.allthemodium:allthemodium:4.0.0" // must be pushed to maven local! implementation "maven.modrinth:jade:26.0.6+neoforge" // here cuz of atm diff --git a/src/generated/resources/data/alltheores/loot_table/blocks/deepslate_salt_ore.json b/src/generated/resources/data/alltheores/loot_table/blocks/deepslate_salt_ore.json new file mode 100644 index 00000000..5d104331 --- /dev/null +++ b/src/generated/resources/data/alltheores/loot_table/blocks/deepslate_salt_ore.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "alltheores:deepslate_salt_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "alltheores:salt_dust" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "alltheores:blocks/deepslate_salt_ore" +} \ No newline at end of file diff --git a/src/generated/resources/data/alltheores/loot_table/blocks/deepslate_sulfur_ore.json b/src/generated/resources/data/alltheores/loot_table/blocks/deepslate_sulfur_ore.json new file mode 100644 index 00000000..6ff4b31f --- /dev/null +++ b/src/generated/resources/data/alltheores/loot_table/blocks/deepslate_sulfur_ore.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "alltheores:deepslate_sulfur_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "alltheores:sulfur_dust" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "alltheores:blocks/deepslate_sulfur_ore" +} \ No newline at end of file diff --git a/src/generated/resources/data/alltheores/loot_table/blocks/end_salt_ore.json b/src/generated/resources/data/alltheores/loot_table/blocks/end_salt_ore.json new file mode 100644 index 00000000..19abf1f3 --- /dev/null +++ b/src/generated/resources/data/alltheores/loot_table/blocks/end_salt_ore.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "alltheores:end_salt_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "alltheores:salt_dust" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "alltheores:blocks/end_salt_ore" +} \ No newline at end of file diff --git a/src/generated/resources/data/alltheores/loot_table/blocks/end_sulfur_ore.json b/src/generated/resources/data/alltheores/loot_table/blocks/end_sulfur_ore.json new file mode 100644 index 00000000..45ed05b7 --- /dev/null +++ b/src/generated/resources/data/alltheores/loot_table/blocks/end_sulfur_ore.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "alltheores:end_sulfur_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "alltheores:sulfur_dust" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "alltheores:blocks/end_sulfur_ore" +} \ No newline at end of file diff --git a/src/generated/resources/data/alltheores/loot_table/blocks/nether_salt_ore.json b/src/generated/resources/data/alltheores/loot_table/blocks/nether_salt_ore.json new file mode 100644 index 00000000..bbd8615c --- /dev/null +++ b/src/generated/resources/data/alltheores/loot_table/blocks/nether_salt_ore.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "alltheores:nether_salt_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "alltheores:salt_dust" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "alltheores:blocks/nether_salt_ore" +} \ No newline at end of file diff --git a/src/generated/resources/data/alltheores/loot_table/blocks/nether_sulfur_ore.json b/src/generated/resources/data/alltheores/loot_table/blocks/nether_sulfur_ore.json new file mode 100644 index 00000000..ee9af13a --- /dev/null +++ b/src/generated/resources/data/alltheores/loot_table/blocks/nether_sulfur_ore.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "alltheores:nether_sulfur_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "alltheores:sulfur_dust" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "alltheores:blocks/nether_sulfur_ore" +} \ No newline at end of file diff --git a/src/generated/resources/data/alltheores/loot_table/blocks/other_salt_ore.json b/src/generated/resources/data/alltheores/loot_table/blocks/other_salt_ore.json new file mode 100644 index 00000000..9d437932 --- /dev/null +++ b/src/generated/resources/data/alltheores/loot_table/blocks/other_salt_ore.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "alltheores:other_salt_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "alltheores:salt_dust" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "alltheores:blocks/other_salt_ore" +} \ No newline at end of file diff --git a/src/generated/resources/data/alltheores/loot_table/blocks/other_sulfur_ore.json b/src/generated/resources/data/alltheores/loot_table/blocks/other_sulfur_ore.json new file mode 100644 index 00000000..7e12ff8b --- /dev/null +++ b/src/generated/resources/data/alltheores/loot_table/blocks/other_sulfur_ore.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "alltheores:other_sulfur_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "alltheores:sulfur_dust" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "alltheores:blocks/other_sulfur_ore" +} \ No newline at end of file diff --git a/src/generated/resources/data/alltheores/loot_table/blocks/salt_ore.json b/src/generated/resources/data/alltheores/loot_table/blocks/salt_ore.json new file mode 100644 index 00000000..82771ace --- /dev/null +++ b/src/generated/resources/data/alltheores/loot_table/blocks/salt_ore.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "alltheores:salt_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "alltheores:salt_dust" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "alltheores:blocks/salt_ore" +} \ No newline at end of file diff --git a/src/generated/resources/data/alltheores/loot_table/blocks/sulfur_ore.json b/src/generated/resources/data/alltheores/loot_table/blocks/sulfur_ore.json new file mode 100644 index 00000000..15cbbc60 --- /dev/null +++ b/src/generated/resources/data/alltheores/loot_table/blocks/sulfur_ore.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ], + "name": "alltheores:sulfur_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "alltheores:sulfur_dust" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "alltheores:blocks/sulfur_ore" +} \ No newline at end of file diff --git a/src/main/java/net/allthemods/alltheores/data/provider/loot/ATOBlockLoot.java b/src/main/java/net/allthemods/alltheores/data/provider/loot/ATOBlockLoot.java index 2d65532d..f23b630f 100644 --- a/src/main/java/net/allthemods/alltheores/data/provider/loot/ATOBlockLoot.java +++ b/src/main/java/net/allthemods/alltheores/data/provider/loot/ATOBlockLoot.java @@ -52,10 +52,13 @@ private void dropOre(BlockPart ore, Material material) { ItemPart raw = material.get(ItemPartType.RAW); ItemPart gem = material.get(ItemPartType.GEM); + ItemPart dust = material.get(ItemPartType.DUST); if (raw != null) { this.add(ore.getHolder().get(), b -> this.createOreDrop(b, raw.getHolder().get())); } else if (gem != null) { this.add(ore.getHolder().get(), b -> this.createOreDrop(b, gem.getHolder().get())); + } else if (dust != null) { + this.add(ore.getHolder().get(), b -> this.createOreDrop(b, dust.getHolder().get())); } }