shared events

soshimee · soshimee · commit 6c32b2fd9c28 · 2024-06-24T01:48:30.000+09:00
diff --git a/events/closeWindow.js b/events/closeWindow.js
@@ -3,15 +3,19 @@
 const S2EPacketCloseWindow = Java.type("net.minecraft.network.play.server.S2EPacketCloseWindow");
 const C0DPacketCloseWindow = Java.type("net.minecraft.network.play.client.C0DPacketCloseWindow");
 
-const listeners = [];
+global.soshimee ??= {};
+global.soshimee.events ??= {};
+global.soshimee.events.closeWindow ??= {};
 
-const trigger1 = register("packetReceived", () => {
+const listeners = global.soshimee.events.closeWindow.listeners ??= [];
+
+const trigger1 = global.soshimee.events.closeWindow.trigger1 ??= register("packetReceived", () => {
 	for (let listener of listeners) {
 		listener();
 	}
 }).setFilteredClass(S2EPacketCloseWindow).unregister();
 
-const trigger2 = register("packetSent", () => {
+const trigger2 = global.soshimee.events.closeWindow.trigger1 ??= register("packetSent", () => {
 	for (let listener of listeners) {
 		listener();
 	}
diff --git a/events/packetBlockChange.js b/events/packetBlockChange.js
@@ -2,9 +2,13 @@
 
 const S23PacketBlockChange = Java.type("net.minecraft.network.play.server.S23PacketBlockChange");
 
-const listeners = [];
+global.soshimee ??= {};
+global.soshimee.events ??= {};
+global.soshimee.events.packetBlockChange ??= {};
 
-const trigger = register("packetReceived", (packet, event) => {
+const listeners = global.soshimee.events.packetBlockChange.listeners ??= [];
+
+const trigger = global.soshimee.events.packetBlockChange.trigger ??= register("packetReceived", (packet, event) => {
 	const position = packet.func_179827_b();
 	const positionXYZ = [position.func_177958_n(), position.func_177956_o(), position.func_177952_p()];
 	const blockState = packet.func_180728_a();
@@ -27,4 +31,4 @@ export function removeListener(listener) {
 	return true;
 }
 
-export default { addListener, removeListener };
+export default { addListener, removeListener };
diff --git a/events/packetChat.js b/events/packetChat.js
@@ -2,9 +2,13 @@
 
 const S02PacketChat = Java.type("net.minecraft.network.play.server.S02PacketChat");
 
-const listeners = [];
+global.soshimee ??= {};
+global.soshimee.events ??= {};
+global.soshimee.events.packetChat ??= {};
 
-const trigger = register("packetReceived", (packet, event) => {
+const listeners = global.soshimee.events.packetChat.listeners ??= [];
+
+const trigger = global.soshimee.events.packetChat.trigger ??= register("packetReceived", (packet, event) => {
 	if (packet.func_179841_c() === 2) return;
 
 	const message = ChatLib.removeFormatting(packet.func_148915_c().func_150260_c());
diff --git a/events/packetMultiBlockChange.js b/events/packetMultiBlockChange.js
@@ -2,9 +2,13 @@
 
 const S22PacketMultiBlockChange = Java.type("net.minecraft.network.play.server.S22PacketMultiBlockChange");
 
-const listeners = [];
+global.soshimee ??= {};
+global.soshimee.events ??= {};
+global.soshimee.events.packetMultiBlockChange ??= {};
 
-const trigger = register("packetReceived", (packet, event) => {
+const listeners = global.soshimee.events.packetMultiBlockChange.listeners ??= [];
+
+const trigger = global.soshimee.events.packetMultiBlockChange.trigger ??= register("packetReceived", (packet, event) => {
 	const updatedBlocks = packet.func_179844_a();
 	const blocks = updatedBlocks.map(updatedBlock => {
 		const position = updatedBlock.func_180090_a();
diff --git a/events/packetOpenWindow.js b/events/packetOpenWindow.js
@@ -2,9 +2,13 @@
 
 const S2DPacketOpenWindow = Java.type("net.minecraft.network.play.server.S2DPacketOpenWindow");
 
-const listeners = [];
+global.soshimee ??= {};
+global.soshimee.events ??= {};
+global.soshimee.events.packetOpenWindow ??= {};
 
-const trigger = register("packetReceived", (packet, event) => {
+const listeners = global.soshimee.events.packetOpenWindow.listeners ??= [];
+
+const trigger = global.soshimee.events.packetOpenWindow.trigger ??= register("packetReceived", (packet, event) => {
 	const title = ChatLib.removeFormatting(packet.func_179840_c().func_150254_d());
 	const windowId = packet.func_148901_c();
 	const hasSlots = packet.func_148900_g();
diff --git a/events/packetSetSlot.js b/events/packetSetSlot.js
@@ -2,9 +2,13 @@
 
 const S2FPacketSetSlot = Java.type("net.minecraft.network.play.server.S2FPacketSetSlot");
 
-const listeners = [];
+global.soshimee ??= {};
+global.soshimee.events ??= {};
+global.soshimee.events.packetSetSlot ??= {};
 
-const trigger = register("packetReceived", (packet, event) => {
+const listeners = global.soshimee.events.packetSetSlot.listeners ??= [];
+
+const trigger = global.soshimee.events.packetSetSlot.trigger ??= register("packetReceived", (packet, event) => {
 	const itemStack = packet.func_149174_e();
 	const slot = packet.func_149173_d();
 	const windowID = packet.func_149175_c();
diff --git a/events/packetSoundEffect.js b/events/packetSoundEffect.js
@@ -2,9 +2,13 @@
 
 const S29PacketSoundEffect = Java.type("net.minecraft.network.play.server.S29PacketSoundEffect");
 
-const listeners = [];
+global.soshimee ??= {};
+global.soshimee.events ??= {};
+global.soshimee.events.packetSoundEffect ??= {};
 
-const trigger = register("packetReceived", (packet, event) => {
+const listeners = global.soshimee.events.packetSoundEffect.listeners ??= [];
+
+const trigger = global.soshimee.events.packetSoundEffect.trigger ??= register("packetReceived", (packet, event) => {
 	const name = packet.func_149212_c();
 	const volume = packet.func_149208_g();
 	const pitch = packet.func_149209_h();
diff --git a/events/packetTimeUpdate.js b/events/packetTimeUpdate.js
@@ -2,9 +2,13 @@
 
 const S03PacketTimeUpdate = Java.type("net.minecraft.network.play.server.S03PacketTimeUpdate");
 
-const listeners = [];
+global.soshimee ??= {};
+global.soshimee.events ??= {};
+global.soshimee.events.packetTimeUpdate ??= {};
 
-const trigger = register("packetReceived", (packet, event) => {
+const listeners = global.soshimee.events.packetTimeUpdate.listeners ??= [];
+
+const trigger = global.soshimee.events.packetTimeUpdate.trigger ??= register("packetReceived", (packet, event) => {
 	for (let listener of listeners) {
 		listener(packet, event);
 	}
diff --git a/events/packetTitle.js b/events/packetTitle.js
@@ -1,8 +1,12 @@
 const S45PacketTitle = Java.type("net.minecraft.network.play.server.S45PacketTitle");
 
-const listeners = [];
+global.soshimee ??= {};
+global.soshimee.events ??= {};
+global.soshimee.events.packetTitle ??= {};
 
-const trigger = register("packetReceived", (packet, event) => {
+const listeners = global.soshimee.events.packetTitle.listeners ??= [];
+
+const trigger = global.soshimee.events.packetTitle.trigger ??= register("packetReceived", (packet, event) => {
 	const type = packet.func_179807_a().toString();
 	const message = ChatLib.removeFormatting(packet.func_179805_b()?.func_150260_c());
 	for (let listener of listeners) {
diff --git a/events/packetWindowItems.js b/events/packetWindowItems.js
@@ -2,9 +2,13 @@
 
 const S30PacketWindowItems = Java.type("net.minecraft.network.play.server.S30PacketWindowItems");
 
-const listeners = [];
+global.soshimee ??= {};
+global.soshimee.events ??= {};
+global.soshimee.events.packetWindowItems ??= {};
 
-const trigger = register("packetReceived", (packet, event) => {
+const listeners = global.soshimee.events.packetWindowItems.listeners ??= [];
+
+const trigger = global.soshimee.events.packetWindowItems.trigger ??= register("packetReceived", (packet, event) => {
 	const itemStacks = packet.func_148910_d();
 	const windowID = packet.func_148911_c();
 
diff --git a/events/packetWorldBorder.js b/events/packetWorldBorder.js
@@ -3,9 +3,13 @@
 const S44PacketWorldBorder = Java.type("net.minecraft.network.play.server.S44PacketWorldBorder");
 const WorldBorder = Java.type("net.minecraft.world.border.WorldBorder");
 
-const listeners = [];
+global.soshimee ??= {};
+global.soshimee.events ??= {};
+global.soshimee.events.packetWorldBorder ??= {};
 
-const trigger = register("packetReceived", (packet, event) => {
+const listeners = global.soshimee.events.packetWorldBorder.listeners ??= [];
+
+const trigger = global.soshimee.events.packetWorldBorder.trigger ??= register("packetReceived", (packet, event) => {
 	const worldborder = new WorldBorder();
 	packet.func_179788_a(worldborder);
 	for (let listener of listeners) {
diff --git a/events/playerPosition.js b/events/playerPosition.js
@@ -2,9 +2,13 @@
 
 const C03PacketPlayer = Java.type("net.minecraft.network.play.client.C03PacketPlayer");
 
-const listeners = [];
+global.soshimee ??= {};
+global.soshimee.events ??= {};
+global.soshimee.events.playerPosition ??= {};
 
-const trigger = register("packetSent", (packet, event) => {
+const listeners = global.soshimee.events.playerPosition.listeners ??= [];
+
+const trigger = global.soshimee.events.playerPosition.trigger ??= register("packetSent", (packet, event) => {
 	if (!packet.func_149466_j()) return;
 	const x = packet.func_149464_c();
 	const y = packet.func_149467_d();
diff --git a/events/tick.js b/events/tick.js
@@ -2,9 +2,13 @@
 
 const S32PacketConfirmTransaction = Java.type("net.minecraft.network.play.server.S32PacketConfirmTransaction");
 
-const listeners = [];
+global.soshimee ??= {};
+global.soshimee.events ??= {};
+global.soshimee.events.tick ??= {};
 
-const trigger = register("packetReceived", () => {
+const listeners = global.soshimee.events.tick.listeners ??= [];
+
+const trigger = global.soshimee.events.tick.trigger ??= register("packetReceived", () => {
 	for (let listener of listeners) {
 		listener();
 	}
