From 6de4b92ad00ab9c07212623725157ac1574808a3 Mon Sep 17 00:00:00 2001 From: Jozufozu Date: Mon, 23 Aug 2021 22:34:29 -0700 Subject: [PATCH] Interfaces and less log lines - MateralManager, MaterialGroup, and InstanceMaterial are all interfaces - Separate (T)EI facing API from implementation - Comment out debug log in ModelPool --- .../contraptions/base/BackHalfShaftInstance.java | 2 +- .../contraptions/base/CutoutRotatingInstance.java | 3 +-- .../content/contraptions/base/HalfShaftInstance.java | 2 +- .../contraptions/base/HorizontalHalfShaftInstance.java | 2 +- .../content/contraptions/base/KineticTileInstance.java | 2 +- .../contraptions/base/ShaftlessCogInstance.java | 2 +- .../contraptions/base/SingleRotatingInstance.java | 2 +- .../components/actors/DrillActorInstance.java | 2 +- .../contraptions/components/actors/DrillInstance.java | 2 +- .../components/actors/DrillMovementBehaviour.java | 2 +- .../components/actors/HarvesterActorInstance.java | 2 +- .../components/actors/HarvesterMovementBehaviour.java | 2 +- .../components/crafter/MechanicalCrafterInstance.java | 2 +- .../components/crank/HandCrankInstance.java | 2 +- .../components/deployer/DeployerActorInstance.java | 2 +- .../components/deployer/DeployerInstance.java | 2 +- .../components/deployer/DeployerMovementBehaviour.java | 2 +- .../contraptions/components/fan/FanInstance.java | 2 +- .../components/flywheel/FlyWheelInstance.java | 4 ++-- .../components/flywheel/engine/EngineInstance.java | 2 +- .../components/millstone/MillStoneCogInstance.java | 2 +- .../contraptions/components/mixer/MixerInstance.java | 2 +- .../contraptions/components/press/PressInstance.java | 2 +- .../contraptions/components/saw/SawInstance.java | 2 +- .../structureMovement/MovementBehaviour.java | 2 +- .../structureMovement/bearing/BearingInstance.java | 2 +- .../bearing/StabilizedBearingInstance.java | 2 +- .../bearing/StabilizedBearingMovementBehaviour.java | 2 +- .../structureMovement/chassis/StickerInstance.java | 2 +- .../gantry/GantryCarriageInstance.java | 2 +- .../structureMovement/glue/GlueInstance.java | 10 +++------- .../pulley/AbstractPulleyInstance.java | 2 +- .../structureMovement/pulley/HosePulleyInstance.java | 2 +- .../structureMovement/pulley/RopePulleyInstance.java | 2 +- .../structureMovement/render/ActorInstance.java | 4 ++-- .../structureMovement/render/ContraptionGroup.java | 10 +++++----- .../render/ContraptionInstanceManager.java | 4 ++-- .../structureMovement/render/RenderedContraption.java | 6 +++--- .../content/contraptions/fluids/PumpCogInstance.java | 2 +- .../contraptions/fluids/pipes/FluidValveInstance.java | 2 +- .../content/contraptions/relays/belt/BeltInstance.java | 2 +- .../contraptions/relays/encased/ShaftInstance.java | 2 +- .../relays/encased/SplitShaftInstance.java | 4 ++-- .../contraptions/relays/gauge/GaugeInstance.java | 6 +++--- .../contraptions/relays/gearbox/GearboxInstance.java | 4 ++-- .../curiosities/armor/CopperBacktankInstance.java | 2 +- .../block/belts/tunnel/BeltTunnelInstance.java | 2 +- .../content/logistics/block/depot/EjectorInstance.java | 2 +- .../block/diodes/AdjustableRepeaterInstance.java | 2 +- .../content/logistics/block/funnel/FunnelInstance.java | 2 +- .../logistics/block/mechanicalArm/ArmInstance.java | 2 +- .../logistics/block/redstone/AnalogLeverInstance.java | 2 +- .../schematics/block/SchematicannonInstance.java | 2 +- 53 files changed, 68 insertions(+), 73 deletions(-) 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 3133c09ab..f4af13f20 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 @@ -6,7 +6,7 @@ import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.Direction; public class BackHalfShaftInstance extends HalfShaftInstance { - public BackHalfShaftInstance(MaterialManager modelManager, KineticTileEntity tile) { + public BackHalfShaftInstance(MaterialManager modelManager, KineticTileEntity tile) { super(modelManager, tile); } diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/CutoutRotatingInstance.java b/src/main/java/com/simibubi/create/content/contraptions/base/CutoutRotatingInstance.java index c8f3d4335..26c154635 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/CutoutRotatingInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/CutoutRotatingInstance.java @@ -1,12 +1,11 @@ package com.simibubi.create.content.contraptions.base; -import com.jozufozu.flywheel.backend.instancing.Instancer; import com.jozufozu.flywheel.backend.material.InstanceMaterial; import com.jozufozu.flywheel.backend.material.MaterialManager; import com.simibubi.create.foundation.render.AllMaterialSpecs; public class CutoutRotatingInstance extends SingleRotatingInstance { - public CutoutRotatingInstance(MaterialManager modelManager, KineticTileEntity tile) { + public CutoutRotatingInstance(MaterialManager modelManager, KineticTileEntity tile) { super(modelManager, tile); } 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 c5fa91df2..819f9133e 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 @@ -8,7 +8,7 @@ import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.Direction; public class HalfShaftInstance extends SingleRotatingInstance { - public HalfShaftInstance(MaterialManager modelManager, KineticTileEntity tile) { + public HalfShaftInstance(MaterialManager modelManager, KineticTileEntity tile) { super(modelManager, tile); } 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 2ccdd215a..b0d38884d 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 @@ -7,7 +7,7 @@ import net.minecraft.util.Direction; public class HorizontalHalfShaftInstance extends HalfShaftInstance { - public HorizontalHalfShaftInstance(MaterialManager modelManager, KineticTileEntity tile) { + public HorizontalHalfShaftInstance(MaterialManager modelManager, KineticTileEntity tile) { super(modelManager, tile); } 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 c845b8a48..90d5867b0 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 @@ -15,7 +15,7 @@ public abstract class KineticTileInstance extends T protected final Direction.Axis axis; - public KineticTileInstance(MaterialManager modelManager, T tile) { + public KineticTileInstance(MaterialManager modelManager, T tile) { super(modelManager, tile); axis = ((IRotate) blockState.getBlock()).getRotationAxis(blockState); 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 e7b747d02..4cbb1ebca 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 @@ -7,7 +7,7 @@ import com.simibubi.create.foundation.render.AllMaterialSpecs; public class ShaftlessCogInstance extends SingleRotatingInstance { - public ShaftlessCogInstance(MaterialManager modelManager, KineticTileEntity tile) { + public ShaftlessCogInstance(MaterialManager modelManager, KineticTileEntity tile) { super(modelManager, tile); } 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 90a5efdb6..c8327bcc2 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 @@ -9,7 +9,7 @@ public class SingleRotatingInstance extends KineticTileInstance modelManager, KineticTileEntity tile) { + public SingleRotatingInstance(MaterialManager modelManager, KineticTileEntity tile) { super(modelManager, tile); rotatingModel = setup(getModel().createInstance()); 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 c142cd2cf..aee52eba2 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 @@ -19,7 +19,7 @@ public class DrillActorInstance extends ActorInstance { ActorData drillHead; private final Direction facing; - public DrillActorInstance(MaterialManager materialManager, PlacementSimulationWorld contraption, MovementContext context) { + public DrillActorInstance(MaterialManager materialManager, PlacementSimulationWorld contraption, MovementContext context) { super(materialManager, contraption, context); InstanceMaterial instanceMaterial = materialManager.defaultSolid() 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 b43916d7b..5e5768fe6 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 @@ -14,7 +14,7 @@ import net.minecraft.util.Direction; public class DrillInstance extends SingleRotatingInstance { - public DrillInstance(MaterialManager modelManager, KineticTileEntity tile) { + public DrillInstance(MaterialManager modelManager, KineticTileEntity tile) { super(modelManager, tile); } 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 8942b48c5..52a961afa 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 @@ -48,7 +48,7 @@ public class DrillMovementBehaviour extends BlockBreakingMovementBehaviour { @Nullable @Override - public ActorInstance createInstance(MaterialManager materialManager, PlacementSimulationWorld simulationWorld, MovementContext context) { + public ActorInstance createInstance(MaterialManager materialManager, PlacementSimulationWorld simulationWorld, MovementContext context) { return new DrillActorInstance(materialManager, simulationWorld, context); } 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 936a88bb5..b56ab06ac 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 @@ -34,7 +34,7 @@ public class HarvesterActorInstance extends ActorInstance { private double rotation; private double previousRotation; - public HarvesterActorInstance(MaterialManager materialManager, PlacementSimulationWorld simulationWorld, MovementContext context) { + public HarvesterActorInstance(MaterialManager materialManager, PlacementSimulationWorld simulationWorld, MovementContext context) { super(materialManager, simulationWorld, context); InstanceMaterial instanceMaterial = materialManager.defaultCutout() 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 87eee9790..88fa7bc55 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 @@ -49,7 +49,7 @@ public class HarvesterMovementBehaviour extends MovementBehaviour { @Nullable @Override - public ActorInstance createInstance(MaterialManager materialManager, PlacementSimulationWorld simulationWorld, MovementContext context) { + public ActorInstance createInstance(MaterialManager materialManager, PlacementSimulationWorld simulationWorld, MovementContext context) { return new HarvesterActorInstance(materialManager, simulationWorld, context); } 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 cfacf3990..f5da491fb 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 @@ -16,7 +16,7 @@ import net.minecraft.util.Direction; public class MechanicalCrafterInstance extends SingleRotatingInstance { - public MechanicalCrafterInstance(MaterialManager modelManager, KineticTileEntity tile) { + public MechanicalCrafterInstance(MaterialManager modelManager, KineticTileEntity tile) { super(modelManager, tile); } 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 551f76b20..3730842f1 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 @@ -20,7 +20,7 @@ public class HandCrankInstance extends SingleRotatingInstance implements IDynami private ModelData crank; private Direction facing; - public HandCrankInstance(MaterialManager modelManager, HandCrankTileEntity tile) { + public HandCrankInstance(MaterialManager modelManager, HandCrankTileEntity tile) { super(modelManager, tile); this.tile = tile; 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 21768e690..0bf6da0bd 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 @@ -42,7 +42,7 @@ public class DeployerActorInstance extends ActorInstance { ModelData hand; RotatingData shaft; - public DeployerActorInstance(MaterialManager materialManager, PlacementSimulationWorld simulationWorld, MovementContext context) { + public DeployerActorInstance(MaterialManager materialManager, PlacementSimulationWorld simulationWorld, MovementContext context) { super(materialManager, simulationWorld, context); InstanceMaterial mat = materialManager.defaultSolid() 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 d2c7b1c2d..7b0b8cb7f 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 @@ -36,7 +36,7 @@ public class DeployerInstance extends ShaftInstance implements IDynamicInstance, float progress; private boolean newHand = false; - public DeployerInstance(MaterialManager dispatcher, KineticTileEntity tile) { + public DeployerInstance(MaterialManager dispatcher, KineticTileEntity tile) { super(dispatcher, tile); this.tile = (DeployerTileEntity) super.tile; 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 8db2c3089..94563e986 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 @@ -268,7 +268,7 @@ public class DeployerMovementBehaviour extends MovementBehaviour { @Nullable @Override - public ActorInstance createInstance(MaterialManager materialManager, PlacementSimulationWorld simulationWorld, MovementContext context) { + public ActorInstance createInstance(MaterialManager materialManager, PlacementSimulationWorld simulationWorld, MovementContext context) { return new DeployerActorInstance(materialManager, simulationWorld, context); } } 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 9b6956c4d..2ae33df60 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 @@ -19,7 +19,7 @@ public class FanInstance extends KineticTileInstance { final Direction direction; private final Direction opposite; - public FanInstance(MaterialManager modelManager, EncasedFanTileEntity tile) { + public FanInstance(MaterialManager modelManager, EncasedFanTileEntity tile) { super(modelManager, tile); direction = blockState.getValue(FACING); 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 ea35ee0e3..2751225d2 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 @@ -8,8 +8,8 @@ import java.util.List; import com.google.common.collect.Lists; import com.jozufozu.flywheel.backend.instancing.IDynamicInstance; import com.jozufozu.flywheel.backend.instancing.InstanceData; -import com.jozufozu.flywheel.backend.material.InstanceMaterial; import com.jozufozu.flywheel.backend.instancing.Instancer; +import com.jozufozu.flywheel.backend.material.InstanceMaterial; import com.jozufozu.flywheel.backend.material.MaterialManager; import com.jozufozu.flywheel.core.materials.ModelData; import com.jozufozu.flywheel.util.transform.MatrixTransformStack; @@ -45,7 +45,7 @@ public class FlyWheelInstance extends KineticTileInstance im protected float lastAngle = Float.NaN; - public FlyWheelInstance(MaterialManager modelManager, FlywheelTileEntity tile) { + public FlyWheelInstance(MaterialManager modelManager, FlywheelTileEntity tile) { super(modelManager, tile); facing = blockState.getValue(HORIZONTAL_FACING); 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 230960d90..e70504ea5 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 @@ -16,7 +16,7 @@ public class EngineInstance extends TileEntityInstance { protected ModelData frame; - public EngineInstance(MaterialManager modelManager, EngineTileEntity tile) { + public EngineInstance(MaterialManager modelManager, EngineTileEntity tile) { super(modelManager, tile); Block block = blockState 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 afd79ba80..e216429bc 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 @@ -9,7 +9,7 @@ import com.simibubi.create.content.contraptions.base.SingleRotatingInstance; public class MillStoneCogInstance extends SingleRotatingInstance { - public MillStoneCogInstance(MaterialManager modelManager, KineticTileEntity tile) { + public MillStoneCogInstance(MaterialManager modelManager, KineticTileEntity tile) { super(modelManager, tile); } 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 b2fe1b653..01c3586c8 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 @@ -16,7 +16,7 @@ public class MixerInstance extends ShaftlessCogInstance implements IDynamicInsta private final OrientedData mixerPole; private final MechanicalMixerTileEntity mixer; - public MixerInstance(MaterialManager dispatcher, MechanicalMixerTileEntity tile) { + public MixerInstance(MaterialManager dispatcher, MechanicalMixerTileEntity tile) { super(dispatcher, tile); this.mixer = tile; 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 500295183..46264cdc6 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 @@ -17,7 +17,7 @@ public class PressInstance extends ShaftInstance implements IDynamicInstance { private final OrientedData pressHead; private final MechanicalPressTileEntity press; - public PressInstance(MaterialManager dispatcher, MechanicalPressTileEntity tile) { + public PressInstance(MaterialManager dispatcher, MechanicalPressTileEntity tile) { super(dispatcher, tile); press = tile; 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 59fcc7589..3fbea076b 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 @@ -15,7 +15,7 @@ import net.minecraft.util.Rotation; public class SawInstance extends SingleRotatingInstance { - public SawInstance(MaterialManager modelManager, KineticTileEntity tile) { + public SawInstance(MaterialManager modelManager, KineticTileEntity tile) { super(modelManager, tile); } diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementBehaviour.java index b7b3400eb..de9c6d80d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementBehaviour.java @@ -66,7 +66,7 @@ public abstract class MovementBehaviour { @OnlyIn(Dist.CLIENT) @Nullable - public ActorInstance createInstance(MaterialManager materialManager, PlacementSimulationWorld simulationWorld, MovementContext context) { + public ActorInstance createInstance(MaterialManager materialManager, PlacementSimulationWorld simulationWorld, MovementContext context) { return null; } 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 f9ce8806d..aa8165678 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 @@ -23,7 +23,7 @@ public class BearingInstance e final Vector3f rotationAxis; final Quaternion blockOrientation; - public BearingInstance(MaterialManager modelManager, B tile) { + public BearingInstance(MaterialManager modelManager, B tile) { super(modelManager, tile); this.bearing = tile; 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 67de1bc5f..46861f969 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 @@ -23,7 +23,7 @@ public class StabilizedBearingInstance extends ActorInstance { final Vector3f rotationAxis; final Quaternion blockOrientation; - public StabilizedBearingInstance(MaterialManager materialManager, PlacementSimulationWorld simulationWorld, MovementContext context) { + public StabilizedBearingInstance(MaterialManager materialManager, PlacementSimulationWorld simulationWorld, MovementContext context) { super(materialManager, simulationWorld, context); BlockState blockState = context.state; 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 2e03a363e..4f23b4b3e 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 @@ -70,7 +70,7 @@ public class StabilizedBearingMovementBehaviour extends MovementBehaviour { @Nullable @Override - public ActorInstance createInstance(MaterialManager materialManager, PlacementSimulationWorld simulationWorld, MovementContext context) { + public ActorInstance createInstance(MaterialManager materialManager, PlacementSimulationWorld simulationWorld, MovementContext context) { return new StabilizedBearingInstance(materialManager, simulationWorld, context); } 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 050fbc56d..210b684f3 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 @@ -23,7 +23,7 @@ public class StickerInstance extends TileEntityInstance imple private final ModelData head; - public StickerInstance(MaterialManager modelManager, StickerTileEntity tile) { + public StickerInstance(MaterialManager modelManager, StickerTileEntity tile) { super(modelManager, tile); head = getTransformMaterial().getModel(AllBlockPartials.STICKER_HEAD, blockState).createInstance(); 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 5a4d957f5..b8ae681c7 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 @@ -29,7 +29,7 @@ public class GantryCarriageInstance extends ShaftInstance implements IDynamicIns private float lastAngle = Float.NaN; - public GantryCarriageInstance(MaterialManager dispatcher, KineticTileEntity tile) { + public GantryCarriageInstance(MaterialManager dispatcher, KineticTileEntity tile) { super(dispatcher, tile); gantryCogs = getTransformMaterial() diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/GlueInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/GlueInstance.java index 751fe2236..cda3e0233 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/GlueInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/GlueInstance.java @@ -7,13 +7,9 @@ import com.jozufozu.flywheel.backend.instancing.Instancer; import com.jozufozu.flywheel.backend.material.MaterialManager; import com.jozufozu.flywheel.backend.instancing.entity.EntityInstance; import com.jozufozu.flywheel.backend.material.MaterialGroup; -import com.jozufozu.flywheel.backend.model.BufferedModel; -import com.jozufozu.flywheel.backend.model.ElementBuffer; -import com.jozufozu.flywheel.backend.model.IndexedModel; import com.jozufozu.flywheel.backend.state.TextureRenderState; import com.jozufozu.flywheel.core.Formats; import com.jozufozu.flywheel.core.Materials; -import com.jozufozu.flywheel.core.QuadConverter; import com.jozufozu.flywheel.core.instancing.ConditionalInstance; import com.jozufozu.flywheel.core.materials.OrientedData; import com.jozufozu.flywheel.core.model.IModel; @@ -41,7 +37,7 @@ public class GlueInstance extends EntityInstance implements ITi private final Quaternion rotation; protected ConditionalInstance model; - public GlueInstance(MaterialManager materialManager, SuperGlueEntity entity) { + public GlueInstance(MaterialManager materialManager, SuperGlueEntity entity) { super(materialManager, entity); Instancer instancer = getInstancer(materialManager, entity); @@ -55,8 +51,8 @@ public class GlueInstance extends EntityInstance implements ITi .update(); } - private Instancer getInstancer(MaterialManager materialManager, SuperGlueEntity entity) { - MaterialGroup group = USE_ATLAS ? materialManager.defaultCutout() : materialManager.cutout(TextureRenderState.get(TEXTURE)); + private Instancer getInstancer(MaterialManager materialManager, SuperGlueEntity entity) { + MaterialGroup group = USE_ATLAS ? materialManager.defaultCutout() : materialManager.cutout(TextureRenderState.get(TEXTURE)); return group.material(Materials.ORIENTED).model(entity.getType(), GlueModel::new); } 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 fae4a7b18..c1212282f 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 @@ -37,7 +37,7 @@ public abstract class AbstractPulleyInstance extends ShaftInstance implements ID private byte[] sLight = new byte[1]; private GridAlignedBB volume; - public AbstractPulleyInstance(MaterialManager dispatcher, KineticTileEntity tile) { + public AbstractPulleyInstance(MaterialManager dispatcher, KineticTileEntity tile) { super(dispatcher, tile); rotatingAbout = Direction.get(Direction.AxisDirection.POSITIVE, axis); 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 c748a0568..ee98ed61b 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 @@ -11,7 +11,7 @@ import com.simibubi.create.foundation.utility.AnimationTickHolder; public class HosePulleyInstance extends AbstractPulleyInstance { final HosePulleyTileEntity tile = (HosePulleyTileEntity) super.tile; - public HosePulleyInstance(MaterialManager dispatcher, HosePulleyTileEntity tile) { + public HosePulleyInstance(MaterialManager dispatcher, HosePulleyTileEntity tile) { super(dispatcher, tile); beginFrame(); } 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 a832532d2..0400ed115 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 @@ -11,7 +11,7 @@ import com.simibubi.create.foundation.utility.AnimationTickHolder; public class RopePulleyInstance extends AbstractPulleyInstance { final PulleyTileEntity tile = (PulleyTileEntity) super.tile; - public RopePulleyInstance(MaterialManager dispatcher, PulleyTileEntity tile) { + public RopePulleyInstance(MaterialManager dispatcher, PulleyTileEntity tile) { super(dispatcher, tile); beginFrame(); } diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ActorInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ActorInstance.java index ab49754c5..7464bbbd7 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ActorInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ActorInstance.java @@ -7,11 +7,11 @@ import com.simibubi.create.foundation.utility.worldWrappers.PlacementSimulationW import net.minecraft.world.LightType; public abstract class ActorInstance { - protected final MaterialManager materialManager; + protected final MaterialManager materialManager; protected final PlacementSimulationWorld simulationWorld; protected final MovementContext context; - public ActorInstance(MaterialManager materialManager, PlacementSimulationWorld world, MovementContext context) { + public ActorInstance(MaterialManager materialManager, PlacementSimulationWorld world, MovementContext context) { this.materialManager = materialManager; this.simulationWorld = world; this.context = context; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionGroup.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionGroup.java index 582694840..f3ac4460a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionGroup.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionGroup.java @@ -1,14 +1,14 @@ package com.simibubi.create.content.contraptions.components.structureMovement.render; -import com.jozufozu.flywheel.backend.material.MaterialGroup; -import com.jozufozu.flywheel.backend.material.MaterialManager; +import com.jozufozu.flywheel.backend.material.MaterialGroupImpl; +import com.jozufozu.flywheel.backend.material.MaterialManagerImpl; import com.jozufozu.flywheel.backend.state.IRenderState; -public class ContraptionGroup

extends MaterialGroup

{ +public class ContraptionGroup

extends MaterialGroupImpl

{ private final RenderedContraption contraption; - public ContraptionGroup(RenderedContraption contraption, MaterialManager

owner, IRenderState state) { + public ContraptionGroup(RenderedContraption contraption, MaterialManagerImpl

owner, IRenderState state) { super(owner, state); this.contraption = contraption; @@ -19,7 +19,7 @@ public class ContraptionGroup

extends MaterialGrou contraption.setup(program); } - public static

MaterialManager.GroupFactory

forContraption(RenderedContraption c) { + public static

MaterialManagerImpl.GroupFactory

forContraption(RenderedContraption c) { return (materialManager, state) -> new ContraptionGroup<>(c, materialManager, state); } } diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionInstanceManager.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionInstanceManager.java index 47cd9258a..5f589910b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionInstanceManager.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionInstanceManager.java @@ -7,8 +7,8 @@ import javax.annotation.Nullable; import org.apache.commons.lang3.tuple.Pair; -import com.jozufozu.flywheel.backend.material.MaterialManager; import com.jozufozu.flywheel.backend.instancing.tile.TileInstanceManager; +import com.jozufozu.flywheel.backend.material.MaterialManagerImpl; import com.simibubi.create.AllMovementBehaviours; import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; @@ -23,7 +23,7 @@ public class ContraptionInstanceManager extends TileInstanceManager { private final WeakReference contraption; - ContraptionInstanceManager(RenderedContraption contraption, MaterialManager materialManager) { + ContraptionInstanceManager(RenderedContraption contraption, MaterialManagerImpl materialManager) { super(materialManager); this.contraption = new WeakReference<>(contraption); } 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 e088b3647..e53f10058 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 @@ -8,7 +8,7 @@ import java.util.function.Supplier; import com.jozufozu.flywheel.backend.Backend; import com.jozufozu.flywheel.backend.instancing.InstancedRenderRegistry; -import com.jozufozu.flywheel.backend.material.MaterialManager; +import com.jozufozu.flywheel.backend.material.MaterialManagerImpl; import com.jozufozu.flywheel.backend.model.ArrayModelRenderer; import com.jozufozu.flywheel.backend.model.ModelRenderer; import com.jozufozu.flywheel.core.model.IModel; @@ -36,7 +36,7 @@ public class RenderedContraption extends ContraptionRenderInfo { private final ContraptionLighter lighter; - public final MaterialManager materialManager; + public final MaterialManagerImpl materialManager; public final ContraptionInstanceManager kinetics; private final Map renderLayers = new HashMap<>(); @@ -48,7 +48,7 @@ public class RenderedContraption extends ContraptionRenderInfo { public RenderedContraption(Contraption contraption, PlacementSimulationWorld renderWorld) { super(contraption, renderWorld); this.lighter = contraption.makeLighter(); - this.materialManager = MaterialManager.builder(CreateContexts.CWORLD) + this.materialManager = MaterialManagerImpl.builder(CreateContexts.CWORLD) .setGroupFactory(ContraptionGroup.forContraption(this)) .setIgnoreOriginCoordinate(true) .build(); 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 5c6886304..2b2ea5417 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 @@ -14,7 +14,7 @@ import net.minecraft.util.Direction; public class PumpCogInstance extends SingleRotatingInstance { - public PumpCogInstance(MaterialManager modelManager, KineticTileEntity tile) { + public PumpCogInstance(MaterialManager modelManager, KineticTileEntity tile) { super(modelManager, tile); } 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 82ed9782e..85f51eadb 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 @@ -24,7 +24,7 @@ public class FluidValveInstance extends ShaftInstance implements IDynamicInstanc protected final double yRot; protected final int pointerRotationOffset; - public FluidValveInstance(MaterialManager dispatcher, KineticTileEntity tile) { + public FluidValveInstance(MaterialManager dispatcher, KineticTileEntity tile) { super(dispatcher, tile); Direction facing = blockState.getValue(FluidValveBlock.FACING); 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 749cc33c7..08f747ce4 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 @@ -35,7 +35,7 @@ public class BeltInstance extends KineticTileInstance { protected ArrayList keys; protected RotatingData pulleyKey; - public BeltInstance(MaterialManager materialManager, BeltTileEntity tile) { + public BeltInstance(MaterialManager materialManager, BeltTileEntity tile) { super(materialManager, tile); if (!AllBlocks.BELT.has(blockState)) 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 abf7af134..629713259 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 @@ -8,7 +8,7 @@ import net.minecraft.block.BlockState; public class ShaftInstance extends SingleRotatingInstance { - public ShaftInstance(MaterialManager dispatcher, KineticTileEntity tile) { + public ShaftInstance(MaterialManager dispatcher, KineticTileEntity tile) { super(dispatcher, tile); } 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 73ed999ca..e289b1d7c 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 @@ -3,8 +3,8 @@ package com.simibubi.create.content.contraptions.relays.encased; import java.util.ArrayList; import com.jozufozu.flywheel.backend.instancing.InstanceData; -import com.jozufozu.flywheel.backend.material.InstanceMaterial; import com.jozufozu.flywheel.backend.instancing.Instancer; +import com.jozufozu.flywheel.backend.material.InstanceMaterial; import com.jozufozu.flywheel.backend.material.MaterialManager; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.IRotate; @@ -19,7 +19,7 @@ public class SplitShaftInstance extends KineticTileInstance keys; - public SplitShaftInstance(MaterialManager modelManager, SplitShaftTileEntity tile) { + public SplitShaftInstance(MaterialManager modelManager, SplitShaftTileEntity tile) { super(modelManager, tile); keys = new ArrayList<>(2); 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 f38497777..2e0650d79 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 @@ -25,7 +25,7 @@ public abstract class GaugeInstance extends ShaftInstance implements IDynamicIns protected MatrixStack ms; - protected GaugeInstance(MaterialManager dispatcher, KineticTileEntity tile) { + protected GaugeInstance(MaterialManager dispatcher, KineticTileEntity tile) { super(dispatcher, tile); faces = new ArrayList<>(2); @@ -145,7 +145,7 @@ public abstract class GaugeInstance extends ShaftInstance implements IDynamicIns } public static class Speed extends GaugeInstance { - public Speed(MaterialManager dispatcher, KineticTileEntity tile) { + public Speed(MaterialManager dispatcher, KineticTileEntity tile) { super(dispatcher, tile); } @@ -156,7 +156,7 @@ public abstract class GaugeInstance extends ShaftInstance implements IDynamicIns } public static class Stress extends GaugeInstance { - public Stress(MaterialManager dispatcher, KineticTileEntity tile) { + public Stress(MaterialManager dispatcher, KineticTileEntity tile) { super(dispatcher, tile); } 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 0b86084aa..78b91f5b0 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 @@ -4,8 +4,8 @@ import java.util.EnumMap; import java.util.Map; import com.jozufozu.flywheel.backend.instancing.InstanceData; -import com.jozufozu.flywheel.backend.material.InstanceMaterial; import com.jozufozu.flywheel.backend.instancing.Instancer; +import com.jozufozu.flywheel.backend.material.InstanceMaterial; import com.jozufozu.flywheel.backend.material.MaterialManager; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.content.contraptions.base.KineticTileInstance; @@ -22,7 +22,7 @@ public class GearboxInstance extends KineticTileInstance { protected final EnumMap keys; protected Direction sourceFacing; - public GearboxInstance(MaterialManager modelManager, GearboxTileEntity tile) { + public GearboxInstance(MaterialManager modelManager, GearboxTileEntity tile) { super(modelManager, tile); keys = new EnumMap<>(Direction.class); diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/CopperBacktankInstance.java b/src/main/java/com/simibubi/create/content/curiosities/armor/CopperBacktankInstance.java index ad251f267..8482f2279 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/armor/CopperBacktankInstance.java +++ b/src/main/java/com/simibubi/create/content/curiosities/armor/CopperBacktankInstance.java @@ -9,7 +9,7 @@ import com.simibubi.create.content.contraptions.base.SingleRotatingInstance; public class CopperBacktankInstance extends SingleRotatingInstance { - public CopperBacktankInstance(MaterialManager modelManager, KineticTileEntity tile) { + public CopperBacktankInstance(MaterialManager modelManager, KineticTileEntity tile) { super(modelManager, tile); } 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 05b4a1f78..b09a596d1 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 @@ -23,7 +23,7 @@ public class BeltTunnelInstance extends TileEntityInstance private final Map> tunnelFlaps; - public BeltTunnelInstance(MaterialManager modelManager, BeltTunnelTileEntity tile) { + public BeltTunnelInstance(MaterialManager modelManager, BeltTunnelTileEntity tile) { super(modelManager, tile); tunnelFlaps = new EnumMap<>(Direction.class); 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 646ed5616..4717d4559 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 @@ -19,7 +19,7 @@ public class EjectorInstance extends ShaftInstance implements IDynamicInstance { private float lastProgress = Float.NaN; - public EjectorInstance(MaterialManager dispatcher, EjectorTileEntity tile) { + public EjectorInstance(MaterialManager dispatcher, EjectorTileEntity tile) { super(dispatcher, tile); this.tile = tile; 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 bc1bc1407..bcbca0e02 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 @@ -16,7 +16,7 @@ public class AdjustableRepeaterInstance extends TileEntityInstance modelManager, AdjustableRepeaterTileEntity tile) { + public AdjustableRepeaterInstance(MaterialManager modelManager, AdjustableRepeaterTileEntity tile) { super(modelManager, tile); indicator = modelManager.defaultSolid() 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 470e56bda..d345c2dd6 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 @@ -20,7 +20,7 @@ public class FunnelInstance extends TileEntityInstance impleme private final ArrayList flaps; - public FunnelInstance(MaterialManager modelManager, FunnelTileEntity tile) { + public FunnelInstance(MaterialManager modelManager, FunnelTileEntity tile) { super(modelManager, tile); flaps = new ArrayList<>(4); 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 9cd1d7913..e2c586f53 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 @@ -44,7 +44,7 @@ public class ArmInstance extends SingleRotatingInstance implements IDynamicInsta private float upperArmAngle = Float.NaN; private float headAngle = Float.NaN; - public ArmInstance(MaterialManager modelManager, ArmTileEntity tile) { + public ArmInstance(MaterialManager modelManager, ArmTileEntity tile) { super(modelManager, tile); InstanceMaterial mat = getTransformMaterial(); 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 5a877cbda..6fee4260d 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 @@ -23,7 +23,7 @@ public class AnalogLeverInstance extends TileEntityInstance modelManager, AnalogLeverTileEntity tile) { + public AnalogLeverInstance(MaterialManager modelManager, AnalogLeverTileEntity tile) { super(modelManager, tile); InstanceMaterial mat = getTransformMaterial(); 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 3d64468c1..bb449e9f6 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 @@ -17,7 +17,7 @@ public class SchematicannonInstance extends TileEntityInstance modelManager, SchematicannonTileEntity tile) { + public SchematicannonInstance(MaterialManager modelManager, SchematicannonTileEntity tile) { super(modelManager, tile); InstanceMaterial mat = getTransformMaterial();