1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-09-19 10:34:04 +00:00

Allow extending UpgradeDataProvider

Closes #1477
This commit is contained in:
Jonathan Coates
2023-06-15 18:57:25 +01:00
parent c7f3d4f45d
commit df591cd7c6

View File

@@ -24,6 +24,7 @@ import org.apache.logging.log4j.Logger;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@@ -104,7 +105,7 @@ public abstract class UpgradeDataProvider<T extends UpgradeBase, R extends Upgra
protected abstract void addUpgrades(Consumer<Upgrade<R>> addUpgrade); protected abstract void addUpgrades(Consumer<Upgrade<R>> addUpgrade);
@Override @Override
public final CompletableFuture<?> run(CachedOutput cache) { public CompletableFuture<?> run(CachedOutput cache) {
var base = output.getOutputFolder().resolve("data"); var base = output.getOutputFolder().resolve("data");
Set<ResourceLocation> seen = new HashSet<>(); Set<ResourceLocation> seen = new HashSet<>();
@@ -127,7 +128,7 @@ public abstract class UpgradeDataProvider<T extends UpgradeBase, R extends Upgra
} }
}); });
this.upgrades = upgrades; this.upgrades = Collections.unmodifiableList(upgrades);
return Util.sequenceFailFast(futures); return Util.sequenceFailFast(futures);
} }