From 325035822fc5bfb2d76fa04ef388108ccf668789 Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Tue, 23 Nov 2021 21:09:42 -0700
Subject: [PATCH] somehow intellij forgot about this stuff

---
 common/addons/api-addon-loader/build.gradle.kts             | 2 +-
 .../java/com/dfsek/terra/addons/ore/ores/OreHolder.java     | 6 +++---
 common/addons/manifest-addon-loader/build.gradle.kts        | 2 +-
 .../terra/addons/manifest/impl/ManifestAddonLoader.java     | 4 ++++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/common/addons/api-addon-loader/build.gradle.kts b/common/addons/api-addon-loader/build.gradle.kts
index 93a117842..1a5662248 100644
--- a/common/addons/api-addon-loader/build.gradle.kts
+++ b/common/addons/api-addon-loader/build.gradle.kts
@@ -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")
     }
 }
 
diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/OreHolder.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/OreHolder.java
index 7eb1b89bd..d6029489e 100644
--- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/OreHolder.java
+++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/OreHolder.java
@@ -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) {
diff --git a/common/addons/manifest-addon-loader/build.gradle.kts b/common/addons/manifest-addon-loader/build.gradle.kts
index cf802eea7..5b23966fb 100644
--- a/common/addons/manifest-addon-loader/build.gradle.kts
+++ b/common/addons/manifest-addon-loader/build.gradle.kts
@@ -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")
     }
 }
 
diff --git a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java
index 50bd8ca55..aa2c0a62f 100644
--- a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java
+++ b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java
@@ -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());