move computer event constants to CCEvents

zyxkad · zyxkad · commit dd91f78b5895 · 2026-04-04T17:37:20.000-06:00
diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ChatBoxPeripheral.java b/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ChatBoxPeripheral.java
@@ -18,6 +18,7 @@
 import de.srendi.advancedperipherals.common.configuration.APConfig;
 import de.srendi.advancedperipherals.common.events.Events;
 import de.srendi.advancedperipherals.common.network.toclient.ToastToClientPacket;
+import de.srendi.advancedperipherals.common.setup.CCEvents;
 import de.srendi.advancedperipherals.common.util.CoordUtil;
 import de.srendi.advancedperipherals.common.util.EmptyLuaTable;
 import de.srendi.advancedperipherals.common.util.StringUtil;
@@ -509,10 +510,10 @@ public void update() {
                 }
             }
             queueEvent(
-                "chat",
+                CCEvents.CHAT,
+                message.senderId().toString(),
                 message.senderName(),
                 message.message(),
-                message.senderId(),
                 message.isHidden(),
                 StringUtil.utf8ToByteString(message.message())
             );
diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/InventoryManagerPeripheral.java b/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/InventoryManagerPeripheral.java
@@ -43,7 +43,7 @@ public final MethodResult getOwner() throws LuaException {
         if (player == null) {
             return MethodResult.of();
         }
-        return MethodResult.of(player.getName().getString(), player.getUUID().toString());
+        return MethodResult.of(player.getUUID().toString(), player.getGameProfile().getName());
     }
 
 
diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/PlayerDetectorPeripheral.java b/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/PlayerDetectorPeripheral.java
@@ -63,7 +63,7 @@ public boolean isEnabled() {
     @LuaFunction(mainThread = true)
     public final String[] getOnlinePlayers() {
         return getPlayers()
-            .map(player -> player.getName().getString())
+            .map(player -> player.getGameProfile().getName())
             .toArray(String[]::new);
     }
 
@@ -74,23 +74,23 @@ public final List<String> getPlayersInCoords(Map<?, ?> firstCoord, Map<?, ?> sec
 
         return getPlayers()
             .filter(player -> CoordUtil.isInRange(getCenterPos(), player, getLevel(), firstPos, secondPos, MAX_RANGE))
-            .map(player -> player.getName().getString())
+            .map(player -> player.getGameProfile().getName())
             .toList();
     }
 
     @LuaFunction(mainThread = true)
     public final List<String> getPlayersInCubic(int x, int y, int z) {
         return getPlayers()
             .filter(player -> CoordUtil.isInRange(getCenterPos(), getLevel(), player, x, y, z, MAX_RANGE))
-            .map(player -> player.getName().getString())
+            .map(player -> player.getGameProfile().getName())
             .toList();
     }
 
     @LuaFunction(mainThread = true)
     public final List<String> getPlayersInRange(int range) {
         return getPlayers()
             .filter(player -> CoordUtil.isInRange(getCenterPos(), getLevel(), player, range, MAX_RANGE))
-            .map(player -> player.getName().getString())
+            .map(player -> player.getGameProfile().getName())
             .toList();
     }
 
@@ -207,7 +207,7 @@ private Map<String, Object> getPlayerInfo(ServerPlayer player, boolean isOwner)
 
         if (APConfig.PERIPHERALS_CONFIG.morePlayerInformation.get()) {
             info.put("uuid", player.getUUID().toString());
-            info.put("name", player.getName().getString());
+            info.put("name", player.getGameProfile().getName());
             info.put("yaw", player.getYRot());
             info.put("pitch", player.getXRot());
             info.put("dimension", player.level().dimension().location().toString());
diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/SaddlePeripheral.java b/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/SaddlePeripheral.java
@@ -12,6 +12,7 @@
 import de.srendi.advancedperipherals.common.configuration.APConfig;
 import de.srendi.advancedperipherals.common.entity.TurtleSeatEntity;
 import de.srendi.advancedperipherals.common.network.toclient.SaddleTurtleInfoPacket;
+import de.srendi.advancedperipherals.common.setup.CCEvents;
 import de.srendi.advancedperipherals.common.util.LuaConverter;
 import de.srendi.advancedperipherals.common.util.TeleportUtil;
 import de.srendi.advancedperipherals.common.util.fakeplayer.APFakePlayer;
@@ -140,7 +141,7 @@ private boolean standUp() {
         this.seat = null;
         this.rider = null;
         if (owner.getTurtle() instanceof TurtleBrain brain) {
-            brain.getOwner().createServerComputer().queueEvent("saddle_release");
+            brain.getOwner().createServerComputer().queueEvent(CCEvents.SADDLE_RELEASE);
         }
         return passenger != null;
     }
@@ -171,7 +172,7 @@ public MethodResult capture() throws LuaException {
                 return MethodResult.of(null, "Entity cannot sit");
             }
             if (owner.getTurtle() instanceof TurtleBrain brain) {
-                brain.getOwner().createServerComputer().queueEvent("saddle_capture");
+                brain.getOwner().createServerComputer().queueEvent(CCEvents.SADDLE_CAPTURE);
             }
             return MethodResult.of(true);
         }, null);
diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/plugins/AutomataWarpingPlugin.java b/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/plugins/AutomataWarpingPlugin.java
@@ -13,6 +13,7 @@
 import de.srendi.advancedperipherals.common.configuration.APConfig;
 import de.srendi.advancedperipherals.common.entity.TurtleEnderPearl;
 import de.srendi.advancedperipherals.common.setup.APDataComponents;
+import de.srendi.advancedperipherals.common.setup.CCEvents;
 import de.srendi.advancedperipherals.common.util.ChunkManager;
 import de.srendi.advancedperipherals.common.util.LuaConverter;
 import de.srendi.advancedperipherals.common.util.Pair;
@@ -232,13 +233,14 @@ public final MethodResult portalShipPrepare(IArguments arguments) throws LuaExce
                             return;
                         }
                         BlockPos pos = pearl.blockPosition();
-                        Map<String, Object> data = new HashMap<>();
-                        data.put("name", level.dimension().location().toString());
-                        data.put("pos", LuaConverter.posToLua(pos));
-                        data.put("facing", pearl.getDirection().getName());
-                        data.put("costs", getCostsToLevel(level.dimension()));
-                        data.put("canSpawn", owner.isMovementPossible(level, pos));
-                        data.put("shipId", shipId);
+                        Map<String, Object> data = Map.of(
+                            "name", level.dimension().location().toString(),
+                            "pos", LuaConverter.posToLua(pos),
+                            "facing", pearl.getDirection().getName(),
+                            "costs", getCostsToLevel(level.dimension()),
+                            "canSpawn", owner.isMovementPossible(level, pos),
+                            "shipId", shipId
+                        );
                         shipPearls.put(shipId, pearl);
                         automataCore.queueEvent(PortalPrepareCallback.EVENT_ID, data);
                     });
@@ -301,8 +303,8 @@ private static int getCostsToLevel(ResourceKey<Level> level) {
     }
 
     private static final class PortalPrepareCallback implements ILuaCallback {
-        static final String EVENT_ID = "portal_prepare";
-        static final String FAILED_EVENT_ID = "portal_prepare_failed";
+        static final String EVENT_ID = CCEvents.PORTAL_PREPARE;
+        static final String FAILED_EVENT_ID = CCEvents.PORTAL_PREPARE_FAILED;
         final MethodResult pull = MethodResult.pullEvent(null, this);
         private final String id;
 
diff --git a/src/main/java/de/srendi/advancedperipherals/common/blocks/PlayerDetectorBlock.java b/src/main/java/de/srendi/advancedperipherals/common/blocks/PlayerDetectorBlock.java
@@ -1,9 +1,11 @@
 package de.srendi.advancedperipherals.common.blocks;
 
+import de.srendi.advancedperipherals.common.addons.computercraft.peripheral.PlayerDetectorPeripheral;
 import de.srendi.advancedperipherals.common.blocks.base.APBlockEntityBlock;
 import de.srendi.advancedperipherals.common.blocks.blockentities.PlayerDetectorEntity;
 import de.srendi.advancedperipherals.common.configuration.APConfig;
 import de.srendi.advancedperipherals.common.setup.APBlockEntityTypes;
+import de.srendi.advancedperipherals.common.setup.CCEvents;
 import net.minecraft.core.BlockPos;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
@@ -40,7 +42,18 @@ public InteractionResult useWithoutItem(BlockState state, Level level, BlockPos
             if (level.isClientSide()) {
                 return InteractionResult.SUCCESS;
             }
-            entity.queueEvent("player_click", player.getName().getString(), level.dimension().location().toString());
+            PlayerDetectorPeripheral peripheral = entity.getPeripheral();
+            if (peripheral != null) {
+                peripheral.forEachConnectedComputers(
+                    (computer) -> computer.queueEvent(
+                        CCEvents.PLAYER_CLICK,
+                        computer.getAttachmentName(),
+                        player.getUUID().toString(),
+                        player.getGameProfile().getName(),
+                        level.dimension().location().toString()
+                    )
+                );
+            }
             return InteractionResult.CONSUME;
         }
         return super.useWithoutItem(state, level, pos, player, hit);
diff --git a/src/main/java/de/srendi/advancedperipherals/common/entity/TurtleSeatEntity.java b/src/main/java/de/srendi/advancedperipherals/common/entity/TurtleSeatEntity.java
@@ -8,6 +8,7 @@
 import dan200.computercraft.shared.turtle.core.TurtleBrain;
 import de.srendi.advancedperipherals.common.network.toserver.SaddleTurtleControlPacket;
 import de.srendi.advancedperipherals.common.setup.APEntities;
+import de.srendi.advancedperipherals.common.setup.CCEvents;
 import de.srendi.advancedperipherals.common.util.InputKeySet;
 import net.minecraft.client.renderer.culling.Frustum;
 import net.minecraft.client.renderer.entity.EntityRenderer;
@@ -139,22 +140,22 @@ public void baseTick() {
         ServerComputer computer = this.getServerComputer();
         if (computer != null && this.inputs != this.oldInputs) {
             if (this.inputs.forward() != this.oldInputs.forward()) {
-                computer.queueEvent("saddle_control", new Object[]{"forward", this.inputs.forward()});
+                computer.queueEvent(CCEvents.SADDLE_CONTROL, new Object[]{"forward", this.inputs.forward()});
             }
             if (this.inputs.back() != this.oldInputs.back()) {
-                computer.queueEvent("saddle_control", new Object[]{"back", this.inputs.back()});
+                computer.queueEvent(CCEvents.SADDLE_CONTROL, new Object[]{"back", this.inputs.back()});
             }
             if (this.inputs.left() != this.oldInputs.left()) {
-                computer.queueEvent("saddle_control", new Object[]{"left", this.inputs.left()});
+                computer.queueEvent(CCEvents.SADDLE_CONTROL, new Object[]{"left", this.inputs.left()});
             }
             if (this.inputs.right() != this.oldInputs.right()) {
-                computer.queueEvent("saddle_control", new Object[]{"right", this.inputs.right()});
+                computer.queueEvent(CCEvents.SADDLE_CONTROL, new Object[]{"right", this.inputs.right()});
             }
             if (this.inputs.up() != this.oldInputs.up()) {
-                computer.queueEvent("saddle_control", new Object[]{"up", this.inputs.up()});
+                computer.queueEvent(CCEvents.SADDLE_CONTROL, new Object[]{"up", this.inputs.up()});
             }
             if (this.inputs.down() != this.oldInputs.down()) {
-                computer.queueEvent("saddle_control", new Object[]{"down", this.inputs.down()});
+                computer.queueEvent(CCEvents.SADDLE_CONTROL, new Object[]{"down", this.inputs.down()});
             }
             this.oldInputs = this.inputs;
         }
diff --git a/src/main/java/de/srendi/advancedperipherals/common/events/Events.java b/src/main/java/de/srendi/advancedperipherals/common/events/Events.java
@@ -5,6 +5,7 @@
 import de.srendi.advancedperipherals.AdvancedPeripherals;
 import de.srendi.advancedperipherals.common.addons.APAddon;
 import de.srendi.advancedperipherals.common.configuration.APConfig;
+import de.srendi.advancedperipherals.common.setup.CCEvents;
 import de.srendi.advancedperipherals.lib.misc.DataPublisher;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.arguments.MessageArgument;
@@ -51,13 +52,13 @@ public static void onWorldJoin(PlayerEvent.PlayerLoggedInEvent event) {
             }
         }
 
-        putPlayerMessage(new PlayerDimensionEvent("player_join", player.getUUID(), player.getName().getString(), player.level().dimension().location().toString(), null));
+        putPlayerMessage(new PlayerDimensionEvent(CCEvents.PLAYER_JOIN, player.getUUID(), player.getGameProfile().getName(), player.level().dimension().location().toString(), null));
     }
 
     @SubscribeEvent
     public static void onWorldLeave(PlayerEvent.PlayerLoggedOutEvent event) {
         Player player = event.getEntity();
-        putPlayerMessage(new PlayerDimensionEvent("player_leave", player.getUUID(), player.getName().getString(), player.level().dimension().location().toString(), null));
+        putPlayerMessage(new PlayerDimensionEvent(CCEvents.PLAYER_LEAVE, player.getUUID(), player.getGameProfile().getName(), player.level().dimension().location().toString(), null));
     }
 
     @SubscribeEvent
@@ -66,15 +67,15 @@ public static void onPlayerChangeDimension(PlayerEvent.PlayerChangedDimensionEve
         String fromDim = event.getFrom().location().toString();
         String toDim = event.getTo().location().toString();
 
-        putPlayerMessage(new PlayerDimensionEvent("player_changed_dimension", player.getUUID(), player.getName().getString(), fromDim, toDim));
+        putPlayerMessage(new PlayerDimensionEvent(CCEvents.PLAYER_CHANGED_DIMENSION, player.getUUID(), player.getGameProfile().getName(), fromDim, toDim));
     }
 
     @SubscribeEvent(priority = EventPriority.LOWEST)
     public static void onLivingDeath(LivingDeathEvent event) {
         if (!(event.getEntity() instanceof ServerPlayer player)) {
             return;
         }
-        putPlayerMessage(new PlayerDeathEvent(player.getUUID(), player.getName().getString(), event.getSource()));
+        putPlayerMessage(new PlayerDeathEvent(player.getUUID(), player.getGameProfile().getName(), event.getSource()));
     }
 
     @SubscribeEvent
@@ -193,7 +194,7 @@ public Object[] eventArgs() {
     public record PlayerDeathEvent(UUID playerId, String playerName, DamageSource source) implements IPlayerEvent {
         @Override
         public String eventName() {
-            return "player_death";
+            return CCEvents.PLAYER_DEATH;
         }
 
         @Override
diff --git a/src/main/java/de/srendi/advancedperipherals/common/network/toserver/GlassesHotkeyPacket.java b/src/main/java/de/srendi/advancedperipherals/common/network/toserver/GlassesHotkeyPacket.java
@@ -3,6 +3,7 @@
 import de.srendi.advancedperipherals.AdvancedPeripherals;
 import de.srendi.advancedperipherals.common.items.SmartGlassesItem;
 import de.srendi.advancedperipherals.common.network.IAPPacket;
+import de.srendi.advancedperipherals.common.setup.CCEvents;
 import de.srendi.advancedperipherals.common.smartglasses.SmartGlassesComputer;
 import de.srendi.advancedperipherals.common.smartglasses.SmartGlassesSideAccess;
 import de.srendi.advancedperipherals.common.smartglasses.modules.keyboard.KeyboardModule;
@@ -45,7 +46,7 @@ public void handle(IPayloadContext context) {
             return;
         }
         if (keyPressDuration >= 0) {
-            computer.queueEvent("glasses_key_pressed", new Object[]{keyBind, keyPressDuration});
+            computer.queueEvent(CCEvents.GLASSES_KEY_PRESSED, new Object[]{keyBind, keyPressDuration});
             return;
         }
         SmartGlassesSideAccess glasses = computer.getSmartGlassesModuleAccess();
diff --git a/src/main/java/de/srendi/advancedperipherals/common/network/toserver/KeyboardMouseClickPacket.java b/src/main/java/de/srendi/advancedperipherals/common/network/toserver/KeyboardMouseClickPacket.java
@@ -3,6 +3,7 @@
 import de.srendi.advancedperipherals.AdvancedPeripherals;
 import de.srendi.advancedperipherals.common.items.SmartGlassesItem;
 import de.srendi.advancedperipherals.common.network.IAPPacket;
+import de.srendi.advancedperipherals.common.setup.CCEvents;
 import de.srendi.advancedperipherals.common.smartglasses.SmartGlassesComputer;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
@@ -41,7 +42,7 @@ public void handle(IPayloadContext context) {
         if (computer == null) {
             return;
         }
-        computer.queueEvent(isRelease ? "player_mouse_up" : "player_mouse_click", new Object[]{button});
+        computer.queueEvent(isRelease ? CCEvents.PLAYER_MOUSE_UP : CCEvents.PLAYER_MOUSE_CLICK, new Object[]{button});
     }
 
     @Override
diff --git a/src/main/java/de/srendi/advancedperipherals/common/network/toserver/KeyboardMouseMovePacket.java b/src/main/java/de/srendi/advancedperipherals/common/network/toserver/KeyboardMouseMovePacket.java
@@ -3,6 +3,7 @@
 import de.srendi.advancedperipherals.AdvancedPeripherals;
 import de.srendi.advancedperipherals.common.items.SmartGlassesItem;
 import de.srendi.advancedperipherals.common.network.IAPPacket;
+import de.srendi.advancedperipherals.common.setup.CCEvents;
 import de.srendi.advancedperipherals.common.smartglasses.SmartGlassesComputer;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
@@ -41,7 +42,7 @@ public void handle(IPayloadContext context) {
         if (computer == null) {
             return;
         }
-        computer.queueEvent("player_mouse_move", new Object[]{dx, dy});
+        computer.queueEvent(CCEvents.PLAYER_MOUSE_MOVE, new Object[]{dx, dy});
     }
 
     @Override
diff --git a/src/main/java/de/srendi/advancedperipherals/common/network/toserver/KeyboardMouseScrollPacket.java b/src/main/java/de/srendi/advancedperipherals/common/network/toserver/KeyboardMouseScrollPacket.java
@@ -3,6 +3,7 @@
 import de.srendi.advancedperipherals.AdvancedPeripherals;
 import de.srendi.advancedperipherals.common.items.SmartGlassesItem;
 import de.srendi.advancedperipherals.common.network.IAPPacket;
+import de.srendi.advancedperipherals.common.setup.CCEvents;
 import de.srendi.advancedperipherals.common.smartglasses.SmartGlassesComputer;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
@@ -40,7 +41,7 @@ public void handle(IPayloadContext context) {
         if (computer == null) {
             return;
         }
-        computer.queueEvent("player_mouse_scroll", new Object[]{this.deltaY, this.deltaX});
+        computer.queueEvent(CCEvents.PLAYER_MOUSE_SCROLL, new Object[]{this.deltaY, this.deltaX});
     }
 
     @Override
diff --git a/src/main/java/de/srendi/advancedperipherals/common/setup/CCEvents.java b/src/main/java/de/srendi/advancedperipherals/common/setup/CCEvents.java
diff --git a/src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/keyboard/KeyboardModule.java b/src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/keyboard/KeyboardModule.java
diff --git a/src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/OverlayModule.java b/src/main/java/de/srendi/advancedperipherals/common/smartglasses/modules/overlay/OverlayModule.java

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public final MethodResult getOwner() throws LuaException {`
`43`	`43`	`if (player == null) {`
`44`	`44`	`return MethodResult.of();`
`45`	`45`	`}`
`46`		`- return MethodResult.of(player.getName().getString(), player.getUUID().toString());`
	`46`	`+ return MethodResult.of(player.getUUID().toString(), player.getGameProfile().getName());`
`47`	`47`	`}`
`48`	`48`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`import de.srendi.advancedperipherals.common.configuration.APConfig;`
`13`	`13`	`import de.srendi.advancedperipherals.common.entity.TurtleSeatEntity;`
`14`	`14`	`import de.srendi.advancedperipherals.common.network.toclient.SaddleTurtleInfoPacket;`
	`15`	`+import de.srendi.advancedperipherals.common.setup.CCEvents;`
`15`	`16`	`import de.srendi.advancedperipherals.common.util.LuaConverter;`
`16`	`17`	`import de.srendi.advancedperipherals.common.util.TeleportUtil;`
`17`	`18`	`import de.srendi.advancedperipherals.common.util.fakeplayer.APFakePlayer;`
`@@ -140,7 +141,7 @@ private boolean standUp() {`
`140`	`141`	`this.seat = null;`
`141`	`142`	`this.rider = null;`
`142`	`143`	`if (owner.getTurtle() instanceof TurtleBrain brain) {`
`143`		`- brain.getOwner().createServerComputer().queueEvent("saddle_release");`
	`144`	`+ brain.getOwner().createServerComputer().queueEvent(CCEvents.SADDLE_RELEASE);`
`144`	`145`	`}`
`145`	`146`	`return passenger != null;`
`146`	`147`	`}`
`@@ -171,7 +172,7 @@ public MethodResult capture() throws LuaException {`
`171`	`172`	`return MethodResult.of(null, "Entity cannot sit");`
`172`	`173`	`}`
`173`	`174`	`if (owner.getTurtle() instanceof TurtleBrain brain) {`
`174`		`- brain.getOwner().createServerComputer().queueEvent("saddle_capture");`
	`175`	`+ brain.getOwner().createServerComputer().queueEvent(CCEvents.SADDLE_CAPTURE);`
`175`	`176`	`}`
`176`	`177`	`return MethodResult.of(true);`
`177`	`178`	`}, null);`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`import dan200.computercraft.shared.turtle.core.TurtleBrain;`
`9`	`9`	`import de.srendi.advancedperipherals.common.network.toserver.SaddleTurtleControlPacket;`
`10`	`10`	`import de.srendi.advancedperipherals.common.setup.APEntities;`
	`11`	`+import de.srendi.advancedperipherals.common.setup.CCEvents;`
`11`	`12`	`import de.srendi.advancedperipherals.common.util.InputKeySet;`
`12`	`13`	`import net.minecraft.client.renderer.culling.Frustum;`
`13`	`14`	`import net.minecraft.client.renderer.entity.EntityRenderer;`
`@@ -139,22 +140,22 @@ public void baseTick() {`
`139`	`140`	`ServerComputer computer = this.getServerComputer();`
`140`	`141`	`if (computer != null && this.inputs != this.oldInputs) {`
`141`	`142`	`if (this.inputs.forward() != this.oldInputs.forward()) {`
`142`		`- computer.queueEvent("saddle_control", new Object[]{"forward", this.inputs.forward()});`
	`143`	`+ computer.queueEvent(CCEvents.SADDLE_CONTROL, new Object[]{"forward", this.inputs.forward()});`
`143`	`144`	`}`
`144`	`145`	`if (this.inputs.back() != this.oldInputs.back()) {`
`145`		`- computer.queueEvent("saddle_control", new Object[]{"back", this.inputs.back()});`
	`146`	`+ computer.queueEvent(CCEvents.SADDLE_CONTROL, new Object[]{"back", this.inputs.back()});`
`146`	`147`	`}`
`147`	`148`	`if (this.inputs.left() != this.oldInputs.left()) {`
`148`		`- computer.queueEvent("saddle_control", new Object[]{"left", this.inputs.left()});`
	`149`	`+ computer.queueEvent(CCEvents.SADDLE_CONTROL, new Object[]{"left", this.inputs.left()});`
`149`	`150`	`}`
`150`	`151`	`if (this.inputs.right() != this.oldInputs.right()) {`
`151`		`- computer.queueEvent("saddle_control", new Object[]{"right", this.inputs.right()});`
	`152`	`+ computer.queueEvent(CCEvents.SADDLE_CONTROL, new Object[]{"right", this.inputs.right()});`
`152`	`153`	`}`
`153`	`154`	`if (this.inputs.up() != this.oldInputs.up()) {`
`154`		`- computer.queueEvent("saddle_control", new Object[]{"up", this.inputs.up()});`
	`155`	`+ computer.queueEvent(CCEvents.SADDLE_CONTROL, new Object[]{"up", this.inputs.up()});`
`155`	`156`	`}`
`156`	`157`	`if (this.inputs.down() != this.oldInputs.down()) {`
`157`		`- computer.queueEvent("saddle_control", new Object[]{"down", this.inputs.down()});`
	`158`	`+ computer.queueEvent(CCEvents.SADDLE_CONTROL, new Object[]{"down", this.inputs.down()});`
`158`	`159`	`}`
`159`	`160`	`this.oldInputs = this.inputs;`
`160`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`import de.srendi.advancedperipherals.AdvancedPeripherals;`
`6`	`6`	`import de.srendi.advancedperipherals.common.addons.APAddon;`
`7`	`7`	`import de.srendi.advancedperipherals.common.configuration.APConfig;`
	`8`	`+import de.srendi.advancedperipherals.common.setup.CCEvents;`
`8`	`9`	`import de.srendi.advancedperipherals.lib.misc.DataPublisher;`
`9`	`10`	`import net.minecraft.commands.CommandSourceStack;`
`10`	`11`	`import net.minecraft.commands.arguments.MessageArgument;`
`@@ -51,13 +52,13 @@ public static void onWorldJoin(PlayerEvent.PlayerLoggedInEvent event) {`
`51`	`52`	`}`
`52`	`53`	`}`
`53`	`54`
`54`		`- putPlayerMessage(new PlayerDimensionEvent("player_join", player.getUUID(), player.getName().getString(), player.level().dimension().location().toString(), null));`
	`55`	`+ putPlayerMessage(new PlayerDimensionEvent(CCEvents.PLAYER_JOIN, player.getUUID(), player.getGameProfile().getName(), player.level().dimension().location().toString(), null));`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`@SubscribeEvent`
`58`	`59`	`public static void onWorldLeave(PlayerEvent.PlayerLoggedOutEvent event) {`
`59`	`60`	`Player player = event.getEntity();`
`60`		`- putPlayerMessage(new PlayerDimensionEvent("player_leave", player.getUUID(), player.getName().getString(), player.level().dimension().location().toString(), null));`
	`61`	`+ putPlayerMessage(new PlayerDimensionEvent(CCEvents.PLAYER_LEAVE, player.getUUID(), player.getGameProfile().getName(), player.level().dimension().location().toString(), null));`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`@SubscribeEvent`
`@@ -66,15 +67,15 @@ public static void onPlayerChangeDimension(PlayerEvent.PlayerChangedDimensionEve`
`66`	`67`	`String fromDim = event.getFrom().location().toString();`
`67`	`68`	`String toDim = event.getTo().location().toString();`
`68`	`69`
`69`		`- putPlayerMessage(new PlayerDimensionEvent("player_changed_dimension", player.getUUID(), player.getName().getString(), fromDim, toDim));`
	`70`	`+ putPlayerMessage(new PlayerDimensionEvent(CCEvents.PLAYER_CHANGED_DIMENSION, player.getUUID(), player.getGameProfile().getName(), fromDim, toDim));`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`@SubscribeEvent(priority = EventPriority.LOWEST)`
`73`	`74`	`public static void onLivingDeath(LivingDeathEvent event) {`
`74`	`75`	`if (!(event.getEntity() instanceof ServerPlayer player)) {`
`75`	`76`	`return;`
`76`	`77`	`}`
`77`		`- putPlayerMessage(new PlayerDeathEvent(player.getUUID(), player.getName().getString(), event.getSource()));`
	`78`	`+ putPlayerMessage(new PlayerDeathEvent(player.getUUID(), player.getGameProfile().getName(), event.getSource()));`
`78`	`79`	`}`
`79`	`80`
`80`	`81`	`@SubscribeEvent`
`@@ -193,7 +194,7 @@ public Object[] eventArgs() {`
`193`	`194`	`public record PlayerDeathEvent(UUID playerId, String playerName, DamageSource source) implements IPlayerEvent {`
`194`	`195`	`@Override`
`195`	`196`	`public String eventName() {`
`196`		`- return "player_death";`
	`197`	`+ return CCEvents.PLAYER_DEATH;`
`197`	`198`	`}`
`198`	`199`
`199`	`200`	`@Override`