Skip to content

add holder lookup provider to adavncement and loot table provider #7

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

Merged
merged 1 commit into from
Sep 12, 2024
Merged

add holder lookup provider to adavncement and loot table provider #7

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
10 changes: 10 additions & 0 deletions src/main/java/com/tterrag/registrate/providers/RegistrateAdvancementProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,18 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.tterrag.registrate.AbstractRegistrate;
import lombok.Getter;
import lombok.extern.log4j.Log4j2;

import net.minecraft.advancements.Advancement;
import net.minecraft.advancements.AdvancementHolder;
import net.minecraft.core.Holder;
import net.minecraft.core.HolderLookup;
import net.minecraft.data.CachedOutput;
import net.minecraft.data.DataProvider;
import net.minecraft.data.PackOutput;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.neoforged.fml.LogicalSide;
import net.neoforged.neoforge.common.conditions.ICondition;
Expand All @@ -37,13 +40,19 @@ public class RegistrateAdvancementProvider implements RegistrateProvider, Consum
private final PackOutput packOutput;
private final CompletableFuture<HolderLookup.Provider> registriesLookup;
private final List<CompletableFuture<?>> advancementsToSave = Lists.newArrayList();
@Getter
private HolderLookup.Provider provider;

public RegistrateAdvancementProvider(AbstractRegistrate<?> owner, PackOutput packOutputIn, CompletableFuture<HolderLookup.Provider> registriesLookupIn) {
this.owner = owner;
this.packOutput = packOutputIn;
this.registriesLookup = registriesLookupIn;
}

public <T> Holder<T> resolve(ResourceKey<T> key) {
return provider.lookupOrThrow(key.registryKey()).getOrThrow(key);
}

@Override
public LogicalSide getSide() {
return LogicalSide.SERVER;
Expand All @@ -63,6 +72,7 @@ public MutableComponent desc(String category, String name, String desc) {
@Override
public CompletableFuture<?> run(CachedOutput cache) {
return registriesLookup.thenCompose(lookup -> {
this.provider = lookup;
advancementsToSave.clear();

try {
Expand Down
14 changes: 14 additions & 0 deletions src/main/java/com/tterrag/registrate/providers/loot/RegistrateLootTableProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@
import com.tterrag.registrate.util.nullness.NonNullBiFunction;
import com.tterrag.registrate.util.nullness.NonNullConsumer;

import lombok.Getter;
import net.minecraft.core.Holder;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.WritableRegistry;
import net.minecraft.data.CachedOutput;
import net.minecraft.data.PackOutput;
import net.minecraft.data.loot.LootTableProvider;
import net.minecraft.data.loot.LootTableSubProvider;
Expand Down Expand Up @@ -69,9 +72,20 @@ public LootContextParamSet getLootSet() {
private final Multimap<LootContextParamSet, Consumer<BiConsumer<ResourceKey<LootTable>, LootTable.Builder>>> lootActions = HashMultimap.create();
private final Set<RegistrateLootTables> currentLootCreators = new HashSet<>();

private CompletableFuture<HolderLookup.Provider> provider;

public RegistrateLootTableProvider(AbstractRegistrate<?> parent, PackOutput packOutput, CompletableFuture<HolderLookup.Provider> provider) {
super(packOutput, Set.of(), VanillaLootTableProvider.create(packOutput, provider).getTables(), provider);
this.parent = parent;
this.provider = provider;
}

public HolderLookup.Provider getProvider(){
return provider.getNow(null);
}

public <T> Holder<T> resolve(ResourceKey<T> key) {
return getProvider().lookupOrThrow(key.registryKey()).getOrThrow(key);
}

@Override
Expand Down