WIP Seismic Integration

2026-02-16 02:20:57 +00:00 · 2025-03-01 21:32:39 -07:00
parent 8366a5288b
commit 5892464a1d
239 changed files with 623 additions and 6195 deletions
--- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayFakeEntity.java
+++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayFakeEntity.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.allay.delegate;

 import com.dfsek.terra.api.entity.Entity;
-import com.dfsek.terra.api.util.vector.Vector3;
+import com.dfsek.seismic.type.vector.Vector3;
 import com.dfsek.terra.api.world.ServerWorld;

 /**
--- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoWorld.java
+++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoWorld.java
@@ -11,7 +11,7 @@ import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.entity.EntityType;
-import com.dfsek.terra.api.util.vector.Vector3;
+import com.dfsek.seismic.type.vector.Vector3;
 import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
--- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayServerWorld.java
+++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayServerWorld.java
@@ -9,7 +9,7 @@ import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.entity.EntityType;
-import com.dfsek.terra.api.util.vector.Vector3;
+import com.dfsek.seismic.type.vector.Vector3;
 import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.chunk.Chunk;
--- 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
@@ -21,7 +21,7 @@ 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.seismic.type.vector.Vector3;
 import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;

--- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java
+++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java
@@ -21,7 +21,7 @@ import io.papermc.lib.PaperLib;
 import org.bukkit.Location;

 import com.dfsek.terra.api.entity.Player;
-import com.dfsek.terra.api.util.vector.Vector3;
+import com.dfsek.seismic.type.vector.Vector3;
 import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;

--- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java
+++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java
@@ -34,7 +34,7 @@ import com.dfsek.terra.api.command.CommandSender;
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.inventory.ItemStack;
 import com.dfsek.terra.api.inventory.item.Enchantment;
-import com.dfsek.terra.api.util.vector.Vector3;
+import com.dfsek.seismic.type.vector.Vector3;
 import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.api.world.chunk.Chunk;
 import com.dfsek.terra.api.world.info.WorldProperties;
--- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitBlockEntity.java
+++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitBlockEntity.java
@@ -23,7 +23,7 @@ import org.bukkit.block.Sign;

 import com.dfsek.terra.api.block.entity.BlockEntity;
 import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.api.util.vector.Vector3;
+import com.dfsek.seismic.type.vector.Vector3;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState;

--- a/platforms/cli/src/main/java/com/dfsek/terra/cli/TerraCLI.java
+++ b/platforms/cli/src/main/java/com/dfsek/terra/cli/TerraCLI.java
@@ -9,7 +9,7 @@ import java.util.concurrent.Callable;

 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent;
-import com.dfsek.terra.api.util.vector.Vector2Int;
+import com.dfsek.seismic.type.vector.Vector2Int;
 import com.dfsek.terra.cli.world.CLIWorld;

 import picocli.CommandLine;
--- a/platforms/cli/src/main/java/com/dfsek/terra/cli/world/CLIWorld.java
+++ b/platforms/cli/src/main/java/com/dfsek/terra/cli/world/CLIWorld.java
@@ -22,8 +22,8 @@ import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.entity.EntityType;
 import com.dfsek.terra.api.util.generic.pair.Pair;
-import com.dfsek.terra.api.util.vector.Vector2Int;
-import com.dfsek.terra.api.util.vector.Vector3;
+import com.dfsek.seismic.type.vector.Vector2Int;
+import com.dfsek.seismic.type.vector.Vector3;
 import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
--- a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/lifecycle/NoiseConfigMixin.java
+++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/lifecycle/NoiseConfigMixin.java
@@ -1,8 +1,8 @@
 package com.dfsek.terra.forge.mixin.lifecycle;

 import net.minecraft.registry.RegistryEntryLookup;
-import net.minecraft.util.math.noise.DoublePerlinNoiseSampler.NoiseParameters;
-import net.minecraft.world.biome.source.util.MultiNoiseUtil.MultiNoiseSampler;
+import net.minecraft.util.math.noise.DoublePerlinSampler.NoiseParameters;
+import net.minecraft.world.biome.source.util.MultiNoiseUtil.MultiSampler;
 import net.minecraft.world.gen.chunk.ChunkGeneratorSettings;
 import net.minecraft.world.gen.noise.NoiseConfig;
 import org.spongepowered.asm.mixin.Final;
@@ -22,13 +22,13 @@ import com.dfsek.terra.mod.util.SeedHack;
 public class NoiseConfigMixin {
    @Shadow
    @Final
-    private MultiNoiseSampler multiNoiseSampler;
+    private MultiSampler multiSampler;

    @Inject(method = "<init>(Lnet/minecraft/world/gen/chunk/ChunkGeneratorSettings;Lnet/minecraft/registry/RegistryEntryLookup;J)V",
            at = @At("TAIL"))
    private void mapMultiNoise(ChunkGeneratorSettings chunkGeneratorSettings, RegistryEntryLookup<NoiseParameters> noiseParametersLookup,
                               long seed,
                               CallbackInfo ci) {
-        SeedHack.register(multiNoiseSampler, seed);
+        SeedHack.register(multiSampler, seed);
    }
 }
--- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/MinestomAdapter.java
+++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/MinestomAdapter.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.minestom;

-import com.dfsek.terra.api.util.vector.Vector3;
+import com.dfsek.seismic.type.vector.Vector3;

 import net.minestom.server.coordinate.Point;
 import net.minestom.server.coordinate.Pos;
--- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/DeferredMinestomEntity.java
+++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/DeferredMinestomEntity.java
@@ -2,7 +2,7 @@ package com.dfsek.terra.minestom.entity;

 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.entity.EntityType;
-import com.dfsek.terra.api.util.vector.Vector3;
+import com.dfsek.seismic.type.vector.Vector3;
 import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.minestom.world.TerraMinestomWorld;

--- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/MinestomEntity.java
+++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/MinestomEntity.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.minestom.entity;

 import com.dfsek.terra.api.entity.EntityType;
-import com.dfsek.terra.api.util.vector.Vector3;
+import com.dfsek.seismic.type.vector.Vector3;
 import com.dfsek.terra.api.world.ServerWorld;

 import com.dfsek.terra.minestom.MinestomAdapter;
--- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/MonsterSettingsConfig.java
+++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/MonsterSettingsConfig.java
@@ -4,7 +4,7 @@ import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;

-import com.dfsek.terra.api.util.Range;
+import com.dfsek.terra.api.util.range.Range;


 public class MonsterSettingsConfig implements ObjectTemplate<MonsterSettingsConfig> {
--- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/MusicSoundTemplate.java
+++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/MusicSoundTemplate.java
@@ -7,7 +7,7 @@ import net.minecraft.registry.Registries;
 import net.minecraft.sound.MusicSound;
 import net.minecraft.sound.SoundEvent;

-import com.dfsek.terra.api.util.Range;
+import com.dfsek.terra.api.util.range.Range;


 public class MusicSoundTemplate implements ObjectTemplate<MusicSound> {
--- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnEntryTemplate.java
+++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnEntryTemplate.java
@@ -6,7 +6,7 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 import net.minecraft.entity.EntityType;
 import net.minecraft.world.biome.SpawnSettings.SpawnEntry;

-import com.dfsek.terra.api.util.Range;
+import com.dfsek.terra.api.util.range.Range;


 public class SpawnEntryTemplate implements ObjectTemplate<SpawnEntry> {
--- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VanillaWorldProperties.java
+++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VanillaWorldProperties.java
@@ -6,8 +6,8 @@ import com.dfsek.tectonic.api.config.template.annotations.Value;
 import net.minecraft.util.Identifier;

 import com.dfsek.terra.api.properties.Properties;
-import com.dfsek.terra.api.util.ConstantRange;
-import com.dfsek.terra.api.util.Range;
+import com.dfsek.terra.api.util.range.ConstantRange;
+import com.dfsek.terra.api.util.range.Range;


 public class VanillaWorldProperties implements ConfigTemplate, Properties {
--- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/data/Codecs.java
+++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/data/Codecs.java
@@ -6,7 +6,7 @@ import com.mojang.serialization.codecs.RecordCodecBuilder;

 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.registry.key.RegistryKey;
-import com.dfsek.terra.api.util.ConstantRange;
+import com.dfsek.terra.api.util.range.ConstantRange;
 import com.dfsek.terra.mod.CommonPlatform;
 import com.dfsek.terra.mod.generation.GenerationSettings;
 import com.dfsek.terra.mod.generation.MinecraftChunkGeneratorWrapper;
--- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/generation/GenerationSettings.java
+++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/generation/GenerationSettings.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.mod.generation;

-import com.dfsek.terra.api.util.ConstantRange;
+import com.dfsek.terra.api.util.range.ConstantRange;


 public record GenerationSettings(ConstantRange height, Integer sealevel, Boolean mobGeneration, Integer spawnHeight) {
--- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/generation/TerraBiomeSource.java
+++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/generation/TerraBiomeSource.java
@@ -21,6 +21,7 @@ import com.mojang.serialization.MapCodec;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.source.BiomeSource;
+import net.minecraft.world.biome.source.util.MultiNoiseUtil;
 import net.minecraft.world.biome.source.util.MultiNoiseUtil.MultiNoiseSampler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -61,10 +62,10 @@ public class TerraBiomeSource extends BiomeSource {
    }

    @Override
-    public RegistryEntry<Biome> getBiome(int biomeX, int biomeY, int biomeZ, MultiNoiseSampler noiseSampler) {
+    public RegistryEntry<Biome> getBiome(int biomeX, int biomeY, int biomeZ, MultiNoiseSampler Sampler) {
        return ((ProtoPlatformBiome) pack
            .getBiomeProvider()
-            .getBiome(biomeX << 2, biomeY << 2, biomeZ << 2, SeedHack.getSeed(noiseSampler))
+            .getBiome(biomeX << 2, biomeY << 2, biomeZ << 2, SeedHack.getSeed(Sampler))
            .getPlatformBiome()).getDelegate();
    }

--- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/implmentation/TerraIntProvider.java
+++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/implmentation/TerraIntProvider.java
@@ -7,7 +7,7 @@ import net.minecraft.util.math.random.Random;
 import java.util.HashMap;
 import java.util.Map;

-import com.dfsek.terra.api.util.Range;
+import com.dfsek.terra.api.util.range.Range;
 import com.dfsek.terra.mod.util.MinecraftAdapter;


--- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/entity/EntityMixin.java
+++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/entity/EntityMixin.java
@@ -24,7 +24,7 @@ import org.spongepowered.asm.mixin.Interface;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

-import com.dfsek.terra.api.util.vector.Vector3;
+import com.dfsek.seismic.type.vector.Vector3;
 import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.mod.util.MinecraftAdapter;

--- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftAdapter.java
+++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftAdapter.java
@@ -23,7 +23,7 @@ import net.minecraft.world.HeightLimitView;

 import java.util.random.RandomGenerator;

-import com.dfsek.terra.api.util.vector.Vector3;
+import com.dfsek.seismic.type.vector.Vector3;
 import com.dfsek.terra.api.world.info.WorldProperties;


--- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java
+++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java
@@ -3,7 +3,6 @@ package com.dfsek.terra.mod.util;
 import net.minecraft.block.entity.LootableContainerBlockEntity;
 import net.minecraft.block.entity.MobSpawnerBlockEntity;
 import net.minecraft.block.entity.SignBlockEntity;
-import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
@@ -13,19 +12,12 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.intprovider.IntProviderType;
 import net.minecraft.world.WorldAccess;
 import net.minecraft.world.biome.Biome;
-import net.minecraft.world.biome.Biome.Builder;
-import net.minecraft.world.biome.BiomeEffects;
-import net.minecraft.world.biome.GenerationSettings;
 import net.minecraft.world.dimension.DimensionType;
 import net.minecraft.world.gen.feature.ConfiguredFeature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;

 import com.dfsek.terra.api.block.entity.BlockEntity;
@@ -33,14 +25,12 @@ import com.dfsek.terra.api.block.entity.Container;
 import com.dfsek.terra.api.block.entity.MobSpawner;
 import com.dfsek.terra.api.block.entity.Sign;
 import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.util.ConstantRange;
+import com.dfsek.terra.api.util.range.ConstantRange;
 import com.dfsek.terra.mod.CommonPlatform;
 import com.dfsek.terra.mod.config.PreLoadCompatibilityOptions;
 import com.dfsek.terra.mod.config.ProtoPlatformBiome;
-import com.dfsek.terra.mod.config.VanillaBiomeProperties;
 import com.dfsek.terra.mod.data.Codecs;
 import com.dfsek.terra.mod.implmentation.TerraIntProvider;
-import com.dfsek.terra.mod.mixin.access.BiomeAccessor;
 import com.dfsek.terra.mod.mixin_ifaces.FloraFeatureHolder;


--- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/PresetUtil.java
+++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/PresetUtil.java
@@ -27,7 +27,7 @@ import java.util.Locale;

 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.config.MetaPack;
-import com.dfsek.terra.api.util.ConstantRange;
+import com.dfsek.terra.api.util.range.ConstantRange;
 import com.dfsek.terra.api.util.generic.pair.Pair;
 import com.dfsek.terra.mod.ModPlatform;
 import com.dfsek.terra.mod.config.VanillaWorldProperties;