Merge branch 'ver/6.6.0' into feat/platform/minestom

PolyhedralDev · Jan 1, 2025 · b4ab376 · b4ab376
2 parents d5ab3e2 + 1d3c380
commit b4ab376
Show file tree

Hide file tree

Showing 624 changed files with 7,381 additions and 1,200 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2023 Polyhedral Development
+Copyright (c) 2020-2024 Polyhedral Development
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,8 +1,8 @@
 preRelease(true)
 
-versionProjects(":common:api", version("6.5.1"))
-versionProjects(":common:implementation", version("6.5.1"))
-versionProjects(":platforms", version("6.5.1"))
+versionProjects(":common:api", version("6.6.0"))
+versionProjects(":common:implementation", version("6.6.0"))
+versionProjects(":platforms", version("6.6.0"))
 
 
 allprojects {

diff --git a/buildSrc/src/main/kotlin/DependencyConfig.kt b/buildSrc/src/main/kotlin/DependencyConfig.kt
@@ -51,6 +51,15 @@ fun Project.configureDependencies() {
         maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") {
             name = "Sonatype Snapshots"
         }
+        maven("https://repo.opencollab.dev/maven-releases/") {
+            name = "OpenCollab Releases"
+        }
+        maven("https://repo.opencollab.dev/maven-snapshots/") {
+            name = "OpenCollab Snapshots"
+        }
+        maven("https://storehouse.okaeri.eu/repository/maven-public/") {
+            name = "Okaeri"
+        }
     }
 
     dependencies {

diff --git a/buildSrc/src/main/kotlin/DistributionConfig.kt b/buildSrc/src/main/kotlin/DistributionConfig.kt
@@ -133,7 +133,6 @@ fun Project.configureDistribution() {
         version = project.version
         relocate("org.apache.commons", "com.dfsek.terra.lib.commons")
         relocate("org.objectweb.asm", "com.dfsek.terra.lib.asm")
-        relocate("com.dfsek.paralithic", "com.dfsek.terra.lib.paralithic")
         relocate("org.json", "com.dfsek.terra.lib.json")
         relocate("org.yaml", "com.dfsek.terra.lib.yaml")
 

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -5,31 +5,31 @@ object Versions {
 
     object Libraries {
         const val tectonic = "4.2.1"
-        const val paralithic = "0.7.1"
+        const val paralithic = "0.8.1"
         const val strata = "1.3.2"
 
         const val cloud = "2.0.0"
-        const val cloudPaper = "2.0.0-beta.10"
-        const val cloudFabric = "2.0.0-beta.9"
 
         const val caffeine = "3.1.8"
 
         const val slf4j = "2.0.16"
 
         object Internal {
-            const val shadow = "8.3.1"
+            const val shadow = "8.3.3"
             const val apacheText = "1.12.0"
-            const val apacheIO = "2.16.1"
-            const val guava = "33.3.0-jre"
-            const val asm = "9.7"
+            const val apacheIO = "2.17.0"
+            const val guava = "33.3.1-jre"
+            const val asm = "9.7.1"
             const val snakeYml = "2.3"
-            const val jetBrainsAnnotations = "24.1.0"
-            const val junit = "5.11.0"
+            const val jetBrainsAnnotations = "26.0.1"
+            const val junit = "5.11.3"
+            const val nbt = "6.1"
         }
     }
 
     object Fabric {
-        const val fabricAPI = "0.104.0+${Mod.minecraft}"
+        const val fabricAPI = "0.106.1+${Mod.minecraft}"
+        const val cloud = "2.0.0-beta.9"
     }
 //
 //    object Quilt {
@@ -40,12 +40,13 @@ object Versions {
     object Mod {
         const val mixin = "0.15.3+mixin.0.8.7"
 
-        const val minecraft = "1.21.1"
-        const val yarn = "$minecraft+build.3"
-        const val fabricLoader = "0.16.5"
+        const val minecraft = "1.21.3"
+        const val yarn = "$minecraft+build.2"
+        const val fabricLoader = "0.16.7"
 
         const val architecuryLoom = "1.7.413"
         const val architecturyPlugin = "3.4.159"
+
     }
 //
 //    object Forge {
@@ -54,14 +55,15 @@ object Versions {
 //    }
 
     object Bukkit {
-        const val minecraft = "1.21.1"
-        const val paperBuild = "$minecraft-R0.1-20240917.151311-80"
+        const val minecraft = "1.21.3"
+        const val paperBuild = "$minecraft-R0.1-20241101.150401-13"
         const val paper = paperBuild
         const val paperLib = "1.0.8"
         const val reflectionRemapper = "0.1.1"
         const val paperDevBundle = paperBuild
         const val runPaper = "2.3.1"
         const val paperWeight = "1.7.2"
+        const val cloud = "2.0.0-beta.10"
     }
 
     //
@@ -72,8 +74,12 @@ object Versions {
 //    }
 //
     object CLI {
-        const val nbt = "6.1"
         const val logback = "1.5.8"
+        const val picocli = "4.7.6"
+    }
+
+    object Allay {
+        const val api = "0114e0b290"
     }
 
     object Minestom {

diff --git a/common/addons/api-addon-loader/LICENSE b/common/addons/api-addon-loader/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2023 Polyhedral Development
+Copyright (c) 2020-2024 Polyhedral Development
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/...dons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonClassLoader.java b/...dons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

diff --git a/...on/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonLoader.java b/...on/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

diff --git a/common/addons/biome-provider-image-v2/LICENSE b/common/addons/biome-provider-image-v2/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2023 Polyhedral Development
+Copyright (c) 2020-2024 Polyhedral Development
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/...ider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/ImageBiomeProvider.java b/...ider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/ImageBiomeProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

diff --git a/...image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/ImageBiomeProviderAddon.java b/...image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/ImageBiomeProviderAddon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

diff --git a/...-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/config/ImageProviderTemplate.java b/...-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/config/ImageProviderTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

diff --git a/common/addons/biome-provider-image/LICENSE b/common/addons/biome-provider-image/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2023 Polyhedral Development
+Copyright (c) 2020-2024 Polyhedral Development
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/...e-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java b/...e-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

diff --git a/...vider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java b/...vider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

diff --git a/...rovider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageProviderTemplate.java b/...rovider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageProviderTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

diff --git a/common/addons/biome-provider-pipeline-v2/LICENSE b/common/addons/biome-provider-pipeline-v2/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2023 Polyhedral Development
+Copyright (c) 2020-2024 Polyhedral Development
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/...ipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/BiomePipelineAddon.java b/...ipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/BiomePipelineAddon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

diff --git a/...line-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/PipelineBiomeProvider.java b/...line-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/PipelineBiomeProvider.java
@@ -1,5 +1,7 @@
 package com.dfsek.terra.addons.biome.pipeline.v2;
 
+import com.dfsek.terra.api.util.cache.SeededVector2Key;
+
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 
@@ -11,7 +13,6 @@
 
 import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Pipeline;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.SeededVector;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.dfsek.terra.api.noise.NoiseSampler;
@@ -23,7 +24,7 @@
 
 public class PipelineBiomeProvider implements BiomeProvider {
 
-    private final LoadingCache<SeededVector, BiomeChunk> biomeChunkCache;
+    private final LoadingCache<SeededVector2Key, BiomeChunk> biomeChunkCache;
     private final int chunkSize;
     private final int resolution;
     private final NoiseSampler mutator;
@@ -90,7 +91,7 @@ public Biome getBiome(int x, int z, long seed) {
         int xInChunk = x - chunkWorldX;
         int zInChunk = z - chunkWorldZ;
 
-        return biomeChunkCache.get(new SeededVector(seed, chunkWorldX, chunkWorldZ)).get(xInChunk, zInChunk).getBiome();
+        return biomeChunkCache.get(new SeededVector2Key(chunkWorldX, chunkWorldZ, seed)).get(xInChunk, zInChunk).getBiome();
     }
 
     @Override

diff --git a/...ider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Pipeline.java b/...ider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Pipeline.java
@@ -1,10 +1,12 @@
 package com.dfsek.terra.addons.biome.pipeline.v2.api;
 
+import com.dfsek.terra.api.util.cache.SeededVector2Key;
+
 import java.util.List;
 
 
 public interface Pipeline {
-    BiomeChunk generateChunk(SeededVector worldCoordinates);
+    BiomeChunk generateChunk(SeededVector2Key worldCoordinates);
 
     int getChunkSize();
 

diff --git a/...-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/SeededVector.java b/...-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/SeededVector.java
diff --git a/.../src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/BiomePipelineTemplate.java b/.../src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/BiomePipelineTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

diff --git a/...in/java/com/dfsek/terra/addons/biome/pipeline/v2/config/source/SamplerSourceTemplate.java b/...in/java/com/dfsek/terra/addons/biome/pipeline/v2/config/source/SamplerSourceTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

diff --git a/.../src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/source/SourceTemplate.java b/.../src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/source/SourceTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

diff --git a/...v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/StageTemplate.java b/...v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/StageTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

diff --git a/...com/dfsek/terra/addons/biome/pipeline/v2/config/stage/expander/ExpanderStageTemplate.java b/...com/dfsek/terra/addons/biome/pipeline/v2/config/stage/expander/ExpanderStageTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

diff --git a/...om/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/BorderListStageTemplate.java b/...om/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/BorderListStageTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

diff --git a/...va/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/BorderStageTemplate.java b/...va/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/BorderStageTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

diff --git a/...m/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/ReplaceListStageTemplate.java b/...m/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/ReplaceListStageTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

diff --git a/...a/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/ReplaceStageTemplate.java b/...a/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/ReplaceStageTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

diff --git a/...va/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/SmoothStageTemplate.java b/...va/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/SmoothStageTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.