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

Jump to bottom

Update to 1.20.2 #67

Open
wants to merge 1 commit into
base: 1.20
Choose a base branch
from
Open

Update to 1.20.2 #67

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
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mod_version=1.3.x
minecraft_version=1.20
forge_version=46.0.2
minecraft_version=1.20.2
forge_version=48.1.0
21 changes: 8 additions & 13 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
@@ -1,12 +1,9 @@
package com.tterrag.registrate.providers;

import com.google.common.collect.Lists;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.tterrag.registrate.AbstractRegistrate;
import lombok.extern.log4j.Log4j2;

import net.minecraft.advancements.Advancement;
import net.minecraft.advancements.AdvancementHolder;
import net.minecraft.core.HolderLookup;
import net.minecraft.data.CachedOutput;
import net.minecraft.data.DataProvider;
Expand All @@ -25,9 +22,7 @@
import java.util.function.Consumer;

@Log4j2
public class RegistrateAdvancementProvider implements RegistrateProvider, Consumer<Advancement> {

private static final Gson GSON = (new GsonBuilder()).setPrettyPrinting().create();
public class RegistrateAdvancementProvider implements RegistrateProvider, Consumer<AdvancementHolder> {

private final AbstractRegistrate<?> owner;
private final PackOutput packOutput;
Expand Down Expand Up @@ -74,23 +69,23 @@ public CompletableFuture<?> run(CachedOutput cache) {
}

@Override
public void accept(@Nullable Advancement t) {
public void accept(@Nullable AdvancementHolder t) {
CachedOutput cache = this.cache;
if (cache == null) {
throw new IllegalStateException("Cannot accept advancements outside of act");
}
Objects.requireNonNull(t, "Cannot accept a null advancement");
Path path = this.packOutput.getOutputFolder();
if (!seenAdvancements.add(t.getId())) {
throw new IllegalStateException("Duplicate advancement " + t.getId());
if (!seenAdvancements.add(t.id())) {
throw new IllegalStateException("Duplicate advancement " + t.id());
} else {
Path path1 = getPath(path, t);
advancementsToSave.add(DataProvider.saveStable(cache, t.deconstruct().serializeToJson(), path1));
advancementsToSave.add(DataProvider.saveStable(cache, t.value().serializeToJson(), path1));
}
}

private static Path getPath(Path pathIn, Advancement advancementIn) {
return pathIn.resolve("data/" + advancementIn.getId().getNamespace() + "/advancements/" + advancementIn.getId().getPath() + ".json");
private static Path getPath(Path pathIn, AdvancementHolder advancementIn) {
return pathIn.resolve("data/" + advancementIn.id().getNamespace() + "/advancements/" + advancementIn.id().getPath() + ".json");
}

public String getName() {
Expand Down
Loading