From a69389c175b9683027d56e81a4f655f3fe77aae9 Mon Sep 17 00:00:00 2001 From: Jozufozu Date: Thu, 23 May 2024 00:11:21 -0700 Subject: [PATCH] Ctrl Shift R - Bulk replace com.jozufozu.flywheel with dev.engine_room.flywheel - Optimize imports --- .../flywheel/api/BackendImplemented.java | 2 +- .../engine_room/flywheel/api/Flywheel.java | 2 +- .../flywheel/api/backend/Backend.java | 9 ++- .../flywheel/api/backend/BackendManager.java | 4 +- .../flywheel/api/backend/Engine.java | 17 +++-- .../flywheel/api/event/RenderContext.java | 2 +- .../flywheel/api/event/RenderStage.java | 2 +- .../flywheel/api/instance/Instance.java | 2 +- .../flywheel/api/instance/InstanceHandle.java | 4 +- .../flywheel/api/instance/InstanceType.java | 9 ++- .../flywheel/api/instance/InstanceWriter.java | 2 +- .../flywheel/api/instance/Instancer.java | 4 +- .../api/instance/InstancerProvider.java | 6 +- .../api/internal/DependencyInjection.java | 2 +- .../flywheel/api/internal/FlwApiLink.java | 20 +++--- .../flywheel/api/internal/package-info.java | 2 +- .../flywheel/api/layout/ArrayElementType.java | 2 +- .../flywheel/api/layout/ElementType.java | 2 +- .../flywheel/api/layout/FloatRepr.java | 2 +- .../flywheel/api/layout/IntegerRepr.java | 2 +- .../flywheel/api/layout/Layout.java | 2 +- .../flywheel/api/layout/LayoutBuilder.java | 4 +- .../api/layout/MatrixElementType.java | 2 +- .../api/layout/ScalarElementType.java | 2 +- .../api/layout/UnsignedIntegerRepr.java | 2 +- .../flywheel/api/layout/ValueRepr.java | 2 +- .../api/layout/VectorElementType.java | 2 +- .../flywheel/api/material/CutoutShader.java | 7 +- .../flywheel/api/material/DepthTest.java | 2 +- .../flywheel/api/material/FogShader.java | 7 +- .../flywheel/api/material/Material.java | 2 +- .../api/material/MaterialShaders.java | 7 +- .../flywheel/api/material/Transparency.java | 2 +- .../flywheel/api/material/WriteMask.java | 2 +- .../flywheel/api/model/IndexSequence.java | 2 +- .../engine_room/flywheel/api/model/Mesh.java | 4 +- .../engine_room/flywheel/api/model/Model.java | 4 +- .../flywheel/api/registry/IdRegistry.java | 2 +- .../flywheel/api/registry/Registry.java | 2 +- .../engine_room/flywheel/api/task/Plan.java | 2 +- .../flywheel/api/task/TaskExecutor.java | 2 +- .../api/vertex/MutableVertexList.java | 2 +- .../flywheel/api/vertex/VertexList.java | 2 +- .../flywheel/api/vertex/VertexView.java | 2 +- .../api/vertex/VertexViewProvider.java | 2 +- .../vertex/VertexViewProviderRegistry.java | 5 +- .../api/visual/BlockEntityVisual.java | 5 +- .../api/visual/DistanceUpdateLimiter.java | 2 +- .../flywheel/api/visual/DynamicVisual.java | 9 ++- .../flywheel/api/visual/Effect.java | 4 +- .../flywheel/api/visual/EffectVisual.java | 2 +- .../flywheel/api/visual/EntityVisual.java | 2 +- .../flywheel/api/visual/LitVisual.java | 2 +- .../flywheel/api/visual/TickableVisual.java | 8 +-- .../flywheel/api/visual/Visual.java | 2 +- .../visualization/BlockEntityVisualizer.java | 5 +- .../api/visualization/EntityVisualizer.java | 5 +- .../api/visualization/VisualEmbedding.java | 5 +- .../api/visualization/VisualManager.java | 2 +- .../visualization/VisualizationContext.java | 7 +- .../api/visualization/VisualizationLevel.java | 2 +- .../visualization/VisualizationManager.java | 9 ++- .../api/visualization/VisualizerRegistry.java | 5 +- .../flywheel/backend/Backends.java | 22 +++--- .../flywheel/backend/FlwBackend.java | 4 +- .../flywheel/backend/FlwBackendXplat.java | 7 +- .../flywheel/backend/InternalVertex.java | 17 +++-- .../flywheel/backend/LayoutAttributes.java | 26 +++---- .../flywheel/backend/Samplers.java | 4 +- .../flywheel/backend/ShaderIndices.java | 11 ++- .../backend/compile/ContextShader.java | 8 +-- .../flywheel/backend/compile/FlwPrograms.java | 22 +++--- .../backend/compile/IndirectPrograms.java | 32 ++++----- .../backend/compile/InstancingPrograms.java | 17 ++--- .../backend/compile/LayoutInterpreter.java | 20 +++--- .../flywheel/backend/compile/Pipeline.java | 11 ++- .../backend/compile/PipelineCompiler.java | 29 ++++---- .../backend/compile/PipelineProgramKey.java | 4 +- .../flywheel/backend/compile/Pipelines.java | 10 +-- .../backend/compile/SourceChecks.java | 2 +- .../BufferTextureInstanceComponent.java | 20 +++--- .../component/InstanceAssemblerComponent.java | 32 ++++----- .../component/InstanceStructComponent.java | 14 ++-- .../component/SsboInstanceComponent.java | 22 +++--- .../StringSubstitutionComponent.java | 6 +- .../component/UberShaderComponent.java | 20 +++--- .../backend/compile/core/Compilation.java | 19 +++-- .../compile/core/CompilationHarness.java | 6 +- .../backend/compile/core/Compile.java | 15 ++-- .../backend/compile/core/CompilerStats.java | 12 ++-- .../compile/core/FailedCompilation.java | 19 +++-- .../backend/compile/core/LinkResult.java | 4 +- .../backend/compile/core/ProgramLinker.java | 6 +- .../backend/compile/core/ShaderCache.java | 10 +-- .../backend/compile/core/ShaderResult.java | 4 +- .../backend/compile/core/SourceLoader.java | 7 +- .../backend/engine/AbstractInstancer.java | 12 ++-- .../backend/engine/CommonCrumbling.java | 14 ++-- .../flywheel/backend/engine/DrawManager.java | 21 +++--- .../flywheel/backend/engine/EngineImpl.java | 41 ++++++----- .../backend/engine/EnvironmentStorage.java | 5 +- .../flywheel/backend/engine/GroupKey.java | 8 +-- .../flywheel/backend/engine/IndexPool.java | 11 ++- .../backend/engine/InstanceHandleImpl.java | 4 +- .../flywheel/backend/engine/InstancerKey.java | 12 ++-- .../backend/engine/InstancerProviderImpl.java | 16 ++--- .../backend/engine/MaterialEncoder.java | 13 ++-- .../backend/engine/MaterialRenderState.java | 12 ++-- .../flywheel/backend/engine/MeshPool.java | 18 ++--- .../backend/engine/TextureBinder.java | 4 +- .../embed/AbstractEmbeddedEnvironment.java | 25 ++++--- .../engine/embed/EmbeddedLightTexture.java | 5 +- .../engine/embed/EmbeddedLightVolume.java | 5 +- .../engine/embed/EmbeddingUniforms.java | 2 +- .../backend/engine/embed/Environment.java | 6 +- .../engine/embed/GlobalEnvironment.java | 6 +- .../embed/NestedEmbeddedEnvironment.java | 9 ++- .../embed/TopLevelEmbeddedEnvironment.java | 11 ++- .../engine/indirect/IndirectBuffers.java | 6 +- .../engine/indirect/IndirectCullingGroup.java | 32 ++++----- .../backend/engine/indirect/IndirectDraw.java | 12 ++-- .../engine/indirect/IndirectDrawManager.java | 43 ++++++----- .../engine/indirect/IndirectInstancer.java | 16 ++--- .../indirect/ResizableStorageArray.java | 4 +- .../indirect/ResizableStorageBuffer.java | 6 +- .../backend/engine/indirect/ScatterList.java | 4 +- .../engine/indirect/StagingBuffer.java | 15 ++-- .../backend/engine/indirect/TransferList.java | 4 +- .../engine/instancing/InstancedDraw.java | 10 +-- .../instancing/InstancedDrawManager.java | 47 ++++++------ .../engine/instancing/InstancedInstancer.java | 22 +++--- .../instancing/InstancedRenderStage.java | 14 ++-- .../backend/engine/uniform/DebugMode.java | 2 +- .../backend/engine/uniform/FogUniforms.java | 2 +- .../backend/engine/uniform/FrameUniforms.java | 11 ++- .../backend/engine/uniform/LevelUniforms.java | 5 +- .../engine/uniform/OptionsUniforms.java | 2 +- .../engine/uniform/PlayerUniforms.java | 9 ++- .../backend/engine/uniform/UniformBuffer.java | 10 +-- .../backend/engine/uniform/UniformWriter.java | 5 +- .../backend/engine/uniform/Uniforms.java | 6 +- .../flywheel/backend/gl/Driver.java | 2 +- .../flywheel/backend/gl/GlCompat.java | 10 +-- .../flywheel/backend/gl/GlFence.java | 2 +- .../flywheel/backend/gl/GlNumericType.java | 2 +- .../flywheel/backend/gl/GlObject.java | 2 +- .../flywheel/backend/gl/GlPrimitive.java | 2 +- .../flywheel/backend/gl/GlStateTracker.java | 5 +- .../flywheel/backend/gl/GlTexture.java | 2 +- .../flywheel/backend/gl/GlTextureUnit.java | 2 +- .../flywheel/backend/gl/TextureBuffer.java | 2 +- .../backend/gl/array/GlVertexArray.java | 7 +- .../backend/gl/array/GlVertexArrayDSA.java | 6 +- .../backend/gl/array/GlVertexArrayGL3.java | 8 +-- .../GlVertexArraySeparateAttributes.java | 10 +-- .../backend/gl/array/VertexAttribute.java | 4 +- .../flywheel/backend/gl/buffer/Buffer.java | 4 +- .../flywheel/backend/gl/buffer/GlBuffer.java | 9 +-- .../backend/gl/buffer/GlBufferType.java | 4 +- .../backend/gl/buffer/GlBufferUsage.java | 2 +- .../flywheel/backend/gl/error/GlError.java | 2 +- .../backend/gl/error/GlException.java | 2 +- .../flywheel/backend/gl/shader/GlProgram.java | 6 +- .../flywheel/backend/gl/shader/GlShader.java | 4 +- .../backend/gl/shader/ShaderType.java | 2 +- .../flywheel/backend/glsl/GlslVersion.java | 2 +- .../flywheel/backend/glsl/LoadError.java | 9 ++- .../flywheel/backend/glsl/LoadResult.java | 2 +- .../flywheel/backend/glsl/ShaderSources.java | 2 +- .../backend/glsl/SourceComponent.java | 2 +- .../flywheel/backend/glsl/SourceFile.java | 18 ++--- .../flywheel/backend/glsl/SourceLines.java | 4 +- .../backend/glsl/error/ConsoleColors.java | 2 +- .../backend/glsl/error/ErrorBuilder.java | 25 ++++--- .../backend/glsl/error/ErrorLevel.java | 2 +- .../backend/glsl/error/lines/Divider.java | 2 +- .../backend/glsl/error/lines/ErrorLine.java | 2 +- .../backend/glsl/error/lines/FileLine.java | 2 +- .../backend/glsl/error/lines/HeaderLine.java | 2 +- .../backend/glsl/error/lines/NestedLine.java | 2 +- .../backend/glsl/error/lines/SourceLine.java | 2 +- .../glsl/error/lines/SpanHighlightLine.java | 2 +- .../backend/glsl/error/lines/TextLine.java | 2 +- .../flywheel/backend/glsl/generate/BinOp.java | 2 +- .../backend/glsl/generate/FnSignature.java | 5 +- .../backend/glsl/generate/GlslBlock.java | 2 +- .../backend/glsl/generate/GlslBuilder.java | 2 +- .../backend/glsl/generate/GlslExpr.java | 2 +- .../backend/glsl/generate/GlslFn.java | 4 +- .../backend/glsl/generate/GlslStmt.java | 2 +- .../backend/glsl/generate/GlslStruct.java | 6 +- .../backend/glsl/generate/GlslSwitch.java | 6 +- .../glsl/generate/GlslUniformBlock.java | 6 +- .../glsl/generate/GlslVertexInput.java | 2 +- .../flywheel/backend/glsl/parse/Import.java | 7 +- .../backend/glsl/parse/ShaderField.java | 7 +- .../backend/glsl/parse/ShaderFunction.java | 11 +-- .../backend/glsl/parse/ShaderStruct.java | 7 +- .../backend/glsl/parse/ShaderVariable.java | 4 +- .../backend/glsl/parse/StructField.java | 4 +- .../flywheel/backend/glsl/span/CharPos.java | 2 +- .../flywheel/backend/glsl/span/ErrorSpan.java | 4 +- .../flywheel/backend/glsl/span/Span.java | 6 +- .../backend/glsl/span/StringSpan.java | 4 +- .../mixin/AbstractClientPlayerAccessor.java | 2 +- .../backend/mixin/GlStateManagerMixin.java | 7 +- .../backend/mixin/LevelRendererAccessor.java | 2 +- .../flywheel/backend/mixin/OptionsMixin.java | 5 +- .../backend/mixin/RenderSystemMixin.java | 7 +- .../backend/util/AtomicReferenceCounted.java | 2 +- .../flywheel/backend/util/MemoryBuffer.java | 4 +- .../backend/util/ReferenceCounted.java | 2 +- .../flywheel/internal/indirect/cull.glsl | 2 +- .../resources/flywheel.backend.mixins.json | 2 +- .../flywheel/lib/backend/SimpleBackend.java | 9 ++- .../dev/engine_room/flywheel/lib/box/Box.java | 2 +- .../flywheel/lib/box/MutableBox.java | 2 +- .../lib/instance/AbstractInstance.java | 8 +-- .../lib/instance/ColoredLitInstance.java | 7 +- .../flywheel/lib/instance/FlatLit.java | 7 +- .../flywheel/lib/instance/InstanceTypes.java | 14 ++-- .../lib/instance/OrientedInstance.java | 9 ++- .../flywheel/lib/instance/ShadowInstance.java | 6 +- .../lib/instance/SimpleInstanceType.java | 13 ++-- .../lib/instance/TransformedInstance.java | 8 +-- .../flywheel/lib/internal/FlwLibLink.java | 9 +-- .../flywheel/lib/internal/FlwLibXplat.java | 15 ++-- .../flywheel/lib/internal/package-info.java | 2 +- .../flywheel/lib/light/LightPacking.java | 2 +- .../flywheel/lib/light/LightVolume.java | 9 ++- .../flywheel/lib/material/CutoutShaders.java | 6 +- .../flywheel/lib/material/FogShaders.java | 6 +- .../flywheel/lib/material/Materials.java | 7 +- .../lib/material/SimpleCutoutShader.java | 5 +- .../lib/material/SimpleFogShader.java | 5 +- .../flywheel/lib/material/SimpleMaterial.java | 19 +++-- .../lib/material/SimpleMaterialShaders.java | 5 +- .../lib/material/StandardMaterialShaders.java | 6 +- .../flywheel/lib/math/MatrixMath.java | 2 +- .../flywheel/lib/math/MoreMath.java | 2 +- .../flywheel/lib/math/RenderMath.java | 2 +- .../lib/memory/AbstractMemoryBlockImpl.java | 2 +- .../lib/memory/DebugMemoryBlockImpl.java | 6 +- .../flywheel/lib/memory/FlwMemoryTracker.java | 4 +- .../flywheel/lib/memory/MemoryBlock.java | 2 +- .../flywheel/lib/memory/MemoryBlockImpl.java | 2 +- .../lib/memory/TrackedMemoryBlockImpl.java | 2 +- .../flywheel/lib/model/LineModelBuilder.java | 23 +++--- .../flywheel/lib/model/ModelCache.java | 4 +- .../flywheel/lib/model/ModelHolder.java | 4 +- .../flywheel/lib/model/ModelUtil.java | 22 +++--- .../flywheel/lib/model/Models.java | 12 ++-- .../flywheel/lib/model/QuadIndexSequence.java | 4 +- .../flywheel/lib/model/QuadMesh.java | 6 +- .../flywheel/lib/model/SimpleMesh.java | 8 +-- .../flywheel/lib/model/SimpleModel.java | 4 +- .../flywheel/lib/model/SingleMeshModel.java | 9 +-- .../lib/model/baked/BakedModelBuilder.java | 8 +-- .../lib/model/baked/BlockModelBuilder.java | 8 +-- .../model/baked/MultiBlockModelBuilder.java | 8 +-- .../lib/model/baked/PartialModel.java | 2 +- .../baked/TransformingVertexConsumer.java | 5 +- .../lib/model/baked/VirtualBlockGetter.java | 2 +- .../model/baked/VirtualEmptyBlockGetter.java | 2 +- .../lib/model/baked/VirtualLightEngine.java | 2 +- .../lib/model/part/ModelPartConverter.java | 10 +-- .../flywheel/lib/model/part/VertexWriter.java | 11 +-- .../flywheel/lib/task/BarrierPlan.java | 6 +- .../flywheel/lib/task/Distribute.java | 8 +-- .../flywheel/lib/task/DynamicNestedPlan.java | 8 +-- .../engine_room/flywheel/lib/task/Flag.java | 4 +- .../flywheel/lib/task/ForEachPlan.java | 10 +-- .../flywheel/lib/task/ForEachSlicePlan.java | 10 +-- .../flywheel/lib/task/IfElsePlan.java | 8 +-- .../flywheel/lib/task/MapContextPlan.java | 8 +-- .../flywheel/lib/task/NamedFlag.java | 2 +- .../flywheel/lib/task/NestedPlan.java | 7 +- .../flywheel/lib/task/PlanMap.java | 6 +- .../flywheel/lib/task/RaisePlan.java | 4 +- .../flywheel/lib/task/RunnablePlan.java | 6 +- .../flywheel/lib/task/SimplePlan.java | 9 +-- .../flywheel/lib/task/SimplyComposedPlan.java | 4 +- .../flywheel/lib/task/StageFlag.java | 4 +- .../flywheel/lib/task/SyncedPlan.java | 8 +-- .../flywheel/lib/task/Synchronizer.java | 2 +- .../flywheel/lib/task/UnitPlan.java | 6 +- .../BooleanSupplierWithContext.java | 4 +- .../task/functional/ConsumerWithContext.java | 4 +- .../task/functional/RunnableWithContext.java | 4 +- .../task/functional/SupplierWithContext.java | 4 +- .../lib/task/functional/package-info.java | 4 +- .../flywheel/lib/transform/Affine.java | 2 +- .../lib/transform/PoseTransformStack.java | 2 +- .../flywheel/lib/transform/Rotate.java | 2 +- .../flywheel/lib/transform/Scale.java | 2 +- .../flywheel/lib/transform/Transform.java | 2 +- .../lib/transform/TransformStack.java | 5 +- .../flywheel/lib/transform/Translate.java | 2 +- .../flywheel/lib/util/AtomicBitset.java | 2 +- .../flywheel/lib/util/FlwUtil.java | 2 +- .../flywheel/lib/util/LevelAttached.java | 2 +- .../engine_room/flywheel/lib/util/Pair.java | 2 +- .../flywheel/lib/util/ResourceUtil.java | 4 +- .../flywheel/lib/util/SectionUtil.java | 2 +- .../flywheel/lib/util/ShadersModHandler.java | 6 +- .../flywheel/lib/util/StringUtil.java | 2 +- .../engine_room/flywheel/lib/util/Unit.java | 2 +- .../lib/vertex/AbstractVertexView.java | 6 +- .../flywheel/lib/vertex/EmptyVertexList.java | 5 +- .../flywheel/lib/vertex/FullVertexView.java | 4 +- .../lib/vertex/NoOverlayVertexView.java | 4 +- .../lib/vertex/PosTexNormalVertexView.java | 4 +- .../flywheel/lib/vertex/PosVertexView.java | 2 +- .../lib/visual/AbstractBlockEntityVisual.java | 17 +++-- .../lib/visual/AbstractEntityVisual.java | 13 ++-- .../flywheel/lib/visual/AbstractVisual.java | 11 ++- .../flywheel/lib/visual/EntityComponent.java | 4 +- .../lib/visual/EntityVisibilityTester.java | 5 +- .../flywheel/lib/visual/InstanceRecycler.java | 4 +- .../visual/SimpleBlockEntityVisualizer.java | 11 ++- .../lib/visual/SimpleDynamicVisual.java | 12 ++-- .../lib/visual/SimpleEntityVisual.java | 4 +- .../lib/visual/SimpleEntityVisualizer.java | 10 +-- .../lib/visual/SimpleTickableVisual.java | 12 ++-- .../flywheel/lib/visual/SmartRecycler.java | 4 +- .../lib/visual/VisualizationHelper.java | 10 +-- .../lib/visual/component/FireComponent.java | 32 ++++----- .../lib/visual/component/HitboxComponent.java | 21 +++--- .../lib/visual/component/ShadowComponent.java | 33 +++++---- .../flywheel/impl/BackendArgument.java | 6 +- .../flywheel/impl/BackendManagerImpl.java | 13 ++-- .../flywheel/impl/DebugModeArgument.java | 5 +- .../flywheel/impl/FlwApiLinkImpl.java | 32 ++++----- .../engine_room/flywheel/impl/FlwConfig.java | 4 +- .../flywheel/impl/FlwDebugInfo.java | 9 ++- .../engine_room/flywheel/impl/FlwImpl.java | 22 +++--- .../flywheel/impl/FlwImplXplat.java | 11 ++- .../flywheel/impl/FlwLibLinkImpl.java | 9 +-- .../impl/event/RenderContextImpl.java | 4 +- .../extension/BlockEntityTypeExtension.java | 4 +- .../impl/extension/EntityTypeExtension.java | 4 +- .../impl/extension/LevelExtension.java | 2 +- .../impl/extension/PoseStackExtension.java | 4 +- .../impl/extension/VertexFormatExtension.java | 4 +- .../impl/layout/ArrayElementTypeImpl.java | 6 +- .../impl/layout/LayoutBuilderImpl.java | 18 ++--- .../flywheel/impl/layout/LayoutImpl.java | 6 +- .../impl/layout/MatrixElementTypeImpl.java | 6 +- .../impl/layout/ScalarElementTypeImpl.java | 6 +- .../impl/layout/VectorElementTypeImpl.java | 6 +- .../impl/mixin/BlockEntityTypeMixin.java | 6 +- .../impl/mixin/ClientChunkCacheMixin.java | 5 +- .../flywheel/impl/mixin/ClientLevelMixin.java | 6 +- .../flywheel/impl/mixin/EntityTypeMixin.java | 7 +- .../flywheel/impl/mixin/LevelMixin.java | 5 +- .../impl/mixin/LevelRendererMixin.java | 10 +-- .../flywheel/impl/mixin/PoseStackMixin.java | 7 +- .../impl/mixin/VertexFormatMixin.java | 7 +- .../impl/mixin/fix/FixFabulousDepthMixin.java | 2 +- .../impl/mixin/fix/FixNormalScalingMixin.java | 2 +- .../mixin/visualmanage/BlockEntityMixin.java | 4 +- .../mixin/visualmanage/LevelChunkMixin.java | 4 +- .../visualmanage/LevelRendererMixin.java | 4 +- .../mixin/visualmanage/RebuildTaskMixin.java | 4 +- .../impl/registry/IdRegistryImpl.java | 5 +- .../flywheel/impl/registry/RegistryImpl.java | 5 +- .../flywheel/impl/task/FlwTaskExecutor.java | 6 +- .../impl/task/ParallelTaskExecutor.java | 7 +- .../impl/task/SerialTaskExecutor.java | 4 +- .../impl/task/ThreadGroupNotifier.java | 2 +- .../flywheel/impl/task/WaitGroup.java | 2 +- .../impl/vertex/InferredVertexFormatInfo.java | 2 +- .../impl/vertex/InferredVertexView.java | 8 +-- .../vertex/InferredVertexViewProvider.java | 7 +- .../VertexViewProviderRegistryImpl.java | 7 +- .../impl/visual/DynamicVisualContextImpl.java | 7 +- .../visual/TickableVisualContextImpl.java | 4 +- .../VisualizationEventHandler.java | 9 ++- .../VisualizationManagerImpl.java | 71 +++++++++---------- .../visualization/VisualizerRegistryImpl.java | 11 ++- .../manager/BlockEntityStorage.java | 13 ++-- .../visualization/manager/EffectStorage.java | 10 +-- .../visualization/manager/EntityStorage.java | 11 ++- .../manager/VisualManagerImpl.java | 16 ++--- .../ratelimit/BandedPrimeLimiter.java | 2 +- .../ratelimit/DistanceUpdateLimiterImpl.java | 4 +- .../visualization/ratelimit/NonLimiter.java | 2 +- .../impl/visualization/storage/Action.java | 2 +- .../storage/LitVisualStorage.java | 17 +++-- .../impl/visualization/storage/Storage.java | 25 ++++--- .../visualization/storage/Transaction.java | 2 +- .../flywheel/vanilla/BellVisual.java | 23 +++--- .../flywheel/vanilla/ChestVisual.java | 27 ++++--- .../flywheel/vanilla/MinecartVisual.java | 34 ++++----- .../flywheel/vanilla/ShulkerBoxVisual.java | 24 +++---- .../flywheel/vanilla/TntMinecartVisual.java | 6 +- .../flywheel/vanilla/VanillaVisuals.java | 6 +- .../main/resources/flywheel.impl.mixins.json | 2 +- .../backend/glsl/MockShaderSources.java | 2 +- .../flywheel/backend/glsl/TestBase.java | 5 +- .../backend/glsl/TestErrorMessages.java | 5 +- .../backend/glsl/TestShaderSourceLoading.java | 5 +- .../flywheel/impl/task/WaitGroupTest.java | 2 +- .../lib/task/PlanCompositionTest.java | 6 +- .../flywheel/lib/task/PlanExecutionTest.java | 11 ++- .../flywheel/lib/util/TestAtomicBitset.java | 2 +- .../api/event/BeginFrameCallback.java | 2 +- .../EndClientResourceReloadCallback.java | 2 +- .../event/ReloadLevelRendererCallback.java | 2 +- .../api/event/RenderStageCallback.java | 2 +- .../flywheel/backend/FlwBackendXplatImpl.java | 2 +- .../backend/compile/FlwProgramsReloader.java | 5 +- .../lib/model/baked/BakedModelBufferer.java | 2 +- .../baked/ChunkLayerSortedListBuilder.java | 2 +- .../model/baked/FabricBakedModelBuilder.java | 18 ++--- .../model/baked/FabricBlockModelBuilder.java | 18 ++--- .../baked/FabricMultiBlockModelBuilder.java | 18 ++--- .../flywheel/lib/model/baked/MeshEmitter.java | 2 +- .../model/baked/PartialModelEventHandler.java | 5 +- .../lib/model/baked/UniversalMeshEmitter.java | 2 +- .../flywheel/impl/FabricFlwConfig.java | 6 +- .../flywheel/impl/FlwCommands.java | 10 +-- .../flywheel/impl/FlwImplXplatImpl.java | 13 ++-- .../flywheel/impl/FlwLibXplatImpl.java | 19 +++-- .../flywheel/impl/FlywheelFabric.java | 25 ++++--- .../flywheel/impl/mixin/MinecraftMixin.java | 9 ++- .../mixin/fabric/DebugScreenOverlayMixin.java | 5 +- .../impl/mixin/fabric/MinecraftMixin.java | 5 +- .../impl/mixin/fabric/SystemReportMixin.java | 5 +- .../sodium/ChunkBuilderMeshingTaskMixin.java | 5 +- .../impl/mixin/sodium/SodiumMixinPlugin.java | 2 +- fabric/src/main/resources/fabric.mod.json | 2 +- .../flywheel.impl.fabric.mixins.json | 2 +- .../flywheel.impl.sodium.mixins.json | 4 +- .../flywheel/api/event/BeginFrameEvent.java | 2 +- .../event/EndClientResourceReloadEvent.java | 2 +- .../api/event/ReloadLevelRendererEvent.java | 2 +- .../flywheel/api/event/RenderStageEvent.java | 2 +- .../flywheel/backend/FlwBackendXplatImpl.java | 2 +- .../backend/compile/FlwProgramsReloader.java | 2 +- .../lib/model/baked/BakedModelBufferer.java | 2 +- .../baked/ChunkLayerSortedListBuilder.java | 2 +- .../model/baked/ForgeBakedModelBuilder.java | 18 ++--- .../model/baked/ForgeBlockModelBuilder.java | 18 ++--- .../baked/ForgeMultiBlockModelBuilder.java | 18 ++--- .../flywheel/lib/model/baked/MeshEmitter.java | 2 +- .../model/baked/PartialModelEventHandler.java | 2 +- .../flywheel/impl/FlwCommands.java | 10 +-- .../flywheel/impl/FlwImplXplatImpl.java | 13 ++-- .../flywheel/impl/FlwLibXplatImpl.java | 19 +++-- .../flywheel/impl/FlywheelForge.java | 27 ++++--- .../flywheel/impl/ForgeFlwConfig.java | 7 +- .../flywheel/impl/mixin/MinecraftMixin.java | 6 +- .../sodium/ChunkBuilderMeshingTaskMixin.java | 5 +- .../impl/mixin/sodium/SodiumMixinPlugin.java | 2 +- .../flywheel.impl.sodium.mixins.json | 4 +- 456 files changed, 1650 insertions(+), 1727 deletions(-) diff --git a/common/src/api/java/dev/engine_room/flywheel/api/BackendImplemented.java b/common/src/api/java/dev/engine_room/flywheel/api/BackendImplemented.java index 5babd1343..6a5fbba4d 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/BackendImplemented.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/BackendImplemented.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api; +package dev.engine_room.flywheel.api; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/Flywheel.java b/common/src/api/java/dev/engine_room/flywheel/api/Flywheel.java index f410e4ac2..ef18b8b27 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/Flywheel.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/Flywheel.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api; +package dev.engine_room.flywheel.api; import net.minecraft.resources.ResourceLocation; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/backend/Backend.java b/common/src/api/java/dev/engine_room/flywheel/api/backend/Backend.java index 0c6e8ae40..f7b5cebe7 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/backend/Backend.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/backend/Backend.java @@ -1,9 +1,8 @@ -package com.jozufozu.flywheel.api.backend; - -import com.jozufozu.flywheel.api.BackendImplemented; -import com.jozufozu.flywheel.api.internal.FlwApiLink; -import com.jozufozu.flywheel.api.registry.IdRegistry; +package dev.engine_room.flywheel.api.backend; +import dev.engine_room.flywheel.api.BackendImplemented; +import dev.engine_room.flywheel.api.internal.FlwApiLink; +import dev.engine_room.flywheel.api.registry.IdRegistry; import net.minecraft.world.level.LevelAccessor; @BackendImplemented diff --git a/common/src/api/java/dev/engine_room/flywheel/api/backend/BackendManager.java b/common/src/api/java/dev/engine_room/flywheel/api/backend/BackendManager.java index 02eb06020..876700a4d 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/backend/BackendManager.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/backend/BackendManager.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.api.backend; +package dev.engine_room.flywheel.api.backend; -import com.jozufozu.flywheel.api.internal.FlwApiLink; +import dev.engine_room.flywheel.api.internal.FlwApiLink; public final class BackendManager { private BackendManager() { diff --git a/common/src/api/java/dev/engine_room/flywheel/api/backend/Engine.java b/common/src/api/java/dev/engine_room/flywheel/api/backend/Engine.java index ed14b4dbb..ab7d41ee9 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/backend/Engine.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/backend/Engine.java @@ -1,15 +1,14 @@ -package com.jozufozu.flywheel.api.backend; +package dev.engine_room.flywheel.api.backend; import java.util.List; -import com.jozufozu.flywheel.api.BackendImplemented; -import com.jozufozu.flywheel.api.event.RenderContext; -import com.jozufozu.flywheel.api.event.RenderStage; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.api.task.TaskExecutor; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; - +import dev.engine_room.flywheel.api.BackendImplemented; +import dev.engine_room.flywheel.api.event.RenderContext; +import dev.engine_room.flywheel.api.event.RenderStage; +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.task.TaskExecutor; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; import net.minecraft.client.Camera; import net.minecraft.core.BlockPos; import net.minecraft.core.Vec3i; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/event/RenderContext.java b/common/src/api/java/dev/engine_room/flywheel/api/event/RenderContext.java index aa89eb32f..ef27d4169 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/event/RenderContext.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/event/RenderContext.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.event; +package dev.engine_room.flywheel.api.event; import org.jetbrains.annotations.ApiStatus; import org.joml.Matrix4f; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/event/RenderStage.java b/common/src/api/java/dev/engine_room/flywheel/api/event/RenderStage.java index f15cdc070..27183b586 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/event/RenderStage.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/event/RenderStage.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.event; +package dev.engine_room.flywheel.api.event; public enum RenderStage { AFTER_ENTITIES, diff --git a/common/src/api/java/dev/engine_room/flywheel/api/instance/Instance.java b/common/src/api/java/dev/engine_room/flywheel/api/instance/Instance.java index 2dfa86797..19748e9ab 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/instance/Instance.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/instance/Instance.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.instance; +package dev.engine_room.flywheel.api.instance; public interface Instance { InstanceType type(); diff --git a/common/src/api/java/dev/engine_room/flywheel/api/instance/InstanceHandle.java b/common/src/api/java/dev/engine_room/flywheel/api/instance/InstanceHandle.java index 3d2b1264a..f0847058e 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/instance/InstanceHandle.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/instance/InstanceHandle.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.api.instance; +package dev.engine_room.flywheel.api.instance; -import com.jozufozu.flywheel.api.BackendImplemented; +import dev.engine_room.flywheel.api.BackendImplemented; @BackendImplemented public interface InstanceHandle { diff --git a/common/src/api/java/dev/engine_room/flywheel/api/instance/InstanceType.java b/common/src/api/java/dev/engine_room/flywheel/api/instance/InstanceType.java index 6b84e3382..d5e1fbb3e 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/instance/InstanceType.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/instance/InstanceType.java @@ -1,9 +1,8 @@ -package com.jozufozu.flywheel.api.instance; - -import com.jozufozu.flywheel.api.internal.FlwApiLink; -import com.jozufozu.flywheel.api.layout.Layout; -import com.jozufozu.flywheel.api.registry.Registry; +package dev.engine_room.flywheel.api.instance; +import dev.engine_room.flywheel.api.internal.FlwApiLink; +import dev.engine_room.flywheel.api.layout.Layout; +import dev.engine_room.flywheel.api.registry.Registry; import net.minecraft.resources.ResourceLocation; /** diff --git a/common/src/api/java/dev/engine_room/flywheel/api/instance/InstanceWriter.java b/common/src/api/java/dev/engine_room/flywheel/api/instance/InstanceWriter.java index 821e3e3a5..c02f59bf4 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/instance/InstanceWriter.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/instance/InstanceWriter.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.instance; +package dev.engine_room.flywheel.api.instance; /** * InstanceWriters can quickly consume many instances and write them to some memory address. diff --git a/common/src/api/java/dev/engine_room/flywheel/api/instance/Instancer.java b/common/src/api/java/dev/engine_room/flywheel/api/instance/Instancer.java index c91937404..c0b0a5679 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/instance/Instancer.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/instance/Instancer.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.api.instance; +package dev.engine_room.flywheel.api.instance; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.BackendImplemented; +import dev.engine_room.flywheel.api.BackendImplemented; /** * An instancer is how you interact with an instanced model. diff --git a/common/src/api/java/dev/engine_room/flywheel/api/instance/InstancerProvider.java b/common/src/api/java/dev/engine_room/flywheel/api/instance/InstancerProvider.java index 07d641c92..97196d5fd 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/instance/InstancerProvider.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/instance/InstancerProvider.java @@ -1,7 +1,7 @@ -package com.jozufozu.flywheel.api.instance; +package dev.engine_room.flywheel.api.instance; -import com.jozufozu.flywheel.api.BackendImplemented; -import com.jozufozu.flywheel.api.model.Model; +import dev.engine_room.flywheel.api.BackendImplemented; +import dev.engine_room.flywheel.api.model.Model; @BackendImplemented public interface InstancerProvider { diff --git a/common/src/api/java/dev/engine_room/flywheel/api/internal/DependencyInjection.java b/common/src/api/java/dev/engine_room/flywheel/api/internal/DependencyInjection.java index 403b4a785..a681ee304 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/internal/DependencyInjection.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/internal/DependencyInjection.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.internal; +package dev.engine_room.flywheel.api.internal; import java.lang.reflect.Constructor; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/internal/FlwApiLink.java b/common/src/api/java/dev/engine_room/flywheel/api/internal/FlwApiLink.java index 3f1e826aa..a6378aada 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/internal/FlwApiLink.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/internal/FlwApiLink.java @@ -1,17 +1,17 @@ -package com.jozufozu.flywheel.api.internal; +package dev.engine_room.flywheel.api.internal; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.backend.Backend; -import com.jozufozu.flywheel.api.layout.LayoutBuilder; -import com.jozufozu.flywheel.api.registry.IdRegistry; -import com.jozufozu.flywheel.api.registry.Registry; -import com.jozufozu.flywheel.api.vertex.VertexViewProvider; -import com.jozufozu.flywheel.api.visualization.BlockEntityVisualizer; -import com.jozufozu.flywheel.api.visualization.EntityVisualizer; -import com.jozufozu.flywheel.api.visualization.VisualizationManager; import com.mojang.blaze3d.vertex.VertexFormat; +import dev.engine_room.flywheel.api.backend.Backend; +import dev.engine_room.flywheel.api.layout.LayoutBuilder; +import dev.engine_room.flywheel.api.registry.IdRegistry; +import dev.engine_room.flywheel.api.registry.Registry; +import dev.engine_room.flywheel.api.vertex.VertexViewProvider; +import dev.engine_room.flywheel.api.visualization.BlockEntityVisualizer; +import dev.engine_room.flywheel.api.visualization.EntityVisualizer; +import dev.engine_room.flywheel.api.visualization.VisualizationManager; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.LevelAccessor; @@ -19,7 +19,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType; public interface FlwApiLink { - FlwApiLink INSTANCE = DependencyInjection.load(FlwApiLink.class, "com.jozufozu.flywheel.impl.FlwApiLinkImpl"); + FlwApiLink INSTANCE = DependencyInjection.load(FlwApiLink.class, "dev.engine_room.flywheel.impl.FlwApiLinkImpl"); Registry createRegistry(); diff --git a/common/src/api/java/dev/engine_room/flywheel/api/internal/package-info.java b/common/src/api/java/dev/engine_room/flywheel/api/internal/package-info.java index dd1e31fc1..9f47a63f6 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/internal/package-info.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/internal/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @FieldsAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.jozufozu.flywheel.api.internal; +package dev.engine_room.flywheel.api.internal; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/layout/ArrayElementType.java b/common/src/api/java/dev/engine_room/flywheel/api/layout/ArrayElementType.java index fd8c2f06a..763670957 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/layout/ArrayElementType.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/layout/ArrayElementType.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.layout; +package dev.engine_room.flywheel.api.layout; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Range; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/layout/ElementType.java b/common/src/api/java/dev/engine_room/flywheel/api/layout/ElementType.java index 852ef8505..f7da86bb6 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/layout/ElementType.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/layout/ElementType.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.layout; +package dev.engine_room.flywheel.api.layout; public sealed interface ElementType permits ScalarElementType, VectorElementType, MatrixElementType, ArrayElementType { int byteSize(); diff --git a/common/src/api/java/dev/engine_room/flywheel/api/layout/FloatRepr.java b/common/src/api/java/dev/engine_room/flywheel/api/layout/FloatRepr.java index 63b82130a..6bb847948 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/layout/FloatRepr.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/layout/FloatRepr.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.layout; +package dev.engine_room.flywheel.api.layout; public enum FloatRepr implements ValueRepr { BYTE(Byte.BYTES), diff --git a/common/src/api/java/dev/engine_room/flywheel/api/layout/IntegerRepr.java b/common/src/api/java/dev/engine_room/flywheel/api/layout/IntegerRepr.java index c8b1c18e3..50402b2d7 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/layout/IntegerRepr.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/layout/IntegerRepr.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.layout; +package dev.engine_room.flywheel.api.layout; public enum IntegerRepr implements ValueRepr { BYTE(Byte.BYTES), diff --git a/common/src/api/java/dev/engine_room/flywheel/api/layout/Layout.java b/common/src/api/java/dev/engine_room/flywheel/api/layout/Layout.java index 3551576a9..0345dbc53 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/layout/Layout.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/layout/Layout.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.layout; +package dev.engine_room.flywheel.api.layout; import java.util.List; import java.util.Map; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/layout/LayoutBuilder.java b/common/src/api/java/dev/engine_room/flywheel/api/layout/LayoutBuilder.java index db506cdab..e2959f6d6 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/layout/LayoutBuilder.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/layout/LayoutBuilder.java @@ -1,9 +1,9 @@ -package com.jozufozu.flywheel.api.layout; +package dev.engine_room.flywheel.api.layout; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Range; -import com.jozufozu.flywheel.api.internal.FlwApiLink; +import dev.engine_room.flywheel.api.internal.FlwApiLink; @ApiStatus.NonExtendable public interface LayoutBuilder { diff --git a/common/src/api/java/dev/engine_room/flywheel/api/layout/MatrixElementType.java b/common/src/api/java/dev/engine_room/flywheel/api/layout/MatrixElementType.java index fcead2081..75417ddef 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/layout/MatrixElementType.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/layout/MatrixElementType.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.layout; +package dev.engine_room.flywheel.api.layout; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Range; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/layout/ScalarElementType.java b/common/src/api/java/dev/engine_room/flywheel/api/layout/ScalarElementType.java index 1af958585..bdd5c391a 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/layout/ScalarElementType.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/layout/ScalarElementType.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.layout; +package dev.engine_room.flywheel.api.layout; import org.jetbrains.annotations.ApiStatus; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/layout/UnsignedIntegerRepr.java b/common/src/api/java/dev/engine_room/flywheel/api/layout/UnsignedIntegerRepr.java index 8676bd482..c4ef3babb 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/layout/UnsignedIntegerRepr.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/layout/UnsignedIntegerRepr.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.layout; +package dev.engine_room.flywheel.api.layout; public enum UnsignedIntegerRepr implements ValueRepr { UNSIGNED_BYTE(Byte.BYTES), diff --git a/common/src/api/java/dev/engine_room/flywheel/api/layout/ValueRepr.java b/common/src/api/java/dev/engine_room/flywheel/api/layout/ValueRepr.java index 1dcff5001..6a3f7238b 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/layout/ValueRepr.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/layout/ValueRepr.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.layout; +package dev.engine_room.flywheel.api.layout; public sealed interface ValueRepr permits IntegerRepr, UnsignedIntegerRepr, FloatRepr { int byteSize(); diff --git a/common/src/api/java/dev/engine_room/flywheel/api/layout/VectorElementType.java b/common/src/api/java/dev/engine_room/flywheel/api/layout/VectorElementType.java index bc13d6bf5..d0df4bec7 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/layout/VectorElementType.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/layout/VectorElementType.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.layout; +package dev.engine_room.flywheel.api.layout; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Range; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/material/CutoutShader.java b/common/src/api/java/dev/engine_room/flywheel/api/material/CutoutShader.java index 43f8fada9..d3e54294a 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/material/CutoutShader.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/material/CutoutShader.java @@ -1,8 +1,7 @@ -package com.jozufozu.flywheel.api.material; - -import com.jozufozu.flywheel.api.internal.FlwApiLink; -import com.jozufozu.flywheel.api.registry.Registry; +package dev.engine_room.flywheel.api.material; +import dev.engine_room.flywheel.api.internal.FlwApiLink; +import dev.engine_room.flywheel.api.registry.Registry; import net.minecraft.resources.ResourceLocation; public interface CutoutShader { diff --git a/common/src/api/java/dev/engine_room/flywheel/api/material/DepthTest.java b/common/src/api/java/dev/engine_room/flywheel/api/material/DepthTest.java index 0f5370ac7..4d12b8deb 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/material/DepthTest.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/material/DepthTest.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.material; +package dev.engine_room.flywheel.api.material; public enum DepthTest { OFF, diff --git a/common/src/api/java/dev/engine_room/flywheel/api/material/FogShader.java b/common/src/api/java/dev/engine_room/flywheel/api/material/FogShader.java index c68759c1f..4309d53a7 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/material/FogShader.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/material/FogShader.java @@ -1,8 +1,7 @@ -package com.jozufozu.flywheel.api.material; - -import com.jozufozu.flywheel.api.internal.FlwApiLink; -import com.jozufozu.flywheel.api.registry.Registry; +package dev.engine_room.flywheel.api.material; +import dev.engine_room.flywheel.api.internal.FlwApiLink; +import dev.engine_room.flywheel.api.registry.Registry; import net.minecraft.resources.ResourceLocation; public interface FogShader { diff --git a/common/src/api/java/dev/engine_room/flywheel/api/material/Material.java b/common/src/api/java/dev/engine_room/flywheel/api/material/Material.java index 358b823dc..5fb6f740b 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/material/Material.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/material/Material.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.material; +package dev.engine_room.flywheel.api.material; import net.minecraft.resources.ResourceLocation; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/material/MaterialShaders.java b/common/src/api/java/dev/engine_room/flywheel/api/material/MaterialShaders.java index dba708e43..a8f83b1f1 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/material/MaterialShaders.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/material/MaterialShaders.java @@ -1,8 +1,7 @@ -package com.jozufozu.flywheel.api.material; - -import com.jozufozu.flywheel.api.internal.FlwApiLink; -import com.jozufozu.flywheel.api.registry.Registry; +package dev.engine_room.flywheel.api.material; +import dev.engine_room.flywheel.api.internal.FlwApiLink; +import dev.engine_room.flywheel.api.registry.Registry; import net.minecraft.resources.ResourceLocation; public interface MaterialShaders { diff --git a/common/src/api/java/dev/engine_room/flywheel/api/material/Transparency.java b/common/src/api/java/dev/engine_room/flywheel/api/material/Transparency.java index a8c42142d..55ec1a4a5 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/material/Transparency.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/material/Transparency.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.material; +package dev.engine_room.flywheel.api.material; public enum Transparency { OPAQUE, diff --git a/common/src/api/java/dev/engine_room/flywheel/api/material/WriteMask.java b/common/src/api/java/dev/engine_room/flywheel/api/material/WriteMask.java index 8c91b559c..2dc4c070d 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/material/WriteMask.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/material/WriteMask.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.material; +package dev.engine_room.flywheel.api.material; public enum WriteMask { /** diff --git a/common/src/api/java/dev/engine_room/flywheel/api/model/IndexSequence.java b/common/src/api/java/dev/engine_room/flywheel/api/model/IndexSequence.java index 6844417bf..698e11fbe 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/model/IndexSequence.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/model/IndexSequence.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.model; +package dev.engine_room.flywheel.api.model; /** * Represents a sequence of unsigned integer vertex indices. diff --git a/common/src/api/java/dev/engine_room/flywheel/api/model/Mesh.java b/common/src/api/java/dev/engine_room/flywheel/api/model/Mesh.java index 8b84d5ba5..803d11d19 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/model/Mesh.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/model/Mesh.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.api.model; +package dev.engine_room.flywheel.api.model; import org.joml.Vector4fc; -import com.jozufozu.flywheel.api.vertex.MutableVertexList; +import dev.engine_room.flywheel.api.vertex.MutableVertexList; /** * A holder for arbitrary vertex data that can be written to memory or a vertex list. diff --git a/common/src/api/java/dev/engine_room/flywheel/api/model/Model.java b/common/src/api/java/dev/engine_room/flywheel/api/model/Model.java index ad76b132d..4f97f2076 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/model/Model.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/model/Model.java @@ -1,10 +1,10 @@ -package com.jozufozu.flywheel.api.model; +package dev.engine_room.flywheel.api.model; import java.util.List; import org.joml.Vector4fc; -import com.jozufozu.flywheel.api.material.Material; +import dev.engine_room.flywheel.api.material.Material; public interface Model { /** diff --git a/common/src/api/java/dev/engine_room/flywheel/api/registry/IdRegistry.java b/common/src/api/java/dev/engine_room/flywheel/api/registry/IdRegistry.java index 75bd4bd8f..2add5a59b 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/registry/IdRegistry.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/registry/IdRegistry.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.registry; +package dev.engine_room.flywheel.api.registry; import java.util.Collection; import java.util.Set; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/registry/Registry.java b/common/src/api/java/dev/engine_room/flywheel/api/registry/Registry.java index fdfc3dc61..7f14eda04 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/registry/Registry.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/registry/Registry.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.registry; +package dev.engine_room.flywheel.api.registry; import java.util.Set; import java.util.function.Consumer; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/task/Plan.java b/common/src/api/java/dev/engine_room/flywheel/api/task/Plan.java index 703b1a59f..401d890eb 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/task/Plan.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/task/Plan.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.task; +package dev.engine_room.flywheel.api.task; public interface Plan { /** diff --git a/common/src/api/java/dev/engine_room/flywheel/api/task/TaskExecutor.java b/common/src/api/java/dev/engine_room/flywheel/api/task/TaskExecutor.java index 9490aa6aa..0ec30f038 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/task/TaskExecutor.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/task/TaskExecutor.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.task; +package dev.engine_room.flywheel.api.task; import java.util.concurrent.Executor; import java.util.function.BooleanSupplier; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/vertex/MutableVertexList.java b/common/src/api/java/dev/engine_room/flywheel/api/vertex/MutableVertexList.java index 5e82575f6..6bb95559b 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/vertex/MutableVertexList.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/vertex/MutableVertexList.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.vertex; +package dev.engine_room.flywheel.api.vertex; public interface MutableVertexList extends VertexList { void x(int index, float x); diff --git a/common/src/api/java/dev/engine_room/flywheel/api/vertex/VertexList.java b/common/src/api/java/dev/engine_room/flywheel/api/vertex/VertexList.java index f844ad5b3..975f653fe 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/vertex/VertexList.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/vertex/VertexList.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.vertex; +package dev.engine_room.flywheel.api.vertex; import org.joml.Vector3f; import org.joml.Vector4f; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/vertex/VertexView.java b/common/src/api/java/dev/engine_room/flywheel/api/vertex/VertexView.java index 65270f548..1abfda114 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/vertex/VertexView.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/vertex/VertexView.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.vertex; +package dev.engine_room.flywheel.api.vertex; public interface VertexView extends MutableVertexList { long ptr(); diff --git a/common/src/api/java/dev/engine_room/flywheel/api/vertex/VertexViewProvider.java b/common/src/api/java/dev/engine_room/flywheel/api/vertex/VertexViewProvider.java index 91cb569b1..333643d33 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/vertex/VertexViewProvider.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/vertex/VertexViewProvider.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.vertex; +package dev.engine_room.flywheel.api.vertex; public interface VertexViewProvider { VertexView createVertexView(); diff --git a/common/src/api/java/dev/engine_room/flywheel/api/vertex/VertexViewProviderRegistry.java b/common/src/api/java/dev/engine_room/flywheel/api/vertex/VertexViewProviderRegistry.java index b173effb8..558fd32a1 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/vertex/VertexViewProviderRegistry.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/vertex/VertexViewProviderRegistry.java @@ -1,8 +1,9 @@ -package com.jozufozu.flywheel.api.vertex; +package dev.engine_room.flywheel.api.vertex; -import com.jozufozu.flywheel.api.internal.FlwApiLink; import com.mojang.blaze3d.vertex.VertexFormat; +import dev.engine_room.flywheel.api.internal.FlwApiLink; + public final class VertexViewProviderRegistry { private VertexViewProviderRegistry() { } diff --git a/common/src/api/java/dev/engine_room/flywheel/api/visual/BlockEntityVisual.java b/common/src/api/java/dev/engine_room/flywheel/api/visual/BlockEntityVisual.java index 3e5ae15ca..ea1950376 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/visual/BlockEntityVisual.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/visual/BlockEntityVisual.java @@ -1,11 +1,10 @@ -package com.jozufozu.flywheel.api.visual; +package dev.engine_room.flywheel.api.visual; import java.util.function.Consumer; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.instance.Instance; - +import dev.engine_room.flywheel.api.instance.Instance; import net.minecraft.world.level.block.entity.BlockEntity; /** diff --git a/common/src/api/java/dev/engine_room/flywheel/api/visual/DistanceUpdateLimiter.java b/common/src/api/java/dev/engine_room/flywheel/api/visual/DistanceUpdateLimiter.java index 66e039891..ed6ae8729 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/visual/DistanceUpdateLimiter.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/visual/DistanceUpdateLimiter.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.visual; +package dev.engine_room.flywheel.api.visual; import org.jetbrains.annotations.ApiStatus; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/visual/DynamicVisual.java b/common/src/api/java/dev/engine_room/flywheel/api/visual/DynamicVisual.java index 2f815a807..6143f7836 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/visual/DynamicVisual.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/visual/DynamicVisual.java @@ -1,12 +1,11 @@ -package com.jozufozu.flywheel.api.visual; +package dev.engine_room.flywheel.api.visual; import org.jetbrains.annotations.ApiStatus; import org.joml.FrustumIntersection; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.instance.Instancer; -import com.jozufozu.flywheel.api.task.Plan; - +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.instance.Instancer; +import dev.engine_room.flywheel.api.task.Plan; import net.minecraft.client.Camera; /** diff --git a/common/src/api/java/dev/engine_room/flywheel/api/visual/Effect.java b/common/src/api/java/dev/engine_room/flywheel/api/visual/Effect.java index 47827bae7..1b7e233e6 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/visual/Effect.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/visual/Effect.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.api.visual; +package dev.engine_room.flywheel.api.visual; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; /** * An effect is not attached to any formal game object, but allows you to hook into diff --git a/common/src/api/java/dev/engine_room/flywheel/api/visual/EffectVisual.java b/common/src/api/java/dev/engine_room/flywheel/api/visual/EffectVisual.java index 5d238007e..45088bd11 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/visual/EffectVisual.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/visual/EffectVisual.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.visual; +package dev.engine_room.flywheel.api.visual; public interface EffectVisual extends Visual { } diff --git a/common/src/api/java/dev/engine_room/flywheel/api/visual/EntityVisual.java b/common/src/api/java/dev/engine_room/flywheel/api/visual/EntityVisual.java index 886f4fa57..813e70b9d 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/visual/EntityVisual.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/visual/EntityVisual.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.visual; +package dev.engine_room.flywheel.api.visual; import net.minecraft.world.entity.Entity; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/visual/LitVisual.java b/common/src/api/java/dev/engine_room/flywheel/api/visual/LitVisual.java index 9408c99d9..e5d983eb5 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/visual/LitVisual.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/visual/LitVisual.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.visual; +package dev.engine_room.flywheel.api.visual; import java.util.function.LongConsumer; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/visual/TickableVisual.java b/common/src/api/java/dev/engine_room/flywheel/api/visual/TickableVisual.java index 26ab8e76a..ad199a488 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/visual/TickableVisual.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/visual/TickableVisual.java @@ -1,10 +1,10 @@ -package com.jozufozu.flywheel.api.visual; +package dev.engine_room.flywheel.api.visual; import org.jetbrains.annotations.ApiStatus; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.instance.Instancer; -import com.jozufozu.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.instance.Instancer; +import dev.engine_room.flywheel.api.task.Plan; /** * An interface giving {@link Visual}s a hook to have a function called at diff --git a/common/src/api/java/dev/engine_room/flywheel/api/visual/Visual.java b/common/src/api/java/dev/engine_room/flywheel/api/visual/Visual.java index 4627a80f5..7ecbe1cfd 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/visual/Visual.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/visual/Visual.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.visual; +package dev.engine_room.flywheel.api.visual; /** * A general interface providing information about any type of thing that could use Flywheel's visualized rendering. diff --git a/common/src/api/java/dev/engine_room/flywheel/api/visualization/BlockEntityVisualizer.java b/common/src/api/java/dev/engine_room/flywheel/api/visualization/BlockEntityVisualizer.java index bfb354c8d..f24fd1dc5 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/visualization/BlockEntityVisualizer.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/visualization/BlockEntityVisualizer.java @@ -1,7 +1,6 @@ -package com.jozufozu.flywheel.api.visualization; - -import com.jozufozu.flywheel.api.visual.BlockEntityVisual; +package dev.engine_room.flywheel.api.visualization; +import dev.engine_room.flywheel.api.visual.BlockEntityVisual; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/visualization/EntityVisualizer.java b/common/src/api/java/dev/engine_room/flywheel/api/visualization/EntityVisualizer.java index 93826c5b7..f7128f811 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/visualization/EntityVisualizer.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/visualization/EntityVisualizer.java @@ -1,7 +1,6 @@ -package com.jozufozu.flywheel.api.visualization; - -import com.jozufozu.flywheel.api.visual.EntityVisual; +package dev.engine_room.flywheel.api.visualization; +import dev.engine_room.flywheel.api.visual.EntityVisual; import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.world.entity.Entity; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualEmbedding.java b/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualEmbedding.java index 3a7d20d2a..f935ab006 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualEmbedding.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualEmbedding.java @@ -1,10 +1,9 @@ -package com.jozufozu.flywheel.api.visualization; +package dev.engine_room.flywheel.api.visualization; import org.joml.Matrix3fc; import org.joml.Matrix4fc; -import com.jozufozu.flywheel.api.BackendImplemented; - +import dev.engine_room.flywheel.api.BackendImplemented; import net.minecraft.world.level.BlockAndTintGetter; @BackendImplemented diff --git a/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualManager.java b/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualManager.java index b3ba831d7..10d9abdfc 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualManager.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualManager.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.visualization; +package dev.engine_room.flywheel.api.visualization; import org.jetbrains.annotations.ApiStatus; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualizationContext.java b/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualizationContext.java index c1e1f6470..4d5088214 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualizationContext.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualizationContext.java @@ -1,8 +1,7 @@ -package com.jozufozu.flywheel.api.visualization; - -import com.jozufozu.flywheel.api.BackendImplemented; -import com.jozufozu.flywheel.api.instance.InstancerProvider; +package dev.engine_room.flywheel.api.visualization; +import dev.engine_room.flywheel.api.BackendImplemented; +import dev.engine_room.flywheel.api.instance.InstancerProvider; import net.minecraft.core.Vec3i; /** diff --git a/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualizationLevel.java b/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualizationLevel.java index d4dbbca7d..3660dfc27 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualizationLevel.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualizationLevel.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.visualization; +package dev.engine_room.flywheel.api.visualization; import net.minecraft.world.level.LevelAccessor; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualizationManager.java b/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualizationManager.java index cf312b718..0cd976d15 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualizationManager.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualizationManager.java @@ -1,12 +1,11 @@ -package com.jozufozu.flywheel.api.visualization; +package dev.engine_room.flywheel.api.visualization; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.internal.FlwApiLink; -import com.jozufozu.flywheel.api.visual.Effect; -import com.jozufozu.flywheel.api.visual.Visual; - +import dev.engine_room.flywheel.api.internal.FlwApiLink; +import dev.engine_room.flywheel.api.visual.Effect; +import dev.engine_room.flywheel.api.visual.Visual; import net.minecraft.core.Vec3i; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.Level; diff --git a/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualizerRegistry.java b/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualizerRegistry.java index 55e1b8e75..e9dd43370 100644 --- a/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualizerRegistry.java +++ b/common/src/api/java/dev/engine_room/flywheel/api/visualization/VisualizerRegistry.java @@ -1,9 +1,8 @@ -package com.jozufozu.flywheel.api.visualization; +package dev.engine_room.flywheel.api.visualization; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.internal.FlwApiLink; - +import dev.engine_room.flywheel.api.internal.FlwApiLink; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/Backends.java b/common/src/backend/java/dev/engine_room/flywheel/backend/Backends.java index 73698e28b..001f8f39b 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/Backends.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/Backends.java @@ -1,15 +1,15 @@ -package com.jozufozu.flywheel.backend; +package dev.engine_room.flywheel.backend; -import com.jozufozu.flywheel.api.Flywheel; -import com.jozufozu.flywheel.api.backend.Backend; -import com.jozufozu.flywheel.backend.compile.IndirectPrograms; -import com.jozufozu.flywheel.backend.compile.InstancingPrograms; -import com.jozufozu.flywheel.backend.engine.EngineImpl; -import com.jozufozu.flywheel.backend.engine.indirect.IndirectDrawManager; -import com.jozufozu.flywheel.backend.engine.instancing.InstancedDrawManager; -import com.jozufozu.flywheel.backend.gl.GlCompat; -import com.jozufozu.flywheel.lib.backend.SimpleBackend; -import com.jozufozu.flywheel.lib.util.ShadersModHandler; +import dev.engine_room.flywheel.api.Flywheel; +import dev.engine_room.flywheel.api.backend.Backend; +import dev.engine_room.flywheel.backend.compile.IndirectPrograms; +import dev.engine_room.flywheel.backend.compile.InstancingPrograms; +import dev.engine_room.flywheel.backend.engine.EngineImpl; +import dev.engine_room.flywheel.backend.engine.indirect.IndirectDrawManager; +import dev.engine_room.flywheel.backend.engine.instancing.InstancedDrawManager; +import dev.engine_room.flywheel.backend.gl.GlCompat; +import dev.engine_room.flywheel.lib.backend.SimpleBackend; +import dev.engine_room.flywheel.lib.util.ShadersModHandler; public final class Backends { /** diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/FlwBackend.java b/common/src/backend/java/dev/engine_room/flywheel/backend/FlwBackend.java index 8f2f5cb19..36fc3b920 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/FlwBackend.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/FlwBackend.java @@ -1,9 +1,9 @@ -package com.jozufozu.flywheel.backend; +package dev.engine_room.flywheel.backend; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.jozufozu.flywheel.api.Flywheel; +import dev.engine_room.flywheel.api.Flywheel; public final class FlwBackend { public static final Logger LOGGER = LoggerFactory.getLogger(Flywheel.ID + "/backend"); diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/FlwBackendXplat.java b/common/src/backend/java/dev/engine_room/flywheel/backend/FlwBackendXplat.java index 129515b48..6acb2832a 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/FlwBackendXplat.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/FlwBackendXplat.java @@ -1,13 +1,12 @@ -package com.jozufozu.flywheel.backend; - -import com.jozufozu.flywheel.api.internal.DependencyInjection; +package dev.engine_room.flywheel.backend; +import dev.engine_room.flywheel.api.internal.DependencyInjection; import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.state.BlockState; public interface FlwBackendXplat { - FlwBackendXplat INSTANCE = DependencyInjection.load(FlwBackendXplat.class, "com.jozufozu.flywheel.backend.FlwBackendXplatImpl"); + FlwBackendXplat INSTANCE = DependencyInjection.load(FlwBackendXplat.class, "dev.engine_room.flywheel.backend.FlwBackendXplatImpl"); int getLightEmission(BlockState state, BlockGetter level, BlockPos pos); } diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/InternalVertex.java b/common/src/backend/java/dev/engine_room/flywheel/backend/InternalVertex.java index bac7f639b..85d1dc055 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/InternalVertex.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/InternalVertex.java @@ -1,15 +1,14 @@ -package com.jozufozu.flywheel.backend; +package dev.engine_room.flywheel.backend; import java.util.List; -import com.jozufozu.flywheel.api.Flywheel; -import com.jozufozu.flywheel.api.layout.FloatRepr; -import com.jozufozu.flywheel.api.layout.Layout; -import com.jozufozu.flywheel.api.layout.LayoutBuilder; -import com.jozufozu.flywheel.api.vertex.VertexView; -import com.jozufozu.flywheel.backend.gl.array.VertexAttribute; -import com.jozufozu.flywheel.lib.vertex.FullVertexView; - +import dev.engine_room.flywheel.api.Flywheel; +import dev.engine_room.flywheel.api.layout.FloatRepr; +import dev.engine_room.flywheel.api.layout.Layout; +import dev.engine_room.flywheel.api.layout.LayoutBuilder; +import dev.engine_room.flywheel.api.vertex.VertexView; +import dev.engine_room.flywheel.backend.gl.array.VertexAttribute; +import dev.engine_room.flywheel.lib.vertex.FullVertexView; import net.minecraft.resources.ResourceLocation; public final class InternalVertex { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/LayoutAttributes.java b/common/src/backend/java/dev/engine_room/flywheel/backend/LayoutAttributes.java index 5a66ddf54..350d1acc6 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/LayoutAttributes.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/LayoutAttributes.java @@ -1,20 +1,20 @@ -package com.jozufozu.flywheel.backend; +package dev.engine_room.flywheel.backend; import java.util.ArrayList; import java.util.List; -import com.jozufozu.flywheel.api.layout.ArrayElementType; -import com.jozufozu.flywheel.api.layout.ElementType; -import com.jozufozu.flywheel.api.layout.FloatRepr; -import com.jozufozu.flywheel.api.layout.IntegerRepr; -import com.jozufozu.flywheel.api.layout.Layout; -import com.jozufozu.flywheel.api.layout.MatrixElementType; -import com.jozufozu.flywheel.api.layout.ScalarElementType; -import com.jozufozu.flywheel.api.layout.UnsignedIntegerRepr; -import com.jozufozu.flywheel.api.layout.ValueRepr; -import com.jozufozu.flywheel.api.layout.VectorElementType; -import com.jozufozu.flywheel.backend.gl.GlNumericType; -import com.jozufozu.flywheel.backend.gl.array.VertexAttribute; +import dev.engine_room.flywheel.api.layout.ArrayElementType; +import dev.engine_room.flywheel.api.layout.ElementType; +import dev.engine_room.flywheel.api.layout.FloatRepr; +import dev.engine_room.flywheel.api.layout.IntegerRepr; +import dev.engine_room.flywheel.api.layout.Layout; +import dev.engine_room.flywheel.api.layout.MatrixElementType; +import dev.engine_room.flywheel.api.layout.ScalarElementType; +import dev.engine_room.flywheel.api.layout.UnsignedIntegerRepr; +import dev.engine_room.flywheel.api.layout.ValueRepr; +import dev.engine_room.flywheel.api.layout.VectorElementType; +import dev.engine_room.flywheel.backend.gl.GlNumericType; +import dev.engine_room.flywheel.backend.gl.array.VertexAttribute; public class LayoutAttributes { /** diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/Samplers.java b/common/src/backend/java/dev/engine_room/flywheel/backend/Samplers.java index 05c14697f..d8d2975dc 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/Samplers.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/Samplers.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.backend; +package dev.engine_room.flywheel.backend; -import com.jozufozu.flywheel.backend.gl.GlTextureUnit; +import dev.engine_room.flywheel.backend.gl.GlTextureUnit; public class Samplers { public static final GlTextureUnit DIFFUSE = GlTextureUnit.T0; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/ShaderIndices.java b/common/src/backend/java/dev/engine_room/flywheel/backend/ShaderIndices.java index f486979eb..7905fa694 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/ShaderIndices.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/ShaderIndices.java @@ -1,15 +1,14 @@ -package com.jozufozu.flywheel.backend; +package dev.engine_room.flywheel.backend; import java.util.List; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; -import com.jozufozu.flywheel.api.material.CutoutShader; -import com.jozufozu.flywheel.api.material.FogShader; -import com.jozufozu.flywheel.api.material.MaterialShaders; -import com.jozufozu.flywheel.api.registry.Registry; - +import dev.engine_room.flywheel.api.material.CutoutShader; +import dev.engine_room.flywheel.api.material.FogShader; +import dev.engine_room.flywheel.api.material.MaterialShaders; +import dev.engine_room.flywheel.api.registry.Registry; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntMaps; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/ContextShader.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/ContextShader.java index 25be6c307..bcc7832e5 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/ContextShader.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/ContextShader.java @@ -1,13 +1,13 @@ -package com.jozufozu.flywheel.backend.compile; +package dev.engine_room.flywheel.backend.compile; import java.util.Locale; import java.util.function.Consumer; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.backend.Samplers; -import com.jozufozu.flywheel.backend.compile.core.Compilation; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; +import dev.engine_room.flywheel.backend.Samplers; +import dev.engine_room.flywheel.backend.compile.core.Compilation; +import dev.engine_room.flywheel.backend.gl.shader.GlProgram; public enum ContextShader { DEFAULT(null, $ -> { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/FlwPrograms.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/FlwPrograms.java index cbe0b6877..f457d5bf4 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/FlwPrograms.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/FlwPrograms.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.compile; +package dev.engine_room.flywheel.backend.compile; import java.util.List; @@ -7,17 +7,17 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.ImmutableList; -import com.jozufozu.flywheel.api.Flywheel; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.backend.ShaderIndices; -import com.jozufozu.flywheel.backend.compile.component.UberShaderComponent; -import com.jozufozu.flywheel.backend.compile.core.CompilerStats; -import com.jozufozu.flywheel.backend.compile.core.SourceLoader; -import com.jozufozu.flywheel.backend.glsl.ShaderSources; -import com.jozufozu.flywheel.backend.glsl.SourceComponent; -import com.jozufozu.flywheel.backend.glsl.generate.FnSignature; -import com.jozufozu.flywheel.backend.glsl.generate.GlslExpr; +import dev.engine_room.flywheel.api.Flywheel; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.backend.ShaderIndices; +import dev.engine_room.flywheel.backend.compile.component.UberShaderComponent; +import dev.engine_room.flywheel.backend.compile.core.CompilerStats; +import dev.engine_room.flywheel.backend.compile.core.SourceLoader; +import dev.engine_room.flywheel.backend.glsl.ShaderSources; +import dev.engine_room.flywheel.backend.glsl.SourceComponent; +import dev.engine_room.flywheel.backend.glsl.generate.FnSignature; +import dev.engine_room.flywheel.backend.glsl.generate.GlslExpr; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.ResourceManager; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/IndirectPrograms.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/IndirectPrograms.java index 1856776db..a2c7ed16c 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/IndirectPrograms.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/IndirectPrograms.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.compile; +package dev.engine_room.flywheel.backend.compile; import java.util.List; import java.util.Map; @@ -6,22 +6,22 @@ import org.jetbrains.annotations.Nullable; import com.google.common.collect.ImmutableList; -import com.jozufozu.flywheel.api.Flywheel; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.backend.compile.component.InstanceStructComponent; -import com.jozufozu.flywheel.backend.compile.component.SsboInstanceComponent; -import com.jozufozu.flywheel.backend.compile.core.CompilationHarness; -import com.jozufozu.flywheel.backend.compile.core.Compile; -import com.jozufozu.flywheel.backend.engine.uniform.Uniforms; -import com.jozufozu.flywheel.backend.gl.GlCompat; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; -import com.jozufozu.flywheel.backend.gl.shader.ShaderType; -import com.jozufozu.flywheel.backend.glsl.GlslVersion; -import com.jozufozu.flywheel.backend.glsl.ShaderSources; -import com.jozufozu.flywheel.backend.glsl.SourceComponent; -import com.jozufozu.flywheel.backend.util.AtomicReferenceCounted; -import com.jozufozu.flywheel.lib.util.ResourceUtil; +import dev.engine_room.flywheel.api.Flywheel; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.backend.compile.component.InstanceStructComponent; +import dev.engine_room.flywheel.backend.compile.component.SsboInstanceComponent; +import dev.engine_room.flywheel.backend.compile.core.CompilationHarness; +import dev.engine_room.flywheel.backend.compile.core.Compile; +import dev.engine_room.flywheel.backend.engine.uniform.Uniforms; +import dev.engine_room.flywheel.backend.gl.GlCompat; +import dev.engine_room.flywheel.backend.gl.shader.GlProgram; +import dev.engine_room.flywheel.backend.gl.shader.ShaderType; +import dev.engine_room.flywheel.backend.glsl.GlslVersion; +import dev.engine_room.flywheel.backend.glsl.ShaderSources; +import dev.engine_room.flywheel.backend.glsl.SourceComponent; +import dev.engine_room.flywheel.backend.util.AtomicReferenceCounted; +import dev.engine_room.flywheel.lib.util.ResourceUtil; import net.minecraft.resources.ResourceLocation; public class IndirectPrograms extends AtomicReferenceCounted { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/InstancingPrograms.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/InstancingPrograms.java index ea29fe109..f91483469 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/InstancingPrograms.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/InstancingPrograms.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.compile; +package dev.engine_room.flywheel.backend.compile; import java.util.List; import java.util.Map; @@ -6,13 +6,14 @@ import org.jetbrains.annotations.Nullable; import com.google.common.collect.ImmutableList; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.backend.gl.GlCompat; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; -import com.jozufozu.flywheel.backend.glsl.GlslVersion; -import com.jozufozu.flywheel.backend.glsl.ShaderSources; -import com.jozufozu.flywheel.backend.glsl.SourceComponent; -import com.jozufozu.flywheel.backend.util.AtomicReferenceCounted; + +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.backend.gl.GlCompat; +import dev.engine_room.flywheel.backend.gl.shader.GlProgram; +import dev.engine_room.flywheel.backend.glsl.GlslVersion; +import dev.engine_room.flywheel.backend.glsl.ShaderSources; +import dev.engine_room.flywheel.backend.glsl.SourceComponent; +import dev.engine_room.flywheel.backend.util.AtomicReferenceCounted; public class InstancingPrograms extends AtomicReferenceCounted { private static final List EXTENSIONS = getExtensions(GlCompat.MAX_GLSL_VERSION); diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/LayoutInterpreter.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/LayoutInterpreter.java index 41c5c3c15..1f8b370f1 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/LayoutInterpreter.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/LayoutInterpreter.java @@ -1,14 +1,14 @@ -package com.jozufozu.flywheel.backend.compile; +package dev.engine_room.flywheel.backend.compile; -import com.jozufozu.flywheel.api.layout.ArrayElementType; -import com.jozufozu.flywheel.api.layout.ElementType; -import com.jozufozu.flywheel.api.layout.FloatRepr; -import com.jozufozu.flywheel.api.layout.IntegerRepr; -import com.jozufozu.flywheel.api.layout.MatrixElementType; -import com.jozufozu.flywheel.api.layout.ScalarElementType; -import com.jozufozu.flywheel.api.layout.UnsignedIntegerRepr; -import com.jozufozu.flywheel.api.layout.ValueRepr; -import com.jozufozu.flywheel.api.layout.VectorElementType; +import dev.engine_room.flywheel.api.layout.ArrayElementType; +import dev.engine_room.flywheel.api.layout.ElementType; +import dev.engine_room.flywheel.api.layout.FloatRepr; +import dev.engine_room.flywheel.api.layout.IntegerRepr; +import dev.engine_room.flywheel.api.layout.MatrixElementType; +import dev.engine_room.flywheel.api.layout.ScalarElementType; +import dev.engine_room.flywheel.api.layout.UnsignedIntegerRepr; +import dev.engine_room.flywheel.api.layout.ValueRepr; +import dev.engine_room.flywheel.api.layout.VectorElementType; public class LayoutInterpreter { public static String typeName(ElementType type) { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/Pipeline.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/Pipeline.java index a1b5edcec..92a11c4b4 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/Pipeline.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/Pipeline.java @@ -1,15 +1,14 @@ -package com.jozufozu.flywheel.backend.compile; +package dev.engine_room.flywheel.backend.compile; import java.util.Objects; import java.util.function.Consumer; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; -import com.jozufozu.flywheel.backend.glsl.SourceComponent; - +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.backend.gl.shader.GlProgram; +import dev.engine_room.flywheel.backend.glsl.SourceComponent; import net.minecraft.resources.ResourceLocation; public record Pipeline(ResourceLocation vertexMain, ResourceLocation fragmentMain, diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/PipelineCompiler.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/PipelineCompiler.java index a964a8894..a8d1652cf 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/PipelineCompiler.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/PipelineCompiler.java @@ -1,22 +1,21 @@ -package com.jozufozu.flywheel.backend.compile; +package dev.engine_room.flywheel.backend.compile; import java.util.Collection; import java.util.List; -import com.jozufozu.flywheel.api.Flywheel; -import com.jozufozu.flywheel.backend.InternalVertex; -import com.jozufozu.flywheel.backend.Samplers; -import com.jozufozu.flywheel.backend.compile.component.InstanceStructComponent; -import com.jozufozu.flywheel.backend.compile.core.CompilationHarness; -import com.jozufozu.flywheel.backend.compile.core.Compile; -import com.jozufozu.flywheel.backend.engine.uniform.Uniforms; -import com.jozufozu.flywheel.backend.gl.GlCompat; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; -import com.jozufozu.flywheel.backend.gl.shader.ShaderType; -import com.jozufozu.flywheel.backend.glsl.ShaderSources; -import com.jozufozu.flywheel.backend.glsl.SourceComponent; -import com.jozufozu.flywheel.lib.util.ResourceUtil; - +import dev.engine_room.flywheel.api.Flywheel; +import dev.engine_room.flywheel.backend.InternalVertex; +import dev.engine_room.flywheel.backend.Samplers; +import dev.engine_room.flywheel.backend.compile.component.InstanceStructComponent; +import dev.engine_room.flywheel.backend.compile.core.CompilationHarness; +import dev.engine_room.flywheel.backend.compile.core.Compile; +import dev.engine_room.flywheel.backend.engine.uniform.Uniforms; +import dev.engine_room.flywheel.backend.gl.GlCompat; +import dev.engine_room.flywheel.backend.gl.shader.GlProgram; +import dev.engine_room.flywheel.backend.gl.shader.ShaderType; +import dev.engine_room.flywheel.backend.glsl.ShaderSources; +import dev.engine_room.flywheel.backend.glsl.SourceComponent; +import dev.engine_room.flywheel.lib.util.ResourceUtil; import net.minecraft.resources.ResourceLocation; public final class PipelineCompiler { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/PipelineProgramKey.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/PipelineProgramKey.java index 60819e06a..691e026b5 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/PipelineProgramKey.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/PipelineProgramKey.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.backend.compile; +package dev.engine_room.flywheel.backend.compile; -import com.jozufozu.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.api.instance.InstanceType; /** * Represents the entire context of a program's usage. diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/Pipelines.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/Pipelines.java index 238d5e58b..6b3af1ff9 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/Pipelines.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/Pipelines.java @@ -1,9 +1,9 @@ -package com.jozufozu.flywheel.backend.compile; +package dev.engine_room.flywheel.backend.compile; -import com.jozufozu.flywheel.api.Flywheel; -import com.jozufozu.flywheel.backend.Samplers; -import com.jozufozu.flywheel.backend.compile.component.BufferTextureInstanceComponent; -import com.jozufozu.flywheel.backend.compile.component.SsboInstanceComponent; +import dev.engine_room.flywheel.api.Flywheel; +import dev.engine_room.flywheel.backend.Samplers; +import dev.engine_room.flywheel.backend.compile.component.BufferTextureInstanceComponent; +import dev.engine_room.flywheel.backend.compile.component.SsboInstanceComponent; public final class Pipelines { public static final Pipeline INSTANCING = Pipeline.builder() diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/SourceChecks.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/SourceChecks.java index 25db26d25..fdfc5c3d1 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/SourceChecks.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/SourceChecks.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.compile; +package dev.engine_room.flywheel.backend.compile; // TODO: recycle to be invoked by the shader compiler public class SourceChecks { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/BufferTextureInstanceComponent.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/BufferTextureInstanceComponent.java index 1de3b5249..9a6a02012 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/BufferTextureInstanceComponent.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/BufferTextureInstanceComponent.java @@ -1,16 +1,16 @@ -package com.jozufozu.flywheel.backend.compile.component; +package dev.engine_room.flywheel.backend.compile.component; import java.util.ArrayList; -import com.jozufozu.flywheel.api.Flywheel; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.api.layout.Layout; -import com.jozufozu.flywheel.backend.glsl.generate.FnSignature; -import com.jozufozu.flywheel.backend.glsl.generate.GlslBlock; -import com.jozufozu.flywheel.backend.glsl.generate.GlslBuilder; -import com.jozufozu.flywheel.backend.glsl.generate.GlslExpr; -import com.jozufozu.flywheel.backend.glsl.generate.GlslStmt; -import com.jozufozu.flywheel.lib.math.MoreMath; +import dev.engine_room.flywheel.api.Flywheel; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.api.layout.Layout; +import dev.engine_room.flywheel.backend.glsl.generate.FnSignature; +import dev.engine_room.flywheel.backend.glsl.generate.GlslBlock; +import dev.engine_room.flywheel.backend.glsl.generate.GlslBuilder; +import dev.engine_room.flywheel.backend.glsl.generate.GlslExpr; +import dev.engine_room.flywheel.backend.glsl.generate.GlslStmt; +import dev.engine_room.flywheel.lib.math.MoreMath; public class BufferTextureInstanceComponent extends InstanceAssemblerComponent { private static final String[] SWIZZLE_SELECTORS = { "x", "y", "z", "w" }; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/InstanceAssemblerComponent.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/InstanceAssemblerComponent.java index 0513226c5..7115e1a8b 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/InstanceAssemblerComponent.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/InstanceAssemblerComponent.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.compile.component; +package dev.engine_room.flywheel.backend.compile.component; import java.nio.ByteOrder; import java.util.ArrayList; @@ -8,21 +8,21 @@ import java.util.List; import java.util.function.Function; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.api.layout.ArrayElementType; -import com.jozufozu.flywheel.api.layout.ElementType; -import com.jozufozu.flywheel.api.layout.FloatRepr; -import com.jozufozu.flywheel.api.layout.IntegerRepr; -import com.jozufozu.flywheel.api.layout.Layout; -import com.jozufozu.flywheel.api.layout.MatrixElementType; -import com.jozufozu.flywheel.api.layout.ScalarElementType; -import com.jozufozu.flywheel.api.layout.UnsignedIntegerRepr; -import com.jozufozu.flywheel.api.layout.ValueRepr; -import com.jozufozu.flywheel.api.layout.VectorElementType; -import com.jozufozu.flywheel.backend.compile.LayoutInterpreter; -import com.jozufozu.flywheel.backend.glsl.SourceComponent; -import com.jozufozu.flywheel.backend.glsl.generate.GlslBuilder; -import com.jozufozu.flywheel.backend.glsl.generate.GlslExpr; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.api.layout.ArrayElementType; +import dev.engine_room.flywheel.api.layout.ElementType; +import dev.engine_room.flywheel.api.layout.FloatRepr; +import dev.engine_room.flywheel.api.layout.IntegerRepr; +import dev.engine_room.flywheel.api.layout.Layout; +import dev.engine_room.flywheel.api.layout.MatrixElementType; +import dev.engine_room.flywheel.api.layout.ScalarElementType; +import dev.engine_room.flywheel.api.layout.UnsignedIntegerRepr; +import dev.engine_room.flywheel.api.layout.ValueRepr; +import dev.engine_room.flywheel.api.layout.VectorElementType; +import dev.engine_room.flywheel.backend.compile.LayoutInterpreter; +import dev.engine_room.flywheel.backend.glsl.SourceComponent; +import dev.engine_room.flywheel.backend.glsl.generate.GlslBuilder; +import dev.engine_room.flywheel.backend.glsl.generate.GlslExpr; public abstract class InstanceAssemblerComponent implements SourceComponent { protected static final String STRUCT_NAME = "FlwInstance"; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/InstanceStructComponent.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/InstanceStructComponent.java index 123de197a..76d56e755 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/InstanceStructComponent.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/InstanceStructComponent.java @@ -1,14 +1,14 @@ -package com.jozufozu.flywheel.backend.compile.component; +package dev.engine_room.flywheel.backend.compile.component; import java.util.Collection; import java.util.Collections; -import com.jozufozu.flywheel.api.Flywheel; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.api.layout.Layout; -import com.jozufozu.flywheel.backend.compile.LayoutInterpreter; -import com.jozufozu.flywheel.backend.glsl.SourceComponent; -import com.jozufozu.flywheel.backend.glsl.generate.GlslBuilder; +import dev.engine_room.flywheel.api.Flywheel; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.api.layout.Layout; +import dev.engine_room.flywheel.backend.compile.LayoutInterpreter; +import dev.engine_room.flywheel.backend.glsl.SourceComponent; +import dev.engine_room.flywheel.backend.glsl.generate.GlslBuilder; public class InstanceStructComponent implements SourceComponent { private static final String STRUCT_NAME = "FlwInstance"; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/SsboInstanceComponent.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/SsboInstanceComponent.java index f8244ffb1..756ab202f 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/SsboInstanceComponent.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/SsboInstanceComponent.java @@ -1,17 +1,17 @@ -package com.jozufozu.flywheel.backend.compile.component; +package dev.engine_room.flywheel.backend.compile.component; import java.util.ArrayList; -import com.jozufozu.flywheel.api.Flywheel; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.api.layout.Layout; -import com.jozufozu.flywheel.backend.engine.indirect.IndirectBuffers; -import com.jozufozu.flywheel.backend.glsl.generate.FnSignature; -import com.jozufozu.flywheel.backend.glsl.generate.GlslBlock; -import com.jozufozu.flywheel.backend.glsl.generate.GlslBuilder; -import com.jozufozu.flywheel.backend.glsl.generate.GlslExpr; -import com.jozufozu.flywheel.backend.glsl.generate.GlslStmt; -import com.jozufozu.flywheel.lib.math.MoreMath; +import dev.engine_room.flywheel.api.Flywheel; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.api.layout.Layout; +import dev.engine_room.flywheel.backend.engine.indirect.IndirectBuffers; +import dev.engine_room.flywheel.backend.glsl.generate.FnSignature; +import dev.engine_room.flywheel.backend.glsl.generate.GlslBlock; +import dev.engine_room.flywheel.backend.glsl.generate.GlslBuilder; +import dev.engine_room.flywheel.backend.glsl.generate.GlslExpr; +import dev.engine_room.flywheel.backend.glsl.generate.GlslStmt; +import dev.engine_room.flywheel.lib.math.MoreMath; public class SsboInstanceComponent extends InstanceAssemblerComponent { public SsboInstanceComponent(InstanceType type) { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/StringSubstitutionComponent.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/StringSubstitutionComponent.java index 58cbdb73b..f3091f015 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/StringSubstitutionComponent.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/StringSubstitutionComponent.java @@ -1,10 +1,10 @@ -package com.jozufozu.flywheel.backend.compile.component; +package dev.engine_room.flywheel.backend.compile.component; import java.util.Collection; import java.util.Map; -import com.jozufozu.flywheel.api.Flywheel; -import com.jozufozu.flywheel.backend.glsl.SourceComponent; +import dev.engine_room.flywheel.api.Flywheel; +import dev.engine_room.flywheel.backend.glsl.SourceComponent; public final class StringSubstitutionComponent implements SourceComponent { private final SourceComponent source; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/UberShaderComponent.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/UberShaderComponent.java index 733b76776..5fbc44ba9 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/UberShaderComponent.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/component/UberShaderComponent.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.compile.component; +package dev.engine_room.flywheel.backend.compile.component; import java.util.ArrayList; import java.util.Collection; @@ -9,16 +9,16 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.jozufozu.flywheel.api.Flywheel; -import com.jozufozu.flywheel.backend.compile.core.SourceLoader; -import com.jozufozu.flywheel.backend.glsl.SourceComponent; -import com.jozufozu.flywheel.backend.glsl.SourceFile; -import com.jozufozu.flywheel.backend.glsl.generate.FnSignature; -import com.jozufozu.flywheel.backend.glsl.generate.GlslBlock; -import com.jozufozu.flywheel.backend.glsl.generate.GlslBuilder; -import com.jozufozu.flywheel.backend.glsl.generate.GlslExpr; -import com.jozufozu.flywheel.backend.glsl.generate.GlslSwitch; +import dev.engine_room.flywheel.api.Flywheel; +import dev.engine_room.flywheel.backend.compile.core.SourceLoader; +import dev.engine_room.flywheel.backend.glsl.SourceComponent; +import dev.engine_room.flywheel.backend.glsl.SourceFile; +import dev.engine_room.flywheel.backend.glsl.generate.FnSignature; +import dev.engine_room.flywheel.backend.glsl.generate.GlslBlock; +import dev.engine_room.flywheel.backend.glsl.generate.GlslBuilder; +import dev.engine_room.flywheel.backend.glsl.generate.GlslExpr; +import dev.engine_room.flywheel.backend.glsl.generate.GlslSwitch; import net.minecraft.resources.ResourceLocation; public class UberShaderComponent implements SourceComponent { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/Compilation.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/Compilation.java index d61c49133..9891a151b 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/Compilation.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/Compilation.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.compile.core; +package dev.engine_room.flywheel.backend.compile.core; import java.io.File; import java.io.FileWriter; @@ -7,15 +7,14 @@ import org.lwjgl.opengl.GL20; -import com.jozufozu.flywheel.backend.compile.FlwPrograms; -import com.jozufozu.flywheel.backend.gl.GlCompat; -import com.jozufozu.flywheel.backend.gl.shader.GlShader; -import com.jozufozu.flywheel.backend.gl.shader.ShaderType; -import com.jozufozu.flywheel.backend.glsl.GlslVersion; -import com.jozufozu.flywheel.backend.glsl.SourceComponent; -import com.jozufozu.flywheel.backend.glsl.SourceFile; -import com.jozufozu.flywheel.lib.util.StringUtil; - +import dev.engine_room.flywheel.backend.compile.FlwPrograms; +import dev.engine_room.flywheel.backend.gl.GlCompat; +import dev.engine_room.flywheel.backend.gl.shader.GlShader; +import dev.engine_room.flywheel.backend.gl.shader.ShaderType; +import dev.engine_room.flywheel.backend.glsl.GlslVersion; +import dev.engine_room.flywheel.backend.glsl.SourceComponent; +import dev.engine_room.flywheel.backend.glsl.SourceFile; +import dev.engine_room.flywheel.lib.util.StringUtil; import net.minecraft.client.Minecraft; /** diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/CompilationHarness.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/CompilationHarness.java index af52e3678..3bd497ace 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/CompilationHarness.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/CompilationHarness.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.compile.core; +package dev.engine_room.flywheel.backend.compile.core; import java.util.Collection; import java.util.HashMap; @@ -6,8 +6,8 @@ import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; -import com.jozufozu.flywheel.backend.glsl.ShaderSources; +import dev.engine_room.flywheel.backend.gl.shader.GlProgram; +import dev.engine_room.flywheel.backend.glsl.ShaderSources; public class CompilationHarness { private final KeyCompiler compiler; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/Compile.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/Compile.java index 7642adb37..0ba79b486 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/Compile.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/Compile.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.compile.core; +package dev.engine_room.flywheel.backend.compile.core; import java.util.ArrayList; import java.util.Collection; @@ -12,13 +12,12 @@ import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; -import com.jozufozu.flywheel.backend.gl.shader.GlShader; -import com.jozufozu.flywheel.backend.gl.shader.ShaderType; -import com.jozufozu.flywheel.backend.glsl.GlslVersion; -import com.jozufozu.flywheel.backend.glsl.ShaderSources; -import com.jozufozu.flywheel.backend.glsl.SourceComponent; - +import dev.engine_room.flywheel.backend.gl.shader.GlProgram; +import dev.engine_room.flywheel.backend.gl.shader.GlShader; +import dev.engine_room.flywheel.backend.gl.shader.ShaderType; +import dev.engine_room.flywheel.backend.glsl.GlslVersion; +import dev.engine_room.flywheel.backend.glsl.ShaderSources; +import dev.engine_room.flywheel.backend.glsl.SourceComponent; import net.minecraft.resources.ResourceLocation; /** diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/CompilerStats.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/CompilerStats.java index 8af2b0f76..1844529e4 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/CompilerStats.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/CompilerStats.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.compile.core; +package dev.engine_room.flywheel.backend.compile.core; import java.util.ArrayList; import java.util.HashSet; @@ -9,11 +9,11 @@ import org.slf4j.Marker; import org.slf4j.MarkerFactory; -import com.jozufozu.flywheel.backend.compile.FlwPrograms; -import com.jozufozu.flywheel.backend.glsl.LoadError; -import com.jozufozu.flywheel.backend.glsl.LoadResult; -import com.jozufozu.flywheel.backend.glsl.error.ErrorBuilder; -import com.jozufozu.flywheel.lib.util.StringUtil; +import dev.engine_room.flywheel.backend.compile.FlwPrograms; +import dev.engine_room.flywheel.backend.glsl.LoadError; +import dev.engine_room.flywheel.backend.glsl.LoadResult; +import dev.engine_room.flywheel.backend.glsl.error.ErrorBuilder; +import dev.engine_room.flywheel.lib.util.StringUtil; public class CompilerStats { private final Marker marker; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/FailedCompilation.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/FailedCompilation.java index 27dc28cb1..47553238d 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/FailedCompilation.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/FailedCompilation.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.compile.core; +package dev.engine_room.flywheel.backend.compile.core; import java.util.List; import java.util.Locale; @@ -8,15 +8,14 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import com.jozufozu.flywheel.api.Flywheel; -import com.jozufozu.flywheel.backend.glsl.SourceFile; -import com.jozufozu.flywheel.backend.glsl.SourceLines; -import com.jozufozu.flywheel.backend.glsl.error.ConsoleColors; -import com.jozufozu.flywheel.backend.glsl.error.ErrorBuilder; -import com.jozufozu.flywheel.backend.glsl.error.ErrorLevel; -import com.jozufozu.flywheel.backend.glsl.span.Span; -import com.jozufozu.flywheel.lib.util.StringUtil; - +import dev.engine_room.flywheel.api.Flywheel; +import dev.engine_room.flywheel.backend.glsl.SourceFile; +import dev.engine_room.flywheel.backend.glsl.SourceLines; +import dev.engine_room.flywheel.backend.glsl.error.ConsoleColors; +import dev.engine_room.flywheel.backend.glsl.error.ErrorBuilder; +import dev.engine_room.flywheel.backend.glsl.error.ErrorLevel; +import dev.engine_room.flywheel.backend.glsl.span.Span; +import dev.engine_room.flywheel.lib.util.StringUtil; import net.minecraft.resources.ResourceLocation; public class FailedCompilation { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/LinkResult.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/LinkResult.java index 5ac969d04..0c3219530 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/LinkResult.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/LinkResult.java @@ -1,9 +1,9 @@ -package com.jozufozu.flywheel.backend.compile.core; +package dev.engine_room.flywheel.backend.compile.core; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; +import dev.engine_room.flywheel.backend.gl.shader.GlProgram; public sealed interface LinkResult { @Nullable diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/ProgramLinker.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/ProgramLinker.java index c1c2c1f25..ae239ab28 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/ProgramLinker.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/ProgramLinker.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.compile.core; +package dev.engine_room.flywheel.backend.compile.core; import static org.lwjgl.opengl.GL11.GL_TRUE; import static org.lwjgl.opengl.GL20.GL_LINK_STATUS; @@ -13,8 +13,8 @@ import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; -import com.jozufozu.flywheel.backend.gl.shader.GlShader; +import dev.engine_room.flywheel.backend.gl.shader.GlProgram; +import dev.engine_room.flywheel.backend.gl.shader.GlShader; public class ProgramLinker { private final CompilerStats stats; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/ShaderCache.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/ShaderCache.java index 3481a3170..48979de79 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/ShaderCache.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/ShaderCache.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.compile.core; +package dev.engine_room.flywheel.backend.compile.core; import java.util.HashMap; import java.util.LinkedHashSet; @@ -10,10 +10,10 @@ import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.backend.gl.shader.GlShader; -import com.jozufozu.flywheel.backend.gl.shader.ShaderType; -import com.jozufozu.flywheel.backend.glsl.GlslVersion; -import com.jozufozu.flywheel.backend.glsl.SourceComponent; +import dev.engine_room.flywheel.backend.gl.shader.GlShader; +import dev.engine_room.flywheel.backend.gl.shader.ShaderType; +import dev.engine_room.flywheel.backend.glsl.GlslVersion; +import dev.engine_room.flywheel.backend.glsl.SourceComponent; public class ShaderCache { private final Map inner = new HashMap<>(); diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/ShaderResult.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/ShaderResult.java index 46e6e2af7..040e2c9fe 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/ShaderResult.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/ShaderResult.java @@ -1,9 +1,9 @@ -package com.jozufozu.flywheel.backend.compile.core; +package dev.engine_room.flywheel.backend.compile.core; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.backend.gl.shader.GlShader; +import dev.engine_room.flywheel.backend.gl.shader.GlShader; public sealed interface ShaderResult { @Nullable diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/SourceLoader.java b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/SourceLoader.java index 6c77c2fee..03592601a 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/SourceLoader.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/compile/core/SourceLoader.java @@ -1,10 +1,9 @@ -package com.jozufozu.flywheel.backend.compile.core; +package dev.engine_room.flywheel.backend.compile.core; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.backend.glsl.ShaderSources; -import com.jozufozu.flywheel.backend.glsl.SourceFile; - +import dev.engine_room.flywheel.backend.glsl.ShaderSources; +import dev.engine_room.flywheel.backend.glsl.SourceFile; import net.minecraft.resources.ResourceLocation; public class SourceLoader { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/AbstractInstancer.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/AbstractInstancer.java index 8b7b00af1..3ab8d28e1 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/AbstractInstancer.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/AbstractInstancer.java @@ -1,14 +1,14 @@ -package com.jozufozu.flywheel.backend.engine; +package dev.engine_room.flywheel.backend.engine; import java.util.ArrayList; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.api.instance.Instancer; -import com.jozufozu.flywheel.backend.engine.embed.Environment; -import com.jozufozu.flywheel.lib.util.AtomicBitset; +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.api.instance.Instancer; +import dev.engine_room.flywheel.backend.engine.embed.Environment; +import dev.engine_room.flywheel.lib.util.AtomicBitset; public abstract class AbstractInstancer implements Instancer { public final InstanceType type; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/CommonCrumbling.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/CommonCrumbling.java index 2a6980a90..de3661703 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/CommonCrumbling.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/CommonCrumbling.java @@ -1,11 +1,11 @@ -package com.jozufozu.flywheel.backend.engine; +package dev.engine_room.flywheel.backend.engine; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.api.material.Transparency; -import com.jozufozu.flywheel.api.material.WriteMask; -import com.jozufozu.flywheel.lib.material.CutoutShaders; -import com.jozufozu.flywheel.lib.material.FogShaders; -import com.jozufozu.flywheel.lib.material.SimpleMaterial; +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.api.material.Transparency; +import dev.engine_room.flywheel.api.material.WriteMask; +import dev.engine_room.flywheel.lib.material.CutoutShaders; +import dev.engine_room.flywheel.lib.material.FogShaders; +import dev.engine_room.flywheel.lib.material.SimpleMaterial; public class CommonCrumbling { public static void applyCrumblingProperties(SimpleMaterial.Builder crumblingMaterial, Material baseMaterial) { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/DrawManager.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/DrawManager.java index 404155aab..014d2ccdf 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/DrawManager.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/DrawManager.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.engine; +package dev.engine_room.flywheel.backend.engine; import java.util.ArrayList; import java.util.HashMap; @@ -8,16 +8,15 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; -import com.jozufozu.flywheel.api.backend.Engine; -import com.jozufozu.flywheel.api.event.RenderStage; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.api.instance.Instancer; -import com.jozufozu.flywheel.api.model.Model; -import com.jozufozu.flywheel.backend.FlwBackend; -import com.jozufozu.flywheel.backend.engine.embed.Environment; -import com.jozufozu.flywheel.lib.util.Pair; - +import dev.engine_room.flywheel.api.backend.Engine; +import dev.engine_room.flywheel.api.event.RenderStage; +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.api.instance.Instancer; +import dev.engine_room.flywheel.api.model.Model; +import dev.engine_room.flywheel.backend.FlwBackend; +import dev.engine_room.flywheel.backend.engine.embed.Environment; +import dev.engine_room.flywheel.lib.util.Pair; import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.client.resources.model.ModelBakery; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/EngineImpl.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/EngineImpl.java index 4938c6979..3e7dd9d61 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/EngineImpl.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/EngineImpl.java @@ -1,27 +1,26 @@ -package com.jozufozu.flywheel.backend.engine; +package dev.engine_room.flywheel.backend.engine; import java.util.List; -import com.jozufozu.flywheel.api.backend.Engine; -import com.jozufozu.flywheel.api.event.RenderContext; -import com.jozufozu.flywheel.api.event.RenderStage; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.api.instance.Instancer; -import com.jozufozu.flywheel.api.instance.InstancerProvider; -import com.jozufozu.flywheel.api.model.Model; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.api.task.TaskExecutor; -import com.jozufozu.flywheel.api.visualization.VisualEmbedding; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; -import com.jozufozu.flywheel.backend.engine.embed.Environment; -import com.jozufozu.flywheel.backend.engine.embed.TopLevelEmbeddedEnvironment; -import com.jozufozu.flywheel.backend.engine.uniform.Uniforms; -import com.jozufozu.flywheel.backend.gl.GlStateTracker; -import com.jozufozu.flywheel.lib.task.Flag; -import com.jozufozu.flywheel.lib.task.NamedFlag; -import com.jozufozu.flywheel.lib.task.SyncedPlan; - +import dev.engine_room.flywheel.api.backend.Engine; +import dev.engine_room.flywheel.api.event.RenderContext; +import dev.engine_room.flywheel.api.event.RenderStage; +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.api.instance.Instancer; +import dev.engine_room.flywheel.api.instance.InstancerProvider; +import dev.engine_room.flywheel.api.model.Model; +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.task.TaskExecutor; +import dev.engine_room.flywheel.api.visualization.VisualEmbedding; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.backend.engine.embed.Environment; +import dev.engine_room.flywheel.backend.engine.embed.TopLevelEmbeddedEnvironment; +import dev.engine_room.flywheel.backend.engine.uniform.Uniforms; +import dev.engine_room.flywheel.backend.gl.GlStateTracker; +import dev.engine_room.flywheel.lib.task.Flag; +import dev.engine_room.flywheel.lib.task.NamedFlag; +import dev.engine_room.flywheel.lib.task.SyncedPlan; import net.minecraft.client.Camera; import net.minecraft.core.BlockPos; import net.minecraft.core.Vec3i; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/EnvironmentStorage.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/EnvironmentStorage.java index e991f32f9..c6500069f 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/EnvironmentStorage.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/EnvironmentStorage.java @@ -1,10 +1,9 @@ -package com.jozufozu.flywheel.backend.engine; +package dev.engine_room.flywheel.backend.engine; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; -import com.jozufozu.flywheel.backend.engine.embed.AbstractEmbeddedEnvironment; - +import dev.engine_room.flywheel.backend.engine.embed.AbstractEmbeddedEnvironment; import it.unimi.dsi.fastutil.objects.ReferenceLinkedOpenHashSet; import it.unimi.dsi.fastutil.objects.ReferenceSet; import it.unimi.dsi.fastutil.objects.ReferenceSets; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/GroupKey.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/GroupKey.java index a978c59b8..1be120c2c 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/GroupKey.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/GroupKey.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.backend.engine; +package dev.engine_room.flywheel.backend.engine; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.backend.engine.embed.Environment; +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.backend.engine.embed.Environment; public record GroupKey(InstanceType instanceType, Environment environment) { } diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/IndexPool.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/IndexPool.java index 35c94541a..ea5ae10e5 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/IndexPool.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/IndexPool.java @@ -1,10 +1,9 @@ -package com.jozufozu.flywheel.backend.engine; - -import com.jozufozu.flywheel.api.model.IndexSequence; -import com.jozufozu.flywheel.backend.gl.array.GlVertexArray; -import com.jozufozu.flywheel.backend.gl.buffer.GlBuffer; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; +package dev.engine_room.flywheel.backend.engine; +import dev.engine_room.flywheel.api.model.IndexSequence; +import dev.engine_room.flywheel.backend.gl.array.GlVertexArray; +import dev.engine_room.flywheel.backend.gl.buffer.GlBuffer; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; import it.unimi.dsi.fastutil.objects.Reference2IntMap; import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/InstanceHandleImpl.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/InstanceHandleImpl.java index 17148ac6c..3a1de3200 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/InstanceHandleImpl.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/InstanceHandleImpl.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.backend.engine; +package dev.engine_room.flywheel.backend.engine; -import com.jozufozu.flywheel.api.instance.InstanceHandle; +import dev.engine_room.flywheel.api.instance.InstanceHandle; public class InstanceHandleImpl implements InstanceHandle { public AbstractInstancer instancer; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/InstancerKey.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/InstancerKey.java index 5c009c137..7dc10f079 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/InstancerKey.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/InstancerKey.java @@ -1,10 +1,10 @@ -package com.jozufozu.flywheel.backend.engine; +package dev.engine_room.flywheel.backend.engine; -import com.jozufozu.flywheel.api.event.RenderStage; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.api.model.Model; -import com.jozufozu.flywheel.backend.engine.embed.Environment; +import dev.engine_room.flywheel.api.event.RenderStage; +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.api.model.Model; +import dev.engine_room.flywheel.backend.engine.embed.Environment; public record InstancerKey(Environment environment, InstanceType type, Model model, RenderStage stage) { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/InstancerProviderImpl.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/InstancerProviderImpl.java index 6c95568f4..5913df280 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/InstancerProviderImpl.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/InstancerProviderImpl.java @@ -1,12 +1,12 @@ -package com.jozufozu.flywheel.backend.engine; +package dev.engine_room.flywheel.backend.engine; -import com.jozufozu.flywheel.api.event.RenderStage; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.api.instance.Instancer; -import com.jozufozu.flywheel.api.instance.InstancerProvider; -import com.jozufozu.flywheel.api.model.Model; -import com.jozufozu.flywheel.backend.engine.embed.GlobalEnvironment; +import dev.engine_room.flywheel.api.event.RenderStage; +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.api.instance.Instancer; +import dev.engine_room.flywheel.api.instance.InstancerProvider; +import dev.engine_room.flywheel.api.model.Model; +import dev.engine_room.flywheel.backend.engine.embed.GlobalEnvironment; public record InstancerProviderImpl(EngineImpl engine, RenderStage renderStage) implements InstancerProvider { @Override diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/MaterialEncoder.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/MaterialEncoder.java index cd0fb641b..faef1cc6a 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/MaterialEncoder.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/MaterialEncoder.java @@ -1,11 +1,10 @@ -package com.jozufozu.flywheel.backend.engine; - -import com.jozufozu.flywheel.api.material.DepthTest; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.api.material.Transparency; -import com.jozufozu.flywheel.api.material.WriteMask; -import com.jozufozu.flywheel.backend.ShaderIndices; +package dev.engine_room.flywheel.backend.engine; +import dev.engine_room.flywheel.api.material.DepthTest; +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.api.material.Transparency; +import dev.engine_room.flywheel.api.material.WriteMask; +import dev.engine_room.flywheel.backend.ShaderIndices; import net.minecraft.util.Mth; // Materials are unpacked in "flywheel:flywheel/internal/packed_material.glsl" diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/MaterialRenderState.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/MaterialRenderState.java index 961863221..de0637ddb 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/MaterialRenderState.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/MaterialRenderState.java @@ -1,17 +1,17 @@ -package com.jozufozu.flywheel.backend.engine; +package dev.engine_room.flywheel.backend.engine; import java.util.Comparator; import org.lwjgl.opengl.GL11; -import com.jozufozu.flywheel.api.material.DepthTest; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.api.material.Transparency; -import com.jozufozu.flywheel.api.material.WriteMask; -import com.jozufozu.flywheel.backend.Samplers; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; +import dev.engine_room.flywheel.api.material.DepthTest; +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.api.material.Transparency; +import dev.engine_room.flywheel.api.material.WriteMask; +import dev.engine_room.flywheel.backend.Samplers; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.AbstractTexture; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/MeshPool.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/MeshPool.java index e789c3b7b..cbc195a3d 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/MeshPool.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/MeshPool.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.engine; +package dev.engine_room.flywheel.backend.engine; import java.util.ArrayList; import java.util.HashMap; @@ -8,14 +8,14 @@ import org.jetbrains.annotations.Nullable; import org.lwjgl.opengl.GL32; -import com.jozufozu.flywheel.api.model.Mesh; -import com.jozufozu.flywheel.api.vertex.VertexView; -import com.jozufozu.flywheel.backend.InternalVertex; -import com.jozufozu.flywheel.backend.gl.GlPrimitive; -import com.jozufozu.flywheel.backend.gl.array.GlVertexArray; -import com.jozufozu.flywheel.backend.gl.buffer.GlBuffer; -import com.jozufozu.flywheel.backend.util.ReferenceCounted; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; +import dev.engine_room.flywheel.api.model.Mesh; +import dev.engine_room.flywheel.api.vertex.VertexView; +import dev.engine_room.flywheel.backend.InternalVertex; +import dev.engine_room.flywheel.backend.gl.GlPrimitive; +import dev.engine_room.flywheel.backend.gl.array.GlVertexArray; +import dev.engine_room.flywheel.backend.gl.buffer.GlBuffer; +import dev.engine_room.flywheel.backend.util.ReferenceCounted; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; public class MeshPool { private final VertexView vertexView; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/TextureBinder.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/TextureBinder.java index 7751d94ce..5d5f48da2 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/TextureBinder.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/TextureBinder.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.backend.engine; +package dev.engine_room.flywheel.backend.engine; -import com.jozufozu.flywheel.backend.Samplers; import com.mojang.blaze3d.systems.RenderSystem; +import dev.engine_room.flywheel.backend.Samplers; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/AbstractEmbeddedEnvironment.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/AbstractEmbeddedEnvironment.java index dda0f6a92..07adb4805 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/AbstractEmbeddedEnvironment.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/AbstractEmbeddedEnvironment.java @@ -1,22 +1,21 @@ -package com.jozufozu.flywheel.backend.engine.embed; +package dev.engine_room.flywheel.backend.engine.embed; import org.joml.Matrix3f; import org.joml.Matrix3fc; import org.joml.Matrix4f; import org.joml.Matrix4fc; -import com.jozufozu.flywheel.api.event.RenderStage; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.api.instance.Instancer; -import com.jozufozu.flywheel.api.instance.InstancerProvider; -import com.jozufozu.flywheel.api.model.Model; -import com.jozufozu.flywheel.api.visualization.VisualEmbedding; -import com.jozufozu.flywheel.backend.compile.ContextShader; -import com.jozufozu.flywheel.backend.engine.EngineImpl; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; -import com.jozufozu.flywheel.backend.util.AtomicReferenceCounted; - +import dev.engine_room.flywheel.api.event.RenderStage; +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.api.instance.Instancer; +import dev.engine_room.flywheel.api.instance.InstancerProvider; +import dev.engine_room.flywheel.api.model.Model; +import dev.engine_room.flywheel.api.visualization.VisualEmbedding; +import dev.engine_room.flywheel.backend.compile.ContextShader; +import dev.engine_room.flywheel.backend.engine.EngineImpl; +import dev.engine_room.flywheel.backend.gl.shader.GlProgram; +import dev.engine_room.flywheel.backend.util.AtomicReferenceCounted; import net.minecraft.core.Vec3i; public abstract class AbstractEmbeddedEnvironment extends AtomicReferenceCounted implements Environment, VisualEmbedding { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/EmbeddedLightTexture.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/EmbeddedLightTexture.java index 4ea024d29..7e4325fb9 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/EmbeddedLightTexture.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/EmbeddedLightTexture.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.engine.embed; +package dev.engine_room.flywheel.backend.engine.embed; import static org.lwjgl.opengl.GL11.GL_LINEAR; import static org.lwjgl.opengl.GL11.GL_TEXTURE_MAG_FILTER; @@ -23,8 +23,7 @@ import org.jetbrains.annotations.Nullable; import org.lwjgl.opengl.GL30; -import com.jozufozu.flywheel.backend.gl.GlTexture; - +import dev.engine_room.flywheel.backend.gl.GlTexture; import net.minecraft.util.Mth; public class EmbeddedLightTexture { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/EmbeddedLightVolume.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/EmbeddedLightVolume.java index d2300e4d1..c815ae3ea 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/EmbeddedLightVolume.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/EmbeddedLightVolume.java @@ -1,10 +1,9 @@ -package com.jozufozu.flywheel.backend.engine.embed; +package dev.engine_room.flywheel.backend.engine.embed; import org.jetbrains.annotations.Nullable; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; - +import dev.engine_room.flywheel.lib.memory.MemoryBlock; import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.LightLayer; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/EmbeddingUniforms.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/EmbeddingUniforms.java index 3d31f8e94..eb0c58bef 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/EmbeddingUniforms.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/EmbeddingUniforms.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.engine.embed; +package dev.engine_room.flywheel.backend.engine.embed; public class EmbeddingUniforms { public static final String MODEL_MATRIX = "_flw_modelMatrix"; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/Environment.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/Environment.java index d9db66cc3..91da73062 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/Environment.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/Environment.java @@ -1,7 +1,7 @@ -package com.jozufozu.flywheel.backend.engine.embed; +package dev.engine_room.flywheel.backend.engine.embed; -import com.jozufozu.flywheel.backend.compile.ContextShader; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; +import dev.engine_room.flywheel.backend.compile.ContextShader; +import dev.engine_room.flywheel.backend.gl.shader.GlProgram; public interface Environment { ContextShader contextShader(); diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/GlobalEnvironment.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/GlobalEnvironment.java index 72be0a05d..b4c852280 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/GlobalEnvironment.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/GlobalEnvironment.java @@ -1,7 +1,7 @@ -package com.jozufozu.flywheel.backend.engine.embed; +package dev.engine_room.flywheel.backend.engine.embed; -import com.jozufozu.flywheel.backend.compile.ContextShader; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; +import dev.engine_room.flywheel.backend.compile.ContextShader; +import dev.engine_room.flywheel.backend.gl.shader.GlProgram; public class GlobalEnvironment implements Environment { public static final GlobalEnvironment INSTANCE = new GlobalEnvironment(); diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/NestedEmbeddedEnvironment.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/NestedEmbeddedEnvironment.java index f97dc9aa6..f957a7e43 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/NestedEmbeddedEnvironment.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/NestedEmbeddedEnvironment.java @@ -1,12 +1,11 @@ -package com.jozufozu.flywheel.backend.engine.embed; +package dev.engine_room.flywheel.backend.engine.embed; import org.joml.Matrix3f; import org.joml.Matrix4f; -import com.jozufozu.flywheel.api.event.RenderStage; -import com.jozufozu.flywheel.backend.engine.EngineImpl; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; - +import dev.engine_room.flywheel.api.event.RenderStage; +import dev.engine_room.flywheel.backend.engine.EngineImpl; +import dev.engine_room.flywheel.backend.gl.shader.GlProgram; import net.minecraft.world.level.BlockAndTintGetter; public class NestedEmbeddedEnvironment extends AbstractEmbeddedEnvironment { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/TopLevelEmbeddedEnvironment.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/TopLevelEmbeddedEnvironment.java index d320acc3d..d5a8aa9f9 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/TopLevelEmbeddedEnvironment.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/embed/TopLevelEmbeddedEnvironment.java @@ -1,13 +1,12 @@ -package com.jozufozu.flywheel.backend.engine.embed; +package dev.engine_room.flywheel.backend.engine.embed; import org.joml.Matrix3f; import org.joml.Matrix4f; -import com.jozufozu.flywheel.api.event.RenderStage; -import com.jozufozu.flywheel.backend.Samplers; -import com.jozufozu.flywheel.backend.engine.EngineImpl; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; - +import dev.engine_room.flywheel.api.event.RenderStage; +import dev.engine_room.flywheel.backend.Samplers; +import dev.engine_room.flywheel.backend.engine.EngineImpl; +import dev.engine_room.flywheel.backend.gl.shader.GlProgram; import net.minecraft.world.level.BlockAndTintGetter; public class TopLevelEmbeddedEnvironment extends AbstractEmbeddedEnvironment { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectBuffers.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectBuffers.java index 16e886926..fff5d9ea1 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectBuffers.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectBuffers.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.engine.indirect; +package dev.engine_room.flywheel.backend.engine.indirect; import static org.lwjgl.opengl.GL43.GL_SHADER_STORAGE_BUFFER; import static org.lwjgl.opengl.GL44.nglBindBuffersRange; @@ -6,8 +6,8 @@ import org.lwjgl.system.MemoryUtil; import org.lwjgl.system.Pointer; -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; +import dev.engine_room.flywheel.backend.gl.buffer.GlBufferType; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; public class IndirectBuffers { // Number of vbos created. diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectCullingGroup.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectCullingGroup.java index 1f46b138e..c4d5fb8ea 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectCullingGroup.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectCullingGroup.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.engine.indirect; +package dev.engine_room.flywheel.backend.engine.indirect; import static org.lwjgl.opengl.GL11.GL_TRIANGLES; import static org.lwjgl.opengl.GL11.GL_UNSIGNED_INT; @@ -16,21 +16,21 @@ import java.util.List; import java.util.Map; -import com.jozufozu.flywheel.api.event.RenderStage; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.api.model.Model; -import com.jozufozu.flywheel.backend.compile.ContextShader; -import com.jozufozu.flywheel.backend.compile.IndirectPrograms; -import com.jozufozu.flywheel.backend.engine.MaterialRenderState; -import com.jozufozu.flywheel.backend.engine.MeshPool; -import com.jozufozu.flywheel.backend.engine.embed.Environment; -import com.jozufozu.flywheel.backend.engine.uniform.Uniforms; -import com.jozufozu.flywheel.backend.gl.Driver; -import com.jozufozu.flywheel.backend.gl.GlCompat; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; -import com.jozufozu.flywheel.lib.math.MoreMath; +import dev.engine_room.flywheel.api.event.RenderStage; +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.api.model.Model; +import dev.engine_room.flywheel.backend.compile.ContextShader; +import dev.engine_room.flywheel.backend.compile.IndirectPrograms; +import dev.engine_room.flywheel.backend.engine.MaterialRenderState; +import dev.engine_room.flywheel.backend.engine.MeshPool; +import dev.engine_room.flywheel.backend.engine.embed.Environment; +import dev.engine_room.flywheel.backend.engine.uniform.Uniforms; +import dev.engine_room.flywheel.backend.gl.Driver; +import dev.engine_room.flywheel.backend.gl.GlCompat; +import dev.engine_room.flywheel.backend.gl.shader.GlProgram; +import dev.engine_room.flywheel.lib.math.MoreMath; public class IndirectCullingGroup { private static final Comparator DRAW_COMPARATOR = Comparator.comparing(IndirectDraw::stage) diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectDraw.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectDraw.java index b96892c1d..df0069206 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectDraw.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectDraw.java @@ -1,12 +1,12 @@ -package com.jozufozu.flywheel.backend.engine.indirect; +package dev.engine_room.flywheel.backend.engine.indirect; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.api.event.RenderStage; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.backend.ShaderIndices; -import com.jozufozu.flywheel.backend.engine.MaterialEncoder; -import com.jozufozu.flywheel.backend.engine.MeshPool; +import dev.engine_room.flywheel.api.event.RenderStage; +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.backend.ShaderIndices; +import dev.engine_room.flywheel.backend.engine.MaterialEncoder; +import dev.engine_room.flywheel.backend.engine.MeshPool; public class IndirectDraw { private final IndirectInstancer instancer; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectDrawManager.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectDrawManager.java index 1687e5e53..8da0093f9 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectDrawManager.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectDrawManager.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.engine.indirect; +package dev.engine_room.flywheel.backend.engine.indirect; import static org.lwjgl.opengl.GL11.GL_TRIANGLES; import static org.lwjgl.opengl.GL11.GL_UNSIGNED_INT; @@ -10,27 +10,26 @@ import java.util.List; import java.util.Map; -import com.jozufozu.flywheel.api.backend.Engine; -import com.jozufozu.flywheel.api.event.RenderStage; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.backend.Samplers; -import com.jozufozu.flywheel.backend.compile.ContextShader; -import com.jozufozu.flywheel.backend.compile.IndirectPrograms; -import com.jozufozu.flywheel.backend.engine.CommonCrumbling; -import com.jozufozu.flywheel.backend.engine.DrawManager; -import com.jozufozu.flywheel.backend.engine.GroupKey; -import com.jozufozu.flywheel.backend.engine.InstancerKey; -import com.jozufozu.flywheel.backend.engine.MaterialRenderState; -import com.jozufozu.flywheel.backend.engine.MeshPool; -import com.jozufozu.flywheel.backend.engine.TextureBinder; -import com.jozufozu.flywheel.backend.engine.uniform.Uniforms; -import com.jozufozu.flywheel.backend.gl.GlStateTracker; -import com.jozufozu.flywheel.backend.gl.array.GlVertexArray; -import com.jozufozu.flywheel.backend.gl.buffer.GlBuffer; -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType; -import com.jozufozu.flywheel.lib.material.SimpleMaterial; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; - +import dev.engine_room.flywheel.api.backend.Engine; +import dev.engine_room.flywheel.api.event.RenderStage; +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.backend.Samplers; +import dev.engine_room.flywheel.backend.compile.ContextShader; +import dev.engine_room.flywheel.backend.compile.IndirectPrograms; +import dev.engine_room.flywheel.backend.engine.CommonCrumbling; +import dev.engine_room.flywheel.backend.engine.DrawManager; +import dev.engine_room.flywheel.backend.engine.GroupKey; +import dev.engine_room.flywheel.backend.engine.InstancerKey; +import dev.engine_room.flywheel.backend.engine.MaterialRenderState; +import dev.engine_room.flywheel.backend.engine.MeshPool; +import dev.engine_room.flywheel.backend.engine.TextureBinder; +import dev.engine_room.flywheel.backend.engine.uniform.Uniforms; +import dev.engine_room.flywheel.backend.gl.GlStateTracker; +import dev.engine_room.flywheel.backend.gl.array.GlVertexArray; +import dev.engine_room.flywheel.backend.gl.buffer.GlBuffer; +import dev.engine_room.flywheel.backend.gl.buffer.GlBufferType; +import dev.engine_room.flywheel.lib.material.SimpleMaterial; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; import net.minecraft.client.resources.model.ModelBakery; public class IndirectDrawManager extends DrawManager> { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectInstancer.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectInstancer.java index fcb3efd0c..38099c85d 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectInstancer.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectInstancer.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.engine.indirect; +package dev.engine_room.flywheel.backend.engine.indirect; import java.util.ArrayList; import java.util.List; @@ -6,13 +6,13 @@ import org.joml.Vector4fc; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.api.instance.InstanceWriter; -import com.jozufozu.flywheel.api.model.Model; -import com.jozufozu.flywheel.backend.engine.AbstractInstancer; -import com.jozufozu.flywheel.backend.engine.embed.Environment; -import com.jozufozu.flywheel.lib.math.MoreMath; +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.api.instance.InstanceWriter; +import dev.engine_room.flywheel.api.model.Model; +import dev.engine_room.flywheel.backend.engine.AbstractInstancer; +import dev.engine_room.flywheel.backend.engine.embed.Environment; +import dev.engine_room.flywheel.lib.math.MoreMath; public class IndirectInstancer extends AbstractInstancer { private final long instanceStride; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/ResizableStorageArray.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/ResizableStorageArray.java index 3b6e44df1..2160eeb9b 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/ResizableStorageArray.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/ResizableStorageArray.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.backend.engine.indirect; +package dev.engine_room.flywheel.backend.engine.indirect; -import com.jozufozu.flywheel.lib.math.MoreMath; +import dev.engine_room.flywheel.lib.math.MoreMath; /** * A buffer that is aware of its content's stride with some control over how it grows. diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/ResizableStorageBuffer.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/ResizableStorageBuffer.java index 26d191a25..2a4320704 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/ResizableStorageBuffer.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/ResizableStorageBuffer.java @@ -1,12 +1,12 @@ -package com.jozufozu.flywheel.backend.engine.indirect; +package dev.engine_room.flywheel.backend.engine.indirect; import static org.lwjgl.opengl.GL15.glDeleteBuffers; import static org.lwjgl.opengl.GL45.glCopyNamedBufferSubData; import static org.lwjgl.opengl.GL45.glCreateBuffers; import static org.lwjgl.opengl.GL45.glNamedBufferStorage; -import com.jozufozu.flywheel.backend.gl.GlObject; -import com.jozufozu.flywheel.lib.memory.FlwMemoryTracker; +import dev.engine_room.flywheel.backend.gl.GlObject; +import dev.engine_room.flywheel.lib.memory.FlwMemoryTracker; /** * A buffer for storing data on the GPU that can be resized. diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/ScatterList.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/ScatterList.java index 468c8a433..45bef1cda 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/ScatterList.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/ScatterList.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.backend.engine.indirect; +package dev.engine_room.flywheel.backend.engine.indirect; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.backend.util.MemoryBuffer; +import dev.engine_room.flywheel.backend.util.MemoryBuffer; public class ScatterList { public static final long STRIDE = Integer.BYTES * 2; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/StagingBuffer.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/StagingBuffer.java index 8c0324f38..dc60c5cda 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/StagingBuffer.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/StagingBuffer.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.engine.indirect; +package dev.engine_room.flywheel.backend.engine.indirect; import java.util.function.LongConsumer; @@ -7,13 +7,12 @@ import org.lwjgl.opengl.GL45C; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.backend.compile.IndirectPrograms; -import com.jozufozu.flywheel.backend.gl.GlFence; -import com.jozufozu.flywheel.backend.gl.buffer.GlBuffer; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; -import com.jozufozu.flywheel.lib.memory.FlwMemoryTracker; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; - +import dev.engine_room.flywheel.backend.compile.IndirectPrograms; +import dev.engine_room.flywheel.backend.gl.GlFence; +import dev.engine_room.flywheel.backend.gl.buffer.GlBuffer; +import dev.engine_room.flywheel.backend.gl.shader.GlProgram; +import dev.engine_room.flywheel.lib.memory.FlwMemoryTracker; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; import it.unimi.dsi.fastutil.PriorityQueue; import it.unimi.dsi.fastutil.objects.ObjectArrayFIFOQueue; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/TransferList.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/TransferList.java index 178491434..66d7dfa70 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/TransferList.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/TransferList.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.backend.engine.indirect; +package dev.engine_room.flywheel.backend.engine.indirect; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.backend.util.MemoryBuffer; +import dev.engine_room.flywheel.backend.util.MemoryBuffer; public class TransferList { private static final long STRIDE = Long.BYTES * 4; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/instancing/InstancedDraw.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/instancing/InstancedDraw.java index 16e6e77e1..91b8d782c 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/instancing/InstancedDraw.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/instancing/InstancedDraw.java @@ -1,9 +1,9 @@ -package com.jozufozu.flywheel.backend.engine.instancing; +package dev.engine_room.flywheel.backend.engine.instancing; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.backend.engine.GroupKey; -import com.jozufozu.flywheel.backend.engine.MeshPool; -import com.jozufozu.flywheel.backend.gl.TextureBuffer; +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.backend.engine.GroupKey; +import dev.engine_room.flywheel.backend.engine.MeshPool; +import dev.engine_room.flywheel.backend.gl.TextureBuffer; public class InstancedDraw { public final GroupKey groupKey; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/instancing/InstancedDrawManager.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/instancing/InstancedDrawManager.java index 4f6f9940c..b532823ab 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/instancing/InstancedDrawManager.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/instancing/InstancedDrawManager.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.engine.instancing; +package dev.engine_room.flywheel.backend.engine.instancing; import java.util.EnumMap; import java.util.List; @@ -6,29 +6,28 @@ import org.lwjgl.opengl.GL32; -import com.jozufozu.flywheel.api.backend.Engine; -import com.jozufozu.flywheel.api.event.RenderStage; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.backend.Samplers; -import com.jozufozu.flywheel.backend.ShaderIndices; -import com.jozufozu.flywheel.backend.compile.ContextShader; -import com.jozufozu.flywheel.backend.compile.InstancingPrograms; -import com.jozufozu.flywheel.backend.engine.CommonCrumbling; -import com.jozufozu.flywheel.backend.engine.DrawManager; -import com.jozufozu.flywheel.backend.engine.GroupKey; -import com.jozufozu.flywheel.backend.engine.InstancerKey; -import com.jozufozu.flywheel.backend.engine.MaterialEncoder; -import com.jozufozu.flywheel.backend.engine.MaterialRenderState; -import com.jozufozu.flywheel.backend.engine.MeshPool; -import com.jozufozu.flywheel.backend.engine.TextureBinder; -import com.jozufozu.flywheel.backend.engine.uniform.Uniforms; -import com.jozufozu.flywheel.backend.gl.GlStateTracker; -import com.jozufozu.flywheel.backend.gl.TextureBuffer; -import com.jozufozu.flywheel.backend.gl.array.GlVertexArray; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; -import com.jozufozu.flywheel.lib.material.SimpleMaterial; - +import dev.engine_room.flywheel.api.backend.Engine; +import dev.engine_room.flywheel.api.event.RenderStage; +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.backend.Samplers; +import dev.engine_room.flywheel.backend.ShaderIndices; +import dev.engine_room.flywheel.backend.compile.ContextShader; +import dev.engine_room.flywheel.backend.compile.InstancingPrograms; +import dev.engine_room.flywheel.backend.engine.CommonCrumbling; +import dev.engine_room.flywheel.backend.engine.DrawManager; +import dev.engine_room.flywheel.backend.engine.GroupKey; +import dev.engine_room.flywheel.backend.engine.InstancerKey; +import dev.engine_room.flywheel.backend.engine.MaterialEncoder; +import dev.engine_room.flywheel.backend.engine.MaterialRenderState; +import dev.engine_room.flywheel.backend.engine.MeshPool; +import dev.engine_room.flywheel.backend.engine.TextureBinder; +import dev.engine_room.flywheel.backend.engine.uniform.Uniforms; +import dev.engine_room.flywheel.backend.gl.GlStateTracker; +import dev.engine_room.flywheel.backend.gl.TextureBuffer; +import dev.engine_room.flywheel.backend.gl.array.GlVertexArray; +import dev.engine_room.flywheel.backend.gl.shader.GlProgram; +import dev.engine_room.flywheel.lib.material.SimpleMaterial; import net.minecraft.client.resources.model.ModelBakery; public class InstancedDrawManager extends DrawManager> { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/instancing/InstancedInstancer.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/instancing/InstancedInstancer.java index afc225ef5..9ca3d5cc8 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/instancing/InstancedInstancer.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/instancing/InstancedInstancer.java @@ -1,20 +1,20 @@ -package com.jozufozu.flywheel.backend.engine.instancing; +package dev.engine_room.flywheel.backend.engine.instancing; import java.util.ArrayList; import java.util.List; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.api.instance.InstanceWriter; -import com.jozufozu.flywheel.backend.engine.AbstractInstancer; -import com.jozufozu.flywheel.backend.engine.embed.Environment; -import com.jozufozu.flywheel.backend.gl.TextureBuffer; -import com.jozufozu.flywheel.backend.gl.buffer.GlBuffer; -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferUsage; -import com.jozufozu.flywheel.lib.math.MoreMath; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.api.instance.InstanceWriter; +import dev.engine_room.flywheel.backend.engine.AbstractInstancer; +import dev.engine_room.flywheel.backend.engine.embed.Environment; +import dev.engine_room.flywheel.backend.gl.TextureBuffer; +import dev.engine_room.flywheel.backend.gl.buffer.GlBuffer; +import dev.engine_room.flywheel.backend.gl.buffer.GlBufferUsage; +import dev.engine_room.flywheel.lib.math.MoreMath; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; public class InstancedInstancer extends AbstractInstancer { private final int instanceStride; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/instancing/InstancedRenderStage.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/instancing/InstancedRenderStage.java index a8abc66c5..94dee9230 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/instancing/InstancedRenderStage.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/instancing/InstancedRenderStage.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.backend.engine.instancing; +package dev.engine_room.flywheel.backend.engine.instancing; -import static com.jozufozu.flywheel.backend.engine.instancing.InstancedDrawManager.uploadMaterialUniform; +import static dev.engine_room.flywheel.backend.engine.instancing.InstancedDrawManager.uploadMaterialUniform; import java.util.ArrayList; import java.util.Comparator; @@ -8,11 +8,11 @@ import java.util.List; import java.util.Map; -import com.jozufozu.flywheel.backend.Samplers; -import com.jozufozu.flywheel.backend.compile.InstancingPrograms; -import com.jozufozu.flywheel.backend.engine.GroupKey; -import com.jozufozu.flywheel.backend.engine.MaterialRenderState; -import com.jozufozu.flywheel.backend.gl.TextureBuffer; +import dev.engine_room.flywheel.backend.Samplers; +import dev.engine_room.flywheel.backend.compile.InstancingPrograms; +import dev.engine_room.flywheel.backend.engine.GroupKey; +import dev.engine_room.flywheel.backend.engine.MaterialRenderState; +import dev.engine_room.flywheel.backend.gl.TextureBuffer; public class InstancedRenderStage { private static final Comparator DRAW_COMPARATOR = Comparator.comparing(InstancedDraw::indexOfMeshInModel) diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/DebugMode.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/DebugMode.java index 01ac310f1..8eae9c292 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/DebugMode.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/DebugMode.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.engine.uniform; +package dev.engine_room.flywheel.backend.engine.uniform; import java.util.Locale; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/FogUniforms.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/FogUniforms.java index 1e71ff0c2..60a9a39dd 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/FogUniforms.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/FogUniforms.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.engine.uniform; +package dev.engine_room.flywheel.backend.engine.uniform; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/FrameUniforms.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/FrameUniforms.java index e4467ab8e..3ae15cb5b 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/FrameUniforms.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/FrameUniforms.java @@ -1,14 +1,13 @@ -package com.jozufozu.flywheel.backend.engine.uniform; +package dev.engine_room.flywheel.backend.engine.uniform; import org.joml.Matrix4f; import org.joml.Vector2f; import org.joml.Vector3f; -import com.jozufozu.flywheel.api.event.RenderContext; -import com.jozufozu.flywheel.api.visualization.VisualizationManager; -import com.jozufozu.flywheel.backend.mixin.LevelRendererAccessor; -import com.jozufozu.flywheel.lib.math.MatrixMath; - +import dev.engine_room.flywheel.api.event.RenderContext; +import dev.engine_room.flywheel.api.visualization.VisualizationManager; +import dev.engine_room.flywheel.backend.mixin.LevelRendererAccessor; +import dev.engine_room.flywheel.lib.math.MatrixMath; import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/LevelUniforms.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/LevelUniforms.java index f02707788..ae1422181 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/LevelUniforms.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/LevelUniforms.java @@ -1,7 +1,6 @@ -package com.jozufozu.flywheel.backend.engine.uniform; - -import com.jozufozu.flywheel.api.event.RenderContext; +package dev.engine_room.flywheel.backend.engine.uniform; +import dev.engine_room.flywheel.api.event.RenderContext; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.Level; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/OptionsUniforms.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/OptionsUniforms.java index 8fc153150..6c11c2a35 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/OptionsUniforms.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/OptionsUniforms.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.engine.uniform; +package dev.engine_room.flywheel.backend.engine.uniform; import net.minecraft.client.Options; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/PlayerUniforms.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/PlayerUniforms.java index 7bdfc44a6..4df00cc01 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/PlayerUniforms.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/PlayerUniforms.java @@ -1,11 +1,10 @@ -package com.jozufozu.flywheel.backend.engine.uniform; +package dev.engine_room.flywheel.backend.engine.uniform; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.event.RenderContext; -import com.jozufozu.flywheel.backend.FlwBackendXplat; -import com.jozufozu.flywheel.backend.mixin.AbstractClientPlayerAccessor; - +import dev.engine_room.flywheel.api.event.RenderContext; +import dev.engine_room.flywheel.backend.FlwBackendXplat; +import dev.engine_room.flywheel.backend.mixin.AbstractClientPlayerAccessor; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.multiplayer.PlayerInfo; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/UniformBuffer.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/UniformBuffer.java index b1712e133..4dacf1cc0 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/UniformBuffer.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/UniformBuffer.java @@ -1,12 +1,12 @@ -package com.jozufozu.flywheel.backend.engine.uniform; +package dev.engine_room.flywheel.backend.engine.uniform; import org.jetbrains.annotations.Nullable; import org.lwjgl.opengl.GL32; -import com.jozufozu.flywheel.backend.gl.buffer.GlBuffer; -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferUsage; -import com.jozufozu.flywheel.lib.math.MoreMath; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; +import dev.engine_room.flywheel.backend.gl.buffer.GlBuffer; +import dev.engine_room.flywheel.backend.gl.buffer.GlBufferUsage; +import dev.engine_room.flywheel.lib.math.MoreMath; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; public class UniformBuffer { private final int index; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/UniformWriter.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/UniformWriter.java index 9951abb01..246d40edc 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/UniformWriter.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/UniformWriter.java @@ -1,10 +1,9 @@ -package com.jozufozu.flywheel.backend.engine.uniform; +package dev.engine_room.flywheel.backend.engine.uniform; import org.joml.Matrix4f; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.lib.math.MatrixMath; - +import dev.engine_room.flywheel.lib.math.MatrixMath; import net.minecraft.core.BlockPos; import net.minecraft.tags.FluidTags; import net.minecraft.world.level.Level; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/Uniforms.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/Uniforms.java index 057e506ed..14539cb60 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/Uniforms.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/uniform/Uniforms.java @@ -1,7 +1,7 @@ -package com.jozufozu.flywheel.backend.engine.uniform; +package dev.engine_room.flywheel.backend.engine.uniform; -import com.jozufozu.flywheel.api.event.RenderContext; -import com.jozufozu.flywheel.backend.gl.shader.GlProgram; +import dev.engine_room.flywheel.api.event.RenderContext; +import dev.engine_room.flywheel.backend.gl.shader.GlProgram; public final class Uniforms { public static final int FRAME_INDEX = 0; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/Driver.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/Driver.java index 939b78aea..976c7eaf9 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/Driver.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/Driver.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl; +package dev.engine_room.flywheel.backend.gl; public enum Driver { NVIDIA, diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlCompat.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlCompat.java index e284d6975..d860d2556 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlCompat.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlCompat.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl; +package dev.engine_room.flywheel.backend.gl; import java.nio.ByteBuffer; @@ -12,10 +12,10 @@ import org.lwjgl.opengl.KHRShaderSubgroup; import org.lwjgl.system.MemoryStack; -import com.jozufozu.flywheel.backend.FlwBackend; -import com.jozufozu.flywheel.backend.compile.core.Compilation; -import com.jozufozu.flywheel.backend.glsl.GlslVersion; -import com.jozufozu.flywheel.lib.math.MoreMath; +import dev.engine_room.flywheel.backend.FlwBackend; +import dev.engine_room.flywheel.backend.compile.core.Compilation; +import dev.engine_room.flywheel.backend.glsl.GlslVersion; +import dev.engine_room.flywheel.lib.math.MoreMath; public final class GlCompat { @UnknownNullability diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlFence.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlFence.java index 67ce6ffe0..63da9617d 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlFence.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlFence.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl; +package dev.engine_room.flywheel.backend.gl; import static org.lwjgl.opengl.GL32.GL_SIGNALED; import static org.lwjgl.opengl.GL32.GL_SYNC_GPU_COMMANDS_COMPLETE; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlNumericType.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlNumericType.java index 6cac1f448..1a42b8485 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlNumericType.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlNumericType.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl; +package dev.engine_room.flywheel.backend.gl; import org.lwjgl.opengl.GL11; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlObject.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlObject.java index c86581e6b..ed8e40859 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlObject.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlObject.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl; +package dev.engine_room.flywheel.backend.gl; // Utility class for safely dealing with gl object handles. public abstract class GlObject { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlPrimitive.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlPrimitive.java index 71a8d5353..60cc5bccc 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlPrimitive.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlPrimitive.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl; +package dev.engine_room.flywheel.backend.gl; import org.lwjgl.opengl.GL11; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlStateTracker.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlStateTracker.java index ebdb56b20..93c40c9c0 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlStateTracker.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlStateTracker.java @@ -1,8 +1,9 @@ -package com.jozufozu.flywheel.backend.gl; +package dev.engine_room.flywheel.backend.gl; -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType; import com.mojang.blaze3d.platform.GlStateManager; +import dev.engine_room.flywheel.backend.gl.buffer.GlBufferType; + /** * Tracks bound buffers/vbos because GlStateManager doesn't do that for us. */ diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlTexture.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlTexture.java index 4a05ba15f..958763d53 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlTexture.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlTexture.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl; +package dev.engine_room.flywheel.backend.gl; import org.lwjgl.opengl.GL20; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlTextureUnit.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlTextureUnit.java index c599c3cb4..75797f2ec 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlTextureUnit.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/GlTextureUnit.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl; +package dev.engine_room.flywheel.backend.gl; import static org.lwjgl.opengl.GL13.GL_TEXTURE0; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/TextureBuffer.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/TextureBuffer.java index b20ecd71e..21eb9361f 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/TextureBuffer.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/TextureBuffer.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl; +package dev.engine_room.flywheel.backend.gl; import org.lwjgl.opengl.GL32; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/array/GlVertexArray.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/array/GlVertexArray.java index 463ebf549..28da1390a 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/array/GlVertexArray.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/array/GlVertexArray.java @@ -1,13 +1,14 @@ -package com.jozufozu.flywheel.backend.gl.array; +package dev.engine_room.flywheel.backend.gl.array; import java.util.List; import org.lwjgl.opengl.GL32; -import com.jozufozu.flywheel.backend.gl.GlObject; -import com.jozufozu.flywheel.backend.gl.GlStateTracker; import com.mojang.blaze3d.platform.GlStateManager; +import dev.engine_room.flywheel.backend.gl.GlObject; +import dev.engine_room.flywheel.backend.gl.GlStateTracker; + public abstract class GlVertexArray extends GlObject { protected static final int MAX_ATTRIBS = GL32.glGetInteger(GL32.GL_MAX_VERTEX_ATTRIBS); protected static final int MAX_ATTRIB_BINDINGS = 16; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/array/GlVertexArrayDSA.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/array/GlVertexArrayDSA.java index fd5c11190..4dca28b58 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/array/GlVertexArrayDSA.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/array/GlVertexArrayDSA.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.array; +package dev.engine_room.flywheel.backend.gl.array; import java.util.BitSet; import java.util.List; @@ -6,8 +6,8 @@ import org.lwjgl.opengl.GL45C; import org.lwjgl.system.Checks; -import com.jozufozu.flywheel.backend.gl.GlCompat; -import com.jozufozu.flywheel.lib.util.FlwUtil; +import dev.engine_room.flywheel.backend.gl.GlCompat; +import dev.engine_room.flywheel.lib.util.FlwUtil; public class GlVertexArrayDSA extends GlVertexArray { public static final boolean SUPPORTED = isSupported(); diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/array/GlVertexArrayGL3.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/array/GlVertexArrayGL3.java index 98065c88d..bdf048ff4 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/array/GlVertexArrayGL3.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/array/GlVertexArrayGL3.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.array; +package dev.engine_room.flywheel.backend.gl.array; import java.util.BitSet; import java.util.List; @@ -10,9 +10,9 @@ import org.lwjgl.opengl.GL33C; import org.lwjgl.system.Checks; -import com.jozufozu.flywheel.backend.gl.GlCompat; -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType; -import com.jozufozu.flywheel.lib.util.FlwUtil; +import dev.engine_room.flywheel.backend.gl.GlCompat; +import dev.engine_room.flywheel.backend.gl.buffer.GlBufferType; +import dev.engine_room.flywheel.lib.util.FlwUtil; public abstract class GlVertexArrayGL3 extends GlVertexArray { private final BitSet attributeDirty = new BitSet(MAX_ATTRIBS); diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/array/GlVertexArraySeparateAttributes.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/array/GlVertexArraySeparateAttributes.java index 7f930bb6b..a7bdbf978 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/array/GlVertexArraySeparateAttributes.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/array/GlVertexArraySeparateAttributes.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.array; +package dev.engine_room.flywheel.backend.gl.array; import java.util.BitSet; import java.util.List; @@ -6,10 +6,10 @@ import org.lwjgl.opengl.GL43C; import org.lwjgl.system.Checks; -import com.jozufozu.flywheel.backend.gl.GlCompat; -import com.jozufozu.flywheel.backend.gl.GlStateTracker; -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType; -import com.jozufozu.flywheel.lib.util.FlwUtil; +import dev.engine_room.flywheel.backend.gl.GlCompat; +import dev.engine_room.flywheel.backend.gl.GlStateTracker; +import dev.engine_room.flywheel.backend.gl.buffer.GlBufferType; +import dev.engine_room.flywheel.lib.util.FlwUtil; public class GlVertexArraySeparateAttributes extends GlVertexArray { public static final boolean SUPPORTED = isSupported(); diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/array/VertexAttribute.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/array/VertexAttribute.java index 8f7b7b407..c01911dea 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/array/VertexAttribute.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/array/VertexAttribute.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.backend.gl.array; +package dev.engine_room.flywheel.backend.gl.array; -import com.jozufozu.flywheel.backend.gl.GlNumericType; +import dev.engine_room.flywheel.backend.gl.GlNumericType; public sealed interface VertexAttribute { int byteWidth(); diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/buffer/Buffer.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/buffer/Buffer.java index 04b052c40..2e73a8fe6 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/buffer/Buffer.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/buffer/Buffer.java @@ -1,10 +1,10 @@ -package com.jozufozu.flywheel.backend.gl.buffer; +package dev.engine_room.flywheel.backend.gl.buffer; import org.lwjgl.opengl.GL15; import org.lwjgl.opengl.GL45C; import org.lwjgl.system.Checks; -import com.jozufozu.flywheel.backend.gl.GlCompat; +import dev.engine_room.flywheel.backend.gl.GlCompat; public interface Buffer { Buffer IMPL = new DSA().fallback(); diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/buffer/GlBuffer.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/buffer/GlBuffer.java index 86b9f70e7..a42d4aa58 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/buffer/GlBuffer.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/buffer/GlBuffer.java @@ -1,10 +1,11 @@ -package com.jozufozu.flywheel.backend.gl.buffer; +package dev.engine_room.flywheel.backend.gl.buffer; -import com.jozufozu.flywheel.backend.gl.GlObject; -import com.jozufozu.flywheel.lib.memory.FlwMemoryTracker; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; import com.mojang.blaze3d.platform.GlStateManager; +import dev.engine_room.flywheel.backend.gl.GlObject; +import dev.engine_room.flywheel.lib.memory.FlwMemoryTracker; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; + public class GlBuffer extends GlObject { protected final GlBufferUsage usage; /** diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/buffer/GlBufferType.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/buffer/GlBufferType.java index 7e87f1767..933976157 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/buffer/GlBufferType.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/buffer/GlBufferType.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.buffer; +package dev.engine_room.flywheel.backend.gl.buffer; import org.lwjgl.opengl.GL15C; import org.lwjgl.opengl.GL21; @@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL42; import org.lwjgl.opengl.GL43; -import com.jozufozu.flywheel.backend.gl.GlStateTracker; +import dev.engine_room.flywheel.backend.gl.GlStateTracker; public enum GlBufferType { ARRAY_BUFFER(GL15C.GL_ARRAY_BUFFER, GL15C.GL_ARRAY_BUFFER_BINDING), diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/buffer/GlBufferUsage.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/buffer/GlBufferUsage.java index ef1a716fb..905a979e1 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/buffer/GlBufferUsage.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/buffer/GlBufferUsage.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.buffer; +package dev.engine_room.flywheel.backend.gl.buffer; import org.lwjgl.opengl.GL15; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/error/GlError.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/error/GlError.java index a0cdbded8..4780a0922 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/error/GlError.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/error/GlError.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.error; +package dev.engine_room.flywheel.backend.gl.error; import java.util.function.Supplier; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/error/GlException.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/error/GlException.java index ac856a5f1..05b405258 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/error/GlException.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/error/GlException.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.error; +package dev.engine_room.flywheel.backend.gl.error; public class GlException extends RuntimeException { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/shader/GlProgram.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/shader/GlProgram.java index 3642da5e6..b221fdddf 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/shader/GlProgram.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/shader/GlProgram.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.shader; +package dev.engine_room.flywheel.backend.gl.shader; import static org.lwjgl.opengl.GL20.glBindAttribLocation; import static org.lwjgl.opengl.GL20.glDeleteProgram; @@ -19,11 +19,11 @@ import org.joml.Matrix4fc; import org.slf4j.Logger; -import com.jozufozu.flywheel.backend.gl.GlObject; -import com.jozufozu.flywheel.backend.gl.GlTextureUnit; import com.mojang.blaze3d.shaders.ProgramManager; import com.mojang.logging.LogUtils; +import dev.engine_room.flywheel.backend.gl.GlObject; +import dev.engine_room.flywheel.backend.gl.GlTextureUnit; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/shader/GlShader.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/shader/GlShader.java index 6c6f484e4..3481b33a3 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/shader/GlShader.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/shader/GlShader.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.backend.gl.shader; +package dev.engine_room.flywheel.backend.gl.shader; import org.lwjgl.opengl.GL20; -import com.jozufozu.flywheel.backend.gl.GlObject; +import dev.engine_room.flywheel.backend.gl.GlObject; public class GlShader extends GlObject { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/shader/ShaderType.java b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/shader/ShaderType.java index 85c410b1d..da323ff10 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/gl/shader/ShaderType.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/gl/shader/ShaderType.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.gl.shader; +package dev.engine_room.flywheel.backend.gl.shader; import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL43; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/GlslVersion.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/GlslVersion.java index 11453eb07..52df491c3 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/GlslVersion.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/GlslVersion.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl; +package dev.engine_room.flywheel.backend.glsl; public enum GlslVersion { V150(150), diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/LoadError.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/LoadError.java index bf002fd56..0cfd3058b 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/LoadError.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/LoadError.java @@ -1,14 +1,13 @@ -package com.jozufozu.flywheel.backend.glsl; +package dev.engine_room.flywheel.backend.glsl; import java.io.FileNotFoundException; import java.io.IOException; import java.util.List; import java.util.stream.Collectors; -import com.jozufozu.flywheel.backend.glsl.error.ErrorBuilder; -import com.jozufozu.flywheel.backend.glsl.span.Span; -import com.jozufozu.flywheel.lib.util.Pair; - +import dev.engine_room.flywheel.backend.glsl.error.ErrorBuilder; +import dev.engine_room.flywheel.backend.glsl.span.Span; +import dev.engine_room.flywheel.lib.util.Pair; import net.minecraft.ResourceLocationException; import net.minecraft.resources.ResourceLocation; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/LoadResult.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/LoadResult.java index e566ec2e5..7c9753edf 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/LoadResult.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/LoadResult.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl; +package dev.engine_room.flywheel.backend.glsl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/ShaderSources.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/ShaderSources.java index 9b7e26c7f..0c1c08fed 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/ShaderSources.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/ShaderSources.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl; +package dev.engine_room.flywheel.backend.glsl; import java.io.IOException; import java.io.InputStream; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/SourceComponent.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/SourceComponent.java index 2219f845f..8bdf84c4b 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/SourceComponent.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/SourceComponent.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl; +package dev.engine_room.flywheel.backend.glsl; import java.util.Collection; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/SourceFile.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/SourceFile.java index 09daa2951..020b85692 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/SourceFile.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/SourceFile.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl; +package dev.engine_room.flywheel.backend.glsl; import java.util.ArrayList; import java.util.Collection; @@ -11,15 +11,15 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.jozufozu.flywheel.backend.glsl.parse.Import; -import com.jozufozu.flywheel.backend.glsl.parse.ShaderField; -import com.jozufozu.flywheel.backend.glsl.parse.ShaderFunction; -import com.jozufozu.flywheel.backend.glsl.parse.ShaderStruct; -import com.jozufozu.flywheel.backend.glsl.span.Span; -import com.jozufozu.flywheel.backend.glsl.span.StringSpan; -import com.jozufozu.flywheel.lib.util.Pair; -import com.jozufozu.flywheel.lib.util.ResourceUtil; +import dev.engine_room.flywheel.backend.glsl.parse.Import; +import dev.engine_room.flywheel.backend.glsl.parse.ShaderField; +import dev.engine_room.flywheel.backend.glsl.parse.ShaderFunction; +import dev.engine_room.flywheel.backend.glsl.parse.ShaderStruct; +import dev.engine_room.flywheel.backend.glsl.span.Span; +import dev.engine_room.flywheel.backend.glsl.span.StringSpan; +import dev.engine_room.flywheel.lib.util.Pair; +import dev.engine_room.flywheel.lib.util.ResourceUtil; import net.minecraft.ResourceLocationException; import net.minecraft.resources.ResourceLocation; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/SourceLines.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/SourceLines.java index 2964ca880..ebc40e19e 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/SourceLines.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/SourceLines.java @@ -1,11 +1,11 @@ -package com.jozufozu.flywheel.backend.glsl; +package dev.engine_room.flywheel.backend.glsl; import java.util.regex.Matcher; import java.util.regex.Pattern; import com.google.common.collect.ImmutableList; -import com.jozufozu.flywheel.backend.glsl.span.CharPos; +import dev.engine_room.flywheel.backend.glsl.span.CharPos; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; import it.unimi.dsi.fastutil.ints.IntLists; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/ConsoleColors.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/ConsoleColors.java index 3bcb1b316..76b29b538 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/ConsoleColors.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/ConsoleColors.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl.error; +package dev.engine_room.flywheel.backend.glsl.error; // https://stackoverflow.com/a/45444716 public final class ConsoleColors { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/ErrorBuilder.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/ErrorBuilder.java index 84b93258b..f4e5fe023 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/ErrorBuilder.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/ErrorBuilder.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl.error; +package dev.engine_room.flywheel.backend.glsl.error; import java.util.ArrayList; import java.util.List; @@ -8,18 +8,17 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.VisibleForTesting; -import com.jozufozu.flywheel.backend.glsl.SourceFile; -import com.jozufozu.flywheel.backend.glsl.SourceLines; -import com.jozufozu.flywheel.backend.glsl.error.lines.ErrorLine; -import com.jozufozu.flywheel.backend.glsl.error.lines.FileLine; -import com.jozufozu.flywheel.backend.glsl.error.lines.HeaderLine; -import com.jozufozu.flywheel.backend.glsl.error.lines.NestedLine; -import com.jozufozu.flywheel.backend.glsl.error.lines.SourceLine; -import com.jozufozu.flywheel.backend.glsl.error.lines.SpanHighlightLine; -import com.jozufozu.flywheel.backend.glsl.error.lines.TextLine; -import com.jozufozu.flywheel.backend.glsl.span.Span; -import com.jozufozu.flywheel.lib.util.StringUtil; - +import dev.engine_room.flywheel.backend.glsl.SourceFile; +import dev.engine_room.flywheel.backend.glsl.SourceLines; +import dev.engine_room.flywheel.backend.glsl.error.lines.ErrorLine; +import dev.engine_room.flywheel.backend.glsl.error.lines.FileLine; +import dev.engine_room.flywheel.backend.glsl.error.lines.HeaderLine; +import dev.engine_room.flywheel.backend.glsl.error.lines.NestedLine; +import dev.engine_room.flywheel.backend.glsl.error.lines.SourceLine; +import dev.engine_room.flywheel.backend.glsl.error.lines.SpanHighlightLine; +import dev.engine_room.flywheel.backend.glsl.error.lines.TextLine; +import dev.engine_room.flywheel.backend.glsl.span.Span; +import dev.engine_room.flywheel.lib.util.StringUtil; import net.minecraft.resources.ResourceLocation; public class ErrorBuilder { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/ErrorLevel.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/ErrorLevel.java index c0b8a54ff..8e62d6c51 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/ErrorLevel.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/ErrorLevel.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl.error; +package dev.engine_room.flywheel.backend.glsl.error; public enum ErrorLevel { WARN(ConsoleColors.YELLOW, "warn"), diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/Divider.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/Divider.java index 9d2db60bf..09ee68055 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/Divider.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/Divider.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl.error.lines; +package dev.engine_room.flywheel.backend.glsl.error.lines; public enum Divider { BAR(" | "), diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/ErrorLine.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/ErrorLine.java index 88d934f01..d2622ffcd 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/ErrorLine.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/ErrorLine.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl.error.lines; +package dev.engine_room.flywheel.backend.glsl.error.lines; public interface ErrorLine { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/FileLine.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/FileLine.java index 135c39188..e9f77a090 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/FileLine.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/FileLine.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl.error.lines; +package dev.engine_room.flywheel.backend.glsl.error.lines; public record FileLine(String fileName) implements ErrorLine { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/HeaderLine.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/HeaderLine.java index 99c0e635e..dc4f24703 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/HeaderLine.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/HeaderLine.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl.error.lines; +package dev.engine_room.flywheel.backend.glsl.error.lines; public record HeaderLine(String level, CharSequence message) implements ErrorLine { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/NestedLine.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/NestedLine.java index bcb86cec0..9ba5a5b6e 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/NestedLine.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/NestedLine.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl.error.lines; +package dev.engine_room.flywheel.backend.glsl.error.lines; public record NestedLine(String right) implements ErrorLine { @Override diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/SourceLine.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/SourceLine.java index 9b540359f..8015f5abe 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/SourceLine.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/SourceLine.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl.error.lines; +package dev.engine_room.flywheel.backend.glsl.error.lines; public record SourceLine(String number, String line) implements ErrorLine { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/SpanHighlightLine.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/SpanHighlightLine.java index 5d622ba9f..1d1e41a72 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/SpanHighlightLine.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/SpanHighlightLine.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl.error.lines; +package dev.engine_room.flywheel.backend.glsl.error.lines; public class SpanHighlightLine implements ErrorLine { private final String line; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/TextLine.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/TextLine.java index 0a3f7fae3..e957106db 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/TextLine.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/error/lines/TextLine.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl.error.lines; +package dev.engine_room.flywheel.backend.glsl.error.lines; public record TextLine(String msg) implements ErrorLine { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/BinOp.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/BinOp.java index 25abf4c84..d1ccbf8b2 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/BinOp.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/BinOp.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl.generate; +package dev.engine_room.flywheel.backend.glsl.generate; public enum BinOp { DIVIDE("/"), diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/FnSignature.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/FnSignature.java index d1982daaf..dcfea176c 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/FnSignature.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/FnSignature.java @@ -1,10 +1,11 @@ -package com.jozufozu.flywheel.backend.glsl.generate; +package dev.engine_room.flywheel.backend.glsl.generate; import java.util.Collection; import java.util.stream.Collectors; import com.google.common.collect.ImmutableList; -import com.jozufozu.flywheel.lib.util.Pair; + +import dev.engine_room.flywheel.lib.util.Pair; public record FnSignature(String returnType, String name, ImmutableList> args) { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslBlock.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslBlock.java index 973a05584..94ef3b095 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslBlock.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslBlock.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl.generate; +package dev.engine_room.flywheel.backend.glsl.generate; import java.util.ArrayList; import java.util.List; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslBuilder.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslBuilder.java index c9503c648..74f95b389 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslBuilder.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslBuilder.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl.generate; +package dev.engine_room.flywheel.backend.glsl.generate; import java.util.ArrayList; import java.util.List; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslExpr.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslExpr.java index 7c2239f4d..c9f15ea73 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslExpr.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslExpr.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl.generate; +package dev.engine_room.flywheel.backend.glsl.generate; import java.util.Collection; import java.util.List; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslFn.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslFn.java index b9b801ce5..cd6bbea68 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslFn.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslFn.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.backend.glsl.generate; +package dev.engine_room.flywheel.backend.glsl.generate; import java.util.function.Consumer; -import com.jozufozu.flywheel.lib.util.StringUtil; +import dev.engine_room.flywheel.lib.util.StringUtil; public class GlslFn implements GlslBuilder.Declaration { private GlslBlock body = new GlslBlock(); diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslStmt.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslStmt.java index 01c227949..38c3cb865 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslStmt.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslStmt.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl.generate; +package dev.engine_room.flywheel.backend.glsl.generate; public interface GlslStmt { GlslStmt BREAK = () -> "break;"; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslStruct.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslStruct.java index a4298440d..5da578f56 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslStruct.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslStruct.java @@ -1,11 +1,11 @@ -package com.jozufozu.flywheel.backend.glsl.generate; +package dev.engine_room.flywheel.backend.glsl.generate; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import com.jozufozu.flywheel.lib.util.Pair; -import com.jozufozu.flywheel.lib.util.StringUtil; +import dev.engine_room.flywheel.lib.util.Pair; +import dev.engine_room.flywheel.lib.util.StringUtil; public class GlslStruct implements GlslBuilder.Declaration { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslSwitch.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslSwitch.java index ee8379007..37ef474b8 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslSwitch.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslSwitch.java @@ -1,11 +1,11 @@ -package com.jozufozu.flywheel.backend.glsl.generate; +package dev.engine_room.flywheel.backend.glsl.generate; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import com.jozufozu.flywheel.lib.util.Pair; -import com.jozufozu.flywheel.lib.util.StringUtil; +import dev.engine_room.flywheel.lib.util.Pair; +import dev.engine_room.flywheel.lib.util.StringUtil; public class GlslSwitch implements GlslStmt { private final GlslExpr on; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslUniformBlock.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslUniformBlock.java index e6f62c194..011cfe822 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslUniformBlock.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslUniformBlock.java @@ -1,11 +1,11 @@ -package com.jozufozu.flywheel.backend.glsl.generate; +package dev.engine_room.flywheel.backend.glsl.generate; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import com.jozufozu.flywheel.lib.util.Pair; -import com.jozufozu.flywheel.lib.util.StringUtil; +import dev.engine_room.flywheel.lib.util.Pair; +import dev.engine_room.flywheel.lib.util.StringUtil; public class GlslUniformBlock implements GlslBuilder.Declaration { private String qualifier; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslVertexInput.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslVertexInput.java index 0997b1c50..c33f11c12 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslVertexInput.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/generate/GlslVertexInput.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl.generate; +package dev.engine_room.flywheel.backend.glsl.generate; public class GlslVertexInput implements GlslBuilder.Declaration { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/Import.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/Import.java index b189dfd62..159009b21 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/Import.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/Import.java @@ -1,11 +1,12 @@ -package com.jozufozu.flywheel.backend.glsl.parse; +package dev.engine_room.flywheel.backend.glsl.parse; import java.util.regex.Matcher; import java.util.regex.Pattern; import com.google.common.collect.ImmutableList; -import com.jozufozu.flywheel.backend.glsl.SourceLines; -import com.jozufozu.flywheel.backend.glsl.span.Span; + +import dev.engine_room.flywheel.backend.glsl.SourceLines; +import dev.engine_room.flywheel.backend.glsl.span.Span; public record Import(Span self, Span file) { public static final Pattern PATTERN = Pattern.compile("^\\s*#\\s*include\\s+\"(.*)\"", Pattern.MULTILINE); diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/ShaderField.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/ShaderField.java index 772466830..5ed22b77a 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/ShaderField.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/ShaderField.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl.parse; +package dev.engine_room.flywheel.backend.glsl.parse; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -6,8 +6,9 @@ import org.jetbrains.annotations.Nullable; import com.google.common.collect.ImmutableMap; -import com.jozufozu.flywheel.backend.glsl.SourceLines; -import com.jozufozu.flywheel.backend.glsl.span.Span; + +import dev.engine_room.flywheel.backend.glsl.SourceLines; +import dev.engine_room.flywheel.backend.glsl.span.Span; public class ShaderField { public static final Pattern PATTERN = Pattern.compile("layout\\s*\\(location\\s*=\\s*(\\d+)\\)\\s+(in|out)\\s+([\\w\\d]+)\\s+" + "([\\w\\d]+)"); diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/ShaderFunction.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/ShaderFunction.java index 61f0e8c51..5d6c06bbf 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/ShaderFunction.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/ShaderFunction.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl.parse; +package dev.engine_room.flywheel.backend.glsl.parse; import java.util.HashMap; import java.util.Map; @@ -8,10 +8,11 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.jozufozu.flywheel.backend.glsl.SourceLines; -import com.jozufozu.flywheel.backend.glsl.span.ErrorSpan; -import com.jozufozu.flywheel.backend.glsl.span.Span; -import com.jozufozu.flywheel.backend.glsl.span.StringSpan; + +import dev.engine_room.flywheel.backend.glsl.SourceLines; +import dev.engine_room.flywheel.backend.glsl.span.ErrorSpan; +import dev.engine_room.flywheel.backend.glsl.span.Span; +import dev.engine_room.flywheel.backend.glsl.span.StringSpan; public class ShaderFunction { // https://regexr.com/60n3d diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/ShaderStruct.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/ShaderStruct.java index 541298591..d1af3342e 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/ShaderStruct.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/ShaderStruct.java @@ -1,12 +1,13 @@ -package com.jozufozu.flywheel.backend.glsl.parse; +package dev.engine_room.flywheel.backend.glsl.parse; import java.util.regex.Matcher; import java.util.regex.Pattern; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.jozufozu.flywheel.backend.glsl.SourceLines; -import com.jozufozu.flywheel.backend.glsl.span.Span; + +import dev.engine_room.flywheel.backend.glsl.SourceLines; +import dev.engine_room.flywheel.backend.glsl.span.Span; public class ShaderStruct { // https://regexr.com/61rpe diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/ShaderVariable.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/ShaderVariable.java index 9a1a0dc44..707c92830 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/ShaderVariable.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/ShaderVariable.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.backend.glsl.parse; +package dev.engine_room.flywheel.backend.glsl.parse; -import com.jozufozu.flywheel.backend.glsl.span.Span; +import dev.engine_room.flywheel.backend.glsl.span.Span; public class ShaderVariable { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/StructField.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/StructField.java index 98df1161e..b0b3f7448 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/StructField.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/parse/StructField.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.backend.glsl.parse; +package dev.engine_room.flywheel.backend.glsl.parse; import java.util.regex.Pattern; -import com.jozufozu.flywheel.backend.glsl.span.Span; +import dev.engine_room.flywheel.backend.glsl.span.Span; public class StructField { public static final Pattern fieldPattern = Pattern.compile("(\\S+)\\s*(\\S+);"); diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/span/CharPos.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/span/CharPos.java index cb1e08b0f..5bdd2591e 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/span/CharPos.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/span/CharPos.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl.span; +package dev.engine_room.flywheel.backend.glsl.span; /** * A position in a file. diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/span/ErrorSpan.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/span/ErrorSpan.java index 25a97cac3..b975bb2ac 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/span/ErrorSpan.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/span/ErrorSpan.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.backend.glsl.span; +package dev.engine_room.flywheel.backend.glsl.span; -import com.jozufozu.flywheel.backend.glsl.SourceLines; +import dev.engine_room.flywheel.backend.glsl.SourceLines; /** * Represents a (syntactically) malformed segment of code. diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/span/Span.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/span/Span.java index 9a2e7a7ff..6194e8bb0 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/span/Span.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/span/Span.java @@ -1,9 +1,9 @@ -package com.jozufozu.flywheel.backend.glsl.span; +package dev.engine_room.flywheel.backend.glsl.span; import java.util.regex.Matcher; -import com.jozufozu.flywheel.backend.glsl.SourceFile; -import com.jozufozu.flywheel.backend.glsl.SourceLines; +import dev.engine_room.flywheel.backend.glsl.SourceFile; +import dev.engine_room.flywheel.backend.glsl.SourceLines; /** * A segment of code in a {@link SourceFile}. diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/span/StringSpan.java b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/span/StringSpan.java index 7c797f5d6..547ffbb0c 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/span/StringSpan.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/glsl/span/StringSpan.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.backend.glsl.span; +package dev.engine_room.flywheel.backend.glsl.span; -import com.jozufozu.flywheel.backend.glsl.SourceLines; +import dev.engine_room.flywheel.backend.glsl.SourceLines; public class StringSpan extends Span { diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/mixin/AbstractClientPlayerAccessor.java b/common/src/backend/java/dev/engine_room/flywheel/backend/mixin/AbstractClientPlayerAccessor.java index 0c2218f06..6a0c6cdd3 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/mixin/AbstractClientPlayerAccessor.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/mixin/AbstractClientPlayerAccessor.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.mixin; +package dev.engine_room.flywheel.backend.mixin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Invoker; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/mixin/GlStateManagerMixin.java b/common/src/backend/java/dev/engine_room/flywheel/backend/mixin/GlStateManagerMixin.java index 2c0b4ecdb..e2aeffe91 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/mixin/GlStateManagerMixin.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/mixin/GlStateManagerMixin.java @@ -1,14 +1,15 @@ -package com.jozufozu.flywheel.backend.mixin; +package dev.engine_room.flywheel.backend.mixin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.jozufozu.flywheel.backend.gl.GlStateTracker; -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType; import com.mojang.blaze3d.platform.GlStateManager; +import dev.engine_room.flywheel.backend.gl.GlStateTracker; +import dev.engine_room.flywheel.backend.gl.buffer.GlBufferType; + @Mixin(value = GlStateManager.class, remap = false) abstract class GlStateManagerMixin { @Inject(method = "_glBindBuffer(II)V", at = @At("RETURN")) diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/mixin/LevelRendererAccessor.java b/common/src/backend/java/dev/engine_room/flywheel/backend/mixin/LevelRendererAccessor.java index a22055f7b..b0a429f98 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/mixin/LevelRendererAccessor.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/mixin/LevelRendererAccessor.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.mixin; +package dev.engine_room.flywheel.backend.mixin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/mixin/OptionsMixin.java b/common/src/backend/java/dev/engine_room/flywheel/backend/mixin/OptionsMixin.java index 8543d8162..7d0cffada 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/mixin/OptionsMixin.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/mixin/OptionsMixin.java @@ -1,12 +1,11 @@ -package com.jozufozu.flywheel.backend.mixin; +package dev.engine_room.flywheel.backend.mixin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.jozufozu.flywheel.backend.engine.uniform.OptionsUniforms; - +import dev.engine_room.flywheel.backend.engine.uniform.OptionsUniforms; import net.minecraft.client.Options; @Mixin(Options.class) diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/mixin/RenderSystemMixin.java b/common/src/backend/java/dev/engine_room/flywheel/backend/mixin/RenderSystemMixin.java index fb12d286d..9a51df11b 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/mixin/RenderSystemMixin.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/mixin/RenderSystemMixin.java @@ -1,14 +1,15 @@ -package com.jozufozu.flywheel.backend.mixin; +package dev.engine_room.flywheel.backend.mixin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.jozufozu.flywheel.backend.engine.uniform.FogUniforms; -import com.jozufozu.flywheel.backend.gl.GlCompat; import com.mojang.blaze3d.systems.RenderSystem; +import dev.engine_room.flywheel.backend.engine.uniform.FogUniforms; +import dev.engine_room.flywheel.backend.gl.GlCompat; + @Mixin(value = RenderSystem.class, remap = false) abstract class RenderSystemMixin { @Inject(method = "initRenderer(IZ)V", at = @At("RETURN")) diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/util/AtomicReferenceCounted.java b/common/src/backend/java/dev/engine_room/flywheel/backend/util/AtomicReferenceCounted.java index 1aa97c09e..0a68dc92a 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/util/AtomicReferenceCounted.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/util/AtomicReferenceCounted.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.util; +package dev.engine_room.flywheel.backend.util; import java.util.concurrent.atomic.AtomicInteger; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/util/MemoryBuffer.java b/common/src/backend/java/dev/engine_room/flywheel/backend/util/MemoryBuffer.java index 47d52f221..f87914414 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/util/MemoryBuffer.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/util/MemoryBuffer.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.backend.util; +package dev.engine_room.flywheel.backend.util; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; public class MemoryBuffer { private final long stride; diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/util/ReferenceCounted.java b/common/src/backend/java/dev/engine_room/flywheel/backend/util/ReferenceCounted.java index fba534d88..48a06841c 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/util/ReferenceCounted.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/util/ReferenceCounted.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.util; +package dev.engine_room.flywheel.backend.util; public abstract class ReferenceCounted { private int referenceCount = 0; diff --git a/common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/cull.glsl b/common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/cull.glsl index af0fec4f0..76b75bff1 100644 --- a/common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/cull.glsl +++ b/common/src/backend/resources/assets/flywheel/flywheel/internal/indirect/cull.glsl @@ -24,7 +24,7 @@ uniform bool _flw_useModelMatrix = false; // Only uses 6 fmas and some boolean ops. // See also: // flywheel:uniform/flywheel.glsl -// com.jozufozu.flywheel.lib.math.MatrixMath.writePackedFrustumPlanes +// dev.engine_room.flywheel.lib.math.MatrixMath.writePackedFrustumPlanes // org.joml.FrustumIntersection.testSphere bool _flw_testSphere(vec3 center, float radius) { bvec4 xyInside = greaterThanEqual(fma(flw_frustumPlanes.xyX, center.xxxx, fma(flw_frustumPlanes.xyY, center.yyyy, fma(flw_frustumPlanes.xyZ, center.zzzz, flw_frustumPlanes.xyW))), -radius.xxxx); diff --git a/common/src/backend/resources/flywheel.backend.mixins.json b/common/src/backend/resources/flywheel.backend.mixins.json index 9aef02424..2d924bef0 100644 --- a/common/src/backend/resources/flywheel.backend.mixins.json +++ b/common/src/backend/resources/flywheel.backend.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "com.jozufozu.flywheel.backend.mixin", + "package": "dev.engine_room.flywheel.backend.mixin", "compatibilityLevel": "JAVA_17", "refmap": "backend-flywheel.refmap.json", "client": [ diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/backend/SimpleBackend.java b/common/src/lib/java/dev/engine_room/flywheel/lib/backend/SimpleBackend.java index b2c5a6927..f0d25e873 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/backend/SimpleBackend.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/backend/SimpleBackend.java @@ -1,13 +1,12 @@ -package com.jozufozu.flywheel.lib.backend; +package dev.engine_room.flywheel.lib.backend; import java.util.function.BooleanSupplier; import java.util.function.Function; import java.util.function.Supplier; -import com.jozufozu.flywheel.api.backend.Backend; -import com.jozufozu.flywheel.api.backend.BackendManager; -import com.jozufozu.flywheel.api.backend.Engine; - +import dev.engine_room.flywheel.api.backend.Backend; +import dev.engine_room.flywheel.api.backend.BackendManager; +import dev.engine_room.flywheel.api.backend.Engine; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.LevelAccessor; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/box/Box.java b/common/src/lib/java/dev/engine_room/flywheel/lib/box/Box.java index 2f96d2e8d..3955cde1b 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/box/Box.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/box/Box.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.box; +package dev.engine_room.flywheel.lib.box; import net.minecraft.util.Mth; import net.minecraft.world.phys.AABB; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/box/MutableBox.java b/common/src/lib/java/dev/engine_room/flywheel/lib/box/MutableBox.java index 9b471d3c1..db69a3883 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/box/MutableBox.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/box/MutableBox.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.box; +package dev.engine_room.flywheel.lib.box; import java.util.Collection; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/instance/AbstractInstance.java b/common/src/lib/java/dev/engine_room/flywheel/lib/instance/AbstractInstance.java index 8f96feed7..b28dbffdf 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/instance/AbstractInstance.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/instance/AbstractInstance.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.lib.instance; +package dev.engine_room.flywheel.lib.instance; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.instance.InstanceHandle; -import com.jozufozu.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.instance.InstanceHandle; +import dev.engine_room.flywheel.api.instance.InstanceType; public abstract class AbstractInstance implements Instance { protected final InstanceType type; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/instance/ColoredLitInstance.java b/common/src/lib/java/dev/engine_room/flywheel/lib/instance/ColoredLitInstance.java index be535c9a3..a82ccf77d 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/instance/ColoredLitInstance.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/instance/ColoredLitInstance.java @@ -1,8 +1,7 @@ -package com.jozufozu.flywheel.lib.instance; - -import com.jozufozu.flywheel.api.instance.InstanceHandle; -import com.jozufozu.flywheel.api.instance.InstanceType; +package dev.engine_room.flywheel.lib.instance; +import dev.engine_room.flywheel.api.instance.InstanceHandle; +import dev.engine_room.flywheel.api.instance.InstanceType; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.texture.OverlayTexture; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/instance/FlatLit.java b/common/src/lib/java/dev/engine_room/flywheel/lib/instance/FlatLit.java index 472539de0..7a563706a 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/instance/FlatLit.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/instance/FlatLit.java @@ -1,8 +1,7 @@ -package com.jozufozu.flywheel.lib.instance; - -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.lib.visual.AbstractVisual; +package dev.engine_room.flywheel.lib.instance; +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.lib.visual.AbstractVisual; import net.minecraft.client.renderer.LightTexture; /** diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/instance/InstanceTypes.java b/common/src/lib/java/dev/engine_room/flywheel/lib/instance/InstanceTypes.java index 8a56570ff..fa1111641 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/instance/InstanceTypes.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/instance/InstanceTypes.java @@ -1,14 +1,14 @@ -package com.jozufozu.flywheel.lib.instance; +package dev.engine_room.flywheel.lib.instance; import org.jetbrains.annotations.ApiStatus; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.api.Flywheel; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.api.layout.FloatRepr; -import com.jozufozu.flywheel.api.layout.IntegerRepr; -import com.jozufozu.flywheel.api.layout.LayoutBuilder; -import com.jozufozu.flywheel.lib.math.MatrixMath; +import dev.engine_room.flywheel.api.Flywheel; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.api.layout.FloatRepr; +import dev.engine_room.flywheel.api.layout.IntegerRepr; +import dev.engine_room.flywheel.api.layout.LayoutBuilder; +import dev.engine_room.flywheel.lib.math.MatrixMath; public final class InstanceTypes { public static final InstanceType TRANSFORMED = SimpleInstanceType.builder(TransformedInstance::new) diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/instance/OrientedInstance.java b/common/src/lib/java/dev/engine_room/flywheel/lib/instance/OrientedInstance.java index 905987884..a8c2402e6 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/instance/OrientedInstance.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/instance/OrientedInstance.java @@ -1,12 +1,11 @@ -package com.jozufozu.flywheel.lib.instance; +package dev.engine_room.flywheel.lib.instance; import org.joml.Quaternionf; import org.joml.Vector3f; -import com.jozufozu.flywheel.api.instance.InstanceHandle; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.lib.transform.Rotate; - +import dev.engine_room.flywheel.api.instance.InstanceHandle; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.lib.transform.Rotate; import net.minecraft.core.Vec3i; import net.minecraft.world.phys.Vec3; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/instance/ShadowInstance.java b/common/src/lib/java/dev/engine_room/flywheel/lib/instance/ShadowInstance.java index 5f642d14e..75b0e0200 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/instance/ShadowInstance.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/instance/ShadowInstance.java @@ -1,7 +1,7 @@ -package com.jozufozu.flywheel.lib.instance; +package dev.engine_room.flywheel.lib.instance; -import com.jozufozu.flywheel.api.instance.InstanceHandle; -import com.jozufozu.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.api.instance.InstanceHandle; +import dev.engine_room.flywheel.api.instance.InstanceType; public class ShadowInstance extends AbstractInstance { diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/instance/SimpleInstanceType.java b/common/src/lib/java/dev/engine_room/flywheel/lib/instance/SimpleInstanceType.java index 5cd94e01a..711d6f5d1 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/instance/SimpleInstanceType.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/instance/SimpleInstanceType.java @@ -1,13 +1,12 @@ -package com.jozufozu.flywheel.lib.instance; +package dev.engine_room.flywheel.lib.instance; import java.util.Objects; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.instance.InstanceHandle; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.api.instance.InstanceWriter; -import com.jozufozu.flywheel.api.layout.Layout; - +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.instance.InstanceHandle; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.api.instance.InstanceWriter; +import dev.engine_room.flywheel.api.layout.Layout; import net.minecraft.resources.ResourceLocation; public class SimpleInstanceType implements InstanceType { diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/instance/TransformedInstance.java b/common/src/lib/java/dev/engine_room/flywheel/lib/instance/TransformedInstance.java index 6a23ba936..a581b17ec 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/instance/TransformedInstance.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/instance/TransformedInstance.java @@ -1,14 +1,14 @@ -package com.jozufozu.flywheel.lib.instance; +package dev.engine_room.flywheel.lib.instance; import org.joml.Matrix3f; import org.joml.Matrix4f; import org.joml.Quaternionf; -import com.jozufozu.flywheel.api.instance.InstanceHandle; -import com.jozufozu.flywheel.api.instance.InstanceType; -import com.jozufozu.flywheel.lib.transform.Transform; import com.mojang.blaze3d.vertex.PoseStack; +import dev.engine_room.flywheel.api.instance.InstanceHandle; +import dev.engine_room.flywheel.api.instance.InstanceType; +import dev.engine_room.flywheel.lib.transform.Transform; import net.minecraft.util.Mth; public class TransformedInstance extends ColoredLitInstance implements Transform { diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/internal/FlwLibLink.java b/common/src/lib/java/dev/engine_room/flywheel/lib/internal/FlwLibLink.java index cf30466a1..158c12924 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/internal/FlwLibLink.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/internal/FlwLibLink.java @@ -1,13 +1,14 @@ -package com.jozufozu.flywheel.lib.internal; +package dev.engine_room.flywheel.lib.internal; import org.slf4j.Logger; -import com.jozufozu.flywheel.api.internal.DependencyInjection; -import com.jozufozu.flywheel.lib.transform.PoseTransformStack; import com.mojang.blaze3d.vertex.PoseStack; +import dev.engine_room.flywheel.api.internal.DependencyInjection; +import dev.engine_room.flywheel.lib.transform.PoseTransformStack; + public interface FlwLibLink { - FlwLibLink INSTANCE = DependencyInjection.load(FlwLibLink.class, "com.jozufozu.flywheel.impl.FlwLibLinkImpl"); + FlwLibLink INSTANCE = DependencyInjection.load(FlwLibLink.class, "dev.engine_room.flywheel.impl.FlwLibLinkImpl"); Logger getLogger(); diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/internal/FlwLibXplat.java b/common/src/lib/java/dev/engine_room/flywheel/lib/internal/FlwLibXplat.java index 0fb9bc58a..0fe92a997 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/internal/FlwLibXplat.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/internal/FlwLibXplat.java @@ -1,13 +1,12 @@ -package com.jozufozu.flywheel.lib.internal; +package dev.engine_room.flywheel.lib.internal; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.internal.DependencyInjection; -import com.jozufozu.flywheel.lib.model.baked.BakedModelBuilder; -import com.jozufozu.flywheel.lib.model.baked.BlockModelBuilder; -import com.jozufozu.flywheel.lib.model.baked.MultiBlockModelBuilder; -import com.jozufozu.flywheel.lib.util.ShadersModHandler; - +import dev.engine_room.flywheel.api.internal.DependencyInjection; +import dev.engine_room.flywheel.lib.model.baked.BakedModelBuilder; +import dev.engine_room.flywheel.lib.model.baked.BlockModelBuilder; +import dev.engine_room.flywheel.lib.model.baked.MultiBlockModelBuilder; +import dev.engine_room.flywheel.lib.util.ShadersModHandler; import net.minecraft.client.renderer.block.BlockRenderDispatcher; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.core.BlockPos; @@ -15,7 +14,7 @@ import net.minecraft.world.level.block.state.BlockState; public interface FlwLibXplat { - FlwLibXplat INSTANCE = DependencyInjection.load(FlwLibXplat.class, "com.jozufozu.flywheel.impl.FlwLibXplatImpl"); + FlwLibXplat INSTANCE = DependencyInjection.load(FlwLibXplat.class, "dev.engine_room.flywheel.impl.FlwLibXplatImpl"); BlockRenderDispatcher createVanillaBlockRenderDispatcher(); diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/internal/package-info.java b/common/src/lib/java/dev/engine_room/flywheel/lib/internal/package-info.java index b4efe3fa3..6b8384594 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/internal/package-info.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/internal/package-info.java @@ -2,7 +2,7 @@ @ParametersAreNonnullByDefault @FieldsAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.jozufozu.flywheel.lib.internal; +package dev.engine_room.flywheel.lib.internal; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/light/LightPacking.java b/common/src/lib/java/dev/engine_room/flywheel/lib/light/LightPacking.java index 6f2617f9b..7cd9ce37e 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/light/LightPacking.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/light/LightPacking.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.light; +package dev.engine_room.flywheel.lib.light; /** * Utility class for bit-twiddling light. diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/light/LightVolume.java b/common/src/lib/java/dev/engine_room/flywheel/lib/light/LightVolume.java index cbc953b29..ab71bcae3 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/light/LightVolume.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/light/LightVolume.java @@ -1,11 +1,10 @@ -package com.jozufozu.flywheel.lib.light; +package dev.engine_room.flywheel.lib.light; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.lib.box.Box; -import com.jozufozu.flywheel.lib.box.MutableBox; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; - +import dev.engine_room.flywheel.lib.box.Box; +import dev.engine_room.flywheel.lib.box.MutableBox; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; import net.minecraft.core.BlockPos; import net.minecraft.core.SectionPos; import net.minecraft.world.level.BlockAndTintGetter; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/material/CutoutShaders.java b/common/src/lib/java/dev/engine_room/flywheel/lib/material/CutoutShaders.java index e5694e97d..79b5dd444 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/material/CutoutShaders.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/material/CutoutShaders.java @@ -1,9 +1,9 @@ -package com.jozufozu.flywheel.lib.material; +package dev.engine_room.flywheel.lib.material; import org.jetbrains.annotations.ApiStatus; -import com.jozufozu.flywheel.api.Flywheel; -import com.jozufozu.flywheel.api.material.CutoutShader; +import dev.engine_room.flywheel.api.Flywheel; +import dev.engine_room.flywheel.api.material.CutoutShader; public class CutoutShaders { /** diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/material/FogShaders.java b/common/src/lib/java/dev/engine_room/flywheel/lib/material/FogShaders.java index 7f3630a4e..8c2531696 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/material/FogShaders.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/material/FogShaders.java @@ -1,9 +1,9 @@ -package com.jozufozu.flywheel.lib.material; +package dev.engine_room.flywheel.lib.material; import org.jetbrains.annotations.ApiStatus; -import com.jozufozu.flywheel.api.Flywheel; -import com.jozufozu.flywheel.api.material.FogShader; +import dev.engine_room.flywheel.api.Flywheel; +import dev.engine_room.flywheel.api.material.FogShader; public class FogShaders { public static final FogShader NONE = FogShader.REGISTRY.registerAndGet(new SimpleFogShader(Flywheel.rl("fog/none.glsl"))); diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/material/Materials.java b/common/src/lib/java/dev/engine_room/flywheel/lib/material/Materials.java index d3a921e66..2cab44864 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/material/Materials.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/material/Materials.java @@ -1,8 +1,7 @@ -package com.jozufozu.flywheel.lib.material; - -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.api.material.Transparency; +package dev.engine_room.flywheel.lib.material; +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.api.material.Transparency; import net.minecraft.client.renderer.Sheets; import net.minecraft.resources.ResourceLocation; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/material/SimpleCutoutShader.java b/common/src/lib/java/dev/engine_room/flywheel/lib/material/SimpleCutoutShader.java index a3da18750..0756761da 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/material/SimpleCutoutShader.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/material/SimpleCutoutShader.java @@ -1,7 +1,6 @@ -package com.jozufozu.flywheel.lib.material; - -import com.jozufozu.flywheel.api.material.CutoutShader; +package dev.engine_room.flywheel.lib.material; +import dev.engine_room.flywheel.api.material.CutoutShader; import net.minecraft.resources.ResourceLocation; public record SimpleCutoutShader(@Override ResourceLocation source) implements CutoutShader { diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/material/SimpleFogShader.java b/common/src/lib/java/dev/engine_room/flywheel/lib/material/SimpleFogShader.java index c6c0ff4e8..cc67a8f69 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/material/SimpleFogShader.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/material/SimpleFogShader.java @@ -1,7 +1,6 @@ -package com.jozufozu.flywheel.lib.material; - -import com.jozufozu.flywheel.api.material.FogShader; +package dev.engine_room.flywheel.lib.material; +import dev.engine_room.flywheel.api.material.FogShader; import net.minecraft.resources.ResourceLocation; public record SimpleFogShader(@Override ResourceLocation source) implements FogShader { diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/material/SimpleMaterial.java b/common/src/lib/java/dev/engine_room/flywheel/lib/material/SimpleMaterial.java index 0de829d5d..4fe1daa11 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/material/SimpleMaterial.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/material/SimpleMaterial.java @@ -1,13 +1,12 @@ -package com.jozufozu.flywheel.lib.material; - -import com.jozufozu.flywheel.api.material.CutoutShader; -import com.jozufozu.flywheel.api.material.DepthTest; -import com.jozufozu.flywheel.api.material.FogShader; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.api.material.MaterialShaders; -import com.jozufozu.flywheel.api.material.Transparency; -import com.jozufozu.flywheel.api.material.WriteMask; - +package dev.engine_room.flywheel.lib.material; + +import dev.engine_room.flywheel.api.material.CutoutShader; +import dev.engine_room.flywheel.api.material.DepthTest; +import dev.engine_room.flywheel.api.material.FogShader; +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.api.material.MaterialShaders; +import dev.engine_room.flywheel.api.material.Transparency; +import dev.engine_room.flywheel.api.material.WriteMask; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.InventoryMenu; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/material/SimpleMaterialShaders.java b/common/src/lib/java/dev/engine_room/flywheel/lib/material/SimpleMaterialShaders.java index 2ac0c6d6c..35422c805 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/material/SimpleMaterialShaders.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/material/SimpleMaterialShaders.java @@ -1,7 +1,6 @@ -package com.jozufozu.flywheel.lib.material; - -import com.jozufozu.flywheel.api.material.MaterialShaders; +package dev.engine_room.flywheel.lib.material; +import dev.engine_room.flywheel.api.material.MaterialShaders; import net.minecraft.resources.ResourceLocation; public record SimpleMaterialShaders(ResourceLocation vertexShader, ResourceLocation fragmentShader) implements MaterialShaders { diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/material/StandardMaterialShaders.java b/common/src/lib/java/dev/engine_room/flywheel/lib/material/StandardMaterialShaders.java index 715c476b1..97ae60b97 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/material/StandardMaterialShaders.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/material/StandardMaterialShaders.java @@ -1,9 +1,9 @@ -package com.jozufozu.flywheel.lib.material; +package dev.engine_room.flywheel.lib.material; import org.jetbrains.annotations.ApiStatus; -import com.jozufozu.flywheel.api.Flywheel; -import com.jozufozu.flywheel.api.material.MaterialShaders; +import dev.engine_room.flywheel.api.Flywheel; +import dev.engine_room.flywheel.api.material.MaterialShaders; public final class StandardMaterialShaders { public static final MaterialShaders DEFAULT = MaterialShaders.REGISTRY.registerAndGet(new SimpleMaterialShaders( diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/math/MatrixMath.java b/common/src/lib/java/dev/engine_room/flywheel/lib/math/MatrixMath.java index 428e3a89b..a87334056 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/math/MatrixMath.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/math/MatrixMath.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.math; +package dev.engine_room.flywheel.lib.math; import static org.joml.Math.fma; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/math/MoreMath.java b/common/src/lib/java/dev/engine_room/flywheel/lib/math/MoreMath.java index f04db7593..feca659c0 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/math/MoreMath.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/math/MoreMath.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.math; +package dev.engine_room.flywheel.lib.math; public final class MoreMath { private MoreMath() { diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/math/RenderMath.java b/common/src/lib/java/dev/engine_room/flywheel/lib/math/RenderMath.java index 8c7cb698d..fdcd8285a 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/math/RenderMath.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/math/RenderMath.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.math; +package dev.engine_room.flywheel.lib.math; public final class RenderMath { private RenderMath() { diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/memory/AbstractMemoryBlockImpl.java b/common/src/lib/java/dev/engine_room/flywheel/lib/memory/AbstractMemoryBlockImpl.java index e7d29f331..0b50bf662 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/memory/AbstractMemoryBlockImpl.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/memory/AbstractMemoryBlockImpl.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.memory; +package dev.engine_room.flywheel.lib.memory; import java.lang.ref.Cleaner; import java.nio.ByteBuffer; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/memory/DebugMemoryBlockImpl.java b/common/src/lib/java/dev/engine_room/flywheel/lib/memory/DebugMemoryBlockImpl.java index e10b2023a..7ff39f3f5 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/memory/DebugMemoryBlockImpl.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/memory/DebugMemoryBlockImpl.java @@ -1,9 +1,9 @@ -package com.jozufozu.flywheel.lib.memory; +package dev.engine_room.flywheel.lib.memory; import java.lang.ref.Cleaner; -import com.jozufozu.flywheel.lib.internal.FlwLibLink; -import com.jozufozu.flywheel.lib.util.StringUtil; +import dev.engine_room.flywheel.lib.internal.FlwLibLink; +import dev.engine_room.flywheel.lib.util.StringUtil; class DebugMemoryBlockImpl extends AbstractMemoryBlockImpl { final Cleaner cleaner; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/memory/FlwMemoryTracker.java b/common/src/lib/java/dev/engine_room/flywheel/lib/memory/FlwMemoryTracker.java index 82eb4b2eb..0e33b8168 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/memory/FlwMemoryTracker.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/memory/FlwMemoryTracker.java @@ -1,10 +1,10 @@ -package com.jozufozu.flywheel.lib.memory; +package dev.engine_room.flywheel.lib.memory; import java.util.concurrent.atomic.AtomicLong; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.lib.util.StringUtil; +import dev.engine_room.flywheel.lib.util.StringUtil; public final class FlwMemoryTracker { public static final boolean DEBUG_MEMORY_SAFETY = System.getProperty("flw.debugMemorySafety") != null; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/memory/MemoryBlock.java b/common/src/lib/java/dev/engine_room/flywheel/lib/memory/MemoryBlock.java index 8f74c1b73..3f68a8b9e 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/memory/MemoryBlock.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/memory/MemoryBlock.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.memory; +package dev.engine_room.flywheel.lib.memory; import java.nio.ByteBuffer; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/memory/MemoryBlockImpl.java b/common/src/lib/java/dev/engine_room/flywheel/lib/memory/MemoryBlockImpl.java index cc42d0517..f716fb88f 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/memory/MemoryBlockImpl.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/memory/MemoryBlockImpl.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.memory; +package dev.engine_room.flywheel.lib.memory; class MemoryBlockImpl extends AbstractMemoryBlockImpl { MemoryBlockImpl(long ptr, long size) { diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/memory/TrackedMemoryBlockImpl.java b/common/src/lib/java/dev/engine_room/flywheel/lib/memory/TrackedMemoryBlockImpl.java index 3f3d2a7ac..0d052275e 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/memory/TrackedMemoryBlockImpl.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/memory/TrackedMemoryBlockImpl.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.memory; +package dev.engine_room.flywheel.lib.memory; import java.lang.ref.Cleaner; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/LineModelBuilder.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/LineModelBuilder.java index b266d1e4e..5fdab98de 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/LineModelBuilder.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/LineModelBuilder.java @@ -1,20 +1,19 @@ -package com.jozufozu.flywheel.lib.model; +package dev.engine_room.flywheel.lib.model; import org.joml.Vector4f; import org.joml.Vector4fc; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.api.model.IndexSequence; -import com.jozufozu.flywheel.api.model.Mesh; -import com.jozufozu.flywheel.api.model.Model; -import com.jozufozu.flywheel.api.vertex.MutableVertexList; -import com.jozufozu.flywheel.api.vertex.VertexView; -import com.jozufozu.flywheel.lib.material.SimpleMaterial; -import com.jozufozu.flywheel.lib.material.StandardMaterialShaders; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; -import com.jozufozu.flywheel.lib.vertex.FullVertexView; - +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.api.model.IndexSequence; +import dev.engine_room.flywheel.api.model.Mesh; +import dev.engine_room.flywheel.api.model.Model; +import dev.engine_room.flywheel.api.vertex.MutableVertexList; +import dev.engine_room.flywheel.api.vertex.VertexView; +import dev.engine_room.flywheel.lib.material.SimpleMaterial; +import dev.engine_room.flywheel.lib.material.StandardMaterialShaders; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; +import dev.engine_room.flywheel.lib.vertex.FullVertexView; import net.minecraft.client.renderer.LightTexture; public class LineModelBuilder { diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/ModelCache.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/ModelCache.java index 016f706aa..7e37ccce0 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/ModelCache.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/ModelCache.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.model; +package dev.engine_room.flywheel.lib.model; import java.util.ArrayList; import java.util.List; @@ -8,7 +8,7 @@ import org.jetbrains.annotations.ApiStatus; -import com.jozufozu.flywheel.api.model.Model; +import dev.engine_room.flywheel.api.model.Model; public class ModelCache { private static final List> ALL = new ArrayList<>(); diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/ModelHolder.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/ModelHolder.java index cc1d3d0f5..cf3eef535 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/ModelHolder.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/ModelHolder.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.model; +package dev.engine_room.flywheel.lib.model; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.model.Model; +import dev.engine_room.flywheel.api.model.Model; public class ModelHolder { private static final List ALL = new ArrayList<>(); diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/ModelUtil.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/ModelUtil.java index b5078b918..e249284cb 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/ModelUtil.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/ModelUtil.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.model; +package dev.engine_room.flywheel.lib.model; import java.nio.ByteBuffer; import java.util.Collection; @@ -8,20 +8,20 @@ import org.joml.Vector4f; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.api.model.Mesh; -import com.jozufozu.flywheel.api.model.Model; -import com.jozufozu.flywheel.api.vertex.VertexList; -import com.jozufozu.flywheel.api.vertex.VertexView; -import com.jozufozu.flywheel.api.vertex.VertexViewProviderRegistry; -import com.jozufozu.flywheel.lib.internal.FlwLibXplat; -import com.jozufozu.flywheel.lib.material.Materials; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; -import com.jozufozu.flywheel.lib.vertex.PosVertexView; import com.mojang.blaze3d.vertex.BufferBuilder; import com.mojang.blaze3d.vertex.BufferBuilder.DrawState; import com.mojang.blaze3d.vertex.VertexFormat; +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.api.model.Mesh; +import dev.engine_room.flywheel.api.model.Model; +import dev.engine_room.flywheel.api.vertex.VertexList; +import dev.engine_room.flywheel.api.vertex.VertexView; +import dev.engine_room.flywheel.api.vertex.VertexViewProviderRegistry; +import dev.engine_room.flywheel.lib.internal.FlwLibXplat; +import dev.engine_room.flywheel.lib.material.Materials; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; +import dev.engine_room.flywheel.lib.vertex.PosVertexView; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.block.BlockRenderDispatcher; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/Models.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/Models.java index ad821d6ee..93a4849a5 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/Models.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/Models.java @@ -1,14 +1,14 @@ -package com.jozufozu.flywheel.lib.model; +package dev.engine_room.flywheel.lib.model; import java.util.function.BiConsumer; -import com.jozufozu.flywheel.api.model.Model; -import com.jozufozu.flywheel.lib.model.baked.BakedModelBuilder; -import com.jozufozu.flywheel.lib.model.baked.BlockModelBuilder; -import com.jozufozu.flywheel.lib.model.baked.PartialModel; -import com.jozufozu.flywheel.lib.transform.TransformStack; import com.mojang.blaze3d.vertex.PoseStack; +import dev.engine_room.flywheel.api.model.Model; +import dev.engine_room.flywheel.lib.model.baked.BakedModelBuilder; +import dev.engine_room.flywheel.lib.model.baked.BlockModelBuilder; +import dev.engine_room.flywheel.lib.model.baked.PartialModel; +import dev.engine_room.flywheel.lib.transform.TransformStack; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/QuadIndexSequence.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/QuadIndexSequence.java index b6a00bc0f..a59105b0e 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/QuadIndexSequence.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/QuadIndexSequence.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.lib.model; +package dev.engine_room.flywheel.lib.model; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.api.model.IndexSequence; +import dev.engine_room.flywheel.api.model.IndexSequence; public class QuadIndexSequence implements IndexSequence { public static final QuadIndexSequence INSTANCE = new QuadIndexSequence(); diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/QuadMesh.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/QuadMesh.java index 7549a9dc5..03893d255 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/QuadMesh.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/QuadMesh.java @@ -1,7 +1,7 @@ -package com.jozufozu.flywheel.lib.model; +package dev.engine_room.flywheel.lib.model; -import com.jozufozu.flywheel.api.model.IndexSequence; -import com.jozufozu.flywheel.api.model.Mesh; +import dev.engine_room.flywheel.api.model.IndexSequence; +import dev.engine_room.flywheel.api.model.Mesh; public interface QuadMesh extends Mesh { @Override diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/SimpleMesh.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/SimpleMesh.java index fe3c24217..ccddea727 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/SimpleMesh.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/SimpleMesh.java @@ -1,12 +1,12 @@ -package com.jozufozu.flywheel.lib.model; +package dev.engine_room.flywheel.lib.model; import org.jetbrains.annotations.Nullable; import org.joml.Vector4f; import org.joml.Vector4fc; -import com.jozufozu.flywheel.api.vertex.MutableVertexList; -import com.jozufozu.flywheel.api.vertex.VertexView; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; +import dev.engine_room.flywheel.api.vertex.MutableVertexList; +import dev.engine_room.flywheel.api.vertex.VertexView; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; public class SimpleMesh implements QuadMesh { private final int vertexCount; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/SimpleModel.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/SimpleModel.java index bd5b7bb45..2d3483a7b 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/SimpleModel.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/SimpleModel.java @@ -1,10 +1,10 @@ -package com.jozufozu.flywheel.lib.model; +package dev.engine_room.flywheel.lib.model; import java.util.List; import org.joml.Vector4fc; -import com.jozufozu.flywheel.api.model.Model; +import dev.engine_room.flywheel.api.model.Model; public class SimpleModel implements Model { private final List meshes; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/SingleMeshModel.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/SingleMeshModel.java index 245eeaffc..005e92fe1 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/SingleMeshModel.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/SingleMeshModel.java @@ -1,13 +1,14 @@ -package com.jozufozu.flywheel.lib.model; +package dev.engine_room.flywheel.lib.model; import java.util.List; import org.joml.Vector4fc; import com.google.common.collect.ImmutableList; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.api.model.Mesh; -import com.jozufozu.flywheel.api.model.Model; + +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.api.model.Mesh; +import dev.engine_room.flywheel.api.model.Model; public class SingleMeshModel implements Model { private final Mesh mesh; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BakedModelBuilder.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BakedModelBuilder.java index db51497b0..62795cf06 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BakedModelBuilder.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BakedModelBuilder.java @@ -1,15 +1,15 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import java.util.function.BiFunction; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.lib.internal.FlwLibXplat; -import com.jozufozu.flywheel.lib.model.SimpleModel; import com.mojang.blaze3d.vertex.PoseStack; +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.lib.internal.FlwLibXplat; +import dev.engine_room.flywheel.lib.model.SimpleModel; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.world.level.BlockAndTintGetter; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BlockModelBuilder.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BlockModelBuilder.java index aab97fdfe..4ef29359e 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BlockModelBuilder.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BlockModelBuilder.java @@ -1,15 +1,15 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import java.util.function.BiFunction; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.lib.internal.FlwLibXplat; -import com.jozufozu.flywheel.lib.model.SimpleModel; import com.mojang.blaze3d.vertex.PoseStack; +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.lib.internal.FlwLibXplat; +import dev.engine_room.flywheel.lib.model.SimpleModel; import net.minecraft.client.renderer.RenderType; import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MultiBlockModelBuilder.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MultiBlockModelBuilder.java index fdf9db403..5a495263e 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MultiBlockModelBuilder.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MultiBlockModelBuilder.java @@ -1,15 +1,15 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import java.util.function.BiFunction; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.lib.internal.FlwLibXplat; -import com.jozufozu.flywheel.lib.model.SimpleModel; import com.mojang.blaze3d.vertex.PoseStack; +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.lib.internal.FlwLibXplat; +import dev.engine_room.flywheel.lib.model.SimpleModel; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockAndTintGetter; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModel.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModel.java index b7f4a760c..ba96c09c0 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModel.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModel.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import java.util.ArrayList; import java.util.List; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/TransformingVertexConsumer.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/TransformingVertexConsumer.java index 42f7c9f93..d40a4df79 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/TransformingVertexConsumer.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/TransformingVertexConsumer.java @@ -1,13 +1,14 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import org.jetbrains.annotations.UnknownNullability; import org.joml.Matrix3f; import org.joml.Matrix4f; -import com.jozufozu.flywheel.lib.math.MatrixMath; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import dev.engine_room.flywheel.lib.math.MatrixMath; + class TransformingVertexConsumer implements VertexConsumer { @UnknownNullability private VertexConsumer delegate; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/VirtualBlockGetter.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/VirtualBlockGetter.java index 773eb1d6b..1b5782d43 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/VirtualBlockGetter.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/VirtualBlockGetter.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import java.util.function.ToIntFunction; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/VirtualEmptyBlockGetter.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/VirtualEmptyBlockGetter.java index c860e1acb..825e229f6 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/VirtualEmptyBlockGetter.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/VirtualEmptyBlockGetter.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import java.util.function.ToIntFunction; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/VirtualLightEngine.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/VirtualLightEngine.java index 33710ce99..e8b072384 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/VirtualLightEngine.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/VirtualLightEngine.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import java.util.function.ToIntFunction; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/part/ModelPartConverter.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/part/ModelPartConverter.java index b274c3d8b..637c5523e 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/part/ModelPartConverter.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/part/ModelPartConverter.java @@ -1,14 +1,14 @@ -package com.jozufozu.flywheel.lib.model.part; +package dev.engine_room.flywheel.lib.model.part; import org.jetbrains.annotations.Nullable; import org.joml.Vector2f; -import com.jozufozu.flywheel.api.model.Mesh; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; -import com.jozufozu.flywheel.lib.model.SimpleMesh; -import com.jozufozu.flywheel.lib.vertex.PosTexNormalVertexView; import com.mojang.blaze3d.vertex.PoseStack; +import dev.engine_room.flywheel.api.model.Mesh; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; +import dev.engine_room.flywheel.lib.model.SimpleMesh; +import dev.engine_room.flywheel.lib.vertex.PosTexNormalVertexView; import net.minecraft.client.Minecraft; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.model.geom.ModelLayerLocation; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/model/part/VertexWriter.java b/common/src/lib/java/dev/engine_room/flywheel/lib/model/part/VertexWriter.java index b4c908a01..f8b9aa5f6 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/model/part/VertexWriter.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/model/part/VertexWriter.java @@ -1,15 +1,16 @@ -package com.jozufozu.flywheel.lib.model.part; +package dev.engine_room.flywheel.lib.model.part; import org.jetbrains.annotations.Nullable; import org.joml.Vector2f; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.lib.math.RenderMath; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; -import com.jozufozu.flywheel.lib.model.part.ModelPartConverter.TextureMapper; -import com.jozufozu.flywheel.lib.vertex.PosTexNormalVertexView; import com.mojang.blaze3d.vertex.VertexConsumer; +import dev.engine_room.flywheel.lib.math.RenderMath; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; +import dev.engine_room.flywheel.lib.model.part.ModelPartConverter.TextureMapper; +import dev.engine_room.flywheel.lib.vertex.PosTexNormalVertexView; + class VertexWriter implements VertexConsumer { private static final int STRIDE = (int) PosTexNormalVertexView.STRIDE; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/BarrierPlan.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/BarrierPlan.java index fde6956e8..a00e35e21 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/BarrierPlan.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/BarrierPlan.java @@ -1,7 +1,7 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.api.task.TaskExecutor; +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.task.TaskExecutor; public record BarrierPlan(Plan first, Plan second) implements SimplyComposedPlan { public static Plan of(Plan first, Plan second) { diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/Distribute.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/Distribute.java index aa38009cd..3b6f6a1b2 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/Distribute.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/Distribute.java @@ -1,12 +1,12 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; import java.util.Collections; import java.util.List; import java.util.function.BiConsumer; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.api.task.TaskExecutor; -import com.jozufozu.flywheel.lib.math.MoreMath; +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.task.TaskExecutor; +import dev.engine_room.flywheel.lib.math.MoreMath; public final class Distribute { /** diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/DynamicNestedPlan.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/DynamicNestedPlan.java index 29dae88b3..69bf3eed0 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/DynamicNestedPlan.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/DynamicNestedPlan.java @@ -1,10 +1,10 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; import java.util.Collection; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.api.task.TaskExecutor; -import com.jozufozu.flywheel.lib.task.functional.SupplierWithContext; +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.task.TaskExecutor; +import dev.engine_room.flywheel.lib.task.functional.SupplierWithContext; /** * A plan that executes many other plans provided dynamically. diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/Flag.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/Flag.java index afa8c5aa1..ffbffbebe 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/Flag.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/Flag.java @@ -1,11 +1,11 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; import java.util.concurrent.atomic.AtomicBoolean; /** * A flag that can be raised and lowered in a thread-safe fashion. *
- * Useful when combined with {@link RaisePlan} and {@link com.jozufozu.flywheel.api.task.TaskExecutor#syncUntil TaskExecutor.syncUntil}. + * Useful when combined with {@link RaisePlan} and {@link dev.engine_room.flywheel.api.task.TaskExecutor#syncUntil TaskExecutor.syncUntil}. */ public class Flag { diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/ForEachPlan.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/ForEachPlan.java index 0c08bdc72..986281e2f 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/ForEachPlan.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/ForEachPlan.java @@ -1,11 +1,11 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; import java.util.List; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.api.task.TaskExecutor; -import com.jozufozu.flywheel.lib.task.functional.ConsumerWithContext; -import com.jozufozu.flywheel.lib.task.functional.SupplierWithContext; +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.task.TaskExecutor; +import dev.engine_room.flywheel.lib.task.functional.ConsumerWithContext; +import dev.engine_room.flywheel.lib.task.functional.SupplierWithContext; /** * A plan that executes code on each element of a provided list. diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/ForEachSlicePlan.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/ForEachSlicePlan.java index 2f2588eb5..8f036c4b7 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/ForEachSlicePlan.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/ForEachSlicePlan.java @@ -1,11 +1,11 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; import java.util.List; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.api.task.TaskExecutor; -import com.jozufozu.flywheel.lib.task.functional.ConsumerWithContext; -import com.jozufozu.flywheel.lib.task.functional.SupplierWithContext; +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.task.TaskExecutor; +import dev.engine_room.flywheel.lib.task.functional.ConsumerWithContext; +import dev.engine_room.flywheel.lib.task.functional.SupplierWithContext; /** * A plan that executes code over many slices of a provided list. diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/IfElsePlan.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/IfElsePlan.java index 178353d42..d7b60c155 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/IfElsePlan.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/IfElsePlan.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.api.task.TaskExecutor; -import com.jozufozu.flywheel.lib.task.functional.BooleanSupplierWithContext; +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.task.TaskExecutor; +import dev.engine_room.flywheel.lib.task.functional.BooleanSupplierWithContext; /** * Executes one plan or another, depending on a dynamically evaluated condition. diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/MapContextPlan.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/MapContextPlan.java index 516f5bd53..26b4133ff 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/MapContextPlan.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/MapContextPlan.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.api.task.TaskExecutor; -import com.jozufozu.flywheel.lib.task.functional.SupplierWithContext; +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.task.TaskExecutor; +import dev.engine_room.flywheel.lib.task.functional.SupplierWithContext; public record MapContextPlan(SupplierWithContext map, Plan plan) implements SimplyComposedPlan { public static Builder map(SupplierWithContext map) { diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/NamedFlag.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/NamedFlag.java index 0bf8e402c..b990ba974 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/NamedFlag.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/NamedFlag.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; /** * A flag with an arbitrary name. diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/NestedPlan.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/NestedPlan.java index a182f1591..a3e4e4097 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/NestedPlan.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/NestedPlan.java @@ -1,10 +1,11 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; import java.util.List; import com.google.common.collect.ImmutableList; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.api.task.TaskExecutor; + +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.task.TaskExecutor; public record NestedPlan(List> parallelPlans) implements SimplyComposedPlan { @SafeVarargs diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/PlanMap.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/PlanMap.java index 822336ed8..fcc8d7035 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/PlanMap.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/PlanMap.java @@ -1,10 +1,10 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; import java.util.ArrayList; import java.util.List; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.api.task.TaskExecutor; +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.task.TaskExecutor; /** * A plan that executes a dynamic list of plans in parallel. diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/RaisePlan.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/RaisePlan.java index 2098d1c87..b8692200a 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/RaisePlan.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/RaisePlan.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; -import com.jozufozu.flywheel.api.task.TaskExecutor; +import dev.engine_room.flywheel.api.task.TaskExecutor; public record RaisePlan(Flag flag) implements SimplyComposedPlan { public static RaisePlan raise(Flag flag) { diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/RunnablePlan.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/RunnablePlan.java index 1be7ae18f..29395d26e 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/RunnablePlan.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/RunnablePlan.java @@ -1,7 +1,7 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; -import com.jozufozu.flywheel.api.task.TaskExecutor; -import com.jozufozu.flywheel.lib.task.functional.RunnableWithContext; +import dev.engine_room.flywheel.api.task.TaskExecutor; +import dev.engine_room.flywheel.lib.task.functional.RunnableWithContext; public record RunnablePlan(RunnableWithContext runnable) implements SimplyComposedPlan { public static RunnablePlan of(RunnableWithContext runnable) { diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/SimplePlan.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/SimplePlan.java index 5b0fbeead..0ec04d1f9 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/SimplePlan.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/SimplePlan.java @@ -1,11 +1,12 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; import java.util.List; import com.google.common.collect.ImmutableList; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.api.task.TaskExecutor; -import com.jozufozu.flywheel.lib.task.functional.RunnableWithContext; + +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.task.TaskExecutor; +import dev.engine_room.flywheel.lib.task.functional.RunnableWithContext; public record SimplePlan(List> parallelTasks) implements SimplyComposedPlan { @SafeVarargs diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/SimplyComposedPlan.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/SimplyComposedPlan.java index d39ac0277..e5556906a 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/SimplyComposedPlan.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/SimplyComposedPlan.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; -import com.jozufozu.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.task.Plan; public interface SimplyComposedPlan extends Plan { @Override diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/StageFlag.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/StageFlag.java index c7245c28a..34f5db1e8 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/StageFlag.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/StageFlag.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; -import com.jozufozu.flywheel.api.event.RenderStage; +import dev.engine_room.flywheel.api.event.RenderStage; /** * A flag that is associated with a render stage. diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/SyncedPlan.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/SyncedPlan.java index c54d003eb..3a1e42860 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/SyncedPlan.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/SyncedPlan.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.api.task.TaskExecutor; -import com.jozufozu.flywheel.lib.task.functional.RunnableWithContext; +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.task.TaskExecutor; +import dev.engine_room.flywheel.lib.task.functional.RunnableWithContext; public record SyncedPlan(RunnableWithContext task) implements SimplyComposedPlan { public static Plan of(RunnableWithContext task) { diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/Synchronizer.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/Synchronizer.java index c34d68ef7..5039a5cb2 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/Synchronizer.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/Synchronizer.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; import java.util.concurrent.atomic.AtomicInteger; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/UnitPlan.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/UnitPlan.java index e12402bc2..9bc20cef7 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/UnitPlan.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/UnitPlan.java @@ -1,7 +1,7 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.api.task.TaskExecutor; +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.task.TaskExecutor; public class UnitPlan implements Plan { private static final UnitPlan INSTANCE = new UnitPlan<>(); diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/functional/BooleanSupplierWithContext.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/functional/BooleanSupplierWithContext.java index b933708d3..352e59284 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/functional/BooleanSupplierWithContext.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/functional/BooleanSupplierWithContext.java @@ -1,10 +1,10 @@ -package com.jozufozu.flywheel.lib.task.functional; +package dev.engine_room.flywheel.lib.task.functional; import java.util.function.BooleanSupplier; import java.util.function.Predicate; /** - * A boolean supplier like interface for use with {@link com.jozufozu.flywheel.api.task.Plan Plans} and their contexts. + * A boolean supplier like interface for use with {@link dev.engine_room.flywheel.api.task.Plan Plans} and their contexts. * * @param The context type. */ diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/functional/ConsumerWithContext.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/functional/ConsumerWithContext.java index ce4495262..f5c440429 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/functional/ConsumerWithContext.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/functional/ConsumerWithContext.java @@ -1,10 +1,10 @@ -package com.jozufozu.flywheel.lib.task.functional; +package dev.engine_room.flywheel.lib.task.functional; import java.util.function.BiConsumer; import java.util.function.Consumer; /** - * A consumer like interface for use with {@link com.jozufozu.flywheel.api.task.Plan Plans} and their contexts. + * A consumer like interface for use with {@link dev.engine_room.flywheel.api.task.Plan Plans} and their contexts. *
* The subinterface {@link Ignored} is provided for consumers that do not need the context object. * diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/functional/RunnableWithContext.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/functional/RunnableWithContext.java index 7e4e2577b..f0eb003db 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/functional/RunnableWithContext.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/functional/RunnableWithContext.java @@ -1,9 +1,9 @@ -package com.jozufozu.flywheel.lib.task.functional; +package dev.engine_room.flywheel.lib.task.functional; import java.util.function.Consumer; /** - * A runnable like interface for use with {@link com.jozufozu.flywheel.api.task.Plan Plans} and their contexts. + * A runnable like interface for use with {@link dev.engine_room.flywheel.api.task.Plan Plans} and their contexts. *
* The subinterface {@link Ignored} is provided for runnables that do not need the context object. * @param The context type. diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/functional/SupplierWithContext.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/functional/SupplierWithContext.java index 4178ccdb5..72ac9665a 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/functional/SupplierWithContext.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/functional/SupplierWithContext.java @@ -1,10 +1,10 @@ -package com.jozufozu.flywheel.lib.task.functional; +package dev.engine_room.flywheel.lib.task.functional; import java.util.function.Function; import java.util.function.Supplier; /** - * A supplier like interface for use with {@link com.jozufozu.flywheel.api.task.Plan Plans} and their contexts. + * A supplier like interface for use with {@link dev.engine_room.flywheel.api.task.Plan Plans} and their contexts. *
* The subinterface {@link Ignored} is provided for suppliers that do not need the context object. * @param The context type. diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/task/functional/package-info.java b/common/src/lib/java/dev/engine_room/flywheel/lib/task/functional/package-info.java index 7a47118c8..54e74141a 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/task/functional/package-info.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/task/functional/package-info.java @@ -1,5 +1,5 @@ /** - * Functional interfaces accepting a context object for use with {@link com.jozufozu.flywheel.api.task.Plan Plans}. + * Functional interfaces accepting a context object for use with {@link dev.engine_room.flywheel.api.task.Plan Plans}. *
* Each interface in this package has a subinterface that ignores the context object. Plans then call the parent * interface, but do not need to create additional closure objects to translate when the consumer wishes to ignore @@ -8,7 +8,7 @@ @ParametersAreNonnullByDefault @FieldsAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.jozufozu.flywheel.lib.task.functional; +package dev.engine_room.flywheel.lib.task.functional; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/transform/Affine.java b/common/src/lib/java/dev/engine_room/flywheel/lib/transform/Affine.java index 856790c1b..e6e80ec32 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/transform/Affine.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/transform/Affine.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.transform; +package dev.engine_room.flywheel.lib.transform; import org.joml.Quaternionf; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/transform/PoseTransformStack.java b/common/src/lib/java/dev/engine_room/flywheel/lib/transform/PoseTransformStack.java index 14e46855e..aafaefead 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/transform/PoseTransformStack.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/transform/PoseTransformStack.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.transform; +package dev.engine_room.flywheel.lib.transform; import org.jetbrains.annotations.ApiStatus; import org.joml.Matrix3f; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/transform/Rotate.java b/common/src/lib/java/dev/engine_room/flywheel/lib/transform/Rotate.java index 49beb428b..6d96bd6ed 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/transform/Rotate.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/transform/Rotate.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.transform; +package dev.engine_room.flywheel.lib.transform; import org.joml.AxisAngle4f; import org.joml.Quaternionf; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/transform/Scale.java b/common/src/lib/java/dev/engine_room/flywheel/lib/transform/Scale.java index 970b199ff..8ef8cd664 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/transform/Scale.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/transform/Scale.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.transform; +package dev.engine_room.flywheel.lib.transform; public interface Scale> { Self scale(float factorX, float factorY, float factorZ); diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/transform/Transform.java b/common/src/lib/java/dev/engine_room/flywheel/lib/transform/Transform.java index 9f8ba48f0..fa7ddc7f7 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/transform/Transform.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/transform/Transform.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.transform; +package dev.engine_room.flywheel.lib.transform; import org.joml.Matrix3f; import org.joml.Matrix4f; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/transform/TransformStack.java b/common/src/lib/java/dev/engine_room/flywheel/lib/transform/TransformStack.java index 00d77576e..5259989fc 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/transform/TransformStack.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/transform/TransformStack.java @@ -1,8 +1,9 @@ -package com.jozufozu.flywheel.lib.transform; +package dev.engine_room.flywheel.lib.transform; -import com.jozufozu.flywheel.lib.internal.FlwLibLink; import com.mojang.blaze3d.vertex.PoseStack; +import dev.engine_room.flywheel.lib.internal.FlwLibLink; + public interface TransformStack> extends Transform { static PoseTransformStack of(PoseStack stack) { return FlwLibLink.INSTANCE.getPoseTransformStackOf(stack); diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/transform/Translate.java b/common/src/lib/java/dev/engine_room/flywheel/lib/transform/Translate.java index 6535d2145..30b43e2ec 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/transform/Translate.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/transform/Translate.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.transform; +package dev.engine_room.flywheel.lib.transform; import org.joml.Vector3f; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/util/AtomicBitset.java b/common/src/lib/java/dev/engine_room/flywheel/lib/util/AtomicBitset.java index 7a17a62e6..ea59e846d 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/util/AtomicBitset.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/util/AtomicBitset.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.util; +package dev.engine_room.flywheel.lib.util; import java.util.Arrays; import java.util.BitSet; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/util/FlwUtil.java b/common/src/lib/java/dev/engine_room/flywheel/lib/util/FlwUtil.java index 88577a566..5aa9dd4ea 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/util/FlwUtil.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/util/FlwUtil.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.util; +package dev.engine_room.flywheel.lib.util; import java.util.Arrays; import java.util.Collections; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/util/LevelAttached.java b/common/src/lib/java/dev/engine_room/flywheel/lib/util/LevelAttached.java index e8817d6e1..7ab56e1a5 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/util/LevelAttached.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/util/LevelAttached.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.util; +package dev.engine_room.flywheel.lib.util; import java.lang.ref.Cleaner; import java.lang.ref.WeakReference; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/util/Pair.java b/common/src/lib/java/dev/engine_room/flywheel/lib/util/Pair.java index 1ad63730a..a54e9e297 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/util/Pair.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/util/Pair.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.util; +package dev.engine_room.flywheel.lib.util; import java.util.Objects; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/util/ResourceUtil.java b/common/src/lib/java/dev/engine_room/flywheel/lib/util/ResourceUtil.java index 36be0853c..9eb0f1419 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/util/ResourceUtil.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/util/ResourceUtil.java @@ -1,10 +1,10 @@ -package com.jozufozu.flywheel.lib.util; +package dev.engine_room.flywheel.lib.util; -import com.jozufozu.flywheel.api.Flywheel; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; +import dev.engine_room.flywheel.api.Flywheel; import net.minecraft.ResourceLocationException; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/util/SectionUtil.java b/common/src/lib/java/dev/engine_room/flywheel/lib/util/SectionUtil.java index 9bd7afaf9..3f88675c3 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/util/SectionUtil.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/util/SectionUtil.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.util; +package dev.engine_room.flywheel.lib.util; import java.util.Collection; import java.util.function.LongConsumer; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/util/ShadersModHandler.java b/common/src/lib/java/dev/engine_room/flywheel/lib/util/ShadersModHandler.java index 8ab564351..ccf26ce07 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/util/ShadersModHandler.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/util/ShadersModHandler.java @@ -1,12 +1,12 @@ -package com.jozufozu.flywheel.lib.util; +package dev.engine_room.flywheel.lib.util; import java.lang.reflect.Field; import java.util.function.BooleanSupplier; import org.jetbrains.annotations.ApiStatus; -import com.jozufozu.flywheel.lib.internal.FlwLibLink; -import com.jozufozu.flywheel.lib.internal.FlwLibXplat; +import dev.engine_room.flywheel.lib.internal.FlwLibLink; +import dev.engine_room.flywheel.lib.internal.FlwLibXplat; public final class ShadersModHandler { private static final String OPTIFINE_ROOT_PACKAGE = "net.optifine"; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/util/StringUtil.java b/common/src/lib/java/dev/engine_room/flywheel/lib/util/StringUtil.java index f2e842712..93364d43a 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/util/StringUtil.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/util/StringUtil.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.util; +package dev.engine_room.flywheel.lib.util; import java.text.DecimalFormat; import java.text.NumberFormat; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/util/Unit.java b/common/src/lib/java/dev/engine_room/flywheel/lib/util/Unit.java index 7a257f4a0..2544e4286 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/util/Unit.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/util/Unit.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.util; +package dev.engine_room.flywheel.lib.util; public enum Unit { INSTANCE; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/AbstractVertexView.java b/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/AbstractVertexView.java index bf5367029..19a07ec1d 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/AbstractVertexView.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/AbstractVertexView.java @@ -1,9 +1,9 @@ -package com.jozufozu.flywheel.lib.vertex; +package dev.engine_room.flywheel.lib.vertex; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.api.vertex.MutableVertexList; -import com.jozufozu.flywheel.api.vertex.VertexView; +import dev.engine_room.flywheel.api.vertex.MutableVertexList; +import dev.engine_room.flywheel.api.vertex.VertexView; public abstract class AbstractVertexView implements VertexView { protected long ptr; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/EmptyVertexList.java b/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/EmptyVertexList.java index 685d34196..8b8ee1625 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/EmptyVertexList.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/EmptyVertexList.java @@ -1,7 +1,6 @@ -package com.jozufozu.flywheel.lib.vertex; - -import com.jozufozu.flywheel.api.vertex.MutableVertexList; +package dev.engine_room.flywheel.lib.vertex; +import dev.engine_room.flywheel.api.vertex.MutableVertexList; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.texture.OverlayTexture; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/FullVertexView.java b/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/FullVertexView.java index 67e89be89..31aa4efaa 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/FullVertexView.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/FullVertexView.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.lib.vertex; +package dev.engine_room.flywheel.lib.vertex; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.lib.math.RenderMath; +import dev.engine_room.flywheel.lib.math.RenderMath; public class FullVertexView extends AbstractVertexView { public static final long STRIDE = 36; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/NoOverlayVertexView.java b/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/NoOverlayVertexView.java index 6d6eefaf1..6bcdb7201 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/NoOverlayVertexView.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/NoOverlayVertexView.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.lib.vertex; +package dev.engine_room.flywheel.lib.vertex; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.lib.math.RenderMath; +import dev.engine_room.flywheel.lib.math.RenderMath; public class NoOverlayVertexView extends AbstractVertexView implements EmptyVertexList { public static final long STRIDE = 31; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/PosTexNormalVertexView.java b/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/PosTexNormalVertexView.java index 585689e54..d864fec06 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/PosTexNormalVertexView.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/PosTexNormalVertexView.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.lib.vertex; +package dev.engine_room.flywheel.lib.vertex; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.lib.math.RenderMath; +import dev.engine_room.flywheel.lib.math.RenderMath; public class PosTexNormalVertexView extends AbstractVertexView implements EmptyVertexList { public static final long STRIDE = 23; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/PosVertexView.java b/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/PosVertexView.java index 94a7fcaac..bdc6aab26 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/PosVertexView.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/vertex/PosVertexView.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.vertex; +package dev.engine_room.flywheel.lib.vertex; import org.lwjgl.system.MemoryUtil; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/AbstractBlockEntityVisual.java b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/AbstractBlockEntityVisual.java index d5486106e..bdecdb4c4 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/AbstractBlockEntityVisual.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/AbstractBlockEntityVisual.java @@ -1,18 +1,17 @@ -package com.jozufozu.flywheel.lib.visual; +package dev.engine_room.flywheel.lib.visual; import java.util.function.LongConsumer; import org.jetbrains.annotations.Nullable; import org.joml.FrustumIntersection; -import com.jozufozu.flywheel.api.visual.BlockEntityVisual; -import com.jozufozu.flywheel.api.visual.DynamicVisual; -import com.jozufozu.flywheel.api.visual.LitVisual; -import com.jozufozu.flywheel.api.visual.TickableVisual; -import com.jozufozu.flywheel.api.visualization.VisualManager; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; -import com.jozufozu.flywheel.lib.math.MoreMath; - +import dev.engine_room.flywheel.api.visual.BlockEntityVisual; +import dev.engine_room.flywheel.api.visual.DynamicVisual; +import dev.engine_room.flywheel.api.visual.LitVisual; +import dev.engine_room.flywheel.api.visual.TickableVisual; +import dev.engine_room.flywheel.api.visualization.VisualManager; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.lib.math.MoreMath; import net.minecraft.core.BlockPos; import net.minecraft.core.SectionPos; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/AbstractEntityVisual.java b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/AbstractEntityVisual.java index 0d3c2123b..e675a63b4 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/AbstractEntityVisual.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/AbstractEntityVisual.java @@ -1,14 +1,13 @@ -package com.jozufozu.flywheel.lib.visual; +package dev.engine_room.flywheel.lib.visual; import org.joml.FrustumIntersection; import org.joml.Vector3f; -import com.jozufozu.flywheel.api.visual.DynamicVisual; -import com.jozufozu.flywheel.api.visual.EntityVisual; -import com.jozufozu.flywheel.api.visual.TickableVisual; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; -import com.jozufozu.flywheel.api.visualization.VisualizationManager; - +import dev.engine_room.flywheel.api.visual.DynamicVisual; +import dev.engine_room.flywheel.api.visual.EntityVisual; +import dev.engine_room.flywheel.api.visual.TickableVisual; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.api.visualization.VisualizationManager; import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity; import net.minecraft.world.phys.Vec3; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/AbstractVisual.java b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/AbstractVisual.java index 234444986..ce43eca96 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/AbstractVisual.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/AbstractVisual.java @@ -1,15 +1,14 @@ -package com.jozufozu.flywheel.lib.visual; +package dev.engine_room.flywheel.lib.visual; import java.util.Objects; import java.util.stream.Stream; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.instance.InstancerProvider; -import com.jozufozu.flywheel.api.visual.Visual; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; -import com.jozufozu.flywheel.lib.instance.FlatLit; - +import dev.engine_room.flywheel.api.instance.InstancerProvider; +import dev.engine_room.flywheel.api.visual.Visual; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.lib.instance.FlatLit; import net.minecraft.core.BlockPos; import net.minecraft.core.Vec3i; import net.minecraft.world.level.Level; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/EntityComponent.java b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/EntityComponent.java index be229ce4e..582ca8b6e 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/EntityComponent.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/EntityComponent.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.lib.visual; +package dev.engine_room.flywheel.lib.visual; -import com.jozufozu.flywheel.api.visual.DynamicVisual; +import dev.engine_room.flywheel.api.visual.DynamicVisual; public interface EntityComponent { void beginFrame(DynamicVisual.Context context); diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/EntityVisibilityTester.java b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/EntityVisibilityTester.java index a5d4ea5b5..90e2e977e 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/EntityVisibilityTester.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/EntityVisibilityTester.java @@ -1,10 +1,9 @@ -package com.jozufozu.flywheel.lib.visual; +package dev.engine_room.flywheel.lib.visual; import org.jetbrains.annotations.Nullable; import org.joml.FrustumIntersection; -import com.jozufozu.flywheel.lib.math.MoreMath; - +import dev.engine_room.flywheel.lib.math.MoreMath; import net.minecraft.core.Vec3i; import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/InstanceRecycler.java b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/InstanceRecycler.java index af6931bbb..cdfa6a4aa 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/InstanceRecycler.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/InstanceRecycler.java @@ -1,10 +1,10 @@ -package com.jozufozu.flywheel.lib.visual; +package dev.engine_room.flywheel.lib.visual; import java.util.ArrayList; import java.util.List; import java.util.function.Supplier; -import com.jozufozu.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.instance.Instance; /** * A utility for recycling instances. diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleBlockEntityVisualizer.java b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleBlockEntityVisualizer.java index f32a814d5..ab60f3d4c 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleBlockEntityVisualizer.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleBlockEntityVisualizer.java @@ -1,15 +1,14 @@ -package com.jozufozu.flywheel.lib.visual; +package dev.engine_room.flywheel.lib.visual; import java.util.Objects; import java.util.function.Predicate; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.visual.BlockEntityVisual; -import com.jozufozu.flywheel.api.visualization.BlockEntityVisualizer; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; -import com.jozufozu.flywheel.api.visualization.VisualizerRegistry; - +import dev.engine_room.flywheel.api.visual.BlockEntityVisual; +import dev.engine_room.flywheel.api.visualization.BlockEntityVisualizer; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.api.visualization.VisualizerRegistry; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleDynamicVisual.java b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleDynamicVisual.java index 8f0b76dc1..e23496c23 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleDynamicVisual.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleDynamicVisual.java @@ -1,10 +1,10 @@ -package com.jozufozu.flywheel.lib.visual; +package dev.engine_room.flywheel.lib.visual; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.instance.Instancer; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.api.visual.DynamicVisual; -import com.jozufozu.flywheel.lib.task.RunnablePlan; +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.instance.Instancer; +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.visual.DynamicVisual; +import dev.engine_room.flywheel.lib.task.RunnablePlan; public interface SimpleDynamicVisual extends DynamicVisual { /** diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleEntityVisual.java b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleEntityVisual.java index e75d3702a..12b8fc8d7 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleEntityVisual.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleEntityVisual.java @@ -1,9 +1,9 @@ -package com.jozufozu.flywheel.lib.visual; +package dev.engine_room.flywheel.lib.visual; import java.util.ArrayList; import java.util.List; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; import net.minecraft.world.entity.Entity; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleEntityVisualizer.java b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleEntityVisualizer.java index 220e43e7c..828aeffcf 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleEntityVisualizer.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleEntityVisualizer.java @@ -1,14 +1,14 @@ -package com.jozufozu.flywheel.lib.visual; +package dev.engine_room.flywheel.lib.visual; import java.util.Objects; import java.util.function.Predicate; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.visual.EntityVisual; -import com.jozufozu.flywheel.api.visualization.EntityVisualizer; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; -import com.jozufozu.flywheel.api.visualization.VisualizerRegistry; +import dev.engine_room.flywheel.api.visual.EntityVisual; +import dev.engine_room.flywheel.api.visualization.EntityVisualizer; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.api.visualization.VisualizerRegistry; import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.world.entity.Entity; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleTickableVisual.java b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleTickableVisual.java index 110adcd49..489035521 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleTickableVisual.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SimpleTickableVisual.java @@ -1,10 +1,10 @@ -package com.jozufozu.flywheel.lib.visual; +package dev.engine_room.flywheel.lib.visual; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.instance.Instancer; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.api.visual.TickableVisual; -import com.jozufozu.flywheel.lib.task.RunnablePlan; +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.instance.Instancer; +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.visual.TickableVisual; +import dev.engine_room.flywheel.lib.task.RunnablePlan; public interface SimpleTickableVisual extends TickableVisual { diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SmartRecycler.java b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SmartRecycler.java index 0a76c91f3..574976b77 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SmartRecycler.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/SmartRecycler.java @@ -1,10 +1,10 @@ -package com.jozufozu.flywheel.lib.visual; +package dev.engine_room.flywheel.lib.visual; import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import com.jozufozu.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.instance.Instance; public class SmartRecycler { private final Function factory; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/VisualizationHelper.java b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/VisualizationHelper.java index ba5bdb42e..03cba9b70 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/VisualizationHelper.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/VisualizationHelper.java @@ -1,11 +1,11 @@ -package com.jozufozu.flywheel.lib.visual; +package dev.engine_room.flywheel.lib.visual; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.visualization.BlockEntityVisualizer; -import com.jozufozu.flywheel.api.visualization.EntityVisualizer; -import com.jozufozu.flywheel.api.visualization.VisualizationManager; -import com.jozufozu.flywheel.api.visualization.VisualizerRegistry; +import dev.engine_room.flywheel.api.visualization.BlockEntityVisualizer; +import dev.engine_room.flywheel.api.visualization.EntityVisualizer; +import dev.engine_room.flywheel.api.visualization.VisualizationManager; +import dev.engine_room.flywheel.api.visualization.VisualizerRegistry; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/component/FireComponent.java b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/component/FireComponent.java index 8c0f3bf0d..b80e26a24 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/component/FireComponent.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/component/FireComponent.java @@ -1,25 +1,25 @@ -package com.jozufozu.flywheel.lib.visual.component; +package dev.engine_room.flywheel.lib.visual.component; import org.joml.Vector4f; import org.joml.Vector4fc; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.api.model.Model; -import com.jozufozu.flywheel.api.vertex.MutableVertexList; -import com.jozufozu.flywheel.api.visual.DynamicVisual; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; -import com.jozufozu.flywheel.lib.instance.InstanceTypes; -import com.jozufozu.flywheel.lib.instance.TransformedInstance; -import com.jozufozu.flywheel.lib.material.Materials; -import com.jozufozu.flywheel.lib.material.SimpleMaterial; -import com.jozufozu.flywheel.lib.model.ModelCache; -import com.jozufozu.flywheel.lib.model.QuadMesh; -import com.jozufozu.flywheel.lib.model.SingleMeshModel; -import com.jozufozu.flywheel.lib.visual.EntityComponent; -import com.jozufozu.flywheel.lib.visual.SmartRecycler; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.api.model.Model; +import dev.engine_room.flywheel.api.vertex.MutableVertexList; +import dev.engine_room.flywheel.api.visual.DynamicVisual; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.lib.instance.InstanceTypes; +import dev.engine_room.flywheel.lib.instance.TransformedInstance; +import dev.engine_room.flywheel.lib.material.Materials; +import dev.engine_room.flywheel.lib.material.SimpleMaterial; +import dev.engine_room.flywheel.lib.model.ModelCache; +import dev.engine_room.flywheel.lib.model.QuadMesh; +import dev.engine_room.flywheel.lib.model.SingleMeshModel; +import dev.engine_room.flywheel.lib.visual.EntityComponent; +import dev.engine_room.flywheel.lib.visual.SmartRecycler; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.model.ModelBakery; @@ -63,7 +63,7 @@ private TransformedInstance createInstance(Model model) { /** * Update the fire instances. You'd typically call this in your visual's - * {@link com.jozufozu.flywheel.lib.visual.SimpleDynamicVisual#beginFrame(DynamicVisual.Context) beginFrame} method. + * {@link dev.engine_room.flywheel.lib.visual.SimpleDynamicVisual#beginFrame(DynamicVisual.Context) beginFrame} method. * * @param context The frame context. */ diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/component/HitboxComponent.java b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/component/HitboxComponent.java index 2cbba3709..f0cacfc2c 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/component/HitboxComponent.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/component/HitboxComponent.java @@ -1,17 +1,16 @@ -package com.jozufozu.flywheel.lib.visual.component; +package dev.engine_room.flywheel.lib.visual.component; import org.joml.Quaternionf; -import com.jozufozu.flywheel.api.model.Model; -import com.jozufozu.flywheel.api.visual.DynamicVisual; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; -import com.jozufozu.flywheel.lib.instance.InstanceTypes; -import com.jozufozu.flywheel.lib.instance.TransformedInstance; -import com.jozufozu.flywheel.lib.model.LineModelBuilder; -import com.jozufozu.flywheel.lib.model.ModelHolder; -import com.jozufozu.flywheel.lib.visual.EntityComponent; -import com.jozufozu.flywheel.lib.visual.SmartRecycler; - +import dev.engine_room.flywheel.api.model.Model; +import dev.engine_room.flywheel.api.visual.DynamicVisual; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.lib.instance.InstanceTypes; +import dev.engine_room.flywheel.lib.instance.TransformedInstance; +import dev.engine_room.flywheel.lib.model.LineModelBuilder; +import dev.engine_room.flywheel.lib.model.ModelHolder; +import dev.engine_room.flywheel.lib.visual.EntityComponent; +import dev.engine_room.flywheel.lib.visual.SmartRecycler; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.LightTexture; import net.minecraft.util.Mth; diff --git a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/component/ShadowComponent.java b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/component/ShadowComponent.java index 45d3526ca..337be2128 100644 --- a/common/src/lib/java/dev/engine_room/flywheel/lib/visual/component/ShadowComponent.java +++ b/common/src/lib/java/dev/engine_room/flywheel/lib/visual/component/ShadowComponent.java @@ -1,24 +1,23 @@ -package com.jozufozu.flywheel.lib.visual.component; +package dev.engine_room.flywheel.lib.visual.component; import org.jetbrains.annotations.Nullable; import org.joml.Vector4f; import org.joml.Vector4fc; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.api.material.Transparency; -import com.jozufozu.flywheel.api.material.WriteMask; -import com.jozufozu.flywheel.api.model.Model; -import com.jozufozu.flywheel.api.vertex.MutableVertexList; -import com.jozufozu.flywheel.api.visual.DynamicVisual; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; -import com.jozufozu.flywheel.lib.instance.InstanceTypes; -import com.jozufozu.flywheel.lib.instance.ShadowInstance; -import com.jozufozu.flywheel.lib.material.SimpleMaterial; -import com.jozufozu.flywheel.lib.model.QuadMesh; -import com.jozufozu.flywheel.lib.model.SingleMeshModel; -import com.jozufozu.flywheel.lib.visual.EntityComponent; -import com.jozufozu.flywheel.lib.visual.InstanceRecycler; - +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.api.material.Transparency; +import dev.engine_room.flywheel.api.material.WriteMask; +import dev.engine_room.flywheel.api.model.Model; +import dev.engine_room.flywheel.api.vertex.MutableVertexList; +import dev.engine_room.flywheel.api.visual.DynamicVisual; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.lib.instance.InstanceTypes; +import dev.engine_room.flywheel.lib.instance.ShadowInstance; +import dev.engine_room.flywheel.lib.material.SimpleMaterial; +import dev.engine_room.flywheel.lib.model.QuadMesh; +import dev.engine_room.flywheel.lib.model.SingleMeshModel; +import dev.engine_room.flywheel.lib.visual.EntityComponent; +import dev.engine_room.flywheel.lib.visual.InstanceRecycler; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.texture.OverlayTexture; @@ -108,7 +107,7 @@ public ShadowComponent strength(float strength) { /** * Update the shadow instances. You'd typically call this in your visual's - * {@link com.jozufozu.flywheel.lib.visual.SimpleDynamicVisual#beginFrame(DynamicVisual.Context) beginFrame} method. + * {@link dev.engine_room.flywheel.lib.visual.SimpleDynamicVisual#beginFrame(DynamicVisual.Context) beginFrame} method. * * @param context The frame context. */ diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/BackendArgument.java b/common/src/main/java/dev/engine_room/flywheel/impl/BackendArgument.java index bbc2ff860..1ef3235fc 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/BackendArgument.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/BackendArgument.java @@ -1,12 +1,10 @@ -package com.jozufozu.flywheel.impl; +package dev.engine_room.flywheel.impl; import java.util.Collection; import java.util.List; import java.util.Locale; import java.util.concurrent.CompletableFuture; -import com.jozufozu.flywheel.api.backend.Backend; -import com.jozufozu.flywheel.lib.util.ResourceUtil; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; import com.mojang.brigadier.context.CommandContext; @@ -15,6 +13,8 @@ import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; +import dev.engine_room.flywheel.api.backend.Backend; +import dev.engine_room.flywheel.lib.util.ResourceUtil; import net.minecraft.commands.SharedSuggestionProvider; import net.minecraft.commands.synchronization.SingletonArgumentInfo; import net.minecraft.network.chat.Component; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/BackendManagerImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/BackendManagerImpl.java index de7dbed89..012eb01ee 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/BackendManagerImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/BackendManagerImpl.java @@ -1,13 +1,12 @@ -package com.jozufozu.flywheel.impl; +package dev.engine_room.flywheel.impl; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.Flywheel; -import com.jozufozu.flywheel.api.backend.Backend; -import com.jozufozu.flywheel.backend.Backends; -import com.jozufozu.flywheel.impl.visualization.VisualizationManagerImpl; -import com.jozufozu.flywheel.lib.backend.SimpleBackend; - +import dev.engine_room.flywheel.api.Flywheel; +import dev.engine_room.flywheel.api.backend.Backend; +import dev.engine_room.flywheel.backend.Backends; +import dev.engine_room.flywheel.impl.visualization.VisualizationManagerImpl; +import dev.engine_room.flywheel.lib.backend.SimpleBackend; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.resources.ResourceLocation; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/DebugModeArgument.java b/common/src/main/java/dev/engine_room/flywheel/impl/DebugModeArgument.java index d76b9af1e..22fa721ed 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/DebugModeArgument.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/DebugModeArgument.java @@ -1,7 +1,6 @@ -package com.jozufozu.flywheel.impl; - -import com.jozufozu.flywheel.backend.engine.uniform.DebugMode; +package dev.engine_room.flywheel.impl; +import dev.engine_room.flywheel.backend.engine.uniform.DebugMode; import net.minecraft.commands.arguments.StringRepresentableArgument; import net.minecraft.commands.synchronization.SingletonArgumentInfo; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/FlwApiLinkImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/FlwApiLinkImpl.java index 877135322..203f8def5 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/FlwApiLinkImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/FlwApiLinkImpl.java @@ -1,24 +1,24 @@ -package com.jozufozu.flywheel.impl; +package dev.engine_room.flywheel.impl; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.backend.Backend; -import com.jozufozu.flywheel.api.internal.FlwApiLink; -import com.jozufozu.flywheel.api.layout.LayoutBuilder; -import com.jozufozu.flywheel.api.registry.IdRegistry; -import com.jozufozu.flywheel.api.registry.Registry; -import com.jozufozu.flywheel.api.vertex.VertexViewProvider; -import com.jozufozu.flywheel.api.visualization.BlockEntityVisualizer; -import com.jozufozu.flywheel.api.visualization.EntityVisualizer; -import com.jozufozu.flywheel.api.visualization.VisualizationManager; -import com.jozufozu.flywheel.impl.layout.LayoutBuilderImpl; -import com.jozufozu.flywheel.impl.registry.IdRegistryImpl; -import com.jozufozu.flywheel.impl.registry.RegistryImpl; -import com.jozufozu.flywheel.impl.vertex.VertexViewProviderRegistryImpl; -import com.jozufozu.flywheel.impl.visualization.VisualizationManagerImpl; -import com.jozufozu.flywheel.impl.visualization.VisualizerRegistryImpl; import com.mojang.blaze3d.vertex.VertexFormat; +import dev.engine_room.flywheel.api.backend.Backend; +import dev.engine_room.flywheel.api.internal.FlwApiLink; +import dev.engine_room.flywheel.api.layout.LayoutBuilder; +import dev.engine_room.flywheel.api.registry.IdRegistry; +import dev.engine_room.flywheel.api.registry.Registry; +import dev.engine_room.flywheel.api.vertex.VertexViewProvider; +import dev.engine_room.flywheel.api.visualization.BlockEntityVisualizer; +import dev.engine_room.flywheel.api.visualization.EntityVisualizer; +import dev.engine_room.flywheel.api.visualization.VisualizationManager; +import dev.engine_room.flywheel.impl.layout.LayoutBuilderImpl; +import dev.engine_room.flywheel.impl.registry.IdRegistryImpl; +import dev.engine_room.flywheel.impl.registry.RegistryImpl; +import dev.engine_room.flywheel.impl.vertex.VertexViewProviderRegistryImpl; +import dev.engine_room.flywheel.impl.visualization.VisualizationManagerImpl; +import dev.engine_room.flywheel.impl.visualization.VisualizerRegistryImpl; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.LevelAccessor; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/FlwConfig.java b/common/src/main/java/dev/engine_room/flywheel/impl/FlwConfig.java index 35e167d94..ba661d25c 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/FlwConfig.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/FlwConfig.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.impl; +package dev.engine_room.flywheel.impl; -import com.jozufozu.flywheel.api.backend.Backend; +import dev.engine_room.flywheel.api.backend.Backend; public interface FlwConfig { FlwConfig INSTANCE = FlwImplXplat.INSTANCE.getConfig(); diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/FlwDebugInfo.java b/common/src/main/java/dev/engine_room/flywheel/impl/FlwDebugInfo.java index 6150146b1..5f4b61c60 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/FlwDebugInfo.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/FlwDebugInfo.java @@ -1,11 +1,10 @@ -package com.jozufozu.flywheel.impl; +package dev.engine_room.flywheel.impl; import java.util.List; -import com.jozufozu.flywheel.api.visualization.VisualizationManager; -import com.jozufozu.flywheel.lib.memory.FlwMemoryTracker; -import com.jozufozu.flywheel.lib.util.StringUtil; - +import dev.engine_room.flywheel.api.visualization.VisualizationManager; +import dev.engine_room.flywheel.lib.memory.FlwMemoryTracker; +import dev.engine_room.flywheel.lib.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.core.Vec3i; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/FlwImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/FlwImpl.java index 53df9d4e1..5d8538b47 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/FlwImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/FlwImpl.java @@ -1,18 +1,18 @@ -package com.jozufozu.flywheel.impl; +package dev.engine_room.flywheel.impl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.jozufozu.flywheel.api.Flywheel; -import com.jozufozu.flywheel.backend.FlwBackend; -import com.jozufozu.flywheel.impl.registry.IdRegistryImpl; -import com.jozufozu.flywheel.impl.registry.RegistryImpl; -import com.jozufozu.flywheel.lib.instance.InstanceTypes; -import com.jozufozu.flywheel.lib.material.CutoutShaders; -import com.jozufozu.flywheel.lib.material.FogShaders; -import com.jozufozu.flywheel.lib.material.StandardMaterialShaders; -import com.jozufozu.flywheel.lib.util.ShadersModHandler; -import com.jozufozu.flywheel.vanilla.VanillaVisuals; +import dev.engine_room.flywheel.api.Flywheel; +import dev.engine_room.flywheel.backend.FlwBackend; +import dev.engine_room.flywheel.impl.registry.IdRegistryImpl; +import dev.engine_room.flywheel.impl.registry.RegistryImpl; +import dev.engine_room.flywheel.lib.instance.InstanceTypes; +import dev.engine_room.flywheel.lib.material.CutoutShaders; +import dev.engine_room.flywheel.lib.material.FogShaders; +import dev.engine_room.flywheel.lib.material.StandardMaterialShaders; +import dev.engine_room.flywheel.lib.util.ShadersModHandler; +import dev.engine_room.flywheel.vanilla.VanillaVisuals; public final class FlwImpl { public static final Logger LOGGER = LoggerFactory.getLogger(Flywheel.ID); diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplat.java b/common/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplat.java index 198b821ab..3a2a927cb 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplat.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplat.java @@ -1,15 +1,14 @@ -package com.jozufozu.flywheel.impl; +package dev.engine_room.flywheel.impl; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.event.RenderContext; -import com.jozufozu.flywheel.api.event.RenderStage; -import com.jozufozu.flywheel.api.internal.DependencyInjection; - +import dev.engine_room.flywheel.api.event.RenderContext; +import dev.engine_room.flywheel.api.event.RenderStage; +import dev.engine_room.flywheel.api.internal.DependencyInjection; import net.minecraft.client.multiplayer.ClientLevel; public interface FlwImplXplat { - FlwImplXplat INSTANCE = DependencyInjection.load(FlwImplXplat.class, "com.jozufozu.flywheel.impl.FlwImplXplatImpl"); + FlwImplXplat INSTANCE = DependencyInjection.load(FlwImplXplat.class, "dev.engine_room.flywheel.impl.FlwImplXplatImpl"); void dispatchBeginFrameEvent(RenderContext context); diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/FlwLibLinkImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/FlwLibLinkImpl.java index f49536065..7b0e0e682 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/FlwLibLinkImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/FlwLibLinkImpl.java @@ -1,12 +1,13 @@ -package com.jozufozu.flywheel.impl; +package dev.engine_room.flywheel.impl; import org.slf4j.Logger; -import com.jozufozu.flywheel.impl.extension.PoseStackExtension; -import com.jozufozu.flywheel.lib.internal.FlwLibLink; -import com.jozufozu.flywheel.lib.transform.PoseTransformStack; import com.mojang.blaze3d.vertex.PoseStack; +import dev.engine_room.flywheel.impl.extension.PoseStackExtension; +import dev.engine_room.flywheel.lib.internal.FlwLibLink; +import dev.engine_room.flywheel.lib.transform.PoseTransformStack; + public class FlwLibLinkImpl implements FlwLibLink { @Override public Logger getLogger() { diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/event/RenderContextImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/event/RenderContextImpl.java index d5d5d1636..a35272771 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/event/RenderContextImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/event/RenderContextImpl.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.impl.event; +package dev.engine_room.flywheel.impl.event; import org.joml.Matrix4f; -import com.jozufozu.flywheel.api.event.RenderContext; +import dev.engine_room.flywheel.api.event.RenderContext; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Camera; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/extension/BlockEntityTypeExtension.java b/common/src/main/java/dev/engine_room/flywheel/impl/extension/BlockEntityTypeExtension.java index bff16e7ef..139789bfe 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/extension/BlockEntityTypeExtension.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/extension/BlockEntityTypeExtension.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.impl.extension; +package dev.engine_room.flywheel.impl.extension; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.visualization.BlockEntityVisualizer; +import dev.engine_room.flywheel.api.visualization.BlockEntityVisualizer; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/extension/EntityTypeExtension.java b/common/src/main/java/dev/engine_room/flywheel/impl/extension/EntityTypeExtension.java index 8a406a65c..dc8f27dc8 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/extension/EntityTypeExtension.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/extension/EntityTypeExtension.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.impl.extension; +package dev.engine_room.flywheel.impl.extension; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.visualization.EntityVisualizer; +import dev.engine_room.flywheel.api.visualization.EntityVisualizer; import net.minecraft.world.entity.Entity; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/extension/LevelExtension.java b/common/src/main/java/dev/engine_room/flywheel/impl/extension/LevelExtension.java index 5a894cbda..4de117e6a 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/extension/LevelExtension.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/extension/LevelExtension.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.extension; +package dev.engine_room.flywheel.impl.extension; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.world.entity.Entity; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/extension/PoseStackExtension.java b/common/src/main/java/dev/engine_room/flywheel/impl/extension/PoseStackExtension.java index 4b30bdff9..7c63f38f1 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/extension/PoseStackExtension.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/extension/PoseStackExtension.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.impl.extension; +package dev.engine_room.flywheel.impl.extension; -import com.jozufozu.flywheel.lib.transform.PoseTransformStack; +import dev.engine_room.flywheel.lib.transform.PoseTransformStack; import com.mojang.blaze3d.vertex.PoseStack; /** diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/extension/VertexFormatExtension.java b/common/src/main/java/dev/engine_room/flywheel/impl/extension/VertexFormatExtension.java index 1d7f0a1c3..3fa60e0c5 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/extension/VertexFormatExtension.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/extension/VertexFormatExtension.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.impl.extension; +package dev.engine_room.flywheel.impl.extension; -import com.jozufozu.flywheel.api.vertex.VertexViewProvider; +import dev.engine_room.flywheel.api.vertex.VertexViewProvider; import com.mojang.blaze3d.vertex.VertexFormat; /** diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/layout/ArrayElementTypeImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/layout/ArrayElementTypeImpl.java index 5de8c9eee..f1114e535 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/layout/ArrayElementTypeImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/layout/ArrayElementTypeImpl.java @@ -1,9 +1,9 @@ -package com.jozufozu.flywheel.impl.layout; +package dev.engine_room.flywheel.impl.layout; import org.jetbrains.annotations.Range; -import com.jozufozu.flywheel.api.layout.ArrayElementType; -import com.jozufozu.flywheel.api.layout.ElementType; +import dev.engine_room.flywheel.api.layout.ArrayElementType; +import dev.engine_room.flywheel.api.layout.ElementType; record ArrayElementTypeImpl(ElementType innerType, @Range(from = 1, to = 256) int length, int byteSize, int byteAlignment) implements ArrayElementType { static ArrayElementTypeImpl create(ElementType innerType, @Range(from = 1, to = 256) int length) { diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/layout/LayoutBuilderImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/layout/LayoutBuilderImpl.java index 73cdedfe1..a2f7c07cc 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/layout/LayoutBuilderImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/layout/LayoutBuilderImpl.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.layout; +package dev.engine_room.flywheel.impl.layout; import java.util.ArrayList; import java.util.List; @@ -8,14 +8,14 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; -import com.jozufozu.flywheel.api.layout.ElementType; -import com.jozufozu.flywheel.api.layout.FloatRepr; -import com.jozufozu.flywheel.api.layout.Layout; -import com.jozufozu.flywheel.api.layout.Layout.Element; -import com.jozufozu.flywheel.api.layout.LayoutBuilder; -import com.jozufozu.flywheel.api.layout.ValueRepr; -import com.jozufozu.flywheel.impl.layout.LayoutImpl.ElementImpl; -import com.jozufozu.flywheel.lib.math.MoreMath; +import dev.engine_room.flywheel.api.layout.ElementType; +import dev.engine_room.flywheel.api.layout.FloatRepr; +import dev.engine_room.flywheel.api.layout.Layout; +import dev.engine_room.flywheel.api.layout.Layout.Element; +import dev.engine_room.flywheel.api.layout.LayoutBuilder; +import dev.engine_room.flywheel.api.layout.ValueRepr; +import dev.engine_room.flywheel.impl.layout.LayoutImpl.ElementImpl; +import dev.engine_room.flywheel.lib.math.MoreMath; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/layout/LayoutImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/layout/LayoutImpl.java index 788d2bdd9..cb86c5c25 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/layout/LayoutImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/layout/LayoutImpl.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.layout; +package dev.engine_room.flywheel.impl.layout; import java.util.Collections; import java.util.List; @@ -6,8 +6,8 @@ import org.jetbrains.annotations.Unmodifiable; -import com.jozufozu.flywheel.api.layout.ElementType; -import com.jozufozu.flywheel.api.layout.Layout; +import dev.engine_room.flywheel.api.layout.ElementType; +import dev.engine_room.flywheel.api.layout.Layout; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/layout/MatrixElementTypeImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/layout/MatrixElementTypeImpl.java index 20e78d625..1c590e340 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/layout/MatrixElementTypeImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/layout/MatrixElementTypeImpl.java @@ -1,9 +1,9 @@ -package com.jozufozu.flywheel.impl.layout; +package dev.engine_room.flywheel.impl.layout; import org.jetbrains.annotations.Range; -import com.jozufozu.flywheel.api.layout.FloatRepr; -import com.jozufozu.flywheel.api.layout.MatrixElementType; +import dev.engine_room.flywheel.api.layout.FloatRepr; +import dev.engine_room.flywheel.api.layout.MatrixElementType; record MatrixElementTypeImpl(FloatRepr repr, @Range(from = 2, to = 4) int rows, @Range(from = 2, to = 4) int columns, int byteSize, int byteAlignment) implements MatrixElementType { diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/layout/ScalarElementTypeImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/layout/ScalarElementTypeImpl.java index 258542e61..76b25cc80 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/layout/ScalarElementTypeImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/layout/ScalarElementTypeImpl.java @@ -1,7 +1,7 @@ -package com.jozufozu.flywheel.impl.layout; +package dev.engine_room.flywheel.impl.layout; -import com.jozufozu.flywheel.api.layout.ScalarElementType; -import com.jozufozu.flywheel.api.layout.ValueRepr; +import dev.engine_room.flywheel.api.layout.ScalarElementType; +import dev.engine_room.flywheel.api.layout.ValueRepr; record ScalarElementTypeImpl(ValueRepr repr, int byteSize, int byteAlignment) implements ScalarElementType { static ScalarElementTypeImpl create(ValueRepr repr) { diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/layout/VectorElementTypeImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/layout/VectorElementTypeImpl.java index 6088bb5ec..650adcb39 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/layout/VectorElementTypeImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/layout/VectorElementTypeImpl.java @@ -1,9 +1,9 @@ -package com.jozufozu.flywheel.impl.layout; +package dev.engine_room.flywheel.impl.layout; import org.jetbrains.annotations.Range; -import com.jozufozu.flywheel.api.layout.ValueRepr; -import com.jozufozu.flywheel.api.layout.VectorElementType; +import dev.engine_room.flywheel.api.layout.ValueRepr; +import dev.engine_room.flywheel.api.layout.VectorElementType; record VectorElementTypeImpl(ValueRepr repr, @Range(from = 2, to = 4) int size, int byteSize, int byteAlignment) implements VectorElementType { diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/BlockEntityTypeMixin.java b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/BlockEntityTypeMixin.java index fb7ee2574..7b7921233 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/BlockEntityTypeMixin.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/BlockEntityTypeMixin.java @@ -1,11 +1,11 @@ -package com.jozufozu.flywheel.impl.mixin; +package dev.engine_room.flywheel.impl.mixin; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; -import com.jozufozu.flywheel.api.visualization.BlockEntityVisualizer; -import com.jozufozu.flywheel.impl.extension.BlockEntityTypeExtension; +import dev.engine_room.flywheel.api.visualization.BlockEntityVisualizer; +import dev.engine_room.flywheel.impl.extension.BlockEntityTypeExtension; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/ClientChunkCacheMixin.java b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/ClientChunkCacheMixin.java index 30532a337..d12415179 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/ClientChunkCacheMixin.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/ClientChunkCacheMixin.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.mixin; +package dev.engine_room.flywheel.impl.mixin; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -7,8 +7,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.jozufozu.flywheel.impl.visualization.VisualizationManagerImpl; - +import dev.engine_room.flywheel.impl.visualization.VisualizationManagerImpl; import net.minecraft.client.multiplayer.ClientChunkCache; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.SectionPos; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/ClientLevelMixin.java b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/ClientLevelMixin.java index 9b57dc8eb..556e4869f 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/ClientLevelMixin.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/ClientLevelMixin.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.mixin; +package dev.engine_room.flywheel.impl.mixin; import java.util.ArrayList; @@ -8,9 +8,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import com.google.common.collect.Lists; -import com.jozufozu.flywheel.api.visualization.VisualizationManager; -import com.jozufozu.flywheel.lib.visual.VisualizationHelper; +import dev.engine_room.flywheel.api.visualization.VisualizationManager; +import dev.engine_room.flywheel.lib.visual.VisualizationHelper; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.world.entity.Entity; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/EntityTypeMixin.java b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/EntityTypeMixin.java index d21881db2..e8b605a32 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/EntityTypeMixin.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/EntityTypeMixin.java @@ -1,12 +1,11 @@ -package com.jozufozu.flywheel.impl.mixin; +package dev.engine_room.flywheel.impl.mixin; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; -import com.jozufozu.flywheel.api.visualization.EntityVisualizer; -import com.jozufozu.flywheel.impl.extension.EntityTypeExtension; - +import dev.engine_room.flywheel.api.visualization.EntityVisualizer; +import dev.engine_room.flywheel.impl.extension.EntityTypeExtension; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/LevelMixin.java b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/LevelMixin.java index f6a80dde7..024cb530a 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/LevelMixin.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/LevelMixin.java @@ -1,10 +1,9 @@ -package com.jozufozu.flywheel.impl.mixin; +package dev.engine_room.flywheel.impl.mixin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import com.jozufozu.flywheel.impl.extension.LevelExtension; - +import dev.engine_room.flywheel.impl.extension.LevelExtension; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.Level; import net.minecraft.world.level.entity.LevelEntityGetter; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/LevelRendererMixin.java b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/LevelRendererMixin.java index d9afd8992..9cbcf2790 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/LevelRendererMixin.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/LevelRendererMixin.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.mixin; +package dev.engine_room.flywheel.impl.mixin; import java.util.SortedSet; @@ -15,12 +15,12 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.jozufozu.flywheel.api.event.RenderStage; -import com.jozufozu.flywheel.impl.FlwImplXplat; -import com.jozufozu.flywheel.impl.event.RenderContextImpl; -import com.jozufozu.flywheel.impl.visualization.VisualizationManagerImpl; import com.mojang.blaze3d.vertex.PoseStack; +import dev.engine_room.flywheel.api.event.RenderStage; +import dev.engine_room.flywheel.impl.FlwImplXplat; +import dev.engine_room.flywheel.impl.event.RenderContextImpl; +import dev.engine_room.flywheel.impl.visualization.VisualizationManagerImpl; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import net.minecraft.client.Camera; import net.minecraft.client.multiplayer.ClientLevel; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/PoseStackMixin.java b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/PoseStackMixin.java index a1d1a0337..89cc0fef2 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/PoseStackMixin.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/PoseStackMixin.java @@ -1,12 +1,13 @@ -package com.jozufozu.flywheel.impl.mixin; +package dev.engine_room.flywheel.impl.mixin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; -import com.jozufozu.flywheel.impl.extension.PoseStackExtension; -import com.jozufozu.flywheel.lib.transform.PoseTransformStack; import com.mojang.blaze3d.vertex.PoseStack; +import dev.engine_room.flywheel.impl.extension.PoseStackExtension; +import dev.engine_room.flywheel.lib.transform.PoseTransformStack; + @Mixin(PoseStack.class) abstract class PoseStackMixin implements PoseStackExtension { @Unique diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/VertexFormatMixin.java b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/VertexFormatMixin.java index 8e2043373..cd5ab7653 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/VertexFormatMixin.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/VertexFormatMixin.java @@ -1,12 +1,13 @@ -package com.jozufozu.flywheel.impl.mixin; +package dev.engine_room.flywheel.impl.mixin; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; -import com.jozufozu.flywheel.api.vertex.VertexViewProvider; -import com.jozufozu.flywheel.impl.extension.VertexFormatExtension; import com.mojang.blaze3d.vertex.VertexFormat; +import dev.engine_room.flywheel.api.vertex.VertexViewProvider; +import dev.engine_room.flywheel.impl.extension.VertexFormatExtension; + @Mixin(VertexFormat.class) abstract class VertexFormatMixin implements VertexFormatExtension { @Unique diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/fix/FixFabulousDepthMixin.java b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/fix/FixFabulousDepthMixin.java index e617dbdfc..e8c79651d 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/fix/FixFabulousDepthMixin.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/fix/FixFabulousDepthMixin.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.mixin.fix; +package dev.engine_room.flywheel.impl.mixin.fix; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/fix/FixNormalScalingMixin.java b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/fix/FixNormalScalingMixin.java index 36abaff18..f6a9ca887 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/fix/FixNormalScalingMixin.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/fix/FixNormalScalingMixin.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.mixin.fix; +package dev.engine_room.flywheel.impl.mixin.fix; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/visualmanage/BlockEntityMixin.java b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/visualmanage/BlockEntityMixin.java index 201b03d6b..b6d1ab508 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/visualmanage/BlockEntityMixin.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/visualmanage/BlockEntityMixin.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.mixin.visualmanage; +package dev.engine_room.flywheel.impl.mixin.visualmanage; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.jozufozu.flywheel.api.visualization.VisualizationManager; +import dev.engine_room.flywheel.api.visualization.VisualizationManager; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/visualmanage/LevelChunkMixin.java b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/visualmanage/LevelChunkMixin.java index 011b76c8a..0486fd366 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/visualmanage/LevelChunkMixin.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/visualmanage/LevelChunkMixin.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.mixin.visualmanage; +package dev.engine_room.flywheel.impl.mixin.visualmanage; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.jozufozu.flywheel.api.visualization.VisualizationManager; +import dev.engine_room.flywheel.api.visualization.VisualizationManager; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/visualmanage/LevelRendererMixin.java b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/visualmanage/LevelRendererMixin.java index 8b00b1b76..675211b67 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/visualmanage/LevelRendererMixin.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/visualmanage/LevelRendererMixin.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.mixin.visualmanage; +package dev.engine_room.flywheel.impl.mixin.visualmanage; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.jozufozu.flywheel.api.visualization.VisualizationManager; +import dev.engine_room.flywheel.api.visualization.VisualizationManager; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.LevelRenderer; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/visualmanage/RebuildTaskMixin.java b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/visualmanage/RebuildTaskMixin.java index 32344d211..203bb40de 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/visualmanage/RebuildTaskMixin.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/visualmanage/RebuildTaskMixin.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.mixin.visualmanage; +package dev.engine_room.flywheel.impl.mixin.visualmanage; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.jozufozu.flywheel.lib.visual.VisualizationHelper; +import dev.engine_room.flywheel.lib.visual.VisualizationHelper; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/registry/IdRegistryImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/registry/IdRegistryImpl.java index d247c15ca..528668789 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/registry/IdRegistryImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/registry/IdRegistryImpl.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.registry; +package dev.engine_room.flywheel.impl.registry; import java.util.Collection; import java.util.Iterator; @@ -8,8 +8,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; -import com.jozufozu.flywheel.api.registry.IdRegistry; - +import dev.engine_room.flywheel.api.registry.IdRegistry; import it.unimi.dsi.fastutil.objects.Object2ReferenceMap; import it.unimi.dsi.fastutil.objects.Object2ReferenceMaps; import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/registry/RegistryImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/registry/RegistryImpl.java index 75f8feaa3..c6b6db1a2 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/registry/RegistryImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/registry/RegistryImpl.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.registry; +package dev.engine_room.flywheel.impl.registry; import java.util.Iterator; import java.util.Set; @@ -6,8 +6,7 @@ import org.jetbrains.annotations.Unmodifiable; -import com.jozufozu.flywheel.api.registry.Registry; - +import dev.engine_room.flywheel.api.registry.Registry; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import it.unimi.dsi.fastutil.objects.ObjectList; import it.unimi.dsi.fastutil.objects.ObjectLists; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/task/FlwTaskExecutor.java b/common/src/main/java/dev/engine_room/flywheel/impl/task/FlwTaskExecutor.java index 470cb97e5..491b1f371 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/task/FlwTaskExecutor.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/task/FlwTaskExecutor.java @@ -1,12 +1,12 @@ -package com.jozufozu.flywheel.impl.task; +package dev.engine_room.flywheel.impl.task; import org.apache.commons.lang3.concurrent.AtomicSafeInitializer; import org.apache.commons.lang3.concurrent.ConcurrentUtils; -import com.jozufozu.flywheel.api.task.TaskExecutor; -import com.jozufozu.flywheel.impl.FlwConfig; import com.mojang.blaze3d.systems.RenderSystem; +import dev.engine_room.flywheel.api.task.TaskExecutor; +import dev.engine_room.flywheel.impl.FlwConfig; import net.minecraft.util.Mth; public final class FlwTaskExecutor { diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/task/ParallelTaskExecutor.java b/common/src/main/java/dev/engine_room/flywheel/impl/task/ParallelTaskExecutor.java index eb1e38282..6df75cc2c 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/task/ParallelTaskExecutor.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/task/ParallelTaskExecutor.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.task; +package dev.engine_room.flywheel.impl.task; import java.util.ArrayList; import java.util.Deque; @@ -9,9 +9,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.BooleanSupplier; -import com.jozufozu.flywheel.api.task.TaskExecutor; -import com.jozufozu.flywheel.impl.FlwImpl; - +import dev.engine_room.flywheel.api.task.TaskExecutor; +import dev.engine_room.flywheel.impl.FlwImpl; import net.minecraft.util.Mth; // https://github.com/CaffeineMC/sodium-fabric/blob/5d364ed5ba63f9067fcf72a078ca310bff4db3e9/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/compile/ChunkBuilder.java diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/task/SerialTaskExecutor.java b/common/src/main/java/dev/engine_room/flywheel/impl/task/SerialTaskExecutor.java index 44639c362..15fec1462 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/task/SerialTaskExecutor.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/task/SerialTaskExecutor.java @@ -1,8 +1,8 @@ -package com.jozufozu.flywheel.impl.task; +package dev.engine_room.flywheel.impl.task; import java.util.function.BooleanSupplier; -import com.jozufozu.flywheel.api.task.TaskExecutor; +import dev.engine_room.flywheel.api.task.TaskExecutor; public class SerialTaskExecutor implements TaskExecutor { public static final SerialTaskExecutor INSTANCE = new SerialTaskExecutor(); diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/task/ThreadGroupNotifier.java b/common/src/main/java/dev/engine_room/flywheel/impl/task/ThreadGroupNotifier.java index 03c79124a..32401b0ed 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/task/ThreadGroupNotifier.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/task/ThreadGroupNotifier.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.task; +package dev.engine_room.flywheel.impl.task; /** * Thin wrapper around Java's built-in object synchronization primitives. diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/task/WaitGroup.java b/common/src/main/java/dev/engine_room/flywheel/impl/task/WaitGroup.java index 4c27d960c..2e2b312a6 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/task/WaitGroup.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/task/WaitGroup.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.task; +package dev.engine_room.flywheel.impl.task; import java.util.concurrent.atomic.AtomicInteger; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/vertex/InferredVertexFormatInfo.java b/common/src/main/java/dev/engine_room/flywheel/impl/vertex/InferredVertexFormatInfo.java index d0222ad75..7990cc20c 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/vertex/InferredVertexFormatInfo.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/vertex/InferredVertexFormatInfo.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.vertex; +package dev.engine_room.flywheel.impl.vertex; import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.VertexFormat; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/vertex/InferredVertexView.java b/common/src/main/java/dev/engine_room/flywheel/impl/vertex/InferredVertexView.java index 478f75f4d..6503ba21f 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/vertex/InferredVertexView.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/vertex/InferredVertexView.java @@ -1,12 +1,12 @@ -package com.jozufozu.flywheel.impl.vertex; +package dev.engine_room.flywheel.impl.vertex; import org.lwjgl.system.MemoryUtil; -import com.jozufozu.flywheel.api.vertex.VertexView; -import com.jozufozu.flywheel.lib.math.RenderMath; -import com.jozufozu.flywheel.lib.vertex.AbstractVertexView; import com.mojang.blaze3d.vertex.VertexFormat; +import dev.engine_room.flywheel.api.vertex.VertexView; +import dev.engine_room.flywheel.lib.math.RenderMath; +import dev.engine_room.flywheel.lib.vertex.AbstractVertexView; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.texture.OverlayTexture; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/vertex/InferredVertexViewProvider.java b/common/src/main/java/dev/engine_room/flywheel/impl/vertex/InferredVertexViewProvider.java index ea4ce9fec..9cf24cdde 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/vertex/InferredVertexViewProvider.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/vertex/InferredVertexViewProvider.java @@ -1,9 +1,10 @@ -package com.jozufozu.flywheel.impl.vertex; +package dev.engine_room.flywheel.impl.vertex; -import com.jozufozu.flywheel.api.vertex.VertexView; -import com.jozufozu.flywheel.api.vertex.VertexViewProvider; import com.mojang.blaze3d.vertex.VertexFormat; +import dev.engine_room.flywheel.api.vertex.VertexView; +import dev.engine_room.flywheel.api.vertex.VertexViewProvider; + public class InferredVertexViewProvider implements VertexViewProvider { private final InferredVertexFormatInfo formatInfo; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/vertex/VertexViewProviderRegistryImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/vertex/VertexViewProviderRegistryImpl.java index 539714a9d..451886018 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/vertex/VertexViewProviderRegistryImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/vertex/VertexViewProviderRegistryImpl.java @@ -1,9 +1,10 @@ -package com.jozufozu.flywheel.impl.vertex; +package dev.engine_room.flywheel.impl.vertex; -import com.jozufozu.flywheel.api.vertex.VertexViewProvider; -import com.jozufozu.flywheel.impl.extension.VertexFormatExtension; import com.mojang.blaze3d.vertex.VertexFormat; +import dev.engine_room.flywheel.api.vertex.VertexViewProvider; +import dev.engine_room.flywheel.impl.extension.VertexFormatExtension; + // TODO: Add freezing public final class VertexViewProviderRegistryImpl { private VertexViewProviderRegistryImpl() { diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/visual/DynamicVisualContextImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/visual/DynamicVisualContextImpl.java index 6b729d94c..09803bdae 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/visual/DynamicVisualContextImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/visual/DynamicVisualContextImpl.java @@ -1,10 +1,9 @@ -package com.jozufozu.flywheel.impl.visual; +package dev.engine_room.flywheel.impl.visual; import org.joml.FrustumIntersection; -import com.jozufozu.flywheel.api.visual.DistanceUpdateLimiter; -import com.jozufozu.flywheel.api.visual.DynamicVisual; - +import dev.engine_room.flywheel.api.visual.DistanceUpdateLimiter; +import dev.engine_room.flywheel.api.visual.DynamicVisual; import net.minecraft.client.Camera; public record DynamicVisualContextImpl(Camera camera, FrustumIntersection frustum, float partialTick, diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/visual/TickableVisualContextImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/visual/TickableVisualContextImpl.java index c613d37ff..3dcc4d474 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/visual/TickableVisualContextImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/visual/TickableVisualContextImpl.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.impl.visual; +package dev.engine_room.flywheel.impl.visual; -import com.jozufozu.flywheel.api.visual.TickableVisual; +import dev.engine_room.flywheel.api.visual.TickableVisual; public enum TickableVisualContextImpl implements TickableVisual.Context { INSTANCE diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/VisualizationEventHandler.java b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/VisualizationEventHandler.java index 15f1102de..07aa71c67 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/VisualizationEventHandler.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/VisualizationEventHandler.java @@ -1,9 +1,8 @@ -package com.jozufozu.flywheel.impl.visualization; - -import com.jozufozu.flywheel.api.event.RenderContext; -import com.jozufozu.flywheel.api.event.RenderStage; -import com.jozufozu.flywheel.api.visualization.VisualizationManager; +package dev.engine_room.flywheel.impl.visualization; +import dev.engine_room.flywheel.api.event.RenderContext; +import dev.engine_room.flywheel.api.event.RenderStage; +import dev.engine_room.flywheel.api.visualization.VisualizationManager; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.world.entity.Entity; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/VisualizationManagerImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/VisualizationManagerImpl.java index 300621739..e0accaf2d 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/VisualizationManagerImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/VisualizationManagerImpl.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.visualization; +package dev.engine_room.flywheel.impl.visualization; import java.util.ArrayList; import java.util.List; @@ -10,41 +10,40 @@ import org.joml.FrustumIntersection; import org.joml.Matrix4f; -import com.jozufozu.flywheel.api.backend.BackendManager; -import com.jozufozu.flywheel.api.backend.Engine; -import com.jozufozu.flywheel.api.event.RenderContext; -import com.jozufozu.flywheel.api.event.RenderStage; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.api.task.TaskExecutor; -import com.jozufozu.flywheel.api.visual.DynamicVisual; -import com.jozufozu.flywheel.api.visual.Effect; -import com.jozufozu.flywheel.api.visual.TickableVisual; -import com.jozufozu.flywheel.api.visualization.VisualManager; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; -import com.jozufozu.flywheel.api.visualization.VisualizationLevel; -import com.jozufozu.flywheel.api.visualization.VisualizationManager; -import com.jozufozu.flywheel.impl.FlwConfig; -import com.jozufozu.flywheel.impl.extension.LevelExtension; -import com.jozufozu.flywheel.impl.task.FlwTaskExecutor; -import com.jozufozu.flywheel.impl.visual.DynamicVisualContextImpl; -import com.jozufozu.flywheel.impl.visual.TickableVisualContextImpl; -import com.jozufozu.flywheel.impl.visualization.manager.BlockEntityStorage; -import com.jozufozu.flywheel.impl.visualization.manager.EffectStorage; -import com.jozufozu.flywheel.impl.visualization.manager.EntityStorage; -import com.jozufozu.flywheel.impl.visualization.manager.VisualManagerImpl; -import com.jozufozu.flywheel.impl.visualization.ratelimit.BandedPrimeLimiter; -import com.jozufozu.flywheel.impl.visualization.ratelimit.DistanceUpdateLimiterImpl; -import com.jozufozu.flywheel.impl.visualization.ratelimit.NonLimiter; -import com.jozufozu.flywheel.lib.task.Flag; -import com.jozufozu.flywheel.lib.task.IfElsePlan; -import com.jozufozu.flywheel.lib.task.MapContextPlan; -import com.jozufozu.flywheel.lib.task.NamedFlag; -import com.jozufozu.flywheel.lib.task.NestedPlan; -import com.jozufozu.flywheel.lib.task.RaisePlan; -import com.jozufozu.flywheel.lib.task.SimplePlan; -import com.jozufozu.flywheel.lib.util.LevelAttached; - +import dev.engine_room.flywheel.api.backend.BackendManager; +import dev.engine_room.flywheel.api.backend.Engine; +import dev.engine_room.flywheel.api.event.RenderContext; +import dev.engine_room.flywheel.api.event.RenderStage; +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.task.TaskExecutor; +import dev.engine_room.flywheel.api.visual.DynamicVisual; +import dev.engine_room.flywheel.api.visual.Effect; +import dev.engine_room.flywheel.api.visual.TickableVisual; +import dev.engine_room.flywheel.api.visualization.VisualManager; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.api.visualization.VisualizationLevel; +import dev.engine_room.flywheel.api.visualization.VisualizationManager; +import dev.engine_room.flywheel.impl.FlwConfig; +import dev.engine_room.flywheel.impl.extension.LevelExtension; +import dev.engine_room.flywheel.impl.task.FlwTaskExecutor; +import dev.engine_room.flywheel.impl.visual.DynamicVisualContextImpl; +import dev.engine_room.flywheel.impl.visual.TickableVisualContextImpl; +import dev.engine_room.flywheel.impl.visualization.manager.BlockEntityStorage; +import dev.engine_room.flywheel.impl.visualization.manager.EffectStorage; +import dev.engine_room.flywheel.impl.visualization.manager.EntityStorage; +import dev.engine_room.flywheel.impl.visualization.manager.VisualManagerImpl; +import dev.engine_room.flywheel.impl.visualization.ratelimit.BandedPrimeLimiter; +import dev.engine_room.flywheel.impl.visualization.ratelimit.DistanceUpdateLimiterImpl; +import dev.engine_room.flywheel.impl.visualization.ratelimit.NonLimiter; +import dev.engine_room.flywheel.lib.task.Flag; +import dev.engine_room.flywheel.lib.task.IfElsePlan; +import dev.engine_room.flywheel.lib.task.MapContextPlan; +import dev.engine_room.flywheel.lib.task.NamedFlag; +import dev.engine_room.flywheel.lib.task.NestedPlan; +import dev.engine_room.flywheel.lib.task.RaisePlan; +import dev.engine_room.flywheel.lib.task.SimplePlan; +import dev.engine_room.flywheel.lib.util.LevelAttached; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import net.minecraft.client.Minecraft; import net.minecraft.core.Vec3i; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/VisualizerRegistryImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/VisualizerRegistryImpl.java index c9b3f3031..b78562b0b 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/VisualizerRegistryImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/VisualizerRegistryImpl.java @@ -1,12 +1,11 @@ -package com.jozufozu.flywheel.impl.visualization; +package dev.engine_room.flywheel.impl.visualization; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.visualization.BlockEntityVisualizer; -import com.jozufozu.flywheel.api.visualization.EntityVisualizer; -import com.jozufozu.flywheel.impl.extension.BlockEntityTypeExtension; -import com.jozufozu.flywheel.impl.extension.EntityTypeExtension; - +import dev.engine_room.flywheel.api.visualization.BlockEntityVisualizer; +import dev.engine_room.flywheel.api.visualization.EntityVisualizer; +import dev.engine_room.flywheel.impl.extension.BlockEntityTypeExtension; +import dev.engine_room.flywheel.impl.extension.EntityTypeExtension; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/manager/BlockEntityStorage.java b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/manager/BlockEntityStorage.java index 9d27e41da..b61a3824f 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/manager/BlockEntityStorage.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/manager/BlockEntityStorage.java @@ -1,15 +1,14 @@ -package com.jozufozu.flywheel.impl.visualization.manager; +package dev.engine_room.flywheel.impl.visualization.manager; import java.util.function.Supplier; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.visual.BlockEntityVisual; -import com.jozufozu.flywheel.api.visual.Visual; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; -import com.jozufozu.flywheel.lib.visual.VisualizationHelper; -import com.jozufozu.flywheel.impl.visualization.storage.Storage; - +import dev.engine_room.flywheel.api.visual.BlockEntityVisual; +import dev.engine_room.flywheel.api.visual.Visual; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.impl.visualization.storage.Storage; +import dev.engine_room.flywheel.lib.visual.VisualizationHelper; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import net.minecraft.core.BlockPos; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/manager/EffectStorage.java b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/manager/EffectStorage.java index 14cee1e39..2d7816337 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/manager/EffectStorage.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/manager/EffectStorage.java @@ -1,11 +1,11 @@ -package com.jozufozu.flywheel.impl.visualization.manager; +package dev.engine_room.flywheel.impl.visualization.manager; import java.util.function.Supplier; -import com.jozufozu.flywheel.api.visual.Effect; -import com.jozufozu.flywheel.api.visual.EffectVisual; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; -import com.jozufozu.flywheel.impl.visualization.storage.Storage; +import dev.engine_room.flywheel.api.visual.Effect; +import dev.engine_room.flywheel.api.visual.EffectVisual; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.impl.visualization.storage.Storage; public class EffectStorage extends Storage { public EffectStorage(Supplier visualizationContextSupplier) { diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/manager/EntityStorage.java b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/manager/EntityStorage.java index 990f9314b..0d5666880 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/manager/EntityStorage.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/manager/EntityStorage.java @@ -1,14 +1,13 @@ -package com.jozufozu.flywheel.impl.visualization.manager; +package dev.engine_room.flywheel.impl.visualization.manager; import java.util.function.Supplier; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.visual.Visual; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; -import com.jozufozu.flywheel.lib.visual.VisualizationHelper; -import com.jozufozu.flywheel.impl.visualization.storage.Storage; - +import dev.engine_room.flywheel.api.visual.Visual; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.impl.visualization.storage.Storage; +import dev.engine_room.flywheel.lib.visual.VisualizationHelper; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.Level; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/manager/VisualManagerImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/manager/VisualManagerImpl.java index 2bbf64382..800714cb5 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/manager/VisualManagerImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/manager/VisualManagerImpl.java @@ -1,15 +1,15 @@ -package com.jozufozu.flywheel.impl.visualization.manager; +package dev.engine_room.flywheel.impl.visualization.manager; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.api.visual.DynamicVisual; -import com.jozufozu.flywheel.api.visual.TickableVisual; -import com.jozufozu.flywheel.api.visualization.VisualManager; -import com.jozufozu.flywheel.impl.visualization.storage.Storage; -import com.jozufozu.flywheel.impl.visualization.storage.Transaction; -import com.jozufozu.flywheel.lib.task.SimplePlan; +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.visual.DynamicVisual; +import dev.engine_room.flywheel.api.visual.TickableVisual; +import dev.engine_room.flywheel.api.visualization.VisualManager; +import dev.engine_room.flywheel.impl.visualization.storage.Storage; +import dev.engine_room.flywheel.impl.visualization.storage.Transaction; +import dev.engine_room.flywheel.lib.task.SimplePlan; public class VisualManagerImpl> implements VisualManager { private final Queue> queue = new ConcurrentLinkedQueue<>(); diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/ratelimit/BandedPrimeLimiter.java b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/ratelimit/BandedPrimeLimiter.java index 640332755..37678eb00 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/ratelimit/BandedPrimeLimiter.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/ratelimit/BandedPrimeLimiter.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.visualization.ratelimit; +package dev.engine_room.flywheel.impl.visualization.ratelimit; import net.minecraft.util.Mth; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/ratelimit/DistanceUpdateLimiterImpl.java b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/ratelimit/DistanceUpdateLimiterImpl.java index 4a11cb2c1..f6d43cdb4 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/ratelimit/DistanceUpdateLimiterImpl.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/ratelimit/DistanceUpdateLimiterImpl.java @@ -1,6 +1,6 @@ -package com.jozufozu.flywheel.impl.visualization.ratelimit; +package dev.engine_room.flywheel.impl.visualization.ratelimit; -import com.jozufozu.flywheel.api.visual.DistanceUpdateLimiter; +import dev.engine_room.flywheel.api.visual.DistanceUpdateLimiter; public interface DistanceUpdateLimiterImpl extends DistanceUpdateLimiter { /** diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/ratelimit/NonLimiter.java b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/ratelimit/NonLimiter.java index c16b722e0..690fe4f09 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/ratelimit/NonLimiter.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/ratelimit/NonLimiter.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.visualization.ratelimit; +package dev.engine_room.flywheel.impl.visualization.ratelimit; public class NonLimiter implements DistanceUpdateLimiterImpl { @Override diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/storage/Action.java b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/storage/Action.java index aa54498e8..c62f67e12 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/storage/Action.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/storage/Action.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.visualization.storage; +package dev.engine_room.flywheel.impl.visualization.storage; public enum Action { ADD, diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/storage/LitVisualStorage.java b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/storage/LitVisualStorage.java index b61c38d4a..884a5f759 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/storage/LitVisualStorage.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/storage/LitVisualStorage.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.visualization.storage; +package dev.engine_room.flywheel.impl.visualization.storage; import java.util.List; import java.util.Map; @@ -7,14 +7,13 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicLong; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.api.task.TaskExecutor; -import com.jozufozu.flywheel.api.visual.DynamicVisual; -import com.jozufozu.flywheel.api.visual.LitVisual; -import com.jozufozu.flywheel.lib.task.Distribute; -import com.jozufozu.flywheel.lib.task.SimplyComposedPlan; -import com.jozufozu.flywheel.lib.task.Synchronizer; - +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.task.TaskExecutor; +import dev.engine_room.flywheel.api.visual.DynamicVisual; +import dev.engine_room.flywheel.api.visual.LitVisual; +import dev.engine_room.flywheel.lib.task.Distribute; +import dev.engine_room.flywheel.lib.task.SimplyComposedPlan; +import dev.engine_room.flywheel.lib.task.Synchronizer; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import it.unimi.dsi.fastutil.longs.LongArraySet; diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/storage/Storage.java b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/storage/Storage.java index 266ed7c71..1c245e499 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/storage/Storage.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/storage/Storage.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.visualization.storage; +package dev.engine_room.flywheel.impl.visualization.storage; import java.util.ArrayList; import java.util.Collection; @@ -8,18 +8,17 @@ import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.api.visual.DynamicVisual; -import com.jozufozu.flywheel.api.visual.LitVisual; -import com.jozufozu.flywheel.api.visual.TickableVisual; -import com.jozufozu.flywheel.api.visual.Visual; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; -import com.jozufozu.flywheel.lib.task.ForEachPlan; -import com.jozufozu.flywheel.lib.task.NestedPlan; -import com.jozufozu.flywheel.lib.task.PlanMap; -import com.jozufozu.flywheel.lib.visual.SimpleDynamicVisual; -import com.jozufozu.flywheel.lib.visual.SimpleTickableVisual; - +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.api.visual.DynamicVisual; +import dev.engine_room.flywheel.api.visual.LitVisual; +import dev.engine_room.flywheel.api.visual.TickableVisual; +import dev.engine_room.flywheel.api.visual.Visual; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.lib.task.ForEachPlan; +import dev.engine_room.flywheel.lib.task.NestedPlan; +import dev.engine_room.flywheel.lib.task.PlanMap; +import dev.engine_room.flywheel.lib.visual.SimpleDynamicVisual; +import dev.engine_room.flywheel.lib.visual.SimpleTickableVisual; import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap; public abstract class Storage { diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/storage/Transaction.java b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/storage/Transaction.java index b50ba0cbd..26dbd6c86 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/visualization/storage/Transaction.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/visualization/storage/Transaction.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.visualization.storage; +package dev.engine_room.flywheel.impl.visualization.storage; public record Transaction(T obj, Action action) { public static Transaction add(T obj) { diff --git a/common/src/main/java/dev/engine_room/flywheel/vanilla/BellVisual.java b/common/src/main/java/dev/engine_room/flywheel/vanilla/BellVisual.java index 5c0f1ce80..12ae9fcd4 100644 --- a/common/src/main/java/dev/engine_room/flywheel/vanilla/BellVisual.java +++ b/common/src/main/java/dev/engine_room/flywheel/vanilla/BellVisual.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.vanilla; +package dev.engine_room.flywheel.vanilla; import java.util.function.Consumer; @@ -6,17 +6,16 @@ import org.joml.Quaternionf; import org.joml.Vector3f; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; -import com.jozufozu.flywheel.lib.instance.InstanceTypes; -import com.jozufozu.flywheel.lib.instance.OrientedInstance; -import com.jozufozu.flywheel.lib.material.Materials; -import com.jozufozu.flywheel.lib.model.ModelHolder; -import com.jozufozu.flywheel.lib.model.SingleMeshModel; -import com.jozufozu.flywheel.lib.model.part.ModelPartConverter; -import com.jozufozu.flywheel.lib.visual.AbstractBlockEntityVisual; -import com.jozufozu.flywheel.lib.visual.SimpleDynamicVisual; - +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.lib.instance.InstanceTypes; +import dev.engine_room.flywheel.lib.instance.OrientedInstance; +import dev.engine_room.flywheel.lib.material.Materials; +import dev.engine_room.flywheel.lib.model.ModelHolder; +import dev.engine_room.flywheel.lib.model.SingleMeshModel; +import dev.engine_room.flywheel.lib.model.part.ModelPartConverter; +import dev.engine_room.flywheel.lib.visual.AbstractBlockEntityVisual; +import dev.engine_room.flywheel.lib.visual.SimpleDynamicVisual; import net.minecraft.client.model.geom.ModelLayers; import net.minecraft.client.renderer.blockentity.BellRenderer; import net.minecraft.util.Mth; diff --git a/common/src/main/java/dev/engine_room/flywheel/vanilla/ChestVisual.java b/common/src/main/java/dev/engine_room/flywheel/vanilla/ChestVisual.java index f03b19ae9..42c31200e 100644 --- a/common/src/main/java/dev/engine_room/flywheel/vanilla/ChestVisual.java +++ b/common/src/main/java/dev/engine_room/flywheel/vanilla/ChestVisual.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.vanilla; +package dev.engine_room.flywheel.vanilla; import java.util.Calendar; import java.util.EnumMap; @@ -7,19 +7,18 @@ import org.joml.Quaternionf; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; -import com.jozufozu.flywheel.lib.instance.InstanceTypes; -import com.jozufozu.flywheel.lib.instance.OrientedInstance; -import com.jozufozu.flywheel.lib.instance.TransformedInstance; -import com.jozufozu.flywheel.lib.material.Materials; -import com.jozufozu.flywheel.lib.model.ModelCache; -import com.jozufozu.flywheel.lib.model.SingleMeshModel; -import com.jozufozu.flywheel.lib.model.part.ModelPartConverter; -import com.jozufozu.flywheel.lib.util.Pair; -import com.jozufozu.flywheel.lib.visual.AbstractBlockEntityVisual; -import com.jozufozu.flywheel.lib.visual.SimpleDynamicVisual; - +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.lib.instance.InstanceTypes; +import dev.engine_room.flywheel.lib.instance.OrientedInstance; +import dev.engine_room.flywheel.lib.instance.TransformedInstance; +import dev.engine_room.flywheel.lib.material.Materials; +import dev.engine_room.flywheel.lib.model.ModelCache; +import dev.engine_room.flywheel.lib.model.SingleMeshModel; +import dev.engine_room.flywheel.lib.model.part.ModelPartConverter; +import dev.engine_room.flywheel.lib.util.Pair; +import dev.engine_room.flywheel.lib.visual.AbstractBlockEntityVisual; +import dev.engine_room.flywheel.lib.visual.SimpleDynamicVisual; import it.unimi.dsi.fastutil.floats.Float2FloatFunction; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelLayers; diff --git a/common/src/main/java/dev/engine_room/flywheel/vanilla/MinecartVisual.java b/common/src/main/java/dev/engine_room/flywheel/vanilla/MinecartVisual.java index 54d4ca073..a4c27ee82 100644 --- a/common/src/main/java/dev/engine_room/flywheel/vanilla/MinecartVisual.java +++ b/common/src/main/java/dev/engine_room/flywheel/vanilla/MinecartVisual.java @@ -1,26 +1,26 @@ -package com.jozufozu.flywheel.vanilla; +package dev.engine_room.flywheel.vanilla; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.visual.DynamicVisual; -import com.jozufozu.flywheel.api.visual.TickableVisual; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; -import com.jozufozu.flywheel.lib.instance.InstanceTypes; -import com.jozufozu.flywheel.lib.instance.TransformedInstance; -import com.jozufozu.flywheel.lib.material.Materials; -import com.jozufozu.flywheel.lib.model.ModelHolder; -import com.jozufozu.flywheel.lib.model.Models; -import com.jozufozu.flywheel.lib.model.SingleMeshModel; -import com.jozufozu.flywheel.lib.model.part.ModelPartConverter; -import com.jozufozu.flywheel.lib.visual.SimpleDynamicVisual; -import com.jozufozu.flywheel.lib.visual.SimpleEntityVisual; -import com.jozufozu.flywheel.lib.visual.SimpleTickableVisual; -import com.jozufozu.flywheel.lib.visual.component.FireComponent; -import com.jozufozu.flywheel.lib.visual.component.HitboxComponent; -import com.jozufozu.flywheel.lib.visual.component.ShadowComponent; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; +import dev.engine_room.flywheel.api.visual.DynamicVisual; +import dev.engine_room.flywheel.api.visual.TickableVisual; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.lib.instance.InstanceTypes; +import dev.engine_room.flywheel.lib.instance.TransformedInstance; +import dev.engine_room.flywheel.lib.material.Materials; +import dev.engine_room.flywheel.lib.model.ModelHolder; +import dev.engine_room.flywheel.lib.model.Models; +import dev.engine_room.flywheel.lib.model.SingleMeshModel; +import dev.engine_room.flywheel.lib.model.part.ModelPartConverter; +import dev.engine_room.flywheel.lib.visual.SimpleDynamicVisual; +import dev.engine_room.flywheel.lib.visual.SimpleEntityVisual; +import dev.engine_room.flywheel.lib.visual.SimpleTickableVisual; +import dev.engine_room.flywheel.lib.visual.component.FireComponent; +import dev.engine_room.flywheel.lib.visual.component.HitboxComponent; +import dev.engine_room.flywheel.lib.visual.component.ShadowComponent; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelLayers; import net.minecraft.util.Mth; diff --git a/common/src/main/java/dev/engine_room/flywheel/vanilla/ShulkerBoxVisual.java b/common/src/main/java/dev/engine_room/flywheel/vanilla/ShulkerBoxVisual.java index 12eda7ca7..45b76ba87 100644 --- a/common/src/main/java/dev/engine_room/flywheel/vanilla/ShulkerBoxVisual.java +++ b/common/src/main/java/dev/engine_room/flywheel/vanilla/ShulkerBoxVisual.java @@ -1,23 +1,23 @@ -package com.jozufozu.flywheel.vanilla; +package dev.engine_room.flywheel.vanilla; import java.util.function.Consumer; import org.joml.Quaternionf; -import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; -import com.jozufozu.flywheel.lib.instance.InstanceTypes; -import com.jozufozu.flywheel.lib.instance.TransformedInstance; -import com.jozufozu.flywheel.lib.material.Materials; -import com.jozufozu.flywheel.lib.model.ModelCache; -import com.jozufozu.flywheel.lib.model.SingleMeshModel; -import com.jozufozu.flywheel.lib.model.part.ModelPartConverter; -import com.jozufozu.flywheel.lib.transform.TransformStack; -import com.jozufozu.flywheel.lib.visual.AbstractBlockEntityVisual; -import com.jozufozu.flywheel.lib.visual.SimpleDynamicVisual; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; +import dev.engine_room.flywheel.api.instance.Instance; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.lib.instance.InstanceTypes; +import dev.engine_room.flywheel.lib.instance.TransformedInstance; +import dev.engine_room.flywheel.lib.material.Materials; +import dev.engine_room.flywheel.lib.model.ModelCache; +import dev.engine_room.flywheel.lib.model.SingleMeshModel; +import dev.engine_room.flywheel.lib.model.part.ModelPartConverter; +import dev.engine_room.flywheel.lib.transform.TransformStack; +import dev.engine_room.flywheel.lib.visual.AbstractBlockEntityVisual; +import dev.engine_room.flywheel.lib.visual.SimpleDynamicVisual; import net.minecraft.client.model.geom.ModelLayers; import net.minecraft.client.renderer.Sheets; import net.minecraft.client.resources.model.Material; diff --git a/common/src/main/java/dev/engine_room/flywheel/vanilla/TntMinecartVisual.java b/common/src/main/java/dev/engine_room/flywheel/vanilla/TntMinecartVisual.java index 8ff42576f..bf83d0fb3 100644 --- a/common/src/main/java/dev/engine_room/flywheel/vanilla/TntMinecartVisual.java +++ b/common/src/main/java/dev/engine_room/flywheel/vanilla/TntMinecartVisual.java @@ -1,9 +1,9 @@ -package com.jozufozu.flywheel.vanilla; +package dev.engine_room.flywheel.vanilla; -import com.jozufozu.flywheel.api.visualization.VisualizationContext; -import com.jozufozu.flywheel.lib.instance.TransformedInstance; import com.mojang.blaze3d.vertex.PoseStack; +import dev.engine_room.flywheel.api.visualization.VisualizationContext; +import dev.engine_room.flywheel.lib.instance.TransformedInstance; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.util.Mth; import net.minecraft.world.entity.vehicle.MinecartTNT; diff --git a/common/src/main/java/dev/engine_room/flywheel/vanilla/VanillaVisuals.java b/common/src/main/java/dev/engine_room/flywheel/vanilla/VanillaVisuals.java index 3e123d1dd..f39a0a186 100644 --- a/common/src/main/java/dev/engine_room/flywheel/vanilla/VanillaVisuals.java +++ b/common/src/main/java/dev/engine_room/flywheel/vanilla/VanillaVisuals.java @@ -1,7 +1,7 @@ -package com.jozufozu.flywheel.vanilla; +package dev.engine_room.flywheel.vanilla; -import static com.jozufozu.flywheel.lib.visual.SimpleBlockEntityVisualizer.builder; -import static com.jozufozu.flywheel.lib.visual.SimpleEntityVisualizer.builder; +import static dev.engine_room.flywheel.lib.visual.SimpleBlockEntityVisualizer.builder; +import static dev.engine_room.flywheel.lib.visual.SimpleEntityVisualizer.builder; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.entity.BlockEntityType; diff --git a/common/src/main/resources/flywheel.impl.mixins.json b/common/src/main/resources/flywheel.impl.mixins.json index 545e99a3a..ea7474cb8 100644 --- a/common/src/main/resources/flywheel.impl.mixins.json +++ b/common/src/main/resources/flywheel.impl.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "com.jozufozu.flywheel.impl.mixin", + "package": "dev.engine_room.flywheel.impl.mixin", "compatibilityLevel": "JAVA_17", "refmap": "flywheel.refmap.json", "client": [ diff --git a/common/src/test/java/dev/engine_room/flywheel/backend/glsl/MockShaderSources.java b/common/src/test/java/dev/engine_room/flywheel/backend/glsl/MockShaderSources.java index 19d660ddd..df1339621 100644 --- a/common/src/test/java/dev/engine_room/flywheel/backend/glsl/MockShaderSources.java +++ b/common/src/test/java/dev/engine_room/flywheel/backend/glsl/MockShaderSources.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl; +package dev.engine_room.flywheel.backend.glsl; import java.io.FileNotFoundException; import java.util.HashMap; diff --git a/common/src/test/java/dev/engine_room/flywheel/backend/glsl/TestBase.java b/common/src/test/java/dev/engine_room/flywheel/backend/glsl/TestBase.java index 1d74bdebb..fe6be7887 100644 --- a/common/src/test/java/dev/engine_room/flywheel/backend/glsl/TestBase.java +++ b/common/src/test/java/dev/engine_room/flywheel/backend/glsl/TestBase.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl; +package dev.engine_room.flywheel.backend.glsl; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; @@ -6,8 +6,7 @@ import java.util.List; -import com.jozufozu.flywheel.api.Flywheel; - +import dev.engine_room.flywheel.api.Flywheel; import net.minecraft.resources.ResourceLocation; public class TestBase { diff --git a/common/src/test/java/dev/engine_room/flywheel/backend/glsl/TestErrorMessages.java b/common/src/test/java/dev/engine_room/flywheel/backend/glsl/TestErrorMessages.java index 58059a7f9..f1eff161d 100644 --- a/common/src/test/java/dev/engine_room/flywheel/backend/glsl/TestErrorMessages.java +++ b/common/src/test/java/dev/engine_room/flywheel/backend/glsl/TestErrorMessages.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl; +package dev.engine_room.flywheel.backend.glsl; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; @@ -6,8 +6,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import com.jozufozu.flywheel.backend.glsl.error.ErrorBuilder; - +import dev.engine_room.flywheel.backend.glsl.error.ErrorBuilder; import net.minecraft.resources.ResourceLocation; public class TestErrorMessages extends TestBase { diff --git a/common/src/test/java/dev/engine_room/flywheel/backend/glsl/TestShaderSourceLoading.java b/common/src/test/java/dev/engine_room/flywheel/backend/glsl/TestShaderSourceLoading.java index f976f9a6d..51bcccf91 100644 --- a/common/src/test/java/dev/engine_room/flywheel/backend/glsl/TestShaderSourceLoading.java +++ b/common/src/test/java/dev/engine_room/flywheel/backend/glsl/TestShaderSourceLoading.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.glsl; +package dev.engine_room.flywheel.backend.glsl; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; @@ -6,7 +6,8 @@ import org.junit.jupiter.api.Test; import com.google.common.collect.ImmutableList; -import com.jozufozu.flywheel.backend.glsl.parse.Import; + +import dev.engine_room.flywheel.backend.glsl.parse.Import; public class TestShaderSourceLoading extends TestBase { @Test diff --git a/common/src/test/java/dev/engine_room/flywheel/impl/task/WaitGroupTest.java b/common/src/test/java/dev/engine_room/flywheel/impl/task/WaitGroupTest.java index 4e829cff8..118d71e53 100644 --- a/common/src/test/java/dev/engine_room/flywheel/impl/task/WaitGroupTest.java +++ b/common/src/test/java/dev/engine_room/flywheel/impl/task/WaitGroupTest.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.task; +package dev.engine_room.flywheel.impl.task; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/common/src/test/java/dev/engine_room/flywheel/lib/task/PlanCompositionTest.java b/common/src/test/java/dev/engine_room/flywheel/lib/task/PlanCompositionTest.java index 3e00f5593..a7ff0f6f0 100644 --- a/common/src/test/java/dev/engine_room/flywheel/lib/task/PlanCompositionTest.java +++ b/common/src/test/java/dev/engine_room/flywheel/lib/task/PlanCompositionTest.java @@ -1,10 +1,10 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.lib.util.Unit; +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.lib.util.Unit; public class PlanCompositionTest { diff --git a/common/src/test/java/dev/engine_room/flywheel/lib/task/PlanExecutionTest.java b/common/src/test/java/dev/engine_room/flywheel/lib/task/PlanExecutionTest.java index 6315ec18d..7cb8ddd34 100644 --- a/common/src/test/java/dev/engine_room/flywheel/lib/task/PlanExecutionTest.java +++ b/common/src/test/java/dev/engine_room/flywheel/lib/task/PlanExecutionTest.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.task; +package dev.engine_room.flywheel.lib.task; import java.util.ArrayList; import java.util.List; @@ -13,11 +13,10 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import com.jozufozu.flywheel.api.task.Plan; -import com.jozufozu.flywheel.impl.task.ParallelTaskExecutor; -import com.jozufozu.flywheel.lib.task.functional.RunnableWithContext; -import com.jozufozu.flywheel.lib.util.Unit; - +import dev.engine_room.flywheel.api.task.Plan; +import dev.engine_room.flywheel.impl.task.ParallelTaskExecutor; +import dev.engine_room.flywheel.lib.task.functional.RunnableWithContext; +import dev.engine_room.flywheel.lib.util.Unit; import it.unimi.dsi.fastutil.ints.IntArrayList; class PlanExecutionTest { diff --git a/common/src/test/java/dev/engine_room/flywheel/lib/util/TestAtomicBitset.java b/common/src/test/java/dev/engine_room/flywheel/lib/util/TestAtomicBitset.java index 43b384da3..dd93838ac 100644 --- a/common/src/test/java/dev/engine_room/flywheel/lib/util/TestAtomicBitset.java +++ b/common/src/test/java/dev/engine_room/flywheel/lib/util/TestAtomicBitset.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.util; +package dev.engine_room.flywheel.lib.util; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/fabric/src/api/java/dev/engine_room/flywheel/api/event/BeginFrameCallback.java b/fabric/src/api/java/dev/engine_room/flywheel/api/event/BeginFrameCallback.java index 47d16fd95..ea044ae39 100644 --- a/fabric/src/api/java/dev/engine_room/flywheel/api/event/BeginFrameCallback.java +++ b/fabric/src/api/java/dev/engine_room/flywheel/api/event/BeginFrameCallback.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.event; +package dev.engine_room.flywheel.api.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric/src/api/java/dev/engine_room/flywheel/api/event/EndClientResourceReloadCallback.java b/fabric/src/api/java/dev/engine_room/flywheel/api/event/EndClientResourceReloadCallback.java index d6f1a8644..7a85484ae 100644 --- a/fabric/src/api/java/dev/engine_room/flywheel/api/event/EndClientResourceReloadCallback.java +++ b/fabric/src/api/java/dev/engine_room/flywheel/api/event/EndClientResourceReloadCallback.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.event; +package dev.engine_room.flywheel.api.event; import java.util.Optional; diff --git a/fabric/src/api/java/dev/engine_room/flywheel/api/event/ReloadLevelRendererCallback.java b/fabric/src/api/java/dev/engine_room/flywheel/api/event/ReloadLevelRendererCallback.java index a8b448c3d..7b225e414 100644 --- a/fabric/src/api/java/dev/engine_room/flywheel/api/event/ReloadLevelRendererCallback.java +++ b/fabric/src/api/java/dev/engine_room/flywheel/api/event/ReloadLevelRendererCallback.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.event; +package dev.engine_room.flywheel.api.event; import org.jetbrains.annotations.Nullable; diff --git a/fabric/src/api/java/dev/engine_room/flywheel/api/event/RenderStageCallback.java b/fabric/src/api/java/dev/engine_room/flywheel/api/event/RenderStageCallback.java index 64e8061ad..8ac881124 100644 --- a/fabric/src/api/java/dev/engine_room/flywheel/api/event/RenderStageCallback.java +++ b/fabric/src/api/java/dev/engine_room/flywheel/api/event/RenderStageCallback.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.event; +package dev.engine_room.flywheel.api.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/fabric/src/backend/java/dev/engine_room/flywheel/backend/FlwBackendXplatImpl.java b/fabric/src/backend/java/dev/engine_room/flywheel/backend/FlwBackendXplatImpl.java index 222c3c183..661f58bc7 100644 --- a/fabric/src/backend/java/dev/engine_room/flywheel/backend/FlwBackendXplatImpl.java +++ b/fabric/src/backend/java/dev/engine_room/flywheel/backend/FlwBackendXplatImpl.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend; +package dev.engine_room.flywheel.backend; import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockGetter; diff --git a/fabric/src/backend/java/dev/engine_room/flywheel/backend/compile/FlwProgramsReloader.java b/fabric/src/backend/java/dev/engine_room/flywheel/backend/compile/FlwProgramsReloader.java index 4d32525eb..1422ac19c 100644 --- a/fabric/src/backend/java/dev/engine_room/flywheel/backend/compile/FlwProgramsReloader.java +++ b/fabric/src/backend/java/dev/engine_room/flywheel/backend/compile/FlwProgramsReloader.java @@ -1,7 +1,6 @@ -package com.jozufozu.flywheel.backend.compile; - -import com.jozufozu.flywheel.api.Flywheel; +package dev.engine_room.flywheel.backend.compile; +import dev.engine_room.flywheel.api.Flywheel; import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.ResourceManager; diff --git a/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BakedModelBufferer.java b/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BakedModelBufferer.java index a0eb2302d..2f8a09ca6 100644 --- a/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BakedModelBufferer.java +++ b/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BakedModelBufferer.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import java.util.Iterator; diff --git a/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ChunkLayerSortedListBuilder.java b/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ChunkLayerSortedListBuilder.java index 5978d7729..eae9dad15 100644 --- a/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ChunkLayerSortedListBuilder.java +++ b/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ChunkLayerSortedListBuilder.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import java.util.List; diff --git a/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/FabricBakedModelBuilder.java b/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/FabricBakedModelBuilder.java index f853ac884..4245cb8e0 100644 --- a/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/FabricBakedModelBuilder.java +++ b/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/FabricBakedModelBuilder.java @@ -1,17 +1,17 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import java.util.function.BiFunction; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.api.model.Model; -import com.jozufozu.flywheel.api.vertex.VertexView; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; -import com.jozufozu.flywheel.lib.model.ModelUtil; -import com.jozufozu.flywheel.lib.model.SimpleMesh; -import com.jozufozu.flywheel.lib.model.SimpleModel; -import com.jozufozu.flywheel.lib.vertex.NoOverlayVertexView; import com.mojang.blaze3d.vertex.PoseStack; +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.api.model.Model; +import dev.engine_room.flywheel.api.vertex.VertexView; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; +import dev.engine_room.flywheel.lib.model.ModelUtil; +import dev.engine_room.flywheel.lib.model.SimpleMesh; +import dev.engine_room.flywheel.lib.model.SimpleModel; +import dev.engine_room.flywheel.lib.vertex.NoOverlayVertexView; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.world.level.BlockAndTintGetter; diff --git a/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/FabricBlockModelBuilder.java b/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/FabricBlockModelBuilder.java index a64144135..030f0893d 100644 --- a/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/FabricBlockModelBuilder.java +++ b/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/FabricBlockModelBuilder.java @@ -1,17 +1,17 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import java.util.function.BiFunction; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.api.model.Model; -import com.jozufozu.flywheel.api.vertex.VertexView; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; -import com.jozufozu.flywheel.lib.model.ModelUtil; -import com.jozufozu.flywheel.lib.model.SimpleMesh; -import com.jozufozu.flywheel.lib.model.SimpleModel; -import com.jozufozu.flywheel.lib.vertex.NoOverlayVertexView; import com.mojang.blaze3d.vertex.PoseStack; +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.api.model.Model; +import dev.engine_room.flywheel.api.vertex.VertexView; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; +import dev.engine_room.flywheel.lib.model.ModelUtil; +import dev.engine_room.flywheel.lib.model.SimpleMesh; +import dev.engine_room.flywheel.lib.model.SimpleModel; +import dev.engine_room.flywheel.lib.vertex.NoOverlayVertexView; import net.minecraft.client.renderer.RenderType; import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.block.state.BlockState; diff --git a/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/FabricMultiBlockModelBuilder.java b/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/FabricMultiBlockModelBuilder.java index 74a4f29f1..4be30322f 100644 --- a/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/FabricMultiBlockModelBuilder.java +++ b/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/FabricMultiBlockModelBuilder.java @@ -1,17 +1,17 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import java.util.function.BiFunction; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.api.model.Model; -import com.jozufozu.flywheel.api.vertex.VertexView; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; -import com.jozufozu.flywheel.lib.model.ModelUtil; -import com.jozufozu.flywheel.lib.model.SimpleMesh; -import com.jozufozu.flywheel.lib.model.SimpleModel; -import com.jozufozu.flywheel.lib.vertex.NoOverlayVertexView; import com.mojang.blaze3d.vertex.PoseStack; +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.api.model.Model; +import dev.engine_room.flywheel.api.vertex.VertexView; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; +import dev.engine_room.flywheel.lib.model.ModelUtil; +import dev.engine_room.flywheel.lib.model.SimpleMesh; +import dev.engine_room.flywheel.lib.model.SimpleModel; +import dev.engine_room.flywheel.lib.vertex.NoOverlayVertexView; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockAndTintGetter; diff --git a/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MeshEmitter.java b/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MeshEmitter.java index c443807af..3beaeacb0 100644 --- a/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MeshEmitter.java +++ b/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MeshEmitter.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import org.jetbrains.annotations.UnknownNullability; diff --git a/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModelEventHandler.java b/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModelEventHandler.java index a1d80cbd0..21f802f07 100644 --- a/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModelEventHandler.java +++ b/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModelEventHandler.java @@ -1,11 +1,10 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import java.util.List; import org.jetbrains.annotations.ApiStatus; -import com.jozufozu.flywheel.api.Flywheel; - +import dev.engine_room.flywheel.api.Flywheel; import net.fabricmc.fabric.api.resource.ResourceReloadListenerKeys; import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener; import net.minecraft.client.Minecraft; diff --git a/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/UniversalMeshEmitter.java b/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/UniversalMeshEmitter.java index d56633513..feb560bcc 100644 --- a/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/UniversalMeshEmitter.java +++ b/fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/UniversalMeshEmitter.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import java.util.function.Supplier; diff --git a/fabric/src/main/java/dev/engine_room/flywheel/impl/FabricFlwConfig.java b/fabric/src/main/java/dev/engine_room/flywheel/impl/FabricFlwConfig.java index e147424f1..9c9554917 100644 --- a/fabric/src/main/java/dev/engine_room/flywheel/impl/FabricFlwConfig.java +++ b/fabric/src/main/java/dev/engine_room/flywheel/impl/FabricFlwConfig.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl; +package dev.engine_room.flywheel.impl; import java.io.File; import java.io.FileReader; @@ -11,9 +11,9 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.gson.JsonPrimitive; -import com.jozufozu.flywheel.api.backend.Backend; -import com.jozufozu.flywheel.api.backend.BackendManager; +import dev.engine_room.flywheel.api.backend.Backend; +import dev.engine_room.flywheel.api.backend.BackendManager; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.ResourceLocationException; import net.minecraft.resources.ResourceLocation; diff --git a/fabric/src/main/java/dev/engine_room/flywheel/impl/FlwCommands.java b/fabric/src/main/java/dev/engine_room/flywheel/impl/FlwCommands.java index 5e5f44dd2..010d27806 100644 --- a/fabric/src/main/java/dev/engine_room/flywheel/impl/FlwCommands.java +++ b/fabric/src/main/java/dev/engine_room/flywheel/impl/FlwCommands.java @@ -1,15 +1,15 @@ -package com.jozufozu.flywheel.impl; +package dev.engine_room.flywheel.impl; -import com.jozufozu.flywheel.api.backend.Backend; -import com.jozufozu.flywheel.api.backend.BackendManager; -import com.jozufozu.flywheel.backend.engine.uniform.DebugMode; -import com.jozufozu.flywheel.backend.engine.uniform.FrameUniforms; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.IntegerArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.context.CommandContext; +import dev.engine_room.flywheel.api.backend.Backend; +import dev.engine_room.flywheel.api.backend.BackendManager; +import dev.engine_room.flywheel.backend.engine.uniform.DebugMode; +import dev.engine_room.flywheel.backend.engine.uniform.FrameUniforms; import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.minecraft.client.Minecraft; diff --git a/fabric/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java b/fabric/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java index 35de913ce..1cb0650b1 100644 --- a/fabric/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java +++ b/fabric/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java @@ -1,13 +1,12 @@ -package com.jozufozu.flywheel.impl; +package dev.engine_room.flywheel.impl; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.event.BeginFrameCallback; -import com.jozufozu.flywheel.api.event.ReloadLevelRendererCallback; -import com.jozufozu.flywheel.api.event.RenderContext; -import com.jozufozu.flywheel.api.event.RenderStage; -import com.jozufozu.flywheel.api.event.RenderStageCallback; - +import dev.engine_room.flywheel.api.event.BeginFrameCallback; +import dev.engine_room.flywheel.api.event.ReloadLevelRendererCallback; +import dev.engine_room.flywheel.api.event.RenderContext; +import dev.engine_room.flywheel.api.event.RenderStage; +import dev.engine_room.flywheel.api.event.RenderStageCallback; import net.minecraft.client.multiplayer.ClientLevel; public class FlwImplXplatImpl implements FlwImplXplat { diff --git a/fabric/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java b/fabric/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java index 932a458ac..8770f0abe 100644 --- a/fabric/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java +++ b/fabric/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java @@ -1,16 +1,15 @@ -package com.jozufozu.flywheel.impl; +package dev.engine_room.flywheel.impl; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.lib.internal.FlwLibXplat; -import com.jozufozu.flywheel.lib.model.baked.BakedModelBuilder; -import com.jozufozu.flywheel.lib.model.baked.BlockModelBuilder; -import com.jozufozu.flywheel.lib.model.baked.FabricBakedModelBuilder; -import com.jozufozu.flywheel.lib.model.baked.FabricBlockModelBuilder; -import com.jozufozu.flywheel.lib.model.baked.FabricMultiBlockModelBuilder; -import com.jozufozu.flywheel.lib.model.baked.MultiBlockModelBuilder; -import com.jozufozu.flywheel.lib.util.ShadersModHandler; - +import dev.engine_room.flywheel.lib.internal.FlwLibXplat; +import dev.engine_room.flywheel.lib.model.baked.BakedModelBuilder; +import dev.engine_room.flywheel.lib.model.baked.BlockModelBuilder; +import dev.engine_room.flywheel.lib.model.baked.FabricBakedModelBuilder; +import dev.engine_room.flywheel.lib.model.baked.FabricBlockModelBuilder; +import dev.engine_room.flywheel.lib.model.baked.FabricMultiBlockModelBuilder; +import dev.engine_room.flywheel.lib.model.baked.MultiBlockModelBuilder; +import dev.engine_room.flywheel.lib.util.ShadersModHandler; import net.fabricmc.loader.api.FabricLoader; import net.irisshaders.iris.api.v0.IrisApi; import net.minecraft.client.Minecraft; diff --git a/fabric/src/main/java/dev/engine_room/flywheel/impl/FlywheelFabric.java b/fabric/src/main/java/dev/engine_room/flywheel/impl/FlywheelFabric.java index 68857a7e1..d72f235f7 100644 --- a/fabric/src/main/java/dev/engine_room/flywheel/impl/FlywheelFabric.java +++ b/fabric/src/main/java/dev/engine_room/flywheel/impl/FlywheelFabric.java @@ -1,19 +1,18 @@ -package com.jozufozu.flywheel.impl; +package dev.engine_room.flywheel.impl; import org.jetbrains.annotations.UnknownNullability; -import com.jozufozu.flywheel.api.Flywheel; -import com.jozufozu.flywheel.api.event.BeginFrameCallback; -import com.jozufozu.flywheel.api.event.EndClientResourceReloadCallback; -import com.jozufozu.flywheel.api.event.ReloadLevelRendererCallback; -import com.jozufozu.flywheel.api.event.RenderStageCallback; -import com.jozufozu.flywheel.backend.compile.FlwProgramsReloader; -import com.jozufozu.flywheel.backend.engine.uniform.Uniforms; -import com.jozufozu.flywheel.impl.visualization.VisualizationEventHandler; -import com.jozufozu.flywheel.lib.model.ModelCache; -import com.jozufozu.flywheel.lib.model.ModelHolder; -import com.jozufozu.flywheel.lib.model.baked.PartialModelEventHandler; - +import dev.engine_room.flywheel.api.Flywheel; +import dev.engine_room.flywheel.api.event.BeginFrameCallback; +import dev.engine_room.flywheel.api.event.EndClientResourceReloadCallback; +import dev.engine_room.flywheel.api.event.ReloadLevelRendererCallback; +import dev.engine_room.flywheel.api.event.RenderStageCallback; +import dev.engine_room.flywheel.backend.compile.FlwProgramsReloader; +import dev.engine_room.flywheel.backend.engine.uniform.Uniforms; +import dev.engine_room.flywheel.impl.visualization.VisualizationEventHandler; +import dev.engine_room.flywheel.lib.model.ModelCache; +import dev.engine_room.flywheel.lib.model.ModelHolder; +import dev.engine_room.flywheel.lib.model.baked.PartialModelEventHandler; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientEntityEvents; diff --git a/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/MinecraftMixin.java b/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/MinecraftMixin.java index 0fed00bf7..f96a68595 100644 --- a/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/MinecraftMixin.java +++ b/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/MinecraftMixin.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.mixin; +package dev.engine_room.flywheel.impl.mixin; import java.util.Optional; import java.util.concurrent.CompletableFuture; @@ -10,10 +10,9 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.jozufozu.flywheel.api.event.EndClientResourceReloadCallback; -import com.jozufozu.flywheel.impl.FabricFlwConfig; -import com.jozufozu.flywheel.impl.FlwImpl; - +import dev.engine_room.flywheel.api.event.EndClientResourceReloadCallback; +import dev.engine_room.flywheel.impl.FabricFlwConfig; +import dev.engine_room.flywheel.impl.FlwImpl; import net.minecraft.client.Minecraft; import net.minecraft.server.packs.resources.ReloadableResourceManager; diff --git a/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/fabric/DebugScreenOverlayMixin.java b/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/fabric/DebugScreenOverlayMixin.java index 0d9719aea..c8201cfce 100644 --- a/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/fabric/DebugScreenOverlayMixin.java +++ b/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/fabric/DebugScreenOverlayMixin.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.mixin.fabric; +package dev.engine_room.flywheel.impl.mixin.fabric; import java.util.List; @@ -9,8 +9,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.jozufozu.flywheel.impl.FlwDebugInfo; - +import dev.engine_room.flywheel.impl.FlwDebugInfo; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.DebugScreenOverlay; diff --git a/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/fabric/MinecraftMixin.java b/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/fabric/MinecraftMixin.java index f80623ea7..e7d8b7af2 100644 --- a/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/fabric/MinecraftMixin.java +++ b/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/fabric/MinecraftMixin.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.mixin.fabric; +package dev.engine_room.flywheel.impl.mixin.fabric; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -6,8 +6,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.jozufozu.flywheel.lib.util.LevelAttached; - +import dev.engine_room.flywheel.lib.util.LevelAttached; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; diff --git a/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/fabric/SystemReportMixin.java b/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/fabric/SystemReportMixin.java index 8a8178793..89f5b1ac7 100644 --- a/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/fabric/SystemReportMixin.java +++ b/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/fabric/SystemReportMixin.java @@ -1,12 +1,11 @@ -package com.jozufozu.flywheel.impl.mixin.fabric; +package dev.engine_room.flywheel.impl.mixin.fabric; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.jozufozu.flywheel.impl.BackendManagerImpl; - +import dev.engine_room.flywheel.impl.BackendManagerImpl; import net.minecraft.SystemReport; @Mixin(value = SystemReport.class, priority = 1056) diff --git a/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/ChunkBuilderMeshingTaskMixin.java b/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/ChunkBuilderMeshingTaskMixin.java index 91ec5eeef..dd03548d3 100644 --- a/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/ChunkBuilderMeshingTaskMixin.java +++ b/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/ChunkBuilderMeshingTaskMixin.java @@ -1,11 +1,10 @@ -package com.jozufozu.flywheel.impl.mixin.sodium; +package dev.engine_room.flywheel.impl.mixin.sodium; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import com.jozufozu.flywheel.lib.visual.VisualizationHelper; - +import dev.engine_room.flywheel.lib.visual.VisualizationHelper; import me.jellysquid.mods.sodium.client.render.chunk.compile.tasks.ChunkBuilderMeshingTask; import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; diff --git a/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/SodiumMixinPlugin.java b/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/SodiumMixinPlugin.java index 0673915cb..0eda36012 100644 --- a/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/SodiumMixinPlugin.java +++ b/fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/SodiumMixinPlugin.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.mixin.sodium; +package dev.engine_room.flywheel.impl.mixin.sodium; import java.util.List; import java.util.Set; diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 8e42e83ae..7bfb5a37f 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -18,7 +18,7 @@ "environment": "client", "entrypoints": { "client": [ - "com.jozufozu.flywheel.impl.FlywheelFabric" + "dev.engine_room.flywheel.impl.FlywheelFabric" ] }, "mixins": [ diff --git a/fabric/src/main/resources/flywheel.impl.fabric.mixins.json b/fabric/src/main/resources/flywheel.impl.fabric.mixins.json index 6bcba4308..ea3900fdd 100644 --- a/fabric/src/main/resources/flywheel.impl.fabric.mixins.json +++ b/fabric/src/main/resources/flywheel.impl.fabric.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "com.jozufozu.flywheel.impl.mixin.fabric", + "package": "dev.engine_room.flywheel.impl.mixin.fabric", "compatibilityLevel": "JAVA_17", "refmap": "flywheel.refmap.json", "client": [ diff --git a/fabric/src/main/resources/flywheel.impl.sodium.mixins.json b/fabric/src/main/resources/flywheel.impl.sodium.mixins.json index c02f33509..7820cb594 100644 --- a/fabric/src/main/resources/flywheel.impl.sodium.mixins.json +++ b/fabric/src/main/resources/flywheel.impl.sodium.mixins.json @@ -1,10 +1,10 @@ { "required": true, "minVersion": "0.8", - "package": "com.jozufozu.flywheel.impl.mixin.sodium", + "package": "dev.engine_room.flywheel.impl.mixin.sodium", "compatibilityLevel": "JAVA_17", "refmap": "flywheel.refmap.json", - "plugin": "com.jozufozu.flywheel.impl.mixin.sodium.SodiumMixinPlugin", + "plugin": "dev.engine_room.flywheel.impl.mixin.sodium.SodiumMixinPlugin", "client": [ "ChunkBuilderMeshingTaskMixin" ], diff --git a/forge/src/api/java/dev/engine_room/flywheel/api/event/BeginFrameEvent.java b/forge/src/api/java/dev/engine_room/flywheel/api/event/BeginFrameEvent.java index 5f0bfe6ae..5da48c419 100644 --- a/forge/src/api/java/dev/engine_room/flywheel/api/event/BeginFrameEvent.java +++ b/forge/src/api/java/dev/engine_room/flywheel/api/event/BeginFrameEvent.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.event; +package dev.engine_room.flywheel.api.event; import net.minecraftforge.eventbus.api.Event; diff --git a/forge/src/api/java/dev/engine_room/flywheel/api/event/EndClientResourceReloadEvent.java b/forge/src/api/java/dev/engine_room/flywheel/api/event/EndClientResourceReloadEvent.java index da5d07ac2..8e102c4ba 100644 --- a/forge/src/api/java/dev/engine_room/flywheel/api/event/EndClientResourceReloadEvent.java +++ b/forge/src/api/java/dev/engine_room/flywheel/api/event/EndClientResourceReloadEvent.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.event; +package dev.engine_room.flywheel.api.event; import java.util.Optional; diff --git a/forge/src/api/java/dev/engine_room/flywheel/api/event/ReloadLevelRendererEvent.java b/forge/src/api/java/dev/engine_room/flywheel/api/event/ReloadLevelRendererEvent.java index 7ae09cd11..e74e792c9 100644 --- a/forge/src/api/java/dev/engine_room/flywheel/api/event/ReloadLevelRendererEvent.java +++ b/forge/src/api/java/dev/engine_room/flywheel/api/event/ReloadLevelRendererEvent.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.event; +package dev.engine_room.flywheel.api.event; import org.jetbrains.annotations.Nullable; diff --git a/forge/src/api/java/dev/engine_room/flywheel/api/event/RenderStageEvent.java b/forge/src/api/java/dev/engine_room/flywheel/api/event/RenderStageEvent.java index c67b285d6..4b0ec8254 100644 --- a/forge/src/api/java/dev/engine_room/flywheel/api/event/RenderStageEvent.java +++ b/forge/src/api/java/dev/engine_room/flywheel/api/event/RenderStageEvent.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.api.event; +package dev.engine_room.flywheel.api.event; import org.joml.Matrix4f; diff --git a/forge/src/backend/java/dev/engine_room/flywheel/backend/FlwBackendXplatImpl.java b/forge/src/backend/java/dev/engine_room/flywheel/backend/FlwBackendXplatImpl.java index b010dfe1f..f49549f3e 100644 --- a/forge/src/backend/java/dev/engine_room/flywheel/backend/FlwBackendXplatImpl.java +++ b/forge/src/backend/java/dev/engine_room/flywheel/backend/FlwBackendXplatImpl.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend; +package dev.engine_room.flywheel.backend; import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockGetter; diff --git a/forge/src/backend/java/dev/engine_room/flywheel/backend/compile/FlwProgramsReloader.java b/forge/src/backend/java/dev/engine_room/flywheel/backend/compile/FlwProgramsReloader.java index 475b2586b..ada440f24 100644 --- a/forge/src/backend/java/dev/engine_room/flywheel/backend/compile/FlwProgramsReloader.java +++ b/forge/src/backend/java/dev/engine_room/flywheel/backend/compile/FlwProgramsReloader.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.backend.compile; +package dev.engine_room.flywheel.backend.compile; import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.server.packs.resources.ResourceManagerReloadListener; diff --git a/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BakedModelBufferer.java b/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BakedModelBufferer.java index d62de8009..50162d4b9 100644 --- a/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BakedModelBufferer.java +++ b/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BakedModelBufferer.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import java.util.Iterator; import java.util.function.Function; diff --git a/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ChunkLayerSortedListBuilder.java b/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ChunkLayerSortedListBuilder.java index 01890f7c7..4026ff008 100644 --- a/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ChunkLayerSortedListBuilder.java +++ b/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ChunkLayerSortedListBuilder.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import java.util.List; diff --git a/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeBakedModelBuilder.java b/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeBakedModelBuilder.java index 515def783..33bf8b86f 100644 --- a/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeBakedModelBuilder.java +++ b/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeBakedModelBuilder.java @@ -1,19 +1,19 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import java.util.function.BiFunction; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.api.model.Model; -import com.jozufozu.flywheel.api.vertex.VertexView; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; -import com.jozufozu.flywheel.lib.model.ModelUtil; -import com.jozufozu.flywheel.lib.model.SimpleMesh; -import com.jozufozu.flywheel.lib.model.SimpleModel; -import com.jozufozu.flywheel.lib.vertex.NoOverlayVertexView; import com.mojang.blaze3d.vertex.PoseStack; +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.api.model.Model; +import dev.engine_room.flywheel.api.vertex.VertexView; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; +import dev.engine_room.flywheel.lib.model.ModelUtil; +import dev.engine_room.flywheel.lib.model.SimpleMesh; +import dev.engine_room.flywheel.lib.model.SimpleModel; +import dev.engine_room.flywheel.lib.vertex.NoOverlayVertexView; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.world.level.BlockAndTintGetter; diff --git a/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeBlockModelBuilder.java b/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeBlockModelBuilder.java index ad385e40c..c66997ad1 100644 --- a/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeBlockModelBuilder.java +++ b/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeBlockModelBuilder.java @@ -1,19 +1,19 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import java.util.function.BiFunction; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.api.model.Model; -import com.jozufozu.flywheel.api.vertex.VertexView; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; -import com.jozufozu.flywheel.lib.model.ModelUtil; -import com.jozufozu.flywheel.lib.model.SimpleMesh; -import com.jozufozu.flywheel.lib.model.SimpleModel; -import com.jozufozu.flywheel.lib.vertex.NoOverlayVertexView; import com.mojang.blaze3d.vertex.PoseStack; +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.api.model.Model; +import dev.engine_room.flywheel.api.vertex.VertexView; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; +import dev.engine_room.flywheel.lib.model.ModelUtil; +import dev.engine_room.flywheel.lib.model.SimpleMesh; +import dev.engine_room.flywheel.lib.model.SimpleModel; +import dev.engine_room.flywheel.lib.vertex.NoOverlayVertexView; import net.minecraft.client.renderer.RenderType; import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.block.state.BlockState; diff --git a/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeMultiBlockModelBuilder.java b/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeMultiBlockModelBuilder.java index d84379598..3c4afa1ea 100644 --- a/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeMultiBlockModelBuilder.java +++ b/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeMultiBlockModelBuilder.java @@ -1,20 +1,20 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import java.util.function.BiFunction; import java.util.function.Function; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.material.Material; -import com.jozufozu.flywheel.api.model.Model; -import com.jozufozu.flywheel.api.vertex.VertexView; -import com.jozufozu.flywheel.lib.memory.MemoryBlock; -import com.jozufozu.flywheel.lib.model.ModelUtil; -import com.jozufozu.flywheel.lib.model.SimpleMesh; -import com.jozufozu.flywheel.lib.model.SimpleModel; -import com.jozufozu.flywheel.lib.vertex.NoOverlayVertexView; import com.mojang.blaze3d.vertex.PoseStack; +import dev.engine_room.flywheel.api.material.Material; +import dev.engine_room.flywheel.api.model.Model; +import dev.engine_room.flywheel.api.vertex.VertexView; +import dev.engine_room.flywheel.lib.memory.MemoryBlock; +import dev.engine_room.flywheel.lib.model.ModelUtil; +import dev.engine_room.flywheel.lib.model.SimpleMesh; +import dev.engine_room.flywheel.lib.model.SimpleModel; +import dev.engine_room.flywheel.lib.vertex.NoOverlayVertexView; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockAndTintGetter; diff --git a/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MeshEmitter.java b/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MeshEmitter.java index 41e36bbdb..4a21280e7 100644 --- a/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MeshEmitter.java +++ b/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MeshEmitter.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import org.jetbrains.annotations.UnknownNullability; diff --git a/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModelEventHandler.java b/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModelEventHandler.java index 9957b2f2c..5c490dcd7 100644 --- a/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModelEventHandler.java +++ b/forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModelEventHandler.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.lib.model.baked; +package dev.engine_room.flywheel.lib.model.baked; import java.util.Map; diff --git a/forge/src/main/java/dev/engine_room/flywheel/impl/FlwCommands.java b/forge/src/main/java/dev/engine_room/flywheel/impl/FlwCommands.java index 37795b40c..227973f4e 100644 --- a/forge/src/main/java/dev/engine_room/flywheel/impl/FlwCommands.java +++ b/forge/src/main/java/dev/engine_room/flywheel/impl/FlwCommands.java @@ -1,13 +1,13 @@ -package com.jozufozu.flywheel.impl; +package dev.engine_room.flywheel.impl; -import com.jozufozu.flywheel.api.backend.Backend; -import com.jozufozu.flywheel.api.backend.BackendManager; -import com.jozufozu.flywheel.backend.engine.uniform.DebugMode; -import com.jozufozu.flywheel.backend.engine.uniform.FrameUniforms; import com.mojang.brigadier.Command; import com.mojang.brigadier.arguments.IntegerArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import dev.engine_room.flywheel.api.backend.Backend; +import dev.engine_room.flywheel.api.backend.BackendManager; +import dev.engine_room.flywheel.backend.engine.uniform.DebugMode; +import dev.engine_room.flywheel.backend.engine.uniform.FrameUniforms; import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; diff --git a/forge/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java b/forge/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java index 1234a4a4a..4ebf4532b 100644 --- a/forge/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java +++ b/forge/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java @@ -1,13 +1,12 @@ -package com.jozufozu.flywheel.impl; +package dev.engine_room.flywheel.impl; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.event.BeginFrameEvent; -import com.jozufozu.flywheel.api.event.ReloadLevelRendererEvent; -import com.jozufozu.flywheel.api.event.RenderContext; -import com.jozufozu.flywheel.api.event.RenderStage; -import com.jozufozu.flywheel.api.event.RenderStageEvent; - +import dev.engine_room.flywheel.api.event.BeginFrameEvent; +import dev.engine_room.flywheel.api.event.ReloadLevelRendererEvent; +import dev.engine_room.flywheel.api.event.RenderContext; +import dev.engine_room.flywheel.api.event.RenderStage; +import dev.engine_room.flywheel.api.event.RenderStageEvent; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraftforge.common.MinecraftForge; diff --git a/forge/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java b/forge/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java index ef50b33fc..7aa29a9b0 100644 --- a/forge/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java +++ b/forge/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java @@ -1,18 +1,17 @@ -package com.jozufozu.flywheel.impl; +package dev.engine_room.flywheel.impl; import java.lang.reflect.Field; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.lib.internal.FlwLibXplat; -import com.jozufozu.flywheel.lib.model.baked.BakedModelBuilder; -import com.jozufozu.flywheel.lib.model.baked.BlockModelBuilder; -import com.jozufozu.flywheel.lib.model.baked.ForgeBakedModelBuilder; -import com.jozufozu.flywheel.lib.model.baked.ForgeBlockModelBuilder; -import com.jozufozu.flywheel.lib.model.baked.ForgeMultiBlockModelBuilder; -import com.jozufozu.flywheel.lib.model.baked.MultiBlockModelBuilder; -import com.jozufozu.flywheel.lib.util.ShadersModHandler; - +import dev.engine_room.flywheel.lib.internal.FlwLibXplat; +import dev.engine_room.flywheel.lib.model.baked.BakedModelBuilder; +import dev.engine_room.flywheel.lib.model.baked.BlockModelBuilder; +import dev.engine_room.flywheel.lib.model.baked.ForgeBakedModelBuilder; +import dev.engine_room.flywheel.lib.model.baked.ForgeBlockModelBuilder; +import dev.engine_room.flywheel.lib.model.baked.ForgeMultiBlockModelBuilder; +import dev.engine_room.flywheel.lib.model.baked.MultiBlockModelBuilder; +import dev.engine_room.flywheel.lib.util.ShadersModHandler; import net.irisshaders.iris.api.v0.IrisApi; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.BlockRenderDispatcher; diff --git a/forge/src/main/java/dev/engine_room/flywheel/impl/FlywheelForge.java b/forge/src/main/java/dev/engine_room/flywheel/impl/FlywheelForge.java index 03c06b4ec..72e5ada1f 100644 --- a/forge/src/main/java/dev/engine_room/flywheel/impl/FlywheelForge.java +++ b/forge/src/main/java/dev/engine_room/flywheel/impl/FlywheelForge.java @@ -1,21 +1,20 @@ -package com.jozufozu.flywheel.impl; +package dev.engine_room.flywheel.impl; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.jetbrains.annotations.UnknownNullability; -import com.jozufozu.flywheel.api.Flywheel; -import com.jozufozu.flywheel.api.event.BeginFrameEvent; -import com.jozufozu.flywheel.api.event.EndClientResourceReloadEvent; -import com.jozufozu.flywheel.api.event.ReloadLevelRendererEvent; -import com.jozufozu.flywheel.api.event.RenderStageEvent; -import com.jozufozu.flywheel.backend.compile.FlwProgramsReloader; -import com.jozufozu.flywheel.backend.engine.uniform.Uniforms; -import com.jozufozu.flywheel.impl.visualization.VisualizationEventHandler; -import com.jozufozu.flywheel.lib.model.ModelCache; -import com.jozufozu.flywheel.lib.model.ModelHolder; -import com.jozufozu.flywheel.lib.model.baked.PartialModelEventHandler; -import com.jozufozu.flywheel.lib.util.LevelAttached; - +import dev.engine_room.flywheel.api.Flywheel; +import dev.engine_room.flywheel.api.event.BeginFrameEvent; +import dev.engine_room.flywheel.api.event.EndClientResourceReloadEvent; +import dev.engine_room.flywheel.api.event.ReloadLevelRendererEvent; +import dev.engine_room.flywheel.api.event.RenderStageEvent; +import dev.engine_room.flywheel.backend.compile.FlwProgramsReloader; +import dev.engine_room.flywheel.backend.engine.uniform.Uniforms; +import dev.engine_room.flywheel.impl.visualization.VisualizationEventHandler; +import dev.engine_room.flywheel.lib.model.ModelCache; +import dev.engine_room.flywheel.lib.model.ModelHolder; +import dev.engine_room.flywheel.lib.model.baked.PartialModelEventHandler; +import dev.engine_room.flywheel.lib.util.LevelAttached; import net.minecraft.client.Minecraft; import net.minecraft.commands.synchronization.ArgumentTypeInfos; import net.minecraftforge.api.distmarker.Dist; diff --git a/forge/src/main/java/dev/engine_room/flywheel/impl/ForgeFlwConfig.java b/forge/src/main/java/dev/engine_room/flywheel/impl/ForgeFlwConfig.java index fff51a309..69fd054c0 100644 --- a/forge/src/main/java/dev/engine_room/flywheel/impl/ForgeFlwConfig.java +++ b/forge/src/main/java/dev/engine_room/flywheel/impl/ForgeFlwConfig.java @@ -1,11 +1,10 @@ -package com.jozufozu.flywheel.impl; +package dev.engine_room.flywheel.impl; import org.apache.commons.lang3.tuple.Pair; import org.jetbrains.annotations.Nullable; -import com.jozufozu.flywheel.api.backend.Backend; -import com.jozufozu.flywheel.api.backend.BackendManager; - +import dev.engine_room.flywheel.api.backend.Backend; +import dev.engine_room.flywheel.api.backend.BackendManager; import net.minecraft.ResourceLocationException; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.common.ForgeConfigSpec; diff --git a/forge/src/main/java/dev/engine_room/flywheel/impl/mixin/MinecraftMixin.java b/forge/src/main/java/dev/engine_room/flywheel/impl/mixin/MinecraftMixin.java index 16874dbaf..99ca5d570 100644 --- a/forge/src/main/java/dev/engine_room/flywheel/impl/mixin/MinecraftMixin.java +++ b/forge/src/main/java/dev/engine_room/flywheel/impl/mixin/MinecraftMixin.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.mixin; +package dev.engine_room.flywheel.impl.mixin; import java.util.Optional; import java.util.concurrent.CompletableFuture; @@ -12,10 +12,10 @@ import org.spongepowered.asm.mixin.injection.ModifyArg; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.jozufozu.flywheel.api.event.EndClientResourceReloadEvent; -import com.jozufozu.flywheel.impl.FlwImpl; import com.mojang.realmsclient.client.RealmsClient; +import dev.engine_room.flywheel.api.event.EndClientResourceReloadEvent; +import dev.engine_room.flywheel.impl.FlwImpl; import net.minecraft.client.Minecraft; import net.minecraft.client.main.GameConfig; import net.minecraft.server.packs.resources.ReloadInstance; diff --git a/forge/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/ChunkBuilderMeshingTaskMixin.java b/forge/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/ChunkBuilderMeshingTaskMixin.java index 91ec5eeef..dd03548d3 100644 --- a/forge/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/ChunkBuilderMeshingTaskMixin.java +++ b/forge/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/ChunkBuilderMeshingTaskMixin.java @@ -1,11 +1,10 @@ -package com.jozufozu.flywheel.impl.mixin.sodium; +package dev.engine_room.flywheel.impl.mixin.sodium; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import com.jozufozu.flywheel.lib.visual.VisualizationHelper; - +import dev.engine_room.flywheel.lib.visual.VisualizationHelper; import me.jellysquid.mods.sodium.client.render.chunk.compile.tasks.ChunkBuilderMeshingTask; import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; diff --git a/forge/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/SodiumMixinPlugin.java b/forge/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/SodiumMixinPlugin.java index aa58d4c7a..1048d91fd 100644 --- a/forge/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/SodiumMixinPlugin.java +++ b/forge/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/SodiumMixinPlugin.java @@ -1,4 +1,4 @@ -package com.jozufozu.flywheel.impl.mixin.sodium; +package dev.engine_room.flywheel.impl.mixin.sodium; import java.util.List; import java.util.Set; diff --git a/forge/src/main/resources/flywheel.impl.sodium.mixins.json b/forge/src/main/resources/flywheel.impl.sodium.mixins.json index c02f33509..7820cb594 100644 --- a/forge/src/main/resources/flywheel.impl.sodium.mixins.json +++ b/forge/src/main/resources/flywheel.impl.sodium.mixins.json @@ -1,10 +1,10 @@ { "required": true, "minVersion": "0.8", - "package": "com.jozufozu.flywheel.impl.mixin.sodium", + "package": "dev.engine_room.flywheel.impl.mixin.sodium", "compatibilityLevel": "JAVA_17", "refmap": "flywheel.refmap.json", - "plugin": "com.jozufozu.flywheel.impl.mixin.sodium.SodiumMixinPlugin", + "plugin": "dev.engine_room.flywheel.impl.mixin.sodium.SodiumMixinPlugin", "client": [ "ChunkBuilderMeshingTaskMixin" ],