Merge remote-tracking branch 'origin/ver/6.5.0' into dev/7.0-2

PolyhedralDev · Sep 20, 2024 · ddb131d · ddb131d
2 parents 2e145cc + 06457bf
commit ddb131d
Show file tree

Hide file tree

Showing 41 changed files with 133 additions and 184 deletions.
diff --git a/...line/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/biome/SelfPipelineBiome.java b/...line/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/biome/SelfPipelineBiome.java
@@ -1,10 +1,10 @@
 package com.dfsek.terra.addons.biome.pipeline.api.biome;
 
+import com.dfsek.terra.api.world.biome.Biome;
+
 import java.util.Collections;
 import java.util.Set;
 
-import com.dfsek.terra.api.world.biome.Biome;
-
 
 final class SelfPipelineBiome implements PipelineBiome {
     public static final SelfPipelineBiome INSTANCE = new SelfPipelineBiome();

diff --git a/...src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java b/...src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java
@@ -8,17 +8,15 @@
 package com.dfsek.terra.addons.chunkgenerator.generation;
 
 
-import com.dfsek.terra.addons.chunkgenerator.palette.slant.SlantHolder;
-
-import com.dfsek.terra.addons.chunkgenerator.generation.math.SlantCalculationMethod;
-
 import org.jetbrains.annotations.NotNull;
 
 import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseProperties;
+import com.dfsek.terra.addons.chunkgenerator.generation.math.SlantCalculationMethod;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.LazilyEvaluatedInterpolator;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.SamplerProvider;
 import com.dfsek.terra.addons.chunkgenerator.palette.BiomePaletteInfo;
+import com.dfsek.terra.addons.chunkgenerator.palette.slant.SlantHolder;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.ConfigPack;

diff --git a/...mmand-addons/src/main/java/com/dfsek/terra/addons/commands/addons/AddonsCommandAddon.java b/...mmand-addons/src/main/java/com/dfsek/terra/addons/commands/addons/AddonsCommandAddon.java
@@ -1,5 +1,8 @@
 package com.dfsek.terra.addons.commands.addons;
 
+import org.incendo.cloud.CommandManager;
+import org.incendo.cloud.description.Description;
+
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.addon.BaseAddon;
@@ -9,9 +12,6 @@
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
 import com.dfsek.terra.api.inject.annotations.Inject;
 
-import org.incendo.cloud.CommandManager;
-import org.incendo.cloud.description.Description;
-
 
 public class AddonsCommandAddon implements AddonInitializer {
     @Inject

diff --git a/...ctures/src/main/java/com/dfsek/terra/addons/commands/structure/StructureCommandAddon.java b/...ctures/src/main/java/com/dfsek/terra/addons/commands/structure/StructureCommandAddon.java
@@ -3,6 +3,13 @@
 
 import java.util.random.RandomGenerator;
 import java.util.random.RandomGeneratorFactory;
+import org.incendo.cloud.CommandManager;
+import org.incendo.cloud.component.DefaultValue;
+import org.incendo.cloud.context.CommandContext;
+import org.incendo.cloud.description.Description;
+import org.incendo.cloud.parser.standard.EnumParser;
+import org.incendo.cloud.parser.standard.LongParser;
+
 import java.util.Random;
 
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
@@ -19,13 +26,6 @@
 import com.dfsek.terra.api.util.Rotation;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 
-import org.incendo.cloud.CommandManager;
-import org.incendo.cloud.component.DefaultValue;
-import org.incendo.cloud.context.CommandContext;
-import org.incendo.cloud.description.Description;
-import org.incendo.cloud.parser.standard.EnumParser;
-import org.incendo.cloud.parser.standard.LongParser;
-
 
 public class StructureCommandAddon implements AddonInitializer {
     @Inject

diff --git a/...n/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java b/...n/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java
@@ -9,45 +9,17 @@
 
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.function.Supplier;
-
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
 import com.dfsek.terra.addons.noise.config.CubicSplinePointTemplate;
 import com.dfsek.terra.addons.noise.config.DimensionApplicableNoiseSampler;
-import com.dfsek.terra.addons.noise.config.templates.BinaryArithmeticTemplate;
-import com.dfsek.terra.addons.noise.config.templates.DomainWarpTemplate;
-import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate;
-import com.dfsek.terra.addons.noise.config.templates.ImageSamplerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.KernelTemplate;
-import com.dfsek.terra.addons.noise.config.templates.LinearHeightmapSamplerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.TranslateSamplerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.noise.CellularNoiseTemplate;
-import com.dfsek.terra.addons.noise.config.templates.noise.ConstantNoiseTemplate;
-import com.dfsek.terra.addons.noise.config.templates.noise.DistanceSamplerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.noise.ExpressionFunctionTemplate;
-import com.dfsek.terra.addons.noise.config.templates.noise.GaborNoiseTemplate;
-import com.dfsek.terra.addons.noise.config.templates.noise.SimpleNoiseTemplate;
+import com.dfsek.terra.addons.noise.config.templates.*;
+import com.dfsek.terra.addons.noise.config.templates.noise.*;
 import com.dfsek.terra.addons.noise.config.templates.noise.fractal.BrownianMotionTemplate;
 import com.dfsek.terra.addons.noise.config.templates.noise.fractal.PingPongTemplate;
 import com.dfsek.terra.addons.noise.config.templates.noise.fractal.RidgedFractalTemplate;
-import com.dfsek.terra.addons.noise.config.templates.normalizer.ClampNormalizerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.normalizer.CubicSplineNormalizerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.normalizer.ExpressionNormalizerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.normalizer.LinearMapNormalizerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.normalizer.LinearNormalizerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.normalizer.NormalNormalizerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.normalizer.PosterizationNormalizerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.normalizer.ProbabilityNormalizerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.normalizer.ScaleNormalizerTemplate;
+import com.dfsek.terra.addons.noise.config.templates.normalizer.*;
 import com.dfsek.terra.addons.noise.math.CubicSpline;
-import com.dfsek.terra.addons.noise.samplers.arithmetic.AdditionSampler;
-import com.dfsek.terra.addons.noise.samplers.arithmetic.DivisionSampler;
-import com.dfsek.terra.addons.noise.samplers.arithmetic.MaxSampler;
-import com.dfsek.terra.addons.noise.samplers.arithmetic.MinSampler;
-import com.dfsek.terra.addons.noise.samplers.arithmetic.MultiplicationSampler;
-import com.dfsek.terra.addons.noise.samplers.arithmetic.SubtractionSampler;
+import com.dfsek.terra.addons.noise.samplers.arithmetic.*;
 import com.dfsek.terra.addons.noise.samplers.noise.CellularSampler;
 import com.dfsek.terra.addons.noise.samplers.noise.DistanceSampler;
 import com.dfsek.terra.addons.noise.samplers.noise.random.GaussianNoiseSampler;
@@ -68,6 +40,10 @@
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.function.Supplier;
+
 
 public class NoiseAddon implements AddonInitializer {
     public static final TypeKey<Supplier<ObjectTemplate<NoiseSampler>>> NOISE_SAMPLER_TOKEN = new TypeKey<>() {

diff --git a/...ion/src/main/java/com/dfsek/terra/addons/noise/config/templates/ImageSamplerTemplate.java b/...ion/src/main/java/com/dfsek/terra/addons/noise/config/templates/ImageSamplerTemplate.java
@@ -8,15 +8,16 @@
 package com.dfsek.terra.addons.noise.config.templates;
 
 import com.dfsek.tectonic.api.config.template.annotations.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.awt.image.BufferedImage;
 
 import com.dfsek.terra.addons.noise.samplers.ImageSampler;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.noise.NoiseSampler;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.awt.image.BufferedImage;
+
 
 @SuppressWarnings({ "unused", "FieldMayBeFinal" })
 public class ImageSamplerTemplate extends SamplerTemplate<ImageSampler> {

diff --git a/...ion/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/SaltedNoiseFunction2.java b/...ion/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/SaltedNoiseFunction2.java
@@ -3,11 +3,10 @@
 import com.dfsek.paralithic.functions.dynamic.Context;
 import com.dfsek.paralithic.functions.dynamic.DynamicFunction;
 import com.dfsek.paralithic.node.Statefulness;
+import org.jetbrains.annotations.NotNull;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
 
-import org.jetbrains.annotations.NotNull;
-
 
 public class SaltedNoiseFunction2 implements DynamicFunction {
     private final NoiseSampler gen;

diff --git a/...ion/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/SaltedNoiseFunction3.java b/...ion/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/SaltedNoiseFunction3.java
@@ -3,11 +3,10 @@
 import com.dfsek.paralithic.functions.dynamic.Context;
 import com.dfsek.paralithic.functions.dynamic.DynamicFunction;
 import com.dfsek.paralithic.node.Statefulness;
+import org.jetbrains.annotations.NotNull;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
 
-import org.jetbrains.annotations.NotNull;
-
 
 public class SaltedNoiseFunction3 implements DynamicFunction {
     private final NoiseSampler gen;

diff --git a/...ature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java b/...ature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java
@@ -63,7 +63,7 @@ public void populate(ProtoWorld world) {
                 world.getBiomeProvider()
                     .getColumn(
                         tx + (doBlending ? (int) (blendSampler.noise(seed, tx, tz) * blendAmplitude) : 0),
-                        tz + (doBlending ? (int) (blendSampler.noise(seed+1, tx, tz) * blendAmplitude) : 0),
+                        tz + (doBlending ? (int) (blendSampler.noise(seed + 1, tx, tz) * blendAmplitude) : 0),
                         world)
                     .forRanges(resolution, (min, max, biome) -> {
                         for(int subChunkX = 0; subChunkX < resolution; subChunkX++) {

diff --git a/...errascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/ParserUtil.java b/...errascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/ParserUtil.java
@@ -7,15 +7,15 @@
 
 package com.dfsek.terra.addons.terrascript.parser;
 
+import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
+import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
+import com.dfsek.terra.addons.terrascript.tokenizer.Token;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.tokenizer.Token;
-
 
 public class ParserUtil {
 

diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/arguments/RegistryArgument.java b/common/api/src/main/java/com/dfsek/terra/api/command/arguments/RegistryArgument.java
@@ -2,6 +2,15 @@
 
 import io.leangen.geantyref.TypeToken;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.component.CommandComponent;
+import org.incendo.cloud.component.DefaultValue;
+import org.incendo.cloud.context.CommandContext;
+import org.incendo.cloud.context.CommandInput;
+import org.incendo.cloud.parser.ArgumentParseResult;
+import org.incendo.cloud.parser.ArgumentParser;
+import org.incendo.cloud.parser.ParserDescriptor;
+import org.incendo.cloud.suggestion.Suggestion;
+import org.incendo.cloud.suggestion.SuggestionProvider;
 
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -13,16 +22,6 @@
 import com.dfsek.terra.api.registry.key.RegistryKey;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 
-import org.incendo.cloud.component.CommandComponent;
-import org.incendo.cloud.component.DefaultValue;
-import org.incendo.cloud.context.CommandContext;
-import org.incendo.cloud.context.CommandInput;
-import org.incendo.cloud.parser.ArgumentParseResult;
-import org.incendo.cloud.parser.ArgumentParser;
-import org.incendo.cloud.parser.ParserDescriptor;
-import org.incendo.cloud.suggestion.Suggestion;
-import org.incendo.cloud.suggestion.SuggestionProvider;
-
 
 public class RegistryArgument {
 
@@ -49,17 +48,17 @@ public static <T, R> Builder<T, R> builder(String name, Function<CommandContext<
     }
 
     public static <T, R> CommandComponent<T> of(String name, Function<CommandContext<T>, Registry<R>> registryFunction,
-                                                  TypeKey<R> registryType) {
+                                                TypeKey<R> registryType) {
         return RegistryArgument.<T, R>builder(name, registryFunction, registryType).build();
     }
 
     public static <T, R> CommandComponent<T> optional(String name, Function<CommandContext<T>, Registry<R>> registryFunction,
-                                                        TypeKey<R> registryType) {
+                                                      TypeKey<R> registryType) {
         return RegistryArgument.builder(name, registryFunction, registryType).optional().build();
     }
 
     public static <T, R> CommandComponent<T> optional(String name, Function<CommandContext<T>, Registry<R>> registryFunction,
-                                                        TypeKey<R> registryType, DefaultValue<T, R> defaultKey) {
+                                                      TypeKey<R> registryType, DefaultValue<T, R> defaultKey) {
         return RegistryArgument.builder(name, registryFunction, registryType).optional(defaultKey).build();
     }
 

diff --git a/...api/src/main/java/com/dfsek/terra/api/event/events/platform/CommandRegistrationEvent.java b/...api/src/main/java/com/dfsek/terra/api/event/events/platform/CommandRegistrationEvent.java
@@ -1,10 +1,10 @@
 package com.dfsek.terra.api.event.events.platform;
 
+import org.incendo.cloud.CommandManager;
+
 import com.dfsek.terra.api.command.CommandSender;
 import com.dfsek.terra.api.event.events.Event;
 
-import org.incendo.cloud.CommandManager;
-
 
 public class CommandRegistrationEvent implements Event {
     private final CommandManager<CommandSender> commandManager;

diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/reflection/ReflectionUtil.java b/common/api/src/main/java/com/dfsek/terra/api/util/reflection/ReflectionUtil.java
@@ -30,11 +30,11 @@ public final class ReflectionUtil {
     private static final Unsafe UNSAFE;
 
     static {
-        try{
+        try {
             final Field unsafeField = Unsafe.class.getDeclaredField("theUnsafe");
             unsafeField.setAccessible(true);
             UNSAFE = (Unsafe) unsafeField.get(null);
-        } catch(NoSuchFieldException | IllegalAccessException e){
+        } catch(NoSuchFieldException | IllegalAccessException e) {
             throw new RuntimeException(e);
         }
     }

diff --git a/...n/implementation/base/src/main/java/com/dfsek/terra/event/FunctionalEventHandlerImpl.java b/...n/implementation/base/src/main/java/com/dfsek/terra/event/FunctionalEventHandlerImpl.java
@@ -17,17 +17,6 @@
 
 package com.dfsek.terra.event;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.dfsek.terra.api.addon.BaseAddon;
 import com.dfsek.terra.api.event.events.Event;
 import com.dfsek.terra.api.event.events.FailThroughEvent;
@@ -36,6 +25,12 @@
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Type;
+import java.util.*;
+
 
 public class FunctionalEventHandlerImpl implements FunctionalEventHandler {
     private static final Logger logger = LoggerFactory.getLogger(FunctionalEventHandlerImpl.class);

diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java
@@ -17,14 +17,14 @@
 
 package com.dfsek.terra.bukkit;
 
-import io.papermc.lib.PaperLib;
-import org.bukkit.Location;
-
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.util.vector.Vector3;
 import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 
+import io.papermc.lib.PaperLib;
+import org.bukkit.Location;
+
 
 public class BukkitEntity implements Entity {
     private final org.bukkit.entity.Entity entity;

diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
@@ -79,7 +79,7 @@ public void onEnable() {
         } catch(Exception e) { // This should never happen.
             logger.error("""
                          TERRA HAS BEEN DISABLED
-                                                  
+                         
                          Errors occurred while registering commands.
                          Please report this to Terra.
                          """.strip(), e);
@@ -102,13 +102,13 @@ private LegacyPaperCommandManager<CommandSender> getCommandSenderPaperCommandMan
                 BukkitAdapter::adapt
             ));
 
-        if (commandManager.hasCapability(CloudBukkitCapabilities.NATIVE_BRIGADIER)) {
+        if(commandManager.hasCapability(CloudBukkitCapabilities.NATIVE_BRIGADIER)) {
             commandManager.registerBrigadier();
             final CloudBrigadierManager<?, ?> brigManager = commandManager.brigadierManager();
             if(brigManager != null) {
                 brigManager.setNativeNumberSuggestions(false);
             }
-        } else if (commandManager.hasCapability(CloudBukkitCapabilities.ASYNCHRONOUS_COMPLETION)) {
+        } else if(commandManager.hasCapability(CloudBukkitCapabilities.ASYNCHRONOUS_COMPLETION)) {
             commandManager.registerAsynchronousCompletions();
         }
 
@@ -181,7 +181,7 @@ private boolean doVersionCheck() {
                 logger.warn("""
                             You are using Mohist, so we will not give you any support for issues that may arise.
                             Since you enabled the "IKnowMohistCausesLotsOfIssuesButIWillUseItAnyways" flag, we won't disable Terra. But be warned.
-                                                        
+                            
                             > I felt a great disturbance in the JVM, as if millions of plugins suddenly cried out in stack traces and were suddenly silenced.
                             > I fear something terrible has happened.
                             > - Astrash
@@ -194,7 +194,7 @@ private boolean doVersionCheck() {
     @Override
     public @Nullable
     ChunkGenerator getDefaultWorldGenerator(@NotNull String worldName, String id) {
-        if (id == null || id.trim().equals("")) { return null; }
+        if(id == null || id.trim().equals("")) { return null; }
         return new BukkitChunkGeneratorWrapper(generatorMap.computeIfAbsent(worldName, name -> {
             ConfigPack pack = platform.getConfigRegistry().getByID(id).orElseThrow(
                 () -> new IllegalArgumentException("No such config pack \"" + id + "\""));