Skip to content

Commit cc0f4f2

Browse files
f-raZ0Rf-raZ0R
committed
Item Unlock Tweaks + Neat Ring Recipe change :tomfoolery:
1 parent a31d49c commit cc0f4f2

34 files changed

+536
-329
lines changed

‎src/main/java/de/dafuqs/spectrum/api/color/ItemColors.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,11 @@ public class ItemColors extends ColorRegistry<Item> {
108108
put(Items.PHANTOM_MEMBRANE, DyeColor.LIGHT_GRAY);
109109
put(Items.PRISMARINE_SHARD, DyeColor.LIGHT_BLUE);
110110
put(Items.RABBIT_FOOT, DyeColor.BROWN);
111+
put(Items.RABBIT_HIDE, DyeColor.BROWN);
111112
put(Items.TOTEM_OF_UNDYING, DyeColor.PINK);
112113
put(Items.APPLE, DyeColor.PINK);
113114
put(Items.CARROT, DyeColor.PINK);
115+
put(Items.BAKED_POTATO, DyeColor.PINK);
114116
put(Items.CACTUS, DyeColor.LIME);
115117
put(Items.TORCHFLOWER_SEEDS, DyeColor.LIME);
116118
put(Items.QUARTZ, DyeColor.LIGHT_GRAY);

‎src/main/java/de/dafuqs/spectrum/compat/botania/BotaniaCompat.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package de.dafuqs.spectrum.compat.botania;
22

3+
import de.dafuqs.spectrum.api.color.*;
34
import de.dafuqs.spectrum.api.interaction.*;
45
import de.dafuqs.spectrum.compat.*;
56
import de.dafuqs.spectrum.registries.*;
@@ -20,6 +21,10 @@ public class BotaniaCompat extends SpectrumIntegrationPacks.ModIntegrationPack {
2021
public void register() {
2122
SpectrumItems.register("least_black_lotus", LEAST_BLACK_LOTUS, DyeColor.BLACK);
2223
SpectrumItems.register("blackest_lotus", BLACKEST_LOTUS, DyeColor.BLACK);
24+
ItemColors.ITEM_COLORS.registerColorMapping(BotaniaItems.overgrowthSeed, DyeColor.LIME);
25+
ItemColors.ITEM_COLORS.registerColorMapping(BotaniaItems.blackLotus, DyeColor.BLACK);
26+
ItemColors.ITEM_COLORS.registerColorMapping(BotaniaItems.blackerLotus, DyeColor.BLACK);
27+
ItemColors.ITEM_COLORS.registerColorMapping(BotaniaItems.terrasteel, DyeColor.LIME);
2328

2429
// registering it late, since Botania might not have been initialized yet
2530
ServerLifecycleEvents.SERVER_STARTED.register(server -> ItemProviderRegistry.register(BotaniaItems.blackHoleTalisman, new ItemProvider() {

‎src/main/java/de/dafuqs/spectrum/compat/malum/MalumCompat.java‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,33 @@
11
package de.dafuqs.spectrum.compat.malum;
22

3+
import com.sammy.malum.registry.common.item.*;
4+
import de.dafuqs.spectrum.api.color.*;
35
import de.dafuqs.spectrum.compat.*;
46
import net.fabricmc.api.*;
7+
import net.minecraft.util.*;
58

69
public class MalumCompat extends SpectrumIntegrationPacks.ModIntegrationPack {
10+
11+
@Override
712
public void register() {
8-
9-
}
13+
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.MNEMONIC_FRAGMENT.get(), DyeColor.PURPLE);
14+
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.NULL_SLATE.get(), DyeColor.BLACK);
15+
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.EARTHEN_SPIRIT.get(), DyeColor.BROWN);
16+
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.INFERNAL_SPIRIT.get(), DyeColor.ORANGE);
17+
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.AERIAL_SPIRIT.get(), DyeColor.CYAN);
18+
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.AQUEOUS_SPIRIT.get(), DyeColor.LIGHT_BLUE);
19+
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.ARCANE_SPIRIT.get(), DyeColor.LIGHT_GRAY);
20+
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.SACRED_SPIRIT.get(), DyeColor.WHITE);
21+
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.ELDRITCH_SPIRIT.get(), DyeColor.GRAY);
22+
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.WICKED_SPIRIT.get(), DyeColor.BLACK);
23+
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.BLAZING_QUARTZ.get(), DyeColor.ORANGE);
24+
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.BLIGHTED_GUNK.get(), DyeColor.LIGHT_GRAY);
25+
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.MASS_OF_BLIGHTED_GUNK.get(), DyeColor.LIGHT_GRAY);
26+
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.CURSED_SAPBALL.get(), DyeColor.BROWN);
27+
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.PROCESSED_SOULSTONE.get(), DyeColor.PURPLE);
28+
29+
30+
}
1031

1132
@Environment(EnvType.CLIENT)
1233
@Override

‎src/main/resources/data/spectrum/advancements/lategame/collect_pure_resource.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "spectrum:lategame/collect_bismuth_crystal",
2+
"parent": "spectrum:lategame/spectrum_lategame",
33
"display": {
44
"icon": {
55
"item": "spectrum:pure_iron"
@@ -19,7 +19,7 @@
1919
"gotten_previous": {
2020
"trigger":"revelationary:advancement_gotten",
2121
"conditions": {
22-
"advancement_identifier": "spectrum:lategame/collect_bismuth_crystal"
22+
"advancement_identifier": "spectrum:lategame/spectrum_lategame"
2323
}
2424
}
2525
}

‎src/main/resources/data/spectrum/advancements/midgame/fill_knowledge_gem.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "spectrum:midgame/enter_liquid_crystal",
2+
"parent": "spectrum:midgame/build_advanced_pedestal_structure",
33
"display": {
44
"icon": {
55
"item": "spectrum:knowledge_gem",
@@ -39,7 +39,7 @@
3939
},
4040
"gotten_previous": {
4141
"trigger":"revelationary:advancement_gotten",
42-
"conditions": { "advancement_identifier": "spectrum:midgame/enter_liquid_crystal" }
42+
"conditions": { "advancement_identifier": "spectrum:midgame/build_advanced_pedestal_structure" }
4343
}
4444
},
4545
"rewards": {

‎src/main/resources/data/spectrum/advancements/mod_integration/malum/haunted.json‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎src/main/resources/data/spectrum/advancements/unlocks/ampoules/raw_azurite_ampoule.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"criteria": {
3+
"built_complex_pedestal_structure": {
4+
"trigger": "revelationary:advancement_gotten",
5+
"conditions": {
6+
"advancement_identifier": "spectrum:lategame/build_complex_pedestal_structure"
7+
}
8+
},
9+
"collected_azurite": {
10+
"trigger": "revelationary:advancement_gotten",
11+
"conditions": {
12+
"advancement_identifier": "spectrum:midgame/collect_azurite"
13+
}
14+
},
15+
"collected_paltaeria": {
16+
"trigger": "revelationary:advancement_gotten",
17+
"conditions": {
18+
"advancement_identifier": "spectrum:lategame/collect_paltaeria"
19+
}
20+
},
21+
"struck_up_hummingstone_hymn": {
22+
"trigger": "revelationary:advancement_gotten",
23+
"conditions": {
24+
"advancement_identifier": "spectrum:lategame/strike_up_hummingstone_hymn"
25+
}
26+
}
27+
}
28+
}

‎src/main/resources/data/spectrum/advancements/unlocks/ampoules/raw_bloodstone_ampoule.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"criteria": {
3+
"built_complex_pedestal_structure": {
4+
"trigger": "revelationary:advancement_gotten",
5+
"conditions": {
6+
"advancement_identifier": "spectrum:lategame/build_complex_pedestal_structure"
7+
}
8+
},
9+
"collected_raw_bloodstone": {
10+
"trigger": "revelationary:advancement_gotten",
11+
"conditions": {
12+
"advancement_identifier": "spectrum:hidden/collect_raw_bloodstone"
13+
}
14+
},
15+
"collected_paltaeria": {
16+
"trigger": "revelationary:advancement_gotten",
17+
"conditions": {
18+
"advancement_identifier": "spectrum:lategame/collect_paltaeria"
19+
}
20+
},
21+
"struck_up_hummingstone_hymn": {
22+
"trigger": "revelationary:advancement_gotten",
23+
"conditions": {
24+
"advancement_identifier": "spectrum:lategame/strike_up_hummingstone_hymn"
25+
}
26+
}
27+
}
28+
}

‎src/main/resources/data/spectrum/advancements/unlocks/ampoules/raw_malachite_ampoule.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"criteria": {
3+
"built_complex_pedestal_structure": {
4+
"trigger": "revelationary:advancement_gotten",
5+
"conditions": {
6+
"advancement_identifier": "spectrum:lategame/build_complex_pedestal_structure"
7+
}
8+
},
9+
"collected_malachite": {
10+
"trigger": "revelationary:advancement_gotten",
11+
"conditions": {
12+
"advancement_identifier": "spectrum:lategame/collect_malachite"
13+
}
14+
},
15+
"collected_paltaeria": {
16+
"trigger": "revelationary:advancement_gotten",
17+
"conditions": {
18+
"advancement_identifier": "spectrum:lategame/collect_paltaeria"
19+
}
20+
},
21+
"struck_up_hummingstone_hymn": {
22+
"trigger": "revelationary:advancement_gotten",
23+
"conditions": {
24+
"advancement_identifier": "spectrum:lategame/strike_up_hummingstone_hymn"
25+
}
26+
}
27+
}
28+
}

‎src/main/resources/data/spectrum/advancements/unlocks/ampoules/refined_azurite_ampoule.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"criteria": {
3+
"built_complex_pedestal_structure": {
4+
"trigger": "revelationary:advancement_gotten",
5+
"conditions": {
6+
"advancement_identifier": "spectrum:lategame/build_complex_pedestal_structure"
7+
}
8+
},
9+
"collected_azurite": {
10+
"trigger": "revelationary:advancement_gotten",
11+
"conditions": {
12+
"advancement_identifier": "spectrum:midgame/collect_azurite"
13+
}
14+
},
15+
"collected_paltaeria_gem": {
16+
"trigger": "revelationary:advancement_gotten",
17+
"conditions": {
18+
"advancement_identifier": "spectrum:hidden/collect_paltaeria_gem"
19+
}
20+
},
21+
"struck_up_hummingstone_hymn": {
22+
"trigger": "revelationary:advancement_gotten",
23+
"conditions": {
24+
"advancement_identifier": "spectrum:lategame/strike_up_hummingstone_hymn"
25+
}
26+
}
27+
}
28+
}

0 commit comments

Comments
 (0)