Skip to content

Commit

Permalink
make viable advancements use advancement api (cant do potion advancem…
Browse files Browse the repository at this point in the history 
…ents)
  • Loading branch information
@AViewFromTheTop
AViewFromTheTop committed Nov 1, 2023
1 parent 076185b commit 685c990
Show file tree
Hide file tree
Showing 8 changed files with 95 additions and 1,868 deletions.
1 change: 1 addition & 0 deletions src/main/java/net/frozenblock/wilderwild/config/MiscConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public final class MiscConfig {
)
);

public boolean modifyAdvancements = true;
public boolean cloudMovement = true;

public int particleWindMovement = 100;
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/net/frozenblock/wilderwild/config/gui/MiscConfigGui.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@ public static void setupEntries(ConfigCategory category, ConfigEntryBuilder entr
var biomeMusic = config.biomeMusic;
category.setBackground(WilderSharedConstants.id("textures/config/misc.png"));

var modifyAdvancements = category.addEntry(entryBuilder.startBooleanToggle(text("modofy_advancements"), config.modifyAdvancements)
.setDefaultValue(defaultConfig.modifyAdvancements)
.setSaveConsumer(newValue -> config.modifyAdvancements = newValue)
.setTooltip(tooltip("modofy_advancements"))
.build()
);

var cloudMovement = category.addEntry(entryBuilder.startBooleanToggle(text("cloud_movement"), config.cloudMovement)
.setDefaultValue(defaultConfig.cloudMovement)
.setSaveConsumer(newValue -> config.cloudMovement = newValue)
Expand Down
107 changes: 85 additions & 22 deletions src/main/java/net/frozenblock/wilderwild/misc/mod_compat/FrozenLibIntegration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import net.frozenblock.lib.wind.api.ClientWindManager;
import net.frozenblock.lib.wind.api.WindManager;
import net.frozenblock.wilderwild.config.BlockConfig;
import net.frozenblock.wilderwild.config.MiscConfig;
import net.frozenblock.wilderwild.entity.Firefly;
import net.frozenblock.wilderwild.misc.WilderSharedConstants;
import net.frozenblock.wilderwild.misc.wind.WilderClientWindManager;
Expand All @@ -46,17 +47,26 @@
import net.frozenblock.wilderwild.registry.RegisterBlockSoundTypes;
import static net.frozenblock.wilderwild.registry.RegisterBlockSoundTypes.*;
import static net.frozenblock.wilderwild.registry.RegisterBlocks.*;
import net.frozenblock.wilderwild.registry.RegisterEntities;
import net.frozenblock.wilderwild.registry.RegisterItems;
import net.frozenblock.wilderwild.registry.RegisterSounds;
import net.frozenblock.wilderwild.registry.RegisterWorldgen;
import net.minecraft.advancements.Advancement;
import net.minecraft.advancements.AdvancementRequirements;
import net.minecraft.advancements.CriteriaTriggers;
import net.minecraft.advancements.Criterion;
import net.minecraft.advancements.critereon.BredAnimalsTrigger;
import net.minecraft.advancements.critereon.ConsumeItemTrigger;
import net.minecraft.advancements.critereon.EntityPredicate;
import net.minecraft.advancements.critereon.FilledBucketTrigger;
import net.minecraft.advancements.critereon.ItemPredicate;
import net.minecraft.advancements.critereon.LocationPredicate;
import net.minecraft.advancements.critereon.PlayerTrigger;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.monster.EnderMan;
import net.minecraft.world.item.InstrumentItem;
Expand Down Expand Up @@ -156,28 +166,81 @@ public void init() {

AdvancementEvents.INIT.register(holder -> {
Advancement advancement = holder.value();
if (holder.id().equals(new ResourceLocation("adventure/adventuring_time"))) {
addBiomeRequirement(advancement, RegisterWorldgen.CYPRESS_WETLANDS);
addBiomeRequirement(advancement, RegisterWorldgen.MIXED_FOREST);
addBiomeRequirement(advancement, RegisterWorldgen.OASIS);
addBiomeRequirement(advancement, RegisterWorldgen.WARM_RIVER);
addBiomeRequirement(advancement, RegisterWorldgen.WARM_BEACH);
addBiomeRequirement(advancement, RegisterWorldgen.JELLYFISH_CAVES);
addBiomeRequirement(advancement, RegisterWorldgen.ARID_FOREST);
addBiomeRequirement(advancement, RegisterWorldgen.ARID_SAVANNA);
addBiomeRequirement(advancement, RegisterWorldgen.PARCHED_FOREST);
addBiomeRequirement(advancement, RegisterWorldgen.BIRCH_JUNGLE);
addBiomeRequirement(advancement, RegisterWorldgen.SPARSE_BIRCH_JUNGLE);
addBiomeRequirement(advancement, RegisterWorldgen.BIRCH_TAIGA);
addBiomeRequirement(advancement, RegisterWorldgen.SEMI_BIRCH_FOREST);
addBiomeRequirement(advancement, RegisterWorldgen.DARK_BIRCH_FOREST);
addBiomeRequirement(advancement, RegisterWorldgen.FLOWER_FIELD);
addBiomeRequirement(advancement, RegisterWorldgen.TEMPERATE_RAINFOREST);
addBiomeRequirement(advancement, RegisterWorldgen.RAINFOREST);
addBiomeRequirement(advancement, RegisterWorldgen.DARK_TAIGA);
addBiomeRequirement(advancement, RegisterWorldgen.OLD_GROWTH_BIRCH_TAIGA);
addBiomeRequirement(advancement, RegisterWorldgen.OLD_GROWTH_DARK_FOREST);
addBiomeRequirement(advancement, RegisterWorldgen.SNOWY_OLD_GROWTH_PINE_TAIGA);
if (MiscConfig.get().modifyAdvancements) {
if (holder.id().equals(new ResourceLocation("adventure/adventuring_time"))) {
addBiomeRequirement(advancement, RegisterWorldgen.CYPRESS_WETLANDS);
addBiomeRequirement(advancement, RegisterWorldgen.MIXED_FOREST);
addBiomeRequirement(advancement, RegisterWorldgen.OASIS);
addBiomeRequirement(advancement, RegisterWorldgen.WARM_RIVER);
addBiomeRequirement(advancement, RegisterWorldgen.WARM_BEACH);
addBiomeRequirement(advancement, RegisterWorldgen.JELLYFISH_CAVES);
addBiomeRequirement(advancement, RegisterWorldgen.ARID_FOREST);
addBiomeRequirement(advancement, RegisterWorldgen.ARID_SAVANNA);
addBiomeRequirement(advancement, RegisterWorldgen.PARCHED_FOREST);
addBiomeRequirement(advancement, RegisterWorldgen.BIRCH_JUNGLE);
addBiomeRequirement(advancement, RegisterWorldgen.SPARSE_BIRCH_JUNGLE);
addBiomeRequirement(advancement, RegisterWorldgen.BIRCH_TAIGA);
addBiomeRequirement(advancement, RegisterWorldgen.SEMI_BIRCH_FOREST);
addBiomeRequirement(advancement, RegisterWorldgen.DARK_BIRCH_FOREST);
addBiomeRequirement(advancement, RegisterWorldgen.FLOWER_FIELD);
addBiomeRequirement(advancement, RegisterWorldgen.TEMPERATE_RAINFOREST);
addBiomeRequirement(advancement, RegisterWorldgen.RAINFOREST);
addBiomeRequirement(advancement, RegisterWorldgen.DARK_TAIGA);
addBiomeRequirement(advancement, RegisterWorldgen.OLD_GROWTH_BIRCH_TAIGA);
addBiomeRequirement(advancement, RegisterWorldgen.OLD_GROWTH_DARK_FOREST);
addBiomeRequirement(advancement, RegisterWorldgen.SNOWY_OLD_GROWTH_PINE_TAIGA);
} else if (holder.id().equals(new ResourceLocation("husbandry/balanced_diet"))) {
AdvancementAPI.addCriteria(advancement, "wilderwild:baobab_nut", CriteriaTriggers.CONSUME_ITEM.createCriterion(
ConsumeItemTrigger.TriggerInstance.usedItem(RegisterItems.BAOBAB_NUT).triggerInstance())
);
AdvancementAPI.addCriteria(advancement, "wilderwild:split_coconut", CriteriaTriggers.CONSUME_ITEM.createCriterion(
ConsumeItemTrigger.TriggerInstance.usedItem(RegisterItems.SPLIT_COCONUT).triggerInstance())
);
AdvancementAPI.addCriteria(advancement, "wilderwild:crab_claw", CriteriaTriggers.CONSUME_ITEM.createCriterion(
ConsumeItemTrigger.TriggerInstance.usedItem(RegisterItems.CRAB_CLAW).triggerInstance())
);
AdvancementAPI.addCriteria(advancement, "wilderwild:cooked_crab_claw", CriteriaTriggers.CONSUME_ITEM.createCriterion(
ConsumeItemTrigger.TriggerInstance.usedItem(RegisterItems.COOKED_CRAB_CLAW).triggerInstance())
);
AdvancementAPI.addCriteria(advancement, "wilderwild:prickly_pear", CriteriaTriggers.CONSUME_ITEM.createCriterion(
ConsumeItemTrigger.TriggerInstance.usedItem(RegisterItems.PRICKLY_PEAR).triggerInstance())
);
AdvancementAPI.addCriteria(advancement, "wilderwild:peeled_prickly_pear", CriteriaTriggers.CONSUME_ITEM.createCriterion(
ConsumeItemTrigger.TriggerInstance.usedItem(RegisterItems.PEELED_PRICKLY_PEAR).triggerInstance())
);
AdvancementAPI.addRequirements(advancement,
new AdvancementRequirements(new String[][]{{
"wilderwild:baobab_nut",
"wilderwild:split_coconut",
"wilderwild:crab_claw",
"wilderwild:cooked_crab_claw",
"wilderwild:prickly_pear",
"wilderwild:peeled_prickly_pear"
}})
);
} else if (holder.id().equals(new ResourceLocation("husbandry/bred_all_animals"))) {
AdvancementAPI.addCriteria(advancement, "wilderwild:crab", CriteriaTriggers.BRED_ANIMALS.createCriterion(
BredAnimalsTrigger.TriggerInstance.bredAnimals(EntityPredicate.Builder.entity().of(RegisterEntities.CRAB)).triggerInstance())
);
AdvancementAPI.addRequirements(advancement, new
AdvancementRequirements(new String[][]{{
"wilderwild:crab"
}})
);
} else if (holder.id().equals(new ResourceLocation("husbandry/tactical_fishing"))) {
AdvancementAPI.addCriteria(advancement, "wilderwild:crab_bucket", CriteriaTriggers.FILLED_BUCKET.createCriterion(
FilledBucketTrigger.TriggerInstance.filledBucket(ItemPredicate.Builder.item().of(RegisterItems.CRAB_BUCKET)).triggerInstance())
);
AdvancementAPI.addCriteria(advancement, "wilderwild:jellyfish_bucket", CriteriaTriggers.FILLED_BUCKET.createCriterion(
FilledBucketTrigger.TriggerInstance.filledBucket(ItemPredicate.Builder.item().of(RegisterItems.CRAB_BUCKET)).triggerInstance())
);
AdvancementAPI.addRequirements(advancement, new
AdvancementRequirements(new String[][]{{
"wilderwild:crab_bucket",
"wilderwild:jellyfish_bucket"
}})
);
}
}
});
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/assets/wilderwild/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@
"option.wilderwild.egg_landing_sounds": "Egg Landing Sounds",
"option.wilderwild.ender_pearl_landing_sounds": "Ender Pearl Landing Sounds",
"option.wilderwild.potion_landing_sounds": "Potion Effect Sounds",
"option.wilderwild.modify_advancements": "Modify Advancements",
"subtitles.block.hanging_tendril.wring": "Hanging Tendril wrung",
"subtitles.block.sculk_sensor.hiccup": "Sculk Sensor hiccups",
"subtitles.block.sculk_shrieker.gargle": "Sculk Shrieker gargles",
Expand Down Expand Up @@ -577,6 +578,7 @@
"tooltip.wilderwild.ender_pearl_landing_sounds": "Whether or not Ender Pearls should make a unique sound upon landing.",
"tooltip.wilderwild.snowball_landing_sounds": "Whether or not Snowballs should make a unique sound upon landing.",
"tooltip.wilderwild.potion_landing_sounds": "Whether or not Potions should make unique sounds upon landing.\n(Sounds vary based on potion type and effect.)",
"tooltip.wilderwild.modify_advancements": "Whether or not advancements should contain Wilder Wild's criteria.\nDisable this if it causes compatability issues.",
"tooltip.wilderwild.tumbleweed": "Contains options for the Tumbleweed.",
"tooltip.wilderwild.tumbleweed_spawn_cap": "Controls the Tumbleweed's spawn cap.",
"tooltip.wilderwild.leashed_tumbleweed": "Whether or not Tumbleweed are able to be leashed.",
Expand Down
Loading

0 comments on commit 685c990

Please sign in to comment.