From 67e75d747a27c9480886898d681eb0d9df0ac680 Mon Sep 17 00:00:00 2001 From: JozsefA Date: Sat, 1 May 2021 16:32:09 -0700 Subject: [PATCH] Move backend --- .../flywheel}/backend/Backend.java | 14 ++++++------ .../flywheel}/backend/BufferedModel.java | 6 ++--- .../backend/FastRenderDispatcher.java | 2 +- .../flywheel}/backend/MaterialType.java | 4 ++-- .../flywheel/backend/MaterialTypes.java | 10 +++++++++ .../flywheel}/backend/OptifineHandler.java | 2 +- .../flywheel}/backend/RenderUtil.java | 2 +- .../flywheel}/backend/RenderWork.java | 2 +- .../flywheel}/backend/ShaderLoader.java | 16 +++++++------- .../backend/core/BasicAttributes.java | 8 +++---- .../flywheel}/backend/core/BasicData.java | 6 ++--- .../flywheel}/backend/core/BasicProgram.java | 6 ++--- .../flywheel}/backend/core/IFlatLight.java | 4 ++-- .../backend/core/ModelAttributes.java | 10 ++++----- .../flywheel}/backend/core/ModelData.java | 6 ++--- .../backend/core/OrientedAttributes.java | 8 +++---- .../flywheel}/backend/core/OrientedData.java | 4 ++-- .../flywheel}/backend/core/OrientedModel.java | 8 +++---- .../flywheel}/backend/core/PartialModel.java | 2 +- .../backend/core/TransformAttributes.java | 8 +++---- .../backend/core/TransformedModel.java | 8 +++---- .../backend/effects/ColorMatrices.java | 2 +- .../backend/effects/EffectsHandler.java | 12 +++++----- .../backend/effects/FilterSphere.java | 4 ++-- .../backend/effects/ScreenQuadAttributes.java | 8 +++---- .../backend/effects/SphereFilterProgram.java | 6 ++--- .../flywheel}/backend/gl/GlBuffer.java | 4 ++-- .../flywheel}/backend/gl/GlFog.java | 2 +- .../flywheel}/backend/gl/GlFogMode.java | 4 ++-- .../flywheel}/backend/gl/GlObject.java | 2 +- .../flywheel}/backend/gl/GlPrimitiveType.java | 2 +- .../flywheel}/backend/gl/GlTexture.java | 2 +- .../flywheel}/backend/gl/GlVertexArray.java | 4 ++-- .../backend/gl/attrib/CommonAttributes.java | 4 ++-- .../backend/gl/attrib/IAttribSpec.java | 2 +- .../backend/gl/attrib/IVertexAttrib.java | 2 +- .../backend/gl/attrib/MatrixAttributes.java | 4 ++-- .../backend/gl/attrib/VertexAttribSpec.java | 4 ++-- .../backend/gl/attrib/VertexFormat.java | 2 +- .../gl/shader/FogSensitiveProgram.java | 8 +++---- .../flywheel}/backend/gl/shader/GLSLType.java | 4 ++-- .../backend/gl/shader/GlProgram.java | 10 ++++----- .../flywheel}/backend/gl/shader/GlShader.java | 8 +++---- .../backend/gl/shader/IMultiProgram.java | 2 +- .../backend/gl/shader/ProgramFogMode.java | 4 ++-- .../backend/gl/shader/ProgramSpec.java | 4 ++-- .../backend/gl/shader/ShaderCallback.java | 2 +- .../backend/gl/shader/ShaderConstants.java | 2 +- .../backend/gl/shader/ShaderSpecLoader.java | 7 ++++++ .../backend/gl/shader/ShaderType.java | 2 +- .../backend/gl/shader/SingleProgram.java | 4 ++-- .../backend/gl/versioned/GlCompat.java | 12 +++++----- .../backend/gl/versioned/GlVersioned.java | 2 +- .../backend/gl/versioned/MapBuffer.java | 2 +- .../backend/gl/versioned/RGPixelFormat.java | 2 +- .../gl/versioned/framebuffer/Blit.java | 4 ++-- .../gl/versioned/framebuffer/Framebuffer.java | 4 ++-- .../versioned/instancing/DrawInstanced.java | 4 ++-- .../versioned/instancing/InstancedArrays.java | 4 ++-- .../instancing/VertexArrayObject.java | 4 ++-- .../backend/instancing/IDynamicInstance.java | 2 +- .../backend/instancing/IFlywheelWorld.java | 2 +- .../backend/instancing/IInstance.java | 2 +- .../backend/instancing/IInstanceRendered.java | 2 +- .../backend/instancing/IRendererFactory.java | 2 +- .../backend/instancing/ITickableInstance.java | 2 +- .../backend/instancing/InstanceData.java | 2 +- .../backend/instancing/InstancedModel.java | 14 ++++++------ .../InstancedTileRenderRegistry.java | 2 +- .../instancing/InstancedTileRenderer.java | 16 +++++++------- .../backend/instancing/ModelFactory.java | 2 +- .../backend/instancing/RenderMaterial.java | 16 +++++++------- .../instancing/TileEntityInstance.java | 8 +++---- .../instancing/util/ConditionalInstance.java | 6 ++--- .../instancing/util/InstanceGroup.java | 6 ++--- .../instancing/util/SelectInstance.java | 6 ++--- .../backend/light/CoordinateConsumer.java | 2 +- .../flywheel}/backend/light/EmptyLighter.java | 2 +- .../backend/light/GridAlignedBB.java | 6 ++--- .../backend/light/LightUpdateListener.java | 2 +- .../flywheel}/backend/light/LightUpdater.java | 2 +- .../flywheel}/backend/light/LightVolume.java | 10 ++++----- .../backend/light/LightVolumeDebugger.java | 2 +- .../com/simibubi/create/AllBlockPartials.java | 2 +- .../com/simibubi/create/CreateClient.java | 8 +++---- .../animations/AnimatedBlazeBurner.java | 2 +- .../category/animations/AnimatedKinetics.java | 2 +- .../base/BackHalfShaftInstance.java | 2 +- .../contraptions/base/HalfShaftInstance.java | 4 ++-- .../base/HorizontalHalfShaftInstance.java | 2 +- .../contraptions/base/KineticAttributes.java | 8 +++---- .../contraptions/base/KineticData.java | 4 ++-- .../base/KineticRenderMaterials.java | 4 ++-- .../contraptions/base/KineticTileEntity.java | 4 ++-- .../base/KineticTileEntityRenderer.java | 2 +- .../base/KineticTileInstance.java | 8 +++---- .../contraptions/base/RotatingAttributes.java | 8 +++---- .../contraptions/base/RotatingData.java | 2 +- .../contraptions/base/RotatingModel.java | 8 +++---- .../base/ShaftlessCogInstance.java | 4 ++-- .../base/SingleRotatingInstance.java | 4 ++-- .../components/actors/ActorData.java | 4 ++-- .../components/actors/ActorModel.java | 6 ++--- .../actors/ActorVertexAttributes.java | 8 +++---- .../components/actors/DrillActorInstance.java | 4 ++-- .../components/actors/DrillInstance.java | 4 ++-- .../actors/DrillMovementBehaviour.java | 2 +- .../actors/HarvesterActorInstance.java | 6 ++--- .../actors/HarvesterMovementBehaviour.java | 2 +- .../PortableStorageInterfaceRenderer.java | 2 +- .../components/clock/CuckooClockRenderer.java | 2 +- .../crafter/MechanicalCrafterInstance.java | 4 ++-- .../crafter/MechanicalCrafterRenderer.java | 4 ++-- .../components/crank/HandCrankBlock.java | 2 +- .../components/crank/HandCrankInstance.java | 10 ++++----- .../components/crank/HandCrankRenderer.java | 4 ++-- .../components/crank/ValveHandleBlock.java | 2 +- .../deployer/DeployerActorInstance.java | 8 +++---- .../components/deployer/DeployerInstance.java | 10 ++++----- .../deployer/DeployerMovementBehaviour.java | 4 ++-- .../components/deployer/DeployerRenderer.java | 4 ++-- .../deployer/DeployerTileEntity.java | 2 +- .../components/fan/EncasedFanRenderer.java | 2 +- .../components/fan/FanInstance.java | 2 +- .../components/flywheel/FlyWheelInstance.java | 12 +++++----- .../components/flywheel/FlywheelRenderer.java | 2 +- .../flywheel/engine/EngineBlock.java | 2 +- .../flywheel/engine/EngineInstance.java | 8 +++---- .../flywheel/engine/EngineRenderer.java | 4 ++-- .../flywheel/engine/EngineTileEntity.java | 2 +- .../flywheel/engine/FurnaceEngineBlock.java | 2 +- .../millstone/MillStoneCogInstance.java | 4 ++-- .../mixer/MechanicalMixerRenderer.java | 2 +- .../components/mixer/MixerInstance.java | 6 ++--- .../press/MechanicalPressRenderer.java | 2 +- .../components/press/PressInstance.java | 6 ++--- .../components/saw/SawInstance.java | 4 ++-- .../components/saw/SawRenderer.java | 4 ++-- .../structureMovement/Contraption.java | 6 ++--- .../structureMovement/ContraptionLighter.java | 8 +++---- .../NonStationaryLighter.java | 2 +- .../bearing/AnchoredLighter.java | 2 +- .../bearing/BearingInstance.java | 8 +++---- .../bearing/BearingRenderer.java | 4 ++-- .../bearing/StabilizedBearingInstance.java | 2 +- .../StabilizedBearingMovementBehaviour.java | 4 ++-- .../chassis/StickerInstance.java | 8 +++---- .../chassis/StickerRenderer.java | 2 +- .../chassis/StickerTileEntity.java | 4 ++-- .../gantry/GantryCarriageInstance.java | 6 ++--- .../gantry/GantryCarriageRenderer.java | 2 +- .../piston/PistonLighter.java | 2 +- .../pulley/AbstractPulleyInstance.java | 20 ++++++++--------- .../pulley/AbstractPulleyRenderer.java | 4 ++-- .../pulley/HosePulleyInstance.java | 6 ++--- .../pulley/PulleyLighter.java | 2 +- .../pulley/PulleyRenderer.java | 2 +- .../pulley/RopePulleyInstance.java | 6 ++--- .../render/ContraptionAttributes.java | 8 +++---- .../render/ContraptionKineticRenderer.java | 12 +++++----- .../render/ContraptionModel.java | 8 +++---- .../render/ContraptionProgram.java | 4 ++-- .../render/ContraptionRenderDispatcher.java | 4 ++-- .../render/RenderedContraption.java | 6 ++--- .../contraptions/fluids/PumpCogInstance.java | 4 ++-- .../fluids/actors/HosePulleyRenderer.java | 2 +- .../fluids/actors/SpoutRenderer.java | 2 +- .../fluids/pipes/FluidValveInstance.java | 6 ++--- .../fluids/pipes/FluidValveRenderer.java | 2 +- .../burner/BlazeBurnerRenderer.java | 2 +- .../advanced/SpeedControllerRenderer.java | 2 +- .../relays/belt/BeltAttributes.java | 8 +++---- .../contraptions/relays/belt/BeltData.java | 2 +- .../relays/belt/BeltInstance.java | 8 +++---- .../relays/belt/BeltInstancedModel.java | 8 +++---- .../relays/belt/BeltRenderer.java | 4 ++-- .../relays/belt/BeltTileEntity.java | 8 +++---- .../relays/encased/ShaftInstance.java | 2 +- .../relays/encased/SplitShaftInstance.java | 8 +++---- .../relays/encased/SplitShaftRenderer.java | 2 +- .../relays/gauge/GaugeInstance.java | 8 +++---- .../relays/gauge/GaugeRenderer.java | 4 ++-- .../relays/gearbox/GearboxInstance.java | 8 +++---- .../relays/gearbox/GearboxRenderer.java | 2 +- .../projector/ChromaticProjectorInstance.java | 8 +++---- .../ChromaticProjectorTileEntity.java | 4 ++-- .../curiosities/projector/ColorEffect.java | 2 +- .../curiosities/projector/FilterStep.java | 2 +- .../symmetry/mirror/CrossPlaneMirror.java | 2 +- .../symmetry/mirror/EmptyMirror.java | 2 +- .../symmetry/mirror/PlaneMirror.java | 2 +- .../symmetry/mirror/SymmetryMirror.java | 2 +- .../symmetry/mirror/TriplePlaneMirror.java | 2 +- .../tools/ExtendoGripRenderHandler.java | 2 +- .../logistics/block/FlapAttributes.java | 8 +++---- .../content/logistics/block/FlapData.java | 6 ++--- .../content/logistics/block/FlapModel.java | 6 ++--- .../belts/tunnel/BeltTunnelInstance.java | 10 ++++----- .../belts/tunnel/BeltTunnelRenderer.java | 2 +- .../belts/tunnel/BeltTunnelTileEntity.java | 20 ++++++++--------- .../block/depot/EjectorInstance.java | 6 ++--- .../block/depot/EjectorRenderer.java | 2 +- .../diodes/AdjustableRepeaterInstance.java | 8 +++---- .../diodes/AdjustableRepeaterTileEntity.java | 6 ++--- .../block/funnel/FunnelInstance.java | 12 +++++----- .../block/funnel/FunnelRenderer.java | 4 ++-- .../block/funnel/FunnelTileEntity.java | 4 ++-- .../block/mechanicalArm/ArmInstance.java | 12 +++++----- .../mechanicalArm/ArmInteractionPoint.java | 2 +- .../block/mechanicalArm/ArmRenderer.java | 2 +- .../block/redstone/AnalogLeverInstance.java | 12 +++++----- .../block/redstone/AnalogLeverRenderer.java | 2 +- .../block/redstone/AnalogLeverTileEntity.java | 2 +- .../block/SchematicannonInstance.java | 12 +++++----- .../block/SchematicannonRenderer.java | 2 +- .../block/SchematicannonTileEntity.java | 2 +- .../simibubi/create/events/ClientEvents.java | 6 ++--- .../command/ConfigureConfigPacket.java | 4 ++-- .../data/CreateTileEntityBuilder.java | 4 ++-- .../create/foundation/gui/GuiGameElement.java | 2 +- .../mixin/CancelTileEntityRenderMixin.java | 4 ++-- .../mixin/FogColorTrackerMixin.java | 2 +- .../foundation/mixin/LightUpdateMixin.java | 2 +- .../mixin/NetworkLightUpdateMixin.java | 4 ++-- .../foundation/mixin/RenderHooksMixin.java | 6 ++--- .../foundation/mixin/ShaderCloseMixin.java | 2 +- .../mixin/StoreProjectionMatrixMixin.java | 4 ++-- .../foundation/render/AllProgramSpecs.java | 22 +++++++++---------- .../create/foundation/render/Compartment.java | 2 +- .../foundation/render/KineticRenderer.java | 14 ++++++------ .../foundation/render/PartialBufferer.java | 2 +- .../render/SuperByteBufferCache.java | 2 +- .../render/backend/MaterialTypes.java | 10 --------- .../backend/gl/shader/ShaderSpecLoader.java | 7 ------ .../ColoredOverlayTileEntityRenderer.java | 2 +- .../PlacementSimulationWorld.java | 2 +- 236 files changed, 580 insertions(+), 580 deletions(-) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/Backend.java (86%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/BufferedModel.java (90%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/FastRenderDispatcher.java (97%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/MaterialType.java (51%) create mode 100644 src/main/java/com/jozufozu/flywheel/backend/MaterialTypes.java rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/OptifineHandler.java (97%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/RenderUtil.java (97%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/RenderWork.java (87%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/ShaderLoader.java (91%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/core/BasicAttributes.java (64%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/core/BasicData.java (87%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/core/BasicProgram.java (86%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/core/IFlatLight.java (85%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/core/ModelAttributes.java (61%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/core/ModelData.java (73%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/core/OrientedAttributes.java (67%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/core/OrientedData.java (93%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/core/OrientedModel.java (65%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/core/PartialModel.java (96%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/core/TransformAttributes.java (65%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/core/TransformedModel.java (65%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/effects/ColorMatrices.java (98%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/effects/EffectsHandler.java (92%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/effects/FilterSphere.java (86%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/effects/ScreenQuadAttributes.java (63%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/effects/SphereFilterProgram.java (93%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/GlBuffer.java (91%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/GlFog.java (94%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/GlFogMode.java (85%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/GlObject.java (93%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/GlPrimitiveType.java (93%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/GlTexture.java (88%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/GlVertexArray.java (80%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/attrib/CommonAttributes.java (88%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/attrib/IAttribSpec.java (68%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/attrib/IVertexAttrib.java (66%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/attrib/MatrixAttributes.java (84%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/attrib/VertexAttribSpec.java (87%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/attrib/VertexFormat.java (95%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/shader/FogSensitiveProgram.java (84%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/shader/GLSLType.java (89%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/shader/GlProgram.java (91%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/shader/GlShader.java (79%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/shader/IMultiProgram.java (87%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/shader/ProgramFogMode.java (90%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/shader/ProgramSpec.java (93%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/shader/ShaderCallback.java (83%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/shader/ShaderConstants.java (95%) create mode 100644 src/main/java/com/jozufozu/flywheel/backend/gl/shader/ShaderSpecLoader.java rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/shader/ShaderType.java (76%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/shader/SingleProgram.java (87%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/versioned/GlCompat.java (86%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/versioned/GlVersioned.java (88%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/versioned/MapBuffer.java (96%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/versioned/RGPixelFormat.java (94%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/versioned/framebuffer/Blit.java (89%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/versioned/framebuffer/Framebuffer.java (89%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/versioned/instancing/DrawInstanced.java (90%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/versioned/instancing/InstancedArrays.java (86%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/gl/versioned/instancing/VertexArrayObject.java (90%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/instancing/IDynamicInstance.java (94%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/instancing/IFlywheelWorld.java (82%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/instancing/IInstance.java (83%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/instancing/IInstanceRendered.java (59%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/instancing/IRendererFactory.java (75%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/instancing/ITickableInstance.java (95%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/instancing/InstanceData.java (94%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/instancing/InstancedModel.java (92%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/instancing/InstancedTileRenderRegistry.java (93%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/instancing/InstancedTileRenderer.java (93%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/instancing/ModelFactory.java (75%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/instancing/RenderMaterial.java (88%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/instancing/TileEntityInstance.java (93%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/instancing/util/ConditionalInstance.java (81%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/instancing/util/InstanceGroup.java (86%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/instancing/util/SelectInstance.java (82%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/light/CoordinateConsumer.java (61%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/light/EmptyLighter.java (89%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/light/GridAlignedBB.java (97%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/light/LightUpdateListener.java (94%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/light/LightUpdater.java (99%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/light/LightVolume.java (96%) rename src/main/java/com/{simibubi/create/foundation/render => jozufozu/flywheel}/backend/light/LightVolumeDebugger.java (95%) delete mode 100644 src/main/java/com/simibubi/create/foundation/render/backend/MaterialTypes.java delete mode 100644 src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ShaderSpecLoader.java diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/Backend.java b/src/main/java/com/jozufozu/flywheel/backend/Backend.java similarity index 86% rename from src/main/java/com/simibubi/create/foundation/render/backend/Backend.java rename to src/main/java/com/jozufozu/flywheel/backend/Backend.java index 095f96b84..b66b67bf6 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/Backend.java +++ b/src/main/java/com/jozufozu/flywheel/backend/Backend.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend; +package com.jozufozu.flywheel.backend; import java.util.HashMap; import java.util.Map; @@ -8,13 +8,13 @@ import org.apache.logging.log4j.Logger; import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GLCapabilities; +import com.jozufozu.flywheel.backend.effects.EffectsHandler; +import com.jozufozu.flywheel.backend.gl.shader.GlProgram; +import com.jozufozu.flywheel.backend.gl.shader.IMultiProgram; +import com.jozufozu.flywheel.backend.gl.shader.ProgramSpec; +import com.jozufozu.flywheel.backend.gl.versioned.GlCompat; +import com.jozufozu.flywheel.backend.instancing.IFlywheelWorld; import com.simibubi.create.foundation.config.AllConfigs; -import com.simibubi.create.foundation.render.backend.effects.EffectsHandler; -import com.simibubi.create.foundation.render.backend.gl.shader.GlProgram; -import com.simibubi.create.foundation.render.backend.gl.shader.IMultiProgram; -import com.simibubi.create.foundation.render.backend.gl.shader.ProgramSpec; -import com.simibubi.create.foundation.render.backend.gl.versioned.GlCompat; -import com.simibubi.create.foundation.render.backend.instancing.IFlywheelWorld; import net.minecraft.client.Minecraft; import net.minecraft.resources.IReloadableResourceManager; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/BufferedModel.java b/src/main/java/com/jozufozu/flywheel/backend/BufferedModel.java similarity index 90% rename from src/main/java/com/simibubi/create/foundation/render/backend/BufferedModel.java rename to src/main/java/com/jozufozu/flywheel/backend/BufferedModel.java index 20c7436f9..ae076ea0b 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/BufferedModel.java +++ b/src/main/java/com/jozufozu/flywheel/backend/BufferedModel.java @@ -1,13 +1,13 @@ -package com.simibubi.create.foundation.render.backend; +package com.jozufozu.flywheel.backend; import java.nio.ByteBuffer; import org.lwjgl.opengl.GL15; import org.lwjgl.opengl.GL20; +import com.jozufozu.flywheel.backend.gl.GlBuffer; +import com.jozufozu.flywheel.backend.gl.attrib.VertexFormat; import com.simibubi.create.foundation.render.TemplateBuffer; -import com.simibubi.create.foundation.render.backend.gl.GlBuffer; -import com.simibubi.create.foundation.render.backend.gl.attrib.VertexFormat; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/FastRenderDispatcher.java b/src/main/java/com/jozufozu/flywheel/backend/FastRenderDispatcher.java similarity index 97% rename from src/main/java/com/simibubi/create/foundation/render/backend/FastRenderDispatcher.java rename to src/main/java/com/jozufozu/flywheel/backend/FastRenderDispatcher.java index ee9fc282f..09879ff0c 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/FastRenderDispatcher.java +++ b/src/main/java/com/jozufozu/flywheel/backend/FastRenderDispatcher.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend; +package com.jozufozu.flywheel.backend; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/MaterialType.java b/src/main/java/com/jozufozu/flywheel/backend/MaterialType.java similarity index 51% rename from src/main/java/com/simibubi/create/foundation/render/backend/MaterialType.java rename to src/main/java/com/jozufozu/flywheel/backend/MaterialType.java index f3c770051..7e55c49d6 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/MaterialType.java +++ b/src/main/java/com/jozufozu/flywheel/backend/MaterialType.java @@ -1,6 +1,6 @@ -package com.simibubi.create.foundation.render.backend; +package com.jozufozu.flywheel.backend; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; public class MaterialType> { diff --git a/src/main/java/com/jozufozu/flywheel/backend/MaterialTypes.java b/src/main/java/com/jozufozu/flywheel/backend/MaterialTypes.java new file mode 100644 index 000000000..2ac7fe4d1 --- /dev/null +++ b/src/main/java/com/jozufozu/flywheel/backend/MaterialTypes.java @@ -0,0 +1,10 @@ +package com.jozufozu.flywheel.backend; + +import com.jozufozu.flywheel.backend.core.ModelData; +import com.jozufozu.flywheel.backend.core.OrientedData; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; + +public class MaterialTypes { + public static final MaterialType> TRANSFORMED = new MaterialType<>(); + public static final MaterialType> ORIENTED = new MaterialType<>(); +} diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/OptifineHandler.java b/src/main/java/com/jozufozu/flywheel/backend/OptifineHandler.java similarity index 97% rename from src/main/java/com/simibubi/create/foundation/render/backend/OptifineHandler.java rename to src/main/java/com/jozufozu/flywheel/backend/OptifineHandler.java index 58cc82188..c4d825c90 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/OptifineHandler.java +++ b/src/main/java/com/jozufozu/flywheel/backend/OptifineHandler.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend; +package com.jozufozu.flywheel.backend; import java.io.BufferedReader; import java.io.File; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/RenderUtil.java b/src/main/java/com/jozufozu/flywheel/backend/RenderUtil.java similarity index 97% rename from src/main/java/com/simibubi/create/foundation/render/backend/RenderUtil.java rename to src/main/java/com/jozufozu/flywheel/backend/RenderUtil.java index 46c89647d..9fd6d2897 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/RenderUtil.java +++ b/src/main/java/com/jozufozu/flywheel/backend/RenderUtil.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend; +package com.jozufozu.flywheel.backend; import java.util.function.Supplier; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/RenderWork.java b/src/main/java/com/jozufozu/flywheel/backend/RenderWork.java similarity index 87% rename from src/main/java/com/simibubi/create/foundation/render/backend/RenderWork.java rename to src/main/java/com/jozufozu/flywheel/backend/RenderWork.java index b20f1d64e..1e197860c 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/RenderWork.java +++ b/src/main/java/com/jozufozu/flywheel/backend/RenderWork.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend; +package com.jozufozu.flywheel.backend; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/ShaderLoader.java b/src/main/java/com/jozufozu/flywheel/backend/ShaderLoader.java similarity index 91% rename from src/main/java/com/simibubi/create/foundation/render/backend/ShaderLoader.java rename to src/main/java/com/jozufozu/flywheel/backend/ShaderLoader.java index b58761b3c..abd224f1a 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/ShaderLoader.java +++ b/src/main/java/com/jozufozu/flywheel/backend/ShaderLoader.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend; +package com.jozufozu.flywheel.backend; import java.io.BufferedReader; import java.io.FileInputStream; @@ -25,14 +25,14 @@ import java.util.stream.Stream; import org.lwjgl.system.MemoryUtil; import com.google.common.collect.Lists; +import com.jozufozu.flywheel.backend.gl.attrib.IVertexAttrib; +import com.jozufozu.flywheel.backend.gl.shader.GlProgram; +import com.jozufozu.flywheel.backend.gl.shader.GlShader; +import com.jozufozu.flywheel.backend.gl.shader.IMultiProgram; +import com.jozufozu.flywheel.backend.gl.shader.ProgramSpec; +import com.jozufozu.flywheel.backend.gl.shader.ShaderConstants; +import com.jozufozu.flywheel.backend.gl.shader.ShaderType; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.foundation.render.backend.gl.attrib.IVertexAttrib; -import com.simibubi.create.foundation.render.backend.gl.shader.GlProgram; -import com.simibubi.create.foundation.render.backend.gl.shader.GlShader; -import com.simibubi.create.foundation.render.backend.gl.shader.IMultiProgram; -import com.simibubi.create.foundation.render.backend.gl.shader.ProgramSpec; -import com.simibubi.create.foundation.render.backend.gl.shader.ShaderConstants; -import com.simibubi.create.foundation.render.backend.gl.shader.ShaderType; import net.minecraft.resources.IResource; import net.minecraft.resources.IResourceManager; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/core/BasicAttributes.java b/src/main/java/com/jozufozu/flywheel/backend/core/BasicAttributes.java similarity index 64% rename from src/main/java/com/simibubi/create/foundation/render/backend/core/BasicAttributes.java rename to src/main/java/com/jozufozu/flywheel/backend/core/BasicAttributes.java index 8721aac88..1592e99fd 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/core/BasicAttributes.java +++ b/src/main/java/com/jozufozu/flywheel/backend/core/BasicAttributes.java @@ -1,8 +1,8 @@ -package com.simibubi.create.foundation.render.backend.core; +package com.jozufozu.flywheel.backend.core; -import com.simibubi.create.foundation.render.backend.gl.attrib.CommonAttributes; -import com.simibubi.create.foundation.render.backend.gl.attrib.IAttribSpec; -import com.simibubi.create.foundation.render.backend.gl.attrib.IVertexAttrib; +import com.jozufozu.flywheel.backend.gl.attrib.CommonAttributes; +import com.jozufozu.flywheel.backend.gl.attrib.IAttribSpec; +import com.jozufozu.flywheel.backend.gl.attrib.IVertexAttrib; public enum BasicAttributes implements IVertexAttrib { LIGHT("aLight", CommonAttributes.LIGHT), diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/core/BasicData.java b/src/main/java/com/jozufozu/flywheel/backend/core/BasicData.java similarity index 87% rename from src/main/java/com/simibubi/create/foundation/render/backend/core/BasicData.java rename to src/main/java/com/jozufozu/flywheel/backend/core/BasicData.java index 531b2d929..2f910eff4 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/core/BasicData.java +++ b/src/main/java/com/jozufozu/flywheel/backend/core/BasicData.java @@ -1,9 +1,9 @@ -package com.simibubi.create.foundation.render.backend.core; +package com.jozufozu.flywheel.backend.core; import java.nio.ByteBuffer; -import com.simibubi.create.foundation.render.backend.instancing.InstanceData; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstanceData; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; public class BasicData extends InstanceData implements IFlatLight { diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/core/BasicProgram.java b/src/main/java/com/jozufozu/flywheel/backend/core/BasicProgram.java similarity index 86% rename from src/main/java/com/simibubi/create/foundation/render/backend/core/BasicProgram.java rename to src/main/java/com/jozufozu/flywheel/backend/core/BasicProgram.java index 76f9460bc..cb8edd2b6 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/core/BasicProgram.java +++ b/src/main/java/com/jozufozu/flywheel/backend/core/BasicProgram.java @@ -1,9 +1,9 @@ -package com.simibubi.create.foundation.render.backend.core; +package com.jozufozu.flywheel.backend.core; import org.lwjgl.opengl.GL20; -import com.simibubi.create.foundation.render.backend.gl.shader.GlProgram; -import com.simibubi.create.foundation.render.backend.gl.shader.ProgramFogMode; +import com.jozufozu.flywheel.backend.gl.shader.GlProgram; +import com.jozufozu.flywheel.backend.gl.shader.ProgramFogMode; import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/core/IFlatLight.java b/src/main/java/com/jozufozu/flywheel/backend/core/IFlatLight.java similarity index 85% rename from src/main/java/com/simibubi/create/foundation/render/backend/core/IFlatLight.java rename to src/main/java/com/jozufozu/flywheel/backend/core/IFlatLight.java index fbbdd58b2..7b6885c12 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/core/IFlatLight.java +++ b/src/main/java/com/jozufozu/flywheel/backend/core/IFlatLight.java @@ -1,6 +1,6 @@ -package com.simibubi.create.foundation.render.backend.core; +package com.jozufozu.flywheel.backend.core; -import com.simibubi.create.foundation.render.backend.instancing.InstanceData; +import com.jozufozu.flywheel.backend.instancing.InstanceData; /** * An interface that implementors of {@link InstanceData} should also implement diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/core/ModelAttributes.java b/src/main/java/com/jozufozu/flywheel/backend/core/ModelAttributes.java similarity index 61% rename from src/main/java/com/simibubi/create/foundation/render/backend/core/ModelAttributes.java rename to src/main/java/com/jozufozu/flywheel/backend/core/ModelAttributes.java index 970fd672e..c5ba5e858 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/core/ModelAttributes.java +++ b/src/main/java/com/jozufozu/flywheel/backend/core/ModelAttributes.java @@ -1,9 +1,9 @@ -package com.simibubi.create.foundation.render.backend.core; +package com.jozufozu.flywheel.backend.core; -import com.simibubi.create.foundation.render.backend.gl.attrib.CommonAttributes; -import com.simibubi.create.foundation.render.backend.gl.attrib.IAttribSpec; -import com.simibubi.create.foundation.render.backend.gl.attrib.IVertexAttrib; -import com.simibubi.create.foundation.render.backend.gl.attrib.VertexAttribSpec; +import com.jozufozu.flywheel.backend.gl.attrib.CommonAttributes; +import com.jozufozu.flywheel.backend.gl.attrib.IAttribSpec; +import com.jozufozu.flywheel.backend.gl.attrib.IVertexAttrib; +import com.jozufozu.flywheel.backend.gl.attrib.VertexAttribSpec; public enum ModelAttributes implements IVertexAttrib { VERTEX_POSITION("aPos", CommonAttributes.VEC3), diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/core/ModelData.java b/src/main/java/com/jozufozu/flywheel/backend/core/ModelData.java similarity index 73% rename from src/main/java/com/simibubi/create/foundation/render/backend/core/ModelData.java rename to src/main/java/com/jozufozu/flywheel/backend/core/ModelData.java index c2f338bf6..cef67d359 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/core/ModelData.java +++ b/src/main/java/com/jozufozu/flywheel/backend/core/ModelData.java @@ -1,10 +1,10 @@ -package com.simibubi.create.foundation.render.backend.core; +package com.jozufozu.flywheel.backend.core; import java.nio.ByteBuffer; +import com.jozufozu.flywheel.backend.RenderUtil; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.foundation.render.backend.RenderUtil; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; public class ModelData extends BasicData { private static final float[] empty = new float[25]; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/core/OrientedAttributes.java b/src/main/java/com/jozufozu/flywheel/backend/core/OrientedAttributes.java similarity index 67% rename from src/main/java/com/simibubi/create/foundation/render/backend/core/OrientedAttributes.java rename to src/main/java/com/jozufozu/flywheel/backend/core/OrientedAttributes.java index 135958501..a92ed42ac 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/core/OrientedAttributes.java +++ b/src/main/java/com/jozufozu/flywheel/backend/core/OrientedAttributes.java @@ -1,8 +1,8 @@ -package com.simibubi.create.foundation.render.backend.core; +package com.jozufozu.flywheel.backend.core; -import com.simibubi.create.foundation.render.backend.gl.attrib.CommonAttributes; -import com.simibubi.create.foundation.render.backend.gl.attrib.IAttribSpec; -import com.simibubi.create.foundation.render.backend.gl.attrib.IVertexAttrib; +import com.jozufozu.flywheel.backend.gl.attrib.CommonAttributes; +import com.jozufozu.flywheel.backend.gl.attrib.IAttribSpec; +import com.jozufozu.flywheel.backend.gl.attrib.IVertexAttrib; public enum OrientedAttributes implements IVertexAttrib { INSTANCE_POS("aInstancePos", CommonAttributes.VEC3), diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/core/OrientedData.java b/src/main/java/com/jozufozu/flywheel/backend/core/OrientedData.java similarity index 93% rename from src/main/java/com/simibubi/create/foundation/render/backend/core/OrientedData.java rename to src/main/java/com/jozufozu/flywheel/backend/core/OrientedData.java index 77becf79e..209458c17 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/core/OrientedData.java +++ b/src/main/java/com/jozufozu/flywheel/backend/core/OrientedData.java @@ -1,8 +1,8 @@ -package com.simibubi.create.foundation.render.backend.core; +package com.jozufozu.flywheel.backend.core; import java.nio.ByteBuffer; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Quaternion; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/core/OrientedModel.java b/src/main/java/com/jozufozu/flywheel/backend/core/OrientedModel.java similarity index 65% rename from src/main/java/com/simibubi/create/foundation/render/backend/core/OrientedModel.java rename to src/main/java/com/jozufozu/flywheel/backend/core/OrientedModel.java index 42ee8334b..76ed0baac 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/core/OrientedModel.java +++ b/src/main/java/com/jozufozu/flywheel/backend/core/OrientedModel.java @@ -1,8 +1,8 @@ -package com.simibubi.create.foundation.render.backend.core; +package com.jozufozu.flywheel.backend.core; -import com.simibubi.create.foundation.render.backend.gl.attrib.VertexFormat; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.gl.attrib.VertexFormat; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/core/PartialModel.java b/src/main/java/com/jozufozu/flywheel/backend/core/PartialModel.java similarity index 96% rename from src/main/java/com/simibubi/create/foundation/render/backend/core/PartialModel.java rename to src/main/java/com/jozufozu/flywheel/backend/core/PartialModel.java index 87fafb9dd..da0ebc65e 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/core/PartialModel.java +++ b/src/main/java/com/jozufozu/flywheel/backend/core/PartialModel.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.core; +package com.jozufozu.flywheel.backend.core; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/core/TransformAttributes.java b/src/main/java/com/jozufozu/flywheel/backend/core/TransformAttributes.java similarity index 65% rename from src/main/java/com/simibubi/create/foundation/render/backend/core/TransformAttributes.java rename to src/main/java/com/jozufozu/flywheel/backend/core/TransformAttributes.java index f35cdf988..a94064541 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/core/TransformAttributes.java +++ b/src/main/java/com/jozufozu/flywheel/backend/core/TransformAttributes.java @@ -1,8 +1,8 @@ -package com.simibubi.create.foundation.render.backend.core; +package com.jozufozu.flywheel.backend.core; -import com.simibubi.create.foundation.render.backend.gl.attrib.IAttribSpec; -import com.simibubi.create.foundation.render.backend.gl.attrib.IVertexAttrib; -import com.simibubi.create.foundation.render.backend.gl.attrib.MatrixAttributes; +import com.jozufozu.flywheel.backend.gl.attrib.IAttribSpec; +import com.jozufozu.flywheel.backend.gl.attrib.IVertexAttrib; +import com.jozufozu.flywheel.backend.gl.attrib.MatrixAttributes; public enum TransformAttributes implements IVertexAttrib { TRANSFORM("aTransform", MatrixAttributes.MAT4), diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/core/TransformedModel.java b/src/main/java/com/jozufozu/flywheel/backend/core/TransformedModel.java similarity index 65% rename from src/main/java/com/simibubi/create/foundation/render/backend/core/TransformedModel.java rename to src/main/java/com/jozufozu/flywheel/backend/core/TransformedModel.java index e5fd44ed1..04436dc0b 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/core/TransformedModel.java +++ b/src/main/java/com/jozufozu/flywheel/backend/core/TransformedModel.java @@ -1,8 +1,8 @@ -package com.simibubi.create.foundation.render.backend.core; +package com.jozufozu.flywheel.backend.core; -import com.simibubi.create.foundation.render.backend.gl.attrib.VertexFormat; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.gl.attrib.VertexFormat; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/effects/ColorMatrices.java b/src/main/java/com/jozufozu/flywheel/backend/effects/ColorMatrices.java similarity index 98% rename from src/main/java/com/simibubi/create/foundation/render/backend/effects/ColorMatrices.java rename to src/main/java/com/jozufozu/flywheel/backend/effects/ColorMatrices.java index 0cba9a59c..fc78551d8 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/effects/ColorMatrices.java +++ b/src/main/java/com/jozufozu/flywheel/backend/effects/ColorMatrices.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.effects; +package com.jozufozu.flywheel.backend.effects; import com.simibubi.create.foundation.utility.AngleHelper; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/effects/EffectsHandler.java b/src/main/java/com/jozufozu/flywheel/backend/effects/EffectsHandler.java similarity index 92% rename from src/main/java/com/simibubi/create/foundation/render/backend/effects/EffectsHandler.java rename to src/main/java/com/jozufozu/flywheel/backend/effects/EffectsHandler.java index a079c039b..4227ed861 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/effects/EffectsHandler.java +++ b/src/main/java/com/jozufozu/flywheel/backend/effects/EffectsHandler.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.effects; +package com.jozufozu.flywheel.backend.effects; import java.util.ArrayList; @@ -7,12 +7,12 @@ import org.lwjgl.opengl.GL15; import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL30; +import com.jozufozu.flywheel.backend.Backend; +import com.jozufozu.flywheel.backend.RenderUtil; +import com.jozufozu.flywheel.backend.gl.GlBuffer; +import com.jozufozu.flywheel.backend.gl.GlPrimitiveType; +import com.jozufozu.flywheel.backend.gl.GlVertexArray; import com.simibubi.create.foundation.render.AllProgramSpecs; -import com.simibubi.create.foundation.render.backend.Backend; -import com.simibubi.create.foundation.render.backend.RenderUtil; -import com.simibubi.create.foundation.render.backend.gl.GlBuffer; -import com.simibubi.create.foundation.render.backend.gl.GlPrimitiveType; -import com.simibubi.create.foundation.render.backend.gl.GlVertexArray; import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.client.MainWindow; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/effects/FilterSphere.java b/src/main/java/com/jozufozu/flywheel/backend/effects/FilterSphere.java similarity index 86% rename from src/main/java/com/simibubi/create/foundation/render/backend/effects/FilterSphere.java rename to src/main/java/com/jozufozu/flywheel/backend/effects/FilterSphere.java index 91499610f..e7485a705 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/effects/FilterSphere.java +++ b/src/main/java/com/jozufozu/flywheel/backend/effects/FilterSphere.java @@ -1,8 +1,8 @@ -package com.simibubi.create.foundation.render.backend.effects; +package com.jozufozu.flywheel.backend.effects; import java.nio.FloatBuffer; -import com.simibubi.create.foundation.render.backend.RenderUtil; +import com.jozufozu.flywheel.backend.RenderUtil; import net.minecraft.util.math.vector.Matrix4f; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/effects/ScreenQuadAttributes.java b/src/main/java/com/jozufozu/flywheel/backend/effects/ScreenQuadAttributes.java similarity index 63% rename from src/main/java/com/simibubi/create/foundation/render/backend/effects/ScreenQuadAttributes.java rename to src/main/java/com/jozufozu/flywheel/backend/effects/ScreenQuadAttributes.java index 5b81e2383..40fd47ac8 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/effects/ScreenQuadAttributes.java +++ b/src/main/java/com/jozufozu/flywheel/backend/effects/ScreenQuadAttributes.java @@ -1,8 +1,8 @@ -package com.simibubi.create.foundation.render.backend.effects; +package com.jozufozu.flywheel.backend.effects; -import com.simibubi.create.foundation.render.backend.gl.attrib.CommonAttributes; -import com.simibubi.create.foundation.render.backend.gl.attrib.IAttribSpec; -import com.simibubi.create.foundation.render.backend.gl.attrib.IVertexAttrib; +import com.jozufozu.flywheel.backend.gl.attrib.CommonAttributes; +import com.jozufozu.flywheel.backend.gl.attrib.IAttribSpec; +import com.jozufozu.flywheel.backend.gl.attrib.IVertexAttrib; public enum ScreenQuadAttributes implements IVertexAttrib { INSTANCE_POS("aVertex", CommonAttributes.VEC4), diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/effects/SphereFilterProgram.java b/src/main/java/com/jozufozu/flywheel/backend/effects/SphereFilterProgram.java similarity index 93% rename from src/main/java/com/simibubi/create/foundation/render/backend/effects/SphereFilterProgram.java rename to src/main/java/com/jozufozu/flywheel/backend/effects/SphereFilterProgram.java index 229aa2f5c..f0aae1390 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/effects/SphereFilterProgram.java +++ b/src/main/java/com/jozufozu/flywheel/backend/effects/SphereFilterProgram.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.effects; +package com.jozufozu.flywheel.backend.effects; import java.nio.FloatBuffer; import java.util.ArrayList; @@ -6,8 +6,8 @@ import java.util.ArrayList; import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL31; -import com.simibubi.create.foundation.render.backend.gl.GlBuffer; -import com.simibubi.create.foundation.render.backend.gl.shader.GlProgram; +import com.jozufozu.flywheel.backend.gl.GlBuffer; +import com.jozufozu.flywheel.backend.gl.shader.GlProgram; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.vector.Matrix4f; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/GlBuffer.java b/src/main/java/com/jozufozu/flywheel/backend/gl/GlBuffer.java similarity index 91% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/GlBuffer.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/GlBuffer.java index 75e634063..7a70c600d 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/GlBuffer.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/GlBuffer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.gl; +package com.jozufozu.flywheel.backend.gl; import java.nio.ByteBuffer; import java.util.function.Consumer; @@ -6,7 +6,7 @@ import java.util.function.Consumer; import org.lwjgl.opengl.GL15; import org.lwjgl.opengl.GL20; -import com.simibubi.create.foundation.render.backend.Backend; +import com.jozufozu.flywheel.backend.Backend; public class GlBuffer extends GlObject { diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/GlFog.java b/src/main/java/com/jozufozu/flywheel/backend/gl/GlFog.java similarity index 94% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/GlFog.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/GlFog.java index 6dfab5be8..2ad61fcf2 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/GlFog.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/GlFog.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.gl; +package com.jozufozu.flywheel.backend.gl; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/GlFogMode.java b/src/main/java/com/jozufozu/flywheel/backend/gl/GlFogMode.java similarity index 85% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/GlFogMode.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/GlFogMode.java index eb333c732..ebb2354bb 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/GlFogMode.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/GlFogMode.java @@ -1,10 +1,10 @@ -package com.simibubi.create.foundation.render.backend.gl; +package com.jozufozu.flywheel.backend.gl; import java.util.Collections; import java.util.List; import com.google.common.collect.Lists; -import com.simibubi.create.foundation.render.backend.gl.shader.ProgramFogMode; +import com.jozufozu.flywheel.backend.gl.shader.ProgramFogMode; public enum GlFogMode { NONE(ProgramFogMode.None::new), diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/GlObject.java b/src/main/java/com/jozufozu/flywheel/backend/gl/GlObject.java similarity index 93% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/GlObject.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/GlObject.java index 5bc642869..1d13d8871 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/GlObject.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/GlObject.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.gl; +package com.jozufozu.flywheel.backend.gl; // Utility class for safely dealing with gl object handles. public abstract class GlObject { diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/GlPrimitiveType.java b/src/main/java/com/jozufozu/flywheel/backend/gl/GlPrimitiveType.java similarity index 93% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/GlPrimitiveType.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/GlPrimitiveType.java index da1d0efba..3a143e3cf 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/GlPrimitiveType.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/GlPrimitiveType.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.gl; +package com.jozufozu.flywheel.backend.gl; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/GlTexture.java b/src/main/java/com/jozufozu/flywheel/backend/gl/GlTexture.java similarity index 88% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/GlTexture.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/GlTexture.java index 67fbd8dc5..76e637a6e 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/GlTexture.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/GlTexture.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.gl; +package com.jozufozu.flywheel.backend.gl; import org.lwjgl.opengl.GL20; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/GlVertexArray.java b/src/main/java/com/jozufozu/flywheel/backend/gl/GlVertexArray.java similarity index 80% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/GlVertexArray.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/GlVertexArray.java index baf9e9545..4cfb770d9 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/GlVertexArray.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/GlVertexArray.java @@ -1,8 +1,8 @@ -package com.simibubi.create.foundation.render.backend.gl; +package com.jozufozu.flywheel.backend.gl; import java.util.function.Consumer; -import com.simibubi.create.foundation.render.backend.Backend; +import com.jozufozu.flywheel.backend.Backend; public class GlVertexArray extends GlObject { public GlVertexArray() { diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/attrib/CommonAttributes.java b/src/main/java/com/jozufozu/flywheel/backend/gl/attrib/CommonAttributes.java similarity index 88% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/attrib/CommonAttributes.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/attrib/CommonAttributes.java index 5c1a3a91a..99f754efe 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/attrib/CommonAttributes.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/attrib/CommonAttributes.java @@ -1,6 +1,6 @@ -package com.simibubi.create.foundation.render.backend.gl.attrib; +package com.jozufozu.flywheel.backend.gl.attrib; -import com.simibubi.create.foundation.render.backend.gl.GlPrimitiveType; +import com.jozufozu.flywheel.backend.gl.GlPrimitiveType; public class CommonAttributes { diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/attrib/IAttribSpec.java b/src/main/java/com/jozufozu/flywheel/backend/gl/attrib/IAttribSpec.java similarity index 68% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/attrib/IAttribSpec.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/attrib/IAttribSpec.java index 31369cd3f..779d5c502 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/attrib/IAttribSpec.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/attrib/IAttribSpec.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.gl.attrib; +package com.jozufozu.flywheel.backend.gl.attrib; public interface IAttribSpec { diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/attrib/IVertexAttrib.java b/src/main/java/com/jozufozu/flywheel/backend/gl/attrib/IVertexAttrib.java similarity index 66% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/attrib/IVertexAttrib.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/attrib/IVertexAttrib.java index 335ba8644..5775962d8 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/attrib/IVertexAttrib.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/attrib/IVertexAttrib.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.gl.attrib; +package com.jozufozu.flywheel.backend.gl.attrib; public interface IVertexAttrib { diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/attrib/MatrixAttributes.java b/src/main/java/com/jozufozu/flywheel/backend/gl/attrib/MatrixAttributes.java similarity index 84% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/attrib/MatrixAttributes.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/attrib/MatrixAttributes.java index 0e57cf59f..86cf089aa 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/attrib/MatrixAttributes.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/attrib/MatrixAttributes.java @@ -1,8 +1,8 @@ -package com.simibubi.create.foundation.render.backend.gl.attrib; +package com.jozufozu.flywheel.backend.gl.attrib; import org.lwjgl.opengl.GL20; -import com.simibubi.create.foundation.render.backend.gl.GlPrimitiveType; +import com.jozufozu.flywheel.backend.gl.GlPrimitiveType; public enum MatrixAttributes implements IAttribSpec { MAT3(3, 3), diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/attrib/VertexAttribSpec.java b/src/main/java/com/jozufozu/flywheel/backend/gl/attrib/VertexAttribSpec.java similarity index 87% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/attrib/VertexAttribSpec.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/attrib/VertexAttribSpec.java index a9b451d01..7717114ab 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/attrib/VertexAttribSpec.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/attrib/VertexAttribSpec.java @@ -1,8 +1,8 @@ -package com.simibubi.create.foundation.render.backend.gl.attrib; +package com.jozufozu.flywheel.backend.gl.attrib; import org.lwjgl.opengl.GL20; -import com.simibubi.create.foundation.render.backend.gl.GlPrimitiveType; +import com.jozufozu.flywheel.backend.gl.GlPrimitiveType; public class VertexAttribSpec implements IAttribSpec { diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/attrib/VertexFormat.java b/src/main/java/com/jozufozu/flywheel/backend/gl/attrib/VertexFormat.java similarity index 95% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/attrib/VertexFormat.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/attrib/VertexFormat.java index 9a3fc8601..714c7e677 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/attrib/VertexFormat.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/attrib/VertexFormat.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.gl.attrib; +package com.jozufozu.flywheel.backend.gl.attrib; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/FogSensitiveProgram.java b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/FogSensitiveProgram.java similarity index 84% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/FogSensitiveProgram.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/shader/FogSensitiveProgram.java index b308a6bd3..3a04cd9f4 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/FogSensitiveProgram.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/FogSensitiveProgram.java @@ -1,11 +1,11 @@ -package com.simibubi.create.foundation.render.backend.gl.shader; +package com.jozufozu.flywheel.backend.gl.shader; import java.util.EnumMap; import java.util.Map; -import com.simibubi.create.foundation.render.backend.ShaderLoader; -import com.simibubi.create.foundation.render.backend.gl.GlFog; -import com.simibubi.create.foundation.render.backend.gl.GlFogMode; +import com.jozufozu.flywheel.backend.ShaderLoader; +import com.jozufozu.flywheel.backend.gl.GlFog; +import com.jozufozu.flywheel.backend.gl.GlFogMode; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/GLSLType.java b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/GLSLType.java similarity index 89% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/GLSLType.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/shader/GLSLType.java index 30037b7c2..0ef93042d 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/GLSLType.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/GLSLType.java @@ -1,6 +1,6 @@ -package com.simibubi.create.foundation.render.backend.gl.shader; +package com.jozufozu.flywheel.backend.gl.shader; -import com.simibubi.create.foundation.render.backend.gl.GlPrimitiveType; +import com.jozufozu.flywheel.backend.gl.GlPrimitiveType; public class GLSLType { public static final GLSLType FLOAT = new GLSLType("mat4", GlPrimitiveType.FLOAT, 16); diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/GlProgram.java b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlProgram.java similarity index 91% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/GlProgram.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlProgram.java index f416f072c..89eabc9d0 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/GlProgram.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlProgram.java @@ -1,13 +1,13 @@ -package com.simibubi.create.foundation.render.backend.gl.shader; +package com.jozufozu.flywheel.backend.gl.shader; import java.util.Collection; import org.lwjgl.opengl.GL20; -import com.simibubi.create.foundation.render.backend.Backend; -import com.simibubi.create.foundation.render.backend.RenderUtil; -import com.simibubi.create.foundation.render.backend.gl.GlObject; -import com.simibubi.create.foundation.render.backend.gl.attrib.IVertexAttrib; +import com.jozufozu.flywheel.backend.Backend; +import com.jozufozu.flywheel.backend.RenderUtil; +import com.jozufozu.flywheel.backend.gl.GlObject; +import com.jozufozu.flywheel.backend.gl.attrib.IVertexAttrib; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.vector.Matrix4f; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/GlShader.java b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlShader.java similarity index 79% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/GlShader.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlShader.java index 208b3843d..6b1cd8cca 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/GlShader.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/GlShader.java @@ -1,10 +1,10 @@ -package com.simibubi.create.foundation.render.backend.gl.shader; +package com.jozufozu.flywheel.backend.gl.shader; import org.lwjgl.opengl.GL20; -import com.simibubi.create.foundation.render.backend.Backend; -import com.simibubi.create.foundation.render.backend.gl.GlObject; -import com.simibubi.create.foundation.render.backend.gl.versioned.GlCompat; +import com.jozufozu.flywheel.backend.Backend; +import com.jozufozu.flywheel.backend.gl.GlObject; +import com.jozufozu.flywheel.backend.gl.versioned.GlCompat; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/IMultiProgram.java b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/IMultiProgram.java similarity index 87% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/IMultiProgram.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/shader/IMultiProgram.java index 072c8ab31..950bcddc1 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/IMultiProgram.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/IMultiProgram.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.gl.shader; +package com.jozufozu.flywheel.backend.gl.shader; /** * Encapsulates any number of shader programs for use in similar contexts. diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ProgramFogMode.java b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/ProgramFogMode.java similarity index 90% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ProgramFogMode.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/shader/ProgramFogMode.java index f0cb24123..ec1048f9b 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ProgramFogMode.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/ProgramFogMode.java @@ -1,8 +1,8 @@ -package com.simibubi.create.foundation.render.backend.gl.shader; +package com.jozufozu.flywheel.backend.gl.shader; import org.lwjgl.opengl.GL20; -import com.simibubi.create.foundation.render.backend.gl.GlFog; +import com.jozufozu.flywheel.backend.gl.GlFog; public abstract class ProgramFogMode { diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ProgramSpec.java b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/ProgramSpec.java similarity index 93% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ProgramSpec.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/shader/ProgramSpec.java index 367f47020..f3c4036c4 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ProgramSpec.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/ProgramSpec.java @@ -1,10 +1,10 @@ -package com.simibubi.create.foundation.render.backend.gl.shader; +package com.jozufozu.flywheel.backend.gl.shader; import java.util.ArrayList; import java.util.Arrays; +import com.jozufozu.flywheel.backend.gl.attrib.IVertexAttrib; import com.simibubi.create.Create; -import com.simibubi.create.foundation.render.backend.gl.attrib.IVertexAttrib; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ShaderCallback.java b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/ShaderCallback.java similarity index 83% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ShaderCallback.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/shader/ShaderCallback.java index e6e17c096..cdf5cf2ff 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ShaderCallback.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/ShaderCallback.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.gl.shader; +package com.jozufozu.flywheel.backend.gl.shader; /** * A Callback for when a shader is called. Used to define shader uniforms. diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ShaderConstants.java b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/ShaderConstants.java similarity index 95% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ShaderConstants.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/shader/ShaderConstants.java index 3d1780628..7822c3553 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ShaderConstants.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/ShaderConstants.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.gl.shader; +package com.jozufozu.flywheel.backend.gl.shader; import java.io.BufferedReader; import java.io.StringReader; diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/shader/ShaderSpecLoader.java b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/ShaderSpecLoader.java new file mode 100644 index 000000000..a0d2d7d21 --- /dev/null +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/ShaderSpecLoader.java @@ -0,0 +1,7 @@ +package com.jozufozu.flywheel.backend.gl.shader; + +import com.jozufozu.flywheel.backend.ShaderLoader; + +public interface ShaderSpecLoader

{ + IMultiProgram

create(ShaderLoader loader, ProgramSpec

spec); +} diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ShaderType.java b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/ShaderType.java similarity index 76% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ShaderType.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/shader/ShaderType.java index 63be397f2..8f6ec6801 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ShaderType.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/ShaderType.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.gl.shader; +package com.jozufozu.flywheel.backend.gl.shader; import org.lwjgl.opengl.GL20; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/SingleProgram.java b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/SingleProgram.java similarity index 87% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/SingleProgram.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/shader/SingleProgram.java index 832e6d8e3..b4fff4541 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/SingleProgram.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/shader/SingleProgram.java @@ -1,6 +1,6 @@ -package com.simibubi.create.foundation.render.backend.gl.shader; +package com.jozufozu.flywheel.backend.gl.shader; -import com.simibubi.create.foundation.render.backend.ShaderLoader; +import com.jozufozu.flywheel.backend.ShaderLoader; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/GlCompat.java b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/GlCompat.java similarity index 86% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/GlCompat.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/versioned/GlCompat.java index c55dbc4d2..17eeecef4 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/GlCompat.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/GlCompat.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.gl.versioned; +package com.jozufozu.flywheel.backend.gl.versioned; import java.nio.ByteBuffer; import java.util.Arrays; @@ -9,11 +9,11 @@ import org.lwjgl.opengl.GLCapabilities; import org.lwjgl.system.MemoryStack; import org.lwjgl.system.MemoryUtil; -import com.simibubi.create.foundation.render.backend.gl.versioned.framebuffer.Blit; -import com.simibubi.create.foundation.render.backend.gl.versioned.framebuffer.Framebuffer; -import com.simibubi.create.foundation.render.backend.gl.versioned.instancing.DrawInstanced; -import com.simibubi.create.foundation.render.backend.gl.versioned.instancing.InstancedArrays; -import com.simibubi.create.foundation.render.backend.gl.versioned.instancing.VertexArrayObject; +import com.jozufozu.flywheel.backend.gl.versioned.framebuffer.Blit; +import com.jozufozu.flywheel.backend.gl.versioned.framebuffer.Framebuffer; +import com.jozufozu.flywheel.backend.gl.versioned.instancing.DrawInstanced; +import com.jozufozu.flywheel.backend.gl.versioned.instancing.InstancedArrays; +import com.jozufozu.flywheel.backend.gl.versioned.instancing.VertexArrayObject; /** * An instance of this class stores information diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/GlVersioned.java b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/GlVersioned.java similarity index 88% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/GlVersioned.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/versioned/GlVersioned.java index a670cd8f9..d019832b7 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/GlVersioned.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/GlVersioned.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.gl.versioned; +package com.jozufozu.flywheel.backend.gl.versioned; import org.lwjgl.opengl.GLCapabilities; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/MapBuffer.java b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/MapBuffer.java similarity index 96% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/MapBuffer.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/versioned/MapBuffer.java index dc11699fb..27636f949 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/MapBuffer.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/MapBuffer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.gl.versioned; +package com.jozufozu.flywheel.backend.gl.versioned; import java.nio.ByteBuffer; import java.util.function.Consumer; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/RGPixelFormat.java b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/RGPixelFormat.java similarity index 94% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/RGPixelFormat.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/versioned/RGPixelFormat.java index 62233e7b4..339289894 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/RGPixelFormat.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/RGPixelFormat.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.gl.versioned; +package com.jozufozu.flywheel.backend.gl.versioned; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL30; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/framebuffer/Blit.java b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/framebuffer/Blit.java similarity index 89% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/framebuffer/Blit.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/versioned/framebuffer/Blit.java index b5809fa29..fdf5473d1 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/framebuffer/Blit.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/framebuffer/Blit.java @@ -1,10 +1,10 @@ -package com.simibubi.create.foundation.render.backend.gl.versioned.framebuffer; +package com.jozufozu.flywheel.backend.gl.versioned.framebuffer; import org.lwjgl.opengl.EXTFramebufferBlit; import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GLCapabilities; -import com.simibubi.create.foundation.render.backend.gl.versioned.GlVersioned; +import com.jozufozu.flywheel.backend.gl.versioned.GlVersioned; public enum Blit implements GlVersioned { CORE { diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/framebuffer/Framebuffer.java b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/framebuffer/Framebuffer.java similarity index 89% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/framebuffer/Framebuffer.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/versioned/framebuffer/Framebuffer.java index 02b64c8d5..a0e2b3e1b 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/framebuffer/Framebuffer.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/framebuffer/Framebuffer.java @@ -1,11 +1,11 @@ -package com.simibubi.create.foundation.render.backend.gl.versioned.framebuffer; +package com.jozufozu.flywheel.backend.gl.versioned.framebuffer; import org.lwjgl.opengl.ARBFramebufferObject; import org.lwjgl.opengl.EXTFramebufferObject; import org.lwjgl.opengl.GL30C; import org.lwjgl.opengl.GLCapabilities; -import com.simibubi.create.foundation.render.backend.gl.versioned.GlVersioned; +import com.jozufozu.flywheel.backend.gl.versioned.GlVersioned; public enum Framebuffer implements GlVersioned { CORE { diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/DrawInstanced.java b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/instancing/DrawInstanced.java similarity index 90% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/DrawInstanced.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/versioned/instancing/DrawInstanced.java index 063dab785..e30ba9bfc 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/DrawInstanced.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/instancing/DrawInstanced.java @@ -1,11 +1,11 @@ -package com.simibubi.create.foundation.render.backend.gl.versioned.instancing; +package com.jozufozu.flywheel.backend.gl.versioned.instancing; import org.lwjgl.opengl.ARBDrawInstanced; import org.lwjgl.opengl.EXTDrawInstanced; import org.lwjgl.opengl.GL31; import org.lwjgl.opengl.GLCapabilities; -import com.simibubi.create.foundation.render.backend.gl.versioned.GlVersioned; +import com.jozufozu.flywheel.backend.gl.versioned.GlVersioned; public enum DrawInstanced implements GlVersioned { GL31_DRAW_INSTANCED { diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/InstancedArrays.java b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/instancing/InstancedArrays.java similarity index 86% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/InstancedArrays.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/versioned/instancing/InstancedArrays.java index 6e2faf155..2c681d41d 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/InstancedArrays.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/instancing/InstancedArrays.java @@ -1,10 +1,10 @@ -package com.simibubi.create.foundation.render.backend.gl.versioned.instancing; +package com.jozufozu.flywheel.backend.gl.versioned.instancing; import org.lwjgl.opengl.ARBInstancedArrays; import org.lwjgl.opengl.GL33; import org.lwjgl.opengl.GLCapabilities; -import com.simibubi.create.foundation.render.backend.gl.versioned.GlVersioned; +import com.jozufozu.flywheel.backend.gl.versioned.GlVersioned; public enum InstancedArrays implements GlVersioned { GL33_INSTANCED_ARRAYS { diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/VertexArrayObject.java b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/instancing/VertexArrayObject.java similarity index 90% rename from src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/VertexArrayObject.java rename to src/main/java/com/jozufozu/flywheel/backend/gl/versioned/instancing/VertexArrayObject.java index 18023f9aa..4a2d13c11 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/VertexArrayObject.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/instancing/VertexArrayObject.java @@ -1,10 +1,10 @@ -package com.simibubi.create.foundation.render.backend.gl.versioned.instancing; +package com.jozufozu.flywheel.backend.gl.versioned.instancing; import org.lwjgl.opengl.ARBVertexArrayObject; import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GLCapabilities; -import com.simibubi.create.foundation.render.backend.gl.versioned.GlVersioned; +import com.jozufozu.flywheel.backend.gl.versioned.GlVersioned; public enum VertexArrayObject implements GlVersioned { GL30_VAO { diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/IDynamicInstance.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/IDynamicInstance.java similarity index 94% rename from src/main/java/com/simibubi/create/foundation/render/backend/instancing/IDynamicInstance.java rename to src/main/java/com/jozufozu/flywheel/backend/instancing/IDynamicInstance.java index a125fd11a..6e825639c 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/IDynamicInstance.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/IDynamicInstance.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.instancing; +package com.jozufozu.flywheel.backend.instancing; /** * An interface giving {@link TileEntityInstance}s a hook to have a function called at diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/IFlywheelWorld.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/IFlywheelWorld.java similarity index 82% rename from src/main/java/com/simibubi/create/foundation/render/backend/instancing/IFlywheelWorld.java rename to src/main/java/com/jozufozu/flywheel/backend/instancing/IFlywheelWorld.java index 86a00ab01..5a138fefc 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/IFlywheelWorld.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/IFlywheelWorld.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.instancing; +package com.jozufozu.flywheel.backend.instancing; /** * A marker interface custom worlds can override to indicate diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/IInstance.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/IInstance.java similarity index 83% rename from src/main/java/com/simibubi/create/foundation/render/backend/instancing/IInstance.java rename to src/main/java/com/jozufozu/flywheel/backend/instancing/IInstance.java index 88ec0eb22..32bab42ab 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/IInstance.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/IInstance.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.instancing; +package com.jozufozu.flywheel.backend.instancing; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/IInstanceRendered.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/IInstanceRendered.java similarity index 59% rename from src/main/java/com/simibubi/create/foundation/render/backend/instancing/IInstanceRendered.java rename to src/main/java/com/jozufozu/flywheel/backend/instancing/IInstanceRendered.java index 386fd9b9c..b9494058c 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/IInstanceRendered.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/IInstanceRendered.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.instancing; +package com.jozufozu.flywheel.backend.instancing; public interface IInstanceRendered { default boolean shouldRenderAsTE() { diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/IRendererFactory.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/IRendererFactory.java similarity index 75% rename from src/main/java/com/simibubi/create/foundation/render/backend/instancing/IRendererFactory.java rename to src/main/java/com/jozufozu/flywheel/backend/instancing/IRendererFactory.java index 206a7534e..7a00d4276 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/IRendererFactory.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/IRendererFactory.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.instancing; +package com.jozufozu.flywheel.backend.instancing; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/ITickableInstance.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/ITickableInstance.java similarity index 95% rename from src/main/java/com/simibubi/create/foundation/render/backend/instancing/ITickableInstance.java rename to src/main/java/com/jozufozu/flywheel/backend/instancing/ITickableInstance.java index c9280973b..e660195c1 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/ITickableInstance.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/ITickableInstance.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.instancing; +package com.jozufozu.flywheel.backend.instancing; /** * An interface giving {@link TileEntityInstance}s a hook to have a function called at diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstanceData.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/InstanceData.java similarity index 94% rename from src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstanceData.java rename to src/main/java/com/jozufozu/flywheel/backend/instancing/InstanceData.java index 14d5f1fb4..320432890 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstanceData.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/InstanceData.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.instancing; +package com.jozufozu.flywheel.backend.instancing; import java.nio.ByteBuffer; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstancedModel.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedModel.java similarity index 92% rename from src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstancedModel.java rename to src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedModel.java index 1ba9b45a1..53a21c878 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstancedModel.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedModel.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.instancing; +package com.jozufozu.flywheel.backend.instancing; import java.nio.ByteBuffer; @@ -9,12 +9,12 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL15; import org.lwjgl.opengl.GL20; -import com.simibubi.create.foundation.render.backend.Backend; -import com.simibubi.create.foundation.render.backend.BufferedModel; -import com.simibubi.create.foundation.render.backend.core.ModelAttributes; -import com.simibubi.create.foundation.render.backend.gl.GlBuffer; -import com.simibubi.create.foundation.render.backend.gl.GlVertexArray; -import com.simibubi.create.foundation.render.backend.gl.attrib.VertexFormat; +import com.jozufozu.flywheel.backend.Backend; +import com.jozufozu.flywheel.backend.BufferedModel; +import com.jozufozu.flywheel.backend.core.ModelAttributes; +import com.jozufozu.flywheel.backend.gl.GlBuffer; +import com.jozufozu.flywheel.backend.gl.GlVertexArray; +import com.jozufozu.flywheel.backend.gl.attrib.VertexFormat; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstancedTileRenderRegistry.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedTileRenderRegistry.java similarity index 93% rename from src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstancedTileRenderRegistry.java rename to src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedTileRenderRegistry.java index 19370f6a0..ff8a320fb 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstancedTileRenderRegistry.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedTileRenderRegistry.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.instancing; +package com.jozufozu.flywheel.backend.instancing; import java.util.Map; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstancedTileRenderer.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedTileRenderer.java similarity index 93% rename from src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstancedTileRenderer.java rename to src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedTileRenderer.java index 859550904..2bc2049d8 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstancedTileRenderer.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedTileRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.instancing; +package com.jozufozu.flywheel.backend.instancing; import java.util.ArrayList; import java.util.HashMap; @@ -6,13 +6,13 @@ import java.util.Map; import javax.annotation.Nullable; -import com.simibubi.create.foundation.render.backend.Backend; -import com.simibubi.create.foundation.render.backend.MaterialType; -import com.simibubi.create.foundation.render.backend.MaterialTypes; -import com.simibubi.create.foundation.render.backend.core.BasicProgram; -import com.simibubi.create.foundation.render.backend.core.ModelData; -import com.simibubi.create.foundation.render.backend.core.OrientedData; -import com.simibubi.create.foundation.render.backend.gl.shader.ShaderCallback; +import com.jozufozu.flywheel.backend.Backend; +import com.jozufozu.flywheel.backend.MaterialType; +import com.jozufozu.flywheel.backend.MaterialTypes; +import com.jozufozu.flywheel.backend.core.BasicProgram; +import com.jozufozu.flywheel.backend.core.ModelData; +import com.jozufozu.flywheel.backend.core.OrientedData; +import com.jozufozu.flywheel.backend.gl.shader.ShaderCallback; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ActiveRenderInfo; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/ModelFactory.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/ModelFactory.java similarity index 75% rename from src/main/java/com/simibubi/create/foundation/render/backend/instancing/ModelFactory.java rename to src/main/java/com/jozufozu/flywheel/backend/instancing/ModelFactory.java index 2042929a8..74edfc7b4 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/ModelFactory.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/ModelFactory.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.instancing; +package com.jozufozu.flywheel.backend.instancing; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/RenderMaterial.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/RenderMaterial.java similarity index 88% rename from src/main/java/com/simibubi/create/foundation/render/backend/instancing/RenderMaterial.java rename to src/main/java/com/jozufozu/flywheel/backend/instancing/RenderMaterial.java index bafe18da4..e29a9d5dd 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/RenderMaterial.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/RenderMaterial.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.instancing; +package com.jozufozu.flywheel.backend.instancing; import java.util.concurrent.ExecutionException; import java.util.function.Consumer; @@ -9,15 +9,15 @@ import org.apache.commons.lang3.tuple.Pair; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; +import com.jozufozu.flywheel.backend.Backend; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.RenderUtil; +import com.jozufozu.flywheel.backend.core.BasicProgram; +import com.jozufozu.flywheel.backend.core.PartialModel; +import com.jozufozu.flywheel.backend.gl.shader.ProgramSpec; +import com.jozufozu.flywheel.backend.gl.shader.ShaderCallback; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.foundation.render.SuperByteBufferCache; -import com.simibubi.create.foundation.render.backend.Backend; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.RenderUtil; -import com.simibubi.create.foundation.render.backend.core.BasicProgram; -import com.simibubi.create.foundation.render.backend.core.PartialModel; -import com.simibubi.create.foundation.render.backend.gl.shader.ProgramSpec; -import com.simibubi.create.foundation.render.backend.gl.shader.ShaderCallback; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/TileEntityInstance.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/TileEntityInstance.java similarity index 93% rename from src/main/java/com/simibubi/create/foundation/render/backend/instancing/TileEntityInstance.java rename to src/main/java/com/jozufozu/flywheel/backend/instancing/TileEntityInstance.java index f5f23f31a..292021e48 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/TileEntityInstance.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/TileEntityInstance.java @@ -1,11 +1,11 @@ -package com.simibubi.create.foundation.render.backend.instancing; +package com.jozufozu.flywheel.backend.instancing; import java.util.Arrays; import java.util.stream.Stream; -import com.simibubi.create.foundation.render.backend.core.IFlatLight; -import com.simibubi.create.foundation.render.backend.core.ModelData; -import com.simibubi.create.foundation.render.backend.core.OrientedData; +import com.jozufozu.flywheel.backend.core.IFlatLight; +import com.jozufozu.flywheel.backend.core.ModelData; +import com.jozufozu.flywheel.backend.core.OrientedData; import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/util/ConditionalInstance.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/util/ConditionalInstance.java similarity index 81% rename from src/main/java/com/simibubi/create/foundation/render/backend/instancing/util/ConditionalInstance.java rename to src/main/java/com/jozufozu/flywheel/backend/instancing/util/ConditionalInstance.java index 386794900..f47c21269 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/util/ConditionalInstance.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/util/ConditionalInstance.java @@ -1,11 +1,11 @@ -package com.simibubi.create.foundation.render.backend.instancing.util; +package com.jozufozu.flywheel.backend.instancing.util; import java.util.Optional; import javax.annotation.Nullable; -import com.simibubi.create.foundation.render.backend.instancing.InstanceData; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstanceData; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; public class ConditionalInstance { diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/util/InstanceGroup.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/util/InstanceGroup.java similarity index 86% rename from src/main/java/com/simibubi/create/foundation/render/backend/instancing/util/InstanceGroup.java rename to src/main/java/com/jozufozu/flywheel/backend/instancing/util/InstanceGroup.java index 6aa8f0cff..6ea964ea9 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/util/InstanceGroup.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/util/InstanceGroup.java @@ -1,12 +1,12 @@ -package com.simibubi.create.foundation.render.backend.instancing.util; +package com.jozufozu.flywheel.backend.instancing.util; import java.util.AbstractCollection; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import com.simibubi.create.foundation.render.backend.instancing.InstanceData; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstanceData; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; public class InstanceGroup extends AbstractCollection { diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/util/SelectInstance.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/util/SelectInstance.java similarity index 82% rename from src/main/java/com/simibubi/create/foundation/render/backend/instancing/util/SelectInstance.java rename to src/main/java/com/jozufozu/flywheel/backend/instancing/util/SelectInstance.java index 25a6445d8..e986763f2 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/instancing/util/SelectInstance.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/util/SelectInstance.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.instancing.util; +package com.jozufozu.flywheel.backend.instancing.util; import java.util.ArrayList; import java.util.List; @@ -6,8 +6,8 @@ import java.util.Optional; import javax.annotation.Nullable; -import com.simibubi.create.foundation.render.backend.instancing.InstanceData; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstanceData; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; public class SelectInstance { diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/light/CoordinateConsumer.java b/src/main/java/com/jozufozu/flywheel/backend/light/CoordinateConsumer.java similarity index 61% rename from src/main/java/com/simibubi/create/foundation/render/backend/light/CoordinateConsumer.java rename to src/main/java/com/jozufozu/flywheel/backend/light/CoordinateConsumer.java index 6f20a8c33..f4fed3d9f 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/light/CoordinateConsumer.java +++ b/src/main/java/com/jozufozu/flywheel/backend/light/CoordinateConsumer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.light; +package com.jozufozu.flywheel.backend.light; @FunctionalInterface public interface CoordinateConsumer { diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/light/EmptyLighter.java b/src/main/java/com/jozufozu/flywheel/backend/light/EmptyLighter.java similarity index 89% rename from src/main/java/com/simibubi/create/foundation/render/backend/light/EmptyLighter.java rename to src/main/java/com/jozufozu/flywheel/backend/light/EmptyLighter.java index a92cf4e27..660e80d11 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/light/EmptyLighter.java +++ b/src/main/java/com/jozufozu/flywheel/backend/light/EmptyLighter.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.light; +package com.jozufozu.flywheel.backend.light; import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionLighter; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/light/GridAlignedBB.java b/src/main/java/com/jozufozu/flywheel/backend/light/GridAlignedBB.java similarity index 97% rename from src/main/java/com/simibubi/create/foundation/render/backend/light/GridAlignedBB.java rename to src/main/java/com/jozufozu/flywheel/backend/light/GridAlignedBB.java index 3703143f5..d8f90f90b 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/light/GridAlignedBB.java +++ b/src/main/java/com/jozufozu/flywheel/backend/light/GridAlignedBB.java @@ -1,8 +1,8 @@ -package com.simibubi.create.foundation.render.backend.light; +package com.jozufozu.flywheel.backend.light; -import static com.simibubi.create.foundation.render.backend.RenderUtil.isPowerOf2; +import static com.jozufozu.flywheel.backend.RenderUtil.isPowerOf2; -import com.simibubi.create.foundation.render.backend.RenderUtil; +import com.jozufozu.flywheel.backend.RenderUtil; import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/light/LightUpdateListener.java b/src/main/java/com/jozufozu/flywheel/backend/light/LightUpdateListener.java similarity index 94% rename from src/main/java/com/simibubi/create/foundation/render/backend/light/LightUpdateListener.java rename to src/main/java/com/jozufozu/flywheel/backend/light/LightUpdateListener.java index 09ea1a04d..1dd0e95dc 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/light/LightUpdateListener.java +++ b/src/main/java/com/jozufozu/flywheel/backend/light/LightUpdateListener.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.light; +package com.jozufozu.flywheel.backend.light; import net.minecraft.world.IBlockDisplayReader; import net.minecraft.world.LightType; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/light/LightUpdater.java b/src/main/java/com/jozufozu/flywheel/backend/light/LightUpdater.java similarity index 99% rename from src/main/java/com/simibubi/create/foundation/render/backend/light/LightUpdater.java rename to src/main/java/com/jozufozu/flywheel/backend/light/LightUpdater.java index 089376a23..5210d02c8 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/light/LightUpdater.java +++ b/src/main/java/com/jozufozu/flywheel/backend/light/LightUpdater.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.light; +package com.jozufozu.flywheel.backend.light; import java.util.WeakHashMap; import java.util.function.LongConsumer; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/light/LightVolume.java b/src/main/java/com/jozufozu/flywheel/backend/light/LightVolume.java similarity index 96% rename from src/main/java/com/simibubi/create/foundation/render/backend/light/LightVolume.java rename to src/main/java/com/jozufozu/flywheel/backend/light/LightVolume.java index ae0bdaa23..48a86fcb6 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/light/LightVolume.java +++ b/src/main/java/com/jozufozu/flywheel/backend/light/LightVolume.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.light; +package com.jozufozu.flywheel.backend.light; import java.nio.ByteBuffer; @@ -8,10 +8,10 @@ import org.lwjgl.opengl.GL13; import org.lwjgl.opengl.GL20; import org.lwjgl.system.MemoryUtil; -import com.simibubi.create.foundation.render.backend.Backend; -import com.simibubi.create.foundation.render.backend.RenderWork; -import com.simibubi.create.foundation.render.backend.gl.GlTexture; -import com.simibubi.create.foundation.render.backend.gl.versioned.RGPixelFormat; +import com.jozufozu.flywheel.backend.Backend; +import com.jozufozu.flywheel.backend.RenderWork; +import com.jozufozu.flywheel.backend.gl.GlTexture; +import com.jozufozu.flywheel.backend.gl.versioned.RGPixelFormat; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockDisplayReader; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/light/LightVolumeDebugger.java b/src/main/java/com/jozufozu/flywheel/backend/light/LightVolumeDebugger.java similarity index 95% rename from src/main/java/com/simibubi/create/foundation/render/backend/light/LightVolumeDebugger.java rename to src/main/java/com/jozufozu/flywheel/backend/light/LightVolumeDebugger.java index e63257d04..6fbcd4d5b 100644 --- a/src/main/java/com/simibubi/create/foundation/render/backend/light/LightVolumeDebugger.java +++ b/src/main/java/com/jozufozu/flywheel/backend/light/LightVolumeDebugger.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.render.backend.light; +package com.jozufozu.flywheel.backend.light; import java.util.ArrayList; diff --git a/src/main/java/com/simibubi/create/AllBlockPartials.java b/src/main/java/com/simibubi/create/AllBlockPartials.java index 102fc4412..ec2984795 100644 --- a/src/main/java/com/simibubi/create/AllBlockPartials.java +++ b/src/main/java/com/simibubi/create/AllBlockPartials.java @@ -3,9 +3,9 @@ package com.simibubi.create; import java.util.HashMap; import java.util.Map; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour; import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.Lang; diff --git a/src/main/java/com/simibubi/create/CreateClient.java b/src/main/java/com/simibubi/create/CreateClient.java index 2940b484d..4b38736f7 100644 --- a/src/main/java/com/simibubi/create/CreateClient.java +++ b/src/main/java/com/simibubi/create/CreateClient.java @@ -7,6 +7,10 @@ import java.util.function.Function; import javax.annotation.Nullable; +import com.jozufozu.flywheel.backend.Backend; +import com.jozufozu.flywheel.backend.OptifineHandler; +import com.jozufozu.flywheel.backend.core.PartialModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher; import com.simibubi.create.content.contraptions.relays.encased.CasingConnectivity; @@ -25,10 +29,6 @@ import com.simibubi.create.foundation.ponder.elements.WorldSectionElement; import com.simibubi.create.foundation.render.AllProgramSpecs; import com.simibubi.create.foundation.render.KineticRenderer; import com.simibubi.create.foundation.render.SuperByteBufferCache; -import com.simibubi.create.foundation.render.backend.Backend; -import com.simibubi.create.foundation.render.backend.OptifineHandler; -import com.simibubi.create.foundation.render.backend.core.PartialModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import com.simibubi.create.foundation.utility.WorldAttached; import com.simibubi.create.foundation.utility.ghost.GhostBlocks; import com.simibubi.create.foundation.utility.outliner.Outliner; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedBlazeBurner.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedBlazeBurner.java index 920ab0bf3..8af7874a1 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedBlazeBurner.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedBlazeBurner.java @@ -1,11 +1,11 @@ package com.simibubi.create.compat.jei.category.animations; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel; import com.simibubi.create.foundation.gui.GuiGameElement; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import mezz.jei.api.gui.drawable.IDrawable; import net.minecraft.util.math.vector.Vector3f; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedKinetics.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedKinetics.java index fb0e5a880..dcf4f1633 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedKinetics.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedKinetics.java @@ -1,8 +1,8 @@ package com.simibubi.create.compat.jei.category.animations; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.utility.AnimationTickHolder; import mezz.jei.api.gui.drawable.IDrawable; diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/BackHalfShaftInstance.java b/src/main/java/com/simibubi/create/content/contraptions/base/BackHalfShaftInstance.java index 738155141..e613e7d28 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/BackHalfShaftInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/BackHalfShaftInstance.java @@ -1,6 +1,6 @@ package com.simibubi.create.content.contraptions.base; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/HalfShaftInstance.java b/src/main/java/com/simibubi/create/content/contraptions/base/HalfShaftInstance.java index 6d3664988..aae8b7c2d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/HalfShaftInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/HalfShaftInstance.java @@ -1,8 +1,8 @@ package com.simibubi.create.content.contraptions.base; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalHalfShaftInstance.java b/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalHalfShaftInstance.java index d5a21d468..d34848692 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalHalfShaftInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/HorizontalHalfShaftInstance.java @@ -1,6 +1,6 @@ package com.simibubi.create.content.contraptions.base; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/KineticAttributes.java b/src/main/java/com/simibubi/create/content/contraptions/base/KineticAttributes.java index 8f7b9b15b..3d9f31d5f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/KineticAttributes.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/KineticAttributes.java @@ -1,9 +1,9 @@ package com.simibubi.create.content.contraptions.base; -import com.simibubi.create.foundation.render.backend.gl.attrib.CommonAttributes; -import com.simibubi.create.foundation.render.backend.gl.attrib.IAttribSpec; -import com.simibubi.create.foundation.render.backend.gl.attrib.IVertexAttrib; -import com.simibubi.create.foundation.render.backend.gl.attrib.VertexAttribSpec; +import com.jozufozu.flywheel.backend.gl.attrib.CommonAttributes; +import com.jozufozu.flywheel.backend.gl.attrib.IAttribSpec; +import com.jozufozu.flywheel.backend.gl.attrib.IVertexAttrib; +import com.jozufozu.flywheel.backend.gl.attrib.VertexAttribSpec; public enum KineticAttributes implements IVertexAttrib { INSTANCE_POSITION("aInstancePos", CommonAttributes.VEC3), diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/KineticData.java b/src/main/java/com/simibubi/create/content/contraptions/base/KineticData.java index b259c89aa..69d8d61b7 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/KineticData.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/KineticData.java @@ -2,8 +2,8 @@ package com.simibubi.create.content.contraptions.base; import java.nio.ByteBuffer; -import com.simibubi.create.foundation.render.backend.core.BasicData; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.core.BasicData; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; import com.simibubi.create.foundation.utility.ColorHelper; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/KineticRenderMaterials.java b/src/main/java/com/simibubi/create/content/contraptions/base/KineticRenderMaterials.java index 29ee62162..d71c65ee6 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/KineticRenderMaterials.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/KineticRenderMaterials.java @@ -1,10 +1,10 @@ package com.simibubi.create.content.contraptions.base; +import com.jozufozu.flywheel.backend.MaterialType; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; import com.simibubi.create.content.contraptions.components.actors.ActorData; import com.simibubi.create.content.contraptions.relays.belt.BeltData; import com.simibubi.create.content.logistics.block.FlapData; -import com.simibubi.create.foundation.render.backend.MaterialType; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; public class KineticRenderMaterials { public static final MaterialType> ROTATING = new MaterialType<>(); diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java index 93058fb64..653240307 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java @@ -7,6 +7,8 @@ import java.util.List; import javax.annotation.Nullable; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.instancing.IInstanceRendered; import com.simibubi.create.Create; import com.simibubi.create.content.contraptions.KineticNetwork; import com.simibubi.create.content.contraptions.RotationPropagator; @@ -18,8 +20,6 @@ import com.simibubi.create.content.contraptions.relays.elementary.ICogWheel; import com.simibubi.create.content.contraptions.relays.gearbox.GearboxBlock; import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.item.TooltipHelper; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.instancing.IInstanceRendered; import com.simibubi.create.foundation.sound.SoundScapes; import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntityRenderer.java index dcefcadfe..e86972c03 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntityRenderer.java @@ -1,5 +1,6 @@ package com.simibubi.create.content.contraptions.base; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlocks; @@ -8,7 +9,6 @@ import com.simibubi.create.content.contraptions.KineticDebugger; import com.simibubi.create.content.contraptions.relays.elementary.ICogWheel; import com.simibubi.create.foundation.render.Compartment; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.ColorHelper; diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/KineticTileInstance.java b/src/main/java/com/simibubi/create/content/contraptions/base/KineticTileInstance.java index f5d6d902e..a21305de9 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/KineticTileInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/KineticTileInstance.java @@ -1,12 +1,12 @@ package com.simibubi.create.content.contraptions.base; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.instancing.RenderMaterial; +import com.jozufozu.flywheel.backend.instancing.TileEntityInstance; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.contraptions.relays.elementary.ICogWheel; import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; -import com.simibubi.create.foundation.render.backend.instancing.RenderMaterial; -import com.simibubi.create.foundation.render.backend.instancing.TileEntityInstance; import net.minecraft.block.BlockState; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/RotatingAttributes.java b/src/main/java/com/simibubi/create/content/contraptions/base/RotatingAttributes.java index ef0e1122c..215027123 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/RotatingAttributes.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/RotatingAttributes.java @@ -1,9 +1,9 @@ package com.simibubi.create.content.contraptions.base; -import com.simibubi.create.foundation.render.backend.gl.attrib.CommonAttributes; -import com.simibubi.create.foundation.render.backend.gl.attrib.IAttribSpec; -import com.simibubi.create.foundation.render.backend.gl.attrib.IVertexAttrib; -import com.simibubi.create.foundation.render.backend.gl.attrib.VertexAttribSpec; +import com.jozufozu.flywheel.backend.gl.attrib.CommonAttributes; +import com.jozufozu.flywheel.backend.gl.attrib.IAttribSpec; +import com.jozufozu.flywheel.backend.gl.attrib.IVertexAttrib; +import com.jozufozu.flywheel.backend.gl.attrib.VertexAttribSpec; public enum RotatingAttributes implements IVertexAttrib { AXIS("aAxis", CommonAttributes.NORMAL), diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/RotatingData.java b/src/main/java/com/simibubi/create/content/contraptions/base/RotatingData.java index 1ca50d3e8..e40d3cf07 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/RotatingData.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/RotatingData.java @@ -2,7 +2,7 @@ package com.simibubi.create.content.contraptions.base; import java.nio.ByteBuffer; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; import net.minecraft.util.Direction; import net.minecraft.util.math.vector.Vector3f; diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/RotatingModel.java b/src/main/java/com/simibubi/create/content/contraptions/base/RotatingModel.java index 81582c35b..4cc26671f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/RotatingModel.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/RotatingModel.java @@ -1,9 +1,9 @@ package com.simibubi.create.content.contraptions.base; -import com.simibubi.create.foundation.render.backend.core.BasicAttributes; -import com.simibubi.create.foundation.render.backend.gl.attrib.VertexFormat; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.core.BasicAttributes; +import com.jozufozu.flywheel.backend.gl.attrib.VertexFormat; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/ShaftlessCogInstance.java b/src/main/java/com/simibubi/create/content/contraptions/base/ShaftlessCogInstance.java index 16f85ab32..733c23a01 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/ShaftlessCogInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/ShaftlessCogInstance.java @@ -1,8 +1,8 @@ package com.simibubi.create.content.contraptions.base; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; public class ShaftlessCogInstance extends SingleRotatingInstance { diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/SingleRotatingInstance.java b/src/main/java/com/simibubi/create/content/contraptions/base/SingleRotatingInstance.java index 1749e308f..266f1f0cd 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/SingleRotatingInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/SingleRotatingInstance.java @@ -1,7 +1,7 @@ package com.simibubi.create.content.contraptions.base; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/ActorData.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/ActorData.java index 191e3ebc0..42bd732c2 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/ActorData.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/ActorData.java @@ -2,8 +2,8 @@ package com.simibubi.create.content.contraptions.components.actors; import java.nio.ByteBuffer; -import com.simibubi.create.foundation.render.backend.instancing.InstanceData; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstanceData; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Quaternion; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/ActorModel.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/ActorModel.java index a8fdeac6c..9010ba9ca 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/ActorModel.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/ActorModel.java @@ -1,8 +1,8 @@ package com.simibubi.create.content.contraptions.components.actors; -import com.simibubi.create.foundation.render.backend.gl.attrib.VertexFormat; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.gl.attrib.VertexFormat; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/ActorVertexAttributes.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/ActorVertexAttributes.java index ff633d817..696d9279a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/ActorVertexAttributes.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/ActorVertexAttributes.java @@ -1,9 +1,9 @@ package com.simibubi.create.content.contraptions.components.actors; -import com.simibubi.create.foundation.render.backend.gl.attrib.CommonAttributes; -import com.simibubi.create.foundation.render.backend.gl.attrib.IAttribSpec; -import com.simibubi.create.foundation.render.backend.gl.attrib.IVertexAttrib; -import com.simibubi.create.foundation.render.backend.gl.attrib.VertexAttribSpec; +import com.jozufozu.flywheel.backend.gl.attrib.CommonAttributes; +import com.jozufozu.flywheel.backend.gl.attrib.IAttribSpec; +import com.jozufozu.flywheel.backend.gl.attrib.IVertexAttrib; +import com.jozufozu.flywheel.backend.gl.attrib.VertexAttribSpec; public enum ActorVertexAttributes implements IVertexAttrib { INSTANCE_POSITION("aInstancePos", CommonAttributes.VEC3), diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillActorInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillActorInstance.java index 40df1e591..517e4fcdb 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillActorInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillActorInstance.java @@ -1,11 +1,11 @@ package com.simibubi.create.content.contraptions.components.actors; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.RenderMaterial; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; import com.simibubi.create.content.contraptions.components.structureMovement.render.ActorInstance; import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionKineticRenderer; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.RenderMaterial; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.VecHelper; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillInstance.java index 7d1bdd735..35d8e766a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillInstance.java @@ -2,12 +2,12 @@ package com.simibubi.create.content.contraptions.components.actors; import static net.minecraft.state.properties.BlockStateProperties.FACING; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.RotatingData; import com.simibubi.create.content.contraptions.base.SingleRotatingInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import net.minecraft.block.BlockState; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillMovementBehaviour.java index 8232772f3..3eeb3f58b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillMovementBehaviour.java @@ -2,11 +2,11 @@ package com.simibubi.create.content.contraptions.components.actors; import javax.annotation.Nullable; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; import com.simibubi.create.content.contraptions.components.structureMovement.render.ActorInstance; import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionKineticRenderer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import com.simibubi.create.foundation.utility.VecHelper; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterActorInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterActorInstance.java index 83f516058..2f5810e9d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterActorInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterActorInstance.java @@ -2,14 +2,14 @@ package com.simibubi.create.content.contraptions.components.actors; import static net.minecraft.state.properties.BlockStateProperties.HORIZONTAL_FACING; +import com.jozufozu.flywheel.backend.core.ModelData; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.RenderMaterial; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; import com.simibubi.create.content.contraptions.components.structureMovement.render.ActorInstance; import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionKineticRenderer; -import com.simibubi.create.foundation.render.backend.core.ModelData; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.RenderMaterial; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.MatrixStacker; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterMovementBehaviour.java index 6472d23d4..83b6a4bcc 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterMovementBehaviour.java @@ -6,12 +6,12 @@ import javax.annotation.Nullable; import org.apache.commons.lang3.mutable.MutableBoolean; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; import com.simibubi.create.content.contraptions.components.structureMovement.render.ActorInstance; import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionKineticRenderer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.VecHelper; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceRenderer.java index 01c3d4d6f..4064f9db0 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceRenderer.java @@ -2,6 +2,7 @@ package com.simibubi.create.content.contraptions.components.actors; import java.util.function.Consumer; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; @@ -10,7 +11,6 @@ import com.simibubi.create.content.contraptions.components.structureMovement.Mov import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockRenderer.java index 412cd349b..a5e0a6a33 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockRenderer.java @@ -1,5 +1,6 @@ package com.simibubi.create.content.contraptions.components.clock; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; @@ -8,7 +9,6 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.content.contraptions.components.clock.CuckooClockTileEntity.Animation; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.utility.AngleHelper; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterInstance.java index 2d88b431c..517258358 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterInstance.java @@ -2,13 +2,13 @@ package com.simibubi.create.content.contraptions.components.crafter; import java.util.function.Supplier; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.RotatingData; import com.simibubi.create.content.contraptions.base.SingleRotatingInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import com.simibubi.create.foundation.utility.MatrixStacker; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterRenderer.java index 4e0e9bc73..b30da5db0 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterRenderer.java @@ -3,6 +3,8 @@ package com.simibubi.create.content.contraptions.components.crafter; import static com.simibubi.create.content.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING; import static com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer.standardKineticRotationTransform; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; @@ -11,8 +13,6 @@ import com.simibubi.create.content.contraptions.components.crafter.MechanicalCra import com.simibubi.create.content.contraptions.components.crafter.RecipeGridHandler.GroupedItems; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java index 2b2bda8d6..c1a4a3fe3 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java @@ -1,12 +1,12 @@ package com.simibubi.create.content.contraptions.components.crank; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllShapes; import com.simibubi.create.AllTileEntities; import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.config.AllConfigs; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankInstance.java index 843882dce..a1ed191ee 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankInstance.java @@ -1,12 +1,12 @@ package com.simibubi.create.content.contraptions.components.crank; +import com.jozufozu.flywheel.backend.core.ModelData; +import com.jozufozu.flywheel.backend.core.PartialModel; +import com.jozufozu.flywheel.backend.instancing.IDynamicInstance; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.content.contraptions.base.SingleRotatingInstance; -import com.simibubi.create.foundation.render.backend.core.ModelData; -import com.simibubi.create.foundation.render.backend.core.PartialModel; -import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.MatrixStacker; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankRenderer.java index 7db258093..4e675698f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankRenderer.java @@ -2,13 +2,13 @@ package com.simibubi.create.content.contraptions.components.crank; import static net.minecraft.state.properties.BlockStateProperties.FACING; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java index e9e8c32d7..875992e8b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java @@ -2,8 +2,8 @@ package com.simibubi.create.content.contraptions.components.crank; import javax.annotation.ParametersAreNonnullByDefault; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.simibubi.create.AllBlocks; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.utility.DyeHelper; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerActorInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerActorInstance.java index e91bc8a0d..69fddcb03 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerActorInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerActorInstance.java @@ -3,6 +3,10 @@ package com.simibubi.create.content.contraptions.components.deployer; import static com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock.AXIS_ALONG_FIRST_COORDINATE; import static com.simibubi.create.content.contraptions.base.DirectionalKineticBlock.FACING; +import com.jozufozu.flywheel.backend.core.ModelData; +import com.jozufozu.flywheel.backend.core.PartialModel; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.RenderMaterial; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.IRotate; @@ -13,10 +17,6 @@ import com.simibubi.create.content.contraptions.components.structureMovement.Mov import com.simibubi.create.content.contraptions.components.structureMovement.render.ActorInstance; import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionKineticRenderer; import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionProgram; -import com.simibubi.create.foundation.render.backend.core.ModelData; -import com.simibubi.create.foundation.render.backend.core.PartialModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.RenderMaterial; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.MatrixStacker; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerInstance.java index 31b1d7665..ad3fcd28f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerInstance.java @@ -3,14 +3,14 @@ package com.simibubi.create.content.contraptions.components.deployer; import static com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock.AXIS_ALONG_FIRST_COORDINATE; import static com.simibubi.create.content.contraptions.base.DirectionalKineticBlock.FACING; +import com.jozufozu.flywheel.backend.core.OrientedData; +import com.jozufozu.flywheel.backend.core.PartialModel; +import com.jozufozu.flywheel.backend.instancing.IDynamicInstance; +import com.jozufozu.flywheel.backend.instancing.ITickableInstance; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.relays.encased.ShaftInstance; -import com.simibubi.create.foundation.render.backend.core.OrientedData; -import com.simibubi.create.foundation.render.backend.core.PartialModel; -import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance; -import com.simibubi.create.foundation.render.backend.instancing.ITickableInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerMovementBehaviour.java index a146a6c3e..ba8a67dc7 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerMovementBehaviour.java @@ -7,6 +7,7 @@ import javax.annotation.Nullable; import org.apache.commons.lang3.tuple.Pair; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; @@ -23,7 +24,6 @@ import com.simibubi.create.content.schematics.SchematicWorld; import com.simibubi.create.content.schematics.filtering.SchematicInstances; import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.item.ItemHelper.ExtractionCountMode; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.NBTHelper; import com.simibubi.create.foundation.utility.NBTProcessors; @@ -115,7 +115,7 @@ public class DeployerMovementBehaviour extends MovementBehaviour { List requiredItems = requirement.getRequiredItems(); ItemStack firstRequired = requiredItems.isEmpty() ? ItemStack.EMPTY : requiredItems.get(0); - + if (!context.contraption.hasUniversalCreativeCrate) { IItemHandler iItemHandler = context.contraption.inventory; for (ItemStack required : requiredItems) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRenderer.java index 0261f9651..6100d2c2e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRenderer.java @@ -3,6 +3,8 @@ package com.simibubi.create.content.contraptions.components.deployer; import static com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock.AXIS_ALONG_FIRST_COORDINATE; import static com.simibubi.create.content.contraptions.base.DirectionalKineticBlock.FACING; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; @@ -13,8 +15,6 @@ import com.simibubi.create.content.contraptions.components.structureMovement.Mov import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringRenderer; import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java index c1e5493a1..102d2bb2b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java @@ -5,13 +5,13 @@ import static com.simibubi.create.content.contraptions.base.DirectionalKineticBl import java.util.ArrayList; import java.util.List; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.curiosities.tools.SandPaperItem; import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.item.TooltipHelper; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; import com.simibubi.create.foundation.utility.NBTHelper; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanRenderer.java index 6491d16e3..ec49792ae 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanRenderer.java @@ -2,6 +2,7 @@ package com.simibubi.create.content.contraptions.components.fan; import static net.minecraft.state.properties.BlockStateProperties.FACING; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; @@ -9,7 +10,6 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/fan/FanInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/fan/FanInstance.java index 2feec9410..0a440e67f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/fan/FanInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/fan/FanInstance.java @@ -2,10 +2,10 @@ package com.simibubi.create.content.contraptions.components.fan; import static net.minecraft.state.properties.BlockStateProperties.FACING; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticTileInstance; import com.simibubi.create.content.contraptions.base.RotatingData; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlyWheelInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlyWheelInstance.java index 219adb6d1..e085391c2 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlyWheelInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlyWheelInstance.java @@ -6,16 +6,16 @@ import java.util.Collections; import java.util.List; import com.google.common.collect.Lists; +import com.jozufozu.flywheel.backend.core.ModelData; +import com.jozufozu.flywheel.backend.instancing.IDynamicInstance; +import com.jozufozu.flywheel.backend.instancing.InstanceData; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.instancing.RenderMaterial; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticTileInstance; import com.simibubi.create.content.contraptions.base.RotatingData; -import com.simibubi.create.foundation.render.backend.core.ModelData; -import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstanceData; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; -import com.simibubi.create.foundation.render.backend.instancing.RenderMaterial; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.MatrixStacker; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelRenderer.java index bf3b46295..edbe2baae 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelRenderer.java @@ -2,6 +2,7 @@ package com.simibubi.create.content.contraptions.components.flywheel; import static com.simibubi.create.content.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; @@ -10,7 +11,6 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock.ConnectionState; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import com.simibubi.create.foundation.utility.AngleHelper; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineBlock.java index f3d07cf66..6e8e09d51 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineBlock.java @@ -2,8 +2,8 @@ package com.simibubi.create.content.contraptions.components.flywheel.engine; import javax.annotation.Nullable; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.simibubi.create.content.contraptions.wrench.IWrenchable; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.utility.Iterate; import net.minecraft.block.Block; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineInstance.java index 3f76914d0..eb5c2cb2b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineInstance.java @@ -1,10 +1,10 @@ package com.simibubi.create.content.contraptions.components.flywheel.engine; +import com.jozufozu.flywheel.backend.core.ModelData; +import com.jozufozu.flywheel.backend.core.PartialModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.instancing.TileEntityInstance; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.foundation.render.backend.core.ModelData; -import com.simibubi.create.foundation.render.backend.core.PartialModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; -import com.simibubi.create.foundation.render.backend.instancing.TileEntityInstance; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.MatrixStacker; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineRenderer.java index 42be5bedf..a47c32400 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineRenderer.java @@ -1,9 +1,9 @@ package com.simibubi.create.content.contraptions.components.flywheel.engine; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.foundation.render.PartialBufferer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineTileEntity.java index 6887efaf4..719a735ca 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineTileEntity.java @@ -2,10 +2,10 @@ package com.simibubi.create.content.contraptions.components.flywheel.engine; import java.util.List; +import com.jozufozu.flywheel.backend.instancing.IInstanceRendered; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock; import com.simibubi.create.content.contraptions.components.flywheel.FlywheelTileEntity; -import com.simibubi.create.foundation.render.backend.instancing.IInstanceRendered; import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/FurnaceEngineBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/FurnaceEngineBlock.java index e50508ad0..82ab8ffea 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/FurnaceEngineBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/FurnaceEngineBlock.java @@ -1,11 +1,11 @@ package com.simibubi.create.content.contraptions.components.flywheel.engine; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllShapes; import com.simibubi.create.AllTileEntities; import com.simibubi.create.foundation.block.ITE; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld; import net.minecraft.block.AbstractFurnaceBlock; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillStoneCogInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillStoneCogInstance.java index e2f931eba..7cad8bda9 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillStoneCogInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillStoneCogInstance.java @@ -1,11 +1,11 @@ package com.simibubi.create.content.contraptions.components.millstone; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.RotatingData; import com.simibubi.create.content.contraptions.base.SingleRotatingInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; public class MillStoneCogInstance extends SingleRotatingInstance { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerRenderer.java index cf0cfe81a..da872236b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerRenderer.java @@ -1,5 +1,6 @@ package com.simibubi.create.content.contraptions.components.mixer; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; @@ -7,7 +8,6 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixerInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixerInstance.java index 2df6346ab..a930a77e6 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixerInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixerInstance.java @@ -1,11 +1,11 @@ package com.simibubi.create.content.contraptions.components.mixer; +import com.jozufozu.flywheel.backend.core.OrientedData; +import com.jozufozu.flywheel.backend.instancing.IDynamicInstance; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.RotatingData; import com.simibubi.create.content.contraptions.base.ShaftlessCogInstance; -import com.simibubi.create.foundation.render.backend.core.OrientedData; -import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressRenderer.java index 189056eb1..9ce1c3d8c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressRenderer.java @@ -2,13 +2,13 @@ package com.simibubi.create.content.contraptions.components.press; import static net.minecraft.state.properties.BlockStateProperties.HORIZONTAL_FACING; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/press/PressInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/press/PressInstance.java index 8dc92b64f..b0e78648e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/press/PressInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/press/PressInstance.java @@ -1,10 +1,10 @@ package com.simibubi.create.content.contraptions.components.press; +import com.jozufozu.flywheel.backend.core.OrientedData; +import com.jozufozu.flywheel.backend.instancing.IDynamicInstance; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.relays.encased.ShaftInstance; -import com.simibubi.create.foundation.render.backend.core.OrientedData; -import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawInstance.java index a3471f32a..47b49924a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawInstance.java @@ -2,12 +2,12 @@ package com.simibubi.create.content.contraptions.components.saw; import static net.minecraft.state.properties.BlockStateProperties.FACING; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.RotatingData; import com.simibubi.create.content.contraptions.base.SingleRotatingInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import net.minecraft.block.BlockState; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java index 5ab9a2960..5b267707e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java @@ -2,6 +2,8 @@ package com.simibubi.create.content.contraptions.components.saw; import static net.minecraft.state.properties.BlockStateProperties.FACING; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.CreateClient; @@ -11,8 +13,6 @@ import com.simibubi.create.content.contraptions.components.structureMovement.Mov import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringRenderer; import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java index 63d400304..0a3d995b0 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java @@ -25,6 +25,9 @@ import javax.annotation.Nullable; import org.apache.commons.lang3.tuple.MutablePair; import org.apache.commons.lang3.tuple.Pair; +import com.jozufozu.flywheel.backend.instancing.IFlywheelWorld; +import com.jozufozu.flywheel.backend.light.EmptyLighter; +import com.jozufozu.flywheel.backend.light.GridAlignedBB; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllMovementBehaviours; import com.simibubi.create.content.contraptions.base.IRotate; @@ -55,9 +58,6 @@ import com.simibubi.create.content.logistics.block.inventories.CreativeCrateTile import com.simibubi.create.content.logistics.block.redstone.RedstoneContactBlock; import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.fluid.CombinedTankWrapper; -import com.simibubi.create.foundation.render.backend.instancing.IFlywheelWorld; -import com.simibubi.create.foundation.render.backend.light.EmptyLighter; -import com.simibubi.create.foundation.render.backend.light.GridAlignedBB; import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; import com.simibubi.create.foundation.utility.BlockFace; import com.simibubi.create.foundation.utility.Coordinate; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionLighter.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionLighter.java index 641c3a90c..518fa9dff 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionLighter.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionLighter.java @@ -1,10 +1,10 @@ package com.simibubi.create.content.contraptions.components.structureMovement; +import com.jozufozu.flywheel.backend.light.GridAlignedBB; +import com.jozufozu.flywheel.backend.light.LightUpdateListener; +import com.jozufozu.flywheel.backend.light.LightUpdater; +import com.jozufozu.flywheel.backend.light.LightVolume; import com.simibubi.create.content.contraptions.components.structureMovement.render.RenderedContraption; -import com.simibubi.create.foundation.render.backend.light.GridAlignedBB; -import com.simibubi.create.foundation.render.backend.light.LightUpdateListener; -import com.simibubi.create.foundation.render.backend.light.LightUpdater; -import com.simibubi.create.foundation.render.backend.light.LightVolume; import net.minecraft.world.IBlockDisplayReader; import net.minecraft.world.LightType; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/NonStationaryLighter.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/NonStationaryLighter.java index 9ce341586..50c0e7119 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/NonStationaryLighter.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/NonStationaryLighter.java @@ -1,7 +1,7 @@ package com.simibubi.create.content.contraptions.components.structureMovement; +import com.jozufozu.flywheel.backend.light.GridAlignedBB; import com.simibubi.create.content.contraptions.components.structureMovement.render.RenderedContraption; -import com.simibubi.create.foundation.render.backend.light.GridAlignedBB; public class NonStationaryLighter extends ContraptionLighter { public NonStationaryLighter(C contraption) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/AnchoredLighter.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/AnchoredLighter.java index b5ed7ee45..4a0489ca1 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/AnchoredLighter.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/AnchoredLighter.java @@ -1,8 +1,8 @@ package com.simibubi.create.content.contraptions.components.structureMovement.bearing; +import com.jozufozu.flywheel.backend.light.GridAlignedBB; import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionLighter; -import com.simibubi.create.foundation.render.backend.light.GridAlignedBB; public class AnchoredLighter extends ContraptionLighter { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingInstance.java index f3c46d7d6..f5b8a1169 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingInstance.java @@ -1,12 +1,12 @@ package com.simibubi.create.content.contraptions.components.structureMovement.bearing; +import com.jozufozu.flywheel.backend.core.OrientedData; +import com.jozufozu.flywheel.backend.core.PartialModel; +import com.jozufozu.flywheel.backend.instancing.IDynamicInstance; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.BackHalfShaftInstance; import com.simibubi.create.content.contraptions.base.KineticTileEntity; -import com.simibubi.create.foundation.render.backend.core.OrientedData; -import com.simibubi.create.foundation.render.backend.core.PartialModel; -import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingRenderer.java index cf6f59b7c..647a3423b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingRenderer.java @@ -1,13 +1,13 @@ package com.simibubi.create.content.contraptions.components.structureMovement.bearing; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.utility.AngleHelper; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedBearingInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedBearingInstance.java index 49c7007b0..ecb98bee6 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedBearingInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedBearingInstance.java @@ -1,10 +1,10 @@ package com.simibubi.create.content.contraptions.components.structureMovement.bearing; +import com.jozufozu.flywheel.backend.core.OrientedData; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; import com.simibubi.create.content.contraptions.components.structureMovement.render.ActorInstance; import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionKineticRenderer; -import com.simibubi.create.foundation.render.backend.core.OrientedData; import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedBearingMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedBearingMovementBehaviour.java index 9d776cb3a..ba09371d2 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedBearingMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedBearingMovementBehaviour.java @@ -2,6 +2,8 @@ package com.simibubi.create.content.contraptions.components.structureMovement.be import javax.annotation.Nullable; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity; @@ -14,8 +16,6 @@ import com.simibubi.create.content.contraptions.components.structureMovement.ren import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerInstance.java index 9e83b008c..cabddfe5b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerInstance.java @@ -1,11 +1,11 @@ package com.simibubi.create.content.contraptions.components.structureMovement.chassis; +import com.jozufozu.flywheel.backend.core.ModelData; +import com.jozufozu.flywheel.backend.instancing.IDynamicInstance; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.instancing.TileEntityInstance; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.foundation.render.backend.core.ModelData; -import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; -import com.simibubi.create.foundation.render.backend.instancing.TileEntityInstance; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.MatrixStacker; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerRenderer.java index 1abccec33..d100d7e9d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerRenderer.java @@ -1,10 +1,10 @@ package com.simibubi.create.content.contraptions.components.structureMovement.chassis; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerTileEntity.java index 34d4a421f..0dcb89f85 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerTileEntity.java @@ -2,12 +2,12 @@ package com.simibubi.create.content.contraptions.components.structureMovement.ch import java.util.List; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.instancing.IInstanceRendered; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueEntity; import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueItem; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.instancing.IInstanceRendered; import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.utility.animation.LerpedFloat; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageInstance.java index fba18244f..860923dc4 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageInstance.java @@ -1,13 +1,13 @@ package com.simibubi.create.content.contraptions.components.structureMovement.gantry; +import com.jozufozu.flywheel.backend.core.ModelData; +import com.jozufozu.flywheel.backend.instancing.IDynamicInstance; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.content.contraptions.relays.encased.ShaftInstance; -import com.simibubi.create.foundation.render.backend.core.ModelData; -import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.MatrixStacker; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageRenderer.java index 72152ff04..cfdeb46b1 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageRenderer.java @@ -1,12 +1,12 @@ package com.simibubi.create.content.contraptions.components.structureMovement.gantry; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.Iterate; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonLighter.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonLighter.java index 466d5bae5..6070a9ccb 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonLighter.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonLighter.java @@ -1,7 +1,7 @@ package com.simibubi.create.content.contraptions.components.structureMovement.piston; +import com.jozufozu.flywheel.backend.light.GridAlignedBB; import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionLighter; -import com.simibubi.create.foundation.render.backend.light.GridAlignedBB; import net.minecraft.util.math.vector.Vector3i; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/AbstractPulleyInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/AbstractPulleyInstance.java index d17c12582..3c09ecf5b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/AbstractPulleyInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/AbstractPulleyInstance.java @@ -2,18 +2,18 @@ package com.simibubi.create.content.contraptions.components.structureMovement.pu import java.util.Arrays; +import com.jozufozu.flywheel.backend.core.OrientedData; +import com.jozufozu.flywheel.backend.instancing.IDynamicInstance; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.instancing.util.ConditionalInstance; +import com.jozufozu.flywheel.backend.instancing.util.InstanceGroup; +import com.jozufozu.flywheel.backend.instancing.util.SelectInstance; +import com.jozufozu.flywheel.backend.light.GridAlignedBB; +import com.jozufozu.flywheel.backend.light.LightUpdateListener; +import com.jozufozu.flywheel.backend.light.LightUpdater; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.relays.encased.ShaftInstance; -import com.simibubi.create.foundation.render.backend.core.OrientedData; -import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; -import com.simibubi.create.foundation.render.backend.instancing.util.ConditionalInstance; -import com.simibubi.create.foundation.render.backend.instancing.util.InstanceGroup; -import com.simibubi.create.foundation.render.backend.instancing.util.SelectInstance; -import com.simibubi.create.foundation.render.backend.light.GridAlignedBB; -import com.simibubi.create.foundation.render.backend.light.LightUpdateListener; -import com.simibubi.create.foundation.render.backend.light.LightUpdater; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/AbstractPulleyRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/AbstractPulleyRenderer.java index 481b065d0..f1fa89220 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/AbstractPulleyRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/AbstractPulleyRenderer.java @@ -1,5 +1,7 @@ package com.simibubi.create.content.contraptions.components.structureMovement.pulley; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.content.contraptions.base.IRotate; @@ -7,8 +9,6 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.utility.AngleHelper; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/HosePulleyInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/HosePulleyInstance.java index a1adb0e43..2c574c770 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/HosePulleyInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/HosePulleyInstance.java @@ -1,10 +1,10 @@ package com.simibubi.create.content.contraptions.components.structureMovement.pulley; +import com.jozufozu.flywheel.backend.core.OrientedData; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.fluids.actors.HosePulleyTileEntity; -import com.simibubi.create.foundation.render.backend.core.OrientedData; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import com.simibubi.create.foundation.utility.AnimationTickHolder; public class HosePulleyInstance extends AbstractPulleyInstance { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyLighter.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyLighter.java index 87cc4cacf..8235bc095 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyLighter.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyLighter.java @@ -1,8 +1,8 @@ package com.simibubi.create.content.contraptions.components.structureMovement.pulley; +import com.jozufozu.flywheel.backend.light.GridAlignedBB; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionLighter; -import com.simibubi.create.foundation.render.backend.light.GridAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyRenderer.java index 4db922553..1fa02d43f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyRenderer.java @@ -1,12 +1,12 @@ package com.simibubi.create.content.contraptions.components.structureMovement.pulley; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; import com.simibubi.create.CreateClient; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/RopePulleyInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/RopePulleyInstance.java index a3bf2dd82..036c91ed1 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/RopePulleyInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/RopePulleyInstance.java @@ -1,11 +1,11 @@ package com.simibubi.create.content.contraptions.components.structureMovement.pulley; +import com.jozufozu.flywheel.backend.core.OrientedData; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; -import com.simibubi.create.foundation.render.backend.core.OrientedData; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import com.simibubi.create.foundation.utility.AnimationTickHolder; public class RopePulleyInstance extends AbstractPulleyInstance { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionAttributes.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionAttributes.java index 4e3d65be9..649f5e680 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionAttributes.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionAttributes.java @@ -1,9 +1,9 @@ package com.simibubi.create.content.contraptions.components.structureMovement.render; -import com.simibubi.create.foundation.render.backend.gl.attrib.CommonAttributes; -import com.simibubi.create.foundation.render.backend.gl.attrib.IAttribSpec; -import com.simibubi.create.foundation.render.backend.gl.attrib.IVertexAttrib; -import com.simibubi.create.foundation.render.backend.gl.attrib.VertexAttribSpec; +import com.jozufozu.flywheel.backend.gl.attrib.CommonAttributes; +import com.jozufozu.flywheel.backend.gl.attrib.IAttribSpec; +import com.jozufozu.flywheel.backend.gl.attrib.IVertexAttrib; +import com.jozufozu.flywheel.backend.gl.attrib.VertexAttribSpec; public enum ContraptionAttributes implements IVertexAttrib { VERTEX_POSITION("aPos", CommonAttributes.VEC3), diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionKineticRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionKineticRenderer.java index 51f02c77b..986ad162e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionKineticRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionKineticRenderer.java @@ -7,6 +7,12 @@ import javax.annotation.Nullable; import org.apache.commons.lang3.tuple.Pair; +import com.jozufozu.flywheel.backend.MaterialTypes; +import com.jozufozu.flywheel.backend.core.OrientedModel; +import com.jozufozu.flywheel.backend.core.TransformedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.instancing.RenderMaterial; import com.simibubi.create.AllMovementBehaviours; import com.simibubi.create.content.contraptions.base.KineticRenderMaterials; import com.simibubi.create.content.contraptions.base.RotatingModel; @@ -17,12 +23,6 @@ import com.simibubi.create.content.contraptions.components.structureMovement.Mov import com.simibubi.create.content.contraptions.relays.belt.BeltInstancedModel; import com.simibubi.create.content.logistics.block.FlapModel; import com.simibubi.create.foundation.render.AllProgramSpecs; -import com.simibubi.create.foundation.render.backend.MaterialTypes; -import com.simibubi.create.foundation.render.backend.core.OrientedModel; -import com.simibubi.create.foundation.render.backend.core.TransformedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; -import com.simibubi.create.foundation.render.backend.instancing.RenderMaterial; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionModel.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionModel.java index 270d8d08d..1b1343135 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionModel.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionModel.java @@ -5,10 +5,10 @@ import java.nio.ByteBuffer; import org.lwjgl.opengl.GL15; import org.lwjgl.opengl.GL20; -import com.simibubi.create.foundation.render.backend.BufferedModel; -import com.simibubi.create.foundation.render.backend.gl.GlBuffer; -import com.simibubi.create.foundation.render.backend.gl.GlPrimitiveType; -import com.simibubi.create.foundation.render.backend.gl.attrib.VertexFormat; +import com.jozufozu.flywheel.backend.BufferedModel; +import com.jozufozu.flywheel.backend.gl.GlBuffer; +import com.jozufozu.flywheel.backend.gl.GlPrimitiveType; +import com.jozufozu.flywheel.backend.gl.attrib.VertexFormat; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.LightTexture; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionProgram.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionProgram.java index 7e0d2750e..868c121ab 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionProgram.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionProgram.java @@ -2,8 +2,8 @@ package com.simibubi.create.content.contraptions.components.structureMovement.re import org.lwjgl.opengl.GL20; -import com.simibubi.create.foundation.render.backend.core.BasicProgram; -import com.simibubi.create.foundation.render.backend.gl.shader.ProgramFogMode; +import com.jozufozu.flywheel.backend.core.BasicProgram; +import com.jozufozu.flywheel.backend.gl.shader.ProgramFogMode; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java index 83c39757f..b7624b37a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java @@ -8,6 +8,8 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL13; import org.lwjgl.opengl.GL40; +import com.jozufozu.flywheel.backend.Backend; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllMovementBehaviours; import com.simibubi.create.CreateClient; @@ -20,8 +22,6 @@ import com.simibubi.create.foundation.render.Compartment; import com.simibubi.create.foundation.render.SuperByteBuffer; import com.simibubi.create.foundation.render.SuperByteBufferCache; import com.simibubi.create.foundation.render.TileEntityRenderHelper; -import com.simibubi.create.foundation.render.backend.Backend; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import com.simibubi.create.foundation.utility.MatrixStacker; import com.simibubi.create.foundation.utility.worldWrappers.PlacementSimulationWorld; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/RenderedContraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/RenderedContraption.java index bf5ffde42..16b079aa8 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/RenderedContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/RenderedContraption.java @@ -7,13 +7,13 @@ import java.util.Random; import org.lwjgl.opengl.GL11; +import com.jozufozu.flywheel.backend.Backend; +import com.jozufozu.flywheel.backend.instancing.IInstanceRendered; +import com.jozufozu.flywheel.backend.light.GridAlignedBB; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity; import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionLighter; -import com.simibubi.create.foundation.render.backend.Backend; -import com.simibubi.create.foundation.render.backend.instancing.IInstanceRendered; -import com.simibubi.create.foundation.render.backend.light.GridAlignedBB; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.worldWrappers.PlacementSimulationWorld; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpCogInstance.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpCogInstance.java index 470b5ab4e..2aae2c2d6 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpCogInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpCogInstance.java @@ -2,12 +2,12 @@ package com.simibubi.create.content.contraptions.fluids; import static net.minecraft.state.properties.BlockStateProperties.FACING; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.RotatingData; import com.simibubi.create.content.contraptions.base.SingleRotatingInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import net.minecraft.block.BlockState; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyRenderer.java index 3e1a43506..6615a4a09 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyRenderer.java @@ -1,11 +1,11 @@ package com.simibubi.create.content.contraptions.fluids.actors; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.components.structureMovement.pulley.AbstractPulleyRenderer; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutRenderer.java index 2cbacbd36..20db657b8 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutRenderer.java @@ -1,10 +1,10 @@ package com.simibubi.create.content.contraptions.fluids.actors; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.foundation.fluid.FluidRenderer; import com.simibubi.create.foundation.render.PartialBufferer; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.tileEntity.behaviour.fluid.SmartFluidTankBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.fluid.SmartFluidTankBehaviour.TankSegment; import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveInstance.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveInstance.java index 2e041cc60..6c2d1a278 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveInstance.java @@ -1,13 +1,13 @@ package com.simibubi.create.content.contraptions.fluids.pipes; +import com.jozufozu.flywheel.backend.core.ModelData; +import com.jozufozu.flywheel.backend.instancing.IDynamicInstance; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.content.contraptions.relays.encased.ShaftInstance; -import com.simibubi.create.foundation.render.backend.core.ModelData; -import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.MatrixStacker; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveRenderer.java index 3d3a02951..5ea1d6dc5 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveRenderer.java @@ -1,12 +1,12 @@ package com.simibubi.create.content.contraptions.fluids.pipes; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.MatrixStacker; diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerRenderer.java index 1d3765ac6..f581a022d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerRenderer.java @@ -1,11 +1,11 @@ package com.simibubi.create.content.contraptions.processing.burner; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java index 6d4fec12e..b3a66b92e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java @@ -1,5 +1,6 @@ package com.simibubi.create.content.contraptions.relays.advanced; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; @@ -7,7 +8,6 @@ import com.simibubi.create.CreateClient; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import com.simibubi.create.foundation.tileEntity.renderer.SmartTileEntityRenderer; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltAttributes.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltAttributes.java index 4753f1eb2..6a7b20814 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltAttributes.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltAttributes.java @@ -1,9 +1,9 @@ package com.simibubi.create.content.contraptions.relays.belt; -import com.simibubi.create.foundation.render.backend.gl.attrib.CommonAttributes; -import com.simibubi.create.foundation.render.backend.gl.attrib.IAttribSpec; -import com.simibubi.create.foundation.render.backend.gl.attrib.IVertexAttrib; -import com.simibubi.create.foundation.render.backend.gl.attrib.VertexAttribSpec; +import com.jozufozu.flywheel.backend.gl.attrib.CommonAttributes; +import com.jozufozu.flywheel.backend.gl.attrib.IAttribSpec; +import com.jozufozu.flywheel.backend.gl.attrib.IVertexAttrib; +import com.jozufozu.flywheel.backend.gl.attrib.VertexAttribSpec; public enum BeltAttributes implements IVertexAttrib { INSTANCE_ROTATION("aInstanceRot", CommonAttributes.QUATERNION), diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltData.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltData.java index ec0b082c5..81d59d97b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltData.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltData.java @@ -2,9 +2,9 @@ package com.simibubi.create.content.contraptions.relays.belt; import java.nio.ByteBuffer; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; import com.simibubi.create.content.contraptions.base.KineticData; import com.simibubi.create.foundation.block.render.SpriteShiftEntry; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.math.vector.Quaternion; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltInstance.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltInstance.java index 5546490ea..08a35cff9 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltInstance.java @@ -3,6 +3,10 @@ package com.simibubi.create.content.contraptions.relays.belt; import java.util.ArrayList; import java.util.function.Supplier; +import com.jozufozu.flywheel.backend.core.PartialModel; +import com.jozufozu.flywheel.backend.instancing.InstanceData; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; @@ -10,10 +14,6 @@ import com.simibubi.create.content.contraptions.base.KineticRenderMaterials; import com.simibubi.create.content.contraptions.base.KineticTileInstance; import com.simibubi.create.content.contraptions.base.RotatingData; import com.simibubi.create.foundation.block.render.SpriteShiftEntry; -import com.simibubi.create.foundation.render.backend.core.PartialModel; -import com.simibubi.create.foundation.render.backend.instancing.InstanceData; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.MatrixStacker; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltInstancedModel.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltInstancedModel.java index 7b75ce395..10d68db54 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltInstancedModel.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltInstancedModel.java @@ -1,10 +1,10 @@ package com.simibubi.create.content.contraptions.relays.belt; +import com.jozufozu.flywheel.backend.core.BasicAttributes; +import com.jozufozu.flywheel.backend.gl.attrib.VertexFormat; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.simibubi.create.content.contraptions.base.KineticAttributes; -import com.simibubi.create.foundation.render.backend.core.BasicAttributes; -import com.simibubi.create.foundation.render.backend.gl.attrib.VertexFormat; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java index 4beec3bb0..076fa64d2 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java @@ -3,6 +3,8 @@ package com.simibubi.create.content.contraptions.relays.belt; import java.util.Random; import java.util.function.Supplier; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; @@ -15,8 +17,6 @@ import com.simibubi.create.foundation.block.render.SpriteShiftEntry; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.ShadowRenderHelper; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java index 1624eb195..1202e5d58 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java @@ -12,6 +12,10 @@ import java.util.Map; import java.util.Optional; import java.util.function.Function; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.light.GridAlignedBB; +import com.jozufozu.flywheel.backend.light.LightUpdateListener; +import com.jozufozu.flywheel.backend.light.LightUpdater; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.contraptions.base.IRotate; import com.simibubi.create.content.contraptions.base.KineticTileEntity; @@ -22,10 +26,6 @@ import com.simibubi.create.content.contraptions.relays.belt.transport.BeltTunnel import com.simibubi.create.content.contraptions.relays.belt.transport.ItemHandlerBeltSegment; import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack; import com.simibubi.create.content.logistics.block.belts.tunnel.BrassTunnelTileEntity; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.light.GridAlignedBB; -import com.simibubi.create.foundation.render.backend.light.LightUpdateListener; -import com.simibubi.create.foundation.render.backend.light.LightUpdater; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.belt.DirectBeltInputBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemStackHandlerBehaviour; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/ShaftInstance.java b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/ShaftInstance.java index b2929b67f..eb7185fc7 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/ShaftInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/ShaftInstance.java @@ -1,8 +1,8 @@ package com.simibubi.create.content.contraptions.relays.encased; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.SingleRotatingInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/SplitShaftInstance.java b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/SplitShaftInstance.java index f317fd24d..a2847452d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/SplitShaftInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/SplitShaftInstance.java @@ -2,14 +2,14 @@ package com.simibubi.create.content.contraptions.relays.encased; import java.util.ArrayList; +import com.jozufozu.flywheel.backend.instancing.InstanceData; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.instancing.RenderMaterial; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.IRotate; import com.simibubi.create.content.contraptions.base.KineticTileInstance; import com.simibubi.create.content.contraptions.base.RotatingData; -import com.simibubi.create.foundation.render.backend.instancing.InstanceData; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; -import com.simibubi.create.foundation.render.backend.instancing.RenderMaterial; import com.simibubi.create.foundation.utility.Iterate; import net.minecraft.block.Block; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/SplitShaftRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/SplitShaftRenderer.java index cac191681..c8016ed47 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/SplitShaftRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/SplitShaftRenderer.java @@ -1,5 +1,6 @@ package com.simibubi.create.content.contraptions.relays.encased; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.IRotate; @@ -7,7 +8,6 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.Iterate; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeInstance.java b/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeInstance.java index dd0a740dd..94178337b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeInstance.java @@ -2,14 +2,14 @@ package com.simibubi.create.content.contraptions.relays.gauge; import java.util.ArrayList; +import com.jozufozu.flywheel.backend.core.ModelData; +import com.jozufozu.flywheel.backend.instancing.IDynamicInstance; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.relays.encased.ShaftInstance; -import com.simibubi.create.foundation.render.backend.core.ModelData; -import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.Couple; import com.simibubi.create.foundation.utility.Iterate; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeRenderer.java index 56c9fb89b..1588b1c77 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeRenderer.java @@ -1,5 +1,7 @@ package com.simibubi.create.content.contraptions.relays.gauge; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; @@ -8,8 +10,6 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.content.contraptions.relays.gauge.GaugeBlock.Type; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.utility.Iterate; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxInstance.java b/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxInstance.java index a991802fa..747c6a9ec 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxInstance.java @@ -3,13 +3,13 @@ package com.simibubi.create.content.contraptions.relays.gearbox; import java.util.EnumMap; import java.util.Map; +import com.jozufozu.flywheel.backend.instancing.InstanceData; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.instancing.RenderMaterial; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticTileInstance; import com.simibubi.create.content.contraptions.base.RotatingData; -import com.simibubi.create.foundation.render.backend.instancing.InstanceData; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; -import com.simibubi.create.foundation.render.backend.instancing.RenderMaterial; import com.simibubi.create.foundation.utility.Iterate; import net.minecraft.state.properties.BlockStateProperties; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxRenderer.java index 72c2e09e8..f0e0c5e5b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxRenderer.java @@ -1,12 +1,12 @@ package com.simibubi.create.content.contraptions.relays.gearbox; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.Iterate; diff --git a/src/main/java/com/simibubi/create/content/curiosities/projector/ChromaticProjectorInstance.java b/src/main/java/com/simibubi/create/content/curiosities/projector/ChromaticProjectorInstance.java index ea7aa760a..e0b1edd59 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/projector/ChromaticProjectorInstance.java +++ b/src/main/java/com/simibubi/create/content/curiosities/projector/ChromaticProjectorInstance.java @@ -1,9 +1,9 @@ package com.simibubi.create.content.curiosities.projector; -import com.simibubi.create.foundation.render.backend.Backend; -import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; -import com.simibubi.create.foundation.render.backend.instancing.TileEntityInstance; +import com.jozufozu.flywheel.backend.Backend; +import com.jozufozu.flywheel.backend.instancing.IDynamicInstance; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.instancing.TileEntityInstance; public class ChromaticProjectorInstance extends TileEntityInstance implements IDynamicInstance { diff --git a/src/main/java/com/simibubi/create/content/curiosities/projector/ChromaticProjectorTileEntity.java b/src/main/java/com/simibubi/create/content/curiosities/projector/ChromaticProjectorTileEntity.java index 0bb20e983..6af2872c5 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/projector/ChromaticProjectorTileEntity.java +++ b/src/main/java/com/simibubi/create/content/curiosities/projector/ChromaticProjectorTileEntity.java @@ -2,8 +2,8 @@ package com.simibubi.create.content.curiosities.projector; import java.util.Vector; -import com.simibubi.create.foundation.render.backend.effects.FilterSphere; -import com.simibubi.create.foundation.render.backend.instancing.IInstanceRendered; +import com.jozufozu.flywheel.backend.effects.FilterSphere; +import com.jozufozu.flywheel.backend.instancing.IInstanceRendered; import com.simibubi.create.foundation.tileEntity.SyncedTileEntity; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/content/curiosities/projector/ColorEffect.java b/src/main/java/com/simibubi/create/content/curiosities/projector/ColorEffect.java index 0d072b419..ab56d6487 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/projector/ColorEffect.java +++ b/src/main/java/com/simibubi/create/content/curiosities/projector/ColorEffect.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.function.Function; import java.util.function.Supplier; +import com.jozufozu.flywheel.backend.effects.ColorMatrices; import com.simibubi.create.foundation.gui.AllGuiTextures; -import com.simibubi.create.foundation.render.backend.effects.ColorMatrices; import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollValueBehaviour; import com.simibubi.create.foundation.utility.Lang; diff --git a/src/main/java/com/simibubi/create/content/curiosities/projector/FilterStep.java b/src/main/java/com/simibubi/create/content/curiosities/projector/FilterStep.java index a8a3795e8..d91f64ee6 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/projector/FilterStep.java +++ b/src/main/java/com/simibubi/create/content/curiosities/projector/FilterStep.java @@ -3,7 +3,7 @@ package com.simibubi.create.content.curiosities.projector; import java.util.Iterator; import java.util.Vector; -import com.simibubi.create.foundation.render.backend.effects.ColorMatrices; +import com.jozufozu.flywheel.backend.effects.ColorMatrices; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/CrossPlaneMirror.java b/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/CrossPlaneMirror.java index 805673bec..45894d199 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/CrossPlaneMirror.java +++ b/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/CrossPlaneMirror.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.Map; import com.google.common.collect.ImmutableList; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.MatrixStacker; diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/EmptyMirror.java b/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/EmptyMirror.java index 9e953ae5b..0fc2fe73b 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/EmptyMirror.java +++ b/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/EmptyMirror.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; import com.google.common.collect.ImmutableList; -import com.simibubi.create.foundation.render.backend.core.PartialModel; +import com.jozufozu.flywheel.backend.core.PartialModel; import net.minecraft.block.BlockState; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/PlaneMirror.java b/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/PlaneMirror.java index 53f8a55c3..2d849ba46 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/PlaneMirror.java +++ b/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/PlaneMirror.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.Map; import com.google.common.collect.ImmutableList; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.MatrixStacker; diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/SymmetryMirror.java b/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/SymmetryMirror.java index 02e950e9e..46df9226b 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/SymmetryMirror.java +++ b/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/SymmetryMirror.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; import com.google.common.collect.ImmutableList; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.utility.Lang; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/TriplePlaneMirror.java b/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/TriplePlaneMirror.java index 838d4b366..9cac8c376 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/TriplePlaneMirror.java +++ b/src/main/java/com/simibubi/create/content/curiosities/symmetry/mirror/TriplePlaneMirror.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; import com.google.common.collect.ImmutableList; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.utility.Lang; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripRenderHandler.java b/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripRenderHandler.java index 847935f56..e1090f707 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripRenderHandler.java +++ b/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripRenderHandler.java @@ -1,9 +1,9 @@ package com.simibubi.create.content.curiosities.tools; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllItems; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.MatrixStacker; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/FlapAttributes.java b/src/main/java/com/simibubi/create/content/logistics/block/FlapAttributes.java index 71a8db0af..ad6864629 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/FlapAttributes.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/FlapAttributes.java @@ -1,9 +1,9 @@ package com.simibubi.create.content.logistics.block; -import com.simibubi.create.foundation.render.backend.gl.attrib.CommonAttributes; -import com.simibubi.create.foundation.render.backend.gl.attrib.IAttribSpec; -import com.simibubi.create.foundation.render.backend.gl.attrib.IVertexAttrib; -import com.simibubi.create.foundation.render.backend.gl.attrib.VertexAttribSpec; +import com.jozufozu.flywheel.backend.gl.attrib.CommonAttributes; +import com.jozufozu.flywheel.backend.gl.attrib.IAttribSpec; +import com.jozufozu.flywheel.backend.gl.attrib.IVertexAttrib; +import com.jozufozu.flywheel.backend.gl.attrib.VertexAttribSpec; public enum FlapAttributes implements IVertexAttrib { INSTANCE_POSITION("aInstancePos",CommonAttributes.VEC3), diff --git a/src/main/java/com/simibubi/create/content/logistics/block/FlapData.java b/src/main/java/com/simibubi/create/content/logistics/block/FlapData.java index 2a91a9e94..2eed76a0f 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/FlapData.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/FlapData.java @@ -2,9 +2,9 @@ package com.simibubi.create.content.logistics.block; import java.nio.ByteBuffer; -import com.simibubi.create.foundation.render.backend.core.IFlatLight; -import com.simibubi.create.foundation.render.backend.instancing.InstanceData; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.core.IFlatLight; +import com.jozufozu.flywheel.backend.instancing.InstanceData; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3f; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/FlapModel.java b/src/main/java/com/simibubi/create/content/logistics/block/FlapModel.java index 7a6a00f14..42aeb46f5 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/FlapModel.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/FlapModel.java @@ -1,8 +1,8 @@ package com.simibubi.create.content.logistics.block; -import com.simibubi.create.foundation.render.backend.gl.attrib.VertexFormat; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.gl.attrib.VertexFormat; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelInstance.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelInstance.java index 81793455e..b238d2084 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelInstance.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelInstance.java @@ -5,15 +5,15 @@ import java.util.Collection; import java.util.EnumMap; import java.util.Map; +import com.jozufozu.flywheel.backend.instancing.IDynamicInstance; +import com.jozufozu.flywheel.backend.instancing.InstanceData; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.instancing.TileEntityInstance; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticRenderMaterials; import com.simibubi.create.content.logistics.block.FlapData; import com.simibubi.create.foundation.gui.widgets.InterpolatedValue; -import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstanceData; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; -import com.simibubi.create.foundation.render.backend.instancing.TileEntityInstance; import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelRenderer.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelRenderer.java index 49252ec37..14f7a8ceb 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelRenderer.java @@ -1,11 +1,11 @@ package com.simibubi.create.content.logistics.block.belts.tunnel; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import com.simibubi.create.foundation.tileEntity.renderer.SmartTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.Iterate; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelTileEntity.java index 6527280b9..a039b6c7f 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelTileEntity.java @@ -9,14 +9,14 @@ import java.util.Set; import org.apache.commons.lang3.tuple.Pair; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.instancing.IInstanceRendered; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock.Shape; import com.simibubi.create.content.logistics.block.funnel.BeltFunnelBlock; import com.simibubi.create.content.logistics.packet.TunnelFlapPacket; import com.simibubi.create.foundation.gui.widgets.InterpolatedChasingValue; import com.simibubi.create.foundation.networking.AllPackets; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.instancing.IInstanceRendered; import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.utility.Iterate; @@ -44,7 +44,7 @@ public class BeltTunnelTileEntity extends SmartTileEntity implements IInstanceRe public Map flaps; public Set sides; - + protected LazyOptional cap = LazyOptional.empty(); protected List> flapsToSend; @@ -67,12 +67,12 @@ public class BeltTunnelTileEntity extends SmartTileEntity implements IInstanceRe for (Direction direction : flaps.keySet()) flapsNBT.add(IntNBT.of(direction.getIndex())); compound.put("Flaps", flapsNBT); - + ListNBT sidesNBT = new ListNBT(); for (Direction direction : sides) sidesNBT.add(IntNBT.of(direction.getIndex())); compound.put("Sides", sidesNBT); - + super.write(compound, clientPacket); } @@ -83,7 +83,7 @@ public class BeltTunnelTileEntity extends SmartTileEntity implements IInstanceRe for (INBT inbt : flapsNBT) if (inbt instanceof IntNBT) newFlaps.add(Direction.byIndex(((IntNBT) inbt).getInt())); - + sides.clear(); ListNBT sidesNBT = compound.getList("Sides", NBT.TAG_INT); for (INBT inbt : sidesNBT) @@ -97,7 +97,7 @@ public class BeltTunnelTileEntity extends SmartTileEntity implements IInstanceRe flaps.put(d, new InterpolatedChasingValue().start(.25f) .target(0) .withSpeed(.05f)); - + // Backwards compat if (!compound.contains("Sides") && compound.contains("Flaps")) sides.addAll(flaps.keySet()); @@ -122,9 +122,9 @@ public class BeltTunnelTileEntity extends SmartTileEntity implements IInstanceRe if (!positive && shape == Shape.T_RIGHT) continue; } - + sides.add(direction); - + // Flap might be occluded BlockState nextState = world.getBlockState(pos.offset(direction)); if (nextState.getBlock() instanceof BeltTunnelBlock) @@ -179,7 +179,7 @@ public class BeltTunnelTileEntity extends SmartTileEntity implements IInstanceRe public boolean shouldRenderAsTE() { return true; } - + @Override public void addBehaviours(List behaviours) {} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorInstance.java b/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorInstance.java index ad44cb651..53b1db9ab 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorInstance.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorInstance.java @@ -1,11 +1,11 @@ package com.simibubi.create.content.logistics.block.depot; +import com.jozufozu.flywheel.backend.core.ModelData; +import com.jozufozu.flywheel.backend.instancing.IDynamicInstance; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.relays.encased.ShaftInstance; -import com.simibubi.create.foundation.render.backend.core.ModelData; -import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.MatrixStacker; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorRenderer.java b/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorRenderer.java index ddb028c7a..3b993fe6b 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorRenderer.java @@ -1,5 +1,6 @@ package com.simibubi.create.content.logistics.block.depot; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; @@ -7,7 +8,6 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.IntAttached; import com.simibubi.create.foundation.utility.MatrixStacker; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterInstance.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterInstance.java index 4bef959ea..2c27676d0 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterInstance.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterInstance.java @@ -1,11 +1,11 @@ package com.simibubi.create.content.logistics.block.diodes; +import com.jozufozu.flywheel.backend.core.ModelData; +import com.jozufozu.flywheel.backend.instancing.ITickableInstance; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.instancing.TileEntityInstance; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.foundation.render.backend.core.ModelData; -import com.simibubi.create.foundation.render.backend.instancing.ITickableInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; -import com.simibubi.create.foundation.render.backend.instancing.TileEntityInstance; import com.simibubi.create.foundation.utility.ColorHelper; import com.simibubi.create.foundation.utility.MatrixStacker; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterTileEntity.java index 363daea76..c678c6085 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterTileEntity.java @@ -5,7 +5,7 @@ import static net.minecraft.block.RedstoneDiodeBlock.POWERED; import java.util.List; -import com.simibubi.create.foundation.render.backend.instancing.IInstanceRendered; +import com.jozufozu.flywheel.backend.instancing.IInstanceRendered; import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollValueBehaviour; @@ -36,10 +36,10 @@ public class AdjustableRepeaterTileEntity extends SmartTileEntity implements IIn maxState.withFormatter(this::format); maxState.withUnit(this::getUnit); maxState.withCallback(this::onMaxDelayChanged); - + behaviours.add(maxState); } - + private void onMaxDelayChanged(int newMax) { state = MathHelper.clamp(state, 0, newMax); sendData(); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelInstance.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelInstance.java index 16090ddbd..4c378f3d7 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelInstance.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelInstance.java @@ -2,15 +2,15 @@ package com.simibubi.create.content.logistics.block.funnel; import java.util.ArrayList; +import com.jozufozu.flywheel.backend.core.PartialModel; +import com.jozufozu.flywheel.backend.instancing.IDynamicInstance; +import com.jozufozu.flywheel.backend.instancing.InstanceData; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.instancing.TileEntityInstance; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticRenderMaterials; import com.simibubi.create.content.logistics.block.FlapData; -import com.simibubi.create.foundation.render.backend.core.PartialModel; -import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstanceData; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; -import com.simibubi.create.foundation.render.backend.instancing.TileEntityInstance; import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelRenderer.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelRenderer.java index 87d762e51..735749775 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelRenderer.java @@ -1,12 +1,12 @@ package com.simibubi.create.content.logistics.block.funnel; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.tileEntity.renderer.SmartTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.MatrixStacker; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelTileEntity.java index 02464be74..ddf7fd424 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelTileEntity.java @@ -3,6 +3,8 @@ package com.simibubi.create.content.logistics.block.funnel; import java.lang.ref.WeakReference; import java.util.List; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.instancing.IInstanceRendered; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.content.contraptions.goggles.IHaveHoveringInformation; @@ -14,8 +16,6 @@ import com.simibubi.create.content.logistics.packet.FunnelFlapPacket; import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.gui.widgets.InterpolatedChasingValue; import com.simibubi.create.foundation.networking.AllPackets; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.instancing.IInstanceRendered; import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.belt.DirectBeltInputBehaviour; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInstance.java b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInstance.java index 941b35260..a33af9b12 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInstance.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInstance.java @@ -3,16 +3,16 @@ package com.simibubi.create.content.logistics.block.mechanicalArm; import java.util.ArrayList; import com.google.common.collect.Lists; +import com.jozufozu.flywheel.backend.core.ModelData; +import com.jozufozu.flywheel.backend.instancing.IDynamicInstance; +import com.jozufozu.flywheel.backend.instancing.InstanceData; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.instancing.RenderMaterial; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.RotatingData; import com.simibubi.create.content.contraptions.base.SingleRotatingInstance; -import com.simibubi.create.foundation.render.backend.core.ModelData; -import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstanceData; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; -import com.simibubi.create.foundation.render.backend.instancing.RenderMaterial; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.ColorHelper; import com.simibubi.create.foundation.utility.Iterate; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java index 84baeee39..bb8f4e297 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java @@ -7,6 +7,7 @@ import javax.annotation.Nullable; import org.apache.commons.lang3.mutable.MutableBoolean; import com.google.common.collect.ImmutableMap; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; @@ -27,7 +28,6 @@ import com.simibubi.create.content.logistics.block.funnel.FunnelBlock; import com.simibubi.create.content.logistics.block.funnel.FunnelTileEntity; import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.item.SmartInventory; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemStackHandlerBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmRenderer.java b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmRenderer.java index 2a9a72ac3..82294a44f 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmRenderer.java @@ -1,5 +1,6 @@ package com.simibubi.create.content.logistics.block.mechanicalArm; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; @@ -8,7 +9,6 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.content.logistics.block.mechanicalArm.ArmTileEntity.Phase; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.ColorHelper; import com.simibubi.create.foundation.utility.Iterate; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverInstance.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverInstance.java index 416766dcf..8c2aaacac 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverInstance.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverInstance.java @@ -1,13 +1,13 @@ package com.simibubi.create.content.logistics.block.redstone; +import com.jozufozu.flywheel.backend.core.ModelData; +import com.jozufozu.flywheel.backend.instancing.IDynamicInstance; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.instancing.RenderMaterial; +import com.jozufozu.flywheel.backend.instancing.TileEntityInstance; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.foundation.render.backend.core.ModelData; -import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; -import com.simibubi.create.foundation.render.backend.instancing.RenderMaterial; -import com.simibubi.create.foundation.render.backend.instancing.TileEntityInstance; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.ColorHelper; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverRenderer.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverRenderer.java index 329760ede..991560762 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverRenderer.java @@ -1,11 +1,11 @@ package com.simibubi.create.content.logistics.block.redstone; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.ColorHelper; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverTileEntity.java index 2862ad0fe..624d2e8f5 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/AnalogLeverTileEntity.java @@ -2,9 +2,9 @@ package com.simibubi.create.content.logistics.block.redstone; import java.util.List; +import com.jozufozu.flywheel.backend.instancing.IInstanceRendered; import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation; import com.simibubi.create.foundation.gui.widgets.InterpolatedChasingValue; -import com.simibubi.create.foundation.render.backend.instancing.IInstanceRendered; import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.utility.Lang; diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonInstance.java b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonInstance.java index b91ca03a0..a64f62969 100644 --- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonInstance.java +++ b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonInstance.java @@ -1,13 +1,13 @@ package com.simibubi.create.content.schematics.block; +import com.jozufozu.flywheel.backend.core.ModelData; +import com.jozufozu.flywheel.backend.instancing.IDynamicInstance; +import com.jozufozu.flywheel.backend.instancing.InstancedModel; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.instancing.RenderMaterial; +import com.jozufozu.flywheel.backend.instancing.TileEntityInstance; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.foundation.render.backend.core.ModelData; -import com.simibubi.create.foundation.render.backend.instancing.IDynamicInstance; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; -import com.simibubi.create.foundation.render.backend.instancing.RenderMaterial; -import com.simibubi.create.foundation.render.backend.instancing.TileEntityInstance; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.MatrixStacker; diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonRenderer.java b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonRenderer.java index 6ac93df76..01e690db8 100644 --- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonRenderer.java +++ b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonRenderer.java @@ -2,6 +2,7 @@ package com.simibubi.create.content.schematics.block; import java.util.Random; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; @@ -9,7 +10,6 @@ import com.simibubi.create.content.schematics.block.LaunchedItem.ForBlockState; import com.simibubi.create.content.schematics.block.LaunchedItem.ForEntity; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java index 8a06c2464..d7f6f57d4 100644 --- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java +++ b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java @@ -7,6 +7,7 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; +import com.jozufozu.flywheel.backend.instancing.IInstanceRendered; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; import com.simibubi.create.AllSoundEvents; @@ -25,7 +26,6 @@ import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.config.CSchematics; import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.item.ItemHelper.ExtractionCountMode; -import com.simibubi.create.foundation.render.backend.instancing.IInstanceRendered; import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.utility.BlockHelper; diff --git a/src/main/java/com/simibubi/create/events/ClientEvents.java b/src/main/java/com/simibubi/create/events/ClientEvents.java index 0aa7c9131..7d0528748 100644 --- a/src/main/java/com/simibubi/create/events/ClientEvents.java +++ b/src/main/java/com/simibubi/create/events/ClientEvents.java @@ -3,6 +3,8 @@ package com.simibubi.create.events; import java.util.ArrayList; import java.util.List; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.RenderWork; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllFluids; @@ -35,8 +37,6 @@ import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.networking.LeftClickPacket; import com.simibubi.create.foundation.ponder.PonderTooltipHandler; import com.simibubi.create.foundation.render.KineticRenderer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.RenderWork; import com.simibubi.create.foundation.renderState.SuperRenderTypeBuffer; import com.simibubi.create.foundation.sound.SoundScapes; import com.simibubi.create.foundation.tileEntity.behaviour.edgeInteraction.EdgeInteractionRenderer; @@ -90,7 +90,7 @@ public class ClientEvents { World world = Minecraft.getInstance().world; if (!isGameActive()) return; - + if (event.phase == Phase.START) { AirCurrent.tickClientPlayerSounds(); return; diff --git a/src/main/java/com/simibubi/create/foundation/command/ConfigureConfigPacket.java b/src/main/java/com/simibubi/create/foundation/command/ConfigureConfigPacket.java index 28339f5c0..7681c1094 100644 --- a/src/main/java/com/simibubi/create/foundation/command/ConfigureConfigPacket.java +++ b/src/main/java/com/simibubi/create/foundation/command/ConfigureConfigPacket.java @@ -5,6 +5,8 @@ import java.util.function.Supplier; import org.apache.logging.log4j.LogManager; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.OptifineHandler; import com.simibubi.create.Create; import com.simibubi.create.content.contraptions.goggles.GoggleConfigScreen; import com.simibubi.create.foundation.config.AllConfigs; @@ -13,8 +15,6 @@ import com.simibubi.create.foundation.networking.SimplePacketBase; import com.simibubi.create.foundation.ponder.PonderRegistry; import com.simibubi.create.foundation.ponder.PonderUI; import com.simibubi.create.foundation.ponder.content.PonderIndexScreen; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.OptifineHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.ClientPlayerEntity; diff --git a/src/main/java/com/simibubi/create/foundation/data/CreateTileEntityBuilder.java b/src/main/java/com/simibubi/create/foundation/data/CreateTileEntityBuilder.java index 64286f525..0a9530d23 100644 --- a/src/main/java/com/simibubi/create/foundation/data/CreateTileEntityBuilder.java +++ b/src/main/java/com/simibubi/create/foundation/data/CreateTileEntityBuilder.java @@ -2,8 +2,8 @@ package com.simibubi.create.foundation.data; import javax.annotation.Nullable; -import com.simibubi.create.foundation.render.backend.instancing.IRendererFactory; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderRegistry; +import com.jozufozu.flywheel.backend.instancing.IRendererFactory; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderRegistry; import com.tterrag.registrate.AbstractRegistrate; import com.tterrag.registrate.builders.BuilderCallback; import com.tterrag.registrate.builders.TileEntityBuilder; diff --git a/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java b/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java index 385f1a019..cab7b57df 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java +++ b/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java @@ -2,6 +2,7 @@ package com.simibubi.create.foundation.gui; import javax.annotation.Nullable; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.platform.GlStateManager.DestFactor; @@ -9,7 +10,6 @@ import com.mojang.blaze3d.platform.GlStateManager.SourceFactor; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.foundation.fluid.FluidRenderer; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.utility.ColorHelper; import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.foundation.utility.VirtualEmptyModelData; diff --git a/src/main/java/com/simibubi/create/foundation/mixin/CancelTileEntityRenderMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/CancelTileEntityRenderMixin.java index 79994972e..f409c43a0 100644 --- a/src/main/java/com/simibubi/create/foundation/mixin/CancelTileEntityRenderMixin.java +++ b/src/main/java/com/simibubi/create/foundation/mixin/CancelTileEntityRenderMixin.java @@ -7,8 +7,8 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.instancing.IInstanceRendered; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.instancing.IInstanceRendered; import net.minecraft.client.renderer.chunk.ChunkRenderDispatcher; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/simibubi/create/foundation/mixin/FogColorTrackerMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/FogColorTrackerMixin.java index d4cb97910..d3e69ecf1 100644 --- a/src/main/java/com/simibubi/create/foundation/mixin/FogColorTrackerMixin.java +++ b/src/main/java/com/simibubi/create/foundation/mixin/FogColorTrackerMixin.java @@ -6,8 +6,8 @@ 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.GlFog; import com.mojang.blaze3d.platform.GlStateManager; -import com.simibubi.create.foundation.render.backend.gl.GlFog; @Mixin(GlStateManager.class) public class FogColorTrackerMixin { diff --git a/src/main/java/com/simibubi/create/foundation/mixin/LightUpdateMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/LightUpdateMixin.java index 440a3f68b..4b8e08f41 100644 --- a/src/main/java/com/simibubi/create/foundation/mixin/LightUpdateMixin.java +++ b/src/main/java/com/simibubi/create/foundation/mixin/LightUpdateMixin.java @@ -7,8 +7,8 @@ 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.light.LightUpdater; import com.simibubi.create.CreateClient; -import com.simibubi.create.foundation.render.backend.light.LightUpdater; import net.minecraft.client.multiplayer.ClientChunkProvider; import net.minecraft.client.world.ClientWorld; diff --git a/src/main/java/com/simibubi/create/foundation/mixin/NetworkLightUpdateMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/NetworkLightUpdateMixin.java index 06ddf0c30..effe19da5 100644 --- a/src/main/java/com/simibubi/create/foundation/mixin/NetworkLightUpdateMixin.java +++ b/src/main/java/com/simibubi/create/foundation/mixin/NetworkLightUpdateMixin.java @@ -5,9 +5,9 @@ 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.RenderWork; +import com.jozufozu.flywheel.backend.light.LightUpdater; import com.simibubi.create.CreateClient; -import com.simibubi.create.foundation.render.backend.RenderWork; -import com.simibubi.create.foundation.render.backend.light.LightUpdater; import net.minecraft.client.Minecraft; import net.minecraft.client.network.play.ClientPlayNetHandler; diff --git a/src/main/java/com/simibubi/create/foundation/mixin/RenderHooksMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/RenderHooksMixin.java index d140a4bef..3ac8541a1 100644 --- a/src/main/java/com/simibubi/create/foundation/mixin/RenderHooksMixin.java +++ b/src/main/java/com/simibubi/create/foundation/mixin/RenderHooksMixin.java @@ -7,14 +7,14 @@ 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.Backend; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; +import com.jozufozu.flywheel.backend.OptifineHandler; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; import com.simibubi.create.CreateClient; import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher; import com.simibubi.create.foundation.render.KineticRenderer; -import com.simibubi.create.foundation.render.backend.Backend; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; -import com.simibubi.create.foundation.render.backend.OptifineHandler; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.ActiveRenderInfo; diff --git a/src/main/java/com/simibubi/create/foundation/mixin/ShaderCloseMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/ShaderCloseMixin.java index d779d6582..8da970608 100644 --- a/src/main/java/com/simibubi/create/foundation/mixin/ShaderCloseMixin.java +++ b/src/main/java/com/simibubi/create/foundation/mixin/ShaderCloseMixin.java @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.simibubi.create.foundation.render.backend.OptifineHandler; +import com.jozufozu.flywheel.backend.OptifineHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.Screen; diff --git a/src/main/java/com/simibubi/create/foundation/mixin/StoreProjectionMatrixMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/StoreProjectionMatrixMixin.java index 0fe562376..822e05bd8 100644 --- a/src/main/java/com/simibubi/create/foundation/mixin/StoreProjectionMatrixMixin.java +++ b/src/main/java/com/simibubi/create/foundation/mixin/StoreProjectionMatrixMixin.java @@ -9,9 +9,9 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import com.jozufozu.flywheel.backend.Backend; +import com.jozufozu.flywheel.backend.effects.EffectsHandler; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.foundation.render.backend.Backend; -import com.simibubi.create.foundation.render.backend.effects.EffectsHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ActiveRenderInfo; diff --git a/src/main/java/com/simibubi/create/foundation/render/AllProgramSpecs.java b/src/main/java/com/simibubi/create/foundation/render/AllProgramSpecs.java index df7bfb5b6..54836972d 100644 --- a/src/main/java/com/simibubi/create/foundation/render/AllProgramSpecs.java +++ b/src/main/java/com/simibubi/create/foundation/render/AllProgramSpecs.java @@ -1,7 +1,17 @@ package com.simibubi.create.foundation.render; -import static com.simibubi.create.foundation.render.backend.Backend.register; +import static com.jozufozu.flywheel.backend.Backend.register; +import com.jozufozu.flywheel.backend.core.BasicAttributes; +import com.jozufozu.flywheel.backend.core.BasicProgram; +import com.jozufozu.flywheel.backend.core.ModelAttributes; +import com.jozufozu.flywheel.backend.core.OrientedAttributes; +import com.jozufozu.flywheel.backend.core.TransformAttributes; +import com.jozufozu.flywheel.backend.effects.SphereFilterProgram; +import com.jozufozu.flywheel.backend.gl.shader.FogSensitiveProgram; +import com.jozufozu.flywheel.backend.gl.shader.ProgramSpec; +import com.jozufozu.flywheel.backend.gl.shader.ShaderConstants; +import com.jozufozu.flywheel.backend.gl.shader.SingleProgram; import com.simibubi.create.Create; import com.simibubi.create.content.contraptions.base.KineticAttributes; import com.simibubi.create.content.contraptions.base.RotatingAttributes; @@ -10,16 +20,6 @@ import com.simibubi.create.content.contraptions.components.structureMovement.ren import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionProgram; import com.simibubi.create.content.contraptions.relays.belt.BeltAttributes; import com.simibubi.create.content.logistics.block.FlapAttributes; -import com.simibubi.create.foundation.render.backend.core.BasicAttributes; -import com.simibubi.create.foundation.render.backend.core.BasicProgram; -import com.simibubi.create.foundation.render.backend.core.ModelAttributes; -import com.simibubi.create.foundation.render.backend.core.OrientedAttributes; -import com.simibubi.create.foundation.render.backend.core.TransformAttributes; -import com.simibubi.create.foundation.render.backend.effects.SphereFilterProgram; -import com.simibubi.create.foundation.render.backend.gl.shader.FogSensitiveProgram; -import com.simibubi.create.foundation.render.backend.gl.shader.ProgramSpec; -import com.simibubi.create.foundation.render.backend.gl.shader.ShaderConstants; -import com.simibubi.create.foundation.render.backend.gl.shader.SingleProgram; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/foundation/render/Compartment.java b/src/main/java/com/simibubi/create/foundation/render/Compartment.java index 01087fc22..8c7e45338 100644 --- a/src/main/java/com/simibubi/create/foundation/render/Compartment.java +++ b/src/main/java/com/simibubi/create/foundation/render/Compartment.java @@ -2,7 +2,7 @@ package com.simibubi.create.foundation.render; import org.apache.commons.lang3.tuple.Pair; -import com.simibubi.create.foundation.render.backend.core.PartialModel; +import com.jozufozu.flywheel.backend.core.PartialModel; import net.minecraft.block.BlockState; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/foundation/render/KineticRenderer.java b/src/main/java/com/simibubi/create/foundation/render/KineticRenderer.java index d6dd5bb80..510641f19 100644 --- a/src/main/java/com/simibubi/create/foundation/render/KineticRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/render/KineticRenderer.java @@ -2,17 +2,17 @@ package com.simibubi.create.foundation.render; import java.util.ArrayList; +import com.jozufozu.flywheel.backend.MaterialTypes; +import com.jozufozu.flywheel.backend.core.BasicProgram; +import com.jozufozu.flywheel.backend.core.OrientedModel; +import com.jozufozu.flywheel.backend.core.TransformedModel; +import com.jozufozu.flywheel.backend.gl.shader.ShaderCallback; +import com.jozufozu.flywheel.backend.instancing.InstancedTileRenderer; +import com.jozufozu.flywheel.backend.instancing.RenderMaterial; import com.simibubi.create.content.contraptions.base.KineticRenderMaterials; import com.simibubi.create.content.contraptions.base.RotatingModel; import com.simibubi.create.content.contraptions.relays.belt.BeltInstancedModel; import com.simibubi.create.content.logistics.block.FlapModel; -import com.simibubi.create.foundation.render.backend.MaterialTypes; -import com.simibubi.create.foundation.render.backend.core.BasicProgram; -import com.simibubi.create.foundation.render.backend.core.OrientedModel; -import com.simibubi.create.foundation.render.backend.core.TransformedModel; -import com.simibubi.create.foundation.render.backend.gl.shader.ShaderCallback; -import com.simibubi.create.foundation.render.backend.instancing.InstancedTileRenderer; -import com.simibubi.create.foundation.render.backend.instancing.RenderMaterial; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/simibubi/create/foundation/render/PartialBufferer.java b/src/main/java/com/simibubi/create/foundation/render/PartialBufferer.java index 4ed176c64..1c143cb0c 100644 --- a/src/main/java/com/simibubi/create/foundation/render/PartialBufferer.java +++ b/src/main/java/com/simibubi/create/foundation/render/PartialBufferer.java @@ -4,9 +4,9 @@ import static net.minecraft.state.properties.BlockStateProperties.FACING; import java.util.function.Supplier; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.CreateClient; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.MatrixStacker; diff --git a/src/main/java/com/simibubi/create/foundation/render/SuperByteBufferCache.java b/src/main/java/com/simibubi/create/foundation/render/SuperByteBufferCache.java index f5f7d7559..d0208773c 100644 --- a/src/main/java/com/simibubi/create/foundation/render/SuperByteBufferCache.java +++ b/src/main/java/com/simibubi/create/foundation/render/SuperByteBufferCache.java @@ -11,8 +11,8 @@ import org.lwjgl.opengl.GL11; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; +import com.jozufozu.flywheel.backend.core.PartialModel; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.foundation.render.backend.core.PartialModel; import com.simibubi.create.foundation.utility.VirtualEmptyModelData; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/MaterialTypes.java b/src/main/java/com/simibubi/create/foundation/render/backend/MaterialTypes.java deleted file mode 100644 index e524b295c..000000000 --- a/src/main/java/com/simibubi/create/foundation/render/backend/MaterialTypes.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.simibubi.create.foundation.render.backend; - -import com.simibubi.create.foundation.render.backend.core.ModelData; -import com.simibubi.create.foundation.render.backend.core.OrientedData; -import com.simibubi.create.foundation.render.backend.instancing.InstancedModel; - -public class MaterialTypes { - public static final MaterialType> TRANSFORMED = new MaterialType<>(); - public static final MaterialType> ORIENTED = new MaterialType<>(); -} diff --git a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ShaderSpecLoader.java b/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ShaderSpecLoader.java deleted file mode 100644 index 3747a572c..000000000 --- a/src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ShaderSpecLoader.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.simibubi.create.foundation.render.backend.gl.shader; - -import com.simibubi.create.foundation.render.backend.ShaderLoader; - -public interface ShaderSpecLoader

{ - IMultiProgram

create(ShaderLoader loader, ProgramSpec

spec); -} diff --git a/src/main/java/com/simibubi/create/foundation/tileEntity/renderer/ColoredOverlayTileEntityRenderer.java b/src/main/java/com/simibubi/create/foundation/tileEntity/renderer/ColoredOverlayTileEntityRenderer.java index c7b6ac979..e64b8fcda 100644 --- a/src/main/java/com/simibubi/create/foundation/tileEntity/renderer/ColoredOverlayTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/renderer/ColoredOverlayTileEntityRenderer.java @@ -1,8 +1,8 @@ package com.simibubi.create.foundation.tileEntity.renderer; +import com.jozufozu.flywheel.backend.FastRenderDispatcher; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.render.backend.FastRenderDispatcher; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/PlacementSimulationWorld.java b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/PlacementSimulationWorld.java index ac5fdae65..ae127670b 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/PlacementSimulationWorld.java +++ b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/PlacementSimulationWorld.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.function.Predicate; -import com.simibubi.create.foundation.render.backend.instancing.IFlywheelWorld; +import com.jozufozu.flywheel.backend.instancing.IFlywheelWorld; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks;