Skip to content

Commit 1e61e46

Browse files
committed
refactor: restructure project for more consistency
refactor: rename PacketDefinitionRegistry, MainPacketDefinitions and SkBeePacketDefinitions
1 parent 9bc0d74 commit 1e61e46

15 files changed

Lines changed: 340 additions & 327 deletions

src/main/java/dev/threeadd/packeteventssk/AddonLoader.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
import ch.njol.skript.Skript;
44
import com.github.shanebeee.skr.Registration;
5-
import dev.threeadd.packeteventssk.api.general.SkBeePacketRegistrations;
5+
import dev.threeadd.packeteventssk.api.general.packet.definition.MainPacketDefinitions;
6+
import dev.threeadd.packeteventssk.api.general.packet.definition.SkBeePacketDefinitions;
67
import dev.threeadd.packeteventssk.api.util.LogUtil;
78
import dev.threeadd.packeteventssk.api.util.registry.element.SkriptElementRegistration;
89
import dev.threeadd.packeteventssk.api.util.registry.element.SkriptElementRegistry;
@@ -39,12 +40,14 @@ protected boolean canLoad() {
3940
return false;
4041
}
4142

43+
MainPacketDefinitions.register();
44+
4245
try {
4346
Class<?> nbtApiClass = Class.forName("com.shanebeestudios.skbee.api.nbt.NBTApi");
4447
boolean enabled = (boolean) nbtApiClass.getMethod("isEnabled").invoke(null);
4548
if (enabled) {
4649
LogUtil.info("Hooked into SkBee NBT using NBT-API");
47-
SkBeePacketRegistrations.register();
50+
SkBeePacketDefinitions.register();
4851
}
4952
} catch (ClassNotFoundException ignored) {
5053
LogUtil.error("SkBee not found, PacketEventsSK elements depending on NBT will not be registered");

src/main/java/dev/threeadd/packeteventssk/PacketEventsSK.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import dev.threeadd.packeteventssk.api.util.LogUtil;
1111
import dev.threeadd.packeteventssk.config.Config;
1212
import dev.threeadd.packeteventssk.config.Configurable;
13+
import dev.threeadd.packeteventssk.metrics.MetricsLoader;
1314
import dev.threeadd.packeteventssk.update.UpdateChecker;
1415
import me.tofaa.entitylib.APIConfig;
1516
import me.tofaa.entitylib.EntityLib;

src/main/java/dev/threeadd/packeteventssk/api/general/PacketConstructorRegistry.java

Lines changed: 0 additions & 295 deletions
This file was deleted.

src/main/java/dev/threeadd/packeteventssk/api/general/PacketSendOrReceiveEvent.java renamed to src/main/java/dev/threeadd/packeteventssk/api/general/packet/PacketSendOrReceiveEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.threeadd.packeteventssk.api.general;
1+
package dev.threeadd.packeteventssk.api.general.packet;
22

33
import com.github.retrooper.packetevents.event.PacketListenerPriority;
44
import com.github.retrooper.packetevents.event.ProtocolPacketEvent;

src/main/java/dev/threeadd/packeteventssk/api/general/PacketSendOrReceiveListener.java renamed to src/main/java/dev/threeadd/packeteventssk/api/general/packet/PacketSendOrReceiveListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.threeadd.packeteventssk.api.general;
1+
package dev.threeadd.packeteventssk.api.general.packet;
22

33
import com.github.retrooper.packetevents.PacketEvents;
44
import com.github.retrooper.packetevents.event.*;

src/main/java/dev/threeadd/packeteventssk/api/general/PacketTypeRegistry.java renamed to src/main/java/dev/threeadd/packeteventssk/api/general/packet/PacketTypeRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.threeadd.packeteventssk.api.general;
1+
package dev.threeadd.packeteventssk.api.general.packet;
22

33
import com.github.retrooper.packetevents.protocol.packettype.PacketType;
44
import com.github.retrooper.packetevents.protocol.packettype.PacketTypeCommon;

0 commit comments

Comments
 (0)