Skip to content

Item Unlock Tweaks + Neat Ring Recipe change :tomfoolery: #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaFuqs merged 3 commits into from
Nov 24, 2024
Merged

Item Unlock Tweaks + Neat Ring Recipe change :tomfoolery: #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc0f4f2
Item Unlock Tweaks + Neat Ring Recipe change :tomfoolery:
f-raZ0R Nov 19, 2024
5af1327
Merge branch '1.20.1-aria-for-painters' into unlocks-cleanup
f-raZ0R Nov 19, 2024
7c05b50
Update glass_ampoules.json
f-raZ0R Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/de/dafuqs/spectrum/api/color/ItemColors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,11 @@ public class ItemColors extends ColorRegistry<Item> {
put(Items.PHANTOM_MEMBRANE, DyeColor.LIGHT_GRAY);
put(Items.PRISMARINE_SHARD, DyeColor.LIGHT_BLUE);
put(Items.RABBIT_FOOT, DyeColor.BROWN);
put(Items.RABBIT_HIDE, DyeColor.BROWN);
put(Items.TOTEM_OF_UNDYING, DyeColor.PINK);
put(Items.APPLE, DyeColor.PINK);
put(Items.CARROT, DyeColor.PINK);
put(Items.BAKED_POTATO, DyeColor.PINK);
put(Items.CACTUS, DyeColor.LIME);
put(Items.TORCHFLOWER_SEEDS, DyeColor.LIME);
put(Items.QUARTZ, DyeColor.LIGHT_GRAY);
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/de/dafuqs/spectrum/compat/botania/BotaniaCompat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package de.dafuqs.spectrum.compat.botania;

import de.dafuqs.spectrum.api.color.*;
import de.dafuqs.spectrum.api.interaction.*;
import de.dafuqs.spectrum.compat.*;
import de.dafuqs.spectrum.registries.*;
Expand All @@ -20,6 +21,10 @@ public class BotaniaCompat extends SpectrumIntegrationPacks.ModIntegrationPack {
public void register() {
SpectrumItems.register("least_black_lotus", LEAST_BLACK_LOTUS, DyeColor.BLACK);
SpectrumItems.register("blackest_lotus", BLACKEST_LOTUS, DyeColor.BLACK);
ItemColors.ITEM_COLORS.registerColorMapping(BotaniaItems.overgrowthSeed, DyeColor.LIME);
ItemColors.ITEM_COLORS.registerColorMapping(BotaniaItems.blackLotus, DyeColor.BLACK);
ItemColors.ITEM_COLORS.registerColorMapping(BotaniaItems.blackerLotus, DyeColor.BLACK);
ItemColors.ITEM_COLORS.registerColorMapping(BotaniaItems.terrasteel, DyeColor.LIME);

// registering it late, since Botania might not have been initialized yet
ServerLifecycleEvents.SERVER_STARTED.register(server -> ItemProviderRegistry.register(BotaniaItems.blackHoleTalisman, new ItemProvider() {
Expand Down
25 changes: 23 additions & 2 deletions src/main/java/de/dafuqs/spectrum/compat/malum/MalumCompat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,33 @@
package de.dafuqs.spectrum.compat.malum;

import com.sammy.malum.registry.common.item.*;
import de.dafuqs.spectrum.api.color.*;
import de.dafuqs.spectrum.compat.*;
import net.fabricmc.api.*;
import net.minecraft.util.*;

public class MalumCompat extends SpectrumIntegrationPacks.ModIntegrationPack {

@Override
public void register() {

}
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.MNEMONIC_FRAGMENT.get(), DyeColor.PURPLE);
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.NULL_SLATE.get(), DyeColor.BLACK);
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.EARTHEN_SPIRIT.get(), DyeColor.BROWN);
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.INFERNAL_SPIRIT.get(), DyeColor.ORANGE);
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.AERIAL_SPIRIT.get(), DyeColor.CYAN);
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.AQUEOUS_SPIRIT.get(), DyeColor.LIGHT_BLUE);
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.ARCANE_SPIRIT.get(), DyeColor.LIGHT_GRAY);
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.SACRED_SPIRIT.get(), DyeColor.WHITE);
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.ELDRITCH_SPIRIT.get(), DyeColor.GRAY);
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.WICKED_SPIRIT.get(), DyeColor.BLACK);
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.BLAZING_QUARTZ.get(), DyeColor.ORANGE);
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.BLIGHTED_GUNK.get(), DyeColor.LIGHT_GRAY);
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.MASS_OF_BLIGHTED_GUNK.get(), DyeColor.LIGHT_GRAY);
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.CURSED_SAPBALL.get(), DyeColor.BROWN);
ItemColors.ITEM_COLORS.registerColorMapping(ItemRegistry.PROCESSED_SOULSTONE.get(), DyeColor.PURPLE);


}

@Environment(EnvType.CLIENT)
@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/data/spectrum/advancements/lategame/collect_pure_resource.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "spectrum:lategame/collect_bismuth_crystal",
"parent": "spectrum:lategame/spectrum_lategame",
"display": {
"icon": {
"item": "spectrum:pure_iron"
Expand All @@ -19,7 +19,7 @@
"gotten_previous": {
"trigger":"revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/collect_bismuth_crystal"
"advancement_identifier": "spectrum:lategame/spectrum_lategame"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/data/spectrum/advancements/midgame/fill_knowledge_gem.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "spectrum:midgame/enter_liquid_crystal",
"parent": "spectrum:midgame/build_advanced_pedestal_structure",
"display": {
"icon": {
"item": "spectrum:knowledge_gem",
Expand Down Expand Up @@ -39,7 +39,7 @@
},
"gotten_previous": {
"trigger":"revelationary:advancement_gotten",
"conditions": { "advancement_identifier": "spectrum:midgame/enter_liquid_crystal" }
"conditions": { "advancement_identifier": "spectrum:midgame/build_advanced_pedestal_structure" }
}
},
"rewards": {
Expand Down
32 changes: 0 additions & 32 deletions src/main/resources/data/spectrum/advancements/mod_integration/malum/haunted.json
View file
Open in desktop

This file was deleted.

28 changes: 28 additions & 0 deletions src/main/resources/data/spectrum/advancements/unlocks/ampoules/raw_azurite_ampoule.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"criteria": {
"built_complex_pedestal_structure": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/build_complex_pedestal_structure"
}
},
"collected_azurite": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:midgame/collect_azurite"
}
},
"collected_paltaeria": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/collect_paltaeria"
}
},
"struck_up_hummingstone_hymn": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/strike_up_hummingstone_hymn"
}
}
}
}
28 changes: 28 additions & 0 deletions src/main/resources/data/spectrum/advancements/unlocks/ampoules/raw_bloodstone_ampoule.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"criteria": {
"built_complex_pedestal_structure": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/build_complex_pedestal_structure"
}
},
"collected_raw_bloodstone": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:hidden/collect_raw_bloodstone"
}
},
"collected_paltaeria": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/collect_paltaeria"
}
},
"struck_up_hummingstone_hymn": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/strike_up_hummingstone_hymn"
}
}
}
}
28 changes: 28 additions & 0 deletions src/main/resources/data/spectrum/advancements/unlocks/ampoules/raw_malachite_ampoule.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"criteria": {
"built_complex_pedestal_structure": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/build_complex_pedestal_structure"
}
},
"collected_malachite": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/collect_malachite"
}
},
"collected_paltaeria": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/collect_paltaeria"
}
},
"struck_up_hummingstone_hymn": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/strike_up_hummingstone_hymn"
}
}
}
}
28 changes: 28 additions & 0 deletions src/main/resources/data/spectrum/advancements/unlocks/ampoules/refined_azurite_ampoule.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"criteria": {
"built_complex_pedestal_structure": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/build_complex_pedestal_structure"
}
},
"collected_azurite": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:midgame/collect_azurite"
}
},
"collected_paltaeria_gem": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:hidden/collect_paltaeria_gem"
}
},
"struck_up_hummingstone_hymn": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/strike_up_hummingstone_hymn"
}
}
}
}
28 changes: 28 additions & 0 deletions ...ain/resources/data/spectrum/advancements/unlocks/ampoules/refined_bloodstone_ampoule.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"criteria": {
"built_complex_pedestal_structure": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/build_complex_pedestal_structure"
}
},
"created_refined_bloodstone": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:grow_bloodstone_in_crystallarieum"
}
},
"collected_paltaeria_gem": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:hidden/collect_paltaeria_gem"
}
},
"struck_up_hummingstone_hymn": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/strike_up_hummingstone_hymn"
}
}
}
}
34 changes: 34 additions & 0 deletions ...main/resources/data/spectrum/advancements/unlocks/ampoules/refined_malachite_ampoule.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"criteria": {
"built_complex_pedestal_structure": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/build_complex_pedestal_structure"
}
},
"collected_malachite": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/collect_malachite"
}
},
"unlocked_crystallarieum": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:unlocks/blocks/crystallarieum"
}
},
"collected_paltaeria_gem": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:hidden/collect_paltaeria_gem"
}
},
"struck_up_hummingstone_hymn": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/strike_up_hummingstone_hymn"
}
}
}
}
42 changes: 24 additions & 18 deletions src/main/resources/data/spectrum/advancements/unlocks/blocks/crystallarieum.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,28 @@
{
"criteria": {
"collected_bismuth_crystal": {
"trigger":"revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/collect_bismuth_crystal"
}
},
"collected_pigment": {
"trigger":"revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:collect_pigment"
}
},
"unlocked_ink": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:milestones/unlock_ink_use"
}
}
"collected_bismuth_crystal": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/collect_bismuth_crystal"
}
},
"built_complex_pedestal_structure": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:lategame/build_complex_pedestal_structure"
}
},
"collected_pigment": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:collect_pigment"
}
},
"unlocked_ink": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:milestones/unlock_ink_use"
}
}
}
}
4 changes: 2 additions & 2 deletions src/main/resources/data/spectrum/advancements/unlocks/equipment/soothing_bouquet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"advancement_identifier": "spectrum:lategame/collect_nectardew"
}
},
"unlocked_crystallarieum": {
"collected_pure_resource": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:unlocks/blocks/crystallarieum"
"advancement_identifier": "spectrum:lategame/collect_pure_resource"
}
},
"apply_eternal_slumber": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/data/spectrum/advancements/unlocks/food/dragonbone_broth.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"collected_dragonbone": {
"trigger": "revelationary:advancement_gotten",
"conditions": {
"advancement_identifier": "spectrum:unlocks/blocks/titration_barrel"
"advancement_identifier": "spectrum:break_cracked_dragonbone"
}
}
}
Expand Down
Loading
Loading