Send a message when the player resets their spawn point with bedSpawn…

…Fix enabled Also refactor accessor mixins into separate packages Signed-off-by: unilock <unilock@fennet.rentals>
unilock · Mar 23, 2024 · 366de47 · 366de47
1 parent 4b60b02
commit 366de47
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 5 deletions.
diff --git a/src/main/java/cc/unilock/legacyfixes/mixin/BlockBedMixin.java b/src/main/java/cc/unilock/legacyfixes/mixin/BlockBedMixin.java
@@ -1,8 +1,10 @@
 package cc.unilock.legacyfixes.mixin;
 
 import cc.unilock.legacyfixes.LegacyFixesConfig;
+import cc.unilock.legacyfixes.mixin.accessor.EntityPlayerAccessor;
 import net.minecraft.block.BlockBed;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
@@ -14,6 +16,12 @@
 public class BlockBedMixin {
     @Inject(method = "Lnet/minecraft/block/BlockBed;onBlockActivated(Lnet/minecraft/world/World;IIILnet/minecraft/entity/player/EntityPlayer;IFFF)Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/EntityPlayer;sleepInBedAt(III)Lnet/minecraft/entity/player/EntityPlayer$EnumStatus;"))
     private void legacyfixes$onBlockActivated(World worldIn, int x, int y, int z, EntityPlayer player, int side, float subX, float subY, float subZ, CallbackInfoReturnable<Boolean> cir) {
-        if (LegacyFixesConfig.bedSpawnFix) player.setSpawnChunk(new ChunkCoordinates(x, y, z), false);
+        if (LegacyFixesConfig.bedSpawnFix) {
+            ChunkCoordinates spawnChunk = new ChunkCoordinates(x, y, z);
+            if (!spawnChunk.equals(((EntityPlayerAccessor) player).getSpawnChunk())) {
+                player.setSpawnChunk(spawnChunk, false);
+                player.addChatComponentMessage(new ChatComponentTranslation("tile.bed.setSpawnChunk"));
+            }
+        }
     }
 }
diff --git a/src/main/java/cc/unilock/legacyfixes/mixin/accessor/EntityPlayerAccessor.java b/src/main/java/cc/unilock/legacyfixes/mixin/accessor/EntityPlayerAccessor.java
@@ -0,0 +1,12 @@
+package cc.unilock.legacyfixes.mixin.accessor;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.ChunkCoordinates;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(EntityPlayer.class)
+public interface EntityPlayerAccessor {
+    @Accessor
+    ChunkCoordinates getSpawnChunk();
+}
diff --git a/...ixes/mixin/client/NBTTagListAccessor.java → ...n/client/accessor/NBTTagListAccessor.java b/...ixes/mixin/client/NBTTagListAccessor.java → ...n/client/accessor/NBTTagListAccessor.java
@@ -1,4 +1,4 @@
-package cc.unilock.legacyfixes.mixin.client;
+package cc.unilock.legacyfixes.mixin.client.accessor;
 
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagList;

diff --git a/src/main/java/cc/unilock/legacyfixes/util/NBTUtils.java b/src/main/java/cc/unilock/legacyfixes/util/NBTUtils.java
@@ -1,6 +1,6 @@
 package cc.unilock.legacyfixes.util;
 
-import cc.unilock.legacyfixes.mixin.client.NBTTagListAccessor;
+import cc.unilock.legacyfixes.mixin.client.accessor.NBTTagListAccessor;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;

diff --git a/src/main/resources/assets/legacyfixes/lang/en_US.lang b/src/main/resources/assets/legacyfixes/lang/en_US.lang
@@ -0,0 +1 @@
+tile.bed.setSpawnChunk=Respawn point set
diff --git a/src/main/resources/mixins.legacyfixes.json b/src/main/resources/mixins.legacyfixes.json
@@ -10,15 +10,16 @@
     "BlockFarmlandMixin",
     "EntityLivingBaseMixin",
     "EntityPlayerMixin",
-    "ItemInWorldManagerMixin"
+    "ItemInWorldManagerMixin",
+    "accessor.EntityPlayerAccessor"
   ],
   "client": [
     "client.FontRendererMixin",
     "client.GuiNewChatMixin",
     "client.GuiTextFieldMixin",
     "client.ItemEnchantedBookMixin",
     "client.ItemStackMixin",
-    "client.NBTTagListAccessor"
+    "client.accessor.NBTTagListAccessor"
   ],
   "server": []
 }