diff --git a/api/src/main/java/com/seibel/lod/api/interfaces/IDhApiUnsafeWrapper.java b/api/src/main/java/com/seibel/lod/api/interfaces/IDhApiUnsafeWrapper.java index b5c3e18c4..0dcd5ec21 100644 --- a/api/src/main/java/com/seibel/lod/api/interfaces/IDhApiUnsafeWrapper.java +++ b/api/src/main/java/com/seibel/lod/api/interfaces/IDhApiUnsafeWrapper.java @@ -1,12 +1,8 @@ package com.seibel.lod.api.interfaces; /** - * The Distant Horizons' API objects can't cover - * every potential use case. Sometimes developers just need - * the base Minecraft Objects. - * * @author James Seibel - * @version 2022-9-16 + * @version 2023-6-17 */ public interface IDhApiUnsafeWrapper { @@ -21,6 +17,6 @@ public interface IDhApiUnsafeWrapper * in order to determine what object this method returns for * the specific version of Minecraft you are developing for. */ - Object getWrappedMcObject_UNSAFE(); + Object getWrappedMcObject(); } diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IDimensionTypeWrapper.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IDimensionTypeWrapper.java index b46e8be08..8570c4266 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IDimensionTypeWrapper.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/IDimensionTypeWrapper.java @@ -24,7 +24,7 @@ import com.seibel.lod.coreapi.interfaces.dependencyInjection.IBindable; /** * @author James Seibel - * @version 2022-9-16 + * @version 2023-6-17 */ public interface IDimensionTypeWrapper extends IDhApiDimensionTypeWrapper, IBindable { @@ -35,6 +35,4 @@ public interface IDimensionTypeWrapper extends IDhApiDimensionTypeWrapper, IBind boolean hasSkyLight(); - Object getWrappedMcObject_UNSAFE(); - } diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/ILevelWrapper.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/ILevelWrapper.java index 47fa07eb3..1d66b6d81 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/ILevelWrapper.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/world/ILevelWrapper.java @@ -31,7 +31,7 @@ import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; * Can be either a Server world or a Client world. * * @author James Seibel - * @version 2022-9-16 + * @version 2023-6-17 */ public interface ILevelWrapper extends IDhApiLevelWrapper, IBindable { @@ -65,9 +65,6 @@ public interface ILevelWrapper extends IDhApiLevelWrapper, IBindable @Deprecated IBiomeWrapper getBiome(DhBlockPos pos); - @Override - Object getWrappedMcObject_UNSAFE(); - // TODO implement onUnload // necessary so ChunkToLodBuilder can have its cache cleared after the level closes diff --git a/core/src/test/java/testItems/worldGeneratorInjection/objects/LevelWrapperTest.java b/core/src/test/java/testItems/worldGeneratorInjection/objects/LevelWrapperTest.java index 4418235cd..613f926f9 100644 --- a/core/src/test/java/testItems/worldGeneratorInjection/objects/LevelWrapperTest.java +++ b/core/src/test/java/testItems/worldGeneratorInjection/objects/LevelWrapperTest.java @@ -13,7 +13,7 @@ import com.seibel.lod.api.interfaces.world.IDhApiLevelWrapper; public class LevelWrapperTest implements IDhApiLevelWrapper { @Override - public Object getWrappedMcObject_UNSAFE() { return null; } + public Object getWrappedMcObject() { return null; } @Override public IDhApiDimensionTypeWrapper getDimensionType() { return null; }