Fixed activation of root advancement. (#2658)

This commit is contained in:
Ayutac 2021-12-19 13:37:50 +01:00 committed by GitHub
parent 774d42d944
commit 5eab27bead
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 62 additions and 6 deletions

View file

@ -374,6 +374,8 @@ public class TRContent {
private final static Map<Ores, Ores> deepslateMap = new HashMap<>(); private final static Map<Ores, Ores> deepslateMap = new HashMap<>();
public enum Ores implements ItemConvertible { 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), BAUXITE(OreDistribution.BAUXITE),
CINNABAR(OreDistribution.CINNABAR), CINNABAR(OreDistribution.CINNABAR),
GALENA(OreDistribution.GALENA), GALENA(OreDistribution.GALENA),
@ -629,6 +631,7 @@ public class TRContent {
public enum RawMetals implements ItemConvertible{ 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; IRIDIUM, LEAD, SILVER, TIN, TUNGSTEN;
public final String name; public final String name;
@ -678,6 +681,7 @@ public class TRContent {
} }
public enum Gems implements ItemConvertible { 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; PERIDOT, RED_GARNET, RUBY, SAPPHIRE, YELLOW_GARNET;
public final String name; public final String name;

View file

@ -19,33 +19,33 @@
"conditions": { "conditions": {
"items": [ "items": [
{ {
"items": ["techreborn:lead_ore"] "tag": "techreborn:ores"
} }
] ]
} }
}, },
"ore2_in_inventory": { "raw_metal_in_inventory": {
"trigger": "minecraft:inventory_changed", "trigger": "minecraft:inventory_changed",
"conditions": { "conditions": {
"items": [ "items": [
{ {
"items": ["techreborn:silver_ore"] "tag": "techreborn:raw_metals"
} }
] ]
} }
}, },
"ore3_in_inventory": { "gem_in_inventory": {
"trigger": "minecraft:inventory_changed", "trigger": "minecraft:inventory_changed",
"conditions": { "conditions": {
"items": [ "items": [
{ {
"items": ["techreborn:tin_ore"] "tag": "techreborn:gems"
} }
] ]
} }
} }
}, },
"requirements": [ "requirements": [
["ore_in_inventory", "ore2_in_inventory","ore3_in_inventory"] ["ore_in_inventory", "raw_metal_in_inventory","gem_in_inventory"]
] ]
} }

View file

@ -0,0 +1,10 @@
{
"replace": false,
"values": [
"techreborn:peridot_gem",
"techreborn:red_garnet_gem",
"techreborn:ruby_gem",
"techreborn:sapphire_gem",
"techreborn:yellow_garnet_gem"
]
}

View file

@ -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"
]
}

View file

@ -0,0 +1,10 @@
{
"replace": false,
"values": [
"techreborn:raw_iridium",
"techreborn:raw_lead",
"techreborn:raw_silver",
"techreborn:raw_tin",
"techreborn:raw_tungsten"
]
}