This commit is contained in:
dfsek 2021-11-17 16:28:38 -07:00
parent a5d9fca932
commit 9b30d11791
7 changed files with 11 additions and 15 deletions

View File

@ -3,7 +3,7 @@ dependencies {
"shadedImplementation"("com.dfsek.tectonic:yaml:2.1.2") "shadedImplementation"("com.dfsek.tectonic:yaml:2.1.2")
} }
tasks.withType<Jar>() { tasks.withType<Jar> {
manifest { manifest {
attributes("Bootstrap-Addon-Entry-Point" to "com.dfsek.terra.addons.manifest.impl.ManifestAddonLoader") attributes("Bootstrap-Addon-Entry-Point" to "com.dfsek.terra.addons.manifest.impl.ManifestAddonLoader")
} }

View File

@ -1,9 +1,6 @@
package com.dfsek.terra.addons.manifest.api; package com.dfsek.terra.addons.manifest.api;
import com.dfsek.terra.api.addon.BaseAddon;
public interface AddonInitializer { public interface AddonInitializer {
void initialize(); void initialize();
} }

View File

@ -1,5 +1,7 @@
package com.dfsek.terra.addons.manifest.impl; package com.dfsek.terra.addons.manifest.impl;
import java.util.List;
import com.dfsek.terra.addons.manifest.api.AddonInitializer; import com.dfsek.terra.addons.manifest.api.AddonInitializer;
import com.dfsek.terra.addons.manifest.impl.config.AddonManifest; import com.dfsek.terra.addons.manifest.impl.config.AddonManifest;
import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.Platform;
@ -7,8 +9,6 @@ import com.dfsek.terra.api.addon.BaseAddon;
import com.dfsek.terra.api.inject.Injector; import com.dfsek.terra.api.inject.Injector;
import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.inject.annotations.Inject;
import java.util.List;
public class ManifestAddon implements BaseAddon { public class ManifestAddon implements BaseAddon {
private final AddonManifest manifest; private final AddonManifest manifest;

View File

@ -56,7 +56,6 @@ public class ManifestAddonLoader implements BootstrapBaseAddon<ManifestAddon> {
} }
try { try {
AddonManifest manifest = manifestLoader.load(new AddonManifest(), AddonManifest manifest = manifestLoader.load(new AddonManifest(),
new YamlConfiguration(jar.getInputStream(manifestEntry), new YamlConfiguration(jar.getInputStream(manifestEntry),

View File

@ -6,12 +6,12 @@ import com.dfsek.tectonic.annotations.Default;
import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.annotations.Value;
import com.dfsek.tectonic.config.ConfigTemplate; import com.dfsek.tectonic.config.ConfigTemplate;
import com.dfsek.terra.api.util.StringIdentifiable;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.dfsek.terra.api.util.StringIdentifiable;
@SuppressWarnings("FieldMayBeFinal") @SuppressWarnings("FieldMayBeFinal")
public class AddonManifest implements ConfigTemplate, StringIdentifiable { public class AddonManifest implements ConfigTemplate, StringIdentifiable {