mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-02-16 10:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

somehow intellij forgot about this stuff

Browse Source
This commit is contained in:
dfsek
2021-11-23 21:09:42 -07:00
parent 3557536968
commit 325035822f
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/addons/api-addon-loader/build.gradle.kts
View File

@@ -3,7 +3,7 @@ dependencies {
tasks.withType<Jar> {
manifest {
attributes("Bootstrap-Addon-Entry-Point" to "com.dfsek.terra.addon.loader.ApiAddonLoader")
attributes("Terra-Bootstrap-Addon-Entry-Point" to "com.dfsek.terra.addon.loader.ApiAddonLoader")
}
}

6
common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/OreHolder.java
View File

@@ -11,7 +11,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.function.BiConsumer;
import com.dfsek.terra.api.util.generic.pair.ImmutablePair;
import com.dfsek.terra.api.util.generic.pair.Pair;
/**
@@ -20,8 +20,8 @@ import com.dfsek.terra.api.util.generic.pair.ImmutablePair;
public class OreHolder {
private final List<Entry> entries = new ArrayList<>();
public void forEach(BiConsumer<String, ImmutablePair<Ore, OreConfig>> consumer) {
entries.forEach(entry -> consumer.accept(entry.getId(), ImmutablePair.of(entry.getOre(), entry.getConfig())));
public void forEach(BiConsumer<String, Pair<Ore, OreConfig>> consumer) {
entries.forEach(entry -> consumer.accept(entry.getId(), Pair.of(entry.getOre(), entry.getConfig())));
}
public OreHolder add(Ore ore, OreConfig config, String id) {

2
common/addons/manifest-addon-loader/build.gradle.kts
View File

@@ -5,7 +5,7 @@ dependencies {
tasks.withType<Jar> {
manifest {
attributes("Bootstrap-Addon-Entry-Point" to "com.dfsek.terra.addons.manifest.impl.ManifestAddonLoader")
attributes("Terra-Bootstrap-Addon-Entry-Point" to "com.dfsek.terra.addons.manifest.impl.ManifestAddonLoader")
}
}

4
common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java
View File

@@ -67,6 +67,10 @@ public class ManifestAddonLoader implements BootstrapBaseAddon<ManifestAddon> {
logger.debug("Loading addon {}@{}", manifest.getID(), manifest.getVersion());
if(manifest.getSchemaVersion() != 1) {
throw new AddonException("Addon " + manifest.getID() + " has unknown schema version: " + manifest.getSchemaVersion());
}
@SuppressWarnings({ "IOResourceOpenedButNotSafelyClosed", "resource" })
ManifestAddonClassLoader loader = new ManifestAddonClassLoader(new URL[]{ addonPath.toUri().toURL() },
getClass().getClassLoader());