port: fix contraption types

realRobotix · realRobotix · commit 8c6167752582 · 2025-04-24T23:27:35.000+02:00
diff --git a/src/main/java/rbasamoyai/createbigcannons/CreateBigCannons.java b/src/main/java/rbasamoyai/createbigcannons/CreateBigCannons.java
@@ -59,7 +59,7 @@ public static void init() {
 		CBCRecipeTypes.register();
 		CBCCannonContraptionTypes.register();
 
-		CBCContraptionTypes.prepare();
+		CBCContraptionTypes.init();
 		CBCArmInteractionPointTypes.register();
 		CBCChecks.register();
 		CBCTags.register();
diff --git a/src/main/java/rbasamoyai/createbigcannons/cannon_control/contraption/MountedAutocannonContraption.java b/src/main/java/rbasamoyai/createbigcannons/cannon_control/contraption/MountedAutocannonContraption.java
@@ -531,7 +531,7 @@ public void readNBT(Level level, CompoundTag tag, boolean clientData) {
 
 	@Override
 	public ContraptionType getType() {
-		return CBCContraptionTypes.MOUNTED_AUTOCANNON;
+		return CBCContraptionTypes.MOUNTED_AUTOCANNON.value();
 	}
 
 	@Override
diff --git a/src/main/java/rbasamoyai/createbigcannons/cannon_control/contraption/MountedBigCannonContraption.java b/src/main/java/rbasamoyai/createbigcannons/cannon_control/contraption/MountedBigCannonContraption.java
@@ -626,7 +626,7 @@ public void readNBT(Level level, CompoundTag tag, boolean clientData) {
 
 	@Override
 	public ContraptionType getType() {
-		return CBCContraptionTypes.MOUNTED_CANNON;
+		return CBCContraptionTypes.MOUNTED_CANNON.value();
 	}
 
 	public boolean isDropMortar() {
diff --git a/src/main/java/rbasamoyai/createbigcannons/cannon_control/fixed_cannon_mount/FixedCannonMountBlockEntity.java b/src/main/java/rbasamoyai/createbigcannons/cannon_control/fixed_cannon_mount/FixedCannonMountBlockEntity.java
@@ -238,7 +238,7 @@ public BlockPos getControllerBlockPos() {
 	}
 
 	@Override
-	public void _delete() {
+	public void remove() {
 		this.remove = true;
 		if (!this.level.isClientSide)
 			this.disassemble();
diff --git a/src/main/java/rbasamoyai/createbigcannons/cannon_control/fixed_cannon_mount/FixedCannonMountValueScreen.java b/src/main/java/rbasamoyai/createbigcannons/cannon_control/fixed_cannon_mount/FixedCannonMountValueScreen.java
@@ -18,8 +18,8 @@ public class FixedCannonMountValueScreen extends ValueSettingsScreen {
 	private final BlockPos posCopy;
 
 	public FixedCannonMountValueScreen(BlockPos pos, ValueSettingsBoard board, ValueSettings valueSettings,
-                                       Consumer<ValueSettings> onHover, boolean pitch) {
-		super(pos, board, valueSettings, onHover);
+                                       Consumer<ValueSettings> onHover, boolean pitch, int netId) {
+		super(pos, board, valueSettings, onHover, netId);
 		this.pitch = pitch;
 		this.posCopy = pos;
 	}
@@ -29,7 +29,7 @@ protected void saveAndClose(double pMouseX, double pMouseY) {
 		ValueSettings closest = getClosestCoordinate((int) pMouseX, (int) pMouseY);
 		// FIXME: value settings may be face-sensitive on future components - taken from ValueSettingsScreen#saveAndClose
 		NetworkPlatform.sendToServer(new ServerboundSetFixedCannonMountValuePacket(this.posCopy, closest.row(), closest.value(),
-			null, Direction.UP, AllKeys.ctrlDown(), this.pitch));
+			null, null, Direction.UP, AllKeys.ctrlDown(), this.pitch));
 		this.onClose();
 	}
 
diff --git a/src/main/java/rbasamoyai/createbigcannons/cannon_loading/CBCModifiedContraptionRegistry.java b/src/main/java/rbasamoyai/createbigcannons/cannon_loading/CBCModifiedContraptionRegistry.java
@@ -1,5 +1,6 @@
 package rbasamoyai.createbigcannons.cannon_loading;
 
+import com.simibubi.create.AllContraptionTypes;
 import com.simibubi.create.api.contraption.ContraptionType;
 import com.simibubi.create.content.contraptions.Contraption;
 
@@ -33,14 +34,14 @@ public static boolean isFragileContraption(Contraption contraption) {
 	}
 
 	public static void registerDefaults() {
-		registerCannonLoaderType(CBCContraptionTypes.CANNON_LOADER);
-		registerCannonLoaderType(ContraptionType.PISTON);
-		registerCannonLoaderType(ContraptionType.GANTRY);
-		registerCannonLoaderType(ContraptionType.PULLEY);
-		registerFragileType(CBCContraptionTypes.CANNON_LOADER);
-		registerFragileType(ContraptionType.PISTON);
-		registerFragileType(ContraptionType.GANTRY);
-		registerFragileType(ContraptionType.PULLEY);
+		registerCannonLoaderType(CBCContraptionTypes.CANNON_LOADER.value());
+		registerCannonLoaderType(AllContraptionTypes.PISTON.value());
+		registerCannonLoaderType(AllContraptionTypes.GANTRY.value());
+		registerCannonLoaderType(AllContraptionTypes.PULLEY.value());
+		registerFragileType(CBCContraptionTypes.CANNON_LOADER.value());
+		registerFragileType(AllContraptionTypes.PISTON.value());
+		registerFragileType(AllContraptionTypes.GANTRY.value());
+		registerFragileType(AllContraptionTypes.PULLEY.value());
 	}
 
 }
diff --git a/src/main/java/rbasamoyai/createbigcannons/cannon_loading/CannonLoadingContraption.java b/src/main/java/rbasamoyai/createbigcannons/cannon_loading/CannonLoadingContraption.java
@@ -347,7 +347,7 @@ public CompoundTag writeNBT(boolean spawnPacket) {
 
 	@Override
 	public ContraptionType getType() {
-		return CBCContraptionTypes.CANNON_LOADER;
+		return CBCContraptionTypes.CANNON_LOADER.value();
 	}
 
 	@Override
diff --git a/src/main/java/rbasamoyai/createbigcannons/cannons/autocannon/breech/AutocannonBreechRenderer.java b/src/main/java/rbasamoyai/createbigcannons/cannons/autocannon/breech/AutocannonBreechRenderer.java
@@ -1,5 +1,7 @@
 package rbasamoyai.createbigcannons.cannons.autocannon.breech;
 
+import dev.engine_room.flywheel.api.visualization.VisualizationManager;
+
 import org.joml.Quaternionf;
 import org.joml.Vector3f;
 
diff --git a/src/main/java/rbasamoyai/createbigcannons/cannons/big_cannons/breeches/quickfiring_breech/QuickfiringBreechBlock.java b/src/main/java/rbasamoyai/createbigcannons/cannons/big_cannons/breeches/quickfiring_breech/QuickfiringBreechBlock.java
@@ -289,7 +289,7 @@ public InteractionResult onWrenched(BlockState state, UseOnContext context) {
 					}
 					newBe.setChanged();
 				}
-				this.playRemoveSound(level, pos);
+				// this.playRemoveSound(level, pos); todo: c6 fix
 			}
 			return InteractionResult.sidedSuccess(level.isClientSide);
 		}
diff --git a/src/main/java/rbasamoyai/createbigcannons/cannons/big_cannons/breeches/quickfiring_breech/QuickfiringBreechBlockEntityRenderer.java b/src/main/java/rbasamoyai/createbigcannons/cannons/big_cannons/breeches/quickfiring_breech/QuickfiringBreechBlockEntityRenderer.java
@@ -1,5 +1,7 @@
 package rbasamoyai.createbigcannons.cannons.big_cannons.breeches.quickfiring_breech;
 
+import dev.engine_room.flywheel.api.visualization.VisualizationManager;
+
 import org.joml.Quaternionf;
 import org.joml.Vector3f;
 
diff --git a/src/main/java/rbasamoyai/createbigcannons/cannons/big_cannons/breeches/screw_breech/ScrewBreechBlockEntityRenderer.java b/src/main/java/rbasamoyai/createbigcannons/cannons/big_cannons/breeches/screw_breech/ScrewBreechBlockEntityRenderer.java
@@ -1,5 +1,7 @@
 package rbasamoyai.createbigcannons.cannons.big_cannons.breeches.screw_breech;
 
+import dev.engine_room.flywheel.api.visualization.VisualizationManager;
+
 import org.joml.Quaternionf;
 import org.joml.Vector3f;
 
diff --git a/src/main/java/rbasamoyai/createbigcannons/crafting/boring/CannonDrillingContraption.java b/src/main/java/rbasamoyai/createbigcannons/crafting/boring/CannonDrillingContraption.java
@@ -148,7 +148,7 @@ protected boolean customBlockRemoval(LevelAccessor level, BlockPos pos, BlockSta
 
 	@Override
 	public ContraptionType getType() {
-		return CBCContraptionTypes.CANNON_DRILL;
+		return CBCContraptionTypes.CANNON_DRILL.value();
 	}
 
 }
diff --git a/src/main/java/rbasamoyai/createbigcannons/crafting/builtup/CannonBuildingContraption.java b/src/main/java/rbasamoyai/createbigcannons/crafting/builtup/CannonBuildingContraption.java
@@ -430,7 +430,7 @@ public void readNBT(Level level, CompoundTag tag, boolean spawnData) {
 
 	@Override
 	public ContraptionType getType() {
-		return CBCContraptionTypes.CANNON_BUILDER;
+		return CBCContraptionTypes.CANNON_BUILDER.value();
 	}
 
 	public static AssemblyException tooManyPistonPoles() {
diff --git a/src/main/java/rbasamoyai/createbigcannons/index/CBCBlockEntities.java b/src/main/java/rbasamoyai/createbigcannons/index/CBCBlockEntities.java
@@ -119,7 +119,7 @@ public class CBCBlockEntities {
 
 	public static final BlockEntityEntry<CannonMountExtensionBlockEntity> CANNON_MOUNT_EXTENSION = REGISTRATE
 		.blockEntity("cannon_mount_extension", CannonMountExtensionBlockEntity::new)
-		.visual(() -> ShaftInstance::new)
+		.visual(() -> ShaftVisual::new)
 		.renderer(() -> ShaftRenderer::new)
 		.validBlock(CBCBlocks.CANNON_MOUNT_EXTENSION)
 		.register();
diff --git a/src/main/java/rbasamoyai/createbigcannons/index/CBCContraptionTypes.java b/src/main/java/rbasamoyai/createbigcannons/index/CBCContraptionTypes.java
@@ -1,24 +1,42 @@
 package rbasamoyai.createbigcannons.index;
 
+import com.simibubi.create.AllContraptionTypes;
+import com.simibubi.create.Create;
 import com.simibubi.create.api.contraption.ContraptionType;
 
+import com.simibubi.create.api.registry.CreateBuiltInRegistries;
+import com.simibubi.create.content.contraptions.Contraption;
+
+import net.minecraft.core.Holder;
+import net.minecraft.core.Registry;
 import rbasamoyai.createbigcannons.CreateBigCannons;
 import rbasamoyai.createbigcannons.cannon_control.contraption.MountedAutocannonContraption;
 import rbasamoyai.createbigcannons.cannon_control.contraption.MountedBigCannonContraption;
 import rbasamoyai.createbigcannons.cannon_loading.CannonLoadingContraption;
 import rbasamoyai.createbigcannons.crafting.boring.CannonDrillingContraption;
 import rbasamoyai.createbigcannons.crafting.builtup.CannonBuildingContraption;
 
+import java.util.function.Supplier;
+
+import static com.simibubi.create.AllContraptionTypes.BY_LEGACY_NAME;
+
 public class CBCContraptionTypes {
 
-	public static final ContraptionType
-		CANNON_LOADER = ContraptionType.register(CreateBigCannons.resource("cannon_loader").toString(), CannonLoadingContraption::new),
-		MOUNTED_CANNON = ContraptionType.register(CreateBigCannons.resource("mounted_cannon").toString(), MountedBigCannonContraption::new),
-		MOUNTED_AUTOCANNON = ContraptionType.register(CreateBigCannons.resource("mounted_autocannon").toString(), MountedAutocannonContraption::new),
-		CANNON_DRILL = ContraptionType.register(CreateBigCannons.resource("cannon_drill").toString(), CannonDrillingContraption::new),
-		CANNON_BUILDER = ContraptionType.register(CreateBigCannons.resource("cannon_builder").toString(), CannonBuildingContraption::new);
+	public static final Holder.Reference<ContraptionType>
+		CANNON_LOADER = register(CreateBigCannons.resource("cannon_loader").toString(), CannonLoadingContraption::new),
+        MOUNTED_CANNON = register(CreateBigCannons.resource("mounted_cannon").toString(), MountedBigCannonContraption::new),
+        MOUNTED_AUTOCANNON = register(CreateBigCannons.resource("mounted_autocannon").toString(), MountedAutocannonContraption::new),
+        CANNON_DRILL = register(CreateBigCannons.resource("cannon_drill").toString(), CannonDrillingContraption::new),
+        CANNON_BUILDER = register(CreateBigCannons.resource("cannon_builder").toString(), CannonBuildingContraption::new);
+
+    private static Holder.Reference<ContraptionType> register(String name, Supplier<? extends Contraption> factory) {
+        ContraptionType type = new ContraptionType(factory);
+        BY_LEGACY_NAME.put(name, type);
+
+        return Registry.registerForHolder(CreateBuiltInRegistries.CONTRAPTION_TYPE, CreateBigCannons.resource(name), type);
+    }
 
-	public static void prepare() {
-	}
+    public static void init() {
+    }
 
 }
diff --git a/src/main/java/rbasamoyai/createbigcannons/mixin/compat/create/ContraptionMixin.java b/src/main/java/rbasamoyai/createbigcannons/mixin/compat/create/ContraptionMixin.java
@@ -6,6 +6,8 @@
 
 import javax.annotation.Nullable;
 
+import com.simibubi.create.AllContraptionTypes;
+
 import org.apache.commons.lang3.tuple.Pair;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -56,6 +58,7 @@ public abstract class ContraptionMixin {
 
 	@Shadow
 	public boolean disassembled;
+/* fixme
 
 	@Inject(method = "searchMovedStructure",
 		at = @At(value = "INVOKE", target = "Lcom/simibubi/create/content/contraptions/BlockMovementChecks;isBrittle(Lnet/minecraft/world/level/block/state/BlockState;)Z", shift = At.Shift.BEFORE))
@@ -66,13 +69,14 @@ public abstract class ContraptionMixin {
 		if (forcedDirectionRef.get() == null)
 			forcedDirectionRef.set(((CanLoadBigCannon) this.createbigcannons$self).createbigcannons$getAssemblyMovementDirection(level));
 	}
+*/
 
 	@Inject(method = "searchMovedStructure",
 		at = @At(value = "INVOKE", target = "Ljava/util/Queue;add(Ljava/lang/Object;)Z", shift = At.Shift.AFTER),
 		remap = false)
 	private void createbigcannons$searchMovedStructure$removePulley(Level level, BlockPos pos, Direction forcedDirection,
 																	CallbackInfoReturnable<Boolean> cir, @Local Queue<BlockPos> frontier) {
-		if (this.createbigcannons$self.getType() == ContraptionType.PULLEY)
+		if (this.createbigcannons$self.getType() == AllContraptionTypes.PULLEY.value())
 			ContraptionRemix.pulleyChecks((PulleyContraption) this.createbigcannons$self, level, pos, forcedDirection, frontier);
 	}
 
diff --git a/src/main/java/rbasamoyai/createbigcannons/munitions/big_cannon/FuzedBlockEntityRenderer.java b/src/main/java/rbasamoyai/createbigcannons/munitions/big_cannon/FuzedBlockEntityRenderer.java
@@ -3,6 +3,7 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
 
+import dev.engine_room.flywheel.api.visualization.VisualizationManager;
 import net.createmod.catnip.render.CachedBuffers;
 import net.createmod.catnip.render.SuperByteBuffer;
 import net.minecraft.client.renderer.MultiBufferSource;
diff --git a/src/main/java/rbasamoyai/createbigcannons/ponder/CannonKineticsScenes.java b/src/main/java/rbasamoyai/createbigcannons/ponder/CannonKineticsScenes.java
@@ -1,5 +1,8 @@
 package rbasamoyai.createbigcannons.ponder;
 
+import com.simibubi.create.foundation.ponder.CreateSceneBuilder;
+
+import net.createmod.ponder.api.PonderPalette;
 import net.createmod.ponder.api.element.ElementLink;
 import net.createmod.ponder.api.element.WorldSectionElement;
 import net.createmod.ponder.api.scene.SceneBuilder;
@@ -10,13 +13,14 @@
 
 public class CannonKineticsScenes {
 
-	public static void slidingBreech(SceneBuilder scene, SceneBuildingUtil util) {
+	public static void slidingBreech(SceneBuilder builder, SceneBuildingUtil util) {
+        CreateSceneBuilder scene = new CreateSceneBuilder(builder);
 		scene.title("cannon_mount/sliding_breech", "Using a Sliding Breech");
 		scene.configureBasePlate(0, 0, 5);
 		scene.showBasePlate();
 
-		BlockPos breechPos = util.grid.at(2, 1, 2);
-		scene.world().showSection(util.select().fromTo(breechPos, util.grid.at(2, 1, 4)), Direction.DOWN);
+		BlockPos breechPos = util.grid().at(2, 1, 2);
+		scene.world().showSection(util.select().fromTo(breechPos, util.grid().at(2, 1, 4)), Direction.DOWN);
 		scene.idle(20);
 
 		scene.overlay().showText(80)
@@ -31,7 +35,7 @@ public static void slidingBreech(SceneBuilder scene, SceneBuildingUtil util) {
 		scene.addKeyframe();
 
 		Selection gearUp = util.select().fromTo(2, 2, 3, 3, 2, 3);
-		Selection gearDown = util.select().fromTo(breechPos, util.grid.at(3, 1, 2));
+		Selection gearDown = util.select().fromTo(breechPos, util.grid().at(3, 1, 2));
 		scene.world().setKineticSpeed(gearUp, -16);
 		scene.world().setKineticSpeed(gearDown, 8);
 		scene.idle(40);
@@ -47,7 +51,7 @@ public static void slidingBreech(SceneBuilder scene, SceneBuildingUtil util) {
 
 		scene.addKeyframe();
 
-		BlockPos munitionPos = util.grid.at(2, 1, 1);
+		BlockPos munitionPos = util.grid().at(2, 1, 1);
 		ElementLink<WorldSectionElement> munitionBlock = scene.world().showIndependentSection(util.select().position(munitionPos), Direction.SOUTH);
 		scene.idle(15);
 
@@ -77,14 +81,15 @@ public static void slidingBreech(SceneBuilder scene, SceneBuildingUtil util) {
 		scene.markAsFinished();
 	}
 
-	public static void screwBreech(SceneBuilder scene, SceneBuildingUtil util) {
+	public static void screwBreech(SceneBuilder builder, SceneBuildingUtil util) {
+        CreateSceneBuilder scene = new CreateSceneBuilder(builder);
 		scene.title("cannon_mount/screw_breech", "Using a Screw Breech");
 		scene.configureBasePlate(0, 0, 5);
 		scene.showBasePlate();
 
-		BlockPos breechPos = util.grid.at(2, 1, 2);
+		BlockPos breechPos = util.grid().at(2, 1, 2);
 		ElementLink<WorldSectionElement> breech = scene.world().showIndependentSection(util.select().position(breechPos), Direction.DOWN);
-		scene.world().showSection(util.select().fromTo(util.grid.at(3, 1, 2), util.grid.at(4, 1, 2)), Direction.DOWN);
+		scene.world().showSection(util.select().fromTo(util.grid().at(3, 1, 2), util.grid().at(4, 1, 2)), Direction.DOWN);
 		scene.idle(20);
 
 		scene.overlay().showText(80)
@@ -98,7 +103,7 @@ public static void screwBreech(SceneBuilder scene, SceneBuildingUtil util) {
 
 		Selection breechGearUp = util.select().fromTo(0, 2, 3, 1, 2, 3);
 		Selection breechGearDown = util.select().position(1, 1, 2);
-		Selection breechGearDownAll = util.select().fromTo(util.grid.at(1, 1, 2), breechPos);
+		Selection breechGearDownAll = util.select().fromTo(util.grid().at(1, 1, 2), breechPos);
 
 		scene.world().showSection(breechGearUp, Direction.EAST);
 		scene.world().showSection(breechGearDown, Direction.EAST);

Original file line number	Diff line number	Diff line change
`@@ -531,7 +531,7 @@ public void readNBT(Level level, CompoundTag tag, boolean clientData) {`
`531`	`531`
`532`	`532`	`@Override`
`533`	`533`	`public ContraptionType getType() {`
`534`		`- return CBCContraptionTypes.MOUNTED_AUTOCANNON;`
	`534`	`+ return CBCContraptionTypes.MOUNTED_AUTOCANNON.value();`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -626,7 +626,7 @@ public void readNBT(Level level, CompoundTag tag, boolean clientData) {`
`626`	`626`
`627`	`627`	`@Override`
`628`	`628`	`public ContraptionType getType() {`
`629`		`- return CBCContraptionTypes.MOUNTED_CANNON;`
	`629`	`+ return CBCContraptionTypes.MOUNTED_CANNON.value();`
`630`	`630`	`}`
`631`	`631`
`632`	`632`	`public boolean isDropMortar() {`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ public BlockPos getControllerBlockPos() {`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`@Override`
`241`		`- public void _delete() {`
	`241`	`+ public void remove() {`
`242`	`242`	`this.remove = true;`
`243`	`243`	`if (!this.level.isClientSide)`
`244`	`244`	`this.disassemble();`
Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ public CompoundTag writeNBT(boolean spawnPacket) {`
`347`	`347`
`348`	`348`	`@Override`
`349`	`349`	`public ContraptionType getType() {`
`350`		`- return CBCContraptionTypes.CANNON_LOADER;`
	`350`	`+ return CBCContraptionTypes.CANNON_LOADER.value();`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ public InteractionResult onWrenched(BlockState state, UseOnContext context) {`
`289`	`289`	`}`
`290`	`290`	`newBe.setChanged();`
`291`	`291`	`}`
`292`		`- this.playRemoveSound(level, pos);`
	`292`	`+ // this.playRemoveSound(level, pos); todo: c6 fix`
`293`	`293`	`}`
`294`	`294`	`return InteractionResult.sidedSuccess(level.isClientSide);`
`295`	`295`	`}`