Merge remote-tracking branch 'upstream/ver/6.0.0' into architecture/slf4j-logging

# Conflicts:
#	common/api/core/src/main/java/com/dfsek/terra/api/Logger.java
This commit is contained in:
solonovamax
2021-09-24 13:50:21 -04:00
271 changed files with 123 additions and 3977 deletions

View File

@@ -1,5 +1,7 @@
dependencies {
"shadedApi"("com.dfsek:Paralithic:0.4.0")
"shadedApi"(project(":common:api:util"))
"shadedApi"("com.dfsek:Paralithic:0.5.0")
"shadedApi"("com.dfsek.tectonic:common:2.1.2")

View File

@@ -0,0 +1,4 @@
package com.dfsek.terra.api.addon;
public interface Addon {
}

View File

@@ -0,0 +1,13 @@
package com.dfsek.terra.api.addon;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.registry.CheckedRegistry;
public interface AddonLoader {
/**
* Load all addons.
* @param main TerraPlugin instance.
*/
void load(TerraPlugin main, CheckedRegistry<Addon> addons);
}

Some files were not shown because too many files have changed in this diff Show More