Updating patterns on state change (#239)

WhoCraft · May 1, 2024 · 6ef8da1 · 6ef8da1
1 parent f2e9b0a
commit 6ef8da1
Showing 1 changed file with 28 additions and 4 deletions.
diff --git a/...on/src/main/java/whocraft/tardis_refined/common/tardis/manager/TardisPilotingManager.java b/...on/src/main/java/whocraft/tardis_refined/common/tardis/manager/TardisPilotingManager.java
@@ -5,6 +5,7 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtUtils;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
@@ -14,6 +15,7 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
 import whocraft.tardis_refined.api.event.TardisEvents;
@@ -30,6 +32,7 @@
 import whocraft.tardis_refined.common.util.TardisHelper;
 import whocraft.tardis_refined.constants.ModMessages;
 import whocraft.tardis_refined.constants.NbtConstants;
+import whocraft.tardis_refined.patterns.ConsolePattern;
 import whocraft.tardis_refined.registry.TRSoundRegistry;
 
 import java.util.ArrayList;
@@ -827,8 +830,17 @@ public void setCurrentConsole(GlobalConsoleBlockEntity newConsole) {
 
             Level level = this.currentConsole.getLevel();
 
-            if (level.getBlockState(this.currentConsole.getBlockPos()).getBlock() instanceof GlobalConsoleBlock) {
-                level.setBlockAndUpdate(this.currentConsole.getBlockPos(), this.currentConsole.getBlockState().setValue(GlobalConsoleBlock.POWERED, false));
+            if (level.getBlockState(this.currentConsole.getBlockPos()).getBlock() instanceof GlobalConsoleBlock && level.getBlockEntity(this.currentConsole.getBlockPos()) instanceof GlobalConsoleBlockEntity consoleBlockEntity ) {
+
+                ResourceLocation oldTheme = consoleBlockEntity.theme();
+                ConsolePattern oldPattern = consoleBlockEntity.pattern();
+
+                level.setBlock(this.currentConsole.getBlockPos(), this.currentConsole.getBlockState().setValue(GlobalConsoleBlock.POWERED, false), Block.UPDATE_ALL);
+                GlobalConsoleBlockEntity updated = (GlobalConsoleBlockEntity) level.getBlockEntity(this.currentConsole.getBlockPos());
+                updated.setConsoleTheme(oldTheme);
+                updated.setPattern(oldPattern);
+                updated.sendUpdates();
+
             }
         }
 
@@ -838,8 +850,20 @@ public void setCurrentConsole(GlobalConsoleBlockEntity newConsole) {
 
         Level level = this.currentConsole.getLevel();
 
-        level.setBlockAndUpdate(this.currentConsole.getBlockPos(), this.currentConsole.getBlockState().setValue(GlobalConsoleBlock.POWERED, true));
-        level.playSound(null, this.currentConsole.getBlockPos(), TRSoundRegistry.CONSOLE_POWER_ON.get(), SoundSource.BLOCKS, 2f, 1f);
+        if (level.getBlockState(this.currentConsole.getBlockPos()).getBlock() instanceof GlobalConsoleBlock && level.getBlockEntity(this.currentConsole.getBlockPos()) instanceof GlobalConsoleBlockEntity consoleBlockEntity ) {
+
+            ResourceLocation oldTheme = consoleBlockEntity.theme();
+            ConsolePattern oldPattern = consoleBlockEntity.pattern();
+
+            level.setBlock(this.currentConsole.getBlockPos(), this.currentConsole.getBlockState().setValue(GlobalConsoleBlock.POWERED, true), Block.UPDATE_ALL);
+            GlobalConsoleBlockEntity updated = (GlobalConsoleBlockEntity) level.getBlockEntity(this.currentConsole.getBlockPos());
+            updated.setConsoleTheme(oldTheme);
+            updated.setPattern(oldPattern);
+            updated.sendUpdates();
+
+            level.playSound(null, this.currentConsole.getBlockPos(), TRSoundRegistry.CONSOLE_POWER_ON.get(), SoundSource.BLOCKS, 2f, 1f);
+
+        }
     }
 
     /**