Skip to content

Commit

Permalink
omae wa mo booleansupplier
Browse files Browse the repository at this point in the history
  • Loading branch information
@quat1024
quat1024 committed Nov 10, 2023
1 parent 57eec0f commit ddce915
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 17 deletions.
9 changes: 6 additions & 3 deletions src/main/java/org/violetmoon/quark/content/mobs/module/CrabsModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import org.violetmoon.quark.base.config.Config;
import org.violetmoon.quark.base.config.type.CompoundBiomeConfig;
import org.violetmoon.quark.base.config.type.EntitySpawnConfig;
import org.violetmoon.quark.base.handler.GeneralConfig;
import org.violetmoon.quark.base.handler.QuarkSounds;
import org.violetmoon.zeta.advancement.modifier.BalancedDietModifier;
import org.violetmoon.zeta.advancement.modifier.FuriousCocktailModifier;
Expand Down Expand Up @@ -110,9 +111,11 @@ public final void register(ZRegister event) {
EntitySpawnHandler.addEgg(this, crabType, 0x893c22, 0x916548, spawnConfig);

event.getAdvancementModifierRegistry().addModifier(new FuriousCocktailModifier(this, () -> enableBrewing, ImmutableSet.of(resilience))
.setCondition(() -> resilienceRequiredForAllEffects));
event.getAdvancementModifierRegistry().addModifier(new TwoByTwoModifier(this, ImmutableSet.of(crabType)));
event.getAdvancementModifierRegistry().addModifier(new BalancedDietModifier(this, ImmutableSet.of(crab_leg, cookedCrabLeg)));
.setCondition(() -> GeneralConfig.enableAdvancementModification && resilienceRequiredForAllEffects));
event.getAdvancementModifierRegistry().addModifier(new TwoByTwoModifier(this, ImmutableSet.of(crabType))
.setCondition(() -> GeneralConfig.enableAdvancementModification));
event.getAdvancementModifierRegistry().addModifier(new BalancedDietModifier(this, ImmutableSet.of(crab_leg, cookedCrabLeg))
.setCondition(() -> GeneralConfig.enableAdvancementModification));
}

@LoadEvent
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/violetmoon/quark/content/mobs/module/ForgottenModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import org.violetmoon.quark.base.QuarkClient;
import org.violetmoon.quark.base.client.handler.ModelHandler;
import org.violetmoon.quark.base.config.Config;
import org.violetmoon.quark.base.handler.GeneralConfig;
import org.violetmoon.zeta.advancement.modifier.MonsterHunterModifier;
import org.violetmoon.quark.base.world.EntitySpawnHandler;
import org.violetmoon.quark.content.mobs.client.render.entity.ForgottenRenderer;
Expand Down Expand Up @@ -57,7 +58,8 @@ public final void register(ZRegister event) {
Quark.ZETA.registry.register(forgottenType, "forgotten", Registry.ENTITY_TYPE_REGISTRY);
EntitySpawnHandler.addEgg(forgottenType, 0x969487, 0x3a3330, this, () -> true);

event.getAdvancementModifierRegistry().addModifier(new MonsterHunterModifier(this, ImmutableSet.of(forgottenType)));
event.getAdvancementModifierRegistry().addModifier(new MonsterHunterModifier(this, ImmutableSet.of(forgottenType))
.setCondition(() -> GeneralConfig.enableAdvancementModification));
}

@LoadEvent
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/org/violetmoon/quark/content/mobs/module/FoxhoundModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.violetmoon.quark.base.config.type.CompoundBiomeConfig;
import org.violetmoon.quark.base.config.type.CostSensitiveEntitySpawnConfig;
import org.violetmoon.quark.base.config.type.EntitySpawnConfig;
import org.violetmoon.quark.base.handler.GeneralConfig;
import org.violetmoon.zeta.advancement.ManualTrigger;
import org.violetmoon.zeta.advancement.modifier.MonsterHunterModifier;
import org.violetmoon.zeta.advancement.modifier.TwoByTwoModifier;
Expand Down Expand Up @@ -81,8 +82,10 @@ public final void register(ZRegister event) {

EntitySpawnHandler.addEgg(this, foxhoundType, 0x890d0d, 0xf2af4b, spawnConfig);

event.getAdvancementModifierRegistry().addModifier(new MonsterHunterModifier(this, ImmutableSet.of(foxhoundType)));
event.getAdvancementModifierRegistry().addModifier(new TwoByTwoModifier(this, ImmutableSet.of(foxhoundType)));
event.getAdvancementModifierRegistry().addModifier(new MonsterHunterModifier(this, ImmutableSet.of(foxhoundType))
.setCondition(() -> GeneralConfig.enableAdvancementModification));
event.getAdvancementModifierRegistry().addModifier(new TwoByTwoModifier(this, ImmutableSet.of(foxhoundType))
.setCondition(() -> GeneralConfig.enableAdvancementModification));

foxhoundFurnaceTrigger = event.getAdvancementModifierRegistry().registerManualTrigger("foxhound_furnace");
}
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/violetmoon/quark/content/mobs/module/ShibaModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import org.violetmoon.quark.base.config.Config;
import org.violetmoon.quark.base.config.type.CompoundBiomeConfig;
import org.violetmoon.quark.base.config.type.EntitySpawnConfig;
import org.violetmoon.quark.base.handler.GeneralConfig;
import org.violetmoon.zeta.advancement.ManualTrigger;
import org.violetmoon.zeta.advancement.modifier.TwoByTwoModifier;
import org.violetmoon.quark.base.world.EntitySpawnHandler;
Expand Down Expand Up @@ -56,7 +57,8 @@ public final void register(ZRegister event) {
EntitySpawnHandler.registerSpawn(shibaType, MobCategory.CREATURE, Type.ON_GROUND, Types.MOTION_BLOCKING_NO_LEAVES, Animal::checkAnimalSpawnRules, spawnConfig);
EntitySpawnHandler.addEgg(this, shibaType, 0xa86741, 0xe8d5b6, spawnConfig);

event.getAdvancementModifierRegistry().addModifier(new TwoByTwoModifier(this, ImmutableSet.of(shibaType)));
event.getAdvancementModifierRegistry().addModifier(new TwoByTwoModifier(this, ImmutableSet.of(shibaType))
.setCondition(() -> GeneralConfig.enableAdvancementModification));

shibaHelpTrigger = event.getAdvancementModifierRegistry().registerManualTrigger("shiba_help");
}
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/violetmoon/quark/content/mobs/module/WraithModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.violetmoon.quark.base.config.type.CompoundBiomeConfig;
import org.violetmoon.quark.base.config.type.CostSensitiveEntitySpawnConfig;
import org.violetmoon.quark.base.config.type.EntitySpawnConfig;
import org.violetmoon.quark.base.handler.GeneralConfig;
import org.violetmoon.zeta.advancement.modifier.MonsterHunterModifier;
import org.violetmoon.quark.base.world.EntitySpawnHandler;
import org.violetmoon.quark.content.mobs.client.render.entity.SoulBeadRenderer;
Expand Down Expand Up @@ -106,7 +107,8 @@ public final void register(ZRegister event) {
EntitySpawnHandler.registerSpawn(wraithType, MobCategory.MONSTER, Type.ON_GROUND, Types.MOTION_BLOCKING_NO_LEAVES, Monster::checkMonsterSpawnRules, spawnConfig);
EntitySpawnHandler.addEgg(this, wraithType, 0xececec, 0xbdbdbd, spawnConfig);

event.getAdvancementModifierRegistry().addModifier(new MonsterHunterModifier(this, ImmutableSet.of(wraithType)));
event.getAdvancementModifierRegistry().addModifier(new MonsterHunterModifier(this, ImmutableSet.of(wraithType))
.setCondition(() -> GeneralConfig.enableAdvancementModification));
}

@LoadEvent
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/violetmoon/quark/content/world/module/AncientWoodModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import org.violetmoon.quark.base.block.QuarkLeavesBlock;
import org.violetmoon.quark.base.config.Config;
import org.violetmoon.quark.base.config.Config.Min;
import org.violetmoon.quark.base.handler.GeneralConfig;
import org.violetmoon.quark.base.handler.VariantHandler;
import org.violetmoon.quark.base.handler.WoodSetHandler;
import org.violetmoon.quark.base.handler.WoodSetHandler.WoodSet;
Expand Down Expand Up @@ -75,7 +76,8 @@ public void register(ZRegister event) {

VariantHandler.addFlowerPot(ancient_sapling, Quark.ZETA.registry.getRegistryName(ancient_sapling, Registry.BLOCK).getPath(), Functions.identity());

event.getAdvancementModifierRegistry().addModifier(new BalancedDietModifier(this, ImmutableSet.of(ancient_fruit)));
event.getAdvancementModifierRegistry().addModifier(new BalancedDietModifier(this, ImmutableSet.of(ancient_fruit))
.setCondition(() -> GeneralConfig.enableAdvancementModification));

ancientFruitTrigger = event.getAdvancementModifierRegistry().registerManualTrigger("ancient_fruit_overlevel");
}
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/violetmoon/quark/content/world/module/GlimmeringWealdModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@

import org.violetmoon.quark.base.Quark;
import org.violetmoon.quark.base.config.Config;
import org.violetmoon.quark.base.handler.GeneralConfig;
import org.violetmoon.quark.base.handler.QuarkSounds;
import org.violetmoon.quark.base.handler.UndergroundBiomeHandler;
import org.violetmoon.quark.base.handler.VariantHandler;
Expand Down Expand Up @@ -112,7 +113,8 @@ public void postRegister(ZRegister.Post e) {
UndergroundBiomeHandler.addUndergroundBiome(this, Climate.parameters(FULL_RANGE, FULL_RANGE, FULL_RANGE, FULL_RANGE,
Climate.Parameter.span(wmin, wmax), FULL_RANGE, 0F), BIOME_NAME);

Quark.ZETA.advancementModifierRegistry.addModifier(new AdventuringTimeModifier(this, ImmutableSet.of(BIOME_KEY)));
Quark.ZETA.advancementModifierRegistry.addModifier(new AdventuringTimeModifier(this, ImmutableSet.of(BIOME_KEY))
.setCondition(() -> GeneralConfig.enableAdvancementModification));
}

@LoadEvent
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/violetmoon/zeta/Zeta.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public DyeablesRegistry createDyeablesRegistry() {
}
public abstract BrewingRegistry createBrewingRegistry();
public AdvancementModifierRegistry createAdvancementModifierRegistry() {
return new AdvancementModifierRegistry(this, () -> GeneralConfig.enableAdvancementModification); //TODO: Quark config option
return new AdvancementModifierRegistry(this);
}
public abstract ZetaNetworkHandler createNetworkHandler(String modid, int protocolVersion);
public abstract ZetaCapabilityManager createCapabilityManager();
Expand Down
7 changes: 1 addition & 6 deletions src/main/java/org/violetmoon/zeta/advancement/AdvancementModifierRegistry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,12 @@

public class AdvancementModifierRegistry {
protected final Zeta zeta;
protected final BooleanSupplier actuallyDoIt;
protected final Multimap<ResourceLocation, IAdvancementModifier> modifiers = HashMultimap.create();

protected boolean gatheredAddons = false;

public AdvancementModifierRegistry(Zeta zeta, BooleanSupplier actuallyDoIt) {
public AdvancementModifierRegistry(Zeta zeta) {
this.zeta = zeta;
this.actuallyDoIt = actuallyDoIt;
}

public ManualTrigger registerManualTrigger(String resloc) {
Expand Down Expand Up @@ -84,9 +82,6 @@ public IAdvancementModifierDelegate getDelegate() {
}

private void onAdvancementsLoaded(ServerAdvancementManager manager) {
if(!actuallyDoIt.getAsBoolean())
return;

for(ResourceLocation res : modifiers.keySet()) {
Advancement adv = manager.getAdvancement(res);

Expand Down

0 comments on commit ddce915

Please sign in to comment.