Partial port to 1.21.10

Patbox · Patbox · commit f111d80f9bfb · 2025-11-18T11:14:43.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -43,6 +43,17 @@ dependencies {
 	modLocalRuntime libs.modmenu
 }
 
+jar {
+	sourceSets {
+		main {
+			java {
+				exclude 'dev/hephaestus/glowcase/client/**'
+				exclude 'dev/hephaestus/glowcase/mixin/client/**'
+			}
+		}
+	}
+}
+
 loom {
 	accessWidenerPath.set(file("src/main/resources/glowcase.accesswidener"))
 
diff --git a/gradle.properties b/gradle.properties
@@ -19,7 +19,7 @@ license=CC0-1.0
 # Mod Version
 baseVersion=2.3.4
 # Branch Metadata
-branch=1.21.7
-tagBranch=1.21.7
-compatibleVersions=1.21.7, 1.21.8
+branch=1.21.10
+tagBranch=1.21.10
+compatibleVersions=1.21.10
 compatibleLoaders=fabric
diff --git a/libs.versions.toml b/libs.versions.toml
@@ -4,12 +4,12 @@ minotaur = "2.+"
 
 kaleidoConfig = "0.3.3+1.3.2"
 
-mc = "1.21.7"
-fl = "0.16.14"
-yarn = "1.21.7+build.2"
-fapi = "0.128.2+1.21.7"
+mc = "1.21.10"
+fl = "0.17.3"
+yarn = "1.21.10+build.1"
+fapi = "0.138.3+1.21.10"
 
-placeholder = "2.4.0+1.21"
+placeholder = "2.8.1+1.21.10"
 polydex = "1.6.0+1.21.6"
 # emi = "1.1.19+1.21.1"
 modmenu = "15.0.0-beta.3"
diff --git a/src/main/java/dev/hephaestus/glowcase/block/ConfigLinkBlock.java b/src/main/java/dev/hephaestus/glowcase/block/ConfigLinkBlock.java
@@ -58,7 +58,7 @@ public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
 	@Override
 	protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) {
 		if (!(world.getBlockEntity(pos) instanceof ConfigLinkBlockEntity be)) return ActionResult.CONSUME;
-		if (world.isClient) {
+		if (world.isClient()) {
 			Glowcase.proxy.openConfigScreen(be.getUrl());
 		}
 		return ActionResult.SUCCESS;
diff --git a/src/main/java/dev/hephaestus/glowcase/block/EntityDisplayBlock.java b/src/main/java/dev/hephaestus/glowcase/block/EntityDisplayBlock.java
@@ -55,7 +55,7 @@ protected boolean openEditScreen(BlockPos pos) {
 
 	@Override
 	boolean canTarget(PlayerEntity player, BlockPos pos) {
-		if (!(player.getWorld().getBlockEntity(pos) instanceof StackInteractable be)) return false;
+		if (!(player.getEntityWorld().getBlockEntity(pos) instanceof StackInteractable be)) return false;
 		return canEditGlowcase(player, pos) && ((be.matchesStack(ItemStack.EMPTY) && player.getMainHandStack().getItem() instanceof SpawnEggItem) || be.matchesStack(player.getMainHandStack()) || player.getMainHandStack().isIn(Glowcase.ITEM_TAG));
 	}
 
diff --git a/src/main/java/dev/hephaestus/glowcase/block/GlowcaseBlock.java b/src/main/java/dev/hephaestus/glowcase/block/GlowcaseBlock.java
@@ -50,8 +50,8 @@ protected VoxelShape targetedOutlineShape(BlockState state, BlockView world, Blo
 	abstract protected boolean openEditScreen(BlockPos pos);
 
 	protected void loadClientSideNBT(World world, BlockPos pos, LivingEntity placer, ItemStack stack) {
-		if (world.isClient && placer instanceof PlayerEntity player && canEditGlowcase(player, pos)) {
-			NbtComponent blockEntityTag = stack.get(DataComponentTypes.BLOCK_ENTITY_DATA);
+		if (world.isClient() && placer instanceof PlayerEntity player && canEditGlowcase(player, pos)) {
+			var blockEntityTag = stack.get(DataComponentTypes.BLOCK_ENTITY_DATA);
 			if (blockEntityTag != null && world.getBlockEntity(pos) instanceof BlockEntity be) {
 				blockEntityTag.applyToBlockEntity(be, world.getRegistryManager());
 			}
@@ -62,7 +62,7 @@ protected void loadClientSideNBT(World world, BlockPos pos, LivingEntity placer,
 	@Override
 	public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
 		loadClientSideNBT(world, pos, placer, stack);
-		if (world.isClient && placer instanceof PlayerEntity player && canEditGlowcase(player, pos)) {
+		if (world.isClient() && placer instanceof PlayerEntity player && canEditGlowcase(player, pos)) {
 			openEditScreen(pos);
 		}
 	}
@@ -74,7 +74,7 @@ protected ActionResult onUseWithItem(ItemStack stack, BlockState state, World wo
 		}
 
 		if (player.getStackInHand(hand).isIn(Glowcase.ITEM_TAG) && canEditGlowcase(player, pos)) {
-			if (world.isClient) {
+			if (world.isClient()) {
 				openEditScreen(pos);
 			}
 
@@ -109,7 +109,7 @@ public static boolean canEditGlowcase(@Nullable LivingEntity entity, BlockPos po
 		if (entity == null) return false;
 
 		if (entity instanceof PlayerEntity player) {
-			if (player.getWorld() instanceof ServerWorld serverWorld) {
+			if (player.getEntityWorld() instanceof ServerWorld serverWorld) {
 				return player.isCreative() && player.canModifyAt(serverWorld, pos);
 			}
 
diff --git a/src/main/java/dev/hephaestus/glowcase/block/HyperlinkBlock.java b/src/main/java/dev/hephaestus/glowcase/block/HyperlinkBlock.java
@@ -56,7 +56,7 @@ public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
 	@Override
 	protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) {
 		if (!(world.getBlockEntity(pos) instanceof HyperlinkBlockEntity be)) return ActionResult.CONSUME;
-		if (world.isClient && !be.getUrl().isBlank()) {
+		if (world.isClient() && !be.getUrl().isBlank()) {
 			Glowcase.proxy.openUrlWithConfirmation(be.getUrl());
 		}
 		return ActionResult.SUCCESS;
diff --git a/src/main/java/dev/hephaestus/glowcase/block/ItemAcceptorBlock.java b/src/main/java/dev/hephaestus/glowcase/block/ItemAcceptorBlock.java
@@ -80,7 +80,7 @@ protected boolean openEditScreen(BlockPos pos) {
 	protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) {
 		if (!(world.getBlockEntity(pos) instanceof ItemAcceptorBlockEntity be)) return ActionResult.CONSUME;
 		if (canEditGlowcase(player, pos)) {
-			if (world.isClient) {
+			if (world.isClient()) {
 				openEditScreen(pos);
 			}
 			return ActionResult.SUCCESS;
diff --git a/src/main/java/dev/hephaestus/glowcase/block/ItemProviderBlock.java b/src/main/java/dev/hephaestus/glowcase/block/ItemProviderBlock.java
@@ -49,7 +49,7 @@ protected void appendProperties(StateManager.Builder<Block, BlockState> builder)
 	}
 
 	public boolean canPickup(PlayerEntity player, BlockPos pos) {
-		return ((player.getWorld().getBlockEntity(pos) instanceof ItemProviderBlockEntity be && be.canGiveTo(player) && !player.isCreative() && be.canGiveTo(player) && (player.getMainHandStack().isEmpty() || (be.matchesStack(player.getMainHandStack()) && player.getMainHandStack().getCount() < player.getMainHandStack().getMaxCount()))));
+		return ((player.getEntityWorld().getBlockEntity(pos) instanceof ItemProviderBlockEntity be && be.canGiveTo(player) && !player.isCreative() && be.canGiveTo(player) && (player.getMainHandStack().isEmpty() || (be.matchesStack(player.getMainHandStack()) && player.getMainHandStack().getCount() < player.getMainHandStack().getMaxCount()))));
 	}
 
 	@Override
@@ -62,7 +62,7 @@ protected ActionResult onUse(BlockState state, World world, BlockPos pos, Player
 		if (!(world.getBlockEntity(pos) instanceof ItemProviderBlockEntity be)) return ActionResult.CONSUME;
 
 		if (be.canGiveTo(player)) {
-			if (!world.isClient) be.giveTo(player);
+			if (!world.isClient()) be.giveTo(player);
 			return ActionResult.SUCCESS;
 		}
 
diff --git a/src/main/java/dev/hephaestus/glowcase/block/PopupBlock.java b/src/main/java/dev/hephaestus/glowcase/block/PopupBlock.java
@@ -57,7 +57,7 @@ public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
 	@Override
 	protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) {
 		if (!(world.getBlockEntity(pos) instanceof PopupBlockEntity be)) return ActionResult.CONSUME;
-		if (world.isClient && !(be.lines.size() == 1 && be.lines.getFirst().getContent().equals(PlainTextContent.EMPTY))) {
+		if (world.isClient() && !(be.lines.size() == 1 && be.lines.getFirst().getContent().equals(PlainTextContent.EMPTY))) {
 			Glowcase.proxy.openPopupBlockViewScreen(pos);
 		}
 		return ActionResult.SUCCESS;
diff --git a/src/main/java/dev/hephaestus/glowcase/block/RecipeBlock.java b/src/main/java/dev/hephaestus/glowcase/block/RecipeBlock.java
@@ -59,7 +59,7 @@ public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
 	protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) {
 		if (!(world.getBlockEntity(pos) instanceof RecipeBlockEntity be)) return ActionResult.CONSUME;
 
-		if (world.isClient) {
+		if (world.isClient()) {
 			be.openRecipe();
 			return ActionResult.SUCCESS;
 		}
diff --git a/src/main/java/dev/hephaestus/glowcase/block/StackInteractableBlock.java b/src/main/java/dev/hephaestus/glowcase/block/StackInteractableBlock.java
@@ -20,7 +20,7 @@ public StackInteractableBlock(AbstractBlock.Settings settings) {
 
 	@Override
 	boolean canTarget(PlayerEntity player, BlockPos pos) {
-		if (!(player.getWorld().getBlockEntity(pos) instanceof StackInteractable be)) return false;
+		if (!(player.getEntityWorld().getBlockEntity(pos) instanceof StackInteractable be)) return false;
 		return canEditGlowcase(player, pos) && (be.matchesStack(ItemStack.EMPTY) || be.matchesStack(player.getMainHandStack()) || player.getMainHandStack().isIn(Glowcase.ITEM_TAG));
 	}
 
@@ -38,13 +38,13 @@ protected ActionResult onUseWithItem(ItemStack stack, BlockState state, World wo
 			boolean holdingSameAsDisplay = be.matchesStack(stack);
 
 			if (be.matchesStack(ItemStack.EMPTY)) {
-				if (!world.isClient) be.setFromStack(stack);
+				if (!world.isClient()) be.setFromStack(stack);
 				return ActionResult.SUCCESS;
 			} else if (holdingSameAsDisplay) {
-				if (world.isClient) openEditScreen(pos);
+				if (world.isClient()) openEditScreen(pos);
 				return ActionResult.SUCCESS;
 			} else if (holdingGlowcaseItem) {
-				if (!world.isClient) be.unsetFromStack();
+				if (!world.isClient()) be.unsetFromStack();
 				return ActionResult.SUCCESS;
 			}
 		}
diff --git a/src/main/java/dev/hephaestus/glowcase/block/TextBlock.java b/src/main/java/dev/hephaestus/glowcase/block/TextBlock.java
@@ -65,9 +65,9 @@ public void appendTooltip(ItemStack stack, Item.TooltipContext context, TooltipD
 		textConsumer.accept(Text.translatable("block.glowcase.text_block.tooltip.0").formatted(Formatting.GRAY));
 		textConsumer.accept(Text.translatable("block.glowcase.generic.tooltip").formatted(Formatting.DARK_GRAY));
 		textConsumer.accept(Text.translatable("block.glowcase.text_block.tooltip.1").formatted(Formatting.DARK_GRAY));
-		NbtComponent component = stack.get(DataComponentTypes.BLOCK_ENTITY_DATA);
+		var component = stack.get(DataComponentTypes.BLOCK_ENTITY_DATA);
 		if (component == null) return;
-		NbtCompound nbt = component.getNbt(); //TODO: use codecs
+		NbtCompound nbt = component.copyNbtWithoutId(); //TODO: use codecs
 		if (nbt == null) return;
 		for (NbtElement element : nbt.getList("lines").orElse(new NbtList())) {
 			Optional<String> line = element.asString();
diff --git a/src/main/java/dev/hephaestus/glowcase/block/entity/EntityDisplayBlockEntity.java b/src/main/java/dev/hephaestus/glowcase/block/entity/EntityDisplayBlockEntity.java
@@ -27,13 +27,13 @@ public EntityDisplayBlockEntity(BlockPos pos, BlockState state) {
 
 	@Override
 	public boolean matchesStack(ItemStack stack) {
-		return (stack.isEmpty() && displayEntity == null) || (stack.getItem() instanceof SpawnEggItem eggItem && eggItem.isOfSameEntityType(world.getRegistryManager(), stack, entityType));
+		return (stack.isEmpty() && displayEntity == null) || (stack.getItem() instanceof SpawnEggItem eggItem && eggItem.isOfSameEntityType(stack, entityType));
 	}
 
 	@Override
 	public void setFromStack(ItemStack stack) {
 		if (stack.getItem() instanceof SpawnEggItem eggItem) {
-			setDisplayEntity(eggItem.getEntityType(world.getRegistryManager(), stack).create(world, SpawnReason.EVENT));
+			setDisplayEntity(eggItem.getEntityType(stack).create(world, SpawnReason.EVENT));
 			setScale(new Vector3f(Math.clamp(Math.round(Math.min(1F / displayEntity.getHeight(), 1F / displayEntity.getWidth()) * 8F) / 8F, 0.125F, 10F)));
 		}
 	}
diff --git a/src/main/java/dev/hephaestus/glowcase/block/entity/GlowcaseBlockEntity.java b/src/main/java/dev/hephaestus/glowcase/block/entity/GlowcaseBlockEntity.java
@@ -1,6 +1,6 @@
 package dev.hephaestus.glowcase.block.entity;
 
-import dev.hephaestus.glowcase.client.render.block.entity.BakedBlockEntityRenderer;
+//import dev.hephaestus.glowcase.client.render.block.entity.BakedBlockEntityRenderer;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityType;
@@ -38,8 +38,9 @@ public Packet<ClientPlayPacketListener> toUpdatePacket() {
 	@SuppressWarnings({"MethodCallSideOnly", "VariableUseSideOnly"})
 	@Override
 	public void markRemoved() {
-		if (world != null && world.isClient) {
-			BakedBlockEntityRenderer.Manager.markForRebuild(getPos());
+		if (world != null && world.isClient()) {
+			// Todo
+			//BakedBlockEntityRenderer.Manager.markForRebuild(getPos());
 		}
 		super.markRemoved();
 	}
diff --git a/src/main/java/dev/hephaestus/glowcase/block/entity/ScreenBlockEntity.java b/src/main/java/dev/hephaestus/glowcase/block/entity/ScreenBlockEntity.java
@@ -2,7 +2,7 @@
 
 import com.mojang.datafixers.util.Pair;
 import dev.hephaestus.glowcase.Glowcase;
-import dev.hephaestus.glowcase.client.GlowcaseClient;
+//import dev.hephaestus.glowcase.client.GlowcaseClient;
 import net.minecraft.block.BlockState;
 import net.minecraft.storage.ReadView;
 import net.minecraft.storage.WriteView;
@@ -136,7 +136,8 @@ protected void readData(ReadView view) {
 		// Cache preview before needed for smooth experience
 		preview = view.getString("preview", "");
 		if (this.getWorld() != null && this.getWorld().isClient()) {
-			GlowcaseClient.screenImageCache.getImage(preview, null);
+			// Todo
+			//GlowcaseClient.screenImageCache.getImage(preview, null);
 		}
 
 		markDirty();
diff --git a/src/main/java/dev/hephaestus/glowcase/block/entity/SoundPlayerBlockEntity.java b/src/main/java/dev/hephaestus/glowcase/block/entity/SoundPlayerBlockEntity.java
@@ -3,7 +3,7 @@
 import com.mojang.logging.LogUtils;
 import com.mojang.serialization.Codec;
 import dev.hephaestus.glowcase.Glowcase;
-import dev.hephaestus.glowcase.client.util.SoundPlayerProxy;
+//import dev.hephaestus.glowcase.client.util.SoundPlayerProxy;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
@@ -91,10 +91,11 @@ public static void clientTick(World world, BlockPos pos, BlockState state, Sound
 
 		final PositionedSoundLoop oldInstance = entity.nowPlaying;
 		if (oldInstance != null) {
-			if (oldInstance.isCompatible() && ((SoundPlayerProxy) soundManager).glowcase$isQueuedOrPlaying(oldInstance)) {
+			// Todo
+			//if (oldInstance.isCompatible() && ((SoundPlayerProxy) soundManager).glowcase$isQueuedOrPlaying(oldInstance)) {
 				// no-op when already playing something, or waiting to be played
-				return;
-			}
+			//	return;
+			//}
 
 			soundManager.stop(oldInstance);
 		}
@@ -151,7 +152,7 @@ public Vec3d getPosition(final MinecraftClient client) {
 				if (client.player == null) {
 					return Vec3d.ZERO;
 				}
-				return client.player.getPos();
+				return client.player.getEntityPos();
 			}
 		};
 
diff --git a/src/main/java/dev/hephaestus/glowcase/block/entity/TextBlockEntity.java b/src/main/java/dev/hephaestus/glowcase/block/entity/TextBlockEntity.java
@@ -2,7 +2,7 @@
 
 import com.mojang.serialization.Codec;
 import dev.hephaestus.glowcase.Glowcase;
-import dev.hephaestus.glowcase.client.util.ColorUtil;
+import dev.hephaestus.glowcase.util.ColorUtil;
 import eu.pb4.placeholders.api.ParserContext;
 import eu.pb4.placeholders.api.parsers.NodeParser;
 import eu.pb4.placeholders.api.parsers.TagParser;
@@ -17,7 +17,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 public class TextBlockEntity extends GlowcaseBlockEntity {
 	public static final NodeParser PARSER = TagParser.DEFAULT;
diff --git a/src/main/java/dev/hephaestus/glowcase/client/GlowcaseClient.java b/src/main/java/dev/hephaestus/glowcase/client/GlowcaseClient.java
@@ -13,7 +13,7 @@
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.client.rendering.v1.InvalidateRenderStateCallback;
-import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
+import net.fabricmc.fabric.api.client.rendering.v1.world.WorldRenderEvents;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenMouseEvents;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
diff --git a/src/main/java/dev/hephaestus/glowcase/client/gui/screen/ingame/TextBlockEditScreen.java b/src/main/java/dev/hephaestus/glowcase/client/gui/screen/ingame/TextBlockEditScreen.java
@@ -3,7 +3,7 @@
 import com.google.common.primitives.Floats;
 import dev.hephaestus.glowcase.block.entity.TextBlockEntity;
 import dev.hephaestus.glowcase.client.gui.widget.ingame.ColorPickerWidget;
-import dev.hephaestus.glowcase.client.util.ColorUtil;
+import dev.hephaestus.glowcase.util.ColorUtil;
 import dev.hephaestus.glowcase.packet.C2SEditTextBlock;
 import eu.pb4.placeholders.api.parsers.tag.TagRegistry;
 import net.minecraft.client.MinecraftClient;
diff --git a/src/main/java/dev/hephaestus/glowcase/client/render/block/entity/BakedBlockEntityRenderer.java b/src/main/java/dev/hephaestus/glowcase/client/render/block/entity/BakedBlockEntityRenderer.java
@@ -18,7 +18,6 @@
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import it.unimi.dsi.fastutil.objects.Reference2ReferenceMap;
 import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap;
-import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gl.Framebuffer;
diff --git a/src/main/java/dev/hephaestus/glowcase/datagen/client/GlowcaseModelGenerator.java b/src/main/java/dev/hephaestus/glowcase/datagen/client/GlowcaseModelGenerator.java
@@ -2,7 +2,7 @@
 
 import dev.hephaestus.glowcase.Glowcase;
 import dev.hephaestus.glowcase.block.ItemAcceptorBlock;
-import dev.hephaestus.glowcase.client.render.item.tint.GlowcaseTintSource;
+//import dev.hephaestus.glowcase.client.render.item.tint.GlowcaseTintSource;
 import net.fabricmc.fabric.api.client.datagen.v1.provider.FabricModelProvider;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.minecraft.block.Block;
@@ -84,6 +84,7 @@ private void registerItemAcceptor(BlockStateModelGenerator generator) {
 
 	public final void registerGlowcaseDyeable(ItemModelGenerator generator, Item item, int defaultColor) {
 		Identifier identifier = generator.upload(item, Models.GENERATED);
-		generator.output.accept(item, ItemModels.tinted(identifier, new GlowcaseTintSource(defaultColor)));
+		// Todo
+		generator.output.accept(item, ItemModels.tinted(identifier/*,/* new GlowcaseTintSource(defaultColor)*/));
 	}
 }
diff --git a/src/main/java/dev/hephaestus/glowcase/item/CollectionCaseItem.java b/src/main/java/dev/hephaestus/glowcase/item/CollectionCaseItem.java
@@ -106,18 +106,18 @@ private void playScrollSound(Entity entity) {
 	}
 
 	private void playRetrieveSound(Entity entity) {
-		entity.playSound(SoundEvents.ITEM_BUNDLE_REMOVE_ONE, 0.8F, 0.8F + entity.getWorld().getRandom().nextFloat() * 0.4F);
+		entity.playSound(SoundEvents.ITEM_BUNDLE_REMOVE_ONE, 0.8F, 0.8F + entity.getEntityWorld().getRandom().nextFloat() * 0.4F);
 	}
 
 	private void playRemoveSound(Entity entity) {
-		entity.playSound(SoundEvents.BLOCK_CHISELED_BOOKSHELF_INSERT, 0.8F, 0.8F + entity.getWorld().getRandom().nextFloat() * 0.4F);
+		entity.playSound(SoundEvents.BLOCK_CHISELED_BOOKSHELF_INSERT, 0.8F, 0.8F + entity.getEntityWorld().getRandom().nextFloat() * 0.4F);
 	}
 
 	private void playAddSound(Entity entity) {
-		entity.playSound(SoundEvents.BLOCK_CHISELED_BOOKSHELF_PICKUP, 0.8F, 0.8F + entity.getWorld().getRandom().nextFloat() * 0.4F);
+		entity.playSound(SoundEvents.BLOCK_CHISELED_BOOKSHELF_PICKUP, 0.8F, 0.8F + entity.getEntityWorld().getRandom().nextFloat() * 0.4F);
 	}
 
 	private void playCollectSound(Entity entity) {
-		entity.playSound(SoundEvents.ITEM_BUNDLE_INSERT, 0.8F, 0.8F + entity.getWorld().getRandom().nextFloat() * 0.4F);
+		entity.playSound(SoundEvents.ITEM_BUNDLE_INSERT, 0.8F, 0.8F + entity.getEntityWorld().getRandom().nextFloat() * 0.4F);
 	}
 }
diff --git a/src/main/java/dev/hephaestus/glowcase/item/LockItem.java b/src/main/java/dev/hephaestus/glowcase/item/LockItem.java
@@ -36,7 +36,7 @@ public LockItem(Settings settings) {
 	public ActionResult useOnBlock(ItemUsageContext context) {
 		World world = context.getWorld();
 		PlayerEntity player = context.getPlayer();
-		if (world.isClient ||
+		if (world.isClient() ||
 			player == null ||
 			!player.isCreative() ||
 			!(world.getBlockEntity(context.getBlockPos()) instanceof LockableContainerBlockEntity be)) {
diff --git a/src/main/java/dev/hephaestus/glowcase/item/TabletItem.java b/src/main/java/dev/hephaestus/glowcase/item/TabletItem.java
@@ -114,12 +114,12 @@ public boolean onClicked(ItemStack stack, ItemStack otherStack, Slot slot, Click
 				// Ensure linked screen is correct before we send the client a wrong connection
 				Pair<UUID, BlockPos> linkedScreen = stack.get(Glowcase.LINKED_SCREEN_COMPONENT.get());
 				assert linkedScreen != null;
-				if (!(player.getWorld().getBlockEntity(linkedScreen.getSecond()) instanceof ScreenBlockEntity screen && screen.macaddress.equals(linkedScreen.getFirst()))) {
+				if (!(player.getEntityWorld().getBlockEntity(linkedScreen.getSecond()) instanceof ScreenBlockEntity screen && screen.macaddress.equals(linkedScreen.getFirst()))) {
 					stack.remove(Glowcase.LINKED_SCREEN_COMPONENT.get());
 				}
 			}
 
-			if (player.getWorld().isClient())
+			if (player.getEntityWorld().isClient())
 				Glowcase.proxy.openTabletEditScreen(stack);
 
 			return true;
diff --git a/src/main/java/dev/hephaestus/glowcase/packet/C2SEditBlockEntity.java b/src/main/java/dev/hephaestus/glowcase/packet/C2SEditBlockEntity.java
diff --git a/src/main/java/dev/hephaestus/glowcase/util/ColorUtil.java b/src/main/java/dev/hephaestus/glowcase/util/ColorUtil.java

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {`
`58`	`58`	`@Override`
`59`	`59`	`protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) {`
`60`	`60`	`if (!(world.getBlockEntity(pos) instanceof ConfigLinkBlockEntity be)) return ActionResult.CONSUME;`
`61`		`- if (world.isClient) {`
	`61`	`+ if (world.isClient()) {`
`62`	`62`	`Glowcase.proxy.openConfigScreen(be.getUrl());`
`63`	`63`	`}`
`64`	`64`	`return ActionResult.SUCCESS;`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ protected boolean openEditScreen(BlockPos pos) {`
`55`	`55`
`56`	`56`	`@Override`
`57`	`57`	`boolean canTarget(PlayerEntity player, BlockPos pos) {`
`58`		`- if (!(player.getWorld().getBlockEntity(pos) instanceof StackInteractable be)) return false;`
	`58`	`+ if (!(player.getEntityWorld().getBlockEntity(pos) instanceof StackInteractable be)) return false;`
`59`	`59`	`return canEditGlowcase(player, pos) && ((be.matchesStack(ItemStack.EMPTY) && player.getMainHandStack().getItem() instanceof SpawnEggItem) \|\| be.matchesStack(player.getMainHandStack()) \|\| player.getMainHandStack().isIn(Glowcase.ITEM_TAG));`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,8 @@ protected VoxelShape targetedOutlineShape(BlockState state, BlockView world, Blo`
`50`	`50`	`abstract protected boolean openEditScreen(BlockPos pos);`
`51`	`51`
`52`	`52`	`protected void loadClientSideNBT(World world, BlockPos pos, LivingEntity placer, ItemStack stack) {`
`53`		`- if (world.isClient && placer instanceof PlayerEntity player && canEditGlowcase(player, pos)) {`
`54`		`- NbtComponent blockEntityTag = stack.get(DataComponentTypes.BLOCK_ENTITY_DATA);`
	`53`	`+ if (world.isClient() && placer instanceof PlayerEntity player && canEditGlowcase(player, pos)) {`
	`54`	`+ var blockEntityTag = stack.get(DataComponentTypes.BLOCK_ENTITY_DATA);`
`55`	`55`	`if (blockEntityTag != null && world.getBlockEntity(pos) instanceof BlockEntity be) {`
`56`	`56`	`blockEntityTag.applyToBlockEntity(be, world.getRegistryManager());`
`57`	`57`	`}`
`@@ -62,7 +62,7 @@ protected void loadClientSideNBT(World world, BlockPos pos, LivingEntity placer,`
`62`	`62`	`@Override`
`63`	`63`	`public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {`
`64`	`64`	`loadClientSideNBT(world, pos, placer, stack);`
`65`		`- if (world.isClient && placer instanceof PlayerEntity player && canEditGlowcase(player, pos)) {`
	`65`	`+ if (world.isClient() && placer instanceof PlayerEntity player && canEditGlowcase(player, pos)) {`
`66`	`66`	`openEditScreen(pos);`
`67`	`67`	`}`
`68`	`68`	`}`
`@@ -74,7 +74,7 @@ protected ActionResult onUseWithItem(ItemStack stack, BlockState state, World wo`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`if (player.getStackInHand(hand).isIn(Glowcase.ITEM_TAG) && canEditGlowcase(player, pos)) {`
`77`		`- if (world.isClient) {`
	`77`	`+ if (world.isClient()) {`
`78`	`78`	`openEditScreen(pos);`
`79`	`79`	`}`
`80`	`80`
`@@ -109,7 +109,7 @@ public static boolean canEditGlowcase(@Nullable LivingEntity entity, BlockPos po`
`109`	`109`	`if (entity == null) return false;`
`110`	`110`
`111`	`111`	`if (entity instanceof PlayerEntity player) {`
`112`		`- if (player.getWorld() instanceof ServerWorld serverWorld) {`
	`112`	`+ if (player.getEntityWorld() instanceof ServerWorld serverWorld) {`
`113`	`113`	`return player.isCreative() && player.canModifyAt(serverWorld, pos);`
`114`	`114`	`}`
`115`	`115`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {`
`56`	`56`	`@Override`
`57`	`57`	`protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) {`
`58`	`58`	`if (!(world.getBlockEntity(pos) instanceof HyperlinkBlockEntity be)) return ActionResult.CONSUME;`
`59`		`- if (world.isClient && !be.getUrl().isBlank()) {`
	`59`	`+ if (world.isClient() && !be.getUrl().isBlank()) {`
`60`	`60`	`Glowcase.proxy.openUrlWithConfirmation(be.getUrl());`
`61`	`61`	`}`
`62`	`62`	`return ActionResult.SUCCESS;`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ protected boolean openEditScreen(BlockPos pos) {`
`80`	`80`	`protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) {`
`81`	`81`	`if (!(world.getBlockEntity(pos) instanceof ItemAcceptorBlockEntity be)) return ActionResult.CONSUME;`
`82`	`82`	`if (canEditGlowcase(player, pos)) {`
`83`		`- if (world.isClient) {`
	`83`	`+ if (world.isClient()) {`
`84`	`84`	`openEditScreen(pos);`
`85`	`85`	`}`
`86`	`86`	`return ActionResult.SUCCESS;`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ protected void appendProperties(StateManager.Builder<Block, BlockState> builder)`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public boolean canPickup(PlayerEntity player, BlockPos pos) {`
`52`		`- return ((player.getWorld().getBlockEntity(pos) instanceof ItemProviderBlockEntity be && be.canGiveTo(player) && !player.isCreative() && be.canGiveTo(player) && (player.getMainHandStack().isEmpty() \|\| (be.matchesStack(player.getMainHandStack()) && player.getMainHandStack().getCount() < player.getMainHandStack().getMaxCount()))));`
	`52`	`+ return ((player.getEntityWorld().getBlockEntity(pos) instanceof ItemProviderBlockEntity be && be.canGiveTo(player) && !player.isCreative() && be.canGiveTo(player) && (player.getMainHandStack().isEmpty() \|\| (be.matchesStack(player.getMainHandStack()) && player.getMainHandStack().getCount() < player.getMainHandStack().getMaxCount()))));`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
`@@ -62,7 +62,7 @@ protected ActionResult onUse(BlockState state, World world, BlockPos pos, Player`
`62`	`62`	`if (!(world.getBlockEntity(pos) instanceof ItemProviderBlockEntity be)) return ActionResult.CONSUME;`
`63`	`63`
`64`	`64`	`if (be.canGiveTo(player)) {`
`65`		`- if (!world.isClient) be.giveTo(player);`
	`65`	`+ if (!world.isClient()) be.giveTo(player);`
`66`	`66`	`return ActionResult.SUCCESS;`
`67`	`67`	`}`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {`
`57`	`57`	`@Override`
`58`	`58`	`protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) {`
`59`	`59`	`if (!(world.getBlockEntity(pos) instanceof PopupBlockEntity be)) return ActionResult.CONSUME;`
`60`		`- if (world.isClient && !(be.lines.size() == 1 && be.lines.getFirst().getContent().equals(PlainTextContent.EMPTY))) {`
	`60`	`+ if (world.isClient() && !(be.lines.size() == 1 && be.lines.getFirst().getContent().equals(PlainTextContent.EMPTY))) {`
`61`	`61`	`Glowcase.proxy.openPopupBlockViewScreen(pos);`
`62`	`62`	`}`
`63`	`63`	`return ActionResult.SUCCESS;`