From 7d265eb2c14b9da4a505819de581eba138b6f6da Mon Sep 17 00:00:00 2001 From: PepperCode1 <44146161+PepperCode1@users.noreply.github.com> Date: Thu, 16 May 2024 16:35:18 -0700 Subject: [PATCH] Rename instance to visual in builders --- .../simibubi/create/AllBlockEntityTypes.java | 116 +++++++++--------- .../com/simibubi/create/AllEntityTypes.java | 8 +- .../compat/jei/GhostIngredientHandler.java | 1 - .../elevator/ElevatorPulleyVisual.java | 2 +- .../gantry/GantryCarriageVisual.java | 2 +- .../render/ContraptionProgram.java | 6 - .../cannon/SchematicannonRenderer.java | 2 +- .../data/CreateBlockEntityBuilder.java | 32 ++--- .../foundation/data/CreateEntityBuilder.java | 30 +++-- .../utility/ghost/GhostBlockRenderer.java | 2 +- 10 files changed, 96 insertions(+), 105 deletions(-) diff --git a/src/main/java/com/simibubi/create/AllBlockEntityTypes.java b/src/main/java/com/simibubi/create/AllBlockEntityTypes.java index c7c3231af..790445320 100644 --- a/src/main/java/com/simibubi/create/AllBlockEntityTypes.java +++ b/src/main/java/com/simibubi/create/AllBlockEntityTypes.java @@ -220,7 +220,7 @@ public class AllBlockEntityTypes { // Schematics public static final BlockEntityEntry SCHEMATICANNON = REGISTRATE .blockEntity("schematicannon", SchematicannonBlockEntity::new) - .instance(() -> SchematicannonVisual::new) + .visual(() -> SchematicannonVisual::new) .validBlocks(AllBlocks.SCHEMATICANNON) .renderer(() -> SchematicannonRenderer::new) .register(); @@ -233,28 +233,28 @@ public class AllBlockEntityTypes { // Kinetics public static final BlockEntityEntry BRACKETED_KINETIC = REGISTRATE .blockEntity("simple_kinetic", BracketedKineticBlockEntity::new) - .instance(() -> BracketedKineticBlockEntityVisual::new, false) + .visual(() -> 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(() -> HalfShaftVisual::new, false) + .visual(() -> HalfShaftVisual::new, false) .validBlocks(AllBlocks.CREATIVE_MOTOR) .renderer(() -> CreativeMotorRenderer::new) .register(); public static final BlockEntityEntry GEARBOX = REGISTRATE .blockEntity("gearbox", GearboxBlockEntity::new) - .instance(() -> GearboxVisual::new, false) + .visual(() -> GearboxVisual::new, false) .validBlocks(AllBlocks.GEARBOX) .renderer(() -> GearboxRenderer::new) .register(); public static final BlockEntityEntry ENCASED_SHAFT = REGISTRATE .blockEntity("encased_shaft", KineticBlockEntity::new) - .instance(() -> ShaftVisual::new, false) + .visual(() -> ShaftVisual::new, false) .validBlocks(AllBlocks.ANDESITE_ENCASED_SHAFT, AllBlocks.BRASS_ENCASED_SHAFT, AllBlocks.ENCASED_CHAIN_DRIVE, AllBlocks.METAL_GIRDER_ENCASED_SHAFT) .renderer(() -> ShaftRenderer::new) @@ -262,28 +262,28 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry ENCASED_COGWHEEL = REGISTRATE .blockEntity("encased_cogwheel", SimpleKineticBlockEntity::new) - .instance(() -> EncasedCogVisual::small, false) + .visual(() -> 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(() -> EncasedCogVisual::large, false) + .visual(() -> 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(() -> ShaftVisual::new, false) + .visual(() -> 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(() -> FanVisual::new, false) + .visual(() -> FanVisual::new, false) .validBlocks(AllBlocks.ENCASED_FAN) .renderer(() -> EncasedFanRenderer::new) .register(); @@ -296,35 +296,35 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry CLUTCH = REGISTRATE .blockEntity("clutch", ClutchBlockEntity::new) - .instance(() -> SplitShaftVisual::new, false) + .visual(() -> SplitShaftVisual::new, false) .validBlocks(AllBlocks.CLUTCH) .renderer(() -> SplitShaftRenderer::new) .register(); public static final BlockEntityEntry GEARSHIFT = REGISTRATE .blockEntity("gearshift", GearshiftBlockEntity::new) - .instance(() -> SplitShaftVisual::new, false) + .visual(() -> SplitShaftVisual::new, false) .validBlocks(AllBlocks.GEARSHIFT) .renderer(() -> SplitShaftRenderer::new) .register(); public static final BlockEntityEntry TURNTABLE = REGISTRATE .blockEntity("turntable", TurntableBlockEntity::new) - .instance(() -> SingleRotatingVisual::new, false) + .visual(() -> SingleRotatingVisual::new, false) .validBlocks(AllBlocks.TURNTABLE) .renderer(() -> KineticBlockEntityRenderer::new) .register(); public static final BlockEntityEntry HAND_CRANK = REGISTRATE .blockEntity("hand_crank", HandCrankBlockEntity::new) - .instance(() -> HandCrankVisual::new) + .visual(() -> HandCrankVisual::new) .validBlocks(AllBlocks.HAND_CRANK) .renderer(() -> HandCrankRenderer::new) .register(); public static final BlockEntityEntry VALVE_HANDLE = REGISTRATE .blockEntity("valve_handle", ValveHandleBlockEntity::new) - .instance(() -> HandCrankVisual::new) + .visual(() -> HandCrankVisual::new) .validBlocks(AllBlocks.COPPER_VALVE_HANDLE) .validBlocks(AllBlocks.DYED_VALVE_HANDLES.toArray()) .renderer(() -> HandCrankRenderer::new) @@ -332,28 +332,28 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry CUCKOO_CLOCK = REGISTRATE .blockEntity("cuckoo_clock", CuckooClockBlockEntity::new) - .instance(() -> HorizontalHalfShaftVisual::new) + .visual(() -> 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(() -> SingleRotatingVisual::new, false) + .visual(() -> SingleRotatingVisual::new, false) .validBlocks(AllBlocks.GANTRY_SHAFT) .renderer(() -> KineticBlockEntityRenderer::new) .register(); public static final BlockEntityEntry GANTRY_PINION = REGISTRATE .blockEntity("gantry_pinion", GantryCarriageBlockEntity::new) - .instance(() -> GantryCarriageVisual::new) + .visual(() -> GantryCarriageVisual::new) .validBlocks(AllBlocks.GANTRY_CARRIAGE) .renderer(() -> GantryCarriageRenderer::new) .register(); public static final BlockEntityEntry MECHANICAL_PUMP = REGISTRATE .blockEntity("mechanical_pump", PumpBlockEntity::new) - .instance(() -> PumpCogVisual::new) + .visual(() -> PumpCogVisual::new) .validBlocks(AllBlocks.MECHANICAL_PUMP) .renderer(() -> PumpRenderer::new) .register(); @@ -382,7 +382,7 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry FLUID_VALVE = REGISTRATE .blockEntity("fluid_valve", FluidValveBlockEntity::new) - .instance(() -> FluidValveVisual::new) + .visual(() -> FluidValveVisual::new) .validBlocks(AllBlocks.FLUID_VALVE) .renderer(() -> FluidValveRenderer::new) .register(); @@ -401,7 +401,7 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry HOSE_PULLEY = REGISTRATE .blockEntity("hose_pulley", HosePulleyBlockEntity::new) - .instance(() -> HosePulleyVisual::new) + .visual(() -> HosePulleyVisual::new) .validBlocks(AllBlocks.HOSE_PULLEY) .renderer(() -> HosePulleyRenderer::new) .register(); @@ -420,7 +420,7 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry BELT = REGISTRATE .blockEntity("belt", BeltBlockEntity::new) - .instance(() -> BeltVisual::new, BeltBlockEntity::shouldRenderNormally) + .visual(() -> BeltVisual::new, BeltBlockEntity::shouldRenderNormally) .validBlocks(AllBlocks.BELT) .renderer(() -> BeltRenderer::new) .register(); @@ -439,21 +439,21 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry ANDESITE_TUNNEL = REGISTRATE .blockEntity("andesite_tunnel", BeltTunnelBlockEntity::new) - .instance(() -> BeltTunnelVisual::new) + .visual(() -> BeltTunnelVisual::new) .validBlocks(AllBlocks.ANDESITE_TUNNEL) .renderer(() -> BeltTunnelRenderer::new) .register(); public static final BlockEntityEntry BRASS_TUNNEL = REGISTRATE .blockEntity("brass_tunnel", BrassTunnelBlockEntity::new) - .instance(() -> BeltTunnelVisual::new) + .visual(() -> BeltTunnelVisual::new) .validBlocks(AllBlocks.BRASS_TUNNEL) .renderer(() -> BeltTunnelRenderer::new) .register(); public static final BlockEntityEntry MECHANICAL_ARM = REGISTRATE .blockEntity("mechanical_arm", ArmBlockEntity::new) - .instance(() -> ArmVisual::new) + .visual(() -> ArmVisual::new) .validBlocks(AllBlocks.MECHANICAL_ARM) .renderer(() -> ArmRenderer::new) .register(); @@ -465,35 +465,35 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry MECHANICAL_PISTON = REGISTRATE .blockEntity("mechanical_piston", MechanicalPistonBlockEntity::new) - .instance(() -> ShaftVisual::new, false) + .visual(() -> 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(() -> BearingVisual::new) + .visual(() -> BearingVisual::new) .validBlocks(AllBlocks.WINDMILL_BEARING) .renderer(() -> BearingRenderer::new) .register(); public static final BlockEntityEntry MECHANICAL_BEARING = REGISTRATE .blockEntity("mechanical_bearing", MechanicalBearingBlockEntity::new) - .instance(() -> BearingVisual::new) + .visual(() -> BearingVisual::new) .validBlocks(AllBlocks.MECHANICAL_BEARING) .renderer(() -> BearingRenderer::new) .register(); public static final BlockEntityEntry CLOCKWORK_BEARING = REGISTRATE .blockEntity("clockwork_bearing", ClockworkBearingBlockEntity::new) - .instance(() -> BearingVisual::new) + .visual(() -> BearingVisual::new) .validBlocks(AllBlocks.CLOCKWORK_BEARING) .renderer(() -> BearingRenderer::new) .register(); public static final BlockEntityEntry ROPE_PULLEY = REGISTRATE .blockEntity("rope_pulley", PulleyBlockEntity::new) - .instance(() -> RopePulleyVisual::new, false) + .visual(() -> RopePulleyVisual::new, false) .validBlocks(AllBlocks.ROPE_PULLEY) .renderer(() -> PulleyRenderer::new) .register(); @@ -518,7 +518,7 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry STICKER = REGISTRATE .blockEntity("sticker", StickerBlockEntity::new) - .instance(() -> StickerVisual::new, false) + .visual(() -> StickerVisual::new, false) .validBlocks(AllBlocks.STICKER) .renderer(() -> StickerRenderer::new) .register(); @@ -531,14 +531,14 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry DRILL = REGISTRATE .blockEntity("drill", DrillBlockEntity::new) - .instance(() -> DrillVisual::new, false) + .visual(() -> DrillVisual::new, false) .validBlocks(AllBlocks.MECHANICAL_DRILL) .renderer(() -> DrillRenderer::new) .register(); public static final BlockEntityEntry SAW = REGISTRATE .blockEntity("saw", SawBlockEntity::new) - .instance(() -> SawVisual::new) + .visual(() -> SawVisual::new) .validBlocks(AllBlocks.MECHANICAL_SAW) .renderer(() -> SawRenderer::new) .register(); @@ -558,7 +558,7 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry PORTABLE_STORAGE_INTERFACE = REGISTRATE .blockEntity("portable_storage_interface", PortableItemInterfaceBlockEntity::new) - .instance(() -> PSIVisual::new) + .visual(() -> PSIVisual::new) .validBlocks(AllBlocks.PORTABLE_STORAGE_INTERFACE) .renderer(() -> PortableStorageInterfaceRenderer::new) .register(); @@ -566,14 +566,14 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry PORTABLE_FLUID_INTERFACE = REGISTRATE .blockEntity("portable_fluid_interface", PortableFluidInterfaceBlockEntity::new) - .instance(() -> PSIVisual::new) + .visual(() -> PSIVisual::new) .validBlocks(AllBlocks.PORTABLE_FLUID_INTERFACE) .renderer(() -> PortableStorageInterfaceRenderer::new) .register(); public static final BlockEntityEntry STEAM_ENGINE = REGISTRATE .blockEntity("steam_engine", SteamEngineBlockEntity::new) - .instance(() -> SteamEngineVisual::new, false) + .visual(() -> SteamEngineVisual::new, false) .validBlocks(AllBlocks.STEAM_ENGINE) .renderer(() -> SteamEngineRenderer::new) .register(); @@ -586,28 +586,28 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry POWERED_SHAFT = REGISTRATE .blockEntity("powered_shaft", PoweredShaftBlockEntity::new) - .instance(() -> SingleRotatingVisual::new, false) + .visual(() -> SingleRotatingVisual::new, false) .validBlocks(AllBlocks.POWERED_SHAFT) .renderer(() -> KineticBlockEntityRenderer::new) .register(); public static final BlockEntityEntry FLYWHEEL = REGISTRATE .blockEntity("flywheel", FlywheelBlockEntity::new) - .instance(() -> FlywheelVisual::new, false) + .visual(() -> FlywheelVisual::new, false) .validBlocks(AllBlocks.FLYWHEEL) .renderer(() -> FlywheelRenderer::new) .register(); public static final BlockEntityEntry MILLSTONE = REGISTRATE .blockEntity("millstone", MillstoneBlockEntity::new) - .instance(() -> MillstoneCogVisual::new, false) + .visual(() -> MillstoneCogVisual::new, false) .validBlocks(AllBlocks.MILLSTONE) .renderer(() -> MillstoneRenderer::new) .register(); public static final BlockEntityEntry CRUSHING_WHEEL = REGISTRATE .blockEntity("crushing_wheel", CrushingWheelBlockEntity::new) - .instance(() -> SingleRotatingVisual::new, false) + .visual(() -> SingleRotatingVisual::new, false) .validBlocks(AllBlocks.CRUSHING_WHEEL) .renderer(() -> KineticBlockEntityRenderer::new) .register(); @@ -621,35 +621,35 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry WATER_WHEEL = REGISTRATE .blockEntity("water_wheel", WaterWheelBlockEntity::new) - .instance(() -> WaterWheelVisual::standard, false) + .visual(() -> 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(() -> WaterWheelVisual::large, false) + .visual(() -> 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(() -> PressVisual::new) + .visual(() -> PressVisual::new) .validBlocks(AllBlocks.MECHANICAL_PRESS) .renderer(() -> MechanicalPressRenderer::new) .register(); public static final BlockEntityEntry MECHANICAL_MIXER = REGISTRATE .blockEntity("mechanical_mixer", MechanicalMixerBlockEntity::new) - .instance(() -> MixerVisual::new) + .visual(() -> MixerVisual::new) .validBlocks(AllBlocks.MECHANICAL_MIXER) .renderer(() -> MechanicalMixerRenderer::new) .register(); public static final BlockEntityEntry DEPLOYER = REGISTRATE .blockEntity("deployer", DeployerBlockEntity::new) - .instance(() -> DeployerVisual::new) + .visual(() -> DeployerVisual::new) .validBlocks(AllBlocks.DEPLOYER) .renderer(() -> DeployerRenderer::new) .register(); @@ -668,42 +668,42 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry MECHANICAL_CRAFTER = REGISTRATE .blockEntity("mechanical_crafter", MechanicalCrafterBlockEntity::new) - .instance(() -> ShaftlessCogwheelVisual::new) + .visual(() -> ShaftlessCogwheelVisual::new) .validBlocks(AllBlocks.MECHANICAL_CRAFTER) .renderer(() -> MechanicalCrafterRenderer::new) .register(); public static final BlockEntityEntry SEQUENCED_GEARSHIFT = REGISTRATE .blockEntity("sequenced_gearshift", SequencedGearshiftBlockEntity::new) - .instance(() -> SplitShaftVisual::new, false) + .visual(() -> 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(() -> ShaftVisual::new) + .visual(() -> ShaftVisual::new) .validBlocks(AllBlocks.ROTATION_SPEED_CONTROLLER) .renderer(() -> SpeedControllerRenderer::new) .register(); public static final BlockEntityEntry SPEEDOMETER = REGISTRATE .blockEntity("speedometer", SpeedGaugeBlockEntity::new) - .instance(() -> GaugeVisual.Speed::new) + .visual(() -> GaugeVisual.Speed::new) .validBlocks(AllBlocks.SPEEDOMETER) .renderer(() -> GaugeRenderer::speed) .register(); public static final BlockEntityEntry STRESSOMETER = REGISTRATE .blockEntity("stressometer", StressGaugeBlockEntity::new) - .instance(() -> GaugeVisual.Stress::new) + .visual(() -> GaugeVisual.Stress::new) .validBlocks(AllBlocks.STRESSOMETER) .renderer(() -> GaugeRenderer::stress) .register(); public static final BlockEntityEntry ANALOG_LEVER = REGISTRATE .blockEntity("analog_lever", AnalogLeverBlockEntity::new) - .instance(() -> AnalogLeverVisual::new, false) + .visual(() -> AnalogLeverVisual::new, false) .validBlocks(AllBlocks.ANALOG_LEVER) .renderer(() -> AnalogLeverRenderer::new) .register(); @@ -762,14 +762,14 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry WEIGHTED_EJECTOR = REGISTRATE .blockEntity("weighted_ejector", EjectorBlockEntity::new) - .instance(() -> EjectorVisual::new) + .visual(() -> EjectorVisual::new) .validBlocks(AllBlocks.WEIGHTED_EJECTOR) .renderer(() -> EjectorRenderer::new) .register(); public static final BlockEntityEntry FUNNEL = REGISTRATE .blockEntity("funnel", FunnelBlockEntity::new) - .instance(() -> FunnelVisual::new) + .visual(() -> FunnelVisual::new) .validBlocks(AllBlocks.BRASS_FUNNEL, AllBlocks.BRASS_BELT_FUNNEL, AllBlocks.ANDESITE_FUNNEL, AllBlocks.ANDESITE_BELT_FUNNEL) .renderer(() -> FunnelRenderer::new) @@ -783,14 +783,14 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry PULSE_EXTENDER = REGISTRATE .blockEntity("pulse_extender", PulseExtenderBlockEntity::new) - .instance(() -> BrassDiodeVisual::new, false) + .visual(() -> BrassDiodeVisual::new, false) .validBlocks(AllBlocks.PULSE_EXTENDER) .renderer(() -> BrassDiodeRenderer::new) .register(); public static final BlockEntityEntry PULSE_REPEATER = REGISTRATE .blockEntity("pulse_repeater", PulseRepeaterBlockEntity::new) - .instance(() -> BrassDiodeVisual::new, false) + .visual(() -> BrassDiodeVisual::new, false) .validBlocks(AllBlocks.PULSE_REPEATER) .renderer(() -> BrassDiodeRenderer::new) .register(); @@ -804,7 +804,7 @@ public class AllBlockEntityTypes { // Curiosities public static final BlockEntityEntry BACKTANK = REGISTRATE .blockEntity("backtank", BacktankBlockEntity::new) - .instance(() -> BacktankVisual::new) + .visual(() -> BacktankVisual::new) .validBlocks(AllBlocks.COPPER_BACKTANK, AllBlocks.NETHERITE_BACKTANK) .renderer(() -> BacktankRenderer::new) .register(); @@ -823,14 +823,14 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry TOOLBOX = REGISTRATE .blockEntity("toolbox", ToolboxBlockEntity::new) - .instance(() -> ToolBoxVisual::new, false) + .visual(() -> ToolBoxVisual::new, false) .validBlocks(AllBlocks.TOOLBOXES.toArray()) .renderer(() -> ToolboxRenderer::new) .register(); public static final BlockEntityEntry TRACK = REGISTRATE .blockEntity("track", TrackBlockEntity::new) - .instance(() -> TrackVisual::new) + .visual(() -> TrackVisual::new) .validBlocksDeferred(TrackMaterial::allBlocks) .renderer(() -> TrackRenderer::new) .register(); @@ -866,7 +866,7 @@ public class AllBlockEntityTypes { public static final BlockEntityEntry FLAP_DISPLAY = REGISTRATE .blockEntity("flap_display", FlapDisplayBlockEntity::new) - .instance(() -> ShaftlessCogwheelVisual::new) + .visual(() -> 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 cd66c0e72..2b21ec3f3 100644 --- a/src/main/java/com/simibubi/create/AllEntityTypes.java +++ b/src/main/java/com/simibubi/create/AllEntityTypes.java @@ -35,21 +35,21 @@ public class AllEntityTypes { public static final EntityEntry ORIENTED_CONTRAPTION = contraption("contraption", OrientedContraptionEntity::new, () -> OrientedContraptionEntityRenderer::new, 5, 3, true) - .instance(() -> ContraptionVisual::new) + .visual(() -> ContraptionVisual::new) .register(); public static final EntityEntry CONTROLLED_CONTRAPTION = contraption("stationary_contraption", ControlledContraptionEntity::new, () -> ContraptionEntityRenderer::new, 20, 40, false) - .instance(() -> ContraptionVisual::new) + .visual(() -> ContraptionVisual::new) .register(); public static final EntityEntry GANTRY_CONTRAPTION = contraption("gantry_contraption", GantryContraptionEntity::new, () -> ContraptionEntityRenderer::new, 10, 40, false) - .instance(() -> ContraptionVisual::new) + .visual(() -> ContraptionVisual::new) .register(); public static final EntityEntry CARRIAGE_CONTRAPTION = contraption("carriage_contraption", CarriageContraptionEntity::new, () -> CarriageContraptionEntityRenderer::new, 15, 3, true) - .instance(() -> CarriageContraptionVisual::new) + .visual(() -> CarriageContraptionVisual::new) .register(); public static final EntityEntry SUPER_GLUE = diff --git a/src/main/java/com/simibubi/create/compat/jei/GhostIngredientHandler.java b/src/main/java/com/simibubi/create/compat/jei/GhostIngredientHandler.java index ed4098fc3..96668a008 100644 --- a/src/main/java/com/simibubi/create/compat/jei/GhostIngredientHandler.java +++ b/src/main/java/com/simibubi/create/compat/jei/GhostIngredientHandler.java @@ -18,7 +18,6 @@ import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.client.renderer.Rect2i; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.accesstransformer.Target; @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault diff --git a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyVisual.java b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyVisual.java index 537532ed5..62c819078 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyVisual.java +++ b/src/main/java/com/simibubi/create/content/contraptions/elevator/ElevatorPulleyVisual.java @@ -1,8 +1,8 @@ package com.simibubi.create.content.contraptions.elevator; -import com.jozufozu.flywheel.lib.visual.SimpleDynamicVisual; import com.jozufozu.flywheel.api.visual.VisualFrameContext; import com.jozufozu.flywheel.api.visualization.VisualizationContext; +import com.jozufozu.flywheel.lib.visual.SimpleDynamicVisual; import com.simibubi.create.content.kinetics.base.ShaftVisual; // TODO diff --git a/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageVisual.java b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageVisual.java index 2965b1b7f..d77b6c3de 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageVisual.java +++ b/src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageVisual.java @@ -3,12 +3,12 @@ package com.simibubi.create.content.contraptions.gantry; import java.util.function.Consumer; import com.jozufozu.flywheel.api.instance.Instance; -import com.jozufozu.flywheel.lib.visual.SimpleDynamicVisual; 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.jozufozu.flywheel.lib.model.Models; +import com.jozufozu.flywheel.lib.visual.SimpleDynamicVisual; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; import com.simibubi.create.content.kinetics.base.ShaftVisual; diff --git a/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionProgram.java b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionProgram.java index 542ed9431..f1a68b403 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionProgram.java +++ b/src/main/java/com/simibubi/create/content/contraptions/render/ContraptionProgram.java @@ -1,11 +1,5 @@ package com.simibubi.create.content.contraptions.render; -import org.joml.Matrix4f; -import org.lwjgl.opengl.GL20; - -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.phys.AABB; - public class ContraptionProgram { // protected final int uLightBoxSize; // protected final int uLightBoxMin; diff --git a/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonRenderer.java b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonRenderer.java index ed2085dab..94994b0b3 100644 --- a/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonRenderer.java +++ b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonRenderer.java @@ -11,8 +11,8 @@ import com.simibubi.create.content.schematics.cannon.LaunchedItem.ForBlockState; import com.simibubi.create.content.schematics.cannon.LaunchedItem.ForEntity; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; import com.simibubi.create.foundation.render.CachedBufferer; -import com.simibubi.create.foundation.render.VirtualRenderHelper; import com.simibubi.create.foundation.render.SuperByteBuffer; +import com.simibubi.create.foundation.render.VirtualRenderHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/simibubi/create/foundation/data/CreateBlockEntityBuilder.java b/src/main/java/com/simibubi/create/foundation/data/CreateBlockEntityBuilder.java index f4647daac..98ad14e0a 100644 --- a/src/main/java/com/simibubi/create/foundation/data/CreateBlockEntityBuilder.java +++ b/src/main/java/com/simibubi/create/foundation/data/CreateBlockEntityBuilder.java @@ -25,7 +25,7 @@ import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; public class CreateBlockEntityBuilder extends BlockEntityBuilder { @Nullable - private NonNullSupplier> instanceFactory; + private NonNullSupplier> visualFactory; private NonNullPredicate renderNormally; private Collection>>> deferredValidBlocks = @@ -56,37 +56,37 @@ public class CreateBlockEntityBuilder extends BlockEnt return super.createEntry(); } - public CreateBlockEntityBuilder instance( - NonNullSupplier> instanceFactory) { - return instance(instanceFactory, true); + public CreateBlockEntityBuilder visual( + NonNullSupplier> visualFactory) { + return visual(visualFactory, true); } - public CreateBlockEntityBuilder instance( - NonNullSupplier> instanceFactory, + public CreateBlockEntityBuilder visual( + NonNullSupplier> visualFactory, boolean renderNormally) { - return instance(instanceFactory, be -> renderNormally); + return visual(visualFactory, be -> renderNormally); } - public CreateBlockEntityBuilder instance( - NonNullSupplier> instanceFactory, + public CreateBlockEntityBuilder visual( + NonNullSupplier> visualFactory, NonNullPredicate renderNormally) { - if (this.instanceFactory == null) { - DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> this::registerInstance); + if (this.visualFactory == null) { + DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> this::registerVisualizer); } - this.instanceFactory = instanceFactory; + this.visualFactory = visualFactory; this.renderNormally = renderNormally; return this; } - protected void registerInstance() { + protected void registerVisualizer() { OneTimeEventReceiver.addModListener(Create.REGISTRATE, FMLClientSetupEvent.class, $ -> { - var instanceFactory = this.instanceFactory; - if (instanceFactory != null) { + var visualFactory = this.visualFactory; + if (visualFactory != null) { NonNullPredicate renderNormally = this.renderNormally; SimpleBlockEntityVisualizer.builder(getEntry()) - .factory(instanceFactory.get()) + .factory(visualFactory.get()) .skipVanillaRender(be -> !renderNormally.test(be)) .apply(); } diff --git a/src/main/java/com/simibubi/create/foundation/data/CreateEntityBuilder.java b/src/main/java/com/simibubi/create/foundation/data/CreateEntityBuilder.java index f745eae51..63e64e72f 100644 --- a/src/main/java/com/simibubi/create/foundation/data/CreateEntityBuilder.java +++ b/src/main/java/com/simibubi/create/foundation/data/CreateEntityBuilder.java @@ -23,7 +23,7 @@ import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; public class CreateEntityBuilder extends EntityBuilder { @Nullable - private NonNullSupplier> instanceFactory; + private NonNullSupplier> visualFactory; private NonNullPredicate renderNormally; public static EntityBuilder create(AbstractRegistrate owner, P parent, String name, BuilderCallback callback, EntityType.EntityFactory factory, MobCategory classification) { @@ -34,37 +34,35 @@ public class CreateEntityBuilder extends EntityBuilder instance(NonNullSupplier> instanceFactory) { - return instance(instanceFactory, true); + public CreateEntityBuilder visual(NonNullSupplier> visualFactory) { + return visual(visualFactory, true); } - public CreateEntityBuilder instance(NonNullSupplier> instanceFactory, boolean renderNormally) { - return instance(instanceFactory, be -> renderNormally); + public CreateEntityBuilder visual(NonNullSupplier> visualFactory, boolean renderNormally) { + return visual(visualFactory, entity -> renderNormally); } - public CreateEntityBuilder instance(NonNullSupplier> instanceFactory, NonNullPredicate renderNormally) { - if (this.instanceFactory == null) { - DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> this::registerInstance); + public CreateEntityBuilder visual(NonNullSupplier> visualFactory, NonNullPredicate renderNormally) { + if (this.visualFactory == null) { + DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> this::registerVisualizer); } - this.instanceFactory = instanceFactory; + this.visualFactory = visualFactory; this.renderNormally = renderNormally; return this; } - protected void registerInstance() { + protected void registerVisualizer() { OneTimeEventReceiver.addModListener(Create.REGISTRATE, FMLClientSetupEvent.class, $ -> { - var instanceFactory = this.instanceFactory; - if (instanceFactory != null) { + var visualFactory = this.visualFactory; + if (visualFactory != null) { NonNullPredicate renderNormally = this.renderNormally; SimpleEntityVisualizer.builder(getEntry()) - .factory(instanceFactory.get()) - .skipVanillaRender(be -> !renderNormally.test(be)) + .factory(visualFactory.get()) + .skipVanillaRender(entity -> !renderNormally.test(entity)) .apply(); } - }); } - } diff --git a/src/main/java/com/simibubi/create/foundation/utility/ghost/GhostBlockRenderer.java b/src/main/java/com/simibubi/create/foundation/utility/ghost/GhostBlockRenderer.java index 778fdc846..097bef997 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/ghost/GhostBlockRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/utility/ghost/GhostBlockRenderer.java @@ -7,8 +7,8 @@ import javax.annotation.Nullable; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.simibubi.create.foundation.placement.PlacementHelpers; -import com.simibubi.create.foundation.render.VirtualRenderHelper; import com.simibubi.create.foundation.render.SuperRenderTypeBuffer; +import com.simibubi.create.foundation.render.VirtualRenderHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.LevelRenderer;