From 9c2d34829cba86806c02cb86b157d01daca32a94 Mon Sep 17 00:00:00 2001 From: thetrouper Date: Mon, 7 Apr 2025 08:31:44 -0500 Subject: [PATCH] Ethanol Detector in progress --- .gradle/8.5/checksums/checksums.lock | Bin 17 -> 17 bytes .gradle/8.5/checksums/md5-checksums.bin | Bin 43747 -> 43947 bytes .gradle/8.5/checksums/sha1-checksums.bin | Bin 202619 -> 215576 bytes build.gradle | 2 +- obf/config.json | 4 +- .../events/extras/ShadowRealmEvents.java | 9 +++-- .../violations/players/EthanolPacket.java | 36 +++++++++++++++++- 7 files changed, 42 insertions(+), 9 deletions(-) diff --git a/.gradle/8.5/checksums/checksums.lock b/.gradle/8.5/checksums/checksums.lock index e3800009d21fd6910bbc5cea414564d663fd2c67..6e5bdbb3ba77d4493d9cd47c7b9c4737ef3e1d73 100644 GIT binary patch literal 17 VcmZSfyWC&;{v_{G1~A~w1OPeh1qlEE literal 17 VcmZSfyWC&;{v_{G1~A|a1pqnO1oZ#_ diff --git a/.gradle/8.5/checksums/md5-checksums.bin b/.gradle/8.5/checksums/md5-checksums.bin index dd00658c2df04fb79747bd430cbf5b54abe1aca5..26cde162dc4c3f0c3a98f3a60a33dcdbdcb36df7 100644 GIT binary patch delta 164 zcmaESm1*^LrVS<%jDI(qN_g_{moiT>Hc*gb0E1PJHtO6Bv-#pjlHxuK@iHaVZ9X%E$O+LI_ uiRHA2^S#M0m+Ju;uDd2nuK+RJtS0-ekeckfL`2}UNMsB|ySV_6)&l?*$}^h) delta 46 zcmV+}0MY-e*8=0!0fekTSS?e#h*_;vBjEk z;YP(D;u{Sr#3%PW;b3IjJoU*XCO-Q^iWz^;g4Hv7uGt*>{30X2(9_2c?z|9z2zp%E ztorh{Fyq3_hJPg*7#X*F)iVBM=PzZRWNe@y2T>!wal2J3qaYW*XXMn?v(Nv48dtX6 zsh{x!E6;x@U|^8Y+@3d;@vaEJ&Q5Rss}?d)?bX|zRx$o!nr!bOFn!iqMzife;sYDw z%kAA;7&ZC$J1s8HzVhe@)KsqRs}C_cvhW|eaz=h1e-K2}{m=Ht#~3@g_;04J&ye() z3la4&+MaxoaUv6c@vQu;B}p@(COq2y`ZA*evq0fPVU_r5VHK$2dE1$`}VqZOoFWZK{juLugqTq)swM(E+b_| zbLCYeIn7-LwZ>t4*)FDT9>$#;6(hvA1I_zrF@3iHvl`235$Ai;*9$NkNrG5l)eKCh zfwWOM1A_q%0|O(&cCV?7jH1|siAh2b6q6GTI3SMvFTgATG}Cq0^guyosp%+OBcOzv z)%3j}iEKfzItbT@=d_4BBuE+7%TDiH!K4LL8ggg4VNS$@N~vBq4BGBt{7A33Z_ikS74a4%Y<$ delta 271 zcmbO+h4=S5o(=U|7+EJbY%!2vVGxtzy=lh z?LguK8{?Dh-CGzn`L>@q#Av~?UFJAr1K0K~7a2R4wuf9{6ldPve4X(%7h~Z@#RW_d zz2}*jB)0E;!g$~$BkT6MbxeY++m~-<`oOl`kAsneW&8GhOjR5pA9aX>)o-71kLj@m E09rO{kpKVy 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) { + + } }