diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index 8c6a5c78d..dcb4e8b4e 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -374,6 +374,8 @@ public class TRContent { private final static Map deepslateMap = new HashMap<>(); public enum Ores implements ItemConvertible { + // when changing ores also change data/techreborn/tags/items/ores.json for correct root advancement display + // as well as data/minecraft/tags/blocks for correct mining level BAUXITE(OreDistribution.BAUXITE), CINNABAR(OreDistribution.CINNABAR), GALENA(OreDistribution.GALENA), @@ -629,6 +631,7 @@ public class TRContent { public enum RawMetals implements ItemConvertible{ + // when changing ores also change data/techreborn/tags/items/raw_metals.json for correct root advancement display IRIDIUM, LEAD, SILVER, TIN, TUNGSTEN; public final String name; @@ -678,6 +681,7 @@ public class TRContent { } public enum Gems implements ItemConvertible { + // when changing ores also change data/techreborn/tags/items/gems.json for correct root advancement display PERIDOT, RED_GARNET, RUBY, SAPPHIRE, YELLOW_GARNET; public final String name; diff --git a/src/main/resources/data/techreborn/advancements/root.json b/src/main/resources/data/techreborn/advancements/root.json index 281916efe..73e38c195 100644 --- a/src/main/resources/data/techreborn/advancements/root.json +++ b/src/main/resources/data/techreborn/advancements/root.json @@ -19,33 +19,33 @@ "conditions": { "items": [ { - "items": ["techreborn:lead_ore"] + "tag": "techreborn:ores" } ] } }, - "ore2_in_inventory": { + "raw_metal_in_inventory": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "items": ["techreborn:silver_ore"] + "tag": "techreborn:raw_metals" } ] } }, - "ore3_in_inventory": { + "gem_in_inventory": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "items": ["techreborn:tin_ore"] + "tag": "techreborn:gems" } ] } } }, "requirements": [ - ["ore_in_inventory", "ore2_in_inventory","ore3_in_inventory"] + ["ore_in_inventory", "raw_metal_in_inventory","gem_in_inventory"] ] } diff --git a/src/main/resources/data/techreborn/tags/items/gems.json b/src/main/resources/data/techreborn/tags/items/gems.json new file mode 100644 index 000000000..7efa56985 --- /dev/null +++ b/src/main/resources/data/techreborn/tags/items/gems.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "techreborn:peridot_gem", + "techreborn:red_garnet_gem", + "techreborn:ruby_gem", + "techreborn:sapphire_gem", + "techreborn:yellow_garnet_gem" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/tags/items/ores.json b/src/main/resources/data/techreborn/tags/items/ores.json new file mode 100644 index 000000000..c10f14de1 --- /dev/null +++ b/src/main/resources/data/techreborn/tags/items/ores.json @@ -0,0 +1,32 @@ +{ + "replace": false, + "values": [ + "techreborn:bauxite_ore", + "techreborn:cinnabar_ore", + "techreborn:galena_ore", + "techreborn:iridium_ore", + "techreborn:lead_ore", + "techreborn:peridot_ore", + "techreborn:pyrite_ore", + "techreborn:ruby_ore", + "techreborn:sapphire_ore", + "techreborn:sheldonite_ore", + "techreborn:silver_ore", + "techreborn:sodalite_ore", + "techreborn:sphalerite_ore", + "techreborn:tin_ore", + "techreborn:tungsten_ore", + "techreborn:deepslate_bauxite_ore", + "techreborn:deepslate_galena_ore", + "techreborn:deepslate_iridium_ore", + "techreborn:deepslate_lead_ore", + "techreborn:deepslate_peridot_ore", + "techreborn:deepslate_ruby_ore", + "techreborn:deepslate_sapphire_ore", + "techreborn:deepslate_sheldonite_ore", + "techreborn:deepslate_silver_ore", + "techreborn:deepslate_sodalite_ore", + "techreborn:deepslate_tin_ore", + "techreborn:deepslate_tungsten_ore" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/tags/items/raw_metals.json b/src/main/resources/data/techreborn/tags/items/raw_metals.json new file mode 100644 index 000000000..e1c2d5b31 --- /dev/null +++ b/src/main/resources/data/techreborn/tags/items/raw_metals.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "techreborn:raw_iridium", + "techreborn:raw_lead", + "techreborn:raw_silver", + "techreborn:raw_tin", + "techreborn:raw_tungsten" + ] +} \ No newline at end of file