Update to CC:Tweaked 1.113

build.gradle

@@ -44,16 +44,16 @@ dependencies {
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-	modImplementation "cc.tweaked:cc-tweaked-1.21-fabric:1.112.0"
+	modImplementation "cc.tweaked:cc-tweaked-1.21.1-fabric:1.113.0"
 
 	modImplementation include('eu.pb4:sgui:1.6.0+1.21')
 	modImplementation include('eu.pb4:player-data-api:0.6.0+1.21')
 	modImplementation include('eu.pb4:map-canvas-api:0.4.1+1.21')
 	modImplementation include('eu.pb4:factorytools:0.3.2+1.21')
-	modImplementation 'eu.pb4:polymer-core:0.9.9+1.21'
-	modImplementation 'eu.pb4:polymer-resource-pack:0.9.9+1.21'
-	modImplementation 'eu.pb4:polymer-autohost:0.9.9+1.21'
-	modImplementation 'eu.pb4:polymer-virtual-entity:0.9.9+1.21'
+	modImplementation 'eu.pb4:polymer-core:0.9.11+1.21.1'
+	modImplementation 'eu.pb4:polymer-resource-pack:0.9.11+1.21.1'
+	modImplementation 'eu.pb4:polymer-autohost:0.9.11+1.21.1'
+	modImplementation 'eu.pb4:polymer-virtual-entity:0.9.11+1.21.1'
 
 
 	modCompileOnly ("nl.theepicblock:PolyMc:5.6.1+1.20.4") {

gradle.properties

@@ -4,12 +4,12 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21
-yarn_mappings=1.21+build.1
+minecraft_version=1.21.1
+yarn_mappings=1.21.1+build.1
 loader_version=0.15.11
 
 # Mod Properties
-mod_version=1.112.0.1+1.21
+mod_version=1.113.0.0+1.21
 maven_group=eu.pb4.cctpatch
 archives_base_name=cc-tweaked-polymer-patch
 

src/main/java/eu/pb4/cctpatch/mixin/mod/block/CustomLecternBlockMixin.java

@@ -0,0 +1,15 @@
+package eu.pb4.cctpatch.mixin.mod.block;
+
+import dan200.computercraft.shared.lectern.CustomLecternBlock;
+import eu.pb4.polymer.core.api.block.PolymerBlock;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(CustomLecternBlock.class)
+public class CustomLecternBlockMixin implements PolymerBlock {
+    @Override
+    public BlockState getPolymerBlockState(BlockState state) {
+        return Blocks.LECTERN.getStateWithProperties(state);
+    }
+}

src/main/java/eu/pb4/cctpatch/mixin/mod/item/PocketServerComputerMixin.java

@@ -1,15 +1,9 @@
 package eu.pb4.cctpatch.mixin.mod.item;
 
-import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.shared.pocket.core.PocketBrain;
-import dan200.computercraft.shared.pocket.core.PocketHolder;
 import dan200.computercraft.shared.pocket.core.PocketServerComputer;
 import eu.pb4.cctpatch.impl.poly.PocketComputerRenderer;
 import eu.pb4.cctpatch.impl.poly.ext.ServerComputerExt;
-import eu.pb4.cctpatch.mixin.PocketBrainAccessor;
-import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemStack;
-import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -26,11 +20,11 @@ public abstract class PocketServerComputerMixin implements ServerComputerExt {
 
     @Inject(method = "onRemoved", at = @At(value = "INVOKE", target = "Ldan200/computercraft/shared/computer/core/ServerComputer;onRemoved()V"))
     private void onRemovedCall(CallbackInfo ci) {
-        this.renderer.onRemoved(((PocketBrainAccessor) (Object) this.brain).callHolder() instanceof PocketHolder.EntityHolder ent ? ent.entity() : null);
+        this.renderer.onRemoved(this.brain.getEntity());
     }
     @Inject(method = "tickServer", at = @At("HEAD"))
     private void onTick(CallbackInfo ci) {
-        this.renderer.tick(((PocketBrainAccessor) (Object) this.brain).callHolder() instanceof PocketHolder.EntityHolder ent ? ent.entity() : null);
+        this.renderer.tick(this.brain.getEntity());
     }
 
     @Override

src/main/java/eu/pb4/cctpatch/mixin/poly/ServerPlayerEntityMixin.java

@@ -2,8 +2,8 @@
 
 import com.llamalad7.mixinextras.sugar.Local;
 import dan200.computercraft.shared.ModRegistry;
-import dan200.computercraft.shared.common.HeldItemMenu;
 import dan200.computercraft.shared.computer.inventory.AbstractComputerMenu;
+import dan200.computercraft.shared.media.PrintoutMenu;
 import dan200.computercraft.shared.media.items.PrintoutItem;
 import dan200.computercraft.shared.peripheral.diskdrive.DiskDriveMenu;
 import dan200.computercraft.shared.peripheral.printer.PrinterMenu;
@@ -31,8 +31,8 @@ private void openCustomScreen(NamedScreenHandlerFactory factory, CallbackInfoRet
         } else if (handler instanceof PrinterMenu wrapped) {
             new PrinterInventoryGui((ServerPlayerEntity) (Object) this, wrapped);
             cir.setReturnValue(OptionalInt.empty());
-        } else if (handler instanceof HeldItemMenu menu && menu.getStack().getItem() instanceof PrintoutItem) {
-            new PrintedPageGui((ServerPlayerEntity) (Object) this, menu.getStack());
+        } else if (handler instanceof PrintoutMenu menu && menu.getPrintout().getItem() instanceof PrintoutItem) {
+            new PrintedPageGui((ServerPlayerEntity) (Object) this, menu.getPrintout());
             cir.setReturnValue(OptionalInt.empty());
         } else if (handler instanceof DiskDriveMenu menu) {
             new DiskDriveInventoryGui((ServerPlayerEntity) (Object) this, menu);

src/main/resources/cc-tweaked-polymer-patch.mixins.json

@@ -3,12 +3,12 @@
   "package": "eu.pb4.cctpatch.mixin",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
-    "PocketBrainAccessor",
     "ServerPlayNetworkHandlerAccessor",
     "TurtleModemAccessor",
     "mod.ComputerCraftMixin",
     "mod.PlatformHelperImplRegistryEntryImplMixin",
     "mod.ServerNetworkingMixin",
+    "mod.block.CustomLecternBlockMixin",
     "mod.block.GenericBlockModelMixin",
     "mod.block.ModRegistryBlocksMixin",
     "mod.block.MonitorBlockEntityMixin",

src/main/resources/fabric.mod.json

@@ -26,8 +26,8 @@
       "cc-tweaked-polymer-patch.mixins.json"
 	],
 	"depends": {
-		"fabricloader": ">=0.15.0",
-		"computercraft": ">=1.101.0",
+		"fabricloader": ">=0.15.10",
+		"computercraft": ">=1.113.0",
 		"minecraft": ">=1.21-",
 		"java": ">=21",
 		"fabric-api": "*"