diff --git a/.gradle/8.5/checksums/checksums.lock b/.gradle/8.5/checksums/checksums.lock index e380000..6e5bdbb 100644 Binary files a/.gradle/8.5/checksums/checksums.lock and b/.gradle/8.5/checksums/checksums.lock differ diff --git a/.gradle/8.5/checksums/md5-checksums.bin b/.gradle/8.5/checksums/md5-checksums.bin index dd00658..26cde16 100644 Binary files a/.gradle/8.5/checksums/md5-checksums.bin and b/.gradle/8.5/checksums/md5-checksums.bin differ diff --git a/.gradle/8.5/checksums/sha1-checksums.bin b/.gradle/8.5/checksums/sha1-checksums.bin index 81202a7..1f61a59 100644 Binary files a/.gradle/8.5/checksums/sha1-checksums.bin and b/.gradle/8.5/checksums/sha1-checksums.bin differ diff --git a/build.gradle b/build.gradle index 82a4737..307921d 100644 --- a/build.gradle +++ b/build.gradle @@ -176,7 +176,7 @@ task obfuscate(type: JavaExec) { // Arguments to pass to the obfuscator (e.g., input and output directories) args = [ - '--config', '.\\obf\\config.json' + '--config', 'obf/config.json' ] } diff --git a/obf/config.json b/obf/config.json index c51bbe7..af3e526 100644 --- a/obf/config.json +++ b/obf/config.json @@ -1,7 +1,7 @@ { "Settings": { - "Input": "./build/libs/Sentinel-0.3.1.jar", - "Output": "./build/libs/Sentinel-0.3.1-obf.jar", + "Input": "/home/wolf/IdeaProjects/Sentinel/build/libs/Sentinel-1.0.0.jar", + "Output": "./build/libs/Sentinel-1.0.0-alfa.jar", "Libraries": [ "./deps" ], diff --git a/src/main/java/me/trouper/sentinel/server/events/extras/ShadowRealmEvents.java b/src/main/java/me/trouper/sentinel/server/events/extras/ShadowRealmEvents.java index fdfbfac..41990b7 100644 --- a/src/main/java/me/trouper/sentinel/server/events/extras/ShadowRealmEvents.java +++ b/src/main/java/me/trouper/sentinel/server/events/extras/ShadowRealmEvents.java @@ -68,7 +68,7 @@ public class ShadowRealmEvents implements CustomListener, PacketListener { sendFakeRespawn(p); Bukkit.getScheduler().runTaskTimerAsynchronously(Sentinel.getInstance(),(t)->{ if (p == null || !p.isOnline() || !Sentinel.getInstance().getDirector().io.extraStorage.shadowRealm.containsKey(p.getUniqueId())) t.cancel(); - sendFakePosition(p,0,666,0); + sendFakePosition(p,0,32767,0); sendCloseScreen(p); },1,1); } @@ -88,11 +88,12 @@ public class ShadowRealmEvents implements CustomListener, PacketListener { player.sendPacket(packet); } - public static void sendFakePosition(Player victim, double x, double y, double z) { - if (victim == null || !victim.isOnline()) return; + public static boolean sendFakePosition(Player victim, double x, double y, double z) { + if (victim == null || !victim.isOnline()) return false; var player = PacketEvents.getAPI().getPlayerManager().getUser(victim); - if (player == null) return; + if (player == null) return false; WrapperPlayServerPlayerPositionAndLook packet = new WrapperPlayServerPlayerPositionAndLook(x,y,z,0,90, RelativeFlag.NONE.getMask(),0,false); player.sendPacket(packet); + return true; } } diff --git a/src/main/java/me/trouper/sentinel/server/events/violations/players/EthanolPacket.java b/src/main/java/me/trouper/sentinel/server/events/violations/players/EthanolPacket.java index d54cafa..9a05d1a 100644 --- a/src/main/java/me/trouper/sentinel/server/events/violations/players/EthanolPacket.java +++ b/src/main/java/me/trouper/sentinel/server/events/violations/players/EthanolPacket.java @@ -1,5 +1,37 @@ package me.trouper.sentinel.server.events.violations.players; -public class EthanolPacket { - +import com.github.retrooper.packetevents.event.PacketListener; +import com.github.retrooper.packetevents.event.PacketReceiveEvent; +import com.github.retrooper.packetevents.protocol.packettype.PacketType; +import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPluginMessage; +import io.github.itzispyder.pdk.plugin.gui.CustomGui; +import me.trouper.sentinel.server.events.violations.AbstractViolation; +import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.inventory.Inventory; + +public class EthanolPacket extends AbstractViolation implements PacketListener { + + + @Override + public void onPacketReceive(PacketReceiveEvent event) { + if (!event.getPacketType().equals(PacketType.Play.Client.PLUGIN_MESSAGE)) return; + WrapperPlayClientPluginMessage packet = new WrapperPlayClientPluginMessage(event); + String channel = packet.getChannelName(); + if (channel.equals()) + } + + @Override + public CustomGui getConfigGui() { + return null; + } + + @Override + public void getMainPage(Inventory inv) { + + } + + @Override + public void onClick(InventoryClickEvent e) { + + } }