mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-17 22:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor implementation

Browse Source
This commit is contained in:
dfsek
2021-07-10 21:44:38 -07:00
parent d09ef5052a
commit 519956dc11
21 changed files with 44 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java
+1 -1
View File
@@ -21,7 +21,7 @@ import com.dfsek.terra.api.command.exception.SwitchFormatException;
import com.dfsek.terra.api.command.tab.TabCompleter; import com.dfsek.terra.api.command.tab.TabCompleter;
import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.CommandSender;
import com.dfsek.terra.api.entity.Player; import com.dfsek.terra.api.entity.Player;
import com.dfsek.terra.api.inject.InjectorImpl; import com.dfsek.terra.inject.InjectorImpl;
import com.dfsek.terra.api.injection.exception.InjectionException; import com.dfsek.terra.api.injection.exception.InjectionException;
import com.dfsek.terra.api.util.ReflectionUtil; import com.dfsek.terra.api.util.ReflectionUtil;
import net.jafama.FastMath; import net.jafama.FastMath;
common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/LoaderImpl.java
+1 -1
View File
@@ -4,7 +4,7 @@ import com.dfsek.tectonic.config.Configuration;
import com.dfsek.tectonic.exception.ConfigException; import com.dfsek.tectonic.exception.ConfigException;
import com.dfsek.terra.api.config.Loader; import com.dfsek.terra.api.config.Loader;
import com.dfsek.terra.api.util.function.ExceptionalConsumer; import com.dfsek.terra.api.util.function.ExceptionalConsumer;
import com.dfsek.terra.api.util.GlueList; import com.dfsek.terra.util.GlueList;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/GridSpawnLoader.java
+1 -1
View File
@@ -2,7 +2,7 @@ package com.dfsek.terra.config.loaders.config;
import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.ConfigLoader;
import com.dfsek.tectonic.loading.TypeLoader; import com.dfsek.tectonic.loading.TypeLoader;
import com.dfsek.terra.api.math.GridSpawn; import com.dfsek.terra.math.GridSpawn;
import com.dfsek.terra.api.structure.StructureSpawn; import com.dfsek.terra.api.structure.StructureSpawn;
import java.lang.reflect.Type; import java.lang.reflect.Type;
common/implementation/src/main/java/com/dfsek/terra/api/event/EventManagerImpl.java → common/implementation/src/main/java/com/dfsek/terra/event/EventManagerImpl.java
+3 -1
View File
@@ -1,7 +1,9 @@
package com.dfsek.terra.api.event; package com.dfsek.terra.event;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.addon.TerraAddon; import com.dfsek.terra.api.addon.TerraAddon;
import com.dfsek.terra.api.event.EventListener;
import com.dfsek.terra.api.event.EventManager;
import com.dfsek.terra.api.event.annotations.Global; import com.dfsek.terra.api.event.annotations.Global;
import com.dfsek.terra.api.event.annotations.Priority; import com.dfsek.terra.api.event.annotations.Priority;
import com.dfsek.terra.api.event.events.Cancellable; import com.dfsek.terra.api.event.events.Cancellable;
common/implementation/src/main/java/com/dfsek/terra/api/inject/InjectorImpl.java → common/implementation/src/main/java/com/dfsek/terra/inject/InjectorImpl.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.dfsek.terra.api.inject; package com.dfsek.terra.inject;
import com.dfsek.terra.api.injection.Injector; import com.dfsek.terra.api.injection.Injector;
import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.injection.annotations.Inject;
common/implementation/src/main/java/com/dfsek/terra/api/math/GridSpawn.java → common/implementation/src/main/java/com/dfsek/terra/math/GridSpawn.java
+3 -3
View File
@@ -1,7 +1,7 @@
package com.dfsek.terra.api.math; package com.dfsek.terra.math;
import com.dfsek.terra.api.util.FastRandom; import com.dfsek.terra.util.FastRandom;
import com.dfsek.terra.api.util.GlueList; import com.dfsek.terra.util.GlueList;
import com.dfsek.terra.api.util.PopulationUtil; import com.dfsek.terra.api.util.PopulationUtil;
import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.vector.Vector3;
common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java
+1 -1
View File
@@ -6,7 +6,7 @@ import com.dfsek.terra.addon.PreLoadAddon;
import com.dfsek.terra.addon.exception.AddonLoadException; import com.dfsek.terra.addon.exception.AddonLoadException;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.addon.TerraAddon; import com.dfsek.terra.api.addon.TerraAddon;
import com.dfsek.terra.api.inject.InjectorImpl; import com.dfsek.terra.inject.InjectorImpl;
import com.dfsek.terra.api.injection.exception.InjectionException; import com.dfsek.terra.api.injection.exception.InjectionException;
import com.dfsek.terra.api.registry.exception.DuplicateEntryException; import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
import com.dfsek.terra.registry.OpenRegistryImpl; import com.dfsek.terra.registry.OpenRegistryImpl;
common/implementation/src/main/java/com/dfsek/terra/api/transform/MapTransform.java → common/implementation/src/main/java/com/dfsek/terra/transform/MapTransform.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.dfsek.terra.api.transform; package com.dfsek.terra.transform;
import com.dfsek.terra.api.transform.Transform;
import com.dfsek.terra.api.transform.exception.TransformException; import com.dfsek.terra.api.transform.exception.TransformException;
import java.util.HashMap; import java.util.HashMap;
common/implementation/src/main/java/com/dfsek/terra/api/transform/TransformerImpl.java → common/implementation/src/main/java/com/dfsek/terra/transform/TransformerImpl.java
+4 -1
View File
@@ -1,5 +1,8 @@
package com.dfsek.terra.api.transform; package com.dfsek.terra.transform;
import com.dfsek.terra.api.transform.Transform;
import com.dfsek.terra.api.transform.Transformer;
import com.dfsek.terra.api.transform.Validator;
import com.dfsek.terra.api.transform.exception.AttemptsFailedException; import com.dfsek.terra.api.transform.exception.AttemptsFailedException;
import com.dfsek.terra.api.transform.exception.TransformException; import com.dfsek.terra.api.transform.exception.TransformException;
common/implementation/src/main/java/com/dfsek/terra/api/util/FastRandom.java → common/implementation/src/main/java/com/dfsek/terra/util/FastRandom.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.dfsek.terra.api.util; package com.dfsek.terra.util;
import org.apache.commons.rng.core.source64.XoRoShiRo128PlusPlus; import org.apache.commons.rng.core.source64.XoRoShiRo128PlusPlus;
common/implementation/src/main/java/com/dfsek/terra/api/util/GlueList.java → common/implementation/src/main/java/com/dfsek/terra/util/GlueList.java
+7 -6
View File
@@ -13,8 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.dfsek.terra.api.util; package com.dfsek.terra.util;
import net.jafama.FastMath;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.io.IOException; import java.io.IOException;
@@ -709,11 +710,11 @@ public class GlueList<T> extends AbstractList<T> implements List<T>, Cloneable,
public Object clone() { public Object clone() {
try { try {
com.dfsek.terra.api.util.GlueList<T> clone = (com.dfsek.terra.api.util.GlueList<T>) super.clone(); GlueList<T> clone = (GlueList<T>) super.clone();
clone.first = clone.last = null; clone.first = clone.last = null;
int capacity = min(MAX_ARRAY_SIZE, max(clone.size, max(clone.initialCapacity, DEFAULT_CAPACITY))); int capacity = FastMath.min(MAX_ARRAY_SIZE, FastMath.max(clone.size, FastMath.max(clone.initialCapacity, DEFAULT_CAPACITY)));
Node<T> initNode = new Node<>(null, null, 0, capacity); Node<T> initNode = new Node<>(null, null, 0, capacity);
@@ -902,7 +903,7 @@ public class GlueList<T> extends AbstractList<T> implements List<T>, Cloneable,
checkForComodification(); checkForComodification();
try { try {
com.dfsek.terra.api.util.GlueList.this.set(lastReturn, t); GlueList.this.set(lastReturn, t);
} catch(IndexOutOfBoundsException e) { } catch(IndexOutOfBoundsException e) {
throw new ConcurrentModificationException(); throw new ConcurrentModificationException();
} }
@@ -916,7 +917,7 @@ public class GlueList<T> extends AbstractList<T> implements List<T>, Cloneable,
try { try {
int temp = j; int temp = j;
com.dfsek.terra.api.util.GlueList.this.add(temp, t); GlueList.this.add(temp, t);
j = temp + 1; j = temp + 1;
@@ -1025,7 +1026,7 @@ public class GlueList<T> extends AbstractList<T> implements List<T>, Cloneable,
checkForComodification(); checkForComodification();
try { try {
com.dfsek.terra.api.util.GlueList.this.remove(lastReturn); GlueList.this.remove(lastReturn);
j = lastReturn; j = lastReturn;
common/implementation/src/main/java/com/dfsek/terra/api/util/logging/DebugLogger.java → common/implementation/src/main/java/com/dfsek/terra/util/logging/DebugLogger.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.dfsek.terra.api.util.logging; package com.dfsek.terra.util.logging;
import com.dfsek.terra.api.Logger; import com.dfsek.terra.api.Logger;
common/implementation/src/main/java/com/dfsek/terra/api/util/logging/JavaLogger.java → common/implementation/src/main/java/com/dfsek/terra/util/logging/JavaLogger.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.dfsek.terra.api.util.logging; package com.dfsek.terra.util.logging;
import com.dfsek.terra.api.Logger; import com.dfsek.terra.api.Logger;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
+3 -3
View File
@@ -14,15 +14,15 @@ import com.dfsek.terra.api.command.exception.MalformedCommandException;
import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.config.PluginConfig; import com.dfsek.terra.api.config.PluginConfig;
import com.dfsek.terra.api.event.EventManager; import com.dfsek.terra.api.event.EventManager;
import com.dfsek.terra.api.event.EventManagerImpl; import com.dfsek.terra.event.EventManagerImpl;
import com.dfsek.terra.api.handle.ItemHandle; import com.dfsek.terra.api.handle.ItemHandle;
import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.handle.WorldHandle;
import com.dfsek.terra.api.lang.Language; import com.dfsek.terra.api.lang.Language;
import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.api.profiler.Profiler;
import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.registry.CheckedRegistry;
import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.util.logging.DebugLogger; import com.dfsek.terra.util.logging.DebugLogger;
import com.dfsek.terra.api.util.logging.JavaLogger; import com.dfsek.terra.util.logging.JavaLogger;
import com.dfsek.terra.api.world.TerraWorld; import com.dfsek.terra.api.world.TerraWorld;
import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.Biome;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java
+3 -3
View File
@@ -2,9 +2,9 @@ package com.dfsek.terra.bukkit.listeners;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.config.WorldConfig; import com.dfsek.terra.api.config.WorldConfig;
import com.dfsek.terra.api.transform.MapTransform; import com.dfsek.terra.transform.MapTransform;
import com.dfsek.terra.api.transform.TransformerImpl; import com.dfsek.terra.transform.TransformerImpl;
import com.dfsek.terra.api.util.FastRandom; import com.dfsek.terra.util.FastRandom;
import com.dfsek.terra.api.world.TerraWorld; import com.dfsek.terra.api.world.TerraWorld;
import com.dfsek.terra.api.world.Tree; import com.dfsek.terra.api.world.Tree;
import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.World;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java
+1 -1
View File
@@ -2,7 +2,7 @@ package com.dfsek.terra.bukkit.population;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.profiler.ProfileFrame;
import com.dfsek.terra.api.util.FastRandom; import com.dfsek.terra.util.FastRandom;
import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.Chunk;
import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.generator.Chunkified; import com.dfsek.terra.api.world.generator.Chunkified;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java
+2 -2
View File
@@ -10,8 +10,8 @@ import com.dfsek.terra.api.block.state.properties.enums.RedstoneConnection;
import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.CommandSender;
import com.dfsek.terra.api.inventory.ItemStack; import com.dfsek.terra.api.inventory.ItemStack;
import com.dfsek.terra.api.inventory.item.Enchantment; import com.dfsek.terra.api.inventory.item.Enchantment;
import com.dfsek.terra.api.transform.MapTransform; import com.dfsek.terra.transform.MapTransform;
import com.dfsek.terra.api.transform.TransformerImpl; import com.dfsek.terra.transform.TransformerImpl;
import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.vector.Vector3;
import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.Chunk;
import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.World;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
+2 -2
View File
@@ -19,7 +19,7 @@ import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.config.PluginConfig; import com.dfsek.terra.api.config.PluginConfig;
import com.dfsek.terra.api.event.EventListener; import com.dfsek.terra.api.event.EventListener;
import com.dfsek.terra.api.event.EventManager; import com.dfsek.terra.api.event.EventManager;
import com.dfsek.terra.api.event.EventManagerImpl; import com.dfsek.terra.event.EventManagerImpl;
import com.dfsek.terra.api.event.annotations.Global; import com.dfsek.terra.api.event.annotations.Global;
import com.dfsek.terra.api.event.annotations.Priority; import com.dfsek.terra.api.event.annotations.Priority;
import com.dfsek.terra.api.event.events.config.ConfigPackPostLoadEvent; import com.dfsek.terra.api.event.events.config.ConfigPackPostLoadEvent;
@@ -31,7 +31,7 @@ import com.dfsek.terra.api.profiler.Profiler;
import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.registry.CheckedRegistry;
import com.dfsek.terra.api.registry.exception.DuplicateEntryException; import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
import com.dfsek.terra.api.util.generic.pair.Pair; import com.dfsek.terra.api.util.generic.pair.Pair;
import com.dfsek.terra.api.util.logging.DebugLogger; import com.dfsek.terra.util.logging.DebugLogger;
import com.dfsek.terra.api.util.seeded.BiomeBuilder; import com.dfsek.terra.api.util.seeded.BiomeBuilder;
import com.dfsek.terra.api.world.TerraWorld; import com.dfsek.terra.api.world.TerraWorld;
import com.dfsek.terra.api.world.Tree; import com.dfsek.terra.api.world.Tree;
platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java
+1 -1
View File
@@ -1,7 +1,7 @@
package com.dfsek.terra.fabric.generation; package com.dfsek.terra.fabric.generation;
import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.util.FastRandom; import com.dfsek.terra.util.FastRandom;
import com.dfsek.terra.api.world.TerraWorld; import com.dfsek.terra.api.world.TerraWorld;
import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.generator.ChunkData; import com.dfsek.terra.api.world.generator.ChunkData;
platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java
+3 -3
View File
@@ -7,15 +7,15 @@ import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.config.PluginConfig; import com.dfsek.terra.api.config.PluginConfig;
import com.dfsek.terra.api.event.EventManager; import com.dfsek.terra.api.event.EventManager;
import com.dfsek.terra.api.event.EventManagerImpl; import com.dfsek.terra.event.EventManagerImpl;
import com.dfsek.terra.api.handle.ItemHandle; import com.dfsek.terra.api.handle.ItemHandle;
import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.handle.WorldHandle;
import com.dfsek.terra.api.lang.Language; import com.dfsek.terra.api.lang.Language;
import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.api.profiler.Profiler;
import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.registry.CheckedRegistry;
import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.util.logging.DebugLogger; import com.dfsek.terra.util.logging.DebugLogger;
import com.dfsek.terra.api.util.logging.JavaLogger; import com.dfsek.terra.util.logging.JavaLogger;
import com.dfsek.terra.api.world.TerraWorld; import com.dfsek.terra.api.world.TerraWorld;
import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.Biome;
platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraSpongePlugin.java
+2 -2
View File
@@ -6,14 +6,14 @@ import com.dfsek.terra.api.addon.TerraAddon;
import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.config.PluginConfig; import com.dfsek.terra.api.config.PluginConfig;
import com.dfsek.terra.api.event.EventManager; import com.dfsek.terra.api.event.EventManager;
import com.dfsek.terra.api.event.EventManagerImpl; import com.dfsek.terra.event.EventManagerImpl;
import com.dfsek.terra.api.handle.ItemHandle; import com.dfsek.terra.api.handle.ItemHandle;
import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.handle.WorldHandle;
import com.dfsek.terra.api.lang.Language; import com.dfsek.terra.api.lang.Language;
import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.api.profiler.Profiler;
import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.registry.CheckedRegistry;
import com.dfsek.terra.api.registry.LockedRegistry; import com.dfsek.terra.api.registry.LockedRegistry;
import com.dfsek.terra.api.util.logging.DebugLogger; import com.dfsek.terra.util.logging.DebugLogger;
import com.dfsek.terra.api.world.TerraWorld; import com.dfsek.terra.api.world.TerraWorld;
import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.World;
import com.dfsek.terra.config.PluginConfigImpl; import com.dfsek.terra.config.PluginConfigImpl;