Skip to content
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

Copy scrollInjections config trick for loreInjections #736

Merged
merged 1 commit into from
Oct 31, 2024
Merged

Copy scrollInjections config trick for loreInjections #736

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import net.minecraft.util.Mth;
import net.minecraft.world.level.Level;

import java.util.ArrayList;
import java.util.List;

import static at.petrak.hexcasting.api.mod.HexConfig.anyMatchResLoc;
Expand Down Expand Up @@ -199,7 +200,12 @@ public static final class Server implements HexConfig.ServerConfigAccess, Config

// TODO: hook this up to the config, change Jankery, test, also test scroll injects on fabric
@ConfigEntry.Gui.Tooltip
private List<ResourceLocation> loreInjections = HexLootHandler.DEFAULT_LORE_INJECTS;
private List<String> loreInjectionsRaw = HexLootHandler.DEFAULT_LORE_INJECTS
.stream()
.map(ResourceLocation::toString)
.toList();
@ConfigEntry.Gui.Excluded
private transient List<ResourceLocation> loreInjections;
@ConfigEntry.Gui.Tooltip
private double loreChance = HexLootHandler.DEFAULT_LORE_CHANCE;

Expand All @@ -222,6 +228,16 @@ public void validatePostLoad() throws ValidationException {
throw new ValidationException("Bad parsing of scroll injects", e);
}

this.loreInjections = new ArrayList<>();
try {
for (var table : this.loreInjectionsRaw) {
ResourceLocation loc = new ResourceLocation(table);
this.loreInjections.add(loc);
}
} catch (Exception e) {
throw new ValidationException("Bad parsing of lore injects", e);
}

this.loreChance = Mth.clamp(this.loreChance, 0.0, 1.0);
}

Expand Down
Loading