1.21.9

Author: JustS-js

gradle.properties

@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.8
-yarn_mappings=1.21.8+build.1
+minecraft_version=1.21.9
+yarn_mappings=1.21.9+build.1
 loader_version=0.17.2
 
 # Fabric API
-fabric_version=0.133.0+1.21.8
+fabric_version=0.134.0+1.21.9
 
 # Mod Properties
-mod_version = 1.1.0+1.21.8
+mod_version = 1.1.0+1.21.9
 maven_group = net.just_s.sframes
 archives_base_name = seamless-itemframes

src/main/java/net/just_s/sframes/SFramesMod.java

@@ -15,7 +15,9 @@
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.s2c.play.EntityTrackerUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.TeamS2CPacket;
+import net.minecraft.scoreboard.Scoreboard;
 import net.minecraft.scoreboard.Team;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
@@ -77,12 +79,20 @@ public static Team getTeam() {
 	}
 
 	public static void addFrameToTeam(ItemFrameEntity itemFrame) {
-		itemFrame.getServer().getScoreboard().addScoreHolderToTeam(itemFrame.getNameForScoreboard(), getTeam());
+		MinecraftServer server = itemFrame.getEntityWorld().getServer();
+		if (server == null) {
+			return;
+		}
+		server.getScoreboard().addScoreHolderToTeam(itemFrame.getNameForScoreboard(), getTeam());
 		itemFrame.addCommandTag(TEAM_NAME);
 	}
 
 	public static void removeFrameFromTeam(ItemFrameEntity itemFrame) {
-		itemFrame.getServer().getScoreboard().removeScoreHolderFromTeam(itemFrame.getNameForScoreboard(), getTeam());
+		MinecraftServer server = itemFrame.getEntityWorld().getServer();
+		if (server == null) {
+			return;
+		}
+		server.getScoreboard().removeScoreHolderFromTeam(itemFrame.getNameForScoreboard(), getTeam());
 		itemFrame.removeCommandTag(TEAM_NAME);
 	}
 
@@ -105,15 +115,15 @@ public static boolean shouldGlow(ItemFrameEntity frame) {
 	}
 
 	public static List<ServerPlayerEntity> getPlayersNearby(ItemFrameEntity itemFrame) {
-		return (List<ServerPlayerEntity>)(Object)itemFrame.getWorld().getOtherEntities(
+		return (List<ServerPlayerEntity>)(Object)itemFrame.getEntityWorld().getOtherEntities(
 				null,
 				new Box(
-						itemFrame.getPos().add(
+						itemFrame.getEntityPos().add(
 								SFramesMod.CONFIG.getData().radiusOfGlowing() + 1,
 								SFramesMod.CONFIG.getData().radiusOfGlowing() + 1,
 								SFramesMod.CONFIG.getData().radiusOfGlowing() + 1
 						),
-						itemFrame.getPos().add(
+						itemFrame.getEntityPos().add(
 								-1 * SFramesMod.CONFIG.getData().radiusOfGlowing(),
 								-1 * SFramesMod.CONFIG.getData().radiusOfGlowing(),
 								-1 * SFramesMod.CONFIG.getData().radiusOfGlowing()

src/main/java/net/just_s/sframes/mixin/DecorationItemMixin.java

@@ -13,12 +13,8 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemUsageContext;
 import net.minecraft.nbt.NbtCompound;
-import net.minecraft.scoreboard.Team;
 import net.minecraft.util.ActionResult;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
-import net.minecraft.world.event.GameEvent;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;

src/main/java/net/just_s/sframes/mixin/GlowingTickMixin.java

@@ -53,7 +53,7 @@ private void tickScheduled() {
     @Inject(at = @At("TAIL"), method = "tick")
     private void sframes$glowingTick(CallbackInfo ci) {
         BlockAttachedEntity frame = (BlockAttachedEntity) (Object) this;
-        if (frame.getWorld().isClient) return;
+        if (frame.getEntityWorld().isClient()) return;
         if (!(frame instanceof ItemFrameEntity && SFramesMod.shouldGlow((ItemFrameEntity) frame))) return;
 
         this.tickScheduled();

src/main/java/net/just_s/sframes/mixin/ItemFrameMixin.java

@@ -34,7 +34,7 @@ public class ItemFrameMixin {
 	@Inject(at = @At("HEAD"), method = "damage", cancellable = true)
 	private void sframes$onItemFrameDamageWithTool(ServerWorld world, DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
 		Entity attacker = source.getAttacker();
-		if (attacker == null || !attacker.isPlayer() || attacker.getWorld().isClient()) return;
+		if (attacker == null || !attacker.isPlayer() || attacker.getEntityWorld().isClient()) return;
 
 		ServerPlayerEntity player = (ServerPlayerEntity) attacker;
 		ItemStack itemStackInHand = player.getInventory().getStack(player.getInventory().getSelectedSlot());
@@ -97,7 +97,7 @@ private boolean applyShears(ItemStack itemStackInHand, ServerPlayerEntity player
 
 		SFramesMod.addFrameToTeam(itemFrame);
 
-		itemFrame.getWorld().playSound(
+		itemFrame.getEntityWorld().playSound(
 				null,
 				itemFrame.getBlockPos(),
 				SoundEvents.ENTITY_SNOW_GOLEM_SHEAR,
@@ -140,7 +140,7 @@ private boolean applyLeather(ItemStack itemStackInHand, ServerPlayerEntity playe
 
 		SFramesMod.removeFrameFromTeam(itemFrame);
 
-		itemFrame.getWorld().playSound(
+		itemFrame.getEntityWorld().playSound(
 				null,
 				itemFrame.getBlockPos(),
 				SoundEvents.ENTITY_ITEM_FRAME_PLACE,

src/main/resources/fabric.mod.json

@@ -29,7 +29,7 @@
   "depends": {
     "fabricloader": ">=0.17.2",
     "fabric": "*",
-    "minecraft": ">=1.21.8",
+    "minecraft": ">=1.21.9",
     "java": ">=21"
   }
 }