From 1c46bc8ae1b9e830f11f68a5cc27e9fc9b41e52b Mon Sep 17 00:00:00 2001 From: Jozufozu Date: Wed, 17 Jan 2024 13:50:26 -0800 Subject: [PATCH] What's in a name - Rename all *Instance -> *Visual. - FlapData -> FlapInstance. - Rename VisualizationContext variables. --- .../simibubi/create/AllBlockEntityTypes.java | 196 +++++++++--------- .../com/simibubi/create/AllEntityTypes.java | 4 +- .../actors/{flwdata => }/ActorInstance.java | 2 +- .../actors/flwdata/package-info.java | 6 - ...nstance.java => HarvesterActorVisual.java} | 11 +- .../harvester/HarvesterMovementBehaviour.java | 8 +- ...ActorInstance.java => PSIActorVisual.java} | 10 +- .../psi/{PSIInstance.java => PSIVisual.java} | 4 +- .../psi/PortableStorageInterfaceMovement.java | 8 +- ...orInstance.java => RollerActorVisual.java} | 11 +- .../roller/RollerMovementBehaviour.java | 8 +- ...earingInstance.java => BearingVisual.java} | 8 +- .../StabilizedBearingMovementBehaviour.java | 10 +- ...ance.java => StabilizedBearingVisual.java} | 16 +- .../behaviour/MovementBehaviour.java | 6 +- ...tickerInstance.java => StickerVisual.java} | 7 +- ...nstance.java => ElevatorPulleyVisual.java} | 8 +- ...nstance.java => GantryCarriageVisual.java} | 9 +- ...nstance.java => AbstractPulleyVisual.java} | 6 +- ...leyInstance.java => HosePulleyVisual.java} | 4 +- ...leyInstance.java => RopePulleyVisual.java} | 6 +- .../{ActorInstance.java => ActorVisual.java} | 4 +- ...ktankInstance.java => BacktankVisual.java} | 8 +- ...oolBoxInstance.java => ToolBoxVisual.java} | 9 +- ...lveInstance.java => FluidValveVisual.java} | 6 +- ...umpCogInstance.java => PumpCogVisual.java} | 8 +- ...Instance.java => BackHalfShaftVisual.java} | 6 +- .../kinetics/base/CutoutRotatingInstance.java | 9 - .../kinetics/base/CutoutRotatingVisual.java | 9 + ...haftInstance.java => HalfShaftVisual.java} | 6 +- ...ce.java => HorizontalHalfShaftVisual.java} | 6 +- ...nce.java => KineticBlockEntityVisual.java} | 6 +- .../{ShaftInstance.java => ShaftVisual.java} | 6 +- ...nstance.java => SingleRotatingVisual.java} | 6 +- .../content/kinetics/belt/BeltVisual.java | 8 +- ...ance.java => ShaftlessCogwheelVisual.java} | 10 +- ...rankInstance.java => HandCrankVisual.java} | 6 +- ...Instance.java => DeployerActorVisual.java} | 14 +- .../deployer/DeployerMovementBehaviour.java | 8 +- ...loyerInstance.java => DeployerVisual.java} | 8 +- ...torInstance.java => DrillActorVisual.java} | 12 +- .../drill/DrillMovementBehaviour.java | 6 +- .../{DrillInstance.java => DrillVisual.java} | 8 +- .../fan/{FanInstance.java => FanVisual.java} | 8 +- ...wheelInstance.java => FlywheelVisual.java} | 8 +- .../{GaugeInstance.java => GaugeVisual.java} | 20 +- ...earboxInstance.java => GearboxVisual.java} | 8 +- .../{ArmInstance.java => ArmVisual.java} | 8 +- ...gInstance.java => MillstoneCogVisual.java} | 8 +- .../{MixerInstance.java => MixerVisual.java} | 8 +- .../{PressInstance.java => PressVisual.java} | 8 +- .../saw/{SawInstance.java => SawVisual.java} | 8 +- ...=> BracketedKineticBlockEntityVisual.java} | 12 +- ...CogInstance.java => EncasedCogVisual.java} | 16 +- ...neInstance.java => SteamEngineVisual.java} | 7 +- ...aftInstance.java => SplitShaftVisual.java} | 6 +- ...eelInstance.java => WaterWheelVisual.java} | 18 +- ...jectorInstance.java => EjectorVisual.java} | 8 +- .../{FlapData.java => FlapInstance.java} | 26 +-- ...{FunnelInstance.java => FunnelVisual.java} | 16 +- ...nelInstance.java => BeltTunnelVisual.java} | 18 +- ...erInstance.java => AnalogLeverVisual.java} | 6 +- ...odeInstance.java => BrassDiodeVisual.java} | 6 +- ...nstance.java => SchematicannonVisual.java} | 8 +- .../trains/bogey/BackupBogeyRenderer.java | 2 +- .../content/trains/bogey/BogeyRenderer.java | 28 +-- .../content/trains/bogey/BogeyStyle.java | 4 +- .../{BogeyInstance.java => BogeyVisual.java} | 14 +- .../trains/bogey/StandardBogeyRenderer.java | 16 +- .../content/trains/entity/CarriageBogey.java | 6 +- .../entity/CarriageContraptionEntity.java | 6 +- ...ce.java => CarriageContraptionVisual.java} | 14 +- .../{TrackInstance.java => TrackVisual.java} | 40 ++-- .../foundation/render/AllInstanceTypes.java | 6 +- 74 files changed, 431 insertions(+), 453 deletions(-) rename src/main/java/com/simibubi/create/content/contraptions/actors/{flwdata => }/ActorInstance.java (97%) delete mode 100644 src/main/java/com/simibubi/create/content/contraptions/actors/flwdata/package-info.java rename src/main/java/com/simibubi/create/content/contraptions/actors/harvester/{HarvesterActorInstance.java => HarvesterActorVisual.java} (87%) rename src/main/java/com/simibubi/create/content/contraptions/actors/psi/{PSIActorInstance.java => PSIActorVisual.java} (67%) rename src/main/java/com/simibubi/create/content/contraptions/actors/psi/{PSIInstance.java => PSIVisual.java} (85%) rename src/main/java/com/simibubi/create/content/contraptions/actors/roller/{RollerActorInstance.java => RollerActorVisual.java} (83%) rename src/main/java/com/simibubi/create/content/contraptions/bearing/{BearingInstance.java => BearingVisual.java} (89%) rename src/main/java/com/simibubi/create/content/contraptions/bearing/{StabilizedBearingInstance.java => StabilizedBearingVisual.java} (80%) rename src/main/java/com/simibubi/create/content/contraptions/chassis/{StickerInstance.java => StickerVisual.java} (87%) rename src/main/java/com/simibubi/create/content/contraptions/elevator/{ElevatorPulleyInstance.java => ElevatorPulleyVisual.java} (56%) rename src/main/java/com/simibubi/create/content/contraptions/gantry/{GantryCarriageInstance.java => GantryCarriageVisual.java} (90%) rename src/main/java/com/simibubi/create/content/contraptions/pulley/{AbstractPulleyInstance.java => AbstractPulleyVisual.java} (94%) rename src/main/java/com/simibubi/create/content/contraptions/pulley/{HosePulleyInstance.java => HosePulleyVisual.java} (90%) rename src/main/java/com/simibubi/create/content/contraptions/pulley/{RopePulleyInstance.java => RopePulleyVisual.java} (89%) rename src/main/java/com/simibubi/create/content/contraptions/render/{ActorInstance.java => ActorVisual.java} (85%) rename src/main/java/com/simibubi/create/content/equipment/armor/{BacktankInstance.java => BacktankVisual.java} (53%) rename src/main/java/com/simibubi/create/content/equipment/toolbox/{ToolBoxInstance.java => ToolBoxVisual.java} (86%) rename src/main/java/com/simibubi/create/content/fluids/pipes/valve/{FluidValveInstance.java => FluidValveVisual.java} (91%) rename src/main/java/com/simibubi/create/content/fluids/pump/{PumpCogInstance.java => PumpCogVisual.java} (73%) rename src/main/java/com/simibubi/create/content/kinetics/base/{BackHalfShaftInstance.java => BackHalfShaftVisual.java} (63%) delete mode 100644 src/main/java/com/simibubi/create/content/kinetics/base/CutoutRotatingInstance.java create mode 100644 src/main/java/com/simibubi/create/content/kinetics/base/CutoutRotatingVisual.java rename src/main/java/com/simibubi/create/content/kinetics/base/{HalfShaftInstance.java => HalfShaftVisual.java} (73%) rename src/main/java/com/simibubi/create/content/kinetics/base/{HorizontalHalfShaftInstance.java => HorizontalHalfShaftVisual.java} (62%) rename src/main/java/com/simibubi/create/content/kinetics/base/{KineticBlockEntityInstance.java => KineticBlockEntityVisual.java} (91%) rename src/main/java/com/simibubi/create/content/kinetics/base/{ShaftInstance.java => ShaftVisual.java} (61%) rename src/main/java/com/simibubi/create/content/kinetics/base/{SingleRotatingInstance.java => SingleRotatingVisual.java} (82%) rename src/main/java/com/simibubi/create/content/kinetics/crafter/{ShaftlessCogwheelInstance.java => ShaftlessCogwheelVisual.java} (72%) rename src/main/java/com/simibubi/create/content/kinetics/crank/{HandCrankInstance.java => HandCrankVisual.java} (88%) rename src/main/java/com/simibubi/create/content/kinetics/deployer/{DeployerActorInstance.java => DeployerActorVisual.java} (90%) rename src/main/java/com/simibubi/create/content/kinetics/deployer/{DeployerInstance.java => DeployerVisual.java} (93%) rename src/main/java/com/simibubi/create/content/kinetics/drill/{DrillActorInstance.java => DrillActorVisual.java} (78%) rename src/main/java/com/simibubi/create/content/kinetics/drill/{DrillInstance.java => DrillVisual.java} (67%) rename src/main/java/com/simibubi/create/content/kinetics/fan/{FanInstance.java => FanVisual.java} (90%) rename src/main/java/com/simibubi/create/content/kinetics/flywheel/{FlywheelInstance.java => FlywheelVisual.java} (90%) rename src/main/java/com/simibubi/create/content/kinetics/gauge/{GaugeInstance.java => GaugeVisual.java} (88%) rename src/main/java/com/simibubi/create/content/kinetics/gearbox/{GearboxInstance.java => GearboxVisual.java} (93%) rename src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/{ArmInstance.java => ArmVisual.java} (95%) rename src/main/java/com/simibubi/create/content/kinetics/millstone/{MillstoneCogInstance.java => MillstoneCogVisual.java} (54%) rename src/main/java/com/simibubi/create/content/kinetics/mixer/{MixerInstance.java => MixerVisual.java} (92%) rename src/main/java/com/simibubi/create/content/kinetics/press/{PressInstance.java => PressVisual.java} (87%) rename src/main/java/com/simibubi/create/content/kinetics/saw/{SawInstance.java => SawVisual.java} (78%) rename src/main/java/com/simibubi/create/content/kinetics/simpleRelays/{BracketedKineticBlockEntityInstance.java => BracketedKineticBlockEntityVisual.java} (86%) rename src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/{EncasedCogInstance.java => EncasedCogVisual.java} (86%) rename src/main/java/com/simibubi/create/content/kinetics/steamEngine/{SteamEngineInstance.java => SteamEngineVisual.java} (91%) rename src/main/java/com/simibubi/create/content/kinetics/transmission/{SplitShaftInstance.java => SplitShaftVisual.java} (91%) rename src/main/java/com/simibubi/create/content/kinetics/waterwheel/{WaterWheelInstance.java => WaterWheelVisual.java} (66%) rename src/main/java/com/simibubi/create/content/logistics/depot/{EjectorInstance.java => EjectorVisual.java} (86%) rename src/main/java/com/simibubi/create/content/logistics/flwdata/{FlapData.java => FlapInstance.java} (67%) rename src/main/java/com/simibubi/create/content/logistics/funnel/{FunnelInstance.java => FunnelVisual.java} (82%) rename src/main/java/com/simibubi/create/content/logistics/tunnel/{BeltTunnelInstance.java => BeltTunnelVisual.java} (82%) rename src/main/java/com/simibubi/create/content/redstone/analogLever/{AnalogLeverInstance.java => AnalogLeverVisual.java} (91%) rename src/main/java/com/simibubi/create/content/redstone/diodes/{BrassDiodeInstance.java => BrassDiodeVisual.java} (86%) rename src/main/java/com/simibubi/create/content/schematics/cannon/{SchematicannonInstance.java => SchematicannonVisual.java} (86%) rename src/main/java/com/simibubi/create/content/trains/bogey/{BogeyInstance.java => BogeyVisual.java} (82%) rename src/main/java/com/simibubi/create/content/trains/entity/{CarriageContraptionInstance.java => CarriageContraptionVisual.java} (83%) rename src/main/java/com/simibubi/create/content/trains/track/{TrackInstance.java => TrackVisual.java} (88%) diff --git a/src/main/java/com/simibubi/create/AllBlockEntityTypes.java b/src/main/java/com/simibubi/create/AllBlockEntityTypes.java index 58d393a00..4f6edcf39 100644 --- a/src/main/java/com/simibubi/create/AllBlockEntityTypes.java +++ b/src/main/java/com/simibubi/create/AllBlockEntityTypes.java @@ -7,34 +7,34 @@ import com.simibubi.create.content.contraptions.actors.contraptionControls.Contr import com.simibubi.create.content.contraptions.actors.contraptionControls.ContraptionControlsRenderer; import com.simibubi.create.content.contraptions.actors.harvester.HarvesterBlockEntity; import com.simibubi.create.content.contraptions.actors.harvester.HarvesterRenderer; -import com.simibubi.create.content.contraptions.actors.psi.PSIInstance; +import com.simibubi.create.content.contraptions.actors.psi.PSIVisual; import com.simibubi.create.content.contraptions.actors.psi.PortableFluidInterfaceBlockEntity; import com.simibubi.create.content.contraptions.actors.psi.PortableItemInterfaceBlockEntity; import com.simibubi.create.content.contraptions.actors.psi.PortableStorageInterfaceRenderer; import com.simibubi.create.content.contraptions.actors.roller.RollerBlockEntity; import com.simibubi.create.content.contraptions.actors.roller.RollerRenderer; -import com.simibubi.create.content.contraptions.bearing.BearingInstance; import com.simibubi.create.content.contraptions.bearing.BearingRenderer; +import com.simibubi.create.content.contraptions.bearing.BearingVisual; import com.simibubi.create.content.contraptions.bearing.ClockworkBearingBlockEntity; import com.simibubi.create.content.contraptions.bearing.MechanicalBearingBlockEntity; import com.simibubi.create.content.contraptions.bearing.WindmillBearingBlockEntity; import com.simibubi.create.content.contraptions.chassis.ChassisBlockEntity; import com.simibubi.create.content.contraptions.chassis.StickerBlockEntity; -import com.simibubi.create.content.contraptions.chassis.StickerInstance; import com.simibubi.create.content.contraptions.chassis.StickerRenderer; +import com.simibubi.create.content.contraptions.chassis.StickerVisual; import com.simibubi.create.content.contraptions.elevator.ElevatorContactBlockEntity; import com.simibubi.create.content.contraptions.elevator.ElevatorPulleyBlockEntity; import com.simibubi.create.content.contraptions.elevator.ElevatorPulleyRenderer; import com.simibubi.create.content.contraptions.gantry.GantryCarriageBlockEntity; -import com.simibubi.create.content.contraptions.gantry.GantryCarriageInstance; import com.simibubi.create.content.contraptions.gantry.GantryCarriageRenderer; +import com.simibubi.create.content.contraptions.gantry.GantryCarriageVisual; import com.simibubi.create.content.contraptions.mounted.CartAssemblerBlockEntity; import com.simibubi.create.content.contraptions.piston.MechanicalPistonBlockEntity; import com.simibubi.create.content.contraptions.piston.MechanicalPistonRenderer; -import com.simibubi.create.content.contraptions.pulley.HosePulleyInstance; +import com.simibubi.create.content.contraptions.pulley.HosePulleyVisual; import com.simibubi.create.content.contraptions.pulley.PulleyBlockEntity; import com.simibubi.create.content.contraptions.pulley.PulleyRenderer; -import com.simibubi.create.content.contraptions.pulley.RopePulleyInstance; +import com.simibubi.create.content.contraptions.pulley.RopePulleyVisual; import com.simibubi.create.content.decoration.copycat.CopycatBlockEntity; import com.simibubi.create.content.decoration.placard.PlacardBlockEntity; import com.simibubi.create.content.decoration.placard.PlacardRenderer; @@ -43,13 +43,13 @@ import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorRenderer; import com.simibubi.create.content.decoration.steamWhistle.WhistleBlockEntity; import com.simibubi.create.content.decoration.steamWhistle.WhistleRenderer; import com.simibubi.create.content.equipment.armor.BacktankBlockEntity; -import com.simibubi.create.content.equipment.armor.BacktankInstance; import com.simibubi.create.content.equipment.armor.BacktankRenderer; +import com.simibubi.create.content.equipment.armor.BacktankVisual; import com.simibubi.create.content.equipment.bell.BellRenderer; import com.simibubi.create.content.equipment.bell.HauntedBellBlockEntity; import com.simibubi.create.content.equipment.bell.PeculiarBellBlockEntity; import com.simibubi.create.content.equipment.clipboard.ClipboardBlockEntity; -import com.simibubi.create.content.equipment.toolbox.ToolBoxInstance; +import com.simibubi.create.content.equipment.toolbox.ToolBoxVisual; import com.simibubi.create.content.equipment.toolbox.ToolboxBlockEntity; import com.simibubi.create.content.equipment.toolbox.ToolboxRenderer; import com.simibubi.create.content.fluids.drain.ItemDrainBlockEntity; @@ -61,99 +61,99 @@ import com.simibubi.create.content.fluids.pipes.SmartFluidPipeBlockEntity; import com.simibubi.create.content.fluids.pipes.StraightPipeBlockEntity; import com.simibubi.create.content.fluids.pipes.TransparentStraightPipeRenderer; import com.simibubi.create.content.fluids.pipes.valve.FluidValveBlockEntity; -import com.simibubi.create.content.fluids.pipes.valve.FluidValveInstance; import com.simibubi.create.content.fluids.pipes.valve.FluidValveRenderer; +import com.simibubi.create.content.fluids.pipes.valve.FluidValveVisual; import com.simibubi.create.content.fluids.pump.PumpBlockEntity; -import com.simibubi.create.content.fluids.pump.PumpCogInstance; +import com.simibubi.create.content.fluids.pump.PumpCogVisual; import com.simibubi.create.content.fluids.pump.PumpRenderer; import com.simibubi.create.content.fluids.spout.SpoutBlockEntity; import com.simibubi.create.content.fluids.spout.SpoutRenderer; import com.simibubi.create.content.fluids.tank.CreativeFluidTankBlockEntity; import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; import com.simibubi.create.content.fluids.tank.FluidTankRenderer; -import com.simibubi.create.content.kinetics.base.CutoutRotatingInstance; -import com.simibubi.create.content.kinetics.base.HalfShaftInstance; -import com.simibubi.create.content.kinetics.base.HorizontalHalfShaftInstance; +import com.simibubi.create.content.kinetics.base.CutoutRotatingVisual; +import com.simibubi.create.content.kinetics.base.HalfShaftVisual; +import com.simibubi.create.content.kinetics.base.HorizontalHalfShaftVisual; import com.simibubi.create.content.kinetics.base.KineticBlockEntity; import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; -import com.simibubi.create.content.kinetics.base.ShaftInstance; import com.simibubi.create.content.kinetics.base.ShaftRenderer; -import com.simibubi.create.content.kinetics.base.SingleRotatingInstance; +import com.simibubi.create.content.kinetics.base.ShaftVisual; +import com.simibubi.create.content.kinetics.base.SingleRotatingVisual; import com.simibubi.create.content.kinetics.belt.BeltBlockEntity; -import com.simibubi.create.content.kinetics.belt.BeltVisual; import com.simibubi.create.content.kinetics.belt.BeltRenderer; +import com.simibubi.create.content.kinetics.belt.BeltVisual; import com.simibubi.create.content.kinetics.chainDrive.ChainGearshiftBlockEntity; import com.simibubi.create.content.kinetics.clock.CuckooClockBlockEntity; import com.simibubi.create.content.kinetics.clock.CuckooClockRenderer; import com.simibubi.create.content.kinetics.crafter.MechanicalCrafterBlockEntity; import com.simibubi.create.content.kinetics.crafter.MechanicalCrafterRenderer; -import com.simibubi.create.content.kinetics.crafter.ShaftlessCogwheelInstance; +import com.simibubi.create.content.kinetics.crafter.ShaftlessCogwheelVisual; import com.simibubi.create.content.kinetics.crank.HandCrankBlockEntity; -import com.simibubi.create.content.kinetics.crank.HandCrankInstance; import com.simibubi.create.content.kinetics.crank.HandCrankRenderer; +import com.simibubi.create.content.kinetics.crank.HandCrankVisual; import com.simibubi.create.content.kinetics.crank.ValveHandleBlockEntity; import com.simibubi.create.content.kinetics.crusher.CrushingWheelBlockEntity; import com.simibubi.create.content.kinetics.crusher.CrushingWheelControllerBlockEntity; import com.simibubi.create.content.kinetics.deployer.DeployerBlockEntity; -import com.simibubi.create.content.kinetics.deployer.DeployerInstance; import com.simibubi.create.content.kinetics.deployer.DeployerRenderer; +import com.simibubi.create.content.kinetics.deployer.DeployerVisual; import com.simibubi.create.content.kinetics.drill.DrillBlockEntity; -import com.simibubi.create.content.kinetics.drill.DrillInstance; import com.simibubi.create.content.kinetics.drill.DrillRenderer; +import com.simibubi.create.content.kinetics.drill.DrillVisual; import com.simibubi.create.content.kinetics.fan.EncasedFanBlockEntity; import com.simibubi.create.content.kinetics.fan.EncasedFanRenderer; -import com.simibubi.create.content.kinetics.fan.FanInstance; +import com.simibubi.create.content.kinetics.fan.FanVisual; import com.simibubi.create.content.kinetics.fan.NozzleBlockEntity; import com.simibubi.create.content.kinetics.flywheel.FlywheelBlockEntity; -import com.simibubi.create.content.kinetics.flywheel.FlywheelInstance; import com.simibubi.create.content.kinetics.flywheel.FlywheelRenderer; +import com.simibubi.create.content.kinetics.flywheel.FlywheelVisual; import com.simibubi.create.content.kinetics.gantry.GantryShaftBlockEntity; -import com.simibubi.create.content.kinetics.gauge.GaugeInstance; import com.simibubi.create.content.kinetics.gauge.GaugeRenderer; +import com.simibubi.create.content.kinetics.gauge.GaugeVisual; import com.simibubi.create.content.kinetics.gauge.SpeedGaugeBlockEntity; import com.simibubi.create.content.kinetics.gauge.StressGaugeBlockEntity; import com.simibubi.create.content.kinetics.gearbox.GearboxBlockEntity; -import com.simibubi.create.content.kinetics.gearbox.GearboxInstance; import com.simibubi.create.content.kinetics.gearbox.GearboxRenderer; +import com.simibubi.create.content.kinetics.gearbox.GearboxVisual; import com.simibubi.create.content.kinetics.mechanicalArm.ArmBlockEntity; -import com.simibubi.create.content.kinetics.mechanicalArm.ArmInstance; import com.simibubi.create.content.kinetics.mechanicalArm.ArmRenderer; +import com.simibubi.create.content.kinetics.mechanicalArm.ArmVisual; import com.simibubi.create.content.kinetics.millstone.MillstoneBlockEntity; -import com.simibubi.create.content.kinetics.millstone.MillstoneCogInstance; +import com.simibubi.create.content.kinetics.millstone.MillstoneCogVisual; import com.simibubi.create.content.kinetics.millstone.MillstoneRenderer; import com.simibubi.create.content.kinetics.mixer.MechanicalMixerBlockEntity; import com.simibubi.create.content.kinetics.mixer.MechanicalMixerRenderer; -import com.simibubi.create.content.kinetics.mixer.MixerInstance; +import com.simibubi.create.content.kinetics.mixer.MixerVisual; import com.simibubi.create.content.kinetics.motor.CreativeMotorBlockEntity; import com.simibubi.create.content.kinetics.motor.CreativeMotorRenderer; import com.simibubi.create.content.kinetics.press.MechanicalPressBlockEntity; import com.simibubi.create.content.kinetics.press.MechanicalPressRenderer; -import com.simibubi.create.content.kinetics.press.PressInstance; +import com.simibubi.create.content.kinetics.press.PressVisual; import com.simibubi.create.content.kinetics.saw.SawBlockEntity; -import com.simibubi.create.content.kinetics.saw.SawInstance; import com.simibubi.create.content.kinetics.saw.SawRenderer; +import com.simibubi.create.content.kinetics.saw.SawVisual; import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockEntity; -import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockEntityInstance; import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockEntityRenderer; +import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockEntityVisual; import com.simibubi.create.content.kinetics.simpleRelays.SimpleKineticBlockEntity; -import com.simibubi.create.content.kinetics.simpleRelays.encased.EncasedCogInstance; import com.simibubi.create.content.kinetics.simpleRelays.encased.EncasedCogRenderer; +import com.simibubi.create.content.kinetics.simpleRelays.encased.EncasedCogVisual; import com.simibubi.create.content.kinetics.speedController.SpeedControllerBlockEntity; import com.simibubi.create.content.kinetics.speedController.SpeedControllerRenderer; import com.simibubi.create.content.kinetics.steamEngine.PoweredShaftBlockEntity; import com.simibubi.create.content.kinetics.steamEngine.SteamEngineBlockEntity; -import com.simibubi.create.content.kinetics.steamEngine.SteamEngineInstance; import com.simibubi.create.content.kinetics.steamEngine.SteamEngineRenderer; +import com.simibubi.create.content.kinetics.steamEngine.SteamEngineVisual; import com.simibubi.create.content.kinetics.transmission.ClutchBlockEntity; import com.simibubi.create.content.kinetics.transmission.GearshiftBlockEntity; -import com.simibubi.create.content.kinetics.transmission.SplitShaftInstance; import com.simibubi.create.content.kinetics.transmission.SplitShaftRenderer; +import com.simibubi.create.content.kinetics.transmission.SplitShaftVisual; import com.simibubi.create.content.kinetics.transmission.sequencer.SequencedGearshiftBlockEntity; import com.simibubi.create.content.kinetics.turntable.TurntableBlockEntity; import com.simibubi.create.content.kinetics.waterwheel.LargeWaterWheelBlockEntity; import com.simibubi.create.content.kinetics.waterwheel.WaterWheelBlockEntity; -import com.simibubi.create.content.kinetics.waterwheel.WaterWheelInstance; import com.simibubi.create.content.kinetics.waterwheel.WaterWheelRenderer; +import com.simibubi.create.content.kinetics.waterwheel.WaterWheelVisual; import com.simibubi.create.content.logistics.chute.ChuteBlockEntity; import com.simibubi.create.content.logistics.chute.ChuteRenderer; import com.simibubi.create.content.logistics.chute.SmartChuteBlockEntity; @@ -162,14 +162,14 @@ import com.simibubi.create.content.logistics.crate.CreativeCrateBlockEntity; import com.simibubi.create.content.logistics.depot.DepotBlockEntity; import com.simibubi.create.content.logistics.depot.DepotRenderer; import com.simibubi.create.content.logistics.depot.EjectorBlockEntity; -import com.simibubi.create.content.logistics.depot.EjectorInstance; import com.simibubi.create.content.logistics.depot.EjectorRenderer; +import com.simibubi.create.content.logistics.depot.EjectorVisual; import com.simibubi.create.content.logistics.funnel.FunnelBlockEntity; -import com.simibubi.create.content.logistics.funnel.FunnelInstance; import com.simibubi.create.content.logistics.funnel.FunnelRenderer; +import com.simibubi.create.content.logistics.funnel.FunnelVisual; import com.simibubi.create.content.logistics.tunnel.BeltTunnelBlockEntity; -import com.simibubi.create.content.logistics.tunnel.BeltTunnelInstance; import com.simibubi.create.content.logistics.tunnel.BeltTunnelRenderer; +import com.simibubi.create.content.logistics.tunnel.BeltTunnelVisual; import com.simibubi.create.content.logistics.tunnel.BrassTunnelBlockEntity; import com.simibubi.create.content.logistics.vault.ItemVaultBlockEntity; import com.simibubi.create.content.processing.basin.BasinBlockEntity; @@ -177,10 +177,10 @@ import com.simibubi.create.content.processing.basin.BasinRenderer; import com.simibubi.create.content.processing.burner.BlazeBurnerBlockEntity; import com.simibubi.create.content.processing.burner.BlazeBurnerRenderer; import com.simibubi.create.content.redstone.analogLever.AnalogLeverBlockEntity; -import com.simibubi.create.content.redstone.analogLever.AnalogLeverInstance; import com.simibubi.create.content.redstone.analogLever.AnalogLeverRenderer; -import com.simibubi.create.content.redstone.diodes.BrassDiodeInstance; +import com.simibubi.create.content.redstone.analogLever.AnalogLeverVisual; import com.simibubi.create.content.redstone.diodes.BrassDiodeRenderer; +import com.simibubi.create.content.redstone.diodes.BrassDiodeVisual; import com.simibubi.create.content.redstone.diodes.PulseExtenderBlockEntity; import com.simibubi.create.content.redstone.diodes.PulseRepeaterBlockEntity; import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlockEntity; @@ -195,8 +195,8 @@ import com.simibubi.create.content.redstone.nixieTube.NixieTubeRenderer; import com.simibubi.create.content.redstone.smartObserver.SmartObserverBlockEntity; import com.simibubi.create.content.redstone.thresholdSwitch.ThresholdSwitchBlockEntity; import com.simibubi.create.content.schematics.cannon.SchematicannonBlockEntity; -import com.simibubi.create.content.schematics.cannon.SchematicannonInstance; import com.simibubi.create.content.schematics.cannon.SchematicannonRenderer; +import com.simibubi.create.content.schematics.cannon.SchematicannonVisual; import com.simibubi.create.content.schematics.table.SchematicTableBlockEntity; import com.simibubi.create.content.trains.bogey.BogeyBlockEntityRenderer; import com.simibubi.create.content.trains.bogey.StandardBogeyBlockEntity; @@ -210,9 +210,9 @@ import com.simibubi.create.content.trains.station.StationBlockEntity; import com.simibubi.create.content.trains.station.StationRenderer; import com.simibubi.create.content.trains.track.FakeTrackBlockEntity; import com.simibubi.create.content.trains.track.TrackBlockEntity; -import com.simibubi.create.content.trains.track.TrackInstance; import com.simibubi.create.content.trains.track.TrackMaterial; import com.simibubi.create.content.trains.track.TrackRenderer; +import com.simibubi.create.content.trains.track.TrackVisual; import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer; import com.tterrag.registrate.util.entry.BlockEntityEntry; @@ -221,7 +221,7 @@ public class AllBlockEntityTypes { // Schematics public static final BlockEntityEntry SCHEMATICANNON = REGISTRATE .blockEntity("schematicannon", SchematicannonBlockEntity::new) - .instance(() -> SchematicannonInstance::new) + .instance(() -> SchematicannonVisual::new) .validBlocks(AllBlocks.SCHEMATICANNON) .renderer(() -> SchematicannonRenderer::new) .register(); @@ -234,28 +234,28 @@ public class AllBlockEntityTypes { // Kinetics public static final BlockEntityEntry BRACKETED_KINETIC = REGISTRATE .blockEntity("simple_kinetic", BracketedKineticBlockEntity::new) - .instance(() -> BracketedKineticBlockEntityInstance::new, false) + .instance(() -> BracketedKineticBlockEntityVisual::new, false) .validBlocks(AllBlocks.SHAFT, AllBlocks.COGWHEEL, AllBlocks.LARGE_COGWHEEL) .renderer(() -> BracketedKineticBlockEntityRenderer::new) .register(); public static final BlockEntityEntry MOTOR = REGISTRATE .blockEntity("motor", CreativeMotorBlockEntity::new) - .instance(() -> HalfShaftInstance::new, false) + .instance(() -> HalfShaftVisual::new, false) .validBlocks(AllBlocks.CREATIVE_MOTOR) .renderer(() -> CreativeMotorRenderer::new) .register(); public static final BlockEntityEntry GEARBOX = REGISTRATE .blockEntity("gearbox", GearboxBlockEntity::new) - .instance(() -> GearboxInstance::new, false) + .instance(() -> GearboxVisual::new, false) .validBlocks(AllBlocks.GEARBOX) .renderer(() -> GearboxRenderer::new) .register(); public static final BlockEntityEntry ENCASED_SHAFT = REGISTRATE .blockEntity("encased_shaft", KineticBlockEntity::new) - .instance(() -> ShaftInstance::new, false) + .instance(() -> ShaftVisual::new, false) .validBlocks(AllBlocks.ANDESITE_ENCASED_SHAFT, AllBlocks.BRASS_ENCASED_SHAFT, AllBlocks.ENCASED_CHAIN_DRIVE, AllBlocks.METAL_GIRDER_ENCASED_SHAFT) .renderer(() -> ShaftRenderer::new) @@ -263,28 +263,28 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry ENCASED_COGWHEEL = REGISTRATE .blockEntity("encased_cogwheel", SimpleKineticBlockEntity::new) - .instance(() -> EncasedCogInstance::small, false) + .instance(() -> EncasedCogVisual::small, false) .validBlocks(AllBlocks.ANDESITE_ENCASED_COGWHEEL, AllBlocks.BRASS_ENCASED_COGWHEEL) .renderer(() -> EncasedCogRenderer::small) .register(); public static final BlockEntityEntry ENCASED_LARGE_COGWHEEL = REGISTRATE .blockEntity("encased_large_cogwheel", SimpleKineticBlockEntity::new) - .instance(() -> EncasedCogInstance::large, false) + .instance(() -> EncasedCogVisual::large, false) .validBlocks(AllBlocks.ANDESITE_ENCASED_LARGE_COGWHEEL, AllBlocks.BRASS_ENCASED_LARGE_COGWHEEL) .renderer(() -> EncasedCogRenderer::large) .register(); public static final BlockEntityEntry ADJUSTABLE_CHAIN_GEARSHIFT = REGISTRATE .blockEntity("adjustable_chain_gearshift", ChainGearshiftBlockEntity::new) - .instance(() -> ShaftInstance::new, false) + .instance(() -> ShaftVisual::new, false) .validBlocks(AllBlocks.ADJUSTABLE_CHAIN_GEARSHIFT) .renderer(() -> ShaftRenderer::new) .register(); public static final BlockEntityEntry ENCASED_FAN = REGISTRATE .blockEntity("encased_fan", EncasedFanBlockEntity::new) - .instance(() -> FanInstance::new, false) + .instance(() -> FanVisual::new, false) .validBlocks(AllBlocks.ENCASED_FAN) .renderer(() -> EncasedFanRenderer::new) .register(); @@ -297,35 +297,35 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry CLUTCH = REGISTRATE .blockEntity("clutch", ClutchBlockEntity::new) - .instance(() -> SplitShaftInstance::new, false) + .instance(() -> SplitShaftVisual::new, false) .validBlocks(AllBlocks.CLUTCH) .renderer(() -> SplitShaftRenderer::new) .register(); public static final BlockEntityEntry GEARSHIFT = REGISTRATE .blockEntity("gearshift", GearshiftBlockEntity::new) - .instance(() -> SplitShaftInstance::new, false) + .instance(() -> SplitShaftVisual::new, false) .validBlocks(AllBlocks.GEARSHIFT) .renderer(() -> SplitShaftRenderer::new) .register(); public static final BlockEntityEntry TURNTABLE = REGISTRATE .blockEntity("turntable", TurntableBlockEntity::new) - .instance(() -> SingleRotatingInstance::new, false) + .instance(() -> SingleRotatingVisual::new, false) .validBlocks(AllBlocks.TURNTABLE) .renderer(() -> KineticBlockEntityRenderer::new) .register(); public static final BlockEntityEntry HAND_CRANK = REGISTRATE .blockEntity("hand_crank", HandCrankBlockEntity::new) - .instance(() -> HandCrankInstance::new) + .instance(() -> HandCrankVisual::new) .validBlocks(AllBlocks.HAND_CRANK) .renderer(() -> HandCrankRenderer::new) .register(); public static final BlockEntityEntry VALVE_HANDLE = REGISTRATE .blockEntity("valve_handle", ValveHandleBlockEntity::new) - .instance(() -> HandCrankInstance::new) + .instance(() -> HandCrankVisual::new) .validBlocks(AllBlocks.COPPER_VALVE_HANDLE) .validBlocks(AllBlocks.DYED_VALVE_HANDLES.toArray()) .renderer(() -> HandCrankRenderer::new) @@ -333,28 +333,28 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry CUCKOO_CLOCK = REGISTRATE .blockEntity("cuckoo_clock", CuckooClockBlockEntity::new) - .instance(() -> HorizontalHalfShaftInstance::new) + .instance(() -> HorizontalHalfShaftVisual::new) .validBlocks(AllBlocks.CUCKOO_CLOCK, AllBlocks.MYSTERIOUS_CUCKOO_CLOCK) .renderer(() -> CuckooClockRenderer::new) .register(); public static final BlockEntityEntry GANTRY_SHAFT = REGISTRATE .blockEntity("gantry_shaft", GantryShaftBlockEntity::new) - .instance(() -> SingleRotatingInstance::new, false) + .instance(() -> SingleRotatingVisual::new, false) .validBlocks(AllBlocks.GANTRY_SHAFT) .renderer(() -> KineticBlockEntityRenderer::new) .register(); public static final BlockEntityEntry GANTRY_PINION = REGISTRATE .blockEntity("gantry_pinion", GantryCarriageBlockEntity::new) - .instance(() -> GantryCarriageInstance::new) + .instance(() -> GantryCarriageVisual::new) .validBlocks(AllBlocks.GANTRY_CARRIAGE) .renderer(() -> GantryCarriageRenderer::new) .register(); public static final BlockEntityEntry MECHANICAL_PUMP = REGISTRATE .blockEntity("mechanical_pump", PumpBlockEntity::new) - .instance(() -> PumpCogInstance::new) + .instance(() -> PumpCogVisual::new) .validBlocks(AllBlocks.MECHANICAL_PUMP) .renderer(() -> PumpRenderer::new) .register(); @@ -383,7 +383,7 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry FLUID_VALVE = REGISTRATE .blockEntity("fluid_valve", FluidValveBlockEntity::new) - .instance(() -> FluidValveInstance::new) + .instance(() -> FluidValveVisual::new) .validBlocks(AllBlocks.FLUID_VALVE) .renderer(() -> FluidValveRenderer::new) .register(); @@ -402,7 +402,7 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry HOSE_PULLEY = REGISTRATE .blockEntity("hose_pulley", HosePulleyBlockEntity::new) - .instance(() -> HosePulleyInstance::new) + .instance(() -> HosePulleyVisual::new) .validBlocks(AllBlocks.HOSE_PULLEY) .renderer(() -> HosePulleyRenderer::new) .register(); @@ -440,21 +440,21 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry ANDESITE_TUNNEL = REGISTRATE .blockEntity("andesite_tunnel", BeltTunnelBlockEntity::new) - .instance(() -> BeltTunnelInstance::new) + .instance(() -> BeltTunnelVisual::new) .validBlocks(AllBlocks.ANDESITE_TUNNEL) .renderer(() -> BeltTunnelRenderer::new) .register(); public static final BlockEntityEntry BRASS_TUNNEL = REGISTRATE .blockEntity("brass_tunnel", BrassTunnelBlockEntity::new) - .instance(() -> BeltTunnelInstance::new) + .instance(() -> BeltTunnelVisual::new) .validBlocks(AllBlocks.BRASS_TUNNEL) .renderer(() -> BeltTunnelRenderer::new) .register(); public static final BlockEntityEntry MECHANICAL_ARM = REGISTRATE .blockEntity("mechanical_arm", ArmBlockEntity::new) - .instance(() -> ArmInstance::new) + .instance(() -> ArmVisual::new) .validBlocks(AllBlocks.MECHANICAL_ARM) .renderer(() -> ArmRenderer::new) .register(); @@ -466,35 +466,35 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry MECHANICAL_PISTON = REGISTRATE .blockEntity("mechanical_piston", MechanicalPistonBlockEntity::new) - .instance(() -> ShaftInstance::new, false) + .instance(() -> ShaftVisual::new, false) .validBlocks(AllBlocks.MECHANICAL_PISTON, AllBlocks.STICKY_MECHANICAL_PISTON) .renderer(() -> MechanicalPistonRenderer::new) .register(); public static final BlockEntityEntry WINDMILL_BEARING = REGISTRATE .blockEntity("windmill_bearing", WindmillBearingBlockEntity::new) - .instance(() -> BearingInstance::new) + .instance(() -> BearingVisual::new) .validBlocks(AllBlocks.WINDMILL_BEARING) .renderer(() -> BearingRenderer::new) .register(); public static final BlockEntityEntry MECHANICAL_BEARING = REGISTRATE .blockEntity("mechanical_bearing", MechanicalBearingBlockEntity::new) - .instance(() -> BearingInstance::new) + .instance(() -> BearingVisual::new) .validBlocks(AllBlocks.MECHANICAL_BEARING) .renderer(() -> BearingRenderer::new) .register(); public static final BlockEntityEntry CLOCKWORK_BEARING = REGISTRATE .blockEntity("clockwork_bearing", ClockworkBearingBlockEntity::new) - .instance(() -> BearingInstance::new) + .instance(() -> BearingVisual::new) .validBlocks(AllBlocks.CLOCKWORK_BEARING) .renderer(() -> BearingRenderer::new) .register(); public static final BlockEntityEntry ROPE_PULLEY = REGISTRATE .blockEntity("rope_pulley", PulleyBlockEntity::new) - .instance(() -> RopePulleyInstance::new, false) + .instance(() -> RopePulleyVisual::new, false) .validBlocks(AllBlocks.ROPE_PULLEY) .renderer(() -> PulleyRenderer::new) .register(); @@ -519,7 +519,7 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry STICKER = REGISTRATE .blockEntity("sticker", StickerBlockEntity::new) - .instance(() -> StickerInstance::new, false) + .instance(() -> StickerVisual::new, false) .validBlocks(AllBlocks.STICKER) .renderer(() -> StickerRenderer::new) .register(); @@ -532,14 +532,14 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry DRILL = REGISTRATE .blockEntity("drill", DrillBlockEntity::new) - .instance(() -> DrillInstance::new, false) + .instance(() -> DrillVisual::new, false) .validBlocks(AllBlocks.MECHANICAL_DRILL) .renderer(() -> DrillRenderer::new) .register(); public static final BlockEntityEntry SAW = REGISTRATE .blockEntity("saw", SawBlockEntity::new) - .instance(() -> SawInstance::new) + .instance(() -> SawVisual::new) .validBlocks(AllBlocks.MECHANICAL_SAW) .renderer(() -> SawRenderer::new) .register(); @@ -559,7 +559,7 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry PORTABLE_STORAGE_INTERFACE = REGISTRATE .blockEntity("portable_storage_interface", PortableItemInterfaceBlockEntity::new) - .instance(() -> PSIInstance::new) + .instance(() -> PSIVisual::new) .validBlocks(AllBlocks.PORTABLE_STORAGE_INTERFACE) .renderer(() -> PortableStorageInterfaceRenderer::new) .register(); @@ -567,14 +567,14 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry PORTABLE_FLUID_INTERFACE = REGISTRATE .blockEntity("portable_fluid_interface", PortableFluidInterfaceBlockEntity::new) - .instance(() -> PSIInstance::new) + .instance(() -> PSIVisual::new) .validBlocks(AllBlocks.PORTABLE_FLUID_INTERFACE) .renderer(() -> PortableStorageInterfaceRenderer::new) .register(); public static final BlockEntityEntry STEAM_ENGINE = REGISTRATE .blockEntity("steam_engine", SteamEngineBlockEntity::new) - .instance(() -> SteamEngineInstance::new, false) + .instance(() -> SteamEngineVisual::new, false) .validBlocks(AllBlocks.STEAM_ENGINE) .renderer(() -> SteamEngineRenderer::new) .register(); @@ -587,28 +587,28 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry POWERED_SHAFT = REGISTRATE .blockEntity("powered_shaft", PoweredShaftBlockEntity::new) - .instance(() -> SingleRotatingInstance::new, false) + .instance(() -> SingleRotatingVisual::new, false) .validBlocks(AllBlocks.POWERED_SHAFT) .renderer(() -> KineticBlockEntityRenderer::new) .register(); public static final BlockEntityEntry FLYWHEEL = REGISTRATE .blockEntity("flywheel", FlywheelBlockEntity::new) - .instance(() -> FlywheelInstance::new, false) + .instance(() -> FlywheelVisual::new, false) .validBlocks(AllBlocks.FLYWHEEL) .renderer(() -> FlywheelRenderer::new) .register(); public static final BlockEntityEntry MILLSTONE = REGISTRATE .blockEntity("millstone", MillstoneBlockEntity::new) - .instance(() -> MillstoneCogInstance::new, false) + .instance(() -> MillstoneCogVisual::new, false) .validBlocks(AllBlocks.MILLSTONE) .renderer(() -> MillstoneRenderer::new) .register(); public static final BlockEntityEntry CRUSHING_WHEEL = REGISTRATE .blockEntity("crushing_wheel", CrushingWheelBlockEntity::new) - .instance(() -> CutoutRotatingInstance::new, false) + .instance(() -> CutoutRotatingVisual::new, false) .validBlocks(AllBlocks.CRUSHING_WHEEL) .renderer(() -> KineticBlockEntityRenderer::new) .register(); @@ -622,35 +622,35 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry WATER_WHEEL = REGISTRATE .blockEntity("water_wheel", WaterWheelBlockEntity::new) - .instance(() -> WaterWheelInstance::standard, false) + .instance(() -> WaterWheelVisual::standard, false) .validBlocks(AllBlocks.WATER_WHEEL) .renderer(() -> WaterWheelRenderer::standard) .register(); public static final BlockEntityEntry LARGE_WATER_WHEEL = REGISTRATE .blockEntity("large_water_wheel", LargeWaterWheelBlockEntity::new) - .instance(() -> WaterWheelInstance::large, false) + .instance(() -> WaterWheelVisual::large, false) .validBlocks(AllBlocks.LARGE_WATER_WHEEL) .renderer(() -> WaterWheelRenderer::large) .register(); public static final BlockEntityEntry MECHANICAL_PRESS = REGISTRATE .blockEntity("mechanical_press", MechanicalPressBlockEntity::new) - .instance(() -> PressInstance::new) + .instance(() -> PressVisual::new) .validBlocks(AllBlocks.MECHANICAL_PRESS) .renderer(() -> MechanicalPressRenderer::new) .register(); public static final BlockEntityEntry MECHANICAL_MIXER = REGISTRATE .blockEntity("mechanical_mixer", MechanicalMixerBlockEntity::new) - .instance(() -> MixerInstance::new) + .instance(() -> MixerVisual::new) .validBlocks(AllBlocks.MECHANICAL_MIXER) .renderer(() -> MechanicalMixerRenderer::new) .register(); public static final BlockEntityEntry DEPLOYER = REGISTRATE .blockEntity("deployer", DeployerBlockEntity::new) - .instance(() -> DeployerInstance::new) + .instance(() -> DeployerVisual::new) .validBlocks(AllBlocks.DEPLOYER) .renderer(() -> DeployerRenderer::new) .register(); @@ -669,42 +669,42 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry MECHANICAL_CRAFTER = REGISTRATE .blockEntity("mechanical_crafter", MechanicalCrafterBlockEntity::new) - .instance(() -> ShaftlessCogwheelInstance::new) + .instance(() -> ShaftlessCogwheelVisual::new) .validBlocks(AllBlocks.MECHANICAL_CRAFTER) .renderer(() -> MechanicalCrafterRenderer::new) .register(); public static final BlockEntityEntry SEQUENCED_GEARSHIFT = REGISTRATE .blockEntity("sequenced_gearshift", SequencedGearshiftBlockEntity::new) - .instance(() -> SplitShaftInstance::new, false) + .instance(() -> SplitShaftVisual::new, false) .validBlocks(AllBlocks.SEQUENCED_GEARSHIFT) .renderer(() -> SplitShaftRenderer::new) .register(); public static final BlockEntityEntry ROTATION_SPEED_CONTROLLER = REGISTRATE .blockEntity("rotation_speed_controller", SpeedControllerBlockEntity::new) - .instance(() -> ShaftInstance::new) + .instance(() -> ShaftVisual::new) .validBlocks(AllBlocks.ROTATION_SPEED_CONTROLLER) .renderer(() -> SpeedControllerRenderer::new) .register(); public static final BlockEntityEntry SPEEDOMETER = REGISTRATE .blockEntity("speedometer", SpeedGaugeBlockEntity::new) - .instance(() -> GaugeInstance.Speed::new) + .instance(() -> GaugeVisual.Speed::new) .validBlocks(AllBlocks.SPEEDOMETER) .renderer(() -> GaugeRenderer::speed) .register(); public static final BlockEntityEntry STRESSOMETER = REGISTRATE .blockEntity("stressometer", StressGaugeBlockEntity::new) - .instance(() -> GaugeInstance.Stress::new) + .instance(() -> GaugeVisual.Stress::new) .validBlocks(AllBlocks.STRESSOMETER) .renderer(() -> GaugeRenderer::stress) .register(); public static final BlockEntityEntry ANALOG_LEVER = REGISTRATE .blockEntity("analog_lever", AnalogLeverBlockEntity::new) - .instance(() -> AnalogLeverInstance::new, false) + .instance(() -> AnalogLeverVisual::new, false) .validBlocks(AllBlocks.ANALOG_LEVER) .renderer(() -> AnalogLeverRenderer::new) .register(); @@ -763,14 +763,14 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry WEIGHTED_EJECTOR = REGISTRATE .blockEntity("weighted_ejector", EjectorBlockEntity::new) - .instance(() -> EjectorInstance::new) + .instance(() -> EjectorVisual::new) .validBlocks(AllBlocks.WEIGHTED_EJECTOR) .renderer(() -> EjectorRenderer::new) .register(); public static final BlockEntityEntry FUNNEL = REGISTRATE .blockEntity("funnel", FunnelBlockEntity::new) - .instance(() -> FunnelInstance::new) + .instance(() -> FunnelVisual::new) .validBlocks(AllBlocks.BRASS_FUNNEL, AllBlocks.BRASS_BELT_FUNNEL, AllBlocks.ANDESITE_FUNNEL, AllBlocks.ANDESITE_BELT_FUNNEL) .renderer(() -> FunnelRenderer::new) @@ -784,14 +784,14 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry PULSE_EXTENDER = REGISTRATE .blockEntity("pulse_extender", PulseExtenderBlockEntity::new) - .instance(() -> BrassDiodeInstance::new, false) + .instance(() -> BrassDiodeVisual::new, false) .validBlocks(AllBlocks.PULSE_EXTENDER) .renderer(() -> BrassDiodeRenderer::new) .register(); public static final BlockEntityEntry PULSE_REPEATER = REGISTRATE .blockEntity("pulse_repeater", PulseRepeaterBlockEntity::new) - .instance(() -> BrassDiodeInstance::new, false) + .instance(() -> BrassDiodeVisual::new, false) .validBlocks(AllBlocks.PULSE_REPEATER) .renderer(() -> BrassDiodeRenderer::new) .register(); @@ -805,7 +805,7 @@ public class AllBlockEntityTypes { // Curiosities public static final BlockEntityEntry BACKTANK = REGISTRATE .blockEntity("backtank", BacktankBlockEntity::new) - .instance(() -> BacktankInstance::new) + .instance(() -> BacktankVisual::new) .validBlocks(AllBlocks.COPPER_BACKTANK, AllBlocks.NETHERITE_BACKTANK) .renderer(() -> BacktankRenderer::new) .register(); @@ -824,14 +824,14 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry TOOLBOX = REGISTRATE .blockEntity("toolbox", ToolboxBlockEntity::new) - .instance(() -> ToolBoxInstance::new, false) + .instance(() -> ToolBoxVisual::new, false) .validBlocks(AllBlocks.TOOLBOXES.toArray()) .renderer(() -> ToolboxRenderer::new) .register(); public static final BlockEntityEntry TRACK = REGISTRATE .blockEntity("track", TrackBlockEntity::new) - .instance(() -> TrackInstance::new) + .instance(() -> TrackVisual::new) .validBlocksDeferred(TrackMaterial::allBlocks) .renderer(() -> TrackRenderer::new) .register(); @@ -867,7 +867,7 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry FLAP_DISPLAY = REGISTRATE .blockEntity("flap_display", FlapDisplayBlockEntity::new) - .instance(() -> ShaftlessCogwheelInstance::new) + .instance(() -> ShaftlessCogwheelVisual::new) .renderer(() -> FlapDisplayRenderer::new) .validBlocks(AllBlocks.DISPLAY_BOARD) .register(); diff --git a/src/main/java/com/simibubi/create/AllEntityTypes.java b/src/main/java/com/simibubi/create/AllEntityTypes.java index 5d6b70220..e8967cbef 100644 --- a/src/main/java/com/simibubi/create/AllEntityTypes.java +++ b/src/main/java/com/simibubi/create/AllEntityTypes.java @@ -15,7 +15,7 @@ import com.simibubi.create.content.equipment.potatoCannon.PotatoProjectileEntity import com.simibubi.create.content.equipment.potatoCannon.PotatoProjectileRenderer; import com.simibubi.create.content.trains.entity.CarriageContraptionEntity; import com.simibubi.create.content.trains.entity.CarriageContraptionEntityRenderer; -import com.simibubi.create.content.trains.entity.CarriageContraptionInstance; +import com.simibubi.create.content.trains.entity.CarriageContraptionVisual; import com.simibubi.create.foundation.data.CreateEntityBuilder; import com.simibubi.create.foundation.utility.Lang; import com.tterrag.registrate.util.entry.EntityEntry; @@ -41,7 +41,7 @@ public class AllEntityTypes { GantryContraptionEntity::new, () -> ContraptionEntityRenderer::new, 10, 40, false).register(); public static final EntityEntry CARRIAGE_CONTRAPTION = contraption("carriage_contraption", CarriageContraptionEntity::new, - () -> CarriageContraptionEntityRenderer::new, 15, 3, true).instance(() -> CarriageContraptionInstance::new) + () -> CarriageContraptionEntityRenderer::new, 15, 3, true).instance(() -> CarriageContraptionVisual::new) .register(); public static final EntityEntry SUPER_GLUE = diff --git a/src/main/java/com/simibubi/create/content/contraptions/actors/flwdata/ActorInstance.java b/src/main/java/com/simibubi/create/content/contraptions/actors/ActorInstance.java similarity index 97% rename from src/main/java/com/simibubi/create/content/contraptions/actors/flwdata/ActorInstance.java rename to src/main/java/com/simibubi/create/content/contraptions/actors/ActorInstance.java index 2f13b9502..7d375cfc9 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/actors/flwdata/ActorInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/actors/ActorInstance.java @@ -1,4 +1,4 @@ -package com.simibubi.create.content.contraptions.actors.flwdata; +package com.simibubi.create.content.contraptions.actors; import org.joml.Quaternionf; import org.joml.Vector3f; diff --git a/src/main/java/com/simibubi/create/content/contraptions/actors/flwdata/package-info.java b/src/main/java/com/simibubi/create/content/contraptions/actors/flwdata/package-info.java deleted file mode 100644 index 0498b1729..000000000 --- a/src/main/java/com/simibubi/create/content/contraptions/actors/flwdata/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package com.simibubi.create.content.contraptions.actors.flwdata; - -import javax.annotation.ParametersAreNonnullByDefault; - -import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterActorInstance.java b/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterActorVisual.java similarity index 87% rename from src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterActorInstance.java rename to src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterActorVisual.java index 788e45f27..5d1f447c3 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterActorInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterActorVisual.java @@ -8,7 +8,7 @@ import com.jozufozu.flywheel.lib.model.Models; import com.jozufozu.flywheel.lib.model.baked.PartialModel; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.contraptions.behaviour.MovementContext; -import com.simibubi.create.content.contraptions.render.ActorInstance; +import com.simibubi.create.content.contraptions.render.ActorVisual; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.VecHelper; @@ -18,9 +18,8 @@ import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.phys.Vec3; -import net.minecraftforge.client.model.data.ModelData; -public class HarvesterActorInstance extends ActorInstance { +public class HarvesterActorVisual extends ActorVisual { static float originOffset = 1 / 16f; static Vec3 rotOffset = new Vec3(0.5f, -2 * originOffset + 0.5f, originOffset + 0.5f); @@ -32,10 +31,10 @@ public class HarvesterActorInstance extends ActorInstance { private double rotation; private double previousRotation; - public HarvesterActorInstance(VisualizationContext materialManager, VirtualRenderWorld simulationWorld, MovementContext context) { - super(materialManager, simulationWorld, context); + public HarvesterActorVisual(VisualizationContext visualizationContext, VirtualRenderWorld simulationWorld, MovementContext movementContext) { + super(visualizationContext, simulationWorld, movementContext); - BlockState state = context.state; + BlockState state = movementContext.state; facing = state.getValue(BlockStateProperties.HORIZONTAL_FACING); diff --git a/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterMovementBehaviour.java index 387d4b03d..bfb95fe82 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/actors/harvester/HarvesterMovementBehaviour.java @@ -7,7 +7,7 @@ import org.apache.commons.lang3.mutable.MutableBoolean; import com.jozufozu.flywheel.api.visualization.VisualizationContext; import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour; import com.simibubi.create.content.contraptions.behaviour.MovementContext; -import com.simibubi.create.content.contraptions.render.ActorInstance; +import com.simibubi.create.content.contraptions.render.ActorVisual; import com.simibubi.create.content.contraptions.render.ContraptionMatrices; import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher; import com.simibubi.create.foundation.item.ItemHelper; @@ -52,9 +52,9 @@ public class HarvesterMovementBehaviour implements MovementBehaviour { @Nullable @Override - public ActorInstance createInstance(VisualizationContext materialManager, VirtualRenderWorld simulationWorld, - MovementContext context) { - return new HarvesterActorInstance(materialManager, simulationWorld, context); + public ActorVisual createInstance(VisualizationContext visualizationContext, VirtualRenderWorld simulationWorld, + MovementContext movementContext) { + return new HarvesterActorVisual(visualizationContext, simulationWorld, movementContext); } @Override diff --git a/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PSIActorInstance.java b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PSIActorVisual.java similarity index 67% rename from src/main/java/com/simibubi/create/content/contraptions/actors/psi/PSIActorInstance.java rename to src/main/java/com/simibubi/create/content/contraptions/actors/psi/PSIActorVisual.java index f698c4f15..04f905b83 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PSIActorInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PSIActorVisual.java @@ -2,19 +2,19 @@ package com.simibubi.create.content.contraptions.actors.psi; import com.jozufozu.flywheel.api.visualization.VisualizationContext; import com.simibubi.create.content.contraptions.behaviour.MovementContext; -import com.simibubi.create.content.contraptions.render.ActorInstance; +import com.simibubi.create.content.contraptions.render.ActorVisual; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.animation.LerpedFloat; import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld; -public class PSIActorInstance extends ActorInstance { +public class PSIActorVisual extends ActorVisual { private final PIInstance instance; - public PSIActorInstance(VisualizationContext materialManager, VirtualRenderWorld world, MovementContext context) { - super(materialManager, world, context); + public PSIActorVisual(VisualizationContext context, VirtualRenderWorld world, MovementContext movementContext) { + super(context, world, movementContext); - instance = new PIInstance(materialManager.instancerProvider(), context.state, context.localPos); + instance = new PIInstance(context.instancerProvider(), movementContext.state, movementContext.localPos); instance.init(false); instance.middle.setBlockLight(localBlockLight()); diff --git a/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PSIInstance.java b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PSIVisual.java similarity index 85% rename from src/main/java/com/simibubi/create/content/contraptions/actors/psi/PSIInstance.java rename to src/main/java/com/simibubi/create/content/contraptions/actors/psi/PSIVisual.java index 2953b5f1c..0d23f1f3e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PSIInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PSIVisual.java @@ -11,11 +11,11 @@ import com.jozufozu.flywheel.api.visualization.VisualizationContext; import com.jozufozu.flywheel.lib.visual.AbstractBlockEntityVisual; import com.simibubi.create.foundation.utility.AnimationTickHolder; -public class PSIInstance extends AbstractBlockEntityVisual implements DynamicVisual, TickableVisual { +public class PSIVisual extends AbstractBlockEntityVisual implements DynamicVisual, TickableVisual { private final PIInstance instance; - public PSIInstance(VisualizationContext visualizationContext, PortableStorageInterfaceBlockEntity blockEntity) { + public PSIVisual(VisualizationContext visualizationContext, PortableStorageInterfaceBlockEntity blockEntity) { super(visualizationContext, blockEntity); instance = new PIInstance(visualizationContext.instancerProvider(), blockState, getVisualPosition()); diff --git a/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableStorageInterfaceMovement.java b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableStorageInterfaceMovement.java index db45d8b55..1f9310c4d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableStorageInterfaceMovement.java +++ b/src/main/java/com/simibubi/create/content/contraptions/actors/psi/PortableStorageInterfaceMovement.java @@ -7,7 +7,7 @@ import org.jetbrains.annotations.Nullable; import com.jozufozu.flywheel.api.visualization.VisualizationContext; import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour; import com.simibubi.create.content.contraptions.behaviour.MovementContext; -import com.simibubi.create.content.contraptions.render.ActorInstance; +import com.simibubi.create.content.contraptions.render.ActorVisual; import com.simibubi.create.content.contraptions.render.ContraptionMatrices; import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher; import com.simibubi.create.content.trains.entity.CarriageContraption; @@ -46,9 +46,9 @@ public class PortableStorageInterfaceMovement implements MovementBehaviour { @Nullable @Override - public ActorInstance createInstance(VisualizationContext materialManager, VirtualRenderWorld simulationWorld, - MovementContext context) { - return new PSIActorInstance(materialManager, simulationWorld, context); + public ActorVisual createInstance(VisualizationContext visualizationContext, VirtualRenderWorld simulationWorld, + MovementContext movementContext) { + return new PSIActorVisual(visualizationContext, simulationWorld, movementContext); } @Override diff --git a/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerActorInstance.java b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerActorVisual.java similarity index 83% rename from src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerActorInstance.java rename to src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerActorVisual.java index 8c5d26b5e..08bfba3a4 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerActorInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerActorVisual.java @@ -7,20 +7,19 @@ import com.jozufozu.flywheel.lib.instance.TransformedInstance; import com.jozufozu.flywheel.lib.model.Models; import com.jozufozu.flywheel.lib.model.baked.PartialModel; import com.simibubi.create.AllPartialModels; -import com.simibubi.create.content.contraptions.actors.harvester.HarvesterActorInstance; +import com.simibubi.create.content.contraptions.actors.harvester.HarvesterActorVisual; import com.simibubi.create.content.contraptions.behaviour.MovementContext; import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld; import net.minecraft.world.phys.Vec3; -import net.minecraftforge.client.model.data.ModelData; -public class RollerActorInstance extends HarvesterActorInstance { +public class RollerActorVisual extends HarvesterActorVisual { TransformedInstance frame; - public RollerActorInstance(VisualizationContext materialManager, VirtualRenderWorld simulationWorld, - MovementContext context) { - super(materialManager, simulationWorld, context); + public RollerActorVisual(VisualizationContext visualizationContext, VirtualRenderWorld simulationWorld, + MovementContext movementContext) { + super(visualizationContext, simulationWorld, movementContext); frame = instancerProvider.instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.ROLLER_FRAME), RenderStage.AFTER_BLOCK_ENTITIES) .createInstance(); diff --git a/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java index d22578fa0..2c30041de 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java @@ -14,7 +14,7 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.content.contraptions.actors.roller.RollerBlockEntity.RollingMode; import com.simibubi.create.content.contraptions.behaviour.MovementContext; import com.simibubi.create.content.contraptions.pulley.PulleyContraption; -import com.simibubi.create.content.contraptions.render.ActorInstance; +import com.simibubi.create.content.contraptions.render.ActorVisual; import com.simibubi.create.content.contraptions.render.ContraptionMatrices; import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher; import com.simibubi.create.content.kinetics.base.BlockBreakingMovementBehaviour; @@ -76,9 +76,9 @@ public class RollerMovementBehaviour extends BlockBreakingMovementBehaviour { @Nullable @Override - public ActorInstance createInstance(VisualizationContext materialManager, VirtualRenderWorld simulationWorld, - MovementContext context) { - return new RollerActorInstance(materialManager, simulationWorld, context); + public ActorVisual createInstance(VisualizationContext visualizationContext, VirtualRenderWorld simulationWorld, + MovementContext movementContext) { + return new RollerActorVisual(visualizationContext, simulationWorld, movementContext); } @Override diff --git a/src/main/java/com/simibubi/create/content/contraptions/bearing/BearingInstance.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/BearingVisual.java similarity index 89% rename from src/main/java/com/simibubi/create/content/contraptions/bearing/BearingInstance.java rename to src/main/java/com/simibubi/create/content/contraptions/bearing/BearingVisual.java index 1696536be..48fe53dc0 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/bearing/BearingInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/BearingVisual.java @@ -15,7 +15,7 @@ import com.jozufozu.flywheel.lib.model.Models; import com.jozufozu.flywheel.lib.model.baked.PartialModel; import com.mojang.math.Axis; import com.simibubi.create.AllPartialModels; -import com.simibubi.create.content.kinetics.base.BackHalfShaftInstance; +import com.simibubi.create.content.kinetics.base.BackHalfShaftVisual; import com.simibubi.create.content.kinetics.base.KineticBlockEntity; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; @@ -23,14 +23,14 @@ import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -public class BearingInstance extends BackHalfShaftInstance implements DynamicVisual { +public class BearingVisual extends BackHalfShaftVisual implements DynamicVisual { final OrientedInstance topInstance; final Axis rotationAxis; final Quaternionf blockOrientation; - public BearingInstance(VisualizationContext materialManager, B blockEntity) { - super(materialManager, blockEntity); + public BearingVisual(VisualizationContext context, B blockEntity) { + super(context, blockEntity); Direction facing = blockState.getValue(BlockStateProperties.FACING); rotationAxis = Axis.of(Direction.get(Direction.AxisDirection.POSITIVE, axis).step()); diff --git a/src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedBearingMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedBearingMovementBehaviour.java index 4920a7ee3..2d7b970bc 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedBearingMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedBearingMovementBehaviour.java @@ -13,7 +13,7 @@ import com.simibubi.create.content.contraptions.ControlledContraptionEntity; import com.simibubi.create.content.contraptions.OrientedContraptionEntity; import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour; import com.simibubi.create.content.contraptions.behaviour.MovementContext; -import com.simibubi.create.content.contraptions.render.ActorInstance; +import com.simibubi.create.content.contraptions.render.ActorVisual; import com.simibubi.create.content.contraptions.render.ContraptionMatrices; import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher; import com.simibubi.create.foundation.render.CachedBufferer; @@ -49,7 +49,7 @@ public class StabilizedBearingMovementBehaviour implements MovementBehaviour { float renderPartialTicks = AnimationTickHolder.getPartialTicks(); // rotate to match blockstate - Quaternionf orientation = BearingInstance.getBlockStateOrientation(facing); + Quaternionf orientation = BearingVisual.getBlockStateOrientation(facing); // rotate against parent float angle = getCounterRotationAngle(context, facing, renderPartialTicks) * facing.getAxisDirection() @@ -78,9 +78,9 @@ public class StabilizedBearingMovementBehaviour implements MovementBehaviour { @Nullable @Override - public ActorInstance createInstance(VisualizationContext materialManager, VirtualRenderWorld simulationWorld, - MovementContext context) { - return new StabilizedBearingInstance(materialManager, simulationWorld, context); + public ActorVisual createInstance(VisualizationContext visualizationContext, VirtualRenderWorld simulationWorld, + MovementContext movementContext) { + return new StabilizedBearingVisual(visualizationContext, simulationWorld, movementContext); } static float getCounterRotationAngle(MovementContext context, Direction facing, float renderPartialTicks) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedBearingInstance.java b/src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedBearingVisual.java similarity index 80% rename from src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedBearingInstance.java rename to src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedBearingVisual.java index d59c50c12..81a0e6f7c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedBearingInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/bearing/StabilizedBearingVisual.java @@ -10,7 +10,7 @@ import com.jozufozu.flywheel.lib.model.Models; import com.mojang.math.Axis; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.contraptions.behaviour.MovementContext; -import com.simibubi.create.content.contraptions.render.ActorInstance; +import com.simibubi.create.content.contraptions.render.ActorVisual; import com.simibubi.create.content.kinetics.base.RotatingInstance; import com.simibubi.create.foundation.render.AllInstanceTypes; import com.simibubi.create.foundation.utility.AnimationTickHolder; @@ -20,7 +20,7 @@ import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -public class StabilizedBearingInstance extends ActorInstance { +public class StabilizedBearingVisual extends ActorVisual { final OrientedInstance topInstance; final RotatingInstance shaft; @@ -29,21 +29,21 @@ public class StabilizedBearingInstance extends ActorInstance { final Axis rotationAxis; final Quaternionf blockOrientation; - public StabilizedBearingInstance(VisualizationContext materialManager, VirtualRenderWorld simulationWorld, MovementContext context) { - super(materialManager, simulationWorld, context); + public StabilizedBearingVisual(VisualizationContext visualizationContext, VirtualRenderWorld simulationWorld, MovementContext movementContext) { + super(visualizationContext, simulationWorld, movementContext); - BlockState blockState = context.state; + BlockState blockState = movementContext.state; facing = blockState.getValue(BlockStateProperties.FACING); rotationAxis = Axis.of(Direction.get(Direction.AxisDirection.POSITIVE, facing.getAxis()).step()); - blockOrientation = BearingInstance.getBlockStateOrientation(facing); + blockOrientation = BearingVisual.getBlockStateOrientation(facing); topInstance = instancerProvider.instancer(InstanceTypes.ORIENTED, Models.partial(AllPartialModels.BEARING_TOP), RenderStage.AFTER_BLOCK_ENTITIES) .createInstance(); int blockLight = localBlockLight(); - topInstance.setPosition(context.localPos) + topInstance.setPosition(movementContext.localPos) .setRotation(blockOrientation) .setBlockLight(blockLight); @@ -51,7 +51,7 @@ public class StabilizedBearingInstance extends ActorInstance { .createInstance(); // not rotating so no need to set speed, axis, etc. - shaft.setPosition(context.localPos) + shaft.setPosition(movementContext.localPos) .setBlockLight(blockLight); } diff --git a/src/main/java/com/simibubi/create/content/contraptions/behaviour/MovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/behaviour/MovementBehaviour.java index 18832dfea..64cdc9f92 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/behaviour/MovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/behaviour/MovementBehaviour.java @@ -3,7 +3,7 @@ package com.simibubi.create.content.contraptions.behaviour; import javax.annotation.Nullable; import com.jozufozu.flywheel.api.visualization.VisualizationContext; -import com.simibubi.create.content.contraptions.render.ActorInstance; +import com.simibubi.create.content.contraptions.render.ActorVisual; import com.simibubi.create.content.contraptions.render.ContraptionMatrices; import com.simibubi.create.foundation.virtualWorld.VirtualRenderWorld; import com.simibubi.create.infrastructure.config.AllConfigs; @@ -94,8 +94,8 @@ public interface MovementBehaviour { @OnlyIn(Dist.CLIENT) @Nullable - default ActorInstance createInstance(VisualizationContext materialManager, VirtualRenderWorld simulationWorld, - MovementContext context) { + default ActorVisual createInstance(VisualizationContext visualizationContext, VirtualRenderWorld simulationWorld, + MovementContext movementContext) { return null; } } diff --git a/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerInstance.java b/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerVisual.java similarity index 87% rename from src/main/java/com/simibubi/create/content/contraptions/chassis/StickerInstance.java rename to src/main/java/com/simibubi/create/content/contraptions/chassis/StickerVisual.java index 8602c6844..8432be25a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/chassis/StickerVisual.java @@ -13,13 +13,12 @@ import com.jozufozu.flywheel.lib.model.Models; import com.jozufozu.flywheel.lib.visual.AbstractBlockEntityVisual; import com.simibubi.create.AllPartialModels; import com.simibubi.create.foundation.utility.AngleHelper; -import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.client.Minecraft; import net.minecraft.core.Direction; import net.minecraft.util.Mth; -public class StickerInstance extends AbstractBlockEntityVisual implements DynamicVisual { +public class StickerVisual extends AbstractBlockEntityVisual implements DynamicVisual { float lastOffset = Float.NaN; final Direction facing; @@ -28,8 +27,8 @@ public class StickerInstance extends AbstractBlockEntityVisual implements DynamicVisual, TickingLightListener { +public class ElevatorPulleyVisual extends ShaftVisual implements DynamicVisual, TickingLightListener { - public ElevatorPulleyInstance(VisualizationContext materialManager, ElevatorPulleyBlockEntity blockEntity) { - super(materialManager, blockEntity); + public ElevatorPulleyVisual(VisualizationContext context, ElevatorPulleyBlockEntity blockEntity) { + super(context, blockEntity); } @Override diff --git a/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageInstance.java b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageVisual.java similarity index 90% rename from src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageInstance.java rename to src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageVisual.java index 2d533c6b3..6703e14d6 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageVisual.java @@ -12,16 +12,15 @@ import com.jozufozu.flywheel.lib.instance.TransformedInstance; import com.jozufozu.flywheel.lib.model.Models; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; -import com.simibubi.create.content.kinetics.base.ShaftInstance; +import com.simibubi.create.content.kinetics.base.ShaftVisual; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.Iterate; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.util.Mth; -import net.minecraftforge.client.model.data.ModelData; -public class GantryCarriageInstance extends ShaftInstance implements DynamicVisual { +public class GantryCarriageVisual extends ShaftVisual implements DynamicVisual { private final TransformedInstance gantryCogs; @@ -33,8 +32,8 @@ public class GantryCarriageInstance extends ShaftInstance extends ShaftInstance implements DynamicVisual, TickingLightListener { +public abstract class AbstractPulleyVisual extends ShaftVisual implements DynamicVisual, TickingLightListener { final OrientedInstance coil; final SelectInstance magnet; @@ -39,7 +39,7 @@ public abstract class AbstractPulleyInstance exten private final MutableBox volume = new MutableBox(); private final LightVolume light; - public AbstractPulleyInstance(VisualizationContext dispatcher, T blockEntity) { + public AbstractPulleyVisual(VisualizationContext dispatcher, T blockEntity) { super(dispatcher, blockEntity); rotatingAbout = Direction.get(Direction.AxisDirection.POSITIVE, axis); diff --git a/src/main/java/com/simibubi/create/content/contraptions/pulley/HosePulleyInstance.java b/src/main/java/com/simibubi/create/content/contraptions/pulley/HosePulleyVisual.java similarity index 90% rename from src/main/java/com/simibubi/create/content/contraptions/pulley/HosePulleyInstance.java rename to src/main/java/com/simibubi/create/content/contraptions/pulley/HosePulleyVisual.java index 4808cb2f7..3076ace2e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/pulley/HosePulleyInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/pulley/HosePulleyVisual.java @@ -10,9 +10,9 @@ import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.fluids.hosePulley.HosePulleyBlockEntity; import com.simibubi.create.foundation.utility.AnimationTickHolder; -public class HosePulleyInstance extends AbstractPulleyInstance { +public class HosePulleyVisual extends AbstractPulleyVisual { - public HosePulleyInstance(VisualizationContext dispatcher, HosePulleyBlockEntity blockEntity) { + public HosePulleyVisual(VisualizationContext dispatcher, HosePulleyBlockEntity blockEntity) { super(dispatcher, blockEntity); } diff --git a/src/main/java/com/simibubi/create/content/contraptions/pulley/RopePulleyInstance.java b/src/main/java/com/simibubi/create/content/contraptions/pulley/RopePulleyVisual.java similarity index 89% rename from src/main/java/com/simibubi/create/content/contraptions/pulley/RopePulleyInstance.java rename to src/main/java/com/simibubi/create/content/contraptions/pulley/RopePulleyVisual.java index a74e497f0..965824ed6 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/pulley/RopePulleyInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/pulley/RopePulleyVisual.java @@ -12,9 +12,9 @@ import com.simibubi.create.AllPartialModels; import com.simibubi.create.foundation.render.VirtualRenderHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; -public class RopePulleyInstance extends AbstractPulleyInstance { - public RopePulleyInstance(VisualizationContext materialManager, PulleyBlockEntity blockEntity) { - super(materialManager, blockEntity); +public class RopePulleyVisual extends AbstractPulleyVisual { + public RopePulleyVisual(VisualizationContext context, PulleyBlockEntity blockEntity) { + super(context, blockEntity); } protected Instancer getRopeModel() { diff --git a/src/main/java/com/simibubi/create/content/contraptions/render/ActorInstance.java b/src/main/java/com/simibubi/create/content/contraptions/render/ActorVisual.java similarity index 85% rename from src/main/java/com/simibubi/create/content/contraptions/render/ActorInstance.java rename to src/main/java/com/simibubi/create/content/contraptions/render/ActorVisual.java index 124c77afa..bcd68ea31 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/render/ActorInstance.java +++ b/src/main/java/com/simibubi/create/content/contraptions/render/ActorVisual.java @@ -7,13 +7,13 @@ import com.simibubi.create.content.contraptions.behaviour.MovementContext; import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.LightLayer; -public abstract class ActorInstance { +public abstract class ActorVisual { protected final VisualizationContext visualizationContext; protected final InstancerProvider instancerProvider; protected final BlockAndTintGetter simulationWorld; protected final MovementContext context; - public ActorInstance(VisualizationContext visualizationContext, BlockAndTintGetter world, MovementContext context) { + public ActorVisual(VisualizationContext visualizationContext, BlockAndTintGetter world, MovementContext context) { this.visualizationContext = visualizationContext; this.instancerProvider = visualizationContext.instancerProvider(); this.simulationWorld = world; diff --git a/src/main/java/com/simibubi/create/content/equipment/armor/BacktankInstance.java b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankVisual.java similarity index 53% rename from src/main/java/com/simibubi/create/content/equipment/armor/BacktankInstance.java rename to src/main/java/com/simibubi/create/content/equipment/armor/BacktankVisual.java index cd885751f..2bc764de5 100644 --- a/src/main/java/com/simibubi/create/content/equipment/armor/BacktankInstance.java +++ b/src/main/java/com/simibubi/create/content/equipment/armor/BacktankVisual.java @@ -3,12 +3,12 @@ package com.simibubi.create.content.equipment.armor; import com.jozufozu.flywheel.api.model.Model; import com.jozufozu.flywheel.api.visualization.VisualizationContext; import com.jozufozu.flywheel.lib.model.Models; -import com.simibubi.create.content.kinetics.base.SingleRotatingInstance; +import com.simibubi.create.content.kinetics.base.SingleRotatingVisual; -public class BacktankInstance extends SingleRotatingInstance { +public class BacktankVisual extends SingleRotatingVisual { - public BacktankInstance(VisualizationContext materialManager, BacktankBlockEntity blockEntity) { - super(materialManager, blockEntity); + public BacktankVisual(VisualizationContext context, BacktankBlockEntity blockEntity) { + super(context, blockEntity); } @Override diff --git a/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolBoxInstance.java b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolBoxVisual.java similarity index 86% rename from src/main/java/com/simibubi/create/content/equipment/toolbox/ToolBoxInstance.java rename to src/main/java/com/simibubi/create/content/equipment/toolbox/ToolBoxVisual.java index d9028ab8a..3c7e81530 100644 --- a/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolBoxInstance.java +++ b/src/main/java/com/simibubi/create/content/equipment/toolbox/ToolBoxVisual.java @@ -13,21 +13,18 @@ import com.jozufozu.flywheel.lib.instance.TransformedInstance; import com.jozufozu.flywheel.lib.model.Models; import com.jozufozu.flywheel.lib.visual.AbstractBlockEntityVisual; import com.simibubi.create.AllPartialModels; -import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.Iterate; import net.minecraft.core.Direction; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.data.ModelData; -public class ToolBoxInstance extends AbstractBlockEntityVisual implements DynamicVisual { +public class ToolBoxVisual extends AbstractBlockEntityVisual implements DynamicVisual { private final Direction facing; private TransformedInstance lid; private TransformedInstance[] drawers; - public ToolBoxInstance(VisualizationContext materialManager, ToolboxBlockEntity blockEntity) { - super(materialManager, blockEntity); + public ToolBoxVisual(VisualizationContext context, ToolboxBlockEntity blockEntity) { + super(context, blockEntity); facing = blockState.getValue(ToolboxBlock.FACING) .getOpposite(); diff --git a/src/main/java/com/simibubi/create/content/fluids/pipes/valve/FluidValveInstance.java b/src/main/java/com/simibubi/create/content/fluids/pipes/valve/FluidValveVisual.java similarity index 91% rename from src/main/java/com/simibubi/create/content/fluids/pipes/valve/FluidValveInstance.java rename to src/main/java/com/simibubi/create/content/fluids/pipes/valve/FluidValveVisual.java index 7ff7f6cca..d7ed82dba 100644 --- a/src/main/java/com/simibubi/create/content/fluids/pipes/valve/FluidValveInstance.java +++ b/src/main/java/com/simibubi/create/content/fluids/pipes/valve/FluidValveVisual.java @@ -12,14 +12,14 @@ import com.jozufozu.flywheel.lib.instance.TransformedInstance; import com.jozufozu.flywheel.lib.model.Models; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; -import com.simibubi.create.content.kinetics.base.ShaftInstance; +import com.simibubi.create.content.kinetics.base.ShaftVisual; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.core.Direction; import net.minecraft.util.Mth; -public class FluidValveInstance extends ShaftInstance implements DynamicVisual { +public class FluidValveVisual extends ShaftVisual implements DynamicVisual { protected TransformedInstance pointer; protected boolean settled; @@ -28,7 +28,7 @@ public class FluidValveInstance extends ShaftInstance imp protected final double yRot; protected final int pointerRotationOffset; - public FluidValveInstance(VisualizationContext dispatcher, FluidValveBlockEntity blockEntity) { + public FluidValveVisual(VisualizationContext dispatcher, FluidValveBlockEntity blockEntity) { super(dispatcher, blockEntity); Direction facing = blockState.getValue(FluidValveBlock.FACING); diff --git a/src/main/java/com/simibubi/create/content/fluids/pump/PumpCogInstance.java b/src/main/java/com/simibubi/create/content/fluids/pump/PumpCogVisual.java similarity index 73% rename from src/main/java/com/simibubi/create/content/fluids/pump/PumpCogInstance.java rename to src/main/java/com/simibubi/create/content/fluids/pump/PumpCogVisual.java index 51285b145..83590b8dc 100644 --- a/src/main/java/com/simibubi/create/content/fluids/pump/PumpCogInstance.java +++ b/src/main/java/com/simibubi/create/content/fluids/pump/PumpCogVisual.java @@ -6,16 +6,16 @@ import com.jozufozu.flywheel.api.visual.VisualFrameContext; import com.jozufozu.flywheel.api.visualization.VisualizationContext; import com.jozufozu.flywheel.lib.model.Models; import com.simibubi.create.AllPartialModels; -import com.simibubi.create.content.kinetics.base.SingleRotatingInstance; +import com.simibubi.create.content.kinetics.base.SingleRotatingVisual; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -public class PumpCogInstance extends SingleRotatingInstance implements DynamicVisual { +public class PumpCogVisual extends SingleRotatingVisual implements DynamicVisual { - public PumpCogInstance(VisualizationContext materialManager, PumpBlockEntity blockEntity) { - super(materialManager, blockEntity); + public PumpCogVisual(VisualizationContext context, PumpBlockEntity blockEntity) { + super(context, blockEntity); } @Override diff --git a/src/main/java/com/simibubi/create/content/kinetics/base/BackHalfShaftInstance.java b/src/main/java/com/simibubi/create/content/kinetics/base/BackHalfShaftVisual.java similarity index 63% rename from src/main/java/com/simibubi/create/content/kinetics/base/BackHalfShaftInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/base/BackHalfShaftVisual.java index 6d7737993..a288807fc 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/base/BackHalfShaftInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/base/BackHalfShaftVisual.java @@ -5,9 +5,9 @@ import com.jozufozu.flywheel.api.visualization.VisualizationContext; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -public class BackHalfShaftInstance extends HalfShaftInstance { - public BackHalfShaftInstance(VisualizationContext materialManager, T blockEntity) { - super(materialManager, blockEntity); +public class BackHalfShaftVisual extends HalfShaftVisual { + public BackHalfShaftVisual(VisualizationContext context, T blockEntity) { + super(context, blockEntity); } @Override diff --git a/src/main/java/com/simibubi/create/content/kinetics/base/CutoutRotatingInstance.java b/src/main/java/com/simibubi/create/content/kinetics/base/CutoutRotatingInstance.java deleted file mode 100644 index 471c38138..000000000 --- a/src/main/java/com/simibubi/create/content/kinetics/base/CutoutRotatingInstance.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.simibubi.create.content.kinetics.base; - -import com.jozufozu.flywheel.api.visualization.VisualizationContext; - -public class CutoutRotatingInstance extends SingleRotatingInstance { - public CutoutRotatingInstance(VisualizationContext materialManager, T blockEntity) { - super(materialManager, blockEntity); - } -} diff --git a/src/main/java/com/simibubi/create/content/kinetics/base/CutoutRotatingVisual.java b/src/main/java/com/simibubi/create/content/kinetics/base/CutoutRotatingVisual.java new file mode 100644 index 000000000..b849a7303 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/kinetics/base/CutoutRotatingVisual.java @@ -0,0 +1,9 @@ +package com.simibubi.create.content.kinetics.base; + +import com.jozufozu.flywheel.api.visualization.VisualizationContext; + +public class CutoutRotatingVisual extends SingleRotatingVisual { + public CutoutRotatingVisual(VisualizationContext context, T blockEntity) { + super(context, blockEntity); + } +} diff --git a/src/main/java/com/simibubi/create/content/kinetics/base/HalfShaftInstance.java b/src/main/java/com/simibubi/create/content/kinetics/base/HalfShaftVisual.java similarity index 73% rename from src/main/java/com/simibubi/create/content/kinetics/base/HalfShaftInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/base/HalfShaftVisual.java index 4ba90b7de..949b4b922 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/base/HalfShaftInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/base/HalfShaftVisual.java @@ -8,9 +8,9 @@ import com.simibubi.create.AllPartialModels; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -public class HalfShaftInstance extends SingleRotatingInstance { - public HalfShaftInstance(VisualizationContext materialManager, T blockEntity) { - super(materialManager, blockEntity); +public class HalfShaftVisual extends SingleRotatingVisual { + public HalfShaftVisual(VisualizationContext context, T blockEntity) { + super(context, blockEntity); } @Override diff --git a/src/main/java/com/simibubi/create/content/kinetics/base/HorizontalHalfShaftInstance.java b/src/main/java/com/simibubi/create/content/kinetics/base/HorizontalHalfShaftVisual.java similarity index 62% rename from src/main/java/com/simibubi/create/content/kinetics/base/HorizontalHalfShaftInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/base/HorizontalHalfShaftVisual.java index 6f8a41f34..399db1e2b 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/base/HorizontalHalfShaftInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/base/HorizontalHalfShaftVisual.java @@ -5,10 +5,10 @@ import com.jozufozu.flywheel.api.visualization.VisualizationContext; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -public class HorizontalHalfShaftInstance extends HalfShaftInstance { +public class HorizontalHalfShaftVisual extends HalfShaftVisual { - public HorizontalHalfShaftInstance(VisualizationContext materialManager, T blockEntity) { - super(materialManager, blockEntity); + public HorizontalHalfShaftVisual(VisualizationContext context, T blockEntity) { + super(context, blockEntity); } @Override diff --git a/src/main/java/com/simibubi/create/content/kinetics/base/KineticBlockEntityInstance.java b/src/main/java/com/simibubi/create/content/kinetics/base/KineticBlockEntityVisual.java similarity index 91% rename from src/main/java/com/simibubi/create/content/kinetics/base/KineticBlockEntityInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/base/KineticBlockEntityVisual.java index 1c90f8d02..ecda32b4e 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/base/KineticBlockEntityInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/base/KineticBlockEntityVisual.java @@ -10,12 +10,12 @@ import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.world.level.block.state.BlockState; -public abstract class KineticBlockEntityInstance extends AbstractBlockEntityVisual { +public abstract class KineticBlockEntityVisual extends AbstractBlockEntityVisual { protected final Direction.Axis axis; - public KineticBlockEntityInstance(VisualizationContext materialManager, T blockEntity) { - super(materialManager, blockEntity); + public KineticBlockEntityVisual(VisualizationContext context, T blockEntity) { + super(context, blockEntity); axis = (blockState.getBlock() instanceof IRotate irotate) ? irotate.getRotationAxis(blockState) : Axis.Y; } diff --git a/src/main/java/com/simibubi/create/content/kinetics/base/ShaftInstance.java b/src/main/java/com/simibubi/create/content/kinetics/base/ShaftVisual.java similarity index 61% rename from src/main/java/com/simibubi/create/content/kinetics/base/ShaftInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/base/ShaftVisual.java index 9bb1435b6..21ce8bf7e 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/base/ShaftInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/base/ShaftVisual.java @@ -4,10 +4,10 @@ import com.jozufozu.flywheel.api.model.Model; import com.jozufozu.flywheel.api.visualization.VisualizationContext; import com.simibubi.create.foundation.render.VirtualRenderHelper; -public class ShaftInstance extends SingleRotatingInstance { +public class ShaftVisual extends SingleRotatingVisual { - public ShaftInstance(VisualizationContext materialManager, T blockEntity) { - super(materialManager, blockEntity); + public ShaftVisual(VisualizationContext context, T blockEntity) { + super(context, blockEntity); } @Override diff --git a/src/main/java/com/simibubi/create/content/kinetics/base/SingleRotatingInstance.java b/src/main/java/com/simibubi/create/content/kinetics/base/SingleRotatingVisual.java similarity index 82% rename from src/main/java/com/simibubi/create/content/kinetics/base/SingleRotatingInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/base/SingleRotatingVisual.java index db4b913ba..6f344a4f1 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/base/SingleRotatingInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/base/SingleRotatingVisual.java @@ -9,12 +9,12 @@ import com.jozufozu.flywheel.api.visualization.VisualizationContext; import com.simibubi.create.foundation.render.AllInstanceTypes; import com.simibubi.create.foundation.render.VirtualRenderHelper; -public class SingleRotatingInstance extends KineticBlockEntityInstance { +public class SingleRotatingVisual extends KineticBlockEntityVisual { protected RotatingInstance rotatingModel; - public SingleRotatingInstance(VisualizationContext materialManager, T blockEntity) { - super(materialManager, blockEntity); + public SingleRotatingVisual(VisualizationContext context, T blockEntity) { + super(context, blockEntity); } @Override diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltVisual.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltVisual.java index 4d58e2f20..b72629fdf 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltVisual.java +++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltVisual.java @@ -15,7 +15,7 @@ import com.jozufozu.flywheel.lib.model.baked.PartialModel; import com.jozufozu.flywheel.lib.transform.TransformStack; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllPartialModels; -import com.simibubi.create.content.kinetics.base.KineticBlockEntityInstance; +import com.simibubi.create.content.kinetics.base.KineticBlockEntityVisual; import com.simibubi.create.content.kinetics.base.RotatingInstance; import com.simibubi.create.foundation.block.render.SpriteShiftEntry; import com.simibubi.create.foundation.render.AllInstanceTypes; @@ -26,7 +26,7 @@ import net.minecraft.util.Mth; import net.minecraft.world.item.DyeColor; import net.minecraft.world.level.LightLayer; -public class BeltVisual extends KineticBlockEntityInstance { +public class BeltVisual extends KineticBlockEntityVisual { boolean upward; boolean diagonal; @@ -39,8 +39,8 @@ public class BeltVisual extends KineticBlockEntityInstance { protected ArrayList keys; protected RotatingInstance pulleyKey; - public BeltVisual(VisualizationContext materialManager, BeltBlockEntity blockEntity) { - super(materialManager, blockEntity); + public BeltVisual(VisualizationContext context, BeltBlockEntity blockEntity) { + super(context, blockEntity); if (!AllBlocks.BELT.has(blockState)) return; diff --git a/src/main/java/com/simibubi/create/content/kinetics/crafter/ShaftlessCogwheelInstance.java b/src/main/java/com/simibubi/create/content/kinetics/crafter/ShaftlessCogwheelVisual.java similarity index 72% rename from src/main/java/com/simibubi/create/content/kinetics/crafter/ShaftlessCogwheelInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/crafter/ShaftlessCogwheelVisual.java index 7f8f5353b..48034fa05 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/crafter/ShaftlessCogwheelInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/crafter/ShaftlessCogwheelVisual.java @@ -7,21 +7,21 @@ import com.jozufozu.flywheel.lib.transform.TransformStack; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.KineticBlockEntity; -import com.simibubi.create.content.kinetics.base.SingleRotatingInstance; +import com.simibubi.create.content.kinetics.base.SingleRotatingVisual; import net.minecraft.core.Direction; -public class ShaftlessCogwheelInstance extends SingleRotatingInstance { +public class ShaftlessCogwheelVisual extends SingleRotatingVisual { - public ShaftlessCogwheelInstance(VisualizationContext materialManager, KineticBlockEntity blockEntity) { - super(materialManager, blockEntity); + public ShaftlessCogwheelVisual(VisualizationContext context, KineticBlockEntity blockEntity) { + super(context, blockEntity); } @Override protected Model model() { Direction facing = blockState.getValue(MechanicalCrafterBlock.HORIZONTAL_FACING); - return Models.partial(AllPartialModels.SHAFTLESS_COGWHEEL, facing, ShaftlessCogwheelInstance::rotateToFace); + return Models.partial(AllPartialModels.SHAFTLESS_COGWHEEL, facing, ShaftlessCogwheelVisual::rotateToFace); } private static void rotateToFace(Direction facing, PoseStack stack) { diff --git a/src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankInstance.java b/src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankVisual.java similarity index 88% rename from src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankVisual.java index 6cb5965bd..b216fa0fe 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankVisual.java @@ -10,18 +10,18 @@ import com.jozufozu.flywheel.api.visual.VisualFrameContext; import com.jozufozu.flywheel.api.visualization.VisualizationContext; import com.jozufozu.flywheel.lib.instance.InstanceTypes; import com.jozufozu.flywheel.lib.instance.TransformedInstance; -import com.simibubi.create.content.kinetics.base.SingleRotatingInstance; +import com.simibubi.create.content.kinetics.base.SingleRotatingVisual; import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -public class HandCrankInstance extends SingleRotatingInstance implements DynamicVisual { +public class HandCrankVisual extends SingleRotatingVisual implements DynamicVisual { private TransformedInstance crank; private Direction facing; - public HandCrankInstance(VisualizationContext modelManager, HandCrankBlockEntity blockEntity) { + public HandCrankVisual(VisualizationContext modelManager, HandCrankBlockEntity blockEntity) { super(modelManager, blockEntity); facing = blockState.getValue(BlockStateProperties.FACING); Model model = blockEntity.getRenderedHandleInstance(); diff --git a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerActorInstance.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerActorVisual.java similarity index 90% rename from src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerActorInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerActorVisual.java index 9340ac999..e0c265612 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerActorInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerActorVisual.java @@ -13,9 +13,9 @@ import com.jozufozu.flywheel.lib.transform.TransformStack; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.contraptions.behaviour.MovementContext; -import com.simibubi.create.content.contraptions.render.ActorInstance; +import com.simibubi.create.content.contraptions.render.ActorVisual; import com.simibubi.create.content.kinetics.base.IRotate; -import com.simibubi.create.content.kinetics.base.KineticBlockEntityInstance; +import com.simibubi.create.content.kinetics.base.KineticBlockEntityVisual; import com.simibubi.create.content.kinetics.base.RotatingInstance; import com.simibubi.create.foundation.render.AllInstanceTypes; import com.simibubi.create.foundation.render.VirtualRenderHelper; @@ -31,7 +31,7 @@ import net.minecraft.util.Mth; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; -public class DeployerActorInstance extends ActorInstance { +public class DeployerActorVisual extends ActorVisual { private final PoseStack stack = new PoseStack(); Direction facing; @@ -45,8 +45,8 @@ public class DeployerActorInstance extends ActorInstance { TransformedInstance hand; RotatingInstance shaft; - public DeployerActorInstance(VisualizationContext materialManager, VirtualRenderWorld simulationWorld, MovementContext context) { - super(materialManager, simulationWorld, context); + public DeployerActorVisual(VisualizationContext visualizationContext, VirtualRenderWorld simulationWorld, MovementContext context) { + super(visualizationContext, simulationWorld, context); BlockState state = context.state; DeployerBlockEntity.Mode mode = NBTHelper.readEnum(context.blockEntityData, "Mode", DeployerBlockEntity.Mode.class); PartialModel handPose = DeployerRenderer.getHandPose(mode); @@ -59,13 +59,11 @@ public class DeployerActorInstance extends ActorInstance { xRot = facing == Direction.UP ? 270 : facing == Direction.DOWN ? 90 : 0; zRot = rotatePole ? 90 : 0; - var instancerProvider = materialManager.instancerProvider(); - pole = instancerProvider.instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.DEPLOYER_POLE), RenderStage.AFTER_BLOCK_ENTITIES).createInstance(); hand = instancerProvider.instancer(InstanceTypes.TRANSFORMED, Models.partial(handPose), RenderStage.AFTER_BLOCK_ENTITIES).createInstance(); Direction.Axis axis = ((IRotate) state.getBlock()).getRotationAxis(state); - shaft = instancerProvider.instancer(AllInstanceTypes.ROTATING, VirtualRenderHelper.blockModel(KineticBlockEntityInstance.shaft(axis)), RenderStage.AFTER_BLOCK_ENTITIES) + shaft = instancerProvider.instancer(AllInstanceTypes.ROTATING, VirtualRenderHelper.blockModel(KineticBlockEntityVisual.shaft(axis)), RenderStage.AFTER_BLOCK_ENTITIES) .createInstance(); int blockLight = localBlockLight(); diff --git a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerMovementBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerMovementBehaviour.java index 3778796f1..2716d0dac 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerMovementBehaviour.java @@ -16,7 +16,7 @@ import com.simibubi.create.content.contraptions.OrientedContraptionEntity; import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour; import com.simibubi.create.content.contraptions.behaviour.MovementContext; import com.simibubi.create.content.contraptions.mounted.MountedContraption; -import com.simibubi.create.content.contraptions.render.ActorInstance; +import com.simibubi.create.content.contraptions.render.ActorVisual; import com.simibubi.create.content.contraptions.render.ContraptionMatrices; import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher; import com.simibubi.create.content.kinetics.deployer.DeployerBlockEntity.Mode; @@ -295,8 +295,8 @@ public class DeployerMovementBehaviour implements MovementBehaviour { @Nullable @Override - public ActorInstance createInstance(VisualizationContext materialManager, VirtualRenderWorld simulationWorld, - MovementContext context) { - return new DeployerActorInstance(materialManager, simulationWorld, context); + public ActorVisual createInstance(VisualizationContext visualizationContext, VirtualRenderWorld simulationWorld, + MovementContext movementContext) { + return new DeployerActorVisual(visualizationContext, simulationWorld, movementContext); } } diff --git a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerInstance.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerVisual.java similarity index 93% rename from src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerVisual.java index 08d191cce..509f6f470 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerVisual.java @@ -20,7 +20,7 @@ import com.jozufozu.flywheel.lib.model.Models; import com.jozufozu.flywheel.lib.model.baked.PartialModel; import com.mojang.math.Axis; import com.simibubi.create.AllPartialModels; -import com.simibubi.create.content.kinetics.base.ShaftInstance; +import com.simibubi.create.content.kinetics.base.ShaftVisual; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; @@ -29,7 +29,7 @@ import net.minecraft.core.Direction; import net.minecraft.core.Vec3i; import net.minecraft.util.Mth; -public class DeployerInstance extends ShaftInstance implements DynamicVisual, TickableVisual { +public class DeployerVisual extends ShaftVisual implements DynamicVisual, TickableVisual { final Direction facing; final float yRot; @@ -43,8 +43,8 @@ public class DeployerInstance extends ShaftInstance impleme PartialModel currentHand; float progress; - public DeployerInstance(VisualizationContext materialManager, DeployerBlockEntity blockEntity) { - super(materialManager, blockEntity); + public DeployerVisual(VisualizationContext context, DeployerBlockEntity blockEntity) { + super(context, blockEntity); facing = blockState.getValue(FACING); diff --git a/src/main/java/com/simibubi/create/content/kinetics/drill/DrillActorInstance.java b/src/main/java/com/simibubi/create/content/kinetics/drill/DrillActorVisual.java similarity index 78% rename from src/main/java/com/simibubi/create/content/kinetics/drill/DrillActorInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/drill/DrillActorVisual.java index ef78b919a..cb135d611 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/drill/DrillActorInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/drill/DrillActorVisual.java @@ -6,8 +6,9 @@ import com.jozufozu.flywheel.api.event.RenderStage; import com.jozufozu.flywheel.api.visualization.VisualizationContext; import com.jozufozu.flywheel.lib.model.Models; import com.simibubi.create.AllPartialModels; -import com.simibubi.create.content.contraptions.actors.flwdata.ActorInstance; +import com.simibubi.create.content.contraptions.actors.ActorInstance; import com.simibubi.create.content.contraptions.behaviour.MovementContext; +import com.simibubi.create.content.contraptions.render.ActorVisual; import com.simibubi.create.foundation.render.AllInstanceTypes; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.VecHelper; @@ -17,13 +18,13 @@ import net.minecraft.core.Direction; import net.minecraft.util.Mth; import net.minecraft.world.level.block.state.BlockState; -public class DrillActorInstance extends com.simibubi.create.content.contraptions.render.ActorInstance { +public class DrillActorVisual extends ActorVisual { ActorInstance drillHead; private final Direction facing; - public DrillActorInstance(VisualizationContext materialManager, VirtualRenderWorld contraption, MovementContext context) { - super(materialManager, contraption, context); + public DrillActorVisual(VisualizationContext visualizationContext, VirtualRenderWorld contraption, MovementContext context) { + super(visualizationContext, contraption, context); BlockState state = context.state; @@ -38,8 +39,7 @@ public class DrillActorInstance extends com.simibubi.create.content.contraptions else eulerY = facing.toYRot() + ((axis == Direction.Axis.X) ? 180 : 0); - drillHead = materialManager.instancerProvider() - .instancer(AllInstanceTypes.ACTORS, Models.partial(AllPartialModels.DRILL_HEAD), RenderStage.AFTER_BLOCK_ENTITIES) + drillHead = instancerProvider.instancer(AllInstanceTypes.ACTORS, Models.partial(AllPartialModels.DRILL_HEAD), RenderStage.AFTER_BLOCK_ENTITIES) .createInstance(); drillHead.setPosition(context.localPos) diff --git a/src/main/java/com/simibubi/create/content/kinetics/drill/DrillMovementBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/drill/DrillMovementBehaviour.java index e1bc5d195..ebb681f16 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/drill/DrillMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/kinetics/drill/DrillMovementBehaviour.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; import com.jozufozu.flywheel.api.visualization.VisualizationContext; import com.simibubi.create.AllTags; import com.simibubi.create.content.contraptions.behaviour.MovementContext; -import com.simibubi.create.content.contraptions.render.ActorInstance; +import com.simibubi.create.content.contraptions.render.ActorVisual; import com.simibubi.create.content.contraptions.render.ContraptionMatrices; import com.simibubi.create.content.contraptions.render.ContraptionRenderDispatcher; import com.simibubi.create.content.kinetics.base.BlockBreakingMovementBehaviour; @@ -52,8 +52,8 @@ public class DrillMovementBehaviour extends BlockBreakingMovementBehaviour { @Nullable @Override - public ActorInstance createInstance(VisualizationContext materialManager, VirtualRenderWorld simulationWorld, MovementContext context) { - return new DrillActorInstance(materialManager, simulationWorld, context); + public ActorVisual createInstance(VisualizationContext visualizationContext, VirtualRenderWorld simulationWorld, MovementContext movementContext) { + return new DrillActorVisual(visualizationContext, simulationWorld, movementContext); } @Override diff --git a/src/main/java/com/simibubi/create/content/kinetics/drill/DrillInstance.java b/src/main/java/com/simibubi/create/content/kinetics/drill/DrillVisual.java similarity index 67% rename from src/main/java/com/simibubi/create/content/kinetics/drill/DrillInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/drill/DrillVisual.java index 6d468e8cc..b9904dfe6 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/drill/DrillInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/drill/DrillVisual.java @@ -4,15 +4,15 @@ import com.jozufozu.flywheel.api.model.Model; import com.jozufozu.flywheel.api.visualization.VisualizationContext; import com.jozufozu.flywheel.lib.model.Models; import com.simibubi.create.AllPartialModels; -import com.simibubi.create.content.kinetics.base.SingleRotatingInstance; +import com.simibubi.create.content.kinetics.base.SingleRotatingVisual; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -public class DrillInstance extends SingleRotatingInstance { +public class DrillVisual extends SingleRotatingVisual { - public DrillInstance(VisualizationContext materialManager, DrillBlockEntity blockEntity) { - super(materialManager, blockEntity); + public DrillVisual(VisualizationContext context, DrillBlockEntity blockEntity) { + super(context, blockEntity); } @Override diff --git a/src/main/java/com/simibubi/create/content/kinetics/fan/FanInstance.java b/src/main/java/com/simibubi/create/content/kinetics/fan/FanVisual.java similarity index 90% rename from src/main/java/com/simibubi/create/content/kinetics/fan/FanInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/fan/FanVisual.java index fdf90a7ae..261db244e 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/fan/FanInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/fan/FanVisual.java @@ -9,7 +9,7 @@ import com.jozufozu.flywheel.api.instance.Instance; import com.jozufozu.flywheel.api.visualization.VisualizationContext; import com.jozufozu.flywheel.lib.model.Models; import com.simibubi.create.AllPartialModels; -import com.simibubi.create.content.kinetics.base.KineticBlockEntityInstance; +import com.simibubi.create.content.kinetics.base.KineticBlockEntityVisual; import com.simibubi.create.content.kinetics.base.RotatingInstance; import com.simibubi.create.foundation.render.AllInstanceTypes; @@ -17,15 +17,15 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.util.Mth; -public class FanInstance extends KineticBlockEntityInstance { +public class FanVisual extends KineticBlockEntityVisual { protected final RotatingInstance shaft; protected final RotatingInstance fan; final Direction direction; private final Direction opposite; - public FanInstance(VisualizationContext materialManager, EncasedFanBlockEntity blockEntity) { - super(materialManager, blockEntity); + public FanVisual(VisualizationContext context, EncasedFanBlockEntity blockEntity) { + super(context, blockEntity); direction = blockState.getValue(FACING); diff --git a/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelInstance.java b/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelVisual.java similarity index 90% rename from src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelVisual.java index 37aece9c4..a63cd5b8e 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelVisual.java @@ -11,7 +11,7 @@ import com.jozufozu.flywheel.lib.instance.InstanceTypes; import com.jozufozu.flywheel.lib.instance.TransformedInstance; import com.jozufozu.flywheel.lib.transform.TransformStack; import com.mojang.blaze3d.vertex.PoseStack; -import com.simibubi.create.content.kinetics.base.KineticBlockEntityInstance; +import com.simibubi.create.content.kinetics.base.KineticBlockEntityVisual; import com.simibubi.create.content.kinetics.base.RotatingInstance; import com.simibubi.create.foundation.render.AllInstanceTypes; import com.simibubi.create.foundation.render.VirtualRenderHelper; @@ -20,14 +20,14 @@ import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.core.Direction; -public class FlywheelInstance extends KineticBlockEntityInstance implements DynamicVisual { +public class FlywheelVisual extends KineticBlockEntityVisual implements DynamicVisual { protected final RotatingInstance shaft; protected final TransformedInstance wheel; protected float lastAngle = Float.NaN; - public FlywheelInstance(VisualizationContext materialManager, FlywheelBlockEntity blockEntity) { - super(materialManager, blockEntity); + public FlywheelVisual(VisualizationContext context, FlywheelBlockEntity blockEntity) { + super(context, blockEntity); shaft = setup(instancerProvider.instancer(AllInstanceTypes.ROTATING, VirtualRenderHelper.blockModel(shaft()), RenderStage.AFTER_BLOCK_ENTITIES) .createInstance()); diff --git a/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeInstance.java b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeVisual.java similarity index 88% rename from src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeVisual.java index d34ca83bf..ca42a7cf9 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/gauge/GaugeVisual.java @@ -15,7 +15,7 @@ import com.jozufozu.flywheel.lib.model.Models; import com.jozufozu.flywheel.lib.transform.TransformStack; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.AllPartialModels; -import com.simibubi.create.content.kinetics.base.ShaftInstance; +import com.simibubi.create.content.kinetics.base.ShaftVisual; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.Couple; import com.simibubi.create.foundation.utility.Iterate; @@ -23,14 +23,14 @@ import com.simibubi.create.foundation.utility.Iterate; import net.minecraft.core.Direction; import net.minecraft.util.Mth; -public abstract class GaugeInstance extends ShaftInstance implements DynamicVisual { +public abstract class GaugeVisual extends ShaftVisual implements DynamicVisual { protected final ArrayList faces; protected PoseStack ms; - protected GaugeInstance(VisualizationContext materialManager, GaugeBlockEntity blockEntity) { - super(materialManager, blockEntity); + protected GaugeVisual(VisualizationContext context, GaugeBlockEntity blockEntity) { + super(context, blockEntity); faces = new ArrayList<>(2); @@ -153,9 +153,9 @@ public abstract class GaugeInstance extends ShaftInstance impl } } - public static class Speed extends GaugeInstance { - public Speed(VisualizationContext materialManager, GaugeBlockEntity blockEntity) { - super(materialManager, blockEntity); + public static class Speed extends GaugeVisual { + public Speed(VisualizationContext context, GaugeBlockEntity blockEntity) { + super(context, blockEntity); } @Override @@ -164,9 +164,9 @@ public abstract class GaugeInstance extends ShaftInstance impl } } - public static class Stress extends GaugeInstance { - public Stress(VisualizationContext materialManager, GaugeBlockEntity blockEntity) { - super(materialManager, blockEntity); + public static class Stress extends GaugeVisual { + public Stress(VisualizationContext context, GaugeBlockEntity blockEntity) { + super(context, blockEntity); } @Override diff --git a/src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxInstance.java b/src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxVisual.java similarity index 93% rename from src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxVisual.java index ef4ef7e24..4d0bb2999 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/gearbox/GearboxVisual.java @@ -10,7 +10,7 @@ import com.jozufozu.flywheel.api.visualization.VisualizationContext; import com.jozufozu.flywheel.lib.instance.AbstractInstance; import com.jozufozu.flywheel.lib.model.Models; import com.simibubi.create.AllPartialModels; -import com.simibubi.create.content.kinetics.base.KineticBlockEntityInstance; +import com.simibubi.create.content.kinetics.base.KineticBlockEntityVisual; import com.simibubi.create.content.kinetics.base.RotatingInstance; import com.simibubi.create.foundation.render.AllInstanceTypes; import com.simibubi.create.foundation.utility.Iterate; @@ -20,13 +20,13 @@ import net.minecraft.core.Direction; import net.minecraft.world.level.LightLayer; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -public class GearboxInstance extends KineticBlockEntityInstance { +public class GearboxVisual extends KineticBlockEntityVisual { protected final EnumMap keys; protected Direction sourceFacing; - public GearboxInstance(VisualizationContext materialManager, GearboxBlockEntity blockEntity) { - super(materialManager, blockEntity); + public GearboxVisual(VisualizationContext context, GearboxBlockEntity blockEntity) { + super(context, blockEntity); keys = new EnumMap<>(Direction.class); diff --git a/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInstance.java b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmVisual.java similarity index 95% rename from src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmVisual.java index 9e2d82382..908f3ddc2 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmVisual.java @@ -17,7 +17,7 @@ import com.jozufozu.flywheel.lib.model.Models; import com.jozufozu.flywheel.lib.transform.TransformStack; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.AllPartialModels; -import com.simibubi.create.content.kinetics.base.SingleRotatingInstance; +import com.simibubi.create.content.kinetics.base.SingleRotatingVisual; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.Color; import com.simibubi.create.foundation.utility.Iterate; @@ -28,7 +28,7 @@ import net.minecraft.util.Mth; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; -public class ArmInstance extends SingleRotatingInstance implements DynamicVisual { +public class ArmVisual extends SingleRotatingVisual implements DynamicVisual { final TransformedInstance base; final TransformedInstance lowerBody; @@ -46,8 +46,8 @@ public class ArmInstance extends SingleRotatingInstance implemen private float upperArmAngle = Float.NaN; private float headAngle = Float.NaN; - public ArmInstance(VisualizationContext materialManager, ArmBlockEntity blockEntity) { - super(materialManager, blockEntity); + public ArmVisual(VisualizationContext context, ArmBlockEntity blockEntity) { + super(context, blockEntity); base = instancerProvider.instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.ARM_BASE), RenderStage.AFTER_BLOCK_ENTITIES) .createInstance(); diff --git a/src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneCogInstance.java b/src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneCogVisual.java similarity index 54% rename from src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneCogInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneCogVisual.java index 6e7791fa4..680efb9d5 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneCogInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneCogVisual.java @@ -4,12 +4,12 @@ import com.jozufozu.flywheel.api.model.Model; import com.jozufozu.flywheel.api.visualization.VisualizationContext; import com.jozufozu.flywheel.lib.model.Models; import com.simibubi.create.AllPartialModels; -import com.simibubi.create.content.kinetics.base.SingleRotatingInstance; +import com.simibubi.create.content.kinetics.base.SingleRotatingVisual; -public class MillstoneCogInstance extends SingleRotatingInstance { +public class MillstoneCogVisual extends SingleRotatingVisual { - public MillstoneCogInstance(VisualizationContext materialManager, MillstoneBlockEntity blockEntity) { - super(materialManager, blockEntity); + public MillstoneCogVisual(VisualizationContext context, MillstoneBlockEntity blockEntity) { + super(context, blockEntity); } @Override diff --git a/src/main/java/com/simibubi/create/content/kinetics/mixer/MixerInstance.java b/src/main/java/com/simibubi/create/content/kinetics/mixer/MixerVisual.java similarity index 92% rename from src/main/java/com/simibubi/create/content/kinetics/mixer/MixerInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/mixer/MixerVisual.java index b7400b2a7..8264cefa6 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/mixer/MixerInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/mixer/MixerVisual.java @@ -13,20 +13,20 @@ import com.jozufozu.flywheel.lib.instance.OrientedInstance; import com.jozufozu.flywheel.lib.model.Models; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.RotatingInstance; -import com.simibubi.create.content.kinetics.simpleRelays.encased.EncasedCogInstance; +import com.simibubi.create.content.kinetics.simpleRelays.encased.EncasedCogVisual; import com.simibubi.create.foundation.render.AllInstanceTypes; import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.core.Direction; -public class MixerInstance extends EncasedCogInstance implements DynamicVisual { +public class MixerVisual extends EncasedCogVisual implements DynamicVisual { private final RotatingInstance mixerHead; private final OrientedInstance mixerPole; private final MechanicalMixerBlockEntity mixer; - public MixerInstance(VisualizationContext materialManager, MechanicalMixerBlockEntity blockEntity) { - super(materialManager, blockEntity, false); + public MixerVisual(VisualizationContext context, MechanicalMixerBlockEntity blockEntity) { + super(context, blockEntity, false); this.mixer = blockEntity; mixerHead = instancerProvider.instancer(AllInstanceTypes.ROTATING, Models.partial(AllPartialModels.MECHANICAL_MIXER_HEAD), RenderStage.AFTER_BLOCK_ENTITIES) diff --git a/src/main/java/com/simibubi/create/content/kinetics/press/PressInstance.java b/src/main/java/com/simibubi/create/content/kinetics/press/PressVisual.java similarity index 87% rename from src/main/java/com/simibubi/create/content/kinetics/press/PressInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/press/PressVisual.java index eee3ddced..31f2437e8 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/press/PressInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/press/PressVisual.java @@ -14,16 +14,16 @@ import com.jozufozu.flywheel.lib.instance.OrientedInstance; import com.jozufozu.flywheel.lib.model.Models; import com.mojang.math.Axis; import com.simibubi.create.AllPartialModels; -import com.simibubi.create.content.kinetics.base.ShaftInstance; +import com.simibubi.create.content.kinetics.base.ShaftVisual; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.AnimationTickHolder; -public class PressInstance extends ShaftInstance implements DynamicVisual { +public class PressVisual extends ShaftVisual implements DynamicVisual { private final OrientedInstance pressHead; - public PressInstance(VisualizationContext materialManager, MechanicalPressBlockEntity blockEntity) { - super(materialManager, blockEntity); + public PressVisual(VisualizationContext context, MechanicalPressBlockEntity blockEntity) { + super(context, blockEntity); pressHead = instancerProvider.instancer(InstanceTypes.ORIENTED, Models.partial(AllPartialModels.MECHANICAL_PRESS_HEAD), RenderStage.AFTER_BLOCK_ENTITIES) .createInstance(); diff --git a/src/main/java/com/simibubi/create/content/kinetics/saw/SawInstance.java b/src/main/java/com/simibubi/create/content/kinetics/saw/SawVisual.java similarity index 78% rename from src/main/java/com/simibubi/create/content/kinetics/saw/SawInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/saw/SawVisual.java index c2a14452d..cbcc88442 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/saw/SawInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/saw/SawVisual.java @@ -4,7 +4,7 @@ import com.jozufozu.flywheel.api.model.Model; import com.jozufozu.flywheel.api.visualization.VisualizationContext; import com.jozufozu.flywheel.lib.model.Models; import com.simibubi.create.AllPartialModels; -import com.simibubi.create.content.kinetics.base.SingleRotatingInstance; +import com.simibubi.create.content.kinetics.base.SingleRotatingVisual; import com.simibubi.create.foundation.render.VirtualRenderHelper; import net.minecraft.core.Direction; @@ -12,10 +12,10 @@ import net.minecraft.world.level.block.Rotation; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -public class SawInstance extends SingleRotatingInstance { +public class SawVisual extends SingleRotatingVisual { - public SawInstance(VisualizationContext materialManager, SawBlockEntity blockEntity) { - super(materialManager, blockEntity); + public SawVisual(VisualizationContext context, SawBlockEntity blockEntity) { + super(context, blockEntity); } @Override diff --git a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockEntityInstance.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockEntityVisual.java similarity index 86% rename from src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockEntityInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockEntityVisual.java index 0358ed896..37dca3c4f 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockEntityInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockEntityVisual.java @@ -13,20 +13,20 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; -import com.simibubi.create.content.kinetics.base.SingleRotatingInstance; import com.simibubi.create.content.kinetics.base.RotatingInstance; +import com.simibubi.create.content.kinetics.base.SingleRotatingVisual; import com.simibubi.create.foundation.render.AllInstanceTypes; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.AxisDirection; -public class BracketedKineticBlockEntityInstance extends SingleRotatingInstance { +public class BracketedKineticBlockEntityVisual extends SingleRotatingVisual { protected RotatingInstance additionalShaft; - public BracketedKineticBlockEntityInstance(VisualizationContext materialManager, BracketedKineticBlockEntity blockEntity) { - super(materialManager, blockEntity); + public BracketedKineticBlockEntityVisual(VisualizationContext context, BracketedKineticBlockEntity blockEntity) { + super(context, blockEntity); } @Override @@ -42,7 +42,7 @@ public class BracketedKineticBlockEntityInstance extends SingleRotatingInstance< Direction.Axis axis = KineticBlockEntityRenderer.getRotationAxisOf(blockEntity); BlockPos pos = blockEntity.getBlockPos(); float offset = BracketedKineticBlockEntityRenderer.getShaftAngleOffset(axis, pos); - var model = Models.partial(AllPartialModels.COGWHEEL_SHAFT, axis, BracketedKineticBlockEntityInstance::rotateToAxis); + var model = Models.partial(AllPartialModels.COGWHEEL_SHAFT, axis, BracketedKineticBlockEntityVisual::rotateToAxis); Instancer half = instancerProvider.instancer(AllInstanceTypes.ROTATING, model, RenderStage.AFTER_BLOCK_ENTITIES); additionalShaft = setup(half.createInstance(), speed); @@ -55,7 +55,7 @@ public class BracketedKineticBlockEntityInstance extends SingleRotatingInstance< return super.model(); Direction.Axis axis = KineticBlockEntityRenderer.getRotationAxisOf(blockEntity); - return Models.partial(AllPartialModels.SHAFTLESS_LARGE_COGWHEEL, axis, BracketedKineticBlockEntityInstance::rotateToAxis); + return Models.partial(AllPartialModels.SHAFTLESS_LARGE_COGWHEEL, axis, BracketedKineticBlockEntityVisual::rotateToAxis); } private static void rotateToAxis(Direction.Axis axis, PoseStack ms) { diff --git a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogInstance.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogVisual.java similarity index 86% rename from src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogVisual.java index a153f2f63..c56594507 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogVisual.java @@ -16,7 +16,7 @@ import com.mojang.math.Axis; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.IRotate; import com.simibubi.create.content.kinetics.base.KineticBlockEntity; -import com.simibubi.create.content.kinetics.base.KineticBlockEntityInstance; +import com.simibubi.create.content.kinetics.base.KineticBlockEntityVisual; import com.simibubi.create.content.kinetics.base.RotatingInstance; import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockEntityRenderer; import com.simibubi.create.foundation.render.AllInstanceTypes; @@ -28,7 +28,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -public class EncasedCogInstance extends KineticBlockEntityInstance { +public class EncasedCogVisual extends KineticBlockEntityVisual { private boolean large; @@ -36,15 +36,15 @@ public class EncasedCogInstance extends KineticBlockEntityInstance rotatingTopShaft; protected Optional rotatingBottomShaft; - public static EncasedCogInstance small(VisualizationContext modelManager, KineticBlockEntity blockEntity) { - return new EncasedCogInstance(modelManager, blockEntity, false); + public static EncasedCogVisual small(VisualizationContext modelManager, KineticBlockEntity blockEntity) { + return new EncasedCogVisual(modelManager, blockEntity, false); } - public static EncasedCogInstance large(VisualizationContext modelManager, KineticBlockEntity blockEntity) { - return new EncasedCogInstance(modelManager, blockEntity, true); + public static EncasedCogVisual large(VisualizationContext modelManager, KineticBlockEntity blockEntity) { + return new EncasedCogVisual(modelManager, blockEntity, true); } - public EncasedCogInstance(VisualizationContext modelManager, KineticBlockEntity blockEntity, boolean large) { + public EncasedCogVisual(VisualizationContext modelManager, KineticBlockEntity blockEntity, boolean large) { super(modelManager, blockEntity); this.large = large; } @@ -102,7 +102,7 @@ public class EncasedCogInstance extends KineticBlockEntityInstance implements DynamicVisual { +public class SteamEngineVisual extends AbstractBlockEntityVisual implements DynamicVisual { protected final TransformedInstance piston; protected final TransformedInstance linkage; protected final TransformedInstance connector; - public SteamEngineInstance(VisualizationContext materialManager, SteamEngineBlockEntity blockEntity) { - super(materialManager, blockEntity); + public SteamEngineVisual(VisualizationContext context, SteamEngineBlockEntity blockEntity) { + super(context, blockEntity); piston = instancerProvider.instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.ENGINE_PISTON), RenderStage.AFTER_BLOCK_ENTITIES) .createInstance(); diff --git a/src/main/java/com/simibubi/create/content/kinetics/transmission/SplitShaftInstance.java b/src/main/java/com/simibubi/create/content/kinetics/transmission/SplitShaftVisual.java similarity index 91% rename from src/main/java/com/simibubi/create/content/kinetics/transmission/SplitShaftInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/transmission/SplitShaftVisual.java index 1b59f0cbe..8300dcd58 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/transmission/SplitShaftInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/transmission/SplitShaftVisual.java @@ -10,7 +10,7 @@ import com.jozufozu.flywheel.lib.instance.AbstractInstance; import com.jozufozu.flywheel.lib.model.Models; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.IRotate; -import com.simibubi.create.content.kinetics.base.KineticBlockEntityInstance; +import com.simibubi.create.content.kinetics.base.KineticBlockEntityVisual; import com.simibubi.create.content.kinetics.base.RotatingInstance; import com.simibubi.create.foundation.render.AllInstanceTypes; import com.simibubi.create.foundation.utility.Iterate; @@ -18,11 +18,11 @@ import com.simibubi.create.foundation.utility.Iterate; import net.minecraft.core.Direction; import net.minecraft.world.level.block.Block; -public class SplitShaftInstance extends KineticBlockEntityInstance { +public class SplitShaftVisual extends KineticBlockEntityVisual { protected final ArrayList keys; - public SplitShaftInstance(VisualizationContext modelManager, SplitShaftBlockEntity blockEntity) { + public SplitShaftVisual(VisualizationContext modelManager, SplitShaftBlockEntity blockEntity) { super(modelManager, blockEntity); keys = new ArrayList<>(2); diff --git a/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelInstance.java b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelVisual.java similarity index 66% rename from src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelInstance.java rename to src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelVisual.java index 0792ffd7e..532aa6f05 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelInstance.java +++ b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelVisual.java @@ -5,7 +5,7 @@ import com.jozufozu.flywheel.api.visualization.VisualizationContext; import com.jozufozu.flywheel.lib.model.ModelCache; import com.jozufozu.flywheel.lib.model.baked.BakedModelBuilder; import com.mojang.blaze3d.vertex.PoseStack; -import com.simibubi.create.content.kinetics.base.CutoutRotatingInstance; +import com.simibubi.create.content.kinetics.base.CutoutRotatingVisual; import com.simibubi.create.foundation.render.CachedBufferer; import net.minecraft.client.resources.model.BakedModel; @@ -13,24 +13,24 @@ import net.minecraft.core.Direction; import net.minecraft.core.Direction.AxisDirection; import net.minecraft.world.level.block.state.BlockState; -public class WaterWheelInstance extends CutoutRotatingInstance { - private static final ModelCache MODEL_CACHE = new ModelCache<>(WaterWheelInstance::createModel); +public class WaterWheelVisual extends CutoutRotatingVisual { + private static final ModelCache MODEL_CACHE = new ModelCache<>(WaterWheelVisual::createModel); protected final boolean large; protected final WaterWheelModelKey key; - public WaterWheelInstance(VisualizationContext materialManager, T blockEntity, boolean large) { - super(materialManager, blockEntity); + public WaterWheelVisual(VisualizationContext context, T blockEntity, boolean large) { + super(context, blockEntity); this.large = large; key = new WaterWheelModelKey(large, blockState, blockEntity.material); } - public static WaterWheelInstance standard(VisualizationContext materialManager, T blockEntity) { - return new WaterWheelInstance<>(materialManager, blockEntity, false); + public static WaterWheelVisual standard(VisualizationContext context, T blockEntity) { + return new WaterWheelVisual<>(context, blockEntity, false); } - public static WaterWheelInstance large(VisualizationContext materialManager, T blockEntity) { - return new WaterWheelInstance<>(materialManager, blockEntity, true); + public static WaterWheelVisual large(VisualizationContext context, T blockEntity) { + return new WaterWheelVisual<>(context, blockEntity, true); } @Override diff --git a/src/main/java/com/simibubi/create/content/logistics/depot/EjectorInstance.java b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorVisual.java similarity index 86% rename from src/main/java/com/simibubi/create/content/logistics/depot/EjectorInstance.java rename to src/main/java/com/simibubi/create/content/logistics/depot/EjectorVisual.java index 8fa2db89a..7b7050df5 100644 --- a/src/main/java/com/simibubi/create/content/logistics/depot/EjectorInstance.java +++ b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorVisual.java @@ -11,18 +11,16 @@ import com.jozufozu.flywheel.lib.instance.InstanceTypes; import com.jozufozu.flywheel.lib.instance.TransformedInstance; import com.jozufozu.flywheel.lib.model.Models; import com.simibubi.create.AllPartialModels; -import com.simibubi.create.content.kinetics.base.ShaftInstance; +import com.simibubi.create.content.kinetics.base.ShaftVisual; import com.simibubi.create.foundation.utility.AnimationTickHolder; -import net.minecraft.util.Mth; - -public class EjectorInstance extends ShaftInstance implements DynamicVisual { +public class EjectorVisual extends ShaftVisual implements DynamicVisual { protected final TransformedInstance plate; private float lastProgress = Float.NaN; - public EjectorInstance(VisualizationContext dispatcher, EjectorBlockEntity blockEntity) { + public EjectorVisual(VisualizationContext dispatcher, EjectorBlockEntity blockEntity) { super(dispatcher, blockEntity); plate = instancerProvider.instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.EJECTOR_TOP), RenderStage.AFTER_BLOCK_ENTITIES).createInstance(); diff --git a/src/main/java/com/simibubi/create/content/logistics/flwdata/FlapData.java b/src/main/java/com/simibubi/create/content/logistics/flwdata/FlapInstance.java similarity index 67% rename from src/main/java/com/simibubi/create/content/logistics/flwdata/FlapData.java rename to src/main/java/com/simibubi/create/content/logistics/flwdata/FlapInstance.java index 254ed5b41..1ef7599b3 100644 --- a/src/main/java/com/simibubi/create/content/logistics/flwdata/FlapData.java +++ b/src/main/java/com/simibubi/create/content/logistics/flwdata/FlapInstance.java @@ -10,7 +10,7 @@ import com.jozufozu.flywheel.lib.instance.FlatLit; import net.minecraft.client.renderer.LightTexture; import net.minecraft.core.BlockPos; -public class FlapData extends AbstractInstance implements FlatLit { +public class FlapInstance extends AbstractInstance implements FlatLit { public float x; public float y; @@ -28,20 +28,20 @@ public class FlapData extends AbstractInstance implements FlatLit { public float flapScale; public float flapness; - public FlapData(InstanceType type, InstanceHandle handle) { + public FlapInstance(InstanceType type, InstanceHandle handle) { super(type, handle); } - public FlapData setPosition(BlockPos pos) { + public FlapInstance setPosition(BlockPos pos) { return setPosition(pos.getX(), pos.getY(), pos.getZ()); } - public FlapData setPosition(Vector3f pos) { + public FlapInstance setPosition(Vector3f pos) { return setPosition(pos.x(), pos.y(), pos.z()); } - public FlapData setPosition(float x, float y, float z) { + public FlapInstance setPosition(float x, float y, float z) { this.x = x; this.y = y; this.z = z; @@ -49,13 +49,13 @@ public class FlapData extends AbstractInstance implements FlatLit { } @Override - public FlapData setBlockLight(int blockLight) { + public FlapInstance setBlockLight(int blockLight) { this.blockLight = (byte) (blockLight & 0xF); return this; } @Override - public FlapData setSkyLight(int skyLight) { + public FlapInstance setSkyLight(int skyLight) { this.skyLight = (byte) (skyLight & 0xF); return this; } @@ -65,34 +65,34 @@ public class FlapData extends AbstractInstance implements FlatLit { return LightTexture.pack(this.blockLight, this.skyLight); } - public FlapData setSegmentOffset(float x, float y, float z) { + public FlapInstance setSegmentOffset(float x, float y, float z) { this.segmentOffsetX = x; this.segmentOffsetY = y; this.segmentOffsetZ = z; return this; } - public FlapData setIntensity(float intensity) { + public FlapInstance setIntensity(float intensity) { this.intensity = intensity; return this; } - public FlapData setHorizontalAngle(float horizontalAngle) { + public FlapInstance setHorizontalAngle(float horizontalAngle) { this.horizontalAngle = horizontalAngle; return this; } - public FlapData setFlapScale(float flapScale) { + public FlapInstance setFlapScale(float flapScale) { this.flapScale = flapScale; return this; } - public FlapData setFlapness(float flapness) { + public FlapInstance setFlapness(float flapness) { this.flapness = flapness; return this; } - public FlapData setPivotVoxelSpace(float x, float y, float z) { + public FlapInstance setPivotVoxelSpace(float x, float y, float z) { pivotX = x / 16f; pivotY = y / 16f; pivotZ = z / 16f; diff --git a/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelInstance.java b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelVisual.java similarity index 82% rename from src/main/java/com/simibubi/create/content/logistics/funnel/FunnelInstance.java rename to src/main/java/com/simibubi/create/content/logistics/funnel/FunnelVisual.java index 4fb952b33..5f6744ed8 100644 --- a/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelInstance.java +++ b/src/main/java/com/simibubi/create/content/logistics/funnel/FunnelVisual.java @@ -14,19 +14,19 @@ import com.jozufozu.flywheel.lib.model.Models; import com.jozufozu.flywheel.lib.model.baked.PartialModel; import com.jozufozu.flywheel.lib.visual.AbstractBlockEntityVisual; import com.simibubi.create.AllPartialModels; -import com.simibubi.create.content.logistics.flwdata.FlapData; +import com.simibubi.create.content.logistics.flwdata.FlapInstance; import com.simibubi.create.foundation.render.AllInstanceTypes; import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.core.Direction; import net.minecraft.world.level.LightLayer; -public class FunnelInstance extends AbstractBlockEntityVisual implements DynamicVisual { +public class FunnelVisual extends AbstractBlockEntityVisual implements DynamicVisual { - private final ArrayList flaps; + private final ArrayList flaps; - public FunnelInstance(VisualizationContext materialManager, FunnelBlockEntity blockEntity) { - super(materialManager, blockEntity); + public FunnelVisual(VisualizationContext context, FunnelBlockEntity blockEntity) { + super(context, blockEntity); flaps = new ArrayList<>(4); @@ -34,7 +34,7 @@ public class FunnelInstance extends AbstractBlockEntityVisual PartialModel flapPartial = (blockState.getBlock() instanceof FunnelBlock ? AllPartialModels.FUNNEL_FLAP : AllPartialModels.BELT_FUNNEL_FLAP); - Instancer model = instancerProvider.instancer(AllInstanceTypes.FLAPS, Models.partial(flapPartial), RenderStage.AFTER_BLOCK_ENTITIES); + Instancer model = instancerProvider.instancer(AllInstanceTypes.FLAPS, Models.partial(flapPartial), RenderStage.AFTER_BLOCK_ENTITIES); int blockLight = level.getBrightness(LightLayer.BLOCK, pos); int skyLight = level.getBrightness(LightLayer.SKY, pos); @@ -48,7 +48,7 @@ public class FunnelInstance extends AbstractBlockEntityVisual float intensity = segment == 3 ? 1.5f : segment + 1; float segmentOffset = -3.05f / 16f * segment + 0.075f / 16f; - FlapData key = model.createInstance(); + FlapInstance key = model.createInstance(); key.setPosition(getVisualPosition()) .setSegmentOffset(segmentOffset, 0, -blockEntity.getFlapOffset()) @@ -70,7 +70,7 @@ public class FunnelInstance extends AbstractBlockEntityVisual float flapness = blockEntity.flap.getValue(AnimationTickHolder.getPartialTicks()); - for (FlapData flap : flaps) { + for (FlapInstance flap : flaps) { flap.setFlapness(flapness); } } diff --git a/src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelInstance.java b/src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelVisual.java similarity index 82% rename from src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelInstance.java rename to src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelVisual.java index fc646042e..a306349b2 100644 --- a/src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelInstance.java +++ b/src/main/java/com/simibubi/create/content/logistics/tunnel/BeltTunnelVisual.java @@ -16,7 +16,7 @@ import com.jozufozu.flywheel.lib.instance.AbstractInstance; import com.jozufozu.flywheel.lib.model.Models; import com.jozufozu.flywheel.lib.visual.AbstractBlockEntityVisual; import com.simibubi.create.AllPartialModels; -import com.simibubi.create.content.logistics.flwdata.FlapData; +import com.simibubi.create.content.logistics.flwdata.FlapInstance; import com.simibubi.create.foundation.render.AllInstanceTypes; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.animation.LerpedFloat; @@ -24,16 +24,16 @@ import com.simibubi.create.foundation.utility.animation.LerpedFloat; import net.minecraft.core.Direction; import net.minecraft.world.level.LightLayer; -public class BeltTunnelInstance extends AbstractBlockEntityVisual implements DynamicVisual { +public class BeltTunnelVisual extends AbstractBlockEntityVisual implements DynamicVisual { - private final Map> tunnelFlaps; + private final Map> tunnelFlaps; - public BeltTunnelInstance(VisualizationContext materialManager, BeltTunnelBlockEntity blockEntity) { - super(materialManager, blockEntity); + public BeltTunnelVisual(VisualizationContext context, BeltTunnelBlockEntity blockEntity) { + super(context, blockEntity); tunnelFlaps = new EnumMap<>(Direction.class); - Instancer model = instancerProvider.instancer(AllInstanceTypes.FLAPS, Models.partial(AllPartialModels.BELT_TUNNEL_FLAP), RenderStage.AFTER_BLOCK_ENTITIES); + Instancer model = instancerProvider.instancer(AllInstanceTypes.FLAPS, Models.partial(AllPartialModels.BELT_TUNNEL_FLAP), RenderStage.AFTER_BLOCK_ENTITIES); int blockLight = level.getBrightness(LightLayer.BLOCK, pos); int skyLight = level.getBrightness(LightLayer.SKY, pos); @@ -46,13 +46,13 @@ public class BeltTunnelInstance extends AbstractBlockEntityVisual flaps = new ArrayList<>(4); + ArrayList flaps = new ArrayList<>(4); for (int segment = 0; segment <= 3; segment++) { float intensity = segment == 3 ? 1.5f : segment + 1; float segmentOffset = -3.05f / 16f * segment + 0.075f / 16f; - FlapData key = model.createInstance(); + FlapInstance key = model.createInstance(); key.setPosition(getVisualPosition()) .setSegmentOffset(segmentOffset, 0, 0) @@ -84,7 +84,7 @@ public class BeltTunnelInstance extends AbstractBlockEntityVisual implements DynamicVisual { +public class AnalogLeverVisual extends AbstractBlockEntityVisual implements DynamicVisual { protected final TransformedInstance handle; protected final TransformedInstance indicator; @@ -29,8 +29,8 @@ public class AnalogLeverInstance extends AbstractBlockEntityVisual implements TickableVisual { +public class BrassDiodeVisual extends AbstractBlockEntityVisual implements TickableVisual { protected final TransformedInstance indicator; protected int previousState; - public BrassDiodeInstance(VisualizationContext materialManager, BrassDiodeBlockEntity blockEntity) { - super(materialManager, blockEntity); + public BrassDiodeVisual(VisualizationContext context, BrassDiodeBlockEntity blockEntity) { + super(context, blockEntity); indicator = instancerProvider.instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.FLEXPEATER_INDICATOR), RenderStage.AFTER_BLOCK_ENTITIES).createInstance(); diff --git a/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonInstance.java b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonVisual.java similarity index 86% rename from src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonInstance.java rename to src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonVisual.java index 5560c277e..c2dbdca07 100644 --- a/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonInstance.java +++ b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonVisual.java @@ -6,7 +6,6 @@ import com.jozufozu.flywheel.api.event.RenderStage; import com.jozufozu.flywheel.api.instance.Instance; import com.jozufozu.flywheel.api.visual.DynamicVisual; import com.jozufozu.flywheel.api.visual.VisualFrameContext; -import com.jozufozu.flywheel.api.visual.VisualTickContext; import com.jozufozu.flywheel.api.visualization.VisualizationContext; import com.jozufozu.flywheel.lib.instance.InstanceTypes; import com.jozufozu.flywheel.lib.instance.TransformedInstance; @@ -15,17 +14,16 @@ import com.jozufozu.flywheel.lib.transform.TransformStack; import com.jozufozu.flywheel.lib.visual.AbstractBlockEntityVisual; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.AllPartialModels; -import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.core.Direction; -public class SchematicannonInstance extends AbstractBlockEntityVisual implements DynamicVisual { +public class SchematicannonVisual extends AbstractBlockEntityVisual implements DynamicVisual { private final TransformedInstance connector; private final TransformedInstance pipe; - public SchematicannonInstance(VisualizationContext materialManager, SchematicannonBlockEntity blockEntity) { - super(materialManager, blockEntity); + public SchematicannonVisual(VisualizationContext context, SchematicannonBlockEntity blockEntity) { + super(context, blockEntity); connector = instancerProvider.instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.SCHEMATICANNON_CONNECTOR), RenderStage.AFTER_BLOCK_ENTITIES).createInstance(); pipe = instancerProvider.instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.SCHEMATICANNON_PIPE), RenderStage.AFTER_BLOCK_ENTITIES).createInstance(); diff --git a/src/main/java/com/simibubi/create/content/trains/bogey/BackupBogeyRenderer.java b/src/main/java/com/simibubi/create/content/trains/bogey/BackupBogeyRenderer.java index 1650abb73..417d21767 100644 --- a/src/main/java/com/simibubi/create/content/trains/bogey/BackupBogeyRenderer.java +++ b/src/main/java/com/simibubi/create/content/trains/bogey/BackupBogeyRenderer.java @@ -16,7 +16,7 @@ public class BackupBogeyRenderer extends BogeyRenderer.CommonRenderer { } @Override - public void initialiseContraptionModelData(VisualizationContext materialManager, CarriageBogey carriageBogey) { + public void initialiseContraptionModelData(VisualizationContext context, CarriageBogey carriageBogey) { } } diff --git a/src/main/java/com/simibubi/create/content/trains/bogey/BogeyRenderer.java b/src/main/java/com/simibubi/create/content/trains/bogey/BogeyRenderer.java index 2a2e72230..73d64b18e 100644 --- a/src/main/java/com/simibubi/create/content/trains/bogey/BogeyRenderer.java +++ b/src/main/java/com/simibubi/create/content/trains/bogey/BogeyRenderer.java @@ -181,21 +181,21 @@ public abstract class BogeyRenderer { /** * Provides render implementations a point in setup to instantiate all model data to be needed * - * @param materialManager The material manager + * @param context The visualization context * @param carriageBogey The bogey to create data for */ @OnlyIn(Dist.CLIENT) - public abstract void initialiseContraptionModelData(VisualizationContext materialManager, CarriageBogey carriageBogey); + public abstract void initialiseContraptionModelData(VisualizationContext context, CarriageBogey carriageBogey); /** * Creates instances of models for in-world rendering to a set length from a provided partial model * - * @param materialManager The material manager + * @param context The visualization context * @param model Partial model to be instanced * @param count Amount of models neeeded */ - public void createModelInstance(VisualizationContext materialManager, PartialModel model, int count) { - var instancer = materialManager.instancerProvider() + public void createModelInstance(VisualizationContext context, PartialModel model, int count) { + var instancer = context.instancerProvider() .instancer(InstanceTypes.TRANSFORMED, Models.partial(model), RenderStage.AFTER_BLOCK_ENTITIES); BogeyModelData[] modelData = IntStream.range(0, count) .mapToObj(i -> instancer.createInstance()) @@ -207,12 +207,12 @@ public abstract class BogeyRenderer { /** * Creates instances of models for in-contraption rendering to a set length from a provided blockstate * - * @param materialManager The material manager + * @param context The visualization context * @param state Blockstate of the model to be created * @param count Amount of models needed */ - public void createModelInstance(VisualizationContext materialManager, BlockState state, int count) { - var instancer = materialManager.instancerProvider() + public void createModelInstance(VisualizationContext context, BlockState state, int count) { + var instancer = context.instancerProvider() .instancer(InstanceTypes.TRANSFORMED, VirtualRenderHelper.blockModel(state), RenderStage.AFTER_BLOCK_ENTITIES); BogeyModelData[] modelData = IntStream.range(0, count) .mapToObj(i -> instancer.createInstance()) @@ -224,23 +224,23 @@ public abstract class BogeyRenderer { /** * Creates a single instance of models for in-contraption rendering from a provided blockstate * - * @param materialManager The material manager + * @param context The visualization context * @param states Blockstates of the models to be created */ - public void createModelInstance(VisualizationContext materialManager, BlockState... states) { + public void createModelInstance(VisualizationContext context, BlockState... states) { for (BlockState state : states) - this.createModelInstance(materialManager, state, 1); + this.createModelInstance(context, state, 1); } /** * Helper function to create a single model instance for in-contraption rendering * - * @param materialManager The material manager + * @param context The visualization context * @param models The type of model to create instances of */ - public void createModelInstance(VisualizationContext materialManager, PartialModel... models) { + public void createModelInstance(VisualizationContext context, PartialModel... models) { for (PartialModel model : models) - createModelInstance(materialManager, model, 1); + createModelInstance(context, model, 1); } /** diff --git a/src/main/java/com/simibubi/create/content/trains/bogey/BogeyStyle.java b/src/main/java/com/simibubi/create/content/trains/bogey/BogeyStyle.java index e047138e9..e6c6fcdb7 100644 --- a/src/main/java/com/simibubi/create/content/trains/bogey/BogeyStyle.java +++ b/src/main/java/com/simibubi/create/content/trains/bogey/BogeyStyle.java @@ -116,8 +116,8 @@ public class BogeyStyle { return this.commonRendererFactory.map(Supplier::get); } - public BogeyInstance createInstance(CarriageBogey bogey, BogeySizes.BogeySize size, VisualizationContext materialManager) { - return new BogeyInstance(bogey, this, size, materialManager); + public BogeyVisual createVisual(CarriageBogey bogey, BogeySizes.BogeySize size, VisualizationContext context) { + return new BogeyVisual(bogey, this, size, context); } @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/com/simibubi/create/content/trains/bogey/BogeyInstance.java b/src/main/java/com/simibubi/create/content/trains/bogey/BogeyVisual.java similarity index 82% rename from src/main/java/com/simibubi/create/content/trains/bogey/BogeyInstance.java rename to src/main/java/com/simibubi/create/content/trains/bogey/BogeyVisual.java index 3dd1fd899..60ba5a7e6 100644 --- a/src/main/java/com/simibubi/create/content/trains/bogey/BogeyInstance.java +++ b/src/main/java/com/simibubi/create/content/trains/bogey/BogeyVisual.java @@ -13,7 +13,7 @@ import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.LightLayer; import net.minecraft.world.phys.Vec3; -public final class BogeyInstance { +public final class BogeyVisual { private final BogeySizes.BogeySize size; private final BogeyStyle style; @@ -21,8 +21,8 @@ public final class BogeyInstance { public final BogeyRenderer renderer; public final Optional commonRenderer; - public BogeyInstance(CarriageBogey bogey, BogeyStyle style, BogeySizes.BogeySize size, - VisualizationContext materialManager) { + public BogeyVisual(CarriageBogey bogey, BogeyStyle style, BogeySizes.BogeySize size, + VisualizationContext context) { this.bogey = bogey; this.size = size; this.style = style; @@ -30,8 +30,8 @@ public final class BogeyInstance { this.renderer = this.style.createRendererInstance(this.size); this.commonRenderer = this.style.getNewCommonRenderInstance(); - commonRenderer.ifPresent(bogeyRenderer -> bogeyRenderer.initialiseContraptionModelData(materialManager, bogey)); - renderer.initialiseContraptionModelData(materialManager, bogey); + commonRenderer.ifPresent(bogeyRenderer -> bogeyRenderer.initialiseContraptionModelData(context, bogey)); + renderer.initialiseContraptionModelData(context, bogey); } public void beginFrame(float wheelAngle, PoseStack ms) { @@ -59,7 +59,7 @@ public final class BogeyInstance { } @FunctionalInterface - interface BogeyInstanceFactory { - BogeyInstance create(CarriageBogey bogey, BogeySizes.BogeySize size, VisualizationContext materialManager); + interface BogeyVisualFactory { + BogeyVisual create(CarriageBogey bogey, BogeySizes.BogeySize size, VisualizationContext context); } } diff --git a/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyRenderer.java b/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyRenderer.java index cbb054051..6e6c7fa94 100644 --- a/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyRenderer.java +++ b/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyRenderer.java @@ -22,8 +22,8 @@ import net.minecraft.nbt.CompoundTag; public class StandardBogeyRenderer { public static class CommonStandardBogeyRenderer extends BogeyRenderer.CommonRenderer { @Override - public void initialiseContraptionModelData(VisualizationContext materialManager, CarriageBogey carriageBogey) { - createModelInstance(materialManager, AllBlocks.SHAFT.getDefaultState() + public void initialiseContraptionModelData(VisualizationContext context, CarriageBogey carriageBogey) { + createModelInstance(context, AllBlocks.SHAFT.getDefaultState() .setValue(ShaftBlock.AXIS, Direction.Axis.Z), 2); } @@ -45,9 +45,9 @@ public class StandardBogeyRenderer { public static class SmallStandardBogeyRenderer extends BogeyRenderer { @Override - public void initialiseContraptionModelData(VisualizationContext materialManager, CarriageBogey carriageBogey) { - createModelInstance(materialManager, SMALL_BOGEY_WHEELS, 2); - createModelInstance(materialManager, BOGEY_FRAME); + public void initialiseContraptionModelData(VisualizationContext context, CarriageBogey carriageBogey) { + createModelInstance(context, SMALL_BOGEY_WHEELS, 2); + createModelInstance(context, BOGEY_FRAME); } @@ -78,9 +78,9 @@ public class StandardBogeyRenderer { public static class LargeStandardBogeyRenderer extends BogeyRenderer { @Override - public void initialiseContraptionModelData(VisualizationContext materialManager, CarriageBogey carriageBogey) { - createModelInstance(materialManager, LARGE_BOGEY_WHEELS, BOGEY_DRIVE, BOGEY_PISTON, BOGEY_PIN); - createModelInstance(materialManager, AllBlocks.SHAFT.getDefaultState() + public void initialiseContraptionModelData(VisualizationContext context, CarriageBogey carriageBogey) { + createModelInstance(context, LARGE_BOGEY_WHEELS, BOGEY_DRIVE, BOGEY_PISTON, BOGEY_PIN); + createModelInstance(context, AllBlocks.SHAFT.getDefaultState() .setValue(ShaftBlock.AXIS, Direction.Axis.X), 2); } diff --git a/src/main/java/com/simibubi/create/content/trains/entity/CarriageBogey.java b/src/main/java/com/simibubi/create/content/trains/entity/CarriageBogey.java index 17c8f1444..fe1d78e9c 100644 --- a/src/main/java/com/simibubi/create/content/trains/entity/CarriageBogey.java +++ b/src/main/java/com/simibubi/create/content/trains/entity/CarriageBogey.java @@ -10,8 +10,8 @@ import com.simibubi.create.AllBogeyStyles; import com.simibubi.create.Create; import com.simibubi.create.content.trains.bogey.AbstractBogeyBlock; import com.simibubi.create.content.trains.bogey.AbstractBogeyBlockEntity; -import com.simibubi.create.content.trains.bogey.BogeyInstance; import com.simibubi.create.content.trains.bogey.BogeyStyle; +import com.simibubi.create.content.trains.bogey.BogeyVisual; import com.simibubi.create.content.trains.graph.DimensionPalette; import com.simibubi.create.content.trains.graph.TrackGraph; import com.simibubi.create.foundation.utility.AngleHelper; @@ -199,8 +199,8 @@ public class CarriageBogey { return new CarriageBogey(type, upsideDown, data, points.getFirst(), points.getSecond()); } - public BogeyInstance createInstance(VisualizationContext materialManager) { - return this.getStyle().createInstance(this, type.getSize(), materialManager); + public BogeyVisual createVisual(VisualizationContext context) { + return this.getStyle().createVisual(this, type.getSize(), context); } public BogeyStyle getStyle() { diff --git a/src/main/java/com/simibubi/create/content/trains/entity/CarriageContraptionEntity.java b/src/main/java/com/simibubi/create/content/trains/entity/CarriageContraptionEntity.java index 16bff058d..abfd3a669 100644 --- a/src/main/java/com/simibubi/create/content/trains/entity/CarriageContraptionEntity.java +++ b/src/main/java/com/simibubi/create/content/trains/entity/CarriageContraptionEntity.java @@ -737,10 +737,10 @@ public class CarriageContraptionEntity extends OrientedContraptionEntity { } @OnlyIn(Dist.CLIENT) - private WeakReference instanceHolder; + private WeakReference instanceHolder; @OnlyIn(Dist.CLIENT) - public void bindInstance(CarriageContraptionInstance instance) { + public void bindInstance(CarriageContraptionVisual instance) { this.instanceHolder = new WeakReference<>(instance); updateRenderedPortalCutoff(); } @@ -780,7 +780,7 @@ public class CarriageContraptionEntity extends OrientedContraptionEntity { // update hidden bogeys (if instanced) if (instanceHolder == null) return; - CarriageContraptionInstance instance = instanceHolder.get(); + CarriageContraptionVisual instance = instanceHolder.get(); if (instance == null) return; diff --git a/src/main/java/com/simibubi/create/content/trains/entity/CarriageContraptionInstance.java b/src/main/java/com/simibubi/create/content/trains/entity/CarriageContraptionVisual.java similarity index 83% rename from src/main/java/com/simibubi/create/content/trains/entity/CarriageContraptionInstance.java rename to src/main/java/com/simibubi/create/content/trains/entity/CarriageContraptionVisual.java index 03d20f08d..1309342f3 100644 --- a/src/main/java/com/simibubi/create/content/trains/entity/CarriageContraptionInstance.java +++ b/src/main/java/com/simibubi/create/content/trains/entity/CarriageContraptionVisual.java @@ -8,22 +8,22 @@ import com.jozufozu.flywheel.api.visualization.VisualizationContext; import com.jozufozu.flywheel.lib.transform.TransformStack; import com.jozufozu.flywheel.lib.visual.AbstractEntityVisual; import com.mojang.blaze3d.vertex.PoseStack; -import com.simibubi.create.content.trains.bogey.BogeyInstance; import com.simibubi.create.content.trains.bogey.BogeyRenderer; +import com.simibubi.create.content.trains.bogey.BogeyVisual; import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.Couple; import com.simibubi.create.foundation.utility.Iterate; -public class CarriageContraptionInstance extends AbstractEntityVisual implements DynamicVisual { +public class CarriageContraptionVisual extends AbstractEntityVisual implements DynamicVisual { private final PoseStack ms = new PoseStack(); private Carriage carriage; - private Couple bogeys; + private Couple bogeys; private Couple bogeyHidden; - public CarriageContraptionInstance(VisualizationContext materialManager, CarriageContraptionEntity entity) { - super(materialManager, entity); + public CarriageContraptionVisual(VisualizationContext context, CarriageContraptionEntity entity) { + super(context, entity); bogeyHidden = Couple.create(() -> false); entity.bindInstance(this); } @@ -36,7 +36,7 @@ public class CarriageContraptionInstance extends AbstractEntityVisual - bogey.getStyle().createInstance(bogey, bogey.type.getSize(), manager), visualizationContext); + bogey.getStyle().createVisual(bogey, bogey.type.getSize(), manager), visualizationContext); updateLight(); } @@ -65,7 +65,7 @@ public class CarriageContraptionInstance extends AbstractEntityVisual { +public class TrackVisual extends AbstractBlockEntityVisual { - private List instances; + private List visuals; - public TrackInstance(VisualizationContext materialManager, TrackBlockEntity track) { - super(materialManager, track); + public TrackVisual(VisualizationContext context, TrackBlockEntity track) { + super(context, track); } @Override @@ -44,7 +42,7 @@ public class TrackInstance extends AbstractBlockEntityVisual { return; _delete(); - instances = blockEntity.connections.values() + visuals = blockEntity.connections.values() .stream() .map(this::createInstance) .filter(Objects::nonNull) @@ -63,35 +61,35 @@ public class TrackInstance extends AbstractBlockEntityVisual { @Override public void updateLight() { - if (instances == null) + if (visuals == null) return; - instances.forEach(BezierTrackInstance::updateLight); + visuals.forEach(BezierTrackVisual::updateLight); } @Nullable - private BezierTrackInstance createInstance(BezierConnection bc) { + private BezierTrackVisual createInstance(BezierConnection bc) { if (!bc.isPrimary()) return null; - return new BezierTrackInstance(bc); + return new BezierTrackVisual(bc); } @Override public void _delete() { - if (instances == null) + if (visuals == null) return; - instances.forEach(BezierTrackInstance::delete); + visuals.forEach(BezierTrackVisual::delete); } @Override public void collectCrumblingInstances(Consumer consumer) { - if (instances == null) + if (visuals == null) return; - for (BezierTrackInstance instance : instances) { + for (BezierTrackVisual instance : visuals) { instance.collectCrumblingInstances(consumer); } } - private class BezierTrackInstance { + private class BezierTrackVisual { private final TransformedInstance[] ties; private final TransformedInstance[] left; @@ -100,11 +98,11 @@ public class TrackInstance extends AbstractBlockEntityVisual { private final BlockPos[] leftLightPos; private final BlockPos[] rightLightPos; - private @Nullable GirderInstance girder; + private @Nullable GirderVisual girder; - private BezierTrackInstance(BezierConnection bc) { + private BezierTrackVisual(BezierConnection bc) { BlockPos tePosition = bc.tePositions.getFirst(); - girder = bc.hasGirder ? new GirderInstance(bc) : null; + girder = bc.hasGirder ? new GirderVisual(bc) : null; PoseStack pose = new PoseStack(); TransformStack.of(pose) @@ -182,13 +180,13 @@ public class TrackInstance extends AbstractBlockEntityVisual { girder.collectCrumblingInstances(consumer); } - private class GirderInstance { + private class GirderVisual { private final Couple beams; private final Couple> beamCaps; private final BlockPos[] lightPos; - private GirderInstance(BezierConnection bc) { + private GirderVisual(BezierConnection bc) { BlockPos tePosition = bc.tePositions.getFirst(); PoseStack pose = new PoseStack(); TransformStack.of(pose) diff --git a/src/main/java/com/simibubi/create/foundation/render/AllInstanceTypes.java b/src/main/java/com/simibubi/create/foundation/render/AllInstanceTypes.java index 8f337a039..747b8f042 100644 --- a/src/main/java/com/simibubi/create/foundation/render/AllInstanceTypes.java +++ b/src/main/java/com/simibubi/create/foundation/render/AllInstanceTypes.java @@ -9,10 +9,10 @@ import com.jozufozu.flywheel.api.layout.FloatRepr; import com.jozufozu.flywheel.api.layout.IntegerRepr; import com.jozufozu.flywheel.api.layout.LayoutBuilder; import com.jozufozu.flywheel.lib.instance.SimpleInstanceType; -import com.simibubi.create.content.contraptions.actors.flwdata.ActorInstance; +import com.simibubi.create.content.contraptions.actors.ActorInstance; import com.simibubi.create.content.kinetics.base.RotatingInstance; import com.simibubi.create.content.kinetics.belt.BeltInstance; -import com.simibubi.create.content.logistics.flwdata.FlapData; +import com.simibubi.create.content.logistics.flwdata.FlapInstance; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -120,7 +120,7 @@ public class AllInstanceTypes { MemoryUtil.memPutFloat(ptr + 42, instance.speed); }) .register(); - public static final InstanceType FLAPS = SimpleInstanceType.builder(FlapData::new) + public static final InstanceType FLAPS = SimpleInstanceType.builder(FlapInstance::new) .cullShader(asResource("instance/cull/flap.glsl")) .vertexShader(asResource("instance/flap.vert")) .layout(LayoutBuilder.create()