From 3737e3510dd2c818f60a39ad16d8f6a5acc72471 Mon Sep 17 00:00:00 2001 From: dfsek Date: Wed, 17 Nov 2021 16:28:40 -0700 Subject: [PATCH] format --- .../com/dfsek/terra/api/addon/BaseAddon.java | 2 +- .../addon/bootstrap/BootstrapBaseAddon.java | 6 +- .../java/com/dfsek/terra/api/Platform.java | 1 - .../dfsek/terra/api/addon/AddonLoader.java | 1 + .../state/properties/base/EnumProperty.java | 6 +- .../dfsek/terra/api/config/ConfigPack.java | 2 +- .../dfsek/terra/api/config/WorldConfig.java | 2 +- .../functional/FunctionalEventHandler.java | 1 - .../dfsek/terra/api/structure/Structure.java | 2 +- .../buffer/buffers/StructureBuffer.java | 3 +- .../configured/ConfiguredStructure.java | 2 +- .../api/structure/feature/Distributor.java | 16 +++--- .../dfsek/terra/api/util/RotationUtil.java | 4 +- .../com/dfsek/terra/api/world/Column.java | 4 +- .../api/world/generator/ChunkGenerator.java | 2 +- .../api/world/generator/SamplerCache.java | 1 + .../com/dfsek/terra/api/inject/Injector.java | 8 +-- .../com/dfsek/terra/AbstractPlatform.java | 2 +- .../java/com/dfsek/terra/InternalAddon.java | 6 -- .../dfsek/terra/commands/PacksCommand.java | 3 +- .../terra/commands/TerraCommandManager.java | 5 +- .../dfsek/terra/config/GenericLoaders.java | 1 - .../dfsek/terra/config/PluginConfigImpl.java | 2 +- .../com/dfsek/terra/config/lang/LangUtil.java | 2 +- .../config/pack/ConfigPackAddonsTemplate.java | 1 + .../terra/config/pack/ConfigPackImpl.java | 18 +++--- .../dfsek/terra/event/EventContextImpl.java | 4 +- .../event/FunctionalEventHandlerImpl.java | 1 - .../terra/registry/OpenRegistryImpl.java | 7 ++- .../terra/registry/master/AddonRegistry.java | 2 +- .../dfsek/terra/world/SamplerCacheImpl.java | 5 +- .../src/test/java/profiler/ProfilerTest.java | 56 +++++++++---------- .../src/test/java/registry/RegistryTest.java | 9 ++- .../terra/addon/BootstrapAddonLoader.java | 19 +++---- .../com/dfsek/terra/bukkit/PlatformImpl.java | 9 +-- .../bukkit/listeners/CommonListener.java | 3 +- .../terra/bukkit/listeners/PaperListener.java | 4 +- .../bukkit/listeners/SpigotListener.java | 4 +- .../bukkit/population/PopulationManager.java | 3 +- .../dfsek/terra/bukkit/world/BukkitTree.java | 3 +- .../com/dfsek/terra/fabric/PlatformImpl.java | 19 +++---- .../FabricChunkGeneratorWrapper.java | 19 +++---- .../fabric/generation/TerraBiomeSource.java | 8 +-- .../lifecycle/server/ServerMainMixin.java | 3 +- .../com/dfsek/terra/platform/DirectWorld.java | 2 +- .../com/dfsek/terra/sponge/PlatformImpl.java | 2 +- 46 files changed, 133 insertions(+), 152 deletions(-) diff --git a/common/api/addons/src/main/java/com/dfsek/terra/api/addon/BaseAddon.java b/common/api/addons/src/main/java/com/dfsek/terra/api/addon/BaseAddon.java index 6e5ff82d1..3a131be7b 100644 --- a/common/api/addons/src/main/java/com/dfsek/terra/api/addon/BaseAddon.java +++ b/common/api/addons/src/main/java/com/dfsek/terra/api/addon/BaseAddon.java @@ -4,5 +4,5 @@ import com.dfsek.terra.api.util.StringIdentifiable; public interface BaseAddon extends StringIdentifiable { - default void initialize() {} + default void initialize() { } } diff --git a/common/api/addons/src/main/java/com/dfsek/terra/api/addon/bootstrap/BootstrapBaseAddon.java b/common/api/addons/src/main/java/com/dfsek/terra/api/addon/bootstrap/BootstrapBaseAddon.java index 7a1f7e12c..54a4de636 100644 --- a/common/api/addons/src/main/java/com/dfsek/terra/api/addon/bootstrap/BootstrapBaseAddon.java +++ b/common/api/addons/src/main/java/com/dfsek/terra/api/addon/bootstrap/BootstrapBaseAddon.java @@ -1,15 +1,17 @@ package com.dfsek.terra.api.addon.bootstrap; -import com.dfsek.terra.api.addon.BaseAddon; - import java.nio.file.Path; +import com.dfsek.terra.api.addon.BaseAddon; + public interface BootstrapBaseAddon extends BaseAddon { /** * Load all the relevant addons in the specified path. + * * @param addonsFolder Path containing addons. * @param parent + * * @return Loaded addons */ Iterable loadAddons(Path addonsFolder, ClassLoader parent); diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/Platform.java b/common/api/core/src/main/java/com/dfsek/terra/api/Platform.java index 0a9804869..19a8f66d8 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/Platform.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/Platform.java @@ -3,7 +3,6 @@ package com.dfsek.terra.api; import java.io.File; import com.dfsek.terra.api.addon.BaseAddon; -import com.dfsek.terra.api.addon.TerraAddon; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.config.PluginConfig; import com.dfsek.terra.api.event.EventManager; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/addon/AddonLoader.java b/common/api/core/src/main/java/com/dfsek/terra/api/addon/AddonLoader.java index 8d6f0c5f1..988ae520f 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/addon/AddonLoader.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/addon/AddonLoader.java @@ -7,6 +7,7 @@ import com.dfsek.terra.api.registry.CheckedRegistry; public interface AddonLoader { /** * Load all addons. + * * @param platform TerraPlugin instance. */ void load(Platform platform, CheckedRegistry addons); diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/base/EnumProperty.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/base/EnumProperty.java index 2e7770b4f..475dd8a01 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/base/EnumProperty.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/base/EnumProperty.java @@ -11,17 +11,17 @@ public interface EnumProperty> extends Property { static > EnumProperty of(String name, Class clazz) { return new EnumProperty<>() { private final Lazy> constants = Lazy.lazy(() -> Arrays.asList(clazz.getEnumConstants())); - + @Override public Collection values() { return constants.value(); } - + @Override public Class getType() { return clazz; } - + @Override public String getName() { return name; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java index 63dd322ac..7a3412c81 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java @@ -5,13 +5,13 @@ import java.util.List; import java.util.Map; import java.util.Set; -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; import com.dfsek.terra.api.registry.meta.RegistryHolder; import com.dfsek.terra.api.tectonic.LoaderHolder; import com.dfsek.terra.api.tectonic.LoaderRegistrar; +import com.dfsek.terra.api.util.StringIdentifiable; import com.dfsek.terra.api.util.reflection.TypeKey; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/config/WorldConfig.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/WorldConfig.java index 9750c6940..a13e8f501 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/config/WorldConfig.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/config/WorldConfig.java @@ -2,8 +2,8 @@ package com.dfsek.terra.api.config; import java.util.Map; -import com.dfsek.terra.api.util.StringIdentifiable; import com.dfsek.terra.api.registry.Registry; +import com.dfsek.terra.api.util.StringIdentifiable; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.generator.SamplerCache; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/event/functional/FunctionalEventHandler.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/functional/FunctionalEventHandler.java index 44b838880..a6c0012f0 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/event/functional/FunctionalEventHandler.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/event/functional/FunctionalEventHandler.java @@ -1,7 +1,6 @@ package com.dfsek.terra.api.event.functional; import com.dfsek.terra.api.addon.BaseAddon; -import com.dfsek.terra.api.addon.TerraAddon; import com.dfsek.terra.api.event.EventHandler; import com.dfsek.terra.api.event.events.Event; import com.dfsek.terra.api.util.reflection.TypeKey; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/Structure.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/Structure.java index 18df500bd..c7da619a1 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/Structure.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/Structure.java @@ -2,9 +2,9 @@ package com.dfsek.terra.api.structure; import java.util.Random; -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.util.StringIdentifiable; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/StructureBuffer.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/StructureBuffer.java index 0bc5277b3..5857429c7 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/StructureBuffer.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/StructureBuffer.java @@ -1,7 +1,5 @@ package com.dfsek.terra.api.structure.buffer.buffers; -import com.dfsek.terra.api.structure.buffer.items.Cell; - import net.jafama.FastMath; import java.util.LinkedHashMap; @@ -9,6 +7,7 @@ import java.util.Map; import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.structure.buffer.BufferedItem; +import com.dfsek.terra.api.structure.buffer.items.Cell; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java index 28ecbd83c..a7ae04779 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java @@ -1,9 +1,9 @@ package com.dfsek.terra.api.structure.configured; -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; +import com.dfsek.terra.api.util.StringIdentifiable; import com.dfsek.terra.api.util.collection.ProbabilityCollection; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/Distributor.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/Distributor.java index 82629f469..84d1e7743 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/Distributor.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/Distributor.java @@ -1,6 +1,14 @@ package com.dfsek.terra.api.structure.feature; public interface Distributor { + static Distributor yes() { + return (x, z, seed) -> true; + } + + static Distributor no() { + return (x, z, seed) -> false; + } + boolean matches(int x, int z, long seed); default Distributor and(Distributor other) { @@ -10,12 +18,4 @@ public interface Distributor { default Distributor or(Distributor other) { return (x, z, seed) -> this.matches(x, z, seed) || other.matches(x, z, seed); } - - static Distributor yes() { - return (x, z, seed) -> true; - } - - static Distributor no() { - return (x, z, seed) -> false; - } } diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/util/RotationUtil.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/RotationUtil.java index 9c107e571..40bbe0e7c 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/util/RotationUtil.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/util/RotationUtil.java @@ -16,8 +16,10 @@ public final class RotationUtil { /** * Rotate and mirror a coordinate pair. - * @param orig Vector to rotate. + * + * @param orig Vector to rotate. * @param r Rotation + * * @return */ public static Vector2 rotateVector(Vector2 orig, Rotation r) { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/Column.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/Column.java index 49a54e93f..b01896516 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/Column.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/Column.java @@ -1,10 +1,10 @@ package com.dfsek.terra.api.world; +import java.util.function.IntConsumer; + import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.structure.feature.BinaryColumn; -import java.util.function.IntConsumer; - /** * A single vertical column of a world. diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkGenerator.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkGenerator.java index a4788a986..65dc552b9 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkGenerator.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkGenerator.java @@ -1,6 +1,5 @@ package com.dfsek.terra.api.world.generator; -import com.dfsek.terra.api.util.math.Sampler; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -9,6 +8,7 @@ import java.util.Random; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.ConfigPack; +import com.dfsek.terra.api.util.math.Sampler; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.BiomeGrid; import com.dfsek.terra.api.world.World; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/SamplerCache.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/SamplerCache.java index d8ab56f85..c8c302712 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/SamplerCache.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/SamplerCache.java @@ -2,6 +2,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); diff --git a/common/api/inject/src/main/java/com/dfsek/terra/api/inject/Injector.java b/common/api/inject/src/main/java/com/dfsek/terra/api/inject/Injector.java index ee915ad1a..e9a66d810 100644 --- a/common/api/inject/src/main/java/com/dfsek/terra/api/inject/Injector.java +++ b/common/api/inject/src/main/java/com/dfsek/terra/api/inject/Injector.java @@ -13,6 +13,10 @@ import com.dfsek.terra.api.inject.impl.InjectorImpl; * @param Type of object to inject. */ public interface Injector { + static Injector get(T1 value) { + return new InjectorImpl<>(value); + } + /** * Add an explicit class as a target. Useful for applications where subclasses may cause issues with DI. * @@ -38,8 +42,4 @@ public interface Injector { * */ void inject(Object object) throws InjectionException; - - static Injector get(T1 value) { - return new InjectorImpl<>(value); - } } diff --git a/common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java b/common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java index 2ce1433ae..1c20ea0ec 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java +++ b/common/implementation/src/main/java/com/dfsek/terra/AbstractPlatform.java @@ -28,6 +28,7 @@ import com.dfsek.terra.api.event.EventManager; import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; import com.dfsek.terra.api.inject.Injector; +import com.dfsek.terra.api.inject.impl.InjectorImpl; import com.dfsek.terra.api.lang.Language; import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.api.registry.CheckedRegistry; @@ -41,7 +42,6 @@ import com.dfsek.terra.config.GenericLoaders; import com.dfsek.terra.config.PluginConfigImpl; import com.dfsek.terra.config.lang.LangUtil; import com.dfsek.terra.event.EventManagerImpl; -import com.dfsek.terra.api.inject.impl.InjectorImpl; import com.dfsek.terra.profiler.ProfilerImpl; import com.dfsek.terra.registry.CheckedRegistryImpl; import com.dfsek.terra.registry.LockedRegistryImpl; diff --git a/common/implementation/src/main/java/com/dfsek/terra/InternalAddon.java b/common/implementation/src/main/java/com/dfsek/terra/InternalAddon.java index ccd9b0a0b..6e6ee04d0 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/InternalAddon.java +++ b/common/implementation/src/main/java/com/dfsek/terra/InternalAddon.java @@ -1,12 +1,6 @@ package com.dfsek.terra; import com.dfsek.terra.api.addon.BaseAddon; -import com.dfsek.terra.api.addon.TerraAddon; -import com.dfsek.terra.api.addon.annotations.Addon; -import com.dfsek.terra.api.addon.annotations.Author; -import com.dfsek.terra.api.addon.annotations.Version; -import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent; -import com.dfsek.terra.api.event.functional.FunctionalEventHandler; public class InternalAddon implements BaseAddon { diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/PacksCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/PacksCommand.java index 5403ba14f..b5d668848 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/PacksCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/PacksCommand.java @@ -27,6 +27,7 @@ public class PacksCommand implements CommandTemplate { } LangUtil.send("command.packs.main", sender); - registry.entries().forEach(entry -> LangUtil.send("command.packs.pack", sender, entry.getID(), entry.getAuthor(), entry.getVersion())); + registry.entries().forEach( + entry -> LangUtil.send("command.packs.pack", sender, entry.getID(), entry.getAuthor(), entry.getVersion())); } } diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java b/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java index 5b294d1fc..e900d129e 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java @@ -1,7 +1,5 @@ package com.dfsek.terra.commands; -import com.dfsek.terra.api.Platform; - import net.jafama.FastMath; import java.lang.reflect.Field; @@ -14,6 +12,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.command.CommandManager; import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.annotation.Argument; @@ -35,8 +34,8 @@ import com.dfsek.terra.api.command.tab.TabCompleter; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; import com.dfsek.terra.api.inject.exception.InjectionException; -import com.dfsek.terra.api.util.reflection.ReflectionUtil; import com.dfsek.terra.api.inject.impl.InjectorImpl; +import com.dfsek.terra.api.util.reflection.ReflectionUtil; public class TerraCommandManager implements CommandManager { diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java b/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java index ee670eb33..9f3237ccd 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java @@ -6,7 +6,6 @@ import java.util.LinkedHashMap; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.addon.BaseAddon; -import com.dfsek.terra.api.addon.TerraAddon; import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.tectonic.LoaderRegistrar; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java b/common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java index f9ce0043a..c76583e78 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java @@ -13,8 +13,8 @@ import java.io.IOException; import java.io.UncheckedIOException; import java.time.Duration; -import com.dfsek.terra.api.util.Logger; import com.dfsek.terra.api.Platform; +import com.dfsek.terra.api.util.Logger; @SuppressWarnings("FieldMayBeFinal") diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java b/common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java index 4fca9b9b9..8206d4325 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java @@ -3,10 +3,10 @@ package com.dfsek.terra.config.lang; import java.io.File; import java.io.IOException; -import com.dfsek.terra.api.util.Logger; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.lang.Language; +import com.dfsek.terra.api.util.Logger; public final class LangUtil { diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackAddonsTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackAddonsTemplate.java index 976ade247..9d38317dd 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackAddonsTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackAddonsTemplate.java @@ -10,6 +10,7 @@ import java.util.Set; import com.dfsek.terra.api.addon.TerraAddon; +@SuppressWarnings("FieldMayBeFinal") public class ConfigPackAddonsTemplate implements ConfigTemplate { @Value("addons") @Default diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java b/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java index c906b3aeb..afd14ce4e 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java @@ -123,7 +123,8 @@ public class ConfigPackImpl implements ConfigPack { selfLoader.load(addonsTemplate, configuration); this.addons = addonsTemplate.getAddons(); - platform.getEventManager().callEvent(new ConfigPackPreLoadEvent(this, template -> selfLoader.load(template, configuration))); + platform.getEventManager().callEvent( + new ConfigPackPreLoadEvent(this, template -> selfLoader.load(template, configuration))); selfLoader.load(template, configuration); @@ -173,7 +174,8 @@ public class ConfigPackImpl implements ConfigPack { selfLoader.load(addonsTemplate, configuration); this.addons = addonsTemplate.getAddons(); - platform.getEventManager().callEvent(new ConfigPackPreLoadEvent(this, template -> selfLoader.load(template, configuration))); + platform.getEventManager().callEvent( + new ConfigPackPreLoadEvent(this, template -> selfLoader.load(template, configuration))); selfLoader.load(template, configuration); @@ -364,11 +366,13 @@ public class ConfigPackImpl implements ConfigPack { private void checkDeadEntries(Platform platform) { registryMap.forEach((clazz, pair) -> ((OpenRegistryImpl) pair.getLeft()).getDeadEntries() .forEach((id, value) -> platform.getDebugLogger() - .warning("Dead entry in '" + - ReflectionUtil.typeToString( - clazz) + - "' registry: '" + - id + "'"))); + .warning( + "Dead entry in" + + " '" + + ReflectionUtil.typeToString( + clazz) + + "' registry: '" + + id + "'"))); } @SuppressWarnings({ "unchecked", "rawtypes" }) diff --git a/common/implementation/src/main/java/com/dfsek/terra/event/EventContextImpl.java b/common/implementation/src/main/java/com/dfsek/terra/event/EventContextImpl.java index f2b88c1be..549444f97 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/event/EventContextImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/event/EventContextImpl.java @@ -1,7 +1,5 @@ package com.dfsek.terra.event; -import com.dfsek.terra.api.addon.BaseAddon; - import org.jetbrains.annotations.NotNull; import java.lang.reflect.Type; @@ -9,7 +7,7 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -import com.dfsek.terra.api.addon.TerraAddon; +import com.dfsek.terra.api.addon.BaseAddon; import com.dfsek.terra.api.event.events.Event; import com.dfsek.terra.api.event.events.FailThroughEvent; import com.dfsek.terra.api.event.functional.EventContext; diff --git a/common/implementation/src/main/java/com/dfsek/terra/event/FunctionalEventHandlerImpl.java b/common/implementation/src/main/java/com/dfsek/terra/event/FunctionalEventHandlerImpl.java index 6239d361e..e7b6abea6 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/event/FunctionalEventHandlerImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/event/FunctionalEventHandlerImpl.java @@ -12,7 +12,6 @@ import java.util.Map; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.addon.BaseAddon; -import com.dfsek.terra.api.addon.TerraAddon; import com.dfsek.terra.api.event.events.Event; import com.dfsek.terra.api.event.events.FailThroughEvent; import com.dfsek.terra.api.event.events.PackEvent; diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java b/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java index 5bf886b31..fa00cc369 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java @@ -25,9 +25,8 @@ import com.dfsek.terra.api.registry.exception.DuplicateEntryException; */ public class OpenRegistryImpl implements OpenRegistry { private static final Entry NULL = new Entry<>(null); - private final Map> objects; - private static final Pattern ID_PATTERN = Pattern.compile("^[a-zA-Z0-9_-]*$"); + private final Map> objects; public OpenRegistryImpl() { objects = new HashMap<>(); @@ -69,7 +68,9 @@ public class OpenRegistryImpl implements OpenRegistry { public boolean register(String identifier, Entry value) { if(!ID_PATTERN.matcher(identifier).matches()) - throw new IllegalArgumentException("Registry ID must only contain alphanumeric characters, hyphens, and underscores. \"" + identifier + "\" is not a valid ID."); + throw new IllegalArgumentException( + "Registry ID must only contain alphanumeric characters, hyphens, and underscores. \"" + identifier + + "\" is not a valid ID."); boolean exists = objects.containsKey(identifier); objects.put(identifier, value); return exists; diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java b/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java index f5ea6ab06..ad3e8b9c5 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java @@ -14,8 +14,8 @@ import com.dfsek.terra.addon.exception.AddonLoadException; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.addon.TerraAddon; import com.dfsek.terra.api.inject.exception.InjectionException; -import com.dfsek.terra.api.registry.exception.DuplicateEntryException; import com.dfsek.terra.api.inject.impl.InjectorImpl; +import com.dfsek.terra.api.registry.exception.DuplicateEntryException; import com.dfsek.terra.registry.OpenRegistryImpl; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/SamplerCacheImpl.java b/common/implementation/src/main/java/com/dfsek/terra/world/SamplerCacheImpl.java index 824ab6f90..74acaf9c3 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/SamplerCacheImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/SamplerCacheImpl.java @@ -1,16 +1,15 @@ package com.dfsek.terra.world; -import com.dfsek.terra.api.Platform; - import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import net.jafama.FastMath; import org.jetbrains.annotations.NotNull; +import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.util.MathUtil; -import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.util.math.Sampler; +import com.dfsek.terra.api.world.World; public class SamplerCacheImpl implements com.dfsek.terra.api.world.generator.SamplerCache { diff --git a/common/implementation/src/test/java/profiler/ProfilerTest.java b/common/implementation/src/test/java/profiler/ProfilerTest.java index a3665cc7b..8b35c7ab2 100644 --- a/common/implementation/src/test/java/profiler/ProfilerTest.java +++ b/common/implementation/src/test/java/profiler/ProfilerTest.java @@ -1,40 +1,14 @@ package profiler; +import org.junit.jupiter.api.Test; + import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.profiler.ProfilerImpl; -import org.junit.jupiter.api.Test; - public class ProfilerTest { private static final Profiler PROFILER = new ProfilerImpl(); - @Test - public void testProfiler() throws InterruptedException { - //PROFILER.start(); - for(int i = 0; i < 100; i++) { - doThing(); - } - - for(int i = 0; i < 100; i++) { - doThirdOtherThing(); - } - - for(int i = 0; i < 100; i++) { - doOtherThing(); - } - PROFILER.stop(); - PROFILER.push("thing"); - PROFILER.push("thing2"); - PROFILER.start(); - PROFILER.pop("thing2"); - PROFILER.pop("thing"); - PROFILER.push("thing4"); - PROFILER.pop("thing4"); - - PROFILER.getTimings().forEach((id, timings) -> System.out.println(id + ": " + timings.toString())); - } - private static void doThing() throws InterruptedException { PROFILER.push("thing"); Thread.sleep(1); @@ -62,4 +36,30 @@ public class ProfilerTest { Thread.sleep(2); PROFILER.pop("thing4"); } + + @Test + public void testProfiler() throws InterruptedException { + //PROFILER.start(); + for(int i = 0; i < 100; i++) { + doThing(); + } + + for(int i = 0; i < 100; i++) { + doThirdOtherThing(); + } + + for(int i = 0; i < 100; i++) { + doOtherThing(); + } + PROFILER.stop(); + PROFILER.push("thing"); + PROFILER.push("thing2"); + PROFILER.start(); + PROFILER.pop("thing2"); + PROFILER.pop("thing"); + PROFILER.push("thing4"); + PROFILER.pop("thing4"); + + PROFILER.getTimings().forEach((id, timings) -> System.out.println(id + ": " + timings.toString())); + } } diff --git a/common/implementation/src/test/java/registry/RegistryTest.java b/common/implementation/src/test/java/registry/RegistryTest.java index dbebb3c98..4efeee9b9 100644 --- a/common/implementation/src/test/java/registry/RegistryTest.java +++ b/common/implementation/src/test/java/registry/RegistryTest.java @@ -1,14 +1,13 @@ package registry; +import org.junit.jupiter.api.Test; + import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.registry.OpenRegistry; - import com.dfsek.terra.api.registry.exception.DuplicateEntryException; import com.dfsek.terra.registry.CheckedRegistryImpl; import com.dfsek.terra.registry.OpenRegistryImpl; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.*; @@ -25,7 +24,7 @@ public class RegistryTest { @Test public void openRegistryChecked() { OpenRegistry test = new OpenRegistryImpl<>(); - + test.registerChecked("test", "bazinga"); try { @@ -41,7 +40,7 @@ public class RegistryTest { CheckedRegistry test = new CheckedRegistryImpl<>(new OpenRegistryImpl<>()); test.register("test", "bazinga"); - + assertEquals(test.get("test"), "bazinga"); try { diff --git a/common/loader/addon/src/main/java/com/dfsek/terra/addon/BootstrapAddonLoader.java b/common/loader/addon/src/main/java/com/dfsek/terra/addon/BootstrapAddonLoader.java index 5ec665b01..35af2be96 100644 --- a/common/loader/addon/src/main/java/com/dfsek/terra/addon/BootstrapAddonLoader.java +++ b/common/loader/addon/src/main/java/com/dfsek/terra/addon/BootstrapAddonLoader.java @@ -1,10 +1,5 @@ package com.dfsek.terra.addon; -import com.dfsek.terra.addon.exception.AddonLoadException; -import com.dfsek.terra.api.Platform; -import com.dfsek.terra.api.addon.bootstrap.BootstrapBaseAddon; -import com.dfsek.terra.api.inject.Injector; - import java.io.IOException; import java.io.UncheckedIOException; import java.lang.reflect.InvocationTargetException; @@ -14,6 +9,10 @@ import java.nio.file.Path; import java.util.jar.JarFile; import java.util.stream.Collectors; +import com.dfsek.terra.addon.exception.AddonLoadException; +import com.dfsek.terra.api.Platform; +import com.dfsek.terra.api.addon.bootstrap.BootstrapBaseAddon; + public class BootstrapAddonLoader implements BootstrapBaseAddon> { private final Platform platform; @@ -32,13 +31,13 @@ public class BootstrapAddonLoader implements BootstrapBaseAddon getPlatformAddon() { - return Optional.of(new BukkitAddon(this)); - } - private BukkitBiome parseBiome(String id) throws LoadException { if(!id.startsWith("minecraft:")) throw new LoadException("Invalid biome identifier " + id); return new BukkitBiome(org.bukkit.block.Biome.valueOf(id.toUpperCase(Locale.ROOT).substring(10))); diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java index 5561d6e8f..b38b78c39 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java @@ -1,7 +1,5 @@ package com.dfsek.terra.bukkit.listeners; -import com.dfsek.terra.api.Platform; - import org.bukkit.Material; import org.bukkit.TreeType; import org.bukkit.block.Block; @@ -11,6 +9,7 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.world.StructureGrowEvent; +import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.config.WorldConfig; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Tree; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/PaperListener.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/PaperListener.java index 8e224d110..623ca73a9 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/PaperListener.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/PaperListener.java @@ -1,11 +1,11 @@ package com.dfsek.terra.bukkit.listeners; -import com.dfsek.terra.api.Platform; - import io.papermc.paper.event.world.StructureLocateEvent; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; +import com.dfsek.terra.api.Platform; + public class PaperListener implements Listener { private final Platform platform; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java index 86558b508..6a515fc3b 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java @@ -1,7 +1,5 @@ package com.dfsek.terra.bukkit.listeners; -import com.dfsek.terra.api.Platform; - import org.bukkit.entity.Villager; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -10,6 +8,8 @@ import org.bukkit.event.entity.EntitySpawnEvent; import org.bukkit.event.entity.VillagerAcquireTradeEvent; import org.bukkit.event.entity.VillagerCareerChangeEvent; +import com.dfsek.terra.api.Platform; + /** * Listener to load on Spigot servers, contains Villager crash prevention and hacky ender eye redirection. diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java index c14e0c0ce..06c5f17e4 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java @@ -1,7 +1,5 @@ package com.dfsek.terra.bukkit.population; -import com.dfsek.terra.api.Platform; - import org.bukkit.generator.BlockPopulator; import org.jetbrains.annotations.NotNull; @@ -10,6 +8,7 @@ import java.io.IOException; import java.util.HashSet; import java.util.Random; +import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java index 65e4758dc..6fb53556e 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java @@ -1,12 +1,11 @@ package com.dfsek.terra.bukkit.world; -import com.dfsek.terra.api.Platform; - import org.bukkit.TreeType; import java.util.Locale; import java.util.Random; +import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.util.collection.MaterialSet; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/PlatformImpl.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/PlatformImpl.java index 8f20720b8..228394db7 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/PlatformImpl.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/PlatformImpl.java @@ -2,10 +2,6 @@ package com.dfsek.terra.fabric; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.TypeRegistry; - -import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper; -import com.dfsek.terra.fabric.util.FabricUtil; - import net.fabricmc.loader.api.FabricLoader; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.Identifier; @@ -14,16 +10,15 @@ import org.apache.logging.log4j.LogManager; import java.io.File; import java.util.HashSet; -import java.util.Optional; import java.util.Set; import com.dfsek.terra.AbstractPlatform; -import com.dfsek.terra.api.util.Logger; -import com.dfsek.terra.api.addon.TerraAddon; import com.dfsek.terra.api.handle.ItemHandle; import com.dfsek.terra.api.handle.WorldHandle; +import com.dfsek.terra.api.util.Logger; import com.dfsek.terra.api.util.generic.Lazy; import com.dfsek.terra.config.lang.LangUtil; +import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper; import com.dfsek.terra.fabric.handle.FabricItemHandle; import com.dfsek.terra.fabric.handle.FabricWorldHandle; import com.dfsek.terra.fabric.util.ProtoBiome; @@ -37,20 +32,20 @@ public class PlatformImpl extends AbstractPlatform { private final Set worlds = new HashSet<>(); - public void addWorld(ServerWorld world) { - worlds.add(world); - } - public PlatformImpl() { load(); } + public void addWorld(ServerWorld world) { + worlds.add(world); + } + @Override public boolean reload() { getTerraConfig().load(this); LangUtil.load(getTerraConfig().getLanguage(), this); // Load language. boolean succeed = getRawConfigRegistry().loadAll(this); - + worlds.forEach(world -> { FabricChunkGeneratorWrapper chunkGeneratorWrapper = ((FabricChunkGeneratorWrapper) world.getChunkManager().getChunkGenerator()); chunkGeneratorWrapper.setPack(getConfigRegistry().get(chunkGeneratorWrapper.getPack().getID())); diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java index ebae50251..d763b7afb 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java @@ -60,9 +60,8 @@ public class FabricChunkGeneratorWrapper extends net.minecraft.world.gen.chunk.C ); private final long seed; - private ChunkGenerator delegate; private final TerraBiomeSource biomeSource; - + private ChunkGenerator delegate; private ConfigPack pack; private ServerWorld world; @@ -77,14 +76,6 @@ public class FabricChunkGeneratorWrapper extends net.minecraft.world.gen.chunk.C this.seed = seed; } - public void setPack(ConfigPack pack) { - this.pack = pack; - this.delegate = pack.getGeneratorProvider().newInstance(pack); - biomeSource.setPack(pack); - - delegate.getPlatform().logger().info("Loading world with config pack " + pack.getID()); - } - @Override protected Codec getCodec() { return CODEC; @@ -235,6 +226,14 @@ public class FabricChunkGeneratorWrapper extends net.minecraft.world.gen.chunk.C return pack; } + public void setPack(ConfigPack pack) { + this.pack = pack; + this.delegate = pack.getGeneratorProvider().newInstance(pack); + biomeSource.setPack(pack); + + delegate.getPlatform().logger().info("Loading world with config pack " + pack.getID()); + } + public void setWorld(ServerWorld world) { this.world = world; } diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java index 0ca50b7d0..3d2ad5bdf 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java @@ -36,10 +36,6 @@ public class TerraBiomeSource extends BiomeSource { private final long seed; private ConfigPack pack; - public void setPack(ConfigPack pack) { - this.pack = pack; - } - public TerraBiomeSource(Registry biomes, long seed, ConfigPack pack) { super(biomes.stream() .filter(biome -> Objects.requireNonNull(biomes.getId(biome)) @@ -51,6 +47,10 @@ public class TerraBiomeSource extends BiomeSource { this.pack = pack; } + public void setPack(ConfigPack pack) { + this.pack = pack; + } + @Override protected Codec getCodec() { return CODEC; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/ServerMainMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/ServerMainMixin.java index e5836d657..a17ccdba8 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/ServerMainMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/ServerMainMixin.java @@ -18,6 +18,7 @@ public class ServerMainMixin { "Lnet/minecraft/util/registry/DynamicRegistryManager$Impl;")) private static void injectConstructor(String[] args, CallbackInfo ci) { FabricEntryPoint.getPlatform().getEventManager().callEvent( - new PlatformInitializationEvent()); // Load during MinecraftServer construction, after other mods have registered blocks and stuff + new PlatformInitializationEvent()); // Load during MinecraftServer construction, after other mods have registered blocks + // and stuff } } diff --git a/platforms/region/src/main/java/com/dfsek/terra/platform/DirectWorld.java b/platforms/region/src/main/java/com/dfsek/terra/platform/DirectWorld.java index e89eaee51..932874e02 100644 --- a/platforms/region/src/main/java/com/dfsek/terra/platform/DirectWorld.java +++ b/platforms/region/src/main/java/com/dfsek/terra/platform/DirectWorld.java @@ -59,7 +59,7 @@ public class DirectWorld implements World { @Override public void setBlockData(int x, int y, int z, BlockState data, boolean physics) { - + } @Override diff --git a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/PlatformImpl.java b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/PlatformImpl.java index 6e436d02c..8b19f381f 100644 --- a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/PlatformImpl.java +++ b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/PlatformImpl.java @@ -5,9 +5,9 @@ import org.spongepowered.api.Sponge; import java.io.File; import com.dfsek.terra.AbstractPlatform; -import com.dfsek.terra.api.util.Logger; import com.dfsek.terra.api.handle.ItemHandle; import com.dfsek.terra.api.handle.WorldHandle; +import com.dfsek.terra.api.util.Logger; import com.dfsek.terra.sponge.handle.SpongeWorldHandle;