Skip to content

Commit

Permalink
fixed shit
Browse files Browse the repository at this point in the history
  • Loading branch information
Kaitlyn committed Aug 14, 2022
1 parent 5b0257e commit 61ca563
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 33 deletions.
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

2 changes: 1 addition & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ archives_base_name = effective_advancements

# Dependencies are managed at gradle/libs.versions.toml
cc_version = 5.0.1
modmenu_version = 4.0.4
modmenu_version = 4.0.6
clothconfig_version = 8.0.75
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[versions]
# The latest versions are available at https://lambdaurora.dev/tools/import_quilt.html
minecraft = "1.19"
quilt_mappings = "1.19+build.1"
quilt_loader = "0.17.0"
minecraft = "1.19.1"
quilt_mappings = "1.19.1+build.2"
quilt_loader = "0.17.1"

quilted_fabric_api = "2.0.0-beta.5+0.57.0-1.19"
quilted_fabric_api = "4.0.0-beta.1+0.58.5-1.19.1"

[libraries]
minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,6 @@ public static void register() {


});
/*
CommandRegistrationCallback.EVENT.register(((dispatcher, buildContext, environment) -> {
dispatcher.register(literal("debug")
.executes((context -> {
StatusEffectManager manager = context.getSource().getPlayer().getComponent(StatusEffectComponents.MANAGER);
for (AdvancementEffect effect: manager.advancementEffects) {
System.out.println(effect.toString());
}
return 1;
})));
}));
*/
}

private static int action(CommandContext<ServerCommandSource> context, boolean remove, boolean debuff, boolean random, int everything) throws CommandSyntaxException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

import java.util.ArrayList;
import java.util.Map;
import java.util.Objects;
import java.util.function.Consumer;

public class EffectList extends ArrayList<AdvancementEffect> {
public ArrayList<AdvancementEffect> toRemove = new ArrayList<>();
Expand Down Expand Up @@ -63,6 +61,9 @@ public void amplify(StatusEffect effect, int mod) {

public boolean has(StatusEffect effect) {
for(AdvancementEffect advancementEffect : this) {
if(advancementEffect.getType() == null) {
break;
}
if(advancementEffect.getType().equals(effect)) {
return true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ public static StatusEffect randomEffect(boolean debuff) {

public void grant(boolean debuff) {
add(randomEffect(debuff));
for(AdvancementEffect effect : effects) {
System.out.println(effect);
}
}
public void revoke(boolean debuff) {
boolean complete = false;
Expand All @@ -49,9 +46,7 @@ public void revoke(boolean debuff) {

public void clearType(boolean debuff) {
effects.forEach((effect) -> {
System.out.println(effect.isDebuff());
if(effect.isDebuff() == debuff) {
System.out.println(1);
remove(effect.getType(), true, false);
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
public class EffectiveConfig extends WrappedConfig {

@Comment("The Advancements that cause random buffs to be applied.")
public final ValueList<String> advancementList = ValueList.create("",
public final ValueList<String> advancementList = ValueList.create("Advancement",
"story/obtain_armor",
"story/form_obsidian",
"story/mine_diamond",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.terraformersmc.modmenu.api.ConfigScreenFactory;
import com.terraformersmc.modmenu.api.ModMenuApi;
import io.github.KacyBiscuit.effective_advancements.StatusEffectManager;
import me.shedaniel.clothconfig2.api.ConfigBuilder;
import me.shedaniel.clothconfig2.api.ConfigCategory;
import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
Expand Down

0 comments on commit 61ca563

Please sign in to comment.