From 82a098626bffeed88536562695924bcb79ffb5c8 Mon Sep 17 00:00:00 2001 From: Jozufozu Date: Wed, 24 Apr 2024 14:06:20 -0700 Subject: [PATCH] Centrifuge - Separate common project into 4 source sets - Declare outgoing configurations for forge/fabric to depend on - Re-compile source from each source set in each platform's compileJava --- buildSrc/platforms.gradle | 30 ++++++++-- common/build.gradle | 59 ++++++++++++++++++- .../flywheel/api/BackendImplemented.java | 0 .../flywheel/api/backend/Backend.java | 0 .../flywheel/api/backend/BackendManager.java | 0 .../jozufozu/flywheel/api/backend/Engine.java | 0 .../flywheel/api/event/RenderContext.java | 0 .../flywheel/api/event/RenderStage.java | 0 .../flywheel/api/instance/Instance.java | 0 .../flywheel/api/instance/InstanceHandle.java | 0 .../flywheel/api/instance/InstanceType.java | 0 .../flywheel/api/instance/InstanceWriter.java | 0 .../flywheel/api/instance/Instancer.java | 0 .../api/instance/InstancerProvider.java | 0 .../api/internal/DependencyInjection.java | 0 .../flywheel/api/internal/FlwApiLink.java | 0 .../flywheel/api/internal/package-info.java | 0 .../flywheel/api/layout/ArrayElementType.java | 0 .../flywheel/api/layout/ElementType.java | 0 .../flywheel/api/layout/FloatRepr.java | 0 .../flywheel/api/layout/IntegerRepr.java | 0 .../jozufozu/flywheel/api/layout/Layout.java | 0 .../flywheel/api/layout/LayoutBuilder.java | 0 .../api/layout/MatrixElementType.java | 0 .../api/layout/ScalarElementType.java | 0 .../api/layout/UnsignedIntegerRepr.java | 0 .../flywheel/api/layout/ValueRepr.java | 0 .../api/layout/VectorElementType.java | 0 .../flywheel/api/material/CutoutShader.java | 0 .../flywheel/api/material/DepthTest.java | 0 .../flywheel/api/material/FogShader.java | 0 .../flywheel/api/material/Material.java | 0 .../api/material/MaterialShaders.java | 0 .../flywheel/api/material/Transparency.java | 0 .../flywheel/api/material/WriteMask.java | 0 .../flywheel/api/model/IndexSequence.java | 0 .../com/jozufozu/flywheel/api/model/Mesh.java | 0 .../jozufozu/flywheel/api/model/Model.java | 0 .../flywheel/api/registry/IdRegistry.java | 0 .../flywheel/api/registry/Registry.java | 0 .../com/jozufozu/flywheel/api/task/Plan.java | 0 .../flywheel/api/task/TaskExecutor.java | 0 .../api/vertex/MutableVertexList.java | 0 .../flywheel/api/vertex/VertexList.java | 0 .../flywheel/api/vertex/VertexView.java | 0 .../api/vertex/VertexViewProvider.java | 0 .../vertex/VertexViewProviderRegistry.java | 0 .../api/visual/BlockEntityVisual.java | 0 .../api/visual/DistanceUpdateLimiter.java | 0 .../flywheel/api/visual/DynamicVisual.java | 0 .../jozufozu/flywheel/api/visual/Effect.java | 0 .../flywheel/api/visual/EffectVisual.java | 0 .../flywheel/api/visual/EntityVisual.java | 0 .../flywheel/api/visual/LitVisual.java | 0 .../flywheel/api/visual/TickableVisual.java | 0 .../jozufozu/flywheel/api/visual/Visual.java | 0 .../visualization/BlockEntityVisualizer.java | 0 .../api/visualization/EntityVisualizer.java | 0 .../api/visualization/VisualEmbedding.java | 0 .../api/visualization/VisualManager.java | 0 .../visualization/VisualizationContext.java | 0 .../api/visualization/VisualizationLevel.java | 0 .../visualization/VisualizationManager.java | 0 .../api/visualization/VisualizerRegistry.java | 0 .../jozufozu/flywheel/backend/Backends.java | 0 .../flywheel/backend/FlwBackendXplat.java | 0 .../flywheel/backend/InternalVertex.java | 0 .../flywheel/backend/LayoutAttributes.java | 0 .../jozufozu/flywheel/backend/Samplers.java | 0 .../flywheel/backend/ShaderIndices.java | 0 .../backend/compile/ContextShader.java | 0 .../flywheel/backend/compile/FlwPrograms.java | 0 .../backend/compile/IndirectPrograms.java | 0 .../backend/compile/InstancingPrograms.java | 0 .../backend/compile/LayoutInterpreter.java | 0 .../flywheel/backend/compile/Pipeline.java | 0 .../backend/compile/PipelineCompiler.java | 0 .../backend/compile/PipelineProgramKey.java | 0 .../flywheel/backend/compile/Pipelines.java | 0 .../backend/compile/SourceChecks.java | 0 .../BufferTextureInstanceComponent.java | 0 .../component/InstanceAssemblerComponent.java | 0 .../component/InstanceStructComponent.java | 0 .../component/SsboInstanceComponent.java | 0 .../StringSubstitutionComponent.java | 0 .../component/UberShaderComponent.java | 0 .../backend/compile/core/Compilation.java | 0 .../compile/core/CompilationHarness.java | 0 .../backend/compile/core/Compile.java | 0 .../backend/compile/core/CompilerStats.java | 0 .../compile/core/FailedCompilation.java | 0 .../backend/compile/core/LinkResult.java | 0 .../backend/compile/core/ProgramLinker.java | 0 .../backend/compile/core/ShaderCache.java | 0 .../backend/compile/core/ShaderResult.java | 0 .../backend/compile/core/SourceLoader.java | 0 .../backend/engine/AbstractInstancer.java | 0 .../backend/engine/CommonCrumbling.java | 0 .../flywheel/backend/engine/DrawManager.java | 0 .../flywheel/backend/engine/EngineImpl.java | 0 .../backend/engine/EnvironmentStorage.java | 0 .../flywheel/backend/engine/GroupKey.java | 0 .../flywheel/backend/engine/IndexPool.java | 0 .../backend/engine/InstanceHandleImpl.java | 0 .../flywheel/backend/engine/InstancerKey.java | 0 .../backend/engine/InstancerProviderImpl.java | 0 .../backend/engine/MaterialEncoder.java | 0 .../backend/engine/MaterialRenderState.java | 0 .../flywheel/backend/engine/MeshPool.java | 0 .../backend/engine/TextureBinder.java | 0 .../embed/AbstractEmbeddedEnvironment.java | 0 .../engine/embed/EmbeddedLightTexture.java | 0 .../engine/embed/EmbeddedLightVolume.java | 0 .../engine/embed/EmbeddingUniforms.java | 0 .../backend/engine/embed/Environment.java | 0 .../engine/embed/GlobalEnvironment.java | 0 .../embed/NestedEmbeddedEnvironment.java | 0 .../embed/TopLevelEmbeddedEnvironment.java | 0 .../engine/indirect/IndirectBuffers.java | 0 .../engine/indirect/IndirectCullingGroup.java | 0 .../backend/engine/indirect/IndirectDraw.java | 0 .../engine/indirect/IndirectDrawManager.java | 0 .../engine/indirect/IndirectInstancer.java | 0 .../indirect/ResizableStorageArray.java | 0 .../indirect/ResizableStorageBuffer.java | 0 .../backend/engine/indirect/ScatterList.java | 0 .../engine/indirect/StagingBuffer.java | 0 .../backend/engine/indirect/TransferList.java | 0 .../engine/instancing/InstancedDraw.java | 0 .../instancing/InstancedDrawManager.java | 0 .../engine/instancing/InstancedInstancer.java | 0 .../instancing/InstancedRenderStage.java | 0 .../backend/engine/uniform/DebugMode.java | 0 .../backend/engine/uniform/FogUniforms.java | 0 .../backend/engine/uniform/FrameUniforms.java | 0 .../backend/engine/uniform/LevelUniforms.java | 0 .../engine/uniform/OptionsUniforms.java | 0 .../engine/uniform/PlayerUniforms.java | 0 .../backend/engine/uniform/UniformBuffer.java | 0 .../backend/engine/uniform/UniformWriter.java | 0 .../backend/engine/uniform/Uniforms.java | 0 .../jozufozu/flywheel/backend/gl/Driver.java | 0 .../flywheel/backend/gl/GlCompat.java | 0 .../jozufozu/flywheel/backend/gl/GlFence.java | 0 .../flywheel/backend/gl/GlNumericType.java | 0 .../flywheel/backend/gl/GlObject.java | 0 .../flywheel/backend/gl/GlPrimitive.java | 0 .../flywheel/backend/gl/GlStateTracker.java | 0 .../flywheel/backend/gl/GlTexture.java | 0 .../flywheel/backend/gl/GlTextureUnit.java | 0 .../flywheel/backend/gl/TextureBuffer.java | 0 .../backend/gl/array/GlVertexArray.java | 0 .../backend/gl/array/GlVertexArrayDSA.java | 0 .../backend/gl/array/GlVertexArrayGL3.java | 0 .../GlVertexArraySeparateAttributes.java | 0 .../backend/gl/array/VertexAttribute.java | 0 .../flywheel/backend/gl/buffer/Buffer.java | 0 .../flywheel/backend/gl/buffer/GlBuffer.java | 0 .../backend/gl/buffer/GlBufferType.java | 0 .../backend/gl/buffer/GlBufferUsage.java | 0 .../flywheel/backend/gl/error/GlError.java | 0 .../backend/gl/error/GlException.java | 0 .../flywheel/backend/gl/shader/GlProgram.java | 0 .../flywheel/backend/gl/shader/GlShader.java | 0 .../backend/gl/shader/ShaderType.java | 0 .../flywheel/backend/glsl/GlslVersion.java | 0 .../flywheel/backend/glsl/LoadError.java | 0 .../flywheel/backend/glsl/LoadResult.java | 0 .../flywheel/backend/glsl/ShaderSources.java | 0 .../backend/glsl/SourceComponent.java | 0 .../flywheel/backend/glsl/SourceFile.java | 0 .../flywheel/backend/glsl/SourceLines.java | 0 .../backend/glsl/error/ConsoleColors.java | 0 .../backend/glsl/error/ErrorBuilder.java | 0 .../backend/glsl/error/ErrorLevel.java | 0 .../backend/glsl/error/lines/Divider.java | 0 .../backend/glsl/error/lines/ErrorLine.java | 0 .../backend/glsl/error/lines/FileLine.java | 0 .../backend/glsl/error/lines/HeaderLine.java | 0 .../backend/glsl/error/lines/NestedLine.java | 0 .../backend/glsl/error/lines/SourceLine.java | 0 .../glsl/error/lines/SpanHighlightLine.java | 0 .../backend/glsl/error/lines/TextLine.java | 0 .../flywheel/backend/glsl/generate/BinOp.java | 0 .../backend/glsl/generate/FnSignature.java | 0 .../backend/glsl/generate/GlslBlock.java | 0 .../backend/glsl/generate/GlslBuilder.java | 0 .../backend/glsl/generate/GlslExpr.java | 0 .../backend/glsl/generate/GlslFn.java | 0 .../backend/glsl/generate/GlslStmt.java | 0 .../backend/glsl/generate/GlslStruct.java | 0 .../backend/glsl/generate/GlslSwitch.java | 0 .../glsl/generate/GlslUniformBlock.java | 0 .../glsl/generate/GlslVertexInput.java | 0 .../flywheel/backend/glsl/parse/Import.java | 0 .../backend/glsl/parse/ShaderField.java | 0 .../backend/glsl/parse/ShaderFunction.java | 0 .../backend/glsl/parse/ShaderStruct.java | 0 .../backend/glsl/parse/ShaderVariable.java | 0 .../backend/glsl/parse/StructField.java | 0 .../flywheel/backend/glsl/span/CharPos.java | 0 .../flywheel/backend/glsl/span/ErrorSpan.java | 0 .../flywheel/backend/glsl/span/Span.java | 0 .../backend/glsl/span/StringSpan.java | 0 .../mixin/AbstractClientPlayerAccessor.java | 0 .../backend/mixin/GameRendererAccessor.java | 0 .../backend/mixin/GlStateManagerMixin.java | 0 .../backend/mixin/LevelRendererAccessor.java | 0 .../backend/mixin/LightTextureAccessor.java | 0 .../flywheel/backend/mixin/OptionsMixin.java | 0 .../backend/mixin/OverlayTextureAccessor.java | 0 .../backend/mixin/RenderSystemMixin.java | 0 .../backend/util/AtomicReferenceCounted.java | 0 .../flywheel/backend/util/MemoryBuffer.java | 0 .../backend/util/ReferenceCounted.java | 0 .../flywheel/flywheel/internal/api_impl.frag | 0 .../flywheel/flywheel/internal/api_impl.vert | 0 .../flywheel/flywheel/internal/colorizer.glsl | 0 .../flywheel/flywheel/internal/common.frag | 0 .../flywheel/flywheel/internal/common.vert | 0 .../flywheel/internal/components_header.frag | 0 .../flywheel/internal/components_header.vert | 0 .../flywheel/flywheel/internal/diffuse.glsl | 0 .../flywheel/internal/fog_distance.glsl | 0 .../flywheel/internal/indirect/apply.glsl | 0 .../internal/indirect/buffer_bindings.glsl | 0 .../flywheel/internal/indirect/cull.glsl | 0 .../internal/indirect/cull_api_impl.glsl | 0 .../internal/indirect/draw_command.glsl | 0 .../flywheel/internal/indirect/main.frag | 0 .../flywheel/internal/indirect/main.vert | 0 .../internal/indirect/model_descriptor.glsl | 0 .../flywheel/internal/indirect/scatter.glsl | 0 .../flywheel/internal/instancing/main.frag | 0 .../flywheel/internal/instancing/main.vert | 0 .../flywheel/flywheel/internal/material.glsl | 0 .../flywheel/internal/packed_material.glsl | 0 .../flywheel/internal/uniforms/fog.glsl | 0 .../flywheel/internal/uniforms/frame.glsl | 0 .../flywheel/internal/uniforms/level.glsl | 0 .../flywheel/internal/uniforms/options.glsl | 0 .../flywheel/internal/uniforms/player.glsl | 0 .../flywheel/internal/uniforms/uniforms.glsl | 0 .../flywheel/internal/vertex_input.vert | 0 .../java/com/jozufozu/flywheel/Flywheel.java | 0 .../flywheel/lib/backend/SimpleBackend.java | 0 .../com/jozufozu/flywheel/lib/box/Box.java | 0 .../jozufozu/flywheel/lib/box/MutableBox.java | 0 .../lib/instance/AbstractInstance.java | 0 .../lib/instance/ColoredLitInstance.java | 0 .../flywheel/lib/instance/FlatLit.java | 0 .../flywheel/lib/instance/InstanceTypes.java | 0 .../lib/instance/OrientedInstance.java | 0 .../flywheel/lib/instance/ShadowInstance.java | 0 .../lib/instance/SimpleInstanceType.java | 0 .../lib/instance/TransformedInstance.java | 0 .../flywheel/lib/internal/FlwLibLink.java | 0 .../flywheel/lib/internal/FlwLibXplat.java | 0 .../flywheel/lib/internal/package-info.java | 0 .../flywheel/lib/light/LightPacking.java | 0 .../flywheel/lib/light/LightVolume.java | 0 .../flywheel/lib/material/CutoutShaders.java | 0 .../flywheel/lib/material/FogShaders.java | 0 .../flywheel/lib/material/Materials.java | 0 .../lib/material/SimpleCutoutShader.java | 0 .../lib/material/SimpleFogShader.java | 0 .../flywheel/lib/material/SimpleMaterial.java | 0 .../lib/material/SimpleMaterialShaders.java | 0 .../lib/material/StandardMaterialShaders.java | 0 .../flywheel/lib/math/MatrixMath.java | 0 .../jozufozu/flywheel/lib/math/MoreMath.java | 0 .../flywheel/lib/math/RenderMath.java | 0 .../lib/memory/AbstractMemoryBlockImpl.java | 0 .../lib/memory/DebugMemoryBlockImpl.java | 0 .../flywheel/lib/memory/FlwMemoryTracker.java | 0 .../flywheel/lib/memory/MemoryBlock.java | 0 .../flywheel/lib/memory/MemoryBlockImpl.java | 0 .../lib/memory/TrackedMemoryBlockImpl.java | 0 .../flywheel/lib/model/LineModelBuilder.java | 0 .../flywheel/lib/model/ModelCache.java | 0 .../flywheel/lib/model/ModelHolder.java | 0 .../flywheel/lib/model/ModelUtil.java | 0 .../jozufozu/flywheel/lib/model/Models.java | 0 .../flywheel/lib/model/QuadIndexSequence.java | 0 .../jozufozu/flywheel/lib/model/QuadMesh.java | 0 .../flywheel/lib/model/SimpleMesh.java | 0 .../flywheel/lib/model/SimpleModel.java | 0 .../flywheel/lib/model/SingleMeshModel.java | 0 .../lib/model/baked/BakedModelBuilder.java | 0 .../lib/model/baked/BlockModelBuilder.java | 0 .../flywheel/lib/model/baked/MeshEmitter.java | 0 .../model/baked/MultiBlockModelBuilder.java | 0 .../lib/model/baked/PartialModel.java | 0 .../baked/TransformingVertexConsumer.java | 0 .../lib/model/baked/VirtualBlockGetter.java | 0 .../model/baked/VirtualEmptyBlockGetter.java | 0 .../lib/model/baked/VirtualLightEngine.java | 0 .../lib/model/part/ModelPartConverter.java | 0 .../flywheel/lib/model/part/VertexWriter.java | 0 .../flywheel/lib/task/BarrierPlan.java | 0 .../flywheel/lib/task/Distribute.java | 0 .../flywheel/lib/task/DynamicNestedPlan.java | 0 .../com/jozufozu/flywheel/lib/task/Flag.java | 0 .../flywheel/lib/task/ForEachPlan.java | 0 .../flywheel/lib/task/ForEachSlicePlan.java | 0 .../flywheel/lib/task/IfElsePlan.java | 0 .../flywheel/lib/task/MapContextPlan.java | 0 .../jozufozu/flywheel/lib/task/NamedFlag.java | 0 .../flywheel/lib/task/NestedPlan.java | 0 .../jozufozu/flywheel/lib/task/PlanMap.java | 0 .../jozufozu/flywheel/lib/task/RaisePlan.java | 0 .../flywheel/lib/task/RunnablePlan.java | 0 .../flywheel/lib/task/SimplePlan.java | 0 .../flywheel/lib/task/SimplyComposedPlan.java | 0 .../jozufozu/flywheel/lib/task/StageFlag.java | 0 .../flywheel/lib/task/SyncedPlan.java | 0 .../flywheel/lib/task/Synchronizer.java | 0 .../jozufozu/flywheel/lib/task/UnitPlan.java | 0 .../BooleanSupplierWithContext.java | 0 .../task/functional/ConsumerWithContext.java | 0 .../task/functional/RunnableWithContext.java | 0 .../task/functional/SupplierWithContext.java | 0 .../lib/task/functional/package-info.java | 0 .../flywheel/lib/transform/Affine.java | 0 .../lib/transform/PoseTransformStack.java | 0 .../flywheel/lib/transform/Rotate.java | 0 .../flywheel/lib/transform/Scale.java | 0 .../flywheel/lib/transform/Transform.java | 0 .../lib/transform/TransformStack.java | 0 .../flywheel/lib/transform/Translate.java | 0 .../flywheel/lib/util/AtomicBitset.java | 0 .../jozufozu/flywheel/lib/util/FlwUtil.java | 0 .../flywheel/lib/util/LevelAttached.java | 0 .../com/jozufozu/flywheel/lib/util/Pair.java | 0 .../flywheel/lib/util/ResourceUtil.java | 0 .../flywheel/lib/util/SectionUtil.java | 0 .../flywheel/lib/util/ShadersModHandler.java | 0 .../flywheel/lib/util/StringUtil.java | 0 .../com/jozufozu/flywheel/lib/util/Unit.java | 0 .../lib/vertex/AbstractVertexView.java | 0 .../flywheel/lib/vertex/EmptyVertexList.java | 0 .../flywheel/lib/vertex/FullVertexView.java | 0 .../lib/vertex/NoOverlayVertexView.java | 0 .../lib/vertex/PosTexNormalVertexView.java | 0 .../flywheel/lib/vertex/PosVertexView.java | 0 .../lib/visual/AbstractBlockEntityVisual.java | 0 .../lib/visual/AbstractEntityVisual.java | 0 .../flywheel/lib/visual/AbstractVisual.java | 0 .../flywheel/lib/visual/EntityComponent.java | 0 .../lib/visual/EntityVisibilityTester.java | 0 .../flywheel/lib/visual/InstanceRecycler.java | 0 .../visual/SimpleBlockEntityVisualizer.java | 0 .../lib/visual/SimpleDynamicVisual.java | 0 .../lib/visual/SimpleEntityVisual.java | 0 .../lib/visual/SimpleEntityVisualizer.java | 0 .../lib/visual/SimpleTickableVisual.java | 0 .../flywheel/lib/visual/SmartRecycler.java | 0 .../lib/visual/component/FireComponent.java | 0 .../lib/visual/component/HitboxComponent.java | 0 .../lib/visual/component/ShadowComponent.java | 0 .../flywheel/flywheel/cutout/epsilon.glsl | 0 .../assets/flywheel/flywheel/cutout/half.glsl | 0 .../assets/flywheel/flywheel/cutout/off.glsl | 0 .../flywheel/flywheel/cutout/one_tenth.glsl | 0 .../assets/flywheel/flywheel/fog/linear.glsl | 0 .../flywheel/flywheel/fog/linear_fade.glsl | 0 .../assets/flywheel/flywheel/fog/none.glsl | 0 .../flywheel/instance/cull/oriented.glsl | 0 .../flywheel/instance/cull/shadow.glsl | 0 .../flywheel/instance/cull/transformed.glsl | 0 .../flywheel/flywheel/instance/oriented.vert | 0 .../flywheel/flywheel/instance/shadow.vert | 0 .../flywheel/instance/transformed.vert | 0 .../flywheel/flywheel/material/default.frag | 0 .../flywheel/flywheel/material/default.vert | 0 .../flywheel/flywheel/material/lines.frag | 0 .../flywheel/flywheel/material/lines.vert | 0 .../flywheel/flywheel/material/wireframe.frag | 0 .../flywheel/flywheel/material/wireframe.vert | 0 .../assets/flywheel/flywheel/util/color.glsl | 0 .../assets/flywheel/flywheel/util/matrix.glsl | 0 .../flywheel/flywheel/util/quaternion.glsl | 0 fabric/build.gradle | 2 - forge/build.gradle | 2 - 384 files changed, 82 insertions(+), 11 deletions(-) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/BackendImplemented.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/backend/Backend.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/backend/BackendManager.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/backend/Engine.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/event/RenderContext.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/event/RenderStage.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/instance/Instance.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/instance/InstanceHandle.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/instance/InstanceType.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/instance/InstanceWriter.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/instance/Instancer.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/instance/InstancerProvider.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/internal/DependencyInjection.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/internal/FlwApiLink.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/internal/package-info.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/layout/ArrayElementType.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/layout/ElementType.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/layout/FloatRepr.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/layout/IntegerRepr.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/layout/Layout.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/layout/LayoutBuilder.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/layout/MatrixElementType.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/layout/ScalarElementType.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/layout/UnsignedIntegerRepr.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/layout/ValueRepr.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/layout/VectorElementType.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/material/CutoutShader.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/material/DepthTest.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/material/FogShader.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/material/Material.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/material/MaterialShaders.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/material/Transparency.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/material/WriteMask.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/model/IndexSequence.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/model/Mesh.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/model/Model.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/registry/IdRegistry.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/registry/Registry.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/task/Plan.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/task/TaskExecutor.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/vertex/MutableVertexList.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/vertex/VertexList.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/vertex/VertexView.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/vertex/VertexViewProvider.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/vertex/VertexViewProviderRegistry.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/visual/BlockEntityVisual.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/visual/DistanceUpdateLimiter.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/visual/DynamicVisual.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/visual/Effect.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/visual/EffectVisual.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/visual/EntityVisual.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/visual/LitVisual.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/visual/TickableVisual.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/visual/Visual.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/visualization/BlockEntityVisualizer.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/visualization/EntityVisualizer.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/visualization/VisualEmbedding.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/visualization/VisualManager.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/visualization/VisualizationContext.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/visualization/VisualizationLevel.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/visualization/VisualizationManager.java (100%) rename common/src/{main => api}/java/com/jozufozu/flywheel/api/visualization/VisualizerRegistry.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/Backends.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/FlwBackendXplat.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/InternalVertex.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/LayoutAttributes.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/Samplers.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/ShaderIndices.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/ContextShader.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/FlwPrograms.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/IndirectPrograms.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/InstancingPrograms.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/LayoutInterpreter.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/Pipeline.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/PipelineCompiler.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/PipelineProgramKey.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/Pipelines.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/SourceChecks.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/component/BufferTextureInstanceComponent.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/component/InstanceAssemblerComponent.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/component/InstanceStructComponent.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/component/SsboInstanceComponent.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/component/StringSubstitutionComponent.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/component/UberShaderComponent.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/core/Compilation.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/core/CompilationHarness.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/core/Compile.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/core/CompilerStats.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/core/FailedCompilation.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/core/LinkResult.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/core/ProgramLinker.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/core/ShaderCache.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/core/ShaderResult.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/compile/core/SourceLoader.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/AbstractInstancer.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/CommonCrumbling.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/DrawManager.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/EngineImpl.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/EnvironmentStorage.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/GroupKey.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/IndexPool.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/InstanceHandleImpl.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/InstancerKey.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/InstancerProviderImpl.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/MaterialEncoder.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/MaterialRenderState.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/MeshPool.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/TextureBinder.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/embed/AbstractEmbeddedEnvironment.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/embed/EmbeddedLightTexture.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/embed/EmbeddedLightVolume.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/embed/EmbeddingUniforms.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/embed/Environment.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/embed/GlobalEnvironment.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/embed/NestedEmbeddedEnvironment.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/embed/TopLevelEmbeddedEnvironment.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectBuffers.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectCullingGroup.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectDraw.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectDrawManager.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectInstancer.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/indirect/ResizableStorageArray.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/indirect/ResizableStorageBuffer.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/indirect/ScatterList.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/indirect/StagingBuffer.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/indirect/TransferList.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/instancing/InstancedDraw.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/instancing/InstancedDrawManager.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/instancing/InstancedInstancer.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/instancing/InstancedRenderStage.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/uniform/DebugMode.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/uniform/FogUniforms.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/uniform/FrameUniforms.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/uniform/LevelUniforms.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/uniform/OptionsUniforms.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/uniform/PlayerUniforms.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/uniform/UniformBuffer.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/uniform/UniformWriter.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/engine/uniform/Uniforms.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/Driver.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/GlCompat.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/GlFence.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/GlNumericType.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/GlObject.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/GlPrimitive.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/GlStateTracker.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/GlTexture.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/GlTextureUnit.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/TextureBuffer.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArray.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArrayDSA.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArrayGL3.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArraySeparateAttributes.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/array/VertexAttribute.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/buffer/Buffer.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/buffer/GlBuffer.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/buffer/GlBufferType.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/buffer/GlBufferUsage.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/error/GlError.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/error/GlException.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/shader/GlProgram.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/shader/GlShader.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/gl/shader/ShaderType.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/GlslVersion.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/LoadError.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/LoadResult.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/ShaderSources.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/SourceComponent.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/SourceFile.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/SourceLines.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/error/ConsoleColors.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/error/ErrorBuilder.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/error/ErrorLevel.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/error/lines/Divider.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/error/lines/ErrorLine.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/error/lines/FileLine.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/error/lines/HeaderLine.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/error/lines/NestedLine.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/error/lines/SourceLine.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/error/lines/SpanHighlightLine.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/error/lines/TextLine.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/generate/BinOp.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/generate/FnSignature.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/generate/GlslBlock.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/generate/GlslBuilder.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/generate/GlslExpr.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/generate/GlslFn.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/generate/GlslStmt.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/generate/GlslStruct.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/generate/GlslSwitch.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/generate/GlslUniformBlock.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/generate/GlslVertexInput.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/parse/Import.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/parse/ShaderField.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/parse/ShaderFunction.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/parse/ShaderStruct.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/parse/ShaderVariable.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/parse/StructField.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/span/CharPos.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/span/ErrorSpan.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/span/Span.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/glsl/span/StringSpan.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/mixin/AbstractClientPlayerAccessor.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/mixin/GameRendererAccessor.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/mixin/GlStateManagerMixin.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/mixin/LevelRendererAccessor.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/mixin/LightTextureAccessor.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/mixin/OptionsMixin.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/mixin/OverlayTextureAccessor.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/mixin/RenderSystemMixin.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/util/AtomicReferenceCounted.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/util/MemoryBuffer.java (100%) rename common/src/{main => backend}/java/com/jozufozu/flywheel/backend/util/ReferenceCounted.java (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/api_impl.frag (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/api_impl.vert (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/colorizer.glsl (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/common.frag (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/common.vert (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/components_header.frag (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/components_header.vert (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/diffuse.glsl (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/fog_distance.glsl (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/indirect/apply.glsl (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/indirect/buffer_bindings.glsl (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/indirect/cull.glsl (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/indirect/cull_api_impl.glsl (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/indirect/draw_command.glsl (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/indirect/main.frag (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/indirect/main.vert (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/indirect/model_descriptor.glsl (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/indirect/scatter.glsl (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/instancing/main.frag (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/instancing/main.vert (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/material.glsl (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/packed_material.glsl (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/uniforms/fog.glsl (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/uniforms/frame.glsl (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/uniforms/level.glsl (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/uniforms/options.glsl (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/uniforms/player.glsl (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/uniforms/uniforms.glsl (100%) rename common/src/{main => backend}/resources/assets/flywheel/flywheel/internal/vertex_input.vert (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/Flywheel.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/backend/SimpleBackend.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/box/Box.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/box/MutableBox.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/instance/AbstractInstance.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/instance/ColoredLitInstance.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/instance/FlatLit.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/instance/InstanceTypes.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/instance/OrientedInstance.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/instance/ShadowInstance.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/instance/SimpleInstanceType.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/instance/TransformedInstance.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/internal/FlwLibLink.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/internal/FlwLibXplat.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/internal/package-info.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/light/LightPacking.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/light/LightVolume.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/material/CutoutShaders.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/material/FogShaders.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/material/Materials.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/material/SimpleCutoutShader.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/material/SimpleFogShader.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/material/SimpleMaterial.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/material/SimpleMaterialShaders.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/material/StandardMaterialShaders.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/math/MatrixMath.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/math/MoreMath.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/math/RenderMath.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/memory/AbstractMemoryBlockImpl.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/memory/DebugMemoryBlockImpl.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/memory/FlwMemoryTracker.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/memory/MemoryBlock.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/memory/MemoryBlockImpl.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/memory/TrackedMemoryBlockImpl.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/LineModelBuilder.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/ModelCache.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/ModelHolder.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/ModelUtil.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/Models.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/QuadIndexSequence.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/QuadMesh.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/SimpleMesh.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/SimpleModel.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/SingleMeshModel.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/baked/BakedModelBuilder.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/baked/BlockModelBuilder.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/baked/MeshEmitter.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/baked/MultiBlockModelBuilder.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/baked/PartialModel.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/baked/TransformingVertexConsumer.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/baked/VirtualBlockGetter.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/baked/VirtualEmptyBlockGetter.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/baked/VirtualLightEngine.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/part/ModelPartConverter.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/model/part/VertexWriter.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/BarrierPlan.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/Distribute.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/DynamicNestedPlan.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/Flag.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/ForEachPlan.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/ForEachSlicePlan.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/IfElsePlan.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/MapContextPlan.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/NamedFlag.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/NestedPlan.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/PlanMap.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/RaisePlan.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/RunnablePlan.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/SimplePlan.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/SimplyComposedPlan.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/StageFlag.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/SyncedPlan.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/Synchronizer.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/UnitPlan.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/functional/BooleanSupplierWithContext.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/functional/ConsumerWithContext.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/functional/RunnableWithContext.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/functional/SupplierWithContext.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/task/functional/package-info.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/transform/Affine.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/transform/PoseTransformStack.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/transform/Rotate.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/transform/Scale.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/transform/Transform.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/transform/TransformStack.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/transform/Translate.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/util/AtomicBitset.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/util/FlwUtil.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/util/LevelAttached.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/util/Pair.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/util/ResourceUtil.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/util/SectionUtil.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/util/ShadersModHandler.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/util/StringUtil.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/util/Unit.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/vertex/AbstractVertexView.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/vertex/EmptyVertexList.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/vertex/FullVertexView.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/vertex/NoOverlayVertexView.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/vertex/PosTexNormalVertexView.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/vertex/PosVertexView.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/visual/AbstractBlockEntityVisual.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/visual/AbstractEntityVisual.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/visual/AbstractVisual.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/visual/EntityComponent.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/visual/EntityVisibilityTester.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/visual/InstanceRecycler.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/visual/SimpleBlockEntityVisualizer.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/visual/SimpleDynamicVisual.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/visual/SimpleEntityVisual.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/visual/SimpleEntityVisualizer.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/visual/SimpleTickableVisual.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/visual/SmartRecycler.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/visual/component/FireComponent.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/visual/component/HitboxComponent.java (100%) rename common/src/{main => lib}/java/com/jozufozu/flywheel/lib/visual/component/ShadowComponent.java (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/cutout/epsilon.glsl (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/cutout/half.glsl (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/cutout/off.glsl (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/cutout/one_tenth.glsl (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/fog/linear.glsl (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/fog/linear_fade.glsl (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/fog/none.glsl (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/instance/cull/oriented.glsl (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/instance/cull/shadow.glsl (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/instance/cull/transformed.glsl (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/instance/oriented.vert (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/instance/shadow.vert (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/instance/transformed.vert (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/material/default.frag (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/material/default.vert (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/material/lines.frag (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/material/lines.vert (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/material/wireframe.frag (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/material/wireframe.vert (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/util/color.glsl (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/util/matrix.glsl (100%) rename common/src/{main => lib}/resources/assets/flywheel/flywheel/util/quaternion.glsl (100%) diff --git a/buildSrc/platforms.gradle b/buildSrc/platforms.gradle index f8200edaf..19e7feddb 100644 --- a/buildSrc/platforms.gradle +++ b/buildSrc/platforms.gradle @@ -25,17 +25,37 @@ loom { } } +dependencies { + compileOnly project(path: ':common', configuration: 'commonApi') + compileOnly project(path: ':common', configuration: 'commonLib') + compileOnly project(path: ':common', configuration: 'commonBackend') + compileOnly project(path: ':common', configuration: 'commonImpl') +} + +SourceSet commonApiSource = project(':common').sourceSets.api +SourceSet commonLibSource = project(':common').sourceSets.lib +SourceSet commonBackendSource = project(':common').sourceSets.backend +SourceSet commonMainSource = project(':common').sourceSets.main + +def commonSources = [commonApiSource, commonLibSource, commonBackendSource, commonMainSource] + tasks.named('processResources', ProcessResources).configure { ProcessResources processResources -> - processResources.from project(':common').tasks.named('processResources', ProcessResources).get().source + // No resources in API + processResources.from commonLibSource.resources + processResources.from commonBackendSource.resources + processResources.from commonMainSource.resources } tasks.named('compileJava', JavaCompile).configure { JavaCompile compileJava -> - compileJava.source project(':common').tasks.named('compileJava', JavaCompile).get().source + // TODO: Can we avoid this duplication? Would be nice to repackage the 4 common jars without having to re compile + commonSources.forEach { compileJava.source it.allJava } + excludeDuplicatePackageInfos(compileJava) } tasks.named('javadoc', Javadoc).configure { Javadoc javadoc -> - javadoc.source project(':common').tasks.named('javadoc', Javadoc).get().source + commonSources.forEach { javadoc.source it.allJava } + excludeDuplicatePackageInfos(javadoc) } @@ -44,9 +64,7 @@ tasks.named('jar', Jar).configure { Jar jar -> } tasks.named('sourcesJar', Jar).configure { Jar jar -> - def commonSources = project(':common').tasks.named('sourcesJar', Jar) - dependsOn commonSources - jar.from zipTree(commonSources.flatMap { it.archiveFile }) + commonSources.forEach { jar.from it.allJava } excludeDuplicatePackageInfos(jar) } diff --git a/common/build.gradle b/common/build.gradle index 8eae69c2b..802838ba7 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -7,7 +7,64 @@ plugins { apply from: rootProject.file('buildSrc/simple-java.gradle') apply from: rootProject.file('buildSrc/subprojects.gradle') -apply from: rootProject.file('buildSrc/package-infos.gradle') +// TODO: package-infos specifically targets the main source set +// apply from: rootProject.file('buildSrc/package-infos.gradle') + +sourceSets { + // Loom only populates mc stuff to the main source set, + // so grab that here and use it for the others. + // Note that the `+` operator does NOT perform a deep copy + // of a FileCollection, so this object is shared between + // the source sets and we should avoid mutating it. + FileCollection mcCompileClassPath = main.compileClasspath + + SourceSet api = api { + compileClasspath = mcCompileClassPath + } + SourceSet lib = lib { + compileClasspath = mcCompileClassPath + api.output + } + SourceSet backend = backend { + compileClasspath = mcCompileClassPath + api.output + lib.output + } + + main { + // Assign here rather than concatenate to avoid modifying the mcCompileClassPath FileCollection + compileClasspath = mcCompileClassPath + api.output + lib.output + backend.output + } + + test { + // Only test needs runtimeClasspath filled since the game shouldn't run from common alone. + // Fine to concatenate here. + compileClasspath += api.output + lib.output + backend.output + runtimeClasspath += api.output + lib.output + backend.output + } +} + +TaskProvider createJarAndOutgoingConfiguration(String name) { + return createJarAndOutgoingConfiguration(name, sourceSets.named(name).get()) +} + +TaskProvider createJarAndOutgoingConfiguration(String name, SourceSet sourceSet) { + def config = configurations.register("common${name.capitalize()}") { + canBeConsumed = true + canBeResolved = false + } + def jarTask = tasks.register("${name}Jar", Jar) { + archiveClassifier.set(name) + from sourceSet.output + } + + artifacts.add(config.name, jarTask) + + return jarTask +} + +// TODO: repackage these for maven publication +def apiJar = createJarAndOutgoingConfiguration("api") +def libJar = createJarAndOutgoingConfiguration("lib") +def backendJar = createJarAndOutgoingConfiguration("backend") +def implJar = createJarAndOutgoingConfiguration("impl", sourceSets.main) dependencies { modCompileOnly "net.fabricmc:fabric-loader:${fabric_loader_version}" diff --git a/common/src/main/java/com/jozufozu/flywheel/api/BackendImplemented.java b/common/src/api/java/com/jozufozu/flywheel/api/BackendImplemented.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/BackendImplemented.java rename to common/src/api/java/com/jozufozu/flywheel/api/BackendImplemented.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/backend/Backend.java b/common/src/api/java/com/jozufozu/flywheel/api/backend/Backend.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/backend/Backend.java rename to common/src/api/java/com/jozufozu/flywheel/api/backend/Backend.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/backend/BackendManager.java b/common/src/api/java/com/jozufozu/flywheel/api/backend/BackendManager.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/backend/BackendManager.java rename to common/src/api/java/com/jozufozu/flywheel/api/backend/BackendManager.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/backend/Engine.java b/common/src/api/java/com/jozufozu/flywheel/api/backend/Engine.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/backend/Engine.java rename to common/src/api/java/com/jozufozu/flywheel/api/backend/Engine.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/event/RenderContext.java b/common/src/api/java/com/jozufozu/flywheel/api/event/RenderContext.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/event/RenderContext.java rename to common/src/api/java/com/jozufozu/flywheel/api/event/RenderContext.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/event/RenderStage.java b/common/src/api/java/com/jozufozu/flywheel/api/event/RenderStage.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/event/RenderStage.java rename to common/src/api/java/com/jozufozu/flywheel/api/event/RenderStage.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/instance/Instance.java b/common/src/api/java/com/jozufozu/flywheel/api/instance/Instance.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/instance/Instance.java rename to common/src/api/java/com/jozufozu/flywheel/api/instance/Instance.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/instance/InstanceHandle.java b/common/src/api/java/com/jozufozu/flywheel/api/instance/InstanceHandle.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/instance/InstanceHandle.java rename to common/src/api/java/com/jozufozu/flywheel/api/instance/InstanceHandle.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/instance/InstanceType.java b/common/src/api/java/com/jozufozu/flywheel/api/instance/InstanceType.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/instance/InstanceType.java rename to common/src/api/java/com/jozufozu/flywheel/api/instance/InstanceType.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/instance/InstanceWriter.java b/common/src/api/java/com/jozufozu/flywheel/api/instance/InstanceWriter.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/instance/InstanceWriter.java rename to common/src/api/java/com/jozufozu/flywheel/api/instance/InstanceWriter.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/instance/Instancer.java b/common/src/api/java/com/jozufozu/flywheel/api/instance/Instancer.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/instance/Instancer.java rename to common/src/api/java/com/jozufozu/flywheel/api/instance/Instancer.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/instance/InstancerProvider.java b/common/src/api/java/com/jozufozu/flywheel/api/instance/InstancerProvider.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/instance/InstancerProvider.java rename to common/src/api/java/com/jozufozu/flywheel/api/instance/InstancerProvider.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/internal/DependencyInjection.java b/common/src/api/java/com/jozufozu/flywheel/api/internal/DependencyInjection.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/internal/DependencyInjection.java rename to common/src/api/java/com/jozufozu/flywheel/api/internal/DependencyInjection.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/internal/FlwApiLink.java b/common/src/api/java/com/jozufozu/flywheel/api/internal/FlwApiLink.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/internal/FlwApiLink.java rename to common/src/api/java/com/jozufozu/flywheel/api/internal/FlwApiLink.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/internal/package-info.java b/common/src/api/java/com/jozufozu/flywheel/api/internal/package-info.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/internal/package-info.java rename to common/src/api/java/com/jozufozu/flywheel/api/internal/package-info.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/layout/ArrayElementType.java b/common/src/api/java/com/jozufozu/flywheel/api/layout/ArrayElementType.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/layout/ArrayElementType.java rename to common/src/api/java/com/jozufozu/flywheel/api/layout/ArrayElementType.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/layout/ElementType.java b/common/src/api/java/com/jozufozu/flywheel/api/layout/ElementType.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/layout/ElementType.java rename to common/src/api/java/com/jozufozu/flywheel/api/layout/ElementType.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/layout/FloatRepr.java b/common/src/api/java/com/jozufozu/flywheel/api/layout/FloatRepr.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/layout/FloatRepr.java rename to common/src/api/java/com/jozufozu/flywheel/api/layout/FloatRepr.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/layout/IntegerRepr.java b/common/src/api/java/com/jozufozu/flywheel/api/layout/IntegerRepr.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/layout/IntegerRepr.java rename to common/src/api/java/com/jozufozu/flywheel/api/layout/IntegerRepr.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/layout/Layout.java b/common/src/api/java/com/jozufozu/flywheel/api/layout/Layout.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/layout/Layout.java rename to common/src/api/java/com/jozufozu/flywheel/api/layout/Layout.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/layout/LayoutBuilder.java b/common/src/api/java/com/jozufozu/flywheel/api/layout/LayoutBuilder.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/layout/LayoutBuilder.java rename to common/src/api/java/com/jozufozu/flywheel/api/layout/LayoutBuilder.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/layout/MatrixElementType.java b/common/src/api/java/com/jozufozu/flywheel/api/layout/MatrixElementType.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/layout/MatrixElementType.java rename to common/src/api/java/com/jozufozu/flywheel/api/layout/MatrixElementType.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/layout/ScalarElementType.java b/common/src/api/java/com/jozufozu/flywheel/api/layout/ScalarElementType.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/layout/ScalarElementType.java rename to common/src/api/java/com/jozufozu/flywheel/api/layout/ScalarElementType.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/layout/UnsignedIntegerRepr.java b/common/src/api/java/com/jozufozu/flywheel/api/layout/UnsignedIntegerRepr.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/layout/UnsignedIntegerRepr.java rename to common/src/api/java/com/jozufozu/flywheel/api/layout/UnsignedIntegerRepr.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/layout/ValueRepr.java b/common/src/api/java/com/jozufozu/flywheel/api/layout/ValueRepr.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/layout/ValueRepr.java rename to common/src/api/java/com/jozufozu/flywheel/api/layout/ValueRepr.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/layout/VectorElementType.java b/common/src/api/java/com/jozufozu/flywheel/api/layout/VectorElementType.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/layout/VectorElementType.java rename to common/src/api/java/com/jozufozu/flywheel/api/layout/VectorElementType.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/material/CutoutShader.java b/common/src/api/java/com/jozufozu/flywheel/api/material/CutoutShader.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/material/CutoutShader.java rename to common/src/api/java/com/jozufozu/flywheel/api/material/CutoutShader.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/material/DepthTest.java b/common/src/api/java/com/jozufozu/flywheel/api/material/DepthTest.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/material/DepthTest.java rename to common/src/api/java/com/jozufozu/flywheel/api/material/DepthTest.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/material/FogShader.java b/common/src/api/java/com/jozufozu/flywheel/api/material/FogShader.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/material/FogShader.java rename to common/src/api/java/com/jozufozu/flywheel/api/material/FogShader.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/material/Material.java b/common/src/api/java/com/jozufozu/flywheel/api/material/Material.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/material/Material.java rename to common/src/api/java/com/jozufozu/flywheel/api/material/Material.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/material/MaterialShaders.java b/common/src/api/java/com/jozufozu/flywheel/api/material/MaterialShaders.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/material/MaterialShaders.java rename to common/src/api/java/com/jozufozu/flywheel/api/material/MaterialShaders.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/material/Transparency.java b/common/src/api/java/com/jozufozu/flywheel/api/material/Transparency.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/material/Transparency.java rename to common/src/api/java/com/jozufozu/flywheel/api/material/Transparency.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/material/WriteMask.java b/common/src/api/java/com/jozufozu/flywheel/api/material/WriteMask.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/material/WriteMask.java rename to common/src/api/java/com/jozufozu/flywheel/api/material/WriteMask.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/model/IndexSequence.java b/common/src/api/java/com/jozufozu/flywheel/api/model/IndexSequence.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/model/IndexSequence.java rename to common/src/api/java/com/jozufozu/flywheel/api/model/IndexSequence.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/model/Mesh.java b/common/src/api/java/com/jozufozu/flywheel/api/model/Mesh.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/model/Mesh.java rename to common/src/api/java/com/jozufozu/flywheel/api/model/Mesh.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/model/Model.java b/common/src/api/java/com/jozufozu/flywheel/api/model/Model.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/model/Model.java rename to common/src/api/java/com/jozufozu/flywheel/api/model/Model.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/registry/IdRegistry.java b/common/src/api/java/com/jozufozu/flywheel/api/registry/IdRegistry.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/registry/IdRegistry.java rename to common/src/api/java/com/jozufozu/flywheel/api/registry/IdRegistry.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/registry/Registry.java b/common/src/api/java/com/jozufozu/flywheel/api/registry/Registry.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/registry/Registry.java rename to common/src/api/java/com/jozufozu/flywheel/api/registry/Registry.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/task/Plan.java b/common/src/api/java/com/jozufozu/flywheel/api/task/Plan.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/task/Plan.java rename to common/src/api/java/com/jozufozu/flywheel/api/task/Plan.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/task/TaskExecutor.java b/common/src/api/java/com/jozufozu/flywheel/api/task/TaskExecutor.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/task/TaskExecutor.java rename to common/src/api/java/com/jozufozu/flywheel/api/task/TaskExecutor.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/vertex/MutableVertexList.java b/common/src/api/java/com/jozufozu/flywheel/api/vertex/MutableVertexList.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/vertex/MutableVertexList.java rename to common/src/api/java/com/jozufozu/flywheel/api/vertex/MutableVertexList.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/vertex/VertexList.java b/common/src/api/java/com/jozufozu/flywheel/api/vertex/VertexList.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/vertex/VertexList.java rename to common/src/api/java/com/jozufozu/flywheel/api/vertex/VertexList.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/vertex/VertexView.java b/common/src/api/java/com/jozufozu/flywheel/api/vertex/VertexView.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/vertex/VertexView.java rename to common/src/api/java/com/jozufozu/flywheel/api/vertex/VertexView.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/vertex/VertexViewProvider.java b/common/src/api/java/com/jozufozu/flywheel/api/vertex/VertexViewProvider.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/vertex/VertexViewProvider.java rename to common/src/api/java/com/jozufozu/flywheel/api/vertex/VertexViewProvider.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/vertex/VertexViewProviderRegistry.java b/common/src/api/java/com/jozufozu/flywheel/api/vertex/VertexViewProviderRegistry.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/vertex/VertexViewProviderRegistry.java rename to common/src/api/java/com/jozufozu/flywheel/api/vertex/VertexViewProviderRegistry.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/visual/BlockEntityVisual.java b/common/src/api/java/com/jozufozu/flywheel/api/visual/BlockEntityVisual.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/visual/BlockEntityVisual.java rename to common/src/api/java/com/jozufozu/flywheel/api/visual/BlockEntityVisual.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/visual/DistanceUpdateLimiter.java b/common/src/api/java/com/jozufozu/flywheel/api/visual/DistanceUpdateLimiter.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/visual/DistanceUpdateLimiter.java rename to common/src/api/java/com/jozufozu/flywheel/api/visual/DistanceUpdateLimiter.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/visual/DynamicVisual.java b/common/src/api/java/com/jozufozu/flywheel/api/visual/DynamicVisual.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/visual/DynamicVisual.java rename to common/src/api/java/com/jozufozu/flywheel/api/visual/DynamicVisual.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/visual/Effect.java b/common/src/api/java/com/jozufozu/flywheel/api/visual/Effect.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/visual/Effect.java rename to common/src/api/java/com/jozufozu/flywheel/api/visual/Effect.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/visual/EffectVisual.java b/common/src/api/java/com/jozufozu/flywheel/api/visual/EffectVisual.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/visual/EffectVisual.java rename to common/src/api/java/com/jozufozu/flywheel/api/visual/EffectVisual.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/visual/EntityVisual.java b/common/src/api/java/com/jozufozu/flywheel/api/visual/EntityVisual.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/visual/EntityVisual.java rename to common/src/api/java/com/jozufozu/flywheel/api/visual/EntityVisual.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/visual/LitVisual.java b/common/src/api/java/com/jozufozu/flywheel/api/visual/LitVisual.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/visual/LitVisual.java rename to common/src/api/java/com/jozufozu/flywheel/api/visual/LitVisual.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/visual/TickableVisual.java b/common/src/api/java/com/jozufozu/flywheel/api/visual/TickableVisual.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/visual/TickableVisual.java rename to common/src/api/java/com/jozufozu/flywheel/api/visual/TickableVisual.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/visual/Visual.java b/common/src/api/java/com/jozufozu/flywheel/api/visual/Visual.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/visual/Visual.java rename to common/src/api/java/com/jozufozu/flywheel/api/visual/Visual.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/visualization/BlockEntityVisualizer.java b/common/src/api/java/com/jozufozu/flywheel/api/visualization/BlockEntityVisualizer.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/visualization/BlockEntityVisualizer.java rename to common/src/api/java/com/jozufozu/flywheel/api/visualization/BlockEntityVisualizer.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/visualization/EntityVisualizer.java b/common/src/api/java/com/jozufozu/flywheel/api/visualization/EntityVisualizer.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/visualization/EntityVisualizer.java rename to common/src/api/java/com/jozufozu/flywheel/api/visualization/EntityVisualizer.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/visualization/VisualEmbedding.java b/common/src/api/java/com/jozufozu/flywheel/api/visualization/VisualEmbedding.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/visualization/VisualEmbedding.java rename to common/src/api/java/com/jozufozu/flywheel/api/visualization/VisualEmbedding.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/visualization/VisualManager.java b/common/src/api/java/com/jozufozu/flywheel/api/visualization/VisualManager.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/visualization/VisualManager.java rename to common/src/api/java/com/jozufozu/flywheel/api/visualization/VisualManager.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/visualization/VisualizationContext.java b/common/src/api/java/com/jozufozu/flywheel/api/visualization/VisualizationContext.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/visualization/VisualizationContext.java rename to common/src/api/java/com/jozufozu/flywheel/api/visualization/VisualizationContext.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/visualization/VisualizationLevel.java b/common/src/api/java/com/jozufozu/flywheel/api/visualization/VisualizationLevel.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/visualization/VisualizationLevel.java rename to common/src/api/java/com/jozufozu/flywheel/api/visualization/VisualizationLevel.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/visualization/VisualizationManager.java b/common/src/api/java/com/jozufozu/flywheel/api/visualization/VisualizationManager.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/visualization/VisualizationManager.java rename to common/src/api/java/com/jozufozu/flywheel/api/visualization/VisualizationManager.java diff --git a/common/src/main/java/com/jozufozu/flywheel/api/visualization/VisualizerRegistry.java b/common/src/api/java/com/jozufozu/flywheel/api/visualization/VisualizerRegistry.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/api/visualization/VisualizerRegistry.java rename to common/src/api/java/com/jozufozu/flywheel/api/visualization/VisualizerRegistry.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/Backends.java b/common/src/backend/java/com/jozufozu/flywheel/backend/Backends.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/Backends.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/Backends.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/FlwBackendXplat.java b/common/src/backend/java/com/jozufozu/flywheel/backend/FlwBackendXplat.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/FlwBackendXplat.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/FlwBackendXplat.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/InternalVertex.java b/common/src/backend/java/com/jozufozu/flywheel/backend/InternalVertex.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/InternalVertex.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/InternalVertex.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/LayoutAttributes.java b/common/src/backend/java/com/jozufozu/flywheel/backend/LayoutAttributes.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/LayoutAttributes.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/LayoutAttributes.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/Samplers.java b/common/src/backend/java/com/jozufozu/flywheel/backend/Samplers.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/Samplers.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/Samplers.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/ShaderIndices.java b/common/src/backend/java/com/jozufozu/flywheel/backend/ShaderIndices.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/ShaderIndices.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/ShaderIndices.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/ContextShader.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/ContextShader.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/ContextShader.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/ContextShader.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/FlwPrograms.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/FlwPrograms.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/FlwPrograms.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/FlwPrograms.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/IndirectPrograms.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/IndirectPrograms.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/IndirectPrograms.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/IndirectPrograms.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/InstancingPrograms.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/InstancingPrograms.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/InstancingPrograms.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/InstancingPrograms.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/LayoutInterpreter.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/LayoutInterpreter.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/LayoutInterpreter.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/LayoutInterpreter.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/Pipeline.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/Pipeline.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/Pipeline.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/Pipeline.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/PipelineCompiler.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/PipelineCompiler.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/PipelineCompiler.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/PipelineCompiler.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/PipelineProgramKey.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/PipelineProgramKey.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/PipelineProgramKey.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/PipelineProgramKey.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/Pipelines.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/Pipelines.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/Pipelines.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/Pipelines.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/SourceChecks.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/SourceChecks.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/SourceChecks.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/SourceChecks.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/component/BufferTextureInstanceComponent.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/component/BufferTextureInstanceComponent.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/component/BufferTextureInstanceComponent.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/component/BufferTextureInstanceComponent.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/component/InstanceAssemblerComponent.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/component/InstanceAssemblerComponent.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/component/InstanceAssemblerComponent.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/component/InstanceAssemblerComponent.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/component/InstanceStructComponent.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/component/InstanceStructComponent.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/component/InstanceStructComponent.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/component/InstanceStructComponent.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/component/SsboInstanceComponent.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/component/SsboInstanceComponent.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/component/SsboInstanceComponent.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/component/SsboInstanceComponent.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/component/StringSubstitutionComponent.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/component/StringSubstitutionComponent.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/component/StringSubstitutionComponent.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/component/StringSubstitutionComponent.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/component/UberShaderComponent.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/component/UberShaderComponent.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/component/UberShaderComponent.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/component/UberShaderComponent.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/core/Compilation.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/core/Compilation.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/core/Compilation.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/core/Compilation.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/core/CompilationHarness.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/core/CompilationHarness.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/core/CompilationHarness.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/core/CompilationHarness.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/core/Compile.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/core/Compile.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/core/Compile.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/core/Compile.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/core/CompilerStats.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/core/CompilerStats.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/core/CompilerStats.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/core/CompilerStats.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/core/FailedCompilation.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/core/FailedCompilation.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/core/FailedCompilation.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/core/FailedCompilation.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/core/LinkResult.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/core/LinkResult.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/core/LinkResult.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/core/LinkResult.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/core/ProgramLinker.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/core/ProgramLinker.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/core/ProgramLinker.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/core/ProgramLinker.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/core/ShaderCache.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/core/ShaderCache.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/core/ShaderCache.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/core/ShaderCache.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/core/ShaderResult.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/core/ShaderResult.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/core/ShaderResult.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/core/ShaderResult.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/compile/core/SourceLoader.java b/common/src/backend/java/com/jozufozu/flywheel/backend/compile/core/SourceLoader.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/compile/core/SourceLoader.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/compile/core/SourceLoader.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/AbstractInstancer.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/AbstractInstancer.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/AbstractInstancer.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/AbstractInstancer.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/CommonCrumbling.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/CommonCrumbling.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/CommonCrumbling.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/CommonCrumbling.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/DrawManager.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/DrawManager.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/DrawManager.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/DrawManager.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/EngineImpl.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/EngineImpl.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/EngineImpl.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/EngineImpl.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/EnvironmentStorage.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/EnvironmentStorage.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/EnvironmentStorage.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/EnvironmentStorage.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/GroupKey.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/GroupKey.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/GroupKey.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/GroupKey.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/IndexPool.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/IndexPool.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/IndexPool.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/IndexPool.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/InstanceHandleImpl.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/InstanceHandleImpl.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/InstanceHandleImpl.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/InstanceHandleImpl.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/InstancerKey.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/InstancerKey.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/InstancerKey.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/InstancerKey.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/InstancerProviderImpl.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/InstancerProviderImpl.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/InstancerProviderImpl.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/InstancerProviderImpl.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/MaterialEncoder.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/MaterialEncoder.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/MaterialEncoder.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/MaterialEncoder.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/MaterialRenderState.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/MaterialRenderState.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/MaterialRenderState.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/MaterialRenderState.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/MeshPool.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/MeshPool.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/MeshPool.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/MeshPool.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/TextureBinder.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/TextureBinder.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/TextureBinder.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/TextureBinder.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/embed/AbstractEmbeddedEnvironment.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/embed/AbstractEmbeddedEnvironment.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/embed/AbstractEmbeddedEnvironment.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/embed/AbstractEmbeddedEnvironment.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/embed/EmbeddedLightTexture.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/embed/EmbeddedLightTexture.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/embed/EmbeddedLightTexture.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/embed/EmbeddedLightTexture.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/embed/EmbeddedLightVolume.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/embed/EmbeddedLightVolume.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/embed/EmbeddedLightVolume.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/embed/EmbeddedLightVolume.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/embed/EmbeddingUniforms.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/embed/EmbeddingUniforms.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/embed/EmbeddingUniforms.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/embed/EmbeddingUniforms.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/embed/Environment.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/embed/Environment.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/embed/Environment.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/embed/Environment.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/embed/GlobalEnvironment.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/embed/GlobalEnvironment.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/embed/GlobalEnvironment.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/embed/GlobalEnvironment.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/embed/NestedEmbeddedEnvironment.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/embed/NestedEmbeddedEnvironment.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/embed/NestedEmbeddedEnvironment.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/embed/NestedEmbeddedEnvironment.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/embed/TopLevelEmbeddedEnvironment.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/embed/TopLevelEmbeddedEnvironment.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/embed/TopLevelEmbeddedEnvironment.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/embed/TopLevelEmbeddedEnvironment.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectBuffers.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectBuffers.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectBuffers.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectBuffers.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectCullingGroup.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectCullingGroup.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectCullingGroup.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectCullingGroup.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectDraw.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectDraw.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectDraw.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectDraw.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectDrawManager.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectDrawManager.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectDrawManager.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectDrawManager.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectInstancer.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectInstancer.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectInstancer.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectInstancer.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/indirect/ResizableStorageArray.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/indirect/ResizableStorageArray.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/indirect/ResizableStorageArray.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/indirect/ResizableStorageArray.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/indirect/ResizableStorageBuffer.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/indirect/ResizableStorageBuffer.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/indirect/ResizableStorageBuffer.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/indirect/ResizableStorageBuffer.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/indirect/ScatterList.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/indirect/ScatterList.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/indirect/ScatterList.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/indirect/ScatterList.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/indirect/StagingBuffer.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/indirect/StagingBuffer.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/indirect/StagingBuffer.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/indirect/StagingBuffer.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/indirect/TransferList.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/indirect/TransferList.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/indirect/TransferList.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/indirect/TransferList.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/instancing/InstancedDraw.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/instancing/InstancedDraw.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/instancing/InstancedDraw.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/instancing/InstancedDraw.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/instancing/InstancedDrawManager.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/instancing/InstancedDrawManager.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/instancing/InstancedDrawManager.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/instancing/InstancedDrawManager.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/instancing/InstancedInstancer.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/instancing/InstancedInstancer.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/instancing/InstancedInstancer.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/instancing/InstancedInstancer.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/instancing/InstancedRenderStage.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/instancing/InstancedRenderStage.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/instancing/InstancedRenderStage.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/instancing/InstancedRenderStage.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/uniform/DebugMode.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/uniform/DebugMode.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/uniform/DebugMode.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/uniform/DebugMode.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/uniform/FogUniforms.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/uniform/FogUniforms.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/uniform/FogUniforms.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/uniform/FogUniforms.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/uniform/FrameUniforms.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/uniform/FrameUniforms.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/uniform/FrameUniforms.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/uniform/FrameUniforms.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/uniform/LevelUniforms.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/uniform/LevelUniforms.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/uniform/LevelUniforms.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/uniform/LevelUniforms.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/uniform/OptionsUniforms.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/uniform/OptionsUniforms.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/uniform/OptionsUniforms.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/uniform/OptionsUniforms.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/uniform/PlayerUniforms.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/uniform/PlayerUniforms.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/uniform/PlayerUniforms.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/uniform/PlayerUniforms.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/uniform/UniformBuffer.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/uniform/UniformBuffer.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/uniform/UniformBuffer.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/uniform/UniformBuffer.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/uniform/UniformWriter.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/uniform/UniformWriter.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/uniform/UniformWriter.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/uniform/UniformWriter.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/engine/uniform/Uniforms.java b/common/src/backend/java/com/jozufozu/flywheel/backend/engine/uniform/Uniforms.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/engine/uniform/Uniforms.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/engine/uniform/Uniforms.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/Driver.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/Driver.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/Driver.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/Driver.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/GlCompat.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/GlCompat.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/GlCompat.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/GlCompat.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/GlFence.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/GlFence.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/GlFence.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/GlFence.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/GlNumericType.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/GlNumericType.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/GlNumericType.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/GlNumericType.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/GlObject.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/GlObject.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/GlObject.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/GlObject.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/GlPrimitive.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/GlPrimitive.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/GlPrimitive.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/GlPrimitive.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/GlStateTracker.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/GlStateTracker.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/GlStateTracker.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/GlStateTracker.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/GlTexture.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/GlTexture.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/GlTexture.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/GlTexture.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/GlTextureUnit.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/GlTextureUnit.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/GlTextureUnit.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/GlTextureUnit.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/TextureBuffer.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/TextureBuffer.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/TextureBuffer.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/TextureBuffer.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArray.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArray.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArray.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArray.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArrayDSA.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArrayDSA.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArrayDSA.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArrayDSA.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArrayGL3.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArrayGL3.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArrayGL3.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArrayGL3.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArraySeparateAttributes.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArraySeparateAttributes.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArraySeparateAttributes.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/array/GlVertexArraySeparateAttributes.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/array/VertexAttribute.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/array/VertexAttribute.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/array/VertexAttribute.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/array/VertexAttribute.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/Buffer.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/buffer/Buffer.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/Buffer.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/buffer/Buffer.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/GlBuffer.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/buffer/GlBuffer.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/GlBuffer.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/buffer/GlBuffer.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/GlBufferType.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/buffer/GlBufferType.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/GlBufferType.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/buffer/GlBufferType.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/GlBufferUsage.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/buffer/GlBufferUsage.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/GlBufferUsage.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/buffer/GlBufferUsage.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/error/GlError.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/error/GlError.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/error/GlError.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/error/GlError.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/error/GlException.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/error/GlException.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/error/GlException.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/error/GlException.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlProgram.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/shader/GlProgram.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlProgram.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/shader/GlProgram.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlShader.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/shader/GlShader.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlShader.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/shader/GlShader.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/gl/shader/ShaderType.java b/common/src/backend/java/com/jozufozu/flywheel/backend/gl/shader/ShaderType.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/gl/shader/ShaderType.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/gl/shader/ShaderType.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/GlslVersion.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/GlslVersion.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/GlslVersion.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/GlslVersion.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/LoadError.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/LoadError.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/LoadError.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/LoadError.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/LoadResult.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/LoadResult.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/LoadResult.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/LoadResult.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/ShaderSources.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/ShaderSources.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/ShaderSources.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/ShaderSources.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/SourceComponent.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/SourceComponent.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/SourceComponent.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/SourceComponent.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/SourceFile.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/SourceFile.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/SourceFile.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/SourceFile.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/SourceLines.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/SourceLines.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/SourceLines.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/SourceLines.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/ConsoleColors.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/ConsoleColors.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/ConsoleColors.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/ConsoleColors.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/ErrorBuilder.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/ErrorBuilder.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/ErrorBuilder.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/ErrorBuilder.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/ErrorLevel.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/ErrorLevel.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/ErrorLevel.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/ErrorLevel.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/lines/Divider.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/lines/Divider.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/lines/Divider.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/lines/Divider.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/lines/ErrorLine.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/lines/ErrorLine.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/lines/ErrorLine.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/lines/ErrorLine.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/lines/FileLine.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/lines/FileLine.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/lines/FileLine.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/lines/FileLine.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/lines/HeaderLine.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/lines/HeaderLine.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/lines/HeaderLine.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/lines/HeaderLine.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/lines/NestedLine.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/lines/NestedLine.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/lines/NestedLine.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/lines/NestedLine.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/lines/SourceLine.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/lines/SourceLine.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/lines/SourceLine.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/lines/SourceLine.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/lines/SpanHighlightLine.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/lines/SpanHighlightLine.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/lines/SpanHighlightLine.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/lines/SpanHighlightLine.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/lines/TextLine.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/lines/TextLine.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/error/lines/TextLine.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/error/lines/TextLine.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/BinOp.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/BinOp.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/BinOp.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/BinOp.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/FnSignature.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/FnSignature.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/FnSignature.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/FnSignature.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/GlslBlock.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/GlslBlock.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/GlslBlock.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/GlslBlock.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/GlslBuilder.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/GlslBuilder.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/GlslBuilder.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/GlslBuilder.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/GlslExpr.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/GlslExpr.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/GlslExpr.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/GlslExpr.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/GlslFn.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/GlslFn.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/GlslFn.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/GlslFn.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/GlslStmt.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/GlslStmt.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/GlslStmt.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/GlslStmt.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/GlslStruct.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/GlslStruct.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/GlslStruct.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/GlslStruct.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/GlslSwitch.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/GlslSwitch.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/GlslSwitch.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/GlslSwitch.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/GlslUniformBlock.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/GlslUniformBlock.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/GlslUniformBlock.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/GlslUniformBlock.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/GlslVertexInput.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/GlslVertexInput.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/generate/GlslVertexInput.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/generate/GlslVertexInput.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/parse/Import.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/parse/Import.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/parse/Import.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/parse/Import.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/parse/ShaderField.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/parse/ShaderField.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/parse/ShaderField.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/parse/ShaderField.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/parse/ShaderFunction.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/parse/ShaderFunction.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/parse/ShaderFunction.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/parse/ShaderFunction.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/parse/ShaderStruct.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/parse/ShaderStruct.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/parse/ShaderStruct.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/parse/ShaderStruct.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/parse/ShaderVariable.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/parse/ShaderVariable.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/parse/ShaderVariable.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/parse/ShaderVariable.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/parse/StructField.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/parse/StructField.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/parse/StructField.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/parse/StructField.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/span/CharPos.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/span/CharPos.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/span/CharPos.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/span/CharPos.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/span/ErrorSpan.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/span/ErrorSpan.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/span/ErrorSpan.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/span/ErrorSpan.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/span/Span.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/span/Span.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/span/Span.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/span/Span.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/glsl/span/StringSpan.java b/common/src/backend/java/com/jozufozu/flywheel/backend/glsl/span/StringSpan.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/glsl/span/StringSpan.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/glsl/span/StringSpan.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/mixin/AbstractClientPlayerAccessor.java b/common/src/backend/java/com/jozufozu/flywheel/backend/mixin/AbstractClientPlayerAccessor.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/mixin/AbstractClientPlayerAccessor.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/mixin/AbstractClientPlayerAccessor.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/mixin/GameRendererAccessor.java b/common/src/backend/java/com/jozufozu/flywheel/backend/mixin/GameRendererAccessor.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/mixin/GameRendererAccessor.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/mixin/GameRendererAccessor.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/mixin/GlStateManagerMixin.java b/common/src/backend/java/com/jozufozu/flywheel/backend/mixin/GlStateManagerMixin.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/mixin/GlStateManagerMixin.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/mixin/GlStateManagerMixin.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/mixin/LevelRendererAccessor.java b/common/src/backend/java/com/jozufozu/flywheel/backend/mixin/LevelRendererAccessor.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/mixin/LevelRendererAccessor.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/mixin/LevelRendererAccessor.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/mixin/LightTextureAccessor.java b/common/src/backend/java/com/jozufozu/flywheel/backend/mixin/LightTextureAccessor.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/mixin/LightTextureAccessor.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/mixin/LightTextureAccessor.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/mixin/OptionsMixin.java b/common/src/backend/java/com/jozufozu/flywheel/backend/mixin/OptionsMixin.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/mixin/OptionsMixin.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/mixin/OptionsMixin.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/mixin/OverlayTextureAccessor.java b/common/src/backend/java/com/jozufozu/flywheel/backend/mixin/OverlayTextureAccessor.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/mixin/OverlayTextureAccessor.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/mixin/OverlayTextureAccessor.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/mixin/RenderSystemMixin.java b/common/src/backend/java/com/jozufozu/flywheel/backend/mixin/RenderSystemMixin.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/mixin/RenderSystemMixin.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/mixin/RenderSystemMixin.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/util/AtomicReferenceCounted.java b/common/src/backend/java/com/jozufozu/flywheel/backend/util/AtomicReferenceCounted.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/util/AtomicReferenceCounted.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/util/AtomicReferenceCounted.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/util/MemoryBuffer.java b/common/src/backend/java/com/jozufozu/flywheel/backend/util/MemoryBuffer.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/util/MemoryBuffer.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/util/MemoryBuffer.java diff --git a/common/src/main/java/com/jozufozu/flywheel/backend/util/ReferenceCounted.java b/common/src/backend/java/com/jozufozu/flywheel/backend/util/ReferenceCounted.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/backend/util/ReferenceCounted.java rename to common/src/backend/java/com/jozufozu/flywheel/backend/util/ReferenceCounted.java diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/api_impl.frag b/common/src/backend/resources/assets/flywheel/flywheel/internal/api_impl.frag similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/api_impl.frag rename to common/src/backend/resources/assets/flywheel/flywheel/internal/api_impl.frag diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/api_impl.vert b/common/src/backend/resources/assets/flywheel/flywheel/internal/api_impl.vert similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/api_impl.vert rename to common/src/backend/resources/assets/flywheel/flywheel/internal/api_impl.vert diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/colorizer.glsl b/common/src/backend/resources/assets/flywheel/flywheel/internal/colorizer.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/colorizer.glsl rename to common/src/backend/resources/assets/flywheel/flywheel/internal/colorizer.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/common.frag b/common/src/backend/resources/assets/flywheel/flywheel/internal/common.frag similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/common.frag rename to common/src/backend/resources/assets/flywheel/flywheel/internal/common.frag diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/common.vert b/common/src/backend/resources/assets/flywheel/flywheel/internal/common.vert similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/common.vert rename to common/src/backend/resources/assets/flywheel/flywheel/internal/common.vert diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/components_header.frag b/common/src/backend/resources/assets/flywheel/flywheel/internal/components_header.frag similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/components_header.frag rename to common/src/backend/resources/assets/flywheel/flywheel/internal/components_header.frag diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/components_header.vert b/common/src/backend/resources/assets/flywheel/flywheel/internal/components_header.vert similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/components_header.vert rename to common/src/backend/resources/assets/flywheel/flywheel/internal/components_header.vert diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/diffuse.glsl b/common/src/backend/resources/assets/flywheel/flywheel/internal/diffuse.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/diffuse.glsl rename to common/src/backend/resources/assets/flywheel/flywheel/internal/diffuse.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/fog_distance.glsl b/common/src/backend/resources/assets/flywheel/flywheel/internal/fog_distance.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/fog_distance.glsl rename to common/src/backend/resources/assets/flywheel/flywheel/internal/fog_distance.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/indirect/apply.glsl b/common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/apply.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/indirect/apply.glsl rename to common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/apply.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/indirect/buffer_bindings.glsl b/common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/buffer_bindings.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/indirect/buffer_bindings.glsl rename to common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/buffer_bindings.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/indirect/cull.glsl b/common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/cull.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/indirect/cull.glsl rename to common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/cull.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/indirect/cull_api_impl.glsl b/common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/cull_api_impl.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/indirect/cull_api_impl.glsl rename to common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/cull_api_impl.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/indirect/draw_command.glsl b/common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/draw_command.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/indirect/draw_command.glsl rename to common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/draw_command.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/indirect/main.frag b/common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/main.frag similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/indirect/main.frag rename to common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/main.frag diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/indirect/main.vert b/common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/main.vert similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/indirect/main.vert rename to common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/main.vert diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/indirect/model_descriptor.glsl b/common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/model_descriptor.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/indirect/model_descriptor.glsl rename to common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/model_descriptor.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/indirect/scatter.glsl b/common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/scatter.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/indirect/scatter.glsl rename to common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/scatter.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/instancing/main.frag b/common/src/backend/resources/assets/flywheel/flywheel/internal/instancing/main.frag similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/instancing/main.frag rename to common/src/backend/resources/assets/flywheel/flywheel/internal/instancing/main.frag diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/instancing/main.vert b/common/src/backend/resources/assets/flywheel/flywheel/internal/instancing/main.vert similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/instancing/main.vert rename to common/src/backend/resources/assets/flywheel/flywheel/internal/instancing/main.vert diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/material.glsl b/common/src/backend/resources/assets/flywheel/flywheel/internal/material.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/material.glsl rename to common/src/backend/resources/assets/flywheel/flywheel/internal/material.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/packed_material.glsl b/common/src/backend/resources/assets/flywheel/flywheel/internal/packed_material.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/packed_material.glsl rename to common/src/backend/resources/assets/flywheel/flywheel/internal/packed_material.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/uniforms/fog.glsl b/common/src/backend/resources/assets/flywheel/flywheel/internal/uniforms/fog.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/uniforms/fog.glsl rename to common/src/backend/resources/assets/flywheel/flywheel/internal/uniforms/fog.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/uniforms/frame.glsl b/common/src/backend/resources/assets/flywheel/flywheel/internal/uniforms/frame.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/uniforms/frame.glsl rename to common/src/backend/resources/assets/flywheel/flywheel/internal/uniforms/frame.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/uniforms/level.glsl b/common/src/backend/resources/assets/flywheel/flywheel/internal/uniforms/level.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/uniforms/level.glsl rename to common/src/backend/resources/assets/flywheel/flywheel/internal/uniforms/level.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/uniforms/options.glsl b/common/src/backend/resources/assets/flywheel/flywheel/internal/uniforms/options.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/uniforms/options.glsl rename to common/src/backend/resources/assets/flywheel/flywheel/internal/uniforms/options.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/uniforms/player.glsl b/common/src/backend/resources/assets/flywheel/flywheel/internal/uniforms/player.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/uniforms/player.glsl rename to common/src/backend/resources/assets/flywheel/flywheel/internal/uniforms/player.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/uniforms/uniforms.glsl b/common/src/backend/resources/assets/flywheel/flywheel/internal/uniforms/uniforms.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/uniforms/uniforms.glsl rename to common/src/backend/resources/assets/flywheel/flywheel/internal/uniforms/uniforms.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/internal/vertex_input.vert b/common/src/backend/resources/assets/flywheel/flywheel/internal/vertex_input.vert similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/internal/vertex_input.vert rename to common/src/backend/resources/assets/flywheel/flywheel/internal/vertex_input.vert diff --git a/common/src/main/java/com/jozufozu/flywheel/Flywheel.java b/common/src/lib/java/com/jozufozu/flywheel/Flywheel.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/Flywheel.java rename to common/src/lib/java/com/jozufozu/flywheel/Flywheel.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/backend/SimpleBackend.java b/common/src/lib/java/com/jozufozu/flywheel/lib/backend/SimpleBackend.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/backend/SimpleBackend.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/backend/SimpleBackend.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/box/Box.java b/common/src/lib/java/com/jozufozu/flywheel/lib/box/Box.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/box/Box.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/box/Box.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/box/MutableBox.java b/common/src/lib/java/com/jozufozu/flywheel/lib/box/MutableBox.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/box/MutableBox.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/box/MutableBox.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/instance/AbstractInstance.java b/common/src/lib/java/com/jozufozu/flywheel/lib/instance/AbstractInstance.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/instance/AbstractInstance.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/instance/AbstractInstance.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/instance/ColoredLitInstance.java b/common/src/lib/java/com/jozufozu/flywheel/lib/instance/ColoredLitInstance.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/instance/ColoredLitInstance.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/instance/ColoredLitInstance.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/instance/FlatLit.java b/common/src/lib/java/com/jozufozu/flywheel/lib/instance/FlatLit.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/instance/FlatLit.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/instance/FlatLit.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/instance/InstanceTypes.java b/common/src/lib/java/com/jozufozu/flywheel/lib/instance/InstanceTypes.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/instance/InstanceTypes.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/instance/InstanceTypes.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/instance/OrientedInstance.java b/common/src/lib/java/com/jozufozu/flywheel/lib/instance/OrientedInstance.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/instance/OrientedInstance.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/instance/OrientedInstance.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/instance/ShadowInstance.java b/common/src/lib/java/com/jozufozu/flywheel/lib/instance/ShadowInstance.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/instance/ShadowInstance.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/instance/ShadowInstance.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/instance/SimpleInstanceType.java b/common/src/lib/java/com/jozufozu/flywheel/lib/instance/SimpleInstanceType.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/instance/SimpleInstanceType.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/instance/SimpleInstanceType.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/instance/TransformedInstance.java b/common/src/lib/java/com/jozufozu/flywheel/lib/instance/TransformedInstance.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/instance/TransformedInstance.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/instance/TransformedInstance.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/internal/FlwLibLink.java b/common/src/lib/java/com/jozufozu/flywheel/lib/internal/FlwLibLink.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/internal/FlwLibLink.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/internal/FlwLibLink.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/internal/FlwLibXplat.java b/common/src/lib/java/com/jozufozu/flywheel/lib/internal/FlwLibXplat.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/internal/FlwLibXplat.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/internal/FlwLibXplat.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/internal/package-info.java b/common/src/lib/java/com/jozufozu/flywheel/lib/internal/package-info.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/internal/package-info.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/internal/package-info.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/light/LightPacking.java b/common/src/lib/java/com/jozufozu/flywheel/lib/light/LightPacking.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/light/LightPacking.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/light/LightPacking.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/light/LightVolume.java b/common/src/lib/java/com/jozufozu/flywheel/lib/light/LightVolume.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/light/LightVolume.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/light/LightVolume.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/material/CutoutShaders.java b/common/src/lib/java/com/jozufozu/flywheel/lib/material/CutoutShaders.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/material/CutoutShaders.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/material/CutoutShaders.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/material/FogShaders.java b/common/src/lib/java/com/jozufozu/flywheel/lib/material/FogShaders.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/material/FogShaders.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/material/FogShaders.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/material/Materials.java b/common/src/lib/java/com/jozufozu/flywheel/lib/material/Materials.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/material/Materials.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/material/Materials.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/material/SimpleCutoutShader.java b/common/src/lib/java/com/jozufozu/flywheel/lib/material/SimpleCutoutShader.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/material/SimpleCutoutShader.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/material/SimpleCutoutShader.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/material/SimpleFogShader.java b/common/src/lib/java/com/jozufozu/flywheel/lib/material/SimpleFogShader.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/material/SimpleFogShader.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/material/SimpleFogShader.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/material/SimpleMaterial.java b/common/src/lib/java/com/jozufozu/flywheel/lib/material/SimpleMaterial.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/material/SimpleMaterial.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/material/SimpleMaterial.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/material/SimpleMaterialShaders.java b/common/src/lib/java/com/jozufozu/flywheel/lib/material/SimpleMaterialShaders.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/material/SimpleMaterialShaders.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/material/SimpleMaterialShaders.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/material/StandardMaterialShaders.java b/common/src/lib/java/com/jozufozu/flywheel/lib/material/StandardMaterialShaders.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/material/StandardMaterialShaders.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/material/StandardMaterialShaders.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/math/MatrixMath.java b/common/src/lib/java/com/jozufozu/flywheel/lib/math/MatrixMath.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/math/MatrixMath.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/math/MatrixMath.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/math/MoreMath.java b/common/src/lib/java/com/jozufozu/flywheel/lib/math/MoreMath.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/math/MoreMath.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/math/MoreMath.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/math/RenderMath.java b/common/src/lib/java/com/jozufozu/flywheel/lib/math/RenderMath.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/math/RenderMath.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/math/RenderMath.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/memory/AbstractMemoryBlockImpl.java b/common/src/lib/java/com/jozufozu/flywheel/lib/memory/AbstractMemoryBlockImpl.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/memory/AbstractMemoryBlockImpl.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/memory/AbstractMemoryBlockImpl.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/memory/DebugMemoryBlockImpl.java b/common/src/lib/java/com/jozufozu/flywheel/lib/memory/DebugMemoryBlockImpl.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/memory/DebugMemoryBlockImpl.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/memory/DebugMemoryBlockImpl.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/memory/FlwMemoryTracker.java b/common/src/lib/java/com/jozufozu/flywheel/lib/memory/FlwMemoryTracker.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/memory/FlwMemoryTracker.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/memory/FlwMemoryTracker.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/memory/MemoryBlock.java b/common/src/lib/java/com/jozufozu/flywheel/lib/memory/MemoryBlock.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/memory/MemoryBlock.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/memory/MemoryBlock.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/memory/MemoryBlockImpl.java b/common/src/lib/java/com/jozufozu/flywheel/lib/memory/MemoryBlockImpl.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/memory/MemoryBlockImpl.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/memory/MemoryBlockImpl.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/memory/TrackedMemoryBlockImpl.java b/common/src/lib/java/com/jozufozu/flywheel/lib/memory/TrackedMemoryBlockImpl.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/memory/TrackedMemoryBlockImpl.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/memory/TrackedMemoryBlockImpl.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/LineModelBuilder.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/LineModelBuilder.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/LineModelBuilder.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/LineModelBuilder.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/ModelCache.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/ModelCache.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/ModelCache.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/ModelCache.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/ModelHolder.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/ModelHolder.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/ModelHolder.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/ModelHolder.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/ModelUtil.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/ModelUtil.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/ModelUtil.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/ModelUtil.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/Models.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/Models.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/Models.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/Models.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/QuadIndexSequence.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/QuadIndexSequence.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/QuadIndexSequence.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/QuadIndexSequence.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/QuadMesh.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/QuadMesh.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/QuadMesh.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/QuadMesh.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/SimpleMesh.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/SimpleMesh.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/SimpleMesh.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/SimpleMesh.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/SimpleModel.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/SimpleModel.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/SimpleModel.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/SimpleModel.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/SingleMeshModel.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/SingleMeshModel.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/SingleMeshModel.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/SingleMeshModel.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/baked/BakedModelBuilder.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/baked/BakedModelBuilder.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/baked/BakedModelBuilder.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/baked/BakedModelBuilder.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/baked/BlockModelBuilder.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/baked/BlockModelBuilder.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/baked/BlockModelBuilder.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/baked/BlockModelBuilder.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/baked/MeshEmitter.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/baked/MeshEmitter.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/baked/MeshEmitter.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/baked/MeshEmitter.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/baked/MultiBlockModelBuilder.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/baked/MultiBlockModelBuilder.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/baked/MultiBlockModelBuilder.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/baked/MultiBlockModelBuilder.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/baked/PartialModel.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/baked/PartialModel.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/baked/PartialModel.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/baked/PartialModel.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/baked/TransformingVertexConsumer.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/baked/TransformingVertexConsumer.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/baked/TransformingVertexConsumer.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/baked/TransformingVertexConsumer.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/baked/VirtualBlockGetter.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/baked/VirtualBlockGetter.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/baked/VirtualBlockGetter.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/baked/VirtualBlockGetter.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/baked/VirtualEmptyBlockGetter.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/baked/VirtualEmptyBlockGetter.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/baked/VirtualEmptyBlockGetter.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/baked/VirtualEmptyBlockGetter.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/baked/VirtualLightEngine.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/baked/VirtualLightEngine.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/baked/VirtualLightEngine.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/baked/VirtualLightEngine.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/part/ModelPartConverter.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/part/ModelPartConverter.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/part/ModelPartConverter.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/part/ModelPartConverter.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/model/part/VertexWriter.java b/common/src/lib/java/com/jozufozu/flywheel/lib/model/part/VertexWriter.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/model/part/VertexWriter.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/model/part/VertexWriter.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/BarrierPlan.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/BarrierPlan.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/BarrierPlan.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/BarrierPlan.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/Distribute.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/Distribute.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/Distribute.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/Distribute.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/DynamicNestedPlan.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/DynamicNestedPlan.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/DynamicNestedPlan.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/DynamicNestedPlan.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/Flag.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/Flag.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/Flag.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/Flag.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/ForEachPlan.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/ForEachPlan.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/ForEachPlan.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/ForEachPlan.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/ForEachSlicePlan.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/ForEachSlicePlan.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/ForEachSlicePlan.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/ForEachSlicePlan.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/IfElsePlan.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/IfElsePlan.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/IfElsePlan.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/IfElsePlan.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/MapContextPlan.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/MapContextPlan.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/MapContextPlan.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/MapContextPlan.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/NamedFlag.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/NamedFlag.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/NamedFlag.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/NamedFlag.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/NestedPlan.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/NestedPlan.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/NestedPlan.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/NestedPlan.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/PlanMap.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/PlanMap.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/PlanMap.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/PlanMap.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/RaisePlan.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/RaisePlan.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/RaisePlan.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/RaisePlan.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/RunnablePlan.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/RunnablePlan.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/RunnablePlan.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/RunnablePlan.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/SimplePlan.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/SimplePlan.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/SimplePlan.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/SimplePlan.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/SimplyComposedPlan.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/SimplyComposedPlan.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/SimplyComposedPlan.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/SimplyComposedPlan.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/StageFlag.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/StageFlag.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/StageFlag.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/StageFlag.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/SyncedPlan.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/SyncedPlan.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/SyncedPlan.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/SyncedPlan.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/Synchronizer.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/Synchronizer.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/Synchronizer.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/Synchronizer.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/UnitPlan.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/UnitPlan.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/UnitPlan.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/UnitPlan.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/functional/BooleanSupplierWithContext.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/functional/BooleanSupplierWithContext.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/functional/BooleanSupplierWithContext.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/functional/BooleanSupplierWithContext.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/functional/ConsumerWithContext.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/functional/ConsumerWithContext.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/functional/ConsumerWithContext.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/functional/ConsumerWithContext.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/functional/RunnableWithContext.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/functional/RunnableWithContext.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/functional/RunnableWithContext.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/functional/RunnableWithContext.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/functional/SupplierWithContext.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/functional/SupplierWithContext.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/functional/SupplierWithContext.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/functional/SupplierWithContext.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/task/functional/package-info.java b/common/src/lib/java/com/jozufozu/flywheel/lib/task/functional/package-info.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/task/functional/package-info.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/task/functional/package-info.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/transform/Affine.java b/common/src/lib/java/com/jozufozu/flywheel/lib/transform/Affine.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/transform/Affine.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/transform/Affine.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/transform/PoseTransformStack.java b/common/src/lib/java/com/jozufozu/flywheel/lib/transform/PoseTransformStack.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/transform/PoseTransformStack.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/transform/PoseTransformStack.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/transform/Rotate.java b/common/src/lib/java/com/jozufozu/flywheel/lib/transform/Rotate.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/transform/Rotate.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/transform/Rotate.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/transform/Scale.java b/common/src/lib/java/com/jozufozu/flywheel/lib/transform/Scale.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/transform/Scale.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/transform/Scale.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/transform/Transform.java b/common/src/lib/java/com/jozufozu/flywheel/lib/transform/Transform.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/transform/Transform.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/transform/Transform.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/transform/TransformStack.java b/common/src/lib/java/com/jozufozu/flywheel/lib/transform/TransformStack.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/transform/TransformStack.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/transform/TransformStack.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/transform/Translate.java b/common/src/lib/java/com/jozufozu/flywheel/lib/transform/Translate.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/transform/Translate.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/transform/Translate.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/util/AtomicBitset.java b/common/src/lib/java/com/jozufozu/flywheel/lib/util/AtomicBitset.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/util/AtomicBitset.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/util/AtomicBitset.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/util/FlwUtil.java b/common/src/lib/java/com/jozufozu/flywheel/lib/util/FlwUtil.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/util/FlwUtil.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/util/FlwUtil.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/util/LevelAttached.java b/common/src/lib/java/com/jozufozu/flywheel/lib/util/LevelAttached.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/util/LevelAttached.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/util/LevelAttached.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/util/Pair.java b/common/src/lib/java/com/jozufozu/flywheel/lib/util/Pair.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/util/Pair.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/util/Pair.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/util/ResourceUtil.java b/common/src/lib/java/com/jozufozu/flywheel/lib/util/ResourceUtil.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/util/ResourceUtil.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/util/ResourceUtil.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/util/SectionUtil.java b/common/src/lib/java/com/jozufozu/flywheel/lib/util/SectionUtil.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/util/SectionUtil.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/util/SectionUtil.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/util/ShadersModHandler.java b/common/src/lib/java/com/jozufozu/flywheel/lib/util/ShadersModHandler.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/util/ShadersModHandler.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/util/ShadersModHandler.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/util/StringUtil.java b/common/src/lib/java/com/jozufozu/flywheel/lib/util/StringUtil.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/util/StringUtil.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/util/StringUtil.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/util/Unit.java b/common/src/lib/java/com/jozufozu/flywheel/lib/util/Unit.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/util/Unit.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/util/Unit.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/vertex/AbstractVertexView.java b/common/src/lib/java/com/jozufozu/flywheel/lib/vertex/AbstractVertexView.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/vertex/AbstractVertexView.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/vertex/AbstractVertexView.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/vertex/EmptyVertexList.java b/common/src/lib/java/com/jozufozu/flywheel/lib/vertex/EmptyVertexList.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/vertex/EmptyVertexList.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/vertex/EmptyVertexList.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/vertex/FullVertexView.java b/common/src/lib/java/com/jozufozu/flywheel/lib/vertex/FullVertexView.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/vertex/FullVertexView.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/vertex/FullVertexView.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/vertex/NoOverlayVertexView.java b/common/src/lib/java/com/jozufozu/flywheel/lib/vertex/NoOverlayVertexView.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/vertex/NoOverlayVertexView.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/vertex/NoOverlayVertexView.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/vertex/PosTexNormalVertexView.java b/common/src/lib/java/com/jozufozu/flywheel/lib/vertex/PosTexNormalVertexView.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/vertex/PosTexNormalVertexView.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/vertex/PosTexNormalVertexView.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/vertex/PosVertexView.java b/common/src/lib/java/com/jozufozu/flywheel/lib/vertex/PosVertexView.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/vertex/PosVertexView.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/vertex/PosVertexView.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/visual/AbstractBlockEntityVisual.java b/common/src/lib/java/com/jozufozu/flywheel/lib/visual/AbstractBlockEntityVisual.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/visual/AbstractBlockEntityVisual.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/visual/AbstractBlockEntityVisual.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/visual/AbstractEntityVisual.java b/common/src/lib/java/com/jozufozu/flywheel/lib/visual/AbstractEntityVisual.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/visual/AbstractEntityVisual.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/visual/AbstractEntityVisual.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/visual/AbstractVisual.java b/common/src/lib/java/com/jozufozu/flywheel/lib/visual/AbstractVisual.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/visual/AbstractVisual.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/visual/AbstractVisual.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/visual/EntityComponent.java b/common/src/lib/java/com/jozufozu/flywheel/lib/visual/EntityComponent.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/visual/EntityComponent.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/visual/EntityComponent.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/visual/EntityVisibilityTester.java b/common/src/lib/java/com/jozufozu/flywheel/lib/visual/EntityVisibilityTester.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/visual/EntityVisibilityTester.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/visual/EntityVisibilityTester.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/visual/InstanceRecycler.java b/common/src/lib/java/com/jozufozu/flywheel/lib/visual/InstanceRecycler.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/visual/InstanceRecycler.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/visual/InstanceRecycler.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/visual/SimpleBlockEntityVisualizer.java b/common/src/lib/java/com/jozufozu/flywheel/lib/visual/SimpleBlockEntityVisualizer.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/visual/SimpleBlockEntityVisualizer.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/visual/SimpleBlockEntityVisualizer.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/visual/SimpleDynamicVisual.java b/common/src/lib/java/com/jozufozu/flywheel/lib/visual/SimpleDynamicVisual.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/visual/SimpleDynamicVisual.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/visual/SimpleDynamicVisual.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/visual/SimpleEntityVisual.java b/common/src/lib/java/com/jozufozu/flywheel/lib/visual/SimpleEntityVisual.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/visual/SimpleEntityVisual.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/visual/SimpleEntityVisual.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/visual/SimpleEntityVisualizer.java b/common/src/lib/java/com/jozufozu/flywheel/lib/visual/SimpleEntityVisualizer.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/visual/SimpleEntityVisualizer.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/visual/SimpleEntityVisualizer.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/visual/SimpleTickableVisual.java b/common/src/lib/java/com/jozufozu/flywheel/lib/visual/SimpleTickableVisual.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/visual/SimpleTickableVisual.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/visual/SimpleTickableVisual.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/visual/SmartRecycler.java b/common/src/lib/java/com/jozufozu/flywheel/lib/visual/SmartRecycler.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/visual/SmartRecycler.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/visual/SmartRecycler.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/visual/component/FireComponent.java b/common/src/lib/java/com/jozufozu/flywheel/lib/visual/component/FireComponent.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/visual/component/FireComponent.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/visual/component/FireComponent.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/visual/component/HitboxComponent.java b/common/src/lib/java/com/jozufozu/flywheel/lib/visual/component/HitboxComponent.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/visual/component/HitboxComponent.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/visual/component/HitboxComponent.java diff --git a/common/src/main/java/com/jozufozu/flywheel/lib/visual/component/ShadowComponent.java b/common/src/lib/java/com/jozufozu/flywheel/lib/visual/component/ShadowComponent.java similarity index 100% rename from common/src/main/java/com/jozufozu/flywheel/lib/visual/component/ShadowComponent.java rename to common/src/lib/java/com/jozufozu/flywheel/lib/visual/component/ShadowComponent.java diff --git a/common/src/main/resources/assets/flywheel/flywheel/cutout/epsilon.glsl b/common/src/lib/resources/assets/flywheel/flywheel/cutout/epsilon.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/cutout/epsilon.glsl rename to common/src/lib/resources/assets/flywheel/flywheel/cutout/epsilon.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/cutout/half.glsl b/common/src/lib/resources/assets/flywheel/flywheel/cutout/half.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/cutout/half.glsl rename to common/src/lib/resources/assets/flywheel/flywheel/cutout/half.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/cutout/off.glsl b/common/src/lib/resources/assets/flywheel/flywheel/cutout/off.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/cutout/off.glsl rename to common/src/lib/resources/assets/flywheel/flywheel/cutout/off.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/cutout/one_tenth.glsl b/common/src/lib/resources/assets/flywheel/flywheel/cutout/one_tenth.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/cutout/one_tenth.glsl rename to common/src/lib/resources/assets/flywheel/flywheel/cutout/one_tenth.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/fog/linear.glsl b/common/src/lib/resources/assets/flywheel/flywheel/fog/linear.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/fog/linear.glsl rename to common/src/lib/resources/assets/flywheel/flywheel/fog/linear.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/fog/linear_fade.glsl b/common/src/lib/resources/assets/flywheel/flywheel/fog/linear_fade.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/fog/linear_fade.glsl rename to common/src/lib/resources/assets/flywheel/flywheel/fog/linear_fade.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/fog/none.glsl b/common/src/lib/resources/assets/flywheel/flywheel/fog/none.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/fog/none.glsl rename to common/src/lib/resources/assets/flywheel/flywheel/fog/none.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/instance/cull/oriented.glsl b/common/src/lib/resources/assets/flywheel/flywheel/instance/cull/oriented.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/instance/cull/oriented.glsl rename to common/src/lib/resources/assets/flywheel/flywheel/instance/cull/oriented.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/instance/cull/shadow.glsl b/common/src/lib/resources/assets/flywheel/flywheel/instance/cull/shadow.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/instance/cull/shadow.glsl rename to common/src/lib/resources/assets/flywheel/flywheel/instance/cull/shadow.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/instance/cull/transformed.glsl b/common/src/lib/resources/assets/flywheel/flywheel/instance/cull/transformed.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/instance/cull/transformed.glsl rename to common/src/lib/resources/assets/flywheel/flywheel/instance/cull/transformed.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/instance/oriented.vert b/common/src/lib/resources/assets/flywheel/flywheel/instance/oriented.vert similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/instance/oriented.vert rename to common/src/lib/resources/assets/flywheel/flywheel/instance/oriented.vert diff --git a/common/src/main/resources/assets/flywheel/flywheel/instance/shadow.vert b/common/src/lib/resources/assets/flywheel/flywheel/instance/shadow.vert similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/instance/shadow.vert rename to common/src/lib/resources/assets/flywheel/flywheel/instance/shadow.vert diff --git a/common/src/main/resources/assets/flywheel/flywheel/instance/transformed.vert b/common/src/lib/resources/assets/flywheel/flywheel/instance/transformed.vert similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/instance/transformed.vert rename to common/src/lib/resources/assets/flywheel/flywheel/instance/transformed.vert diff --git a/common/src/main/resources/assets/flywheel/flywheel/material/default.frag b/common/src/lib/resources/assets/flywheel/flywheel/material/default.frag similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/material/default.frag rename to common/src/lib/resources/assets/flywheel/flywheel/material/default.frag diff --git a/common/src/main/resources/assets/flywheel/flywheel/material/default.vert b/common/src/lib/resources/assets/flywheel/flywheel/material/default.vert similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/material/default.vert rename to common/src/lib/resources/assets/flywheel/flywheel/material/default.vert diff --git a/common/src/main/resources/assets/flywheel/flywheel/material/lines.frag b/common/src/lib/resources/assets/flywheel/flywheel/material/lines.frag similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/material/lines.frag rename to common/src/lib/resources/assets/flywheel/flywheel/material/lines.frag diff --git a/common/src/main/resources/assets/flywheel/flywheel/material/lines.vert b/common/src/lib/resources/assets/flywheel/flywheel/material/lines.vert similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/material/lines.vert rename to common/src/lib/resources/assets/flywheel/flywheel/material/lines.vert diff --git a/common/src/main/resources/assets/flywheel/flywheel/material/wireframe.frag b/common/src/lib/resources/assets/flywheel/flywheel/material/wireframe.frag similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/material/wireframe.frag rename to common/src/lib/resources/assets/flywheel/flywheel/material/wireframe.frag diff --git a/common/src/main/resources/assets/flywheel/flywheel/material/wireframe.vert b/common/src/lib/resources/assets/flywheel/flywheel/material/wireframe.vert similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/material/wireframe.vert rename to common/src/lib/resources/assets/flywheel/flywheel/material/wireframe.vert diff --git a/common/src/main/resources/assets/flywheel/flywheel/util/color.glsl b/common/src/lib/resources/assets/flywheel/flywheel/util/color.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/util/color.glsl rename to common/src/lib/resources/assets/flywheel/flywheel/util/color.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/util/matrix.glsl b/common/src/lib/resources/assets/flywheel/flywheel/util/matrix.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/util/matrix.glsl rename to common/src/lib/resources/assets/flywheel/flywheel/util/matrix.glsl diff --git a/common/src/main/resources/assets/flywheel/flywheel/util/quaternion.glsl b/common/src/lib/resources/assets/flywheel/flywheel/util/quaternion.glsl similarity index 100% rename from common/src/main/resources/assets/flywheel/flywheel/util/quaternion.glsl rename to common/src/lib/resources/assets/flywheel/flywheel/util/quaternion.glsl diff --git a/fabric/build.gradle b/fabric/build.gradle index c5837720e..e1e426b0e 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -11,8 +11,6 @@ apply from: rootProject.file('buildSrc/platforms.gradle') apply from: rootProject.file('buildSrc/package-infos.gradle') dependencies { - compileOnly project(path: ':common', configuration: 'namedElements') - modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}" modApi "net.fabricmc.fabric-api:fabric-api:${fabric_api_version}" diff --git a/forge/build.gradle b/forge/build.gradle index ffcfd816f..7066b5c65 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -28,8 +28,6 @@ loom { dependencies { forge "net.minecraftforge:forge:${minecraft_version}-${forge_version}" - compileOnly project(path: ':common', configuration: 'namedElements') - modCompileOnly "maven.modrinth:embeddium:${embeddium_version}" modCompileOnly "maven.modrinth:oculus:${oculus_version}" }