Skip to content

Turn loreInjections and DEFAULT_LORE_INJECTS into strings for Auto Config #728

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

Closed
vgskye wants to merge 1 commit into from
Closed

Turn loreInjections and DEFAULT_LORE_INJECTS into strings for Auto Config #728

Show file tree
Hide file tree
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
24 changes: 12 additions & 12 deletions Common/src/main/java/at/petrak/hexcasting/common/loot/HexLootHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,18 @@ public class HexLootHandler {
new ScrollInjection(new ResourceLocation("minecraft", "chests/stronghold_library"), 5)
);

public static final ImmutableList<ResourceLocation> DEFAULT_LORE_INJECTS = ImmutableList.of(
new ResourceLocation("minecraft", "chests/simple_dungeon"),
new ResourceLocation("minecraft", "chests/abandoned_mineshaft"),
new ResourceLocation("minecraft", "chests/pillager_outpost"),
new ResourceLocation("minecraft", "chests/woodland_mansion"),
new ResourceLocation("minecraft", "chests/stronghold_library"),
// >:)
new ResourceLocation("minecraft", "chests/village/village_desert_house"),
new ResourceLocation("minecraft", "chests/village/village_plains_house"),
new ResourceLocation("minecraft", "chests/village/village_savanna_house"),
new ResourceLocation("minecraft", "chests/village/village_snowy_house"),
new ResourceLocation("minecraft", "chests/village/village_taiga_house")
public static final ImmutableList<String> DEFAULT_LORE_INJECTS = ImmutableList.of(
"minecraft:chests/simple_dungeon",
"minecraft:chests/abandoned_mineshaft",
"minecraft:chests/pillager_outpost",
"minecraft:chests/woodland_mansion",
"minecraft:chests/stronghold_library",
// >:3
"minecraft:chests/village/village_desert_house",
"minecraft:chests/village/village_plains_house",
"minecraft:chests/village/village_savanna_house",
"minecraft:chests/village/village_snowy_house",
"minecraft:chests/village/village_taiga_house"
);

public static int getScrollCount(int range, RandomSource random) {
Expand Down
6 changes: 3 additions & 3 deletions 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 @@ -20,7 +20,7 @@

import java.util.List;

import static at.petrak.hexcasting.api.mod.HexConfig.anyMatchResLoc;
import static at.petrak.hexcasting.api.mod.HexConfig.anyMatch;
import static at.petrak.hexcasting.api.mod.HexConfig.noneMatch;

@Config(name = HexAPI.MOD_ID)
Expand Down Expand Up @@ -192,7 +192,7 @@ 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> loreInjections = HexLootHandler.DEFAULT_LORE_INJECTS;
@ConfigEntry.Gui.Tooltip
private double loreChance = HexLootHandler.DEFAULT_LORE_CHANCE;

Expand Down Expand Up @@ -266,7 +266,7 @@ public int scrollRangeForLootTable(ResourceLocation lootTable) {
}

public boolean shouldInjectLore(ResourceLocation lootTable) {
return anyMatchResLoc(this.loreInjections, lootTable);
return anyMatch(this.loreInjections, lootTable);
}

public double getLoreChance() {
Expand Down
5 changes: 3 additions & 2 deletions Forge/src/main/java/at/petrak/hexcasting/forge/datagen/ForgeHexLootModGen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import at.petrak.hexcasting.forge.loot.ForgeHexLoreLootMod;
import at.petrak.hexcasting.forge.loot.ForgeHexScrollLootMod;
import net.minecraft.data.PackOutput;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
import net.minecraftforge.common.data.GlobalLootModifierProvider;
Expand All @@ -26,9 +27,9 @@ protected void start() {
}

for (var injection : HexLootHandler.DEFAULT_LORE_INJECTS) {
var name = "lore/%s/%s".formatted(injection.getNamespace(), injection.getPath());
var name = "lore/%s".formatted(injection.replace(':', '/'));
add(name, new ForgeHexLoreLootMod(new LootItemCondition[]{
LootTableIdCondition.builder(injection).build(),
LootTableIdCondition.builder(new ResourceLocation(injection)).build(),
}, HexLootHandler.DEFAULT_LORE_CHANCE));
}

Expand Down