Removed simpleChannel method

railcraft-reborn · Sep 25, 2023 · 8178df6 · 8178df6
1 parent 0028574
commit 8178df6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/src/main/java/mods/railcraft/Railcraft.java b/src/main/java/mods/railcraft/Railcraft.java
@@ -89,7 +89,6 @@
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.fml.loading.FMLEnvironment;
-import net.minecraftforge.network.NetworkDirection;
 
 @Mod(Railcraft.ID)
 public class Railcraft {
@@ -258,8 +257,7 @@ public void handlePlayerTick(TickEvent.PlayerTickEvent event) {
           .map(RollingStock::getOrThrow)
           .map(LinkedCartsMessage.LinkedCart::new)
           .toList();
-      NetworkChannel.GAME.simpleChannel().sendTo(new LinkedCartsMessage(linkedCarts),
-          player.connection.connection, NetworkDirection.PLAY_TO_CLIENT);
+      NetworkChannel.GAME.sendTo(new LinkedCartsMessage(linkedCarts), player);
     }
   }
 

diff --git a/src/main/java/mods/railcraft/network/NetworkChannel.java b/src/main/java/mods/railcraft/network/NetworkChannel.java
@@ -37,7 +37,7 @@
  */
 public enum NetworkChannel {
 
-  GAME(new ResourceLocation(Railcraft.ID, "game")) {
+  GAME {
     @Override
     public void registerMessages(SimpleChannel simpleChannel) {
       simpleChannel
@@ -178,15 +178,15 @@ public void registerMessages(SimpleChannel simpleChannel) {
   /**
    * Prevents re-registering messages.
    */
-  private static boolean registered;
+  private static boolean REGISTERED;
   /**
    * Simple channel.
    */
   private final SimpleChannel simpleChannel;
 
-  private NetworkChannel(ResourceLocation channelName) {
+  NetworkChannel() {
     this.simpleChannel = NetworkRegistry.ChannelBuilder
-        .named(channelName)
+        .named(new ResourceLocation(Railcraft.ID, "game"))
         .clientAcceptedVersions(NETWORK_VERSION::equals)
         .serverAcceptedVersions(NETWORK_VERSION::equals)
         .networkProtocolVersion(() -> NETWORK_VERSION)
@@ -195,10 +195,6 @@ private NetworkChannel(ResourceLocation channelName) {
 
   protected abstract void registerMessages(SimpleChannel simpleChannel);
 
-  public SimpleChannel simpleChannel() {
-    return this.simpleChannel;
-  }
-
   // ================================================================================
   // Send Helper Methods
   // ================================================================================
@@ -231,11 +227,11 @@ public static void sendToTrackingChunk(Packet<?> packet, ServerLevel level, Bloc
   }
 
   public static void registerAll() {
-    if (!registered) {
+    if (!REGISTERED) {
       for (var channel : values()) {
         channel.registerMessages(channel.simpleChannel);
       }
-      registered = true;
+      REGISTERED = true;
     }
   }
 }
diff --git a/src/main/java/mods/railcraft/world/item/CartItem.java b/src/main/java/mods/railcraft/world/item/CartItem.java
@@ -20,16 +20,15 @@ public CartItem(MinecartFactory minecartFactory, Properties properties) {
 
   @Override
   public InteractionResult useOn(UseOnContext context) {
-    var player = context.getPlayer();
-    var hand = context.getHand();
     var level = context.getLevel();
     var railPos = context.getClickedPos();
-    var railState = level.getBlockState(railPos);
-    var itemStack = player.getItemInHand(hand);
     if (!BaseRailBlock.isRail(level, railPos)) {
       return InteractionResult.FAIL;
     }
     if (level instanceof ServerLevel serverLevel) {
+      var player = context.getPlayer();
+      var railState = level.getBlockState(railPos);
+      var itemStack = player.getItemInHand(context.getHand());
       var railShape = RailShape.NORTH_SOUTH;
       if (railState.getBlock() instanceof BaseRailBlock baseRailBlock) {
         railShape = baseRailBlock.getRailDirection(railState, level, railPos, null);