diff --git a/src/main/java/com/jozufozu/flywheel/backend/api/FlywheelRendered.java b/src/main/java/com/jozufozu/flywheel/api/FlywheelRendered.java similarity index 89% rename from src/main/java/com/jozufozu/flywheel/backend/api/FlywheelRendered.java rename to src/main/java/com/jozufozu/flywheel/api/FlywheelRendered.java index 82e4f47b3..59d656edf 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/api/FlywheelRendered.java +++ b/src/main/java/com/jozufozu/flywheel/api/FlywheelRendered.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.api; +package com.jozufozu.flywheel.api; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/jozufozu/flywheel/backend/api/FlywheelWorld.java b/src/main/java/com/jozufozu/flywheel/api/FlywheelWorld.java similarity index 88% rename from src/main/java/com/jozufozu/flywheel/backend/api/FlywheelWorld.java rename to src/main/java/com/jozufozu/flywheel/api/FlywheelWorld.java index 0254dddef..5cfa5320b 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/api/FlywheelWorld.java +++ b/src/main/java/com/jozufozu/flywheel/api/FlywheelWorld.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.api; +package com.jozufozu.flywheel.api; /** * A marker interface custom worlds can override to indicate diff --git a/src/main/java/com/jozufozu/flywheel/backend/api/InstanceData.java b/src/main/java/com/jozufozu/flywheel/api/InstanceData.java similarity index 93% rename from src/main/java/com/jozufozu/flywheel/backend/api/InstanceData.java rename to src/main/java/com/jozufozu/flywheel/api/InstanceData.java index bc9b33a42..a3471e0f7 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/api/InstanceData.java +++ b/src/main/java/com/jozufozu/flywheel/api/InstanceData.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.api; +package com.jozufozu.flywheel.api; public abstract class InstanceData { diff --git a/src/main/java/com/jozufozu/flywheel/backend/api/Instancer.java b/src/main/java/com/jozufozu/flywheel/api/Instancer.java similarity index 97% rename from src/main/java/com/jozufozu/flywheel/backend/api/Instancer.java rename to src/main/java/com/jozufozu/flywheel/api/Instancer.java index 2da26426b..8ea0c3f70 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/api/Instancer.java +++ b/src/main/java/com/jozufozu/flywheel/api/Instancer.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.api; +package com.jozufozu.flywheel.api; /** * An instancer is how you interact with an instanced model. diff --git a/src/main/java/com/jozufozu/flywheel/backend/api/Material.java b/src/main/java/com/jozufozu/flywheel/api/Material.java similarity index 97% rename from src/main/java/com/jozufozu/flywheel/backend/api/Material.java rename to src/main/java/com/jozufozu/flywheel/api/Material.java index f6a1ed011..edcc489d4 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/api/Material.java +++ b/src/main/java/com/jozufozu/flywheel/api/Material.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.api; +package com.jozufozu.flywheel.api; import java.util.function.Supplier; diff --git a/src/main/java/com/jozufozu/flywheel/backend/api/MaterialGroup.java b/src/main/java/com/jozufozu/flywheel/api/MaterialGroup.java similarity index 89% rename from src/main/java/com/jozufozu/flywheel/backend/api/MaterialGroup.java rename to src/main/java/com/jozufozu/flywheel/api/MaterialGroup.java index 9ffb32d52..9f9c5ee98 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/api/MaterialGroup.java +++ b/src/main/java/com/jozufozu/flywheel/api/MaterialGroup.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.api; +package com.jozufozu.flywheel.api; public interface MaterialGroup { /** diff --git a/src/main/java/com/jozufozu/flywheel/backend/api/MaterialManager.java b/src/main/java/com/jozufozu/flywheel/api/MaterialManager.java similarity index 96% rename from src/main/java/com/jozufozu/flywheel/backend/api/MaterialManager.java rename to src/main/java/com/jozufozu/flywheel/api/MaterialManager.java index c825b8c80..84d706504 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/api/MaterialManager.java +++ b/src/main/java/com/jozufozu/flywheel/api/MaterialManager.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.api; +package com.jozufozu.flywheel.api; import com.jozufozu.flywheel.backend.RenderLayer; diff --git a/src/main/java/com/jozufozu/flywheel/backend/api/MaterialSpec.java b/src/main/java/com/jozufozu/flywheel/api/MaterialSpec.java similarity index 93% rename from src/main/java/com/jozufozu/flywheel/backend/api/MaterialSpec.java rename to src/main/java/com/jozufozu/flywheel/api/MaterialSpec.java index 1350e8878..eb39d03a2 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/api/MaterialSpec.java +++ b/src/main/java/com/jozufozu/flywheel/api/MaterialSpec.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.api; +package com.jozufozu.flywheel.api; import com.jozufozu.flywheel.backend.struct.StructType; diff --git a/src/main/java/com/jozufozu/flywheel/backend/api/instance/IDynamicInstance.java b/src/main/java/com/jozufozu/flywheel/api/instance/IDynamicInstance.java similarity index 89% rename from src/main/java/com/jozufozu/flywheel/backend/api/instance/IDynamicInstance.java rename to src/main/java/com/jozufozu/flywheel/api/instance/IDynamicInstance.java index c69d01994..fdc684913 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/api/instance/IDynamicInstance.java +++ b/src/main/java/com/jozufozu/flywheel/api/instance/IDynamicInstance.java @@ -1,7 +1,7 @@ -package com.jozufozu.flywheel.backend.api.instance; +package com.jozufozu.flywheel.api.instance; -import com.jozufozu.flywheel.backend.api.Instancer; -import com.jozufozu.flywheel.backend.api.InstanceData; +import com.jozufozu.flywheel.api.Instancer; +import com.jozufozu.flywheel.api.InstanceData; import com.jozufozu.flywheel.backend.instancing.tile.TileEntityInstance; /** diff --git a/src/main/java/com/jozufozu/flywheel/backend/api/instance/IInstance.java b/src/main/java/com/jozufozu/flywheel/api/instance/IInstance.java similarity index 66% rename from src/main/java/com/jozufozu/flywheel/backend/api/instance/IInstance.java rename to src/main/java/com/jozufozu/flywheel/api/instance/IInstance.java index 7b088eab2..843cfb147 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/api/instance/IInstance.java +++ b/src/main/java/com/jozufozu/flywheel/api/instance/IInstance.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.api.instance; +package com.jozufozu.flywheel.api.instance; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/jozufozu/flywheel/backend/api/instance/ITickableInstance.java b/src/main/java/com/jozufozu/flywheel/api/instance/ITickableInstance.java similarity index 90% rename from src/main/java/com/jozufozu/flywheel/backend/api/instance/ITickableInstance.java rename to src/main/java/com/jozufozu/flywheel/api/instance/ITickableInstance.java index 8e72e02ce..c0d32cb29 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/api/instance/ITickableInstance.java +++ b/src/main/java/com/jozufozu/flywheel/api/instance/ITickableInstance.java @@ -1,7 +1,7 @@ -package com.jozufozu.flywheel.backend.api.instance; +package com.jozufozu.flywheel.api.instance; -import com.jozufozu.flywheel.backend.api.Instancer; -import com.jozufozu.flywheel.backend.api.InstanceData; +import com.jozufozu.flywheel.api.InstanceData; +import com.jozufozu.flywheel.api.Instancer; import com.jozufozu.flywheel.backend.instancing.tile.TileEntityInstance; /** diff --git a/src/main/java/com/jozufozu/flywheel/backend/api/instance/package-info.java b/src/main/java/com/jozufozu/flywheel/api/instance/package-info.java similarity index 76% rename from src/main/java/com/jozufozu/flywheel/backend/api/instance/package-info.java rename to src/main/java/com/jozufozu/flywheel/api/instance/package-info.java index 2374b554d..aab0f0d30 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/api/instance/package-info.java +++ b/src/main/java/com/jozufozu/flywheel/api/instance/package-info.java @@ -1,5 +1,5 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.jozufozu.flywheel.backend.api.instance; +package com.jozufozu.flywheel.api.instance; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/jozufozu/flywheel/backend/api/package-info.java b/src/main/java/com/jozufozu/flywheel/api/package-info.java similarity index 79% rename from src/main/java/com/jozufozu/flywheel/backend/api/package-info.java rename to src/main/java/com/jozufozu/flywheel/api/package-info.java index 693e0fd2b..5dce95a6c 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/api/package-info.java +++ b/src/main/java/com/jozufozu/flywheel/api/package-info.java @@ -1,5 +1,5 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.jozufozu.flywheel.backend.api; +package com.jozufozu.flywheel.api; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/jozufozu/flywheel/backend/Backend.java b/src/main/java/com/jozufozu/flywheel/backend/Backend.java index aa8b8ad65..2d8edb5b7 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/Backend.java +++ b/src/main/java/com/jozufozu/flywheel/backend/Backend.java @@ -13,10 +13,10 @@ import org.apache.logging.log4j.Logger; import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GLCapabilities; -import com.jozufozu.flywheel.backend.api.FlywheelWorld; +import com.jozufozu.flywheel.api.FlywheelWorld; import com.jozufozu.flywheel.backend.gl.versioned.GlCompat; -import com.jozufozu.flywheel.backend.api.InstanceData; -import com.jozufozu.flywheel.backend.api.MaterialSpec; +import com.jozufozu.flywheel.api.InstanceData; +import com.jozufozu.flywheel.api.MaterialSpec; import com.jozufozu.flywheel.config.FlwConfig; import com.jozufozu.flywheel.core.shader.spec.ProgramSpec; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/AbstractInstance.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/AbstractInstance.java index b17e238bd..1feadfa37 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/AbstractInstance.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/AbstractInstance.java @@ -3,11 +3,11 @@ package com.jozufozu.flywheel.backend.instancing; import java.util.Arrays; import java.util.stream.Stream; -import com.jozufozu.flywheel.backend.api.instance.IDynamicInstance; -import com.jozufozu.flywheel.backend.api.instance.IInstance; -import com.jozufozu.flywheel.backend.api.instance.ITickableInstance; +import com.jozufozu.flywheel.api.instance.IDynamicInstance; +import com.jozufozu.flywheel.api.instance.IInstance; +import com.jozufozu.flywheel.api.instance.ITickableInstance; import com.jozufozu.flywheel.backend.instancing.tile.TileInstanceManager; -import com.jozufozu.flywheel.backend.api.MaterialManager; +import com.jozufozu.flywheel.api.MaterialManager; import com.jozufozu.flywheel.core.materials.FlatLit; import com.jozufozu.flywheel.light.LightListener; import com.jozufozu.flywheel.light.ImmutableBox; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/AbstractInstancer.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/AbstractInstancer.java index 9fb667df6..aa3574c11 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/AbstractInstancer.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/AbstractInstancer.java @@ -3,8 +3,8 @@ package com.jozufozu.flywheel.backend.instancing; import java.util.ArrayList; import java.util.BitSet; -import com.jozufozu.flywheel.backend.api.InstanceData; -import com.jozufozu.flywheel.backend.api.Instancer; +import com.jozufozu.flywheel.api.InstanceData; +import com.jozufozu.flywheel.api.Instancer; import com.jozufozu.flywheel.backend.struct.StructType; import com.jozufozu.flywheel.core.model.Model; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/Engine.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/Engine.java index 430c7e841..1e33c16db 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/Engine.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/Engine.java @@ -1,6 +1,6 @@ package com.jozufozu.flywheel.backend.instancing; -import com.jozufozu.flywheel.backend.api.MaterialManager; +import com.jozufozu.flywheel.api.MaterialManager; public interface Engine extends RenderDispatcher, MaterialManager { } diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/InstanceManager.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/InstanceManager.java index 6e527f91a..ba55db9f5 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/InstanceManager.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/InstanceManager.java @@ -9,9 +9,9 @@ import java.util.Set; import javax.annotation.Nullable; import com.jozufozu.flywheel.backend.Backend; -import com.jozufozu.flywheel.backend.api.instance.IDynamicInstance; -import com.jozufozu.flywheel.backend.api.instance.ITickableInstance; -import com.jozufozu.flywheel.backend.api.MaterialManager; +import com.jozufozu.flywheel.api.instance.IDynamicInstance; +import com.jozufozu.flywheel.api.instance.ITickableInstance; +import com.jozufozu.flywheel.api.MaterialManager; import com.jozufozu.flywheel.backend.instancing.instancing.InstancingEngine; import com.jozufozu.flywheel.light.LightUpdater; import com.mojang.math.Vector3f; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/InstanceWorld.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/InstanceWorld.java index 404ac47c8..47bf41aa4 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/InstanceWorld.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/InstanceWorld.java @@ -1,7 +1,7 @@ package com.jozufozu.flywheel.backend.instancing; -import com.jozufozu.flywheel.backend.api.instance.IDynamicInstance; -import com.jozufozu.flywheel.backend.api.instance.ITickableInstance; +import com.jozufozu.flywheel.api.instance.IDynamicInstance; +import com.jozufozu.flywheel.api.instance.ITickableInstance; import com.jozufozu.flywheel.backend.instancing.entity.EntityInstanceManager; import com.jozufozu.flywheel.backend.instancing.tile.TileInstanceManager; import com.jozufozu.flywheel.backend.instancing.batching.BatchingEngine; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedRenderRegistry.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedRenderRegistry.java index 3beaac245..524b03e78 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedRenderRegistry.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedRenderRegistry.java @@ -5,12 +5,12 @@ import java.util.Map; import javax.annotation.Nullable; import com.google.common.collect.Maps; -import com.jozufozu.flywheel.backend.api.FlywheelRendered; +import com.jozufozu.flywheel.api.FlywheelRendered; import com.jozufozu.flywheel.backend.instancing.entity.EntityInstance; import com.jozufozu.flywheel.backend.instancing.entity.IEntityInstanceFactory; import com.jozufozu.flywheel.backend.instancing.tile.ITileInstanceFactory; import com.jozufozu.flywheel.backend.instancing.tile.TileEntityInstance; -import com.jozufozu.flywheel.backend.api.MaterialManager; +import com.jozufozu.flywheel.api.MaterialManager; import it.unimi.dsi.fastutil.objects.Object2BooleanLinkedOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2BooleanMap; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterial.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterial.java index 5956ea04f..d7b24c696 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterial.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterial.java @@ -4,10 +4,10 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Supplier; -import com.jozufozu.flywheel.backend.api.InstanceData; -import com.jozufozu.flywheel.backend.api.Instancer; -import com.jozufozu.flywheel.backend.api.Material; -import com.jozufozu.flywheel.backend.api.MaterialSpec; +import com.jozufozu.flywheel.api.InstanceData; +import com.jozufozu.flywheel.api.Instancer; +import com.jozufozu.flywheel.api.Material; +import com.jozufozu.flywheel.api.MaterialSpec; import com.jozufozu.flywheel.backend.struct.StructType; import com.jozufozu.flywheel.core.model.Model; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterialGroup.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterialGroup.java index 0226aee2b..64aaa2a2c 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterialGroup.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterialGroup.java @@ -3,9 +3,9 @@ package com.jozufozu.flywheel.backend.instancing.batching; import java.util.HashMap; import java.util.Map; -import com.jozufozu.flywheel.backend.api.InstanceData; -import com.jozufozu.flywheel.backend.api.MaterialGroup; -import com.jozufozu.flywheel.backend.api.MaterialSpec; +import com.jozufozu.flywheel.api.InstanceData; +import com.jozufozu.flywheel.api.MaterialGroup; +import com.jozufozu.flywheel.api.MaterialSpec; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchingEngine.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchingEngine.java index f5dc0bd12..427115dde 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchingEngine.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchingEngine.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Map; import com.jozufozu.flywheel.backend.instancing.Engine; -import com.jozufozu.flywheel.backend.api.MaterialGroup; +import com.jozufozu.flywheel.api.MaterialGroup; import com.jozufozu.flywheel.backend.RenderLayer; import com.jozufozu.flywheel.event.RenderLayerEvent; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/CPUInstancer.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/CPUInstancer.java index 6bec6f210..0e27115bf 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/CPUInstancer.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/batching/CPUInstancer.java @@ -1,7 +1,7 @@ package com.jozufozu.flywheel.backend.instancing.batching; import com.jozufozu.flywheel.backend.instancing.AbstractInstancer; -import com.jozufozu.flywheel.backend.api.InstanceData; +import com.jozufozu.flywheel.api.InstanceData; import com.jozufozu.flywheel.backend.struct.BatchingTransformer; import com.jozufozu.flywheel.backend.struct.StructType; import com.jozufozu.flywheel.core.model.Model; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/entity/EntityInstance.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/entity/EntityInstance.java index ba4dd05cb..f8e84e2fc 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/entity/EntityInstance.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/entity/EntityInstance.java @@ -1,10 +1,10 @@ package com.jozufozu.flywheel.backend.instancing.entity; import com.jozufozu.flywheel.backend.instancing.AbstractInstance; -import com.jozufozu.flywheel.backend.api.instance.IDynamicInstance; -import com.jozufozu.flywheel.backend.api.instance.ITickableInstance; +import com.jozufozu.flywheel.api.instance.IDynamicInstance; +import com.jozufozu.flywheel.api.instance.ITickableInstance; import com.jozufozu.flywheel.backend.instancing.tile.TileInstanceManager; -import com.jozufozu.flywheel.backend.api.MaterialManager; +import com.jozufozu.flywheel.api.MaterialManager; import com.jozufozu.flywheel.light.GridAlignedBB; import com.jozufozu.flywheel.light.LightListener; import com.jozufozu.flywheel.light.MovingListener; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/entity/EntityInstanceManager.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/entity/EntityInstanceManager.java index a9b2d87a8..95bef0093 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/entity/EntityInstanceManager.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/entity/EntityInstanceManager.java @@ -4,7 +4,7 @@ import com.jozufozu.flywheel.backend.Backend; import com.jozufozu.flywheel.backend.instancing.AbstractInstance; import com.jozufozu.flywheel.backend.instancing.InstanceManager; import com.jozufozu.flywheel.backend.instancing.InstancedRenderRegistry; -import com.jozufozu.flywheel.backend.api.MaterialManager; +import com.jozufozu.flywheel.api.MaterialManager; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/entity/IEntityInstanceFactory.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/entity/IEntityInstanceFactory.java index 07db1b55e..04927760a 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/entity/IEntityInstanceFactory.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/entity/IEntityInstanceFactory.java @@ -1,6 +1,6 @@ package com.jozufozu.flywheel.backend.instancing.entity; -import com.jozufozu.flywheel.backend.api.MaterialManager; +import com.jozufozu.flywheel.api.MaterialManager; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/GPUInstancer.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/GPUInstancer.java index f4ec37828..e0e532401 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/GPUInstancer.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/GPUInstancer.java @@ -10,7 +10,7 @@ import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType; import com.jozufozu.flywheel.backend.gl.buffer.MappedBuffer; import com.jozufozu.flywheel.backend.gl.error.GlError; import com.jozufozu.flywheel.backend.instancing.AbstractInstancer; -import com.jozufozu.flywheel.backend.api.InstanceData; +import com.jozufozu.flywheel.api.InstanceData; import com.jozufozu.flywheel.backend.model.IBufferedModel; import com.jozufozu.flywheel.backend.model.ModelAllocator; import com.jozufozu.flywheel.backend.struct.StructType; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterial.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterial.java index 335a1bbeb..855c993b7 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterial.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterial.java @@ -6,10 +6,10 @@ import java.util.function.Supplier; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.jozufozu.flywheel.backend.RenderWork; -import com.jozufozu.flywheel.backend.api.InstanceData; -import com.jozufozu.flywheel.backend.api.Instancer; -import com.jozufozu.flywheel.backend.api.Material; -import com.jozufozu.flywheel.backend.api.MaterialSpec; +import com.jozufozu.flywheel.api.InstanceData; +import com.jozufozu.flywheel.api.Instancer; +import com.jozufozu.flywheel.api.Material; +import com.jozufozu.flywheel.api.MaterialSpec; import com.jozufozu.flywheel.backend.model.ModelPool; import com.jozufozu.flywheel.backend.struct.StructType; import com.jozufozu.flywheel.core.Formats; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterialGroup.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterialGroup.java index 31d604fdb..178dfc4c4 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterialGroup.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterialGroup.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import com.jozufozu.flywheel.backend.api.InstanceData; -import com.jozufozu.flywheel.backend.api.MaterialGroup; -import com.jozufozu.flywheel.backend.api.MaterialSpec; +import com.jozufozu.flywheel.api.InstanceData; +import com.jozufozu.flywheel.api.MaterialGroup; +import com.jozufozu.flywheel.api.MaterialSpec; import com.jozufozu.flywheel.core.shader.WorldProgram; import com.jozufozu.flywheel.util.TextureBinder; import com.mojang.math.Matrix4f; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java index 142531319..e257a381f 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java @@ -11,7 +11,7 @@ import javax.annotation.Nullable; import com.jozufozu.flywheel.backend.gl.GlVertexArray; import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType; import com.jozufozu.flywheel.backend.instancing.Engine; -import com.jozufozu.flywheel.backend.api.MaterialGroup; +import com.jozufozu.flywheel.api.MaterialGroup; import com.jozufozu.flywheel.backend.RenderLayer; import com.jozufozu.flywheel.core.WorldContext; import com.jozufozu.flywheel.core.shader.WorldProgram; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/tile/ITileInstanceFactory.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/tile/ITileInstanceFactory.java index 672198098..c1bdaa74b 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/tile/ITileInstanceFactory.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/tile/ITileInstanceFactory.java @@ -1,6 +1,6 @@ package com.jozufozu.flywheel.backend.instancing.tile; -import com.jozufozu.flywheel.backend.api.MaterialManager; +import com.jozufozu.flywheel.api.MaterialManager; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/tile/TileEntityInstance.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/tile/TileEntityInstance.java index 29f8ec1d5..506b220a4 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/tile/TileEntityInstance.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/tile/TileEntityInstance.java @@ -1,10 +1,10 @@ package com.jozufozu.flywheel.backend.instancing.tile; import com.jozufozu.flywheel.backend.instancing.AbstractInstance; -import com.jozufozu.flywheel.backend.api.instance.IDynamicInstance; -import com.jozufozu.flywheel.backend.api.instance.ITickableInstance; -import com.jozufozu.flywheel.backend.api.Material; -import com.jozufozu.flywheel.backend.api.MaterialManager; +import com.jozufozu.flywheel.api.instance.IDynamicInstance; +import com.jozufozu.flywheel.api.instance.ITickableInstance; +import com.jozufozu.flywheel.api.Material; +import com.jozufozu.flywheel.api.MaterialManager; import com.jozufozu.flywheel.core.Materials; import com.jozufozu.flywheel.core.materials.model.ModelData; import com.jozufozu.flywheel.core.materials.oriented.OrientedData; diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/tile/TileInstanceManager.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/tile/TileInstanceManager.java index edfcd5d71..57eb8c8e9 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/tile/TileInstanceManager.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/tile/TileInstanceManager.java @@ -4,7 +4,7 @@ import com.jozufozu.flywheel.backend.Backend; import com.jozufozu.flywheel.backend.instancing.AbstractInstance; import com.jozufozu.flywheel.backend.instancing.InstanceManager; import com.jozufozu.flywheel.backend.instancing.InstancedRenderRegistry; -import com.jozufozu.flywheel.backend.api.MaterialManager; +import com.jozufozu.flywheel.api.MaterialManager; import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockGetter; diff --git a/src/main/java/com/jozufozu/flywheel/core/Materials.java b/src/main/java/com/jozufozu/flywheel/core/Materials.java index b5efeee81..619c52b86 100644 --- a/src/main/java/com/jozufozu/flywheel/core/Materials.java +++ b/src/main/java/com/jozufozu/flywheel/core/Materials.java @@ -1,6 +1,6 @@ package com.jozufozu.flywheel.core; -import com.jozufozu.flywheel.backend.api.MaterialSpec; +import com.jozufozu.flywheel.api.MaterialSpec; import com.jozufozu.flywheel.backend.struct.StructType; import com.jozufozu.flywheel.core.materials.model.ModelData; import com.jozufozu.flywheel.core.materials.model.ModelType; diff --git a/src/main/java/com/jozufozu/flywheel/core/WorldContext.java b/src/main/java/com/jozufozu/flywheel/core/WorldContext.java index 170b9e10c..a9a2ae14e 100644 --- a/src/main/java/com/jozufozu/flywheel/core/WorldContext.java +++ b/src/main/java/com/jozufozu/flywheel/core/WorldContext.java @@ -7,7 +7,7 @@ import java.util.stream.Stream; import com.jozufozu.flywheel.backend.Backend; import com.jozufozu.flywheel.backend.ShaderContext; -import com.jozufozu.flywheel.backend.api.MaterialSpec; +import com.jozufozu.flywheel.api.MaterialSpec; import com.jozufozu.flywheel.backend.pipeline.ShaderPipeline; import com.jozufozu.flywheel.core.shader.ContextAwareProgram; import com.jozufozu.flywheel.core.shader.WorldProgram; diff --git a/src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingInstanceManager.java b/src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingInstanceManager.java index 57fde613b..63ee63425 100644 --- a/src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingInstanceManager.java +++ b/src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingInstanceManager.java @@ -1,7 +1,7 @@ package com.jozufozu.flywheel.core.crumbling; import com.jozufozu.flywheel.backend.instancing.tile.TileInstanceManager; -import com.jozufozu.flywheel.backend.api.MaterialManager; +import com.jozufozu.flywheel.api.MaterialManager; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/jozufozu/flywheel/core/instancing/ConditionalInstance.java b/src/main/java/com/jozufozu/flywheel/core/instancing/ConditionalInstance.java index 0aa08d052..1059f07ca 100644 --- a/src/main/java/com/jozufozu/flywheel/core/instancing/ConditionalInstance.java +++ b/src/main/java/com/jozufozu/flywheel/core/instancing/ConditionalInstance.java @@ -5,8 +5,8 @@ import java.util.function.Consumer; import javax.annotation.Nullable; -import com.jozufozu.flywheel.backend.api.InstanceData; -import com.jozufozu.flywheel.backend.api.Instancer; +import com.jozufozu.flywheel.api.InstanceData; +import com.jozufozu.flywheel.api.Instancer; public class ConditionalInstance { diff --git a/src/main/java/com/jozufozu/flywheel/core/instancing/GroupInstance.java b/src/main/java/com/jozufozu/flywheel/core/instancing/GroupInstance.java index 8bcc6e078..a6c0a86c1 100644 --- a/src/main/java/com/jozufozu/flywheel/core/instancing/GroupInstance.java +++ b/src/main/java/com/jozufozu/flywheel/core/instancing/GroupInstance.java @@ -5,8 +5,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import com.jozufozu.flywheel.backend.api.InstanceData; -import com.jozufozu.flywheel.backend.api.Instancer; +import com.jozufozu.flywheel.api.InstanceData; +import com.jozufozu.flywheel.api.Instancer; public class GroupInstance extends AbstractCollection { diff --git a/src/main/java/com/jozufozu/flywheel/core/instancing/SelectInstance.java b/src/main/java/com/jozufozu/flywheel/core/instancing/SelectInstance.java index cc848b73a..e516610df 100644 --- a/src/main/java/com/jozufozu/flywheel/core/instancing/SelectInstance.java +++ b/src/main/java/com/jozufozu/flywheel/core/instancing/SelectInstance.java @@ -6,8 +6,8 @@ import java.util.Optional; import javax.annotation.Nullable; -import com.jozufozu.flywheel.backend.api.InstanceData; -import com.jozufozu.flywheel.backend.api.Instancer; +import com.jozufozu.flywheel.api.InstanceData; +import com.jozufozu.flywheel.api.Instancer; public class SelectInstance { diff --git a/src/main/java/com/jozufozu/flywheel/core/materials/BasicData.java b/src/main/java/com/jozufozu/flywheel/core/materials/BasicData.java index 77512d886..1b34a856e 100644 --- a/src/main/java/com/jozufozu/flywheel/core/materials/BasicData.java +++ b/src/main/java/com/jozufozu/flywheel/core/materials/BasicData.java @@ -1,6 +1,6 @@ package com.jozufozu.flywheel.core.materials; -import com.jozufozu.flywheel.backend.api.InstanceData; +import com.jozufozu.flywheel.api.InstanceData; public abstract class BasicData extends InstanceData implements FlatLit { diff --git a/src/main/java/com/jozufozu/flywheel/core/materials/FlatLit.java b/src/main/java/com/jozufozu/flywheel/core/materials/FlatLit.java index d9d4b2010..22031bb14 100644 --- a/src/main/java/com/jozufozu/flywheel/core/materials/FlatLit.java +++ b/src/main/java/com/jozufozu/flywheel/core/materials/FlatLit.java @@ -1,6 +1,6 @@ package com.jozufozu.flywheel.core.materials; -import com.jozufozu.flywheel.backend.api.InstanceData; +import com.jozufozu.flywheel.api.InstanceData; /** * An interface that implementors of {@link InstanceData} should also implement diff --git a/src/main/java/com/jozufozu/flywheel/vanilla/BellInstance.java b/src/main/java/com/jozufozu/flywheel/vanilla/BellInstance.java index c7750f528..1574a5fb4 100644 --- a/src/main/java/com/jozufozu/flywheel/vanilla/BellInstance.java +++ b/src/main/java/com/jozufozu/flywheel/vanilla/BellInstance.java @@ -1,8 +1,8 @@ package com.jozufozu.flywheel.vanilla; -import com.jozufozu.flywheel.backend.api.instance.IDynamicInstance; +import com.jozufozu.flywheel.api.instance.IDynamicInstance; import com.jozufozu.flywheel.backend.instancing.tile.TileEntityInstance; -import com.jozufozu.flywheel.backend.api.MaterialManager; +import com.jozufozu.flywheel.api.MaterialManager; import com.jozufozu.flywheel.core.Materials; import com.jozufozu.flywheel.core.materials.oriented.OrientedData; import com.jozufozu.flywheel.core.model.ModelPart; diff --git a/src/main/java/com/jozufozu/flywheel/vanilla/ChestInstance.java b/src/main/java/com/jozufozu/flywheel/vanilla/ChestInstance.java index 9487aa072..674f48255 100644 --- a/src/main/java/com/jozufozu/flywheel/vanilla/ChestInstance.java +++ b/src/main/java/com/jozufozu/flywheel/vanilla/ChestInstance.java @@ -4,9 +4,9 @@ import java.util.Calendar; import javax.annotation.Nonnull; -import com.jozufozu.flywheel.backend.api.instance.IDynamicInstance; +import com.jozufozu.flywheel.api.instance.IDynamicInstance; import com.jozufozu.flywheel.backend.instancing.tile.TileEntityInstance; -import com.jozufozu.flywheel.backend.api.MaterialManager; +import com.jozufozu.flywheel.api.MaterialManager; import com.jozufozu.flywheel.core.Materials; import com.jozufozu.flywheel.core.materials.model.ModelData; import com.jozufozu.flywheel.core.materials.oriented.OrientedData; diff --git a/src/main/java/com/jozufozu/flywheel/vanilla/MinecartInstance.java b/src/main/java/com/jozufozu/flywheel/vanilla/MinecartInstance.java index d758c588f..f14e7dfde 100644 --- a/src/main/java/com/jozufozu/flywheel/vanilla/MinecartInstance.java +++ b/src/main/java/com/jozufozu/flywheel/vanilla/MinecartInstance.java @@ -1,9 +1,9 @@ package com.jozufozu.flywheel.vanilla; -import com.jozufozu.flywheel.backend.api.instance.IDynamicInstance; -import com.jozufozu.flywheel.backend.api.instance.ITickableInstance; +import com.jozufozu.flywheel.api.instance.IDynamicInstance; +import com.jozufozu.flywheel.api.instance.ITickableInstance; import com.jozufozu.flywheel.backend.instancing.entity.EntityInstance; -import com.jozufozu.flywheel.backend.api.MaterialManager; +import com.jozufozu.flywheel.api.MaterialManager; import com.jozufozu.flywheel.core.Materials; import com.jozufozu.flywheel.core.materials.model.ModelData; import com.jozufozu.flywheel.core.model.Model; diff --git a/src/main/java/com/jozufozu/flywheel/vanilla/ShulkerBoxInstance.java b/src/main/java/com/jozufozu/flywheel/vanilla/ShulkerBoxInstance.java index 291a3c35a..f96710d8e 100644 --- a/src/main/java/com/jozufozu/flywheel/vanilla/ShulkerBoxInstance.java +++ b/src/main/java/com/jozufozu/flywheel/vanilla/ShulkerBoxInstance.java @@ -1,8 +1,8 @@ package com.jozufozu.flywheel.vanilla; -import com.jozufozu.flywheel.backend.api.instance.IDynamicInstance; +import com.jozufozu.flywheel.api.instance.IDynamicInstance; import com.jozufozu.flywheel.backend.instancing.tile.TileEntityInstance; -import com.jozufozu.flywheel.backend.api.MaterialManager; +import com.jozufozu.flywheel.api.MaterialManager; import com.jozufozu.flywheel.core.Materials; import com.jozufozu.flywheel.core.materials.model.ModelData; import com.jozufozu.flywheel.core.model.ModelPart;