diff --git a/common/addons/pipeline-image/src/main/java/com/dfsek/terra/addons/biome/pipeline/image/config/converter/mapping/DefinedPipelineBiomeColorMappingTemplate.java b/common/addons/pipeline-image/src/main/java/com/dfsek/terra/addons/biome/pipeline/image/config/converter/mapping/DefinedPipelineBiomeColorMappingTemplate.java index d743e9e8b..b13150586 100644 --- a/common/addons/pipeline-image/src/main/java/com/dfsek/terra/addons/biome/pipeline/image/config/converter/mapping/DefinedPipelineBiomeColorMappingTemplate.java +++ b/common/addons/pipeline-image/src/main/java/com/dfsek/terra/addons/biome/pipeline/image/config/converter/mapping/DefinedPipelineBiomeColorMappingTemplate.java @@ -3,13 +3,13 @@ package com.dfsek.terra.addons.biome.pipeline.image.config.converter.mapping; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; -import java.util.Map; - import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; import com.dfsek.terra.addons.image.config.ColorLoader.ColorString; import com.dfsek.terra.addons.image.converter.mapping.ColorMapping; import com.dfsek.terra.addons.image.util.MapUtil; +import java.util.Map; + public class DefinedPipelineBiomeColorMappingTemplate implements ObjectTemplate> { diff --git a/common/api/src/main/java/com/dfsek/terra/api/registry/meta/CheckedRegistryHolder.java b/common/api/src/main/java/com/dfsek/terra/api/registry/meta/CheckedRegistryHolder.java index 2554483ea..a55be5885 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/registry/meta/CheckedRegistryHolder.java +++ b/common/api/src/main/java/com/dfsek/terra/api/registry/meta/CheckedRegistryHolder.java @@ -1,10 +1,10 @@ package com.dfsek.terra.api.registry.meta; +import java.lang.reflect.Type; + import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.util.reflection.TypeKey; -import java.lang.reflect.Type; - public interface CheckedRegistryHolder extends RegistryHolder { default CheckedRegistry getCheckedRegistry(Class clazz) throws IllegalStateException { diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java b/common/api/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java index ca5988484..74b840624 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java @@ -7,14 +7,14 @@ package com.dfsek.terra.api.structure.configured; -import org.jetbrains.annotations.ApiStatus.Experimental; - import com.dfsek.terra.api.registry.key.StringIdentifiable; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.structure.StructureSpawn; import com.dfsek.terra.api.util.collection.ProbabilityCollection; import com.dfsek.terra.api.util.range.Range; +import org.jetbrains.annotations.ApiStatus.Experimental; + @Experimental public interface ConfiguredStructure extends StringIdentifiable { diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/CloudCommandSender.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/CloudCommandSender.java index 4ace5e9b0..0160180a9 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/CloudCommandSender.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/CloudCommandSender.java @@ -1,15 +1,15 @@ package com.dfsek.terra.bukkit; -import com.dfsek.terra.api.command.CommandSender; -import com.dfsek.terra.api.entity.Entity; -import com.dfsek.terra.api.entity.Player; -import com.dfsek.terra.bukkit.world.BukkitAdapter; - import io.papermc.paper.command.brigadier.CommandSourceStack; import org.bukkit.ChatColor; import java.util.Optional; +import com.dfsek.terra.api.command.CommandSender; +import com.dfsek.terra.api.entity.Entity; +import com.dfsek.terra.api.entity.Player; +import com.dfsek.terra.bukkit.world.BukkitAdapter; + public class CloudCommandSender implements CommandSender { private final CommandSourceStack delegate; diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java index c513c6bdf..5cb6ab4e6 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java @@ -108,11 +108,11 @@ public class CommonListener implements Listener { @EventHandler public void onWolfSpawn(CreatureSpawnEvent event) { - if (!(event.getEntity() instanceof Wolf wolf)) { + if(!(event.getEntity() instanceof Wolf wolf)) { return; } - if (!WOLF_VARIANT_SPAWN_REASONS.contains(event.getSpawnReason())) { + if(!WOLF_VARIANT_SPAWN_REASONS.contains(event.getSpawnReason())) { logger.debug("Ignoring wolf spawned with reason: " + event.getSpawnReason()); return; } @@ -122,12 +122,12 @@ public class CommonListener implements Listener { @EventHandler public void onChunkGenerate(ChunkLoadEvent event) { - if (!event.isNewChunk()) { + if(!event.isNewChunk()) { return; } - for (Entity entity : event.getChunk().getEntities()) { - if (entity instanceof Wolf wolf) { + for(Entity entity : event.getChunk().getEntities()) { + if(entity instanceof Wolf wolf) { applyWolfVariant(wolf); } } diff --git 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 index 799e33577..3add6347f 100644 --- 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 @@ -19,8 +19,6 @@ package com.dfsek.terra.bukkit.world; import com.dfsek.seismic.type.vector.Vector3; -import com.dfsek.terra.bukkit.CloudCommandSender; - import io.papermc.paper.command.brigadier.CommandSourceStack; import org.bukkit.Location; import org.bukkit.Material; @@ -43,6 +41,7 @@ import com.dfsek.terra.api.world.chunk.Chunk; import com.dfsek.terra.api.world.info.WorldProperties; import com.dfsek.terra.bukkit.BukkitEntity; import com.dfsek.terra.bukkit.BukkitPlayer; +import com.dfsek.terra.bukkit.CloudCommandSender; import com.dfsek.terra.bukkit.world.block.BukkitBlockTypeAndItem; import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState; import com.dfsek.terra.bukkit.world.inventory.BukkitItemStack; diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/AwfulBukkitHacks.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/AwfulBukkitHacks.java index 60622edf1..3c7e9355f 100644 --- a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/AwfulBukkitHacks.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/AwfulBukkitHacks.java @@ -1,9 +1,5 @@ package com.dfsek.terra.bukkit.nms.v1_21_9; -import com.dfsek.terra.bukkit.nms.v1_21_9.config.VanillaBiomeProperties; - -import com.dfsek.terra.bukkit.world.BukkitBiomeInfo; - import net.minecraft.core.Holder; import net.minecraft.core.Holder.Reference; import net.minecraft.core.HolderSet; @@ -29,6 +25,7 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.VanillaBiomeProperties; import com.dfsek.terra.bukkit.world.BukkitBiomeInfo; import com.dfsek.terra.bukkit.world.BukkitPlatformBiome; import com.dfsek.terra.registry.master.ConfigRegistry; diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSPlatform.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSPlatform.java index 8c8ed3992..216665385 100644 --- a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSPlatform.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSPlatform.java @@ -2,32 +2,6 @@ package com.dfsek.terra.bukkit.nms.v1_21_9; import com.dfsek.tectonic.api.TypeRegistry; import com.dfsek.tectonic.api.exception.LoadException; - -import com.dfsek.terra.addon.InternalAddon; -import com.dfsek.terra.api.addon.BaseAddon; -import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent; -import com.dfsek.terra.api.event.functional.FunctionalEventHandler; -import com.dfsek.terra.api.world.biome.PlatformBiome; -import com.dfsek.terra.bukkit.PlatformImpl; -import com.dfsek.terra.bukkit.TerraBukkitPlugin; - -import com.dfsek.terra.bukkit.nms.v1_21_9.config.BiomeAdditionsSoundTemplate; -import com.dfsek.terra.bukkit.nms.v1_21_9.config.BiomeMoodSoundTemplate; -import com.dfsek.terra.bukkit.nms.v1_21_9.config.BiomeParticleConfigTemplate; -import com.dfsek.terra.bukkit.nms.v1_21_9.config.EntityTypeTemplate; - -import com.dfsek.terra.bukkit.nms.v1_21_9.config.MusicSoundTemplate; - -import com.dfsek.terra.bukkit.nms.v1_21_9.config.SoundEventTemplate; - -import com.dfsek.terra.bukkit.nms.v1_21_9.config.SpawnCostConfig; - -import com.dfsek.terra.bukkit.nms.v1_21_9.config.SpawnEntryConfig; -import com.dfsek.terra.bukkit.nms.v1_21_9.config.SpawnSettingsTemplate; -import com.dfsek.terra.bukkit.nms.v1_21_9.config.SpawnTypeConfig; - -import com.dfsek.terra.bukkit.nms.v1_21_9.config.VillagerTypeTemplate; - import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.Music; import net.minecraft.sounds.SoundEvent; @@ -46,10 +20,24 @@ import org.bukkit.Bukkit; import java.util.List; import java.util.Locale; +import com.dfsek.terra.addon.InternalAddon; import com.dfsek.terra.api.addon.BaseAddon; +import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent; +import com.dfsek.terra.api.event.functional.FunctionalEventHandler; import com.dfsek.terra.api.world.biome.PlatformBiome; import com.dfsek.terra.bukkit.PlatformImpl; import com.dfsek.terra.bukkit.TerraBukkitPlugin; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.BiomeAdditionsSoundTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.BiomeMoodSoundTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.BiomeParticleConfigTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.EntityTypeTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.MusicSoundTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.SoundEventTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.SpawnCostConfig; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.SpawnEntryConfig; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.SpawnSettingsTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.SpawnTypeConfig; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.VillagerTypeTemplate; public class NMSPlatform extends PlatformImpl { diff --git a/platforms/cli/src/main/java/com/dfsek/terra/cli/TerraCLI.java b/platforms/cli/src/main/java/com/dfsek/terra/cli/TerraCLI.java index 8b33133b5..c271f98cf 100644 --- a/platforms/cli/src/main/java/com/dfsek/terra/cli/TerraCLI.java +++ b/platforms/cli/src/main/java/com/dfsek/terra/cli/TerraCLI.java @@ -1,11 +1,6 @@ package com.dfsek.terra.cli; import com.dfsek.seismic.type.vector.Vector2Int; - -import com.dfsek.terra.api.config.ConfigPack; -import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent; -import com.dfsek.terra.cli.world.CLIWorld; - import net.querz.mca.MCAUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,6 +11,10 @@ import picocli.CommandLine.Option; import java.io.IOException; 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.cli.world.CLIWorld; + //TODO auto pull in version @Command(name = "TerraCLI", mixinStandardHelpOptions = true, version = "6.6.0", diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/addon/MinestomAddon.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/addon/MinestomAddon.java index 1dc3bc0cc..8c08fb1ba 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/addon/MinestomAddon.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/addon/MinestomAddon.java @@ -2,8 +2,6 @@ package com.dfsek.terra.minestom.addon; import ca.solostudios.strata.Versions; import ca.solostudios.strata.version.Version; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.dfsek.terra.api.addon.BaseAddon; import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent; @@ -12,6 +10,9 @@ import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.minestom.TerraMinestomPlatform; import com.dfsek.terra.minestom.config.VanillaBiomeProperties; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class MinestomAddon implements BaseAddon { private static final Version VERSION = Versions.getVersion(1, 0, 0); diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomUserDefinedBiomePool.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomUserDefinedBiomePool.java index 76d4299a8..8e5eb4fbc 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomUserDefinedBiomePool.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomUserDefinedBiomePool.java @@ -1,6 +1,5 @@ package com.dfsek.terra.minestom.biome; -import java.util.HashMap; import java.util.HashSet; import java.util.IdentityHashMap; diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/MinestomChunkGeneratorWrapper.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/MinestomChunkGeneratorWrapper.java index 2dfa6d18f..3e4d421e4 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/MinestomChunkGeneratorWrapper.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/MinestomChunkGeneratorWrapper.java @@ -1,7 +1,6 @@ package com.dfsek.terra.minestom.world; import net.minestom.server.coordinate.Point; -import net.minestom.server.instance.block.Block; import net.minestom.server.instance.generator.GenerationUnit; import net.minestom.server.instance.generator.Generator; import net.minestom.server.instance.generator.GeneratorImpl.AreaModifierImpl; @@ -10,7 +9,6 @@ import net.minestom.server.instance.generator.UnitModifier; import net.minestom.server.instance.palette.Palette; import org.jetbrains.annotations.NotNull; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; @@ -68,12 +66,12 @@ public class MinestomChunkGeneratorWrapper implements Generator, GeneratorWrappe int minY = section.absoluteStart().blockY(); for(int relativeX = 0; relativeX < 16; relativeX += 1) { int absoluteX = blockX + relativeX; - for(int relativeZ = 0; relativeZ < 16; relativeZ += 1) { + for(int relativeZ = 0; relativeZ < 16; relativeZ += 1) { int absoluteZ = blockZ + relativeZ; - for(int relativeY = 0; relativeY < 16; relativeY += 1) { + for(int relativeY = 0; relativeY < 16; relativeY += 1) { int absoluteY = minY + relativeY; - if (relativeX % 4 == 0 && relativeY % 4 == 0 && relativeZ % 4 == 0) { + if(relativeX % 4 == 0 && relativeY % 4 == 0 && relativeZ % 4 == 0) { UserDefinedBiome userDefinedBiome = biomePool.getBiome( biomeProvider.getBiome(absoluteX, absoluteY, absoluteZ, world.getSeed()) ); diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/TerraMinestomWorld.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/TerraMinestomWorld.java index f95b140da..fe272a864 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/TerraMinestomWorld.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/TerraMinestomWorld.java @@ -1,5 +1,14 @@ package com.dfsek.terra.minestom.world; +import net.minestom.server.MinecraftServer; +import net.minestom.server.coordinate.BlockVec; +import net.minestom.server.coordinate.Point; +import net.minestom.server.instance.Instance; +import net.minestom.server.instance.block.Block; +import net.minestom.server.world.DimensionType; + +import java.util.function.Consumer; + import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.ConfigPack; @@ -18,15 +27,6 @@ import com.dfsek.terra.minestom.biome.MinestomUserDefinedBiomePool; import com.dfsek.terra.minestom.block.MinestomBlockState; import com.dfsek.terra.minestom.entity.MinestomEntity; -import net.minestom.server.MinecraftServer; -import net.minestom.server.coordinate.BlockVec; -import net.minestom.server.coordinate.Point; -import net.minestom.server.instance.Instance; -import net.minestom.server.instance.block.Block; -import net.minestom.server.world.DimensionType; - -import java.util.function.Consumer; - public final class TerraMinestomWorld implements ServerWorld, WorldProperties { private final Instance instance; diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/inventory/meta/ItemStackMetaMixin.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/inventory/meta/ItemStackMetaMixin.java index 129bbb1ad..91a487d0b 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/inventory/meta/ItemStackMetaMixin.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/inventory/meta/ItemStackMetaMixin.java @@ -17,18 +17,22 @@ package com.dfsek.terra.mod.mixin.implementations.terra.inventory.meta; -import com.dfsek.terra.api.inventory.item.Enchantment; -import com.dfsek.terra.api.inventory.item.ItemMeta; - import net.minecraft.component.type.ItemEnchantmentsComponent; import net.minecraft.item.ItemStack; import net.minecraft.registry.entry.RegistryEntry; -import org.spongepowered.asm.mixin.*; +import org.spongepowered.asm.mixin.Implements; +import org.spongepowered.asm.mixin.Interface; +import org.spongepowered.asm.mixin.Intrinsic; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import com.dfsek.terra.api.inventory.item.Enchantment; +import com.dfsek.terra.api.inventory.item.ItemMeta; + @Mixin(ItemStack.class) @Implements(@Interface(iface = ItemMeta.class, prefix = "terra$")) diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java index 4d1f1cdde..5f9d6a651 100644 --- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java +++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java @@ -3,7 +3,6 @@ package com.dfsek.terra.lifecycle; import ca.solostudios.strata.Versions; import ca.solostudios.strata.parser.tokenizer.ParseException; import ca.solostudios.strata.version.Version; -import net.minecraft.MinecraftVersion; import net.minecraft.SharedConstants; import net.minecraft.enchantment.Enchantment; import net.minecraft.registry.DynamicRegistryManager;