From 03205c277b96deb0dc62460a054647d6d3ee1d48 Mon Sep 17 00:00:00 2001 From: JozsefA Date: Wed, 13 Jan 2021 12:14:01 -0800 Subject: [PATCH] move render package up one level --- .../com/simibubi/create/AllBlockPartials.java | 4 ++-- .../com/simibubi/create/CreateClient.java | 8 ++++---- .../contraptions/base/KineticBlock.java | 4 ---- .../contraptions/base/KineticTileEntity.java | 2 +- .../base/KineticTileEntityRenderer.java | 6 +++--- .../components/actors/DrillRenderer.java | 8 ++++---- .../components/actors/HarvesterRenderer.java | 2 +- .../PortableStorageInterfaceRenderer.java | 2 +- .../components/clock/CuckooClockRenderer.java | 8 ++++---- .../crafter/MechanicalCrafterRenderer.java | 2 +- .../components/crank/HandCrankRenderer.java | 2 +- .../components/deployer/DeployerRenderer.java | 6 +++--- .../components/fan/EncasedFanRenderer.java | 6 +++--- .../components/flywheel/FlywheelRenderer.java | 8 ++++---- .../millstone/MillstoneRenderer.java | 6 +++--- .../mixer/MechanicalMixerRenderer.java | 2 +- .../motor/CreativeMotorRenderer.java | 6 +++--- .../press/MechanicalPressRenderer.java | 2 +- .../components/saw/SawRenderer.java | 5 ++--- .../AbstractContraptionEntityRenderer.java | 3 +-- .../structureMovement/Contraption.java | 6 ------ .../ContraptionRenderer.java | 8 ++++---- .../bearing/BearingRenderer.java | 8 ++++---- .../StabilizedBearingMovementBehaviour.java | 2 +- .../pulley/AbstractPulleyRenderer.java | 2 +- .../pulley/PulleyRenderer.java | 2 +- .../train/CouplingRenderer.java | 2 +- .../contraptions/fluids/PumpRenderer.java | 8 ++++---- .../fluids/actors/HosePulleyRenderer.java | 2 +- .../fluids/pipes/FluidValveRenderer.java | 2 +- .../burner/BlazeBurnerRenderer.java | 2 +- .../advanced/SpeedControllerRenderer.java | 3 +-- .../contraptions/relays/belt/BeltModel.java | 2 +- .../relays/belt/BeltRenderer.java | 6 +++--- .../relays/encased/SplitShaftRenderer.java | 6 +++--- .../relays/gauge/GaugeRenderer.java | 2 +- .../relays/gearbox/GearboxRenderer.java | 6 +++--- .../belts/tunnel/BeltTunnelRenderer.java | 2 +- .../diodes/AdjustableRepeaterRenderer.java | 2 +- .../block/funnel/FunnelRenderer.java | 2 +- .../block/mechanicalArm/ArmRenderer.java | 8 ++++---- .../block/redstone/AnalogLeverRenderer.java | 2 +- .../block/SchematicannonRenderer.java | 2 +- .../schematics/client/SchematicRenderer.java | 4 ++-- .../simibubi/create/events/ClientEvents.java | 4 ++-- .../foundation/ResourceReloadHandler.java | 1 - .../block/connected/CTSpriteShiftEntry.java | 2 +- .../command/ClearBufferCacheCommand.java | 1 - .../render/ContraptionBuffer.java | 8 ++++---- .../render/ContraptionLighter.java | 7 +------ .../render/FastContraptionRenderer.java | 16 ++++++---------- .../render/FastKineticRenderer.java | 12 ++++++------ .../{utility => }/render/RenderWork.java | 2 +- .../render/SafeDirectBuffer.java | 2 +- .../render/ShadowRenderHelper.java | 2 +- .../{utility => }/render/SuperByteBuffer.java | 3 +-- .../render/SuperByteBufferCache.java | 3 +-- .../{utility => }/render/TemplateBuffer.java | 2 +- .../render/TileEntityRenderHelper.java | 4 ++-- .../render/instancing/BasicData.java | 6 +++--- .../render/instancing/BeltBuffer.java | 2 +- .../render/instancing/BeltData.java | 6 +++--- .../render/instancing/IInstanceRendered.java | 4 ++++ .../IInstancedTileEntityRenderer.java | 8 ++++++++ .../render/instancing/InstanceBuffer.java | 10 +++++----- .../render/instancing/InstanceContext.java | 6 +++--- .../render/instancing/InstanceData.java | 6 ++---- .../render/instancing/RotatingBuffer.java | 2 +- .../render/instancing/RotatingData.java | 6 +++--- .../render/instancing/VertexAttribute.java | 2 +- .../render/instancing/VertexFormat.java | 2 +- .../{utility => }/render/shader/Shader.java | 2 +- .../render/shader/ShaderCallback.java | 2 +- .../render/shader/ShaderHelper.java | 6 +----- .../ColoredOverlayTileEntityRenderer.java | 2 +- .../render/instancing/IInstanceRendered.java | 4 ---- .../IInstancedTileEntityRenderer.java | 19 ------------------- 77 files changed, 152 insertions(+), 195 deletions(-) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/ContraptionBuffer.java (90%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/ContraptionLighter.java (95%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/FastContraptionRenderer.java (90%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/FastKineticRenderer.java (96%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/RenderWork.java (89%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/SafeDirectBuffer.java (98%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/ShadowRenderHelper.java (98%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/SuperByteBuffer.java (98%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/SuperByteBufferCache.java (98%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/TemplateBuffer.java (98%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/TileEntityRenderHelper.java (94%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/instancing/BasicData.java (88%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/instancing/BeltBuffer.java (85%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/instancing/BeltData.java (88%) create mode 100644 src/main/java/com/simibubi/create/foundation/render/instancing/IInstanceRendered.java create mode 100644 src/main/java/com/simibubi/create/foundation/render/instancing/IInstancedTileEntityRenderer.java rename src/main/java/com/simibubi/create/foundation/{utility => }/render/instancing/InstanceBuffer.java (93%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/instancing/InstanceContext.java (84%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/instancing/InstanceData.java (80%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/instancing/RotatingBuffer.java (85%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/instancing/RotatingData.java (85%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/instancing/VertexAttribute.java (97%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/instancing/VertexFormat.java (96%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/shader/Shader.java (90%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/shader/ShaderCallback.java (73%) rename src/main/java/com/simibubi/create/foundation/{utility => }/render/shader/ShaderHelper.java (95%) delete mode 100644 src/main/java/com/simibubi/create/foundation/utility/render/instancing/IInstanceRendered.java delete mode 100644 src/main/java/com/simibubi/create/foundation/utility/render/instancing/IInstancedTileEntityRenderer.java diff --git a/src/main/java/com/simibubi/create/AllBlockPartials.java b/src/main/java/com/simibubi/create/AllBlockPartials.java index 9279194c2..2635a4a21 100644 --- a/src/main/java/com/simibubi/create/AllBlockPartials.java +++ b/src/main/java/com/simibubi/create/AllBlockPartials.java @@ -15,8 +15,8 @@ import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlo import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; import com.simibubi.create.foundation.utility.*; -import com.simibubi.create.foundation.utility.render.instancing.*; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.instancing.*; +import com.simibubi.create.foundation.render.SuperByteBuffer; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/CreateClient.java b/src/main/java/com/simibubi/create/CreateClient.java index fc635297e..26f17f91c 100644 --- a/src/main/java/com/simibubi/create/CreateClient.java +++ b/src/main/java/com/simibubi/create/CreateClient.java @@ -16,12 +16,12 @@ import com.simibubi.create.foundation.block.render.CustomBlockModels; import com.simibubi.create.foundation.block.render.SpriteShifter; import com.simibubi.create.foundation.item.CustomItemModels; import com.simibubi.create.foundation.item.CustomRenderedItems; -import com.simibubi.create.foundation.utility.render.FastContraptionRenderer; -import com.simibubi.create.foundation.utility.render.FastKineticRenderer; -import com.simibubi.create.foundation.utility.render.SuperByteBufferCache; +import com.simibubi.create.foundation.render.FastContraptionRenderer; +import com.simibubi.create.foundation.render.FastKineticRenderer; +import com.simibubi.create.foundation.render.SuperByteBufferCache; import com.simibubi.create.foundation.utility.outliner.Outliner; -import com.simibubi.create.foundation.utility.render.shader.ShaderHelper; +import com.simibubi.create.foundation.render.shader.ShaderHelper; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockModelShapes; diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlock.java b/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlock.java index 24d116dbc..24d713f28 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlock.java @@ -1,9 +1,7 @@ package com.simibubi.create.content.contraptions.base; -import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.item.ItemDescription.Palette; -import com.simibubi.create.foundation.utility.render.SuperByteBufferCache; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; @@ -16,9 +14,7 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.ToolType; -import net.minecraftforge.fml.DistExecutor; public abstract class KineticBlock extends Block implements IRotate { 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 e0b1824ab..f4271e366 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 @@ -21,7 +21,7 @@ import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.foundation.utility.render.instancing.IInstanceRendered; +import com.simibubi.create.foundation.render.instancing.IInstanceRendered; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.client.resources.I18n; 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 0171090ee..0b2eee618 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 @@ -7,9 +7,9 @@ import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock; import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.ColorHelper; -import com.simibubi.create.foundation.utility.render.instancing.*; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; -import com.simibubi.create.foundation.utility.render.SuperByteBufferCache.Compartment; +import com.simibubi.create.foundation.render.instancing.*; +import com.simibubi.create.foundation.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBufferCache.Compartment; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillRenderer.java index b0a9324f8..a54f8ff93 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillRenderer.java @@ -10,12 +10,12 @@ import com.simibubi.create.content.contraptions.components.structureMovement.Mov import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.MatrixStacker; -import com.simibubi.create.foundation.utility.render.instancing.InstanceBuffer; -import com.simibubi.create.foundation.utility.render.instancing.InstanceContext; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.instancing.InstanceBuffer; +import com.simibubi.create.foundation.render.instancing.InstanceContext; +import com.simibubi.create.foundation.render.SuperByteBuffer; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.foundation.utility.render.instancing.RotatingData; +import com.simibubi.create.foundation.render.instancing.RotatingData; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterRenderer.java index 7f8a291f9..f3933f0c8 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterRenderer.java @@ -8,7 +8,7 @@ import com.simibubi.create.content.contraptions.components.structureMovement.Mov import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; 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/PortableStorageInterfaceRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceRenderer.java index 15cddc518..83f29fb32 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 @@ -10,7 +10,7 @@ import com.simibubi.create.content.contraptions.components.structureMovement.Mov import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.MatrixStacker; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; 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 a3d11138a..9b2406d28 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 @@ -7,11 +7,11 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.content.contraptions.components.clock.CuckooClockTileEntity.Animation; import com.simibubi.create.foundation.utility.AngleHelper; -import com.simibubi.create.foundation.utility.render.instancing.InstanceBuffer; -import com.simibubi.create.foundation.utility.render.instancing.InstanceContext; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.instancing.InstanceBuffer; +import com.simibubi.create.foundation.render.instancing.InstanceContext; +import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.utility.render.instancing.RotatingData; +import com.simibubi.create.foundation.render.instancing.RotatingData; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; 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 cf4803a3d..f5068e880 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 @@ -13,7 +13,7 @@ import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.MatrixStacker; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; 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 c20439331..ea2fbbda4 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 @@ -6,7 +6,7 @@ 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.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; import net.minecraft.block.Block; import net.minecraft.block.BlockState; 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 92b4d5273..3525f6c3c 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 @@ -16,11 +16,11 @@ import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.NBTHelper; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; import com.simibubi.create.foundation.utility.VecHelper; -import com.simibubi.create.foundation.utility.render.instancing.IInstancedTileEntityRenderer; -import com.simibubi.create.foundation.utility.render.instancing.InstanceContext; +import com.simibubi.create.foundation.render.instancing.IInstancedTileEntityRenderer; +import com.simibubi.create.foundation.render.instancing.InstanceContext; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; 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 62ca3e645..5ab2bbd49 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 @@ -8,9 +8,9 @@ import com.simibubi.create.content.contraptions.base.IRotate; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; -import com.simibubi.create.foundation.utility.render.instancing.InstanceBuffer; -import com.simibubi.create.foundation.utility.render.instancing.InstanceContext; -import com.simibubi.create.foundation.utility.render.instancing.RotatingData; +import com.simibubi.create.foundation.render.instancing.InstanceBuffer; +import com.simibubi.create.foundation.render.instancing.InstanceContext; +import com.simibubi.create.foundation.render.instancing.RotatingData; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.Direction; 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 ae072d95d..89508a0cd 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 @@ -9,11 +9,11 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.content.contraptions.components.flywheel.FlywheelBlock.ConnectionState; import com.simibubi.create.foundation.utility.AngleHelper; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.utility.render.instancing.InstanceBuffer; -import com.simibubi.create.foundation.utility.render.instancing.InstanceContext; -import com.simibubi.create.foundation.utility.render.instancing.RotatingData; +import com.simibubi.create.foundation.render.instancing.InstanceBuffer; +import com.simibubi.create.foundation.render.instancing.InstanceContext; +import com.simibubi.create.foundation.render.instancing.RotatingData; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneRenderer.java index 7a0e86232..26316a422 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneRenderer.java @@ -4,9 +4,9 @@ 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.utility.render.instancing.InstanceBuffer; -import com.simibubi.create.foundation.utility.render.instancing.InstanceContext; -import com.simibubi.create.foundation.utility.render.instancing.RotatingData; +import com.simibubi.create.foundation.render.instancing.InstanceBuffer; +import com.simibubi.create.foundation.render.instancing.InstanceContext; +import com.simibubi.create.foundation.render.instancing.RotatingData; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; public class MillstoneRenderer extends KineticTileEntityRenderer { 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 5fc8e6d0f..04231f98d 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 @@ -6,7 +6,7 @@ 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.utility.AnimationTickHolder; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorRenderer.java index a52a7d586..96d02d5b2 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorRenderer.java @@ -4,9 +4,9 @@ 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.utility.render.instancing.InstanceBuffer; -import com.simibubi.create.foundation.utility.render.instancing.InstanceContext; -import com.simibubi.create.foundation.utility.render.instancing.RotatingData; +import com.simibubi.create.foundation.render.instancing.InstanceBuffer; +import com.simibubi.create.foundation.render.instancing.InstanceContext; +import com.simibubi.create.foundation.render.instancing.RotatingData; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; public class CreativeMotorRenderer extends KineticTileEntityRenderer { 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 bef8ed8e7..58a7a6c83 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 @@ -4,7 +4,7 @@ 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.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; 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 299173139..2bd9b9a10 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 @@ -4,7 +4,6 @@ import static net.minecraft.state.properties.BlockStateProperties.FACING; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.CreateClient; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; @@ -12,8 +11,8 @@ import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringRe import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.*; -import com.simibubi.create.foundation.utility.render.instancing.*; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.instancing.*; +import com.simibubi.create.foundation.render.SuperByteBuffer; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntityRenderer.java index 8a3864f49..c81b4ef13 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntityRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntityRenderer.java @@ -2,7 +2,7 @@ package com.simibubi.create.content.contraptions.components.structureMovement; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.foundation.utility.render.FastContraptionRenderer; +import com.simibubi.create.foundation.render.FastContraptionRenderer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.culling.ClippingHelperImpl; @@ -10,7 +10,6 @@ import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.Vec3d; public abstract class AbstractContraptionEntityRenderer extends EntityRenderer { 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 33ed3de37..bf4a6124f 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 @@ -18,12 +18,6 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; -import com.simibubi.create.CreateClient; -import com.simibubi.create.foundation.utility.render.FastContraptionRenderer; -import com.simibubi.create.foundation.utility.render.FastKineticRenderer; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.DistExecutor; import org.apache.commons.lang3.tuple.MutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionRenderer.java index cea15c01a..c5c5f0ad4 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionRenderer.java @@ -10,10 +10,10 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllMovementBehaviours; import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.utility.MatrixStacker; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; -import com.simibubi.create.foundation.utility.render.SuperByteBufferCache; -import com.simibubi.create.foundation.utility.render.SuperByteBufferCache.Compartment; -import com.simibubi.create.foundation.utility.render.TileEntityRenderHelper; +import com.simibubi.create.foundation.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBufferCache; +import com.simibubi.create.foundation.render.SuperByteBufferCache.Compartment; +import com.simibubi.create.foundation.render.TileEntityRenderHelper; import com.simibubi.create.foundation.utility.worldWrappers.PlacementSimulationWorld; import net.minecraft.block.BlockRenderType; 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 1af98d926..6c6bc65fc 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 @@ -5,11 +5,11 @@ 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.utility.AngleHelper; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.utility.render.instancing.InstanceBuffer; -import com.simibubi.create.foundation.utility.render.instancing.InstanceContext; -import com.simibubi.create.foundation.utility.render.instancing.RotatingData; +import com.simibubi.create.foundation.render.instancing.InstanceBuffer; +import com.simibubi.create.foundation.render.instancing.InstanceContext; +import com.simibubi.create.foundation.render.instancing.RotatingData; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; 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 3b92c2738..d6b4c99e8 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 @@ -8,7 +8,7 @@ import com.simibubi.create.content.contraptions.components.structureMovement.Mov import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; import com.simibubi.create.content.contraptions.components.structureMovement.OrientedContraptionEntity; import com.simibubi.create.foundation.utility.AngleHelper; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; 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 ce1f47044..3e1b87452 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 @@ -7,7 +7,7 @@ import com.simibubi.create.content.contraptions.base.IRotate; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; 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 ffdd25677..182e063bb 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 @@ -5,7 +5,7 @@ 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.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; 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/train/CouplingRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingRenderer.java index ab60ed2a4..0a8cb17b8 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingRenderer.java @@ -11,7 +11,7 @@ import com.simibubi.create.content.contraptions.components.structureMovement.tra import com.simibubi.create.foundation.utility.ColorHelper; import com.simibubi.create.foundation.utility.Couple; import com.simibubi.create.foundation.utility.MatrixStacker; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; import com.simibubi.create.foundation.utility.VecHelper; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpRenderer.java index 89c8ec4ea..fed7f4b04 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpRenderer.java @@ -6,11 +6,11 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.MatrixStacker; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; -import com.simibubi.create.foundation.utility.render.instancing.InstanceBuffer; -import com.simibubi.create.foundation.utility.render.instancing.InstanceContext; -import com.simibubi.create.foundation.utility.render.instancing.RotatingData; +import com.simibubi.create.foundation.render.instancing.InstanceBuffer; +import com.simibubi.create.foundation.render.instancing.InstanceContext; +import com.simibubi.create.foundation.render.instancing.RotatingData; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; 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 565bdb3fa..c0d4091c6 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 @@ -3,7 +3,7 @@ package com.simibubi.create.content.contraptions.fluids.actors; 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.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; 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/pipes/FluidValveRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveRenderer.java index cc9d9d8d5..bf16148fd 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 @@ -6,7 +6,7 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.MatrixStacker; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; 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 f2469f1c2..e4110a16b 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 @@ -6,7 +6,7 @@ import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlo import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; 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 e4f72235d..65f440f1a 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,11 +1,10 @@ package com.simibubi.create.content.contraptions.relays.advanced; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.CreateClient; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.tileEntity.renderer.SmartTileEntityRenderer; -import com.simibubi.create.foundation.utility.render.instancing.*; +import com.simibubi.create.foundation.render.instancing.*; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltModel.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltModel.java index 5bcec7066..976a39d7d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltModel.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltModel.java @@ -10,7 +10,7 @@ import java.util.Random; import com.simibubi.create.AllSpriteShifts; import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity.CasingType; import com.simibubi.create.foundation.block.render.SpriteShiftEntry; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.model.BakedQuad; 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 9832bae56..fe0388464 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 @@ -12,9 +12,9 @@ import com.simibubi.create.foundation.block.render.SpriteShiftEntry; import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.MatrixStacker; -import com.simibubi.create.foundation.utility.render.FastKineticRenderer; -import com.simibubi.create.foundation.utility.render.instancing.*; -import com.simibubi.create.foundation.utility.render.ShadowRenderHelper; +import com.simibubi.create.foundation.render.FastKineticRenderer; +import com.simibubi.create.foundation.render.instancing.*; +import com.simibubi.create.foundation.render.ShadowRenderHelper; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; 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 94f93aeb5..72f258b8d 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 @@ -7,9 +7,9 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.utility.Iterate; -import com.simibubi.create.foundation.utility.render.instancing.InstanceBuffer; -import com.simibubi.create.foundation.utility.render.instancing.InstanceContext; -import com.simibubi.create.foundation.utility.render.instancing.RotatingData; +import com.simibubi.create.foundation.render.instancing.InstanceBuffer; +import com.simibubi.create.foundation.render.instancing.InstanceContext; +import com.simibubi.create.foundation.render.instancing.RotatingData; import net.minecraft.block.Block; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; 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 4f02505a2..c8d81bfe9 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 @@ -7,7 +7,7 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.content.contraptions.relays.gauge.GaugeBlock.Type; import com.simibubi.create.foundation.utility.Iterate; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; 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 1bb3f48bc..f4c7b33ba 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 @@ -6,9 +6,9 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.utility.Iterate; -import com.simibubi.create.foundation.utility.render.instancing.InstanceBuffer; -import com.simibubi.create.foundation.utility.render.instancing.InstanceContext; -import com.simibubi.create.foundation.utility.render.instancing.RotatingData; +import com.simibubi.create.foundation.render.instancing.InstanceBuffer; +import com.simibubi.create.foundation.render.instancing.InstanceContext; +import com.simibubi.create.foundation.render.instancing.RotatingData; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.state.properties.BlockStateProperties; 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 6b52d157d..3eaacfa51 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 @@ -7,7 +7,7 @@ import com.simibubi.create.foundation.tileEntity.renderer.SmartTileEntityRendere import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.MatrixStacker; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; import com.simibubi.create.foundation.utility.VecHelper; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterRenderer.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterRenderer.java index 72d235388..17053fed5 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterRenderer.java @@ -3,7 +3,7 @@ package com.simibubi.create.content.logistics.block.diodes; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.foundation.tileEntity.renderer.ColoredOverlayTileEntityRenderer; import com.simibubi.create.foundation.utility.ColorHelper; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; 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 8e61a8675..df3ef9e55 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 @@ -6,7 +6,7 @@ import com.simibubi.create.AllBlockPartials; import com.simibubi.create.foundation.tileEntity.renderer.SmartTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.MatrixStacker; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; import com.simibubi.create.foundation.utility.VecHelper; import net.minecraft.client.renderer.IRenderTypeBuffer; 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 c89f6b956..ece88eec1 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 @@ -8,10 +8,10 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.content.logistics.block.mechanicalArm.ArmTileEntity.Phase; import com.simibubi.create.foundation.utility.*; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; -import com.simibubi.create.foundation.utility.render.instancing.InstanceBuffer; -import com.simibubi.create.foundation.utility.render.instancing.InstanceContext; -import com.simibubi.create.foundation.utility.render.instancing.RotatingData; +import com.simibubi.create.foundation.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.instancing.InstanceBuffer; +import com.simibubi.create.foundation.render.instancing.InstanceContext; +import com.simibubi.create.foundation.render.instancing.RotatingData; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; 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 716cf1648..72a11a15a 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 @@ -6,7 +6,7 @@ import com.simibubi.create.AllBlockPartials; import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.ColorHelper; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; 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 37898e3ff..0fe84ba4a 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 @@ -8,7 +8,7 @@ import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.schematics.block.LaunchedItem.ForBlockState; import com.simibubi.create.content.schematics.block.LaunchedItem.ForEntity; import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java b/src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java index 063dc873a..8796b451b 100644 --- a/src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java @@ -13,8 +13,8 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.content.schematics.SchematicWorld; import com.simibubi.create.foundation.renderState.SuperRenderTypeBuffer; import com.simibubi.create.foundation.utility.MatrixStacker; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; -import com.simibubi.create.foundation.utility.render.TileEntityRenderHelper; +import com.simibubi.create.foundation.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.TileEntityRenderHelper; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/simibubi/create/events/ClientEvents.java b/src/main/java/com/simibubi/create/events/ClientEvents.java index 2a88508ee..30385556d 100644 --- a/src/main/java/com/simibubi/create/events/ClientEvents.java +++ b/src/main/java/com/simibubi/create/events/ClientEvents.java @@ -32,8 +32,8 @@ import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollVal import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.ServerSpeedProvider; import com.simibubi.create.foundation.utility.placement.PlacementHelpers; -import com.simibubi.create.foundation.utility.render.FastContraptionRenderer; -import com.simibubi.create.foundation.utility.render.RenderWork; +import com.simibubi.create.foundation.render.FastContraptionRenderer; +import com.simibubi.create.foundation.render.RenderWork; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/simibubi/create/foundation/ResourceReloadHandler.java b/src/main/java/com/simibubi/create/foundation/ResourceReloadHandler.java index a5ee6a1c7..6342594b9 100644 --- a/src/main/java/com/simibubi/create/foundation/ResourceReloadHandler.java +++ b/src/main/java/com/simibubi/create/foundation/ResourceReloadHandler.java @@ -3,7 +3,6 @@ package com.simibubi.create.foundation; import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.block.render.SpriteShifter; -import com.simibubi.create.foundation.utility.render.FastContraptionRenderer; import net.minecraft.client.resources.ReloadListener; import net.minecraft.profiler.IProfiler; import net.minecraft.resources.IResourceManager; diff --git a/src/main/java/com/simibubi/create/foundation/block/connected/CTSpriteShiftEntry.java b/src/main/java/com/simibubi/create/foundation/block/connected/CTSpriteShiftEntry.java index 2d2d84506..fa99114c3 100644 --- a/src/main/java/com/simibubi/create/foundation/block/connected/CTSpriteShiftEntry.java +++ b/src/main/java/com/simibubi/create/foundation/block/connected/CTSpriteShiftEntry.java @@ -3,7 +3,7 @@ package com.simibubi.create.foundation.block.connected; import com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType; import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour.CTContext; import com.simibubi.create.foundation.block.render.SpriteShiftEntry; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; public abstract class CTSpriteShiftEntry extends SpriteShiftEntry { diff --git a/src/main/java/com/simibubi/create/foundation/command/ClearBufferCacheCommand.java b/src/main/java/com/simibubi/create/foundation/command/ClearBufferCacheCommand.java index 3dc3d23a3..7d9a6cb74 100644 --- a/src/main/java/com/simibubi/create/foundation/command/ClearBufferCacheCommand.java +++ b/src/main/java/com/simibubi/create/foundation/command/ClearBufferCacheCommand.java @@ -3,7 +3,6 @@ package com.simibubi.create.foundation.command; import com.mojang.brigadier.builder.ArgumentBuilder; import com.simibubi.create.CreateClient; -import com.simibubi.create.foundation.utility.render.FastContraptionRenderer; import net.minecraft.command.CommandSource; import net.minecraft.command.Commands; import net.minecraft.util.text.StringTextComponent; diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/ContraptionBuffer.java b/src/main/java/com/simibubi/create/foundation/render/ContraptionBuffer.java similarity index 90% rename from src/main/java/com/simibubi/create/foundation/utility/render/ContraptionBuffer.java rename to src/main/java/com/simibubi/create/foundation/render/ContraptionBuffer.java index 4cebf58d0..c5f37849a 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/ContraptionBuffer.java +++ b/src/main/java/com/simibubi/create/foundation/render/ContraptionBuffer.java @@ -1,12 +1,12 @@ -package com.simibubi.create.foundation.utility.render; +package com.simibubi.create.foundation.render; import com.mojang.blaze3d.platform.GlStateManager; -import com.simibubi.create.foundation.utility.render.instancing.InstanceBuffer; -import com.simibubi.create.foundation.utility.render.instancing.VertexFormat; +import com.simibubi.create.foundation.render.instancing.InstanceBuffer; +import com.simibubi.create.foundation.render.instancing.VertexFormat; import net.minecraft.client.renderer.BufferBuilder; import org.lwjgl.opengl.*; -import static com.simibubi.create.foundation.utility.render.instancing.VertexAttribute.*; +import static com.simibubi.create.foundation.render.instancing.VertexAttribute.*; public class ContraptionBuffer extends TemplateBuffer { public static final VertexFormat FORMAT = new VertexFormat(InstanceBuffer.FORMAT, RGBA); diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/ContraptionLighter.java b/src/main/java/com/simibubi/create/foundation/render/ContraptionLighter.java similarity index 95% rename from src/main/java/com/simibubi/create/foundation/utility/render/ContraptionLighter.java rename to src/main/java/com/simibubi/create/foundation/render/ContraptionLighter.java index e7f65e52a..950fa03f8 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/ContraptionLighter.java +++ b/src/main/java/com/simibubi/create/foundation/render/ContraptionLighter.java @@ -1,17 +1,12 @@ -package com.simibubi.create.foundation.utility.render; +package com.simibubi.create.foundation.render; import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; -import net.minecraft.client.renderer.GLAllocation; -import net.minecraft.client.renderer.RenderType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.LightType; import net.minecraft.world.World; import org.lwjgl.opengl.*; -import org.lwjgl.system.MemoryUtil; - -import java.nio.ByteBuffer; public class ContraptionLighter { diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/FastContraptionRenderer.java b/src/main/java/com/simibubi/create/foundation/render/FastContraptionRenderer.java similarity index 90% rename from src/main/java/com/simibubi/create/foundation/utility/render/FastContraptionRenderer.java rename to src/main/java/com/simibubi/create/foundation/render/FastContraptionRenderer.java index 4a49583f2..2625da228 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/FastContraptionRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/render/FastContraptionRenderer.java @@ -1,23 +1,19 @@ -package com.simibubi.create.foundation.utility.render; +package com.simibubi.create.foundation.render; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; -import com.simibubi.create.content.contraptions.KineticDebugger; import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionRenderer; -import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerRenderer; -import com.simibubi.create.content.schematics.client.SchematicRenderer; -import com.simibubi.create.foundation.utility.render.instancing.IInstanceRendered; -import com.simibubi.create.foundation.utility.render.instancing.IInstancedTileEntityRenderer; -import com.simibubi.create.foundation.utility.render.shader.Shader; -import com.simibubi.create.foundation.utility.render.shader.ShaderCallback; -import com.simibubi.create.foundation.utility.render.shader.ShaderHelper; +import com.simibubi.create.foundation.render.instancing.IInstanceRendered; +import com.simibubi.create.foundation.render.instancing.IInstancedTileEntityRenderer; +import com.simibubi.create.foundation.render.shader.Shader; +import com.simibubi.create.foundation.render.shader.ShaderCallback; +import com.simibubi.create.foundation.render.shader.ShaderHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL13; diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/FastKineticRenderer.java b/src/main/java/com/simibubi/create/foundation/render/FastKineticRenderer.java similarity index 96% rename from src/main/java/com/simibubi/create/foundation/utility/render/FastKineticRenderer.java rename to src/main/java/com/simibubi/create/foundation/render/FastKineticRenderer.java index d28dccf9a..c3ec9e269 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/FastKineticRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/render/FastKineticRenderer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility.render; +package com.simibubi.create.foundation.render; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -6,10 +6,10 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; -import com.simibubi.create.foundation.utility.render.instancing.*; -import com.simibubi.create.foundation.utility.render.shader.Shader; -import com.simibubi.create.foundation.utility.render.shader.ShaderCallback; -import com.simibubi.create.foundation.utility.render.shader.ShaderHelper; +import com.simibubi.create.foundation.render.instancing.*; +import com.simibubi.create.foundation.render.shader.Shader; +import com.simibubi.create.foundation.render.shader.ShaderCallback; +import com.simibubi.create.foundation.render.shader.ShaderHelper; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.*; @@ -31,7 +31,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import static com.simibubi.create.foundation.utility.render.SuperByteBufferCache.PARTIAL; +import static com.simibubi.create.foundation.render.SuperByteBufferCache.PARTIAL; public class FastKineticRenderer { Map, Cache>> rotating; diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/RenderWork.java b/src/main/java/com/simibubi/create/foundation/render/RenderWork.java similarity index 89% rename from src/main/java/com/simibubi/create/foundation/utility/render/RenderWork.java rename to src/main/java/com/simibubi/create/foundation/render/RenderWork.java index d11e11433..6fc1fd6cb 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/RenderWork.java +++ b/src/main/java/com/simibubi/create/foundation/render/RenderWork.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility.render; +package com.simibubi.create.foundation.render; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/SafeDirectBuffer.java b/src/main/java/com/simibubi/create/foundation/render/SafeDirectBuffer.java similarity index 98% rename from src/main/java/com/simibubi/create/foundation/utility/render/SafeDirectBuffer.java rename to src/main/java/com/simibubi/create/foundation/render/SafeDirectBuffer.java index ffa97f6e3..cb6a47172 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/SafeDirectBuffer.java +++ b/src/main/java/com/simibubi/create/foundation/render/SafeDirectBuffer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility.render; +package com.simibubi.create.foundation.render; import net.minecraft.client.renderer.GLAllocation; import sun.nio.ch.DirectBuffer; diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/ShadowRenderHelper.java b/src/main/java/com/simibubi/create/foundation/render/ShadowRenderHelper.java similarity index 98% rename from src/main/java/com/simibubi/create/foundation/utility/render/ShadowRenderHelper.java rename to src/main/java/com/simibubi/create/foundation/render/ShadowRenderHelper.java index a172cefd1..c42a78ae0 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/ShadowRenderHelper.java +++ b/src/main/java/com/simibubi/create/foundation/render/ShadowRenderHelper.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility.render; +package com.simibubi.create.foundation.render; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/SuperByteBuffer.java b/src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java similarity index 98% rename from src/main/java/com/simibubi/create/foundation/utility/render/SuperByteBuffer.java rename to src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java index 25c20d11d..dde2c5a9d 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/SuperByteBuffer.java +++ b/src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility.render; +package com.simibubi.create.foundation.render; import java.nio.Buffer; import java.nio.ByteBuffer; @@ -11,7 +11,6 @@ import it.unimi.dsi.fastutil.longs.Long2DoubleMap; import it.unimi.dsi.fastutil.longs.Long2DoubleOpenHashMap; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.Matrix4f; import net.minecraft.client.renderer.Vector4f; import net.minecraft.client.renderer.texture.TextureAtlasSprite; diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/SuperByteBufferCache.java b/src/main/java/com/simibubi/create/foundation/render/SuperByteBufferCache.java similarity index 98% rename from src/main/java/com/simibubi/create/foundation/utility/render/SuperByteBufferCache.java rename to src/main/java/com/simibubi/create/foundation/render/SuperByteBufferCache.java index fbb52d014..39c8e33de 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/SuperByteBufferCache.java +++ b/src/main/java/com/simibubi/create/foundation/render/SuperByteBufferCache.java @@ -1,11 +1,10 @@ -package com.simibubi.create.foundation.utility.render; +package com.simibubi.create.foundation.render; import java.util.*; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.utility.VirtualEmptyModelData; import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/TemplateBuffer.java b/src/main/java/com/simibubi/create/foundation/render/TemplateBuffer.java similarity index 98% rename from src/main/java/com/simibubi/create/foundation/utility/render/TemplateBuffer.java rename to src/main/java/com/simibubi/create/foundation/render/TemplateBuffer.java index 23b5afc87..f83e512ca 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/TemplateBuffer.java +++ b/src/main/java/com/simibubi/create/foundation/render/TemplateBuffer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility.render; +package com.simibubi.create.foundation.render; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.datafixers.util.Pair; diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/TileEntityRenderHelper.java b/src/main/java/com/simibubi/create/foundation/render/TileEntityRenderHelper.java similarity index 94% rename from src/main/java/com/simibubi/create/foundation/utility/render/TileEntityRenderHelper.java rename to src/main/java/com/simibubi/create/foundation/render/TileEntityRenderHelper.java index 2c4d2fcc2..d457bb8e0 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/TileEntityRenderHelper.java +++ b/src/main/java/com/simibubi/create/foundation/render/TileEntityRenderHelper.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility.render; +package com.simibubi.create.foundation.render; import java.util.Iterator; @@ -7,7 +7,7 @@ import com.simibubi.create.Create; import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.utility.MatrixStacker; -import com.simibubi.create.foundation.utility.render.instancing.IInstanceRendered; +import com.simibubi.create.foundation.render.instancing.IInstanceRendered; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Matrix4f; diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/BasicData.java b/src/main/java/com/simibubi/create/foundation/render/instancing/BasicData.java similarity index 88% rename from src/main/java/com/simibubi/create/foundation/utility/render/instancing/BasicData.java rename to src/main/java/com/simibubi/create/foundation/render/instancing/BasicData.java index 5698537c5..c5be438cc 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/BasicData.java +++ b/src/main/java/com/simibubi/create/foundation/render/instancing/BasicData.java @@ -1,12 +1,12 @@ -package com.simibubi.create.foundation.utility.render.instancing; +package com.simibubi.create.foundation.render.instancing; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.foundation.utility.ColorHelper; -import com.simibubi.create.foundation.utility.render.SafeDirectBuffer; +import com.simibubi.create.foundation.render.SafeDirectBuffer; import net.minecraft.client.renderer.Vector3f; import net.minecraft.util.math.BlockPos; -import static com.simibubi.create.foundation.utility.render.instancing.VertexAttribute.*; +import static com.simibubi.create.foundation.render.instancing.VertexAttribute.*; public class BasicData> extends InstanceData { public static final VertexFormat FORMAT = new VertexFormat(RGB, POSITION, LIGHT); diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/BeltBuffer.java b/src/main/java/com/simibubi/create/foundation/render/instancing/BeltBuffer.java similarity index 85% rename from src/main/java/com/simibubi/create/foundation/utility/render/instancing/BeltBuffer.java rename to src/main/java/com/simibubi/create/foundation/render/instancing/BeltBuffer.java index d8f7839d4..7007d30ec 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/BeltBuffer.java +++ b/src/main/java/com/simibubi/create/foundation/render/instancing/BeltBuffer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility.render.instancing; +package com.simibubi.create.foundation.render.instancing; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/BeltData.java b/src/main/java/com/simibubi/create/foundation/render/instancing/BeltData.java similarity index 88% rename from src/main/java/com/simibubi/create/foundation/utility/render/instancing/BeltData.java rename to src/main/java/com/simibubi/create/foundation/render/instancing/BeltData.java index 12c933d05..de87e604f 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/BeltData.java +++ b/src/main/java/com/simibubi/create/foundation/render/instancing/BeltData.java @@ -1,10 +1,10 @@ -package com.simibubi.create.foundation.utility.render.instancing; +package com.simibubi.create.foundation.render.instancing; import com.simibubi.create.foundation.block.render.SpriteShiftEntry; -import com.simibubi.create.foundation.utility.render.SafeDirectBuffer; +import com.simibubi.create.foundation.render.SafeDirectBuffer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import static com.simibubi.create.foundation.utility.render.instancing.VertexAttribute.*; +import static com.simibubi.create.foundation.render.instancing.VertexAttribute.*; public class BeltData extends BasicData { public static VertexFormat FORMAT = new VertexFormat(BasicData.FORMAT, VEC3, FLOAT, VEC2, VEC4, FLOAT); diff --git a/src/main/java/com/simibubi/create/foundation/render/instancing/IInstanceRendered.java b/src/main/java/com/simibubi/create/foundation/render/instancing/IInstanceRendered.java new file mode 100644 index 000000000..bd825757b --- /dev/null +++ b/src/main/java/com/simibubi/create/foundation/render/instancing/IInstanceRendered.java @@ -0,0 +1,4 @@ +package com.simibubi.create.foundation.render.instancing; + +public interface IInstanceRendered { +} diff --git a/src/main/java/com/simibubi/create/foundation/render/instancing/IInstancedTileEntityRenderer.java b/src/main/java/com/simibubi/create/foundation/render/instancing/IInstancedTileEntityRenderer.java new file mode 100644 index 000000000..176acb724 --- /dev/null +++ b/src/main/java/com/simibubi/create/foundation/render/instancing/IInstancedTileEntityRenderer.java @@ -0,0 +1,8 @@ +package com.simibubi.create.foundation.render.instancing; + +import net.minecraft.tileentity.TileEntity; + +public interface IInstancedTileEntityRenderer { + + void addInstanceData(InstanceContext te); +} diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/InstanceBuffer.java b/src/main/java/com/simibubi/create/foundation/render/instancing/InstanceBuffer.java similarity index 93% rename from src/main/java/com/simibubi/create/foundation/utility/render/instancing/InstanceBuffer.java rename to src/main/java/com/simibubi/create/foundation/render/instancing/InstanceBuffer.java index 130ae5f8a..74d90d8d1 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/InstanceBuffer.java +++ b/src/main/java/com/simibubi/create/foundation/render/instancing/InstanceBuffer.java @@ -1,17 +1,17 @@ -package com.simibubi.create.foundation.utility.render.instancing; +package com.simibubi.create.foundation.render.instancing; import com.mojang.blaze3d.platform.GlStateManager; -import com.simibubi.create.foundation.utility.render.RenderWork; -import com.simibubi.create.foundation.utility.render.SafeDirectBuffer; -import com.simibubi.create.foundation.utility.render.TemplateBuffer; +import com.simibubi.create.foundation.render.RenderWork; +import com.simibubi.create.foundation.render.SafeDirectBuffer; +import com.simibubi.create.foundation.render.TemplateBuffer; import net.minecraft.client.renderer.BufferBuilder; import org.lwjgl.opengl.*; import java.util.ArrayList; import java.util.function.Consumer; -import static com.simibubi.create.foundation.utility.render.instancing.VertexAttribute.*; +import static com.simibubi.create.foundation.render.instancing.VertexAttribute.*; public abstract class InstanceBuffer extends TemplateBuffer { public static final VertexFormat FORMAT = new VertexFormat(POSITION, NORMAL, UV); diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/InstanceContext.java b/src/main/java/com/simibubi/create/foundation/render/instancing/InstanceContext.java similarity index 84% rename from src/main/java/com/simibubi/create/foundation/utility/render/instancing/InstanceContext.java rename to src/main/java/com/simibubi/create/foundation/render/instancing/InstanceContext.java index e1087e9c2..4ec2fbd64 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/InstanceContext.java +++ b/src/main/java/com/simibubi/create/foundation/render/instancing/InstanceContext.java @@ -1,8 +1,8 @@ -package com.simibubi.create.foundation.utility.render.instancing; +package com.simibubi.create.foundation.render.instancing; import com.simibubi.create.CreateClient; -import com.simibubi.create.foundation.utility.render.FastContraptionRenderer; -import com.simibubi.create.foundation.utility.render.FastKineticRenderer; +import com.simibubi.create.foundation.render.FastContraptionRenderer; +import com.simibubi.create.foundation.render.FastKineticRenderer; import net.minecraft.tileentity.TileEntity; public abstract class InstanceContext { diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/InstanceData.java b/src/main/java/com/simibubi/create/foundation/render/instancing/InstanceData.java similarity index 80% rename from src/main/java/com/simibubi/create/foundation/utility/render/instancing/InstanceData.java rename to src/main/java/com/simibubi/create/foundation/render/instancing/InstanceData.java index c7d057b4a..b86be8f53 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/InstanceData.java +++ b/src/main/java/com/simibubi/create/foundation/render/instancing/InstanceData.java @@ -1,8 +1,6 @@ -package com.simibubi.create.foundation.utility.render.instancing; +package com.simibubi.create.foundation.render.instancing; -import com.simibubi.create.foundation.utility.render.SafeDirectBuffer; - -import java.nio.ByteBuffer; +import com.simibubi.create.foundation.render.SafeDirectBuffer; public abstract class InstanceData { diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/RotatingBuffer.java b/src/main/java/com/simibubi/create/foundation/render/instancing/RotatingBuffer.java similarity index 85% rename from src/main/java/com/simibubi/create/foundation/utility/render/instancing/RotatingBuffer.java rename to src/main/java/com/simibubi/create/foundation/render/instancing/RotatingBuffer.java index cbed7078b..7a7b24f4e 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/RotatingBuffer.java +++ b/src/main/java/com/simibubi/create/foundation/render/instancing/RotatingBuffer.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility.render.instancing; +package com.simibubi.create.foundation.render.instancing; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/RotatingData.java b/src/main/java/com/simibubi/create/foundation/render/instancing/RotatingData.java similarity index 85% rename from src/main/java/com/simibubi/create/foundation/utility/render/instancing/RotatingData.java rename to src/main/java/com/simibubi/create/foundation/render/instancing/RotatingData.java index f0b33392a..ddcc0eb6d 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/RotatingData.java +++ b/src/main/java/com/simibubi/create/foundation/render/instancing/RotatingData.java @@ -1,9 +1,9 @@ -package com.simibubi.create.foundation.utility.render.instancing; +package com.simibubi.create.foundation.render.instancing; -import com.simibubi.create.foundation.utility.render.SafeDirectBuffer; +import com.simibubi.create.foundation.render.SafeDirectBuffer; import net.minecraft.client.renderer.Vector3f; -import static com.simibubi.create.foundation.utility.render.instancing.VertexAttribute.*; +import static com.simibubi.create.foundation.render.instancing.VertexAttribute.*; public class RotatingData extends BasicData { public static VertexFormat FORMAT = new VertexFormat(BasicData.FORMAT, FLOAT, FLOAT, VEC3); diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/VertexAttribute.java b/src/main/java/com/simibubi/create/foundation/render/instancing/VertexAttribute.java similarity index 97% rename from src/main/java/com/simibubi/create/foundation/utility/render/instancing/VertexAttribute.java rename to src/main/java/com/simibubi/create/foundation/render/instancing/VertexAttribute.java index 522047cc1..99aec4579 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/VertexAttribute.java +++ b/src/main/java/com/simibubi/create/foundation/render/instancing/VertexAttribute.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility.render.instancing; +package com.simibubi.create.foundation.render.instancing; import net.minecraft.client.renderer.vertex.VertexFormatElement; import org.lwjgl.opengl.GL20; diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/VertexFormat.java b/src/main/java/com/simibubi/create/foundation/render/instancing/VertexFormat.java similarity index 96% rename from src/main/java/com/simibubi/create/foundation/utility/render/instancing/VertexFormat.java rename to src/main/java/com/simibubi/create/foundation/render/instancing/VertexFormat.java index 220e69190..856fcdd7f 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/VertexFormat.java +++ b/src/main/java/com/simibubi/create/foundation/render/instancing/VertexFormat.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility.render.instancing; +package com.simibubi.create.foundation.render.instancing; public class VertexFormat { diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/shader/Shader.java b/src/main/java/com/simibubi/create/foundation/render/shader/Shader.java similarity index 90% rename from src/main/java/com/simibubi/create/foundation/utility/render/shader/Shader.java rename to src/main/java/com/simibubi/create/foundation/render/shader/Shader.java index d748693f2..2be9e5c96 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/shader/Shader.java +++ b/src/main/java/com/simibubi/create/foundation/render/shader/Shader.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility.render.shader; +package com.simibubi.create.foundation.render.shader; public enum Shader { ROTATING("shader/rotating.vert", "shader/instanced.frag"), diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/shader/ShaderCallback.java b/src/main/java/com/simibubi/create/foundation/render/shader/ShaderCallback.java similarity index 73% rename from src/main/java/com/simibubi/create/foundation/utility/render/shader/ShaderCallback.java rename to src/main/java/com/simibubi/create/foundation/render/shader/ShaderCallback.java index 5ed0dbb2d..0474da770 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/shader/ShaderCallback.java +++ b/src/main/java/com/simibubi/create/foundation/render/shader/ShaderCallback.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.utility.render.shader; +package com.simibubi.create.foundation.render.shader; /** * A Callback for when a shader is called. Used to define shader uniforms. diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/shader/ShaderHelper.java b/src/main/java/com/simibubi/create/foundation/render/shader/ShaderHelper.java similarity index 95% rename from src/main/java/com/simibubi/create/foundation/utility/render/shader/ShaderHelper.java rename to src/main/java/com/simibubi/create/foundation/render/shader/ShaderHelper.java index aeadc3de2..4b6de432a 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/render/shader/ShaderHelper.java +++ b/src/main/java/com/simibubi/create/foundation/render/shader/ShaderHelper.java @@ -1,10 +1,8 @@ -package com.simibubi.create.foundation.utility.render.shader; +package com.simibubi.create.foundation.render.shader; import com.mojang.blaze3d.platform.GlStateManager; import com.simibubi.create.Create; -import com.simibubi.create.CreateClient; import com.simibubi.create.content.contraptions.KineticDebugger; -import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Matrix4f; @@ -15,8 +13,6 @@ import net.minecraft.resources.IReloadableResourceManager; import net.minecraft.resources.IResourceManager; import net.minecraft.resources.IResourceManagerReloadListener; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.Vec3d; -import net.minecraftforge.client.event.RenderWorldLastEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.lwjgl.system.MemoryUtil; 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 95648409e..23df51f8f 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,7 +1,7 @@ package com.simibubi.create.foundation.tileEntity.renderer; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.foundation.utility.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.SuperByteBuffer; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/IInstanceRendered.java b/src/main/java/com/simibubi/create/foundation/utility/render/instancing/IInstanceRendered.java deleted file mode 100644 index 3db9de2ae..000000000 --- a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/IInstanceRendered.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.simibubi.create.foundation.utility.render.instancing; - -public interface IInstanceRendered { -} diff --git a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/IInstancedTileEntityRenderer.java b/src/main/java/com/simibubi/create/foundation/utility/render/instancing/IInstancedTileEntityRenderer.java deleted file mode 100644 index ccd123237..000000000 --- a/src/main/java/com/simibubi/create/foundation/utility/render/instancing/IInstancedTileEntityRenderer.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.simibubi.create.foundation.utility.render.instancing; - -import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; -import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; -import com.simibubi.create.foundation.utility.render.FastContraptionRenderer; -import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.tileentity.TileEntityRenderer; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.tileentity.TileEntity; - -import java.util.function.BiFunction; -import java.util.function.Function; -import java.util.function.Supplier; - -public interface IInstancedTileEntityRenderer { - - void addInstanceData(InstanceContext te); -}