Small refactor

railcraft-reborn · Sep 5, 2023 · d399646 · d399646
1 parent cffe4d6
commit d399646
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 26 deletions.
diff --git a/src/main/java/mods/railcraft/client/ClientManager.java b/src/main/java/mods/railcraft/client/ClientManager.java
@@ -210,8 +210,7 @@ static void handleClientTick(TickEvent.ClientTickEvent event) {
 
   @SubscribeEvent
   static void handleRenderWorldLast(RenderLevelStageEvent event) {
-    shuntingAuraRenderer.render(event.getPoseStack(), event.getCamera(),
-        Minecraft.getInstance().player, event.getPartialTick());
+    shuntingAuraRenderer.render(event.getPoseStack(), event.getCamera(), event.getPartialTick());
   }
 
   @SubscribeEvent

diff --git a/src/main/java/mods/railcraft/client/renderer/ShuntingAuraRenderer.java b/src/main/java/mods/railcraft/client/renderer/ShuntingAuraRenderer.java
@@ -27,12 +27,12 @@ public void setLinkedCarts(Collection<LinkedCartsMessage.LinkedCart> linkedCarts
     this.linkedCarts = linkedCarts;
   }
 
-  public void render(PoseStack poseStack, Camera mainCamera,
-      LocalPlayer player, float partialTick) {
+  public void render(PoseStack poseStack, Camera mainCamera, float partialTick) {
     if (this.linkedCarts == null) {
       return;
     }
 
+    var player = Minecraft.getInstance().player;
     var goggles = player.getItemBySlot(EquipmentSlot.HEAD);
     if (goggles.is(RailcraftItems.GOGGLES.get())) {
       var aura = GogglesItem.getAura(goggles);

diff --git a/src/main/java/mods/railcraft/network/NetworkChannel.java b/src/main/java/mods/railcraft/network/NetworkChannel.java
@@ -20,8 +20,11 @@
 import mods.railcraft.network.play.SetSwitchTrackRouterAttributesMessage;
 import mods.railcraft.network.play.SyncWidgetMessage;
 import mods.railcraft.network.play.UpdateAuraByKeyMessage;
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.protocol.Packet;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.Level;
 import net.minecraftforge.network.NetworkDirection;
@@ -160,8 +163,7 @@ public void registerMessages(SimpleChannel simpleChannel) {
           .consumerMainThread(SetMaintenanceMinecartAttributesMessage::handle)
           .add();
       simpleChannel
-          .messageBuilder(UpdateAuraByKeyMessage.class, 0x12,
-              NetworkDirection.PLAY_TO_SERVER)
+          .messageBuilder(UpdateAuraByKeyMessage.class, 0x12, NetworkDirection.PLAY_TO_SERVER)
           .encoder(UpdateAuraByKeyMessage::encode)
           .decoder(UpdateAuraByKeyMessage::decode)
           .consumerMainThread(UpdateAuraByKeyMessage::handle)
@@ -221,6 +223,13 @@ public void sendToDimension(Object packet, ResourceKey<Level> dimensionId) {
     this.simpleChannel.send(PacketDistributor.DIMENSION.with(() -> dimensionId), packet);
   }
 
+  @SuppressWarnings("deprecation")
+  public static void sendToTrackingChunk(Packet<?> packet, ServerLevel level, BlockPos blockPos) {
+    if (level.hasChunkAt(blockPos)) {
+      PacketDistributor.TRACKING_CHUNK.with(() -> level.getChunkAt(blockPos)).send(packet);
+    }
+  }
+
   public static void registerAll() {
     if (!registered) {
       for (var channel : values()) {

diff --git a/src/main/java/mods/railcraft/network/play/UpdateAuraByKeyMessage.java b/src/main/java/mods/railcraft/network/play/UpdateAuraByKeyMessage.java
@@ -14,8 +14,7 @@ public void encode(FriendlyByteBuf out) {
   }
 
   public static UpdateAuraByKeyMessage decode(FriendlyByteBuf in) {
-    var tag = in.readNbt();
-    return new UpdateAuraByKeyMessage(tag);
+    return new UpdateAuraByKeyMessage(in.readNbt());
   }
 
   public boolean handle(Supplier<NetworkEvent.Context> context) {

diff --git a/src/main/java/mods/railcraft/util/NetworkUtil.java b/src/main/java/mods/railcraft/util/NetworkUtil.java
diff --git a/src/main/java/mods/railcraft/world/level/block/entity/RailcraftBlockEntity.java b/src/main/java/mods/railcraft/world/level/block/entity/RailcraftBlockEntity.java
@@ -8,7 +8,7 @@
 import mods.railcraft.api.core.BlockEntityLike;
 import mods.railcraft.api.core.NetworkSerializable;
 import mods.railcraft.api.core.Ownable;
-import mods.railcraft.util.NetworkUtil;
+import mods.railcraft.network.NetworkChannel;
 import mods.railcraft.world.module.BlockModuleProvider;
 import mods.railcraft.world.module.Module;
 import mods.railcraft.world.module.ModuleDispatcher;
@@ -98,7 +98,7 @@ public Level level() {
   public void syncToClient() {
     if (this.level instanceof ServerLevel serverLevel) {
       var packet = this.getUpdatePacket();
-      NetworkUtil.sendToTrackingChunk(packet, serverLevel, this.getBlockPos());
+      NetworkChannel.sendToTrackingChunk(packet, serverLevel, this.getBlockPos());
     }
   }