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

# Conflicts:
#	common/api/util/src/main/java/com/dfsek/terra/api/util/Logger.java
#	common/implementation/src/main/java/com/dfsek/terra/AbstractTerraPlugin.java
#	common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java
#	common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java
#	common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java
#	common/implementation/src/main/java/com/dfsek/terra/util/logging/DebugLogger.java
#	common/implementation/src/main/java/com/dfsek/terra/util/logging/JavaLogger.java
#	platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraPluginImpl.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraPluginImpl.java
#	platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraPluginImpl.java

common/api/build.gradle.kts

@@ -0,0 +1,10 @@
+afterEvaluate {
+    subprojects.forEach {
+        if(it != project) {
+            println("Project: ${it.name}")
+            dependencies {
+                "shadedApi"(it)
+            }
+        }
+    }
+}

common/api/config/build.gradle.kts

@@ -0,0 +1,10 @@
+dependencies {
+    "shadedApi"(project(":common:api:core"))
+    
+    "shadedApi"("com.dfsek:Paralithic:0.5.0")
+    
+    "shadedApi"("com.dfsek.tectonic:common:2.1.2")
+    
+    "shadedApi"("net.jafama:jafama:2.3.2")
+}
+

common/api/core/build.gradle.kts

@@ -1,5 +1,6 @@
 dependencies {
     "shadedApi"(project(":common:api:util"))
+    "shadedApi"(project(":common:api:noise"))
     
     "shadedApi"("com.dfsek:Paralithic:0.5.0")
     

common/api/core/src/main/java/com/dfsek/terra/api/TerraPlugin.java

@@ -13,6 +13,7 @@ import com.dfsek.terra.api.profiler.Profiler;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.tectonic.LoaderRegistrar;
+import com.dfsek.terra.api.util.Logger;
 
 
 /**

common/api/core/src/main/java/com/dfsek/terra/api/block/entity/BlockEntity.java

@@ -2,7 +2,7 @@ package com.dfsek.terra.api.block.entity;
 
 import com.dfsek.terra.api.Handle;
 import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.util.vector.Vector3;
 
 
 public interface BlockEntity extends Handle {

common/api/core/src/main/java/com/dfsek/terra/api/config/AbstractableTemplate.java

@@ -2,7 +2,7 @@ package com.dfsek.terra.api.config;
 
 import com.dfsek.tectonic.config.ConfigTemplate;
 
-import com.dfsek.terra.api.StringIdentifiable;
+import com.dfsek.terra.api.util.StringIdentifiable;
 
 
 public interface AbstractableTemplate extends ConfigTemplate, StringIdentifiable {

common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java

@@ -5,7 +5,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.dfsek.terra.api.StringIdentifiable;
+import com.dfsek.terra.api.util.StringIdentifiable;
 import com.dfsek.terra.api.addon.TerraAddon;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.registry.meta.RegistryFactory;

common/api/core/src/main/java/com/dfsek/terra/api/config/WorldConfig.java

@@ -2,7 +2,7 @@ package com.dfsek.terra.api.config;
 
 import java.util.Map;
 
-import com.dfsek.terra.api.StringIdentifiable;
+import com.dfsek.terra.api.util.StringIdentifiable;
 import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;

common/api/core/src/main/java/com/dfsek/terra/api/entity/Entity.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.entity;
 
-import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.util.vector.Vector3;
 import com.dfsek.terra.api.world.World;
 
 

common/api/core/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java

@@ -8,7 +8,7 @@ import com.dfsek.terra.api.event.events.AbstractCancellable;
 import com.dfsek.terra.api.event.events.PackEvent;
 import com.dfsek.terra.api.structure.LootTable;
 import com.dfsek.terra.api.structure.Structure;
-import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.util.vector.Vector3;
 
 
 /**

common/api/core/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java

@@ -5,7 +5,7 @@ import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.entity.EntityType;
 import com.dfsek.terra.api.entity.Player;
 import com.dfsek.terra.api.util.generic.pair.Pair;
-import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.util.vector.Vector3;
 
 
 /**

common/api/core/src/main/java/com/dfsek/terra/api/inventory/BlockInventoryHolder.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.inventory;
 
-import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.util.vector.Vector3;
 
 
 public interface BlockInventoryHolder extends InventoryHolder {

common/api/core/src/main/java/com/dfsek/terra/api/structure/Structure.java

@@ -2,10 +2,10 @@ package com.dfsek.terra.api.structure;
 
 import java.util.Random;
 
-import com.dfsek.terra.api.StringIdentifiable;
+import com.dfsek.terra.api.util.StringIdentifiable;
 import com.dfsek.terra.api.structure.buffer.Buffer;
 import com.dfsek.terra.api.structure.rotation.Rotation;
-import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.util.vector.Vector3;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.World;
 

common/api/core/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structure;
 
-import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.util.vector.Vector3;
 
 
 public interface StructureSpawn {

common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structure.buffer;
 
-import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.util.vector.Vector3;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.World;
 

common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structure.buffer;
 
-import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.util.vector.Vector3;
 import com.dfsek.terra.api.world.World;
 
 

common/api/core/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structure.configured;
 
-import com.dfsek.terra.api.StringIdentifiable;
+import com.dfsek.terra.api.util.StringIdentifiable;
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.structure.StructureSpawn;
 import com.dfsek.terra.api.util.Range;

common/api/core/src/main/java/com/dfsek/terra/api/util/RotationUtil.java

@@ -9,7 +9,7 @@ import com.dfsek.terra.api.block.state.properties.enums.RailShape;
 import com.dfsek.terra.api.block.state.properties.enums.RedstoneConnection;
 import com.dfsek.terra.api.block.state.properties.enums.WallHeight;
 import com.dfsek.terra.api.structure.rotation.Rotation;
-import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.api.util.vector.Vector2;
 
 
 public final class RotationUtil {

common/api/core/src/main/java/com/dfsek/terra/api/world/Flora.java

@@ -3,7 +3,7 @@ package com.dfsek.terra.api.world;
 import java.util.List;
 
 import com.dfsek.terra.api.util.Range;
-import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.util.vector.Vector3;
 
 
 public interface Flora {

common/api/core/src/main/java/com/dfsek/terra/api/world/Tree.java

@@ -5,7 +5,7 @@ import java.util.Random;
 import java.util.Set;
 
 import com.dfsek.terra.api.block.BlockType;
-import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.util.vector.Vector3;
 
 
 public interface Tree {

common/api/core/src/main/java/com/dfsek/terra/api/world/World.java

@@ -6,7 +6,7 @@ import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.WorldConfig;
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.entity.EntityType;
-import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.util.vector.Vector3;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.generator.ChunkGenerator;
 

common/api/core/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.world.biome.generation;
 
-import com.dfsek.terra.api.vector.Vector2;
-import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.util.vector.Vector2;
+import com.dfsek.terra.api.util.vector.Vector3;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 
 

common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkGenerator.java

@@ -1,5 +1,6 @@
 package com.dfsek.terra.api.world.generator;
 
+import com.dfsek.terra.api.util.math.Sampler;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -8,7 +9,7 @@ import java.util.Random;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.util.vector.Vector3;
 import com.dfsek.terra.api.world.BiomeGrid;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;

common/api/core/src/main/java/com/dfsek/terra/api/world/generator/SamplerCache.java

@@ -1,5 +1,7 @@
 package com.dfsek.terra.api.world.generator;
 
+import com.dfsek.terra.api.util.math.Sampler;
+
 public interface SamplerCache {
     Sampler get(int x, int z);
     

common/api/inject/README.md

@@ -0,0 +1,3 @@
+# Dependency Injection
+
+A simple annotation-based dependency injection framework

common/api/inject/build.gradle.kts

@@ -0,0 +1,10 @@
+dependencies {
+    "shadedApi"(project(":common:api:util"))
+    
+    "shadedApi"("com.dfsek:Paralithic:0.5.0")
+    
+    "shadedApi"("com.dfsek.tectonic:common:2.1.2")
+    
+    "shadedApi"("net.jafama:jafama:2.3.2")
+}
+

common/api/inject/src/main/java/com/dfsek/terra/api/inject/Injector.java

@@ -1,7 +1,7 @@
-package com.dfsek.terra.api.injection;
+package com.dfsek.terra.api.inject;
 
-import com.dfsek.terra.api.injection.annotations.Inject;
-import com.dfsek.terra.api.injection.exception.InjectionException;
+import com.dfsek.terra.api.inject.annotations.Inject;
+import com.dfsek.terra.api.inject.exception.InjectionException;
 
 
 /**

common/api/inject/src/main/java/com/dfsek/terra/api/inject/annotations/Inject.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.injection.annotations;
+package com.dfsek.terra.api.inject.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

common/api/inject/src/main/java/com/dfsek/terra/api/inject/exception/InjectionException.java

@@ -1,12 +1,12 @@
-package com.dfsek.terra.api.injection.exception;
+package com.dfsek.terra.api.inject.exception;
 
-import com.dfsek.terra.api.injection.Injector;
+import com.dfsek.terra.api.inject.Injector;
 
 
 /**
  * Thrown when dynamic dependency injection cannot be completed by an {@link Injector}.
  */
-public class InjectionException extends Exception {
+public class InjectionException extends RuntimeException {
     private static final long serialVersionUID = -6929631447064215387L;
     
     public InjectionException(String message) {

common/api/noise/build.gradle.kts

@@ -0,0 +1,10 @@
+dependencies {
+    "shadedApi"(project(":common:api:util"))
+    
+    "shadedApi"("com.dfsek:Paralithic:0.5.0")
+    
+    "shadedApi"("com.dfsek.tectonic:common:2.1.2")
+    
+    "shadedApi"("net.jafama:jafama:2.3.2")
+}
+

common/api/noise/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.api.noise;
 
 
-import com.dfsek.terra.api.vector.Vector2;
-import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.util.vector.Vector2;
+import com.dfsek.terra.api.util.vector.Vector3;
 
 
 public interface NoiseSampler {

common/api/util/build.gradle.kts

@@ -1,3 +1,4 @@
 dependencies {
+    "shadedApi"("net.jafama:jafama:2.3.2")
 }
 

common/api/util/src/main/java/com/dfsek/terra/api/util/MathUtil.java

@@ -4,7 +4,7 @@ import net.jafama.FastMath;
 
 import java.util.List;
 
-import com.dfsek.terra.api.world.generator.Sampler;
+import com.dfsek.terra.api.util.math.Sampler;
 
 
 /**

common/api/util/src/main/java/com/dfsek/terra/api/util/StringIdentifiable.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api;
+package com.dfsek.terra.api.util;
 
 public interface StringIdentifiable {
     String getID();

common/api/util/src/main/java/com/dfsek/terra/api/util/math/Sampler.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.world.generator;
+package com.dfsek.terra.api.util.math;
 
 @FunctionalInterface
 public interface Sampler {

common/api/util/src/main/java/com/dfsek/terra/api/util/vector/Vector2.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.vector;
+package com.dfsek.terra.api.util.vector;
 
 import net.jafama.FastMath;
 

common/api/util/src/main/java/com/dfsek/terra/api/util/vector/Vector3.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.vector;
+package com.dfsek.terra.api.util.vector;
 
 import net.jafama.FastMath;
 import org.jetbrains.annotations.NotNull;