3rdparty/resent-1.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More code optimizations, remove chat event

Browse Source
This commit is contained in:
BuildTools 2023-01-01 10:57:28 -07:00
parent 2c573bdca0
commit 77ee59589f
13 changed files with 72861 additions and 72640 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.gradle/7.3.1/executionHistory/executionHistory.bin
View File

Binary file not shown.

BIN
.gradle/7.3.1/executionHistory/executionHistory.lock
View File

Binary file not shown.

BIN
.gradle/7.3.1/fileHashes/fileHashes.bin
View File

Binary file not shown.

BIN
.gradle/7.3.1/fileHashes/fileHashes.lock
View File

Binary file not shown.

BIN
.gradle/7.3.1/fileHashes/resourceHashesCache.bin
View File

Binary file not shown.

BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock
View File

Binary file not shown.

BIN
.gradle/buildOutputCleanup/outputFiles.bin
View File

Binary file not shown.

145407
javascript/classes.js
View File

File diff suppressed because it is too large Load Diff

2
javascript/classes.js.map
View File

File diff suppressed because one or more lines are too long

17
src/main/java/dev/resent/event/impl/ClientChatEvent.java
View File

@ -1,17 +0,0 @@
package dev.resent.event.impl;
import net.kyori.event.Cancellable;
public class ClientChatEvent extends Event implements Cancellable{
public String message;
public boolean canceled;
public ClientChatEvent(String message) { this.message = message; }
public String getMessage() { return message; }
public void setMessage(String message) { this.message = message; }
@Override
public boolean isCancelled() { return canceled; }
@Override
public void setCancelled(boolean canceled) { this.canceled = canceled; }
}

14
src/main/java/dev/resent/setting/ModeSetting.java
View File

@ -1,10 +1,11 @@
package dev.resent.setting;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public class ModeSetting extends Setting{
public List<String> modes = new ArrayList<String>();
public List<String> modes = new ArrayList<>();
public String current;
@ -12,20 +13,13 @@ public class ModeSetting extends Setting{
public ModeSetting(String name, String description, String... modes) {
super(name, description);
for (String s : modes) {
this.modes.add(s);
}
if (curr >= this.modes.size()) {
Collections.addAll(this.modes, modes);
if (curr == this.modes.size()) {
curr = 0;
}
current = this.modes.get(curr);
}
public ModeSetting FireChange() {
onChange();
return this;
}
public void onChange() { }
public void setValue(String val) {

51
src/main/java/dev/resent/ui/mods/ClickGUI.java
View File

@ -24,7 +24,6 @@ public class ClickGUI extends GuiScreen {
public ScaledResolution sr;
public int x, y, width, height;
public int offset = 0;
public float offsety = 20;
public FontRenderer fr;
@Override
@ -38,7 +37,7 @@ public class ClickGUI extends GuiScreen {
width = GuiScreen.width - x;
height = GuiScreen.height - y;
x = sr.getScaledWidth() / 8 + xo;
y = sr.getScaledHeight() / (int) 1.1 - 10 + xy;
y = sr.getScaledHeight() - 10 + xy;
int off = 0;
for (Mod m: Resent.INSTANCE.modManager.modules) {
@ -74,8 +73,8 @@ public class ClickGUI extends GuiScreen {
fr.drawString("<", x - fr.FONT_HEIGHT + 4, height + 29 + fr.FONT_HEIGHT + 2, -1);
for (int asdf = 0; asdf < this.modWatching.settings.size(); asdf++) {
BooleanSetting b = null;
ModeSetting m = null;
BooleanSetting b;
ModeSetting m;
Setting s = this.modWatching.settings.get(asdf);
if (s instanceof BooleanSetting) {
@ -88,7 +87,7 @@ public class ClickGUI extends GuiScreen {
if (s instanceof ModeSetting) {
m = (ModeSetting) s;
if(isMouseInside(mouseX, mouseY, this.x+24, height-fr.FONT_HEIGHT+50+var, this.x+24+fr.getStringWidth(s.name+": "+m.getValue()), height-fr.FONT_HEIGHT+50+var+fr.FONT_HEIGHT) && mouseButton == 0)
m.next();
m.next();
}
@ -109,7 +108,7 @@ public class ClickGUI extends GuiScreen {
width = GuiScreen.width - x;
height = GuiScreen.height - y;
x = sr.getScaledWidth() / 8 + xo;
y = sr.getScaledHeight() / (int) 1.1 - 10 + xy;
y = sr.getScaledHeight() - 10 + xy;
int off = 0;
// background
@ -164,7 +163,7 @@ public class ClickGUI extends GuiScreen {
}
fr.drawStringWithShadow(m.name,
this.x + 15 + 7 + xo * (int) 1.5, height - fh * -(off) + 50 - offset, -1);
this.x + 15 + 7 + xo, height - fh * -(off) + 50 - offset, -1);
}
} else if (this.modWatching != null) {
@ -175,7 +174,7 @@ public class ClickGUI extends GuiScreen {
height + 29 - fr.FONT_HEIGHT - 2, -1);
for (int amogus = 0; amogus < this.modWatching.settings.size(); amogus++) {
BooleanSetting b = null;
BooleanSetting b;
ModeSetting mo = null;
Setting s = this.modWatching.settings.get(amogus);
if (s instanceof BooleanSetting) {
@ -241,31 +240,27 @@ public class ClickGUI extends GuiScreen {
if (getListMaxScroll() + this.height >= this.height) {
int wheel = Mouse.getEventDWheel();
if (wheel < 0) {
new Thread(){
public void run(){
for (int i = 0; i < 20; i++) {
offset = MathHelper.clamp_int(offset + 1, 0, getListMaxScroll());
new Thread(() -> {
for (int i = 0; i < 20; i++) {
offset = MathHelper.clamp_int(offset + 1, 0, getListMaxScroll());
try {
Thread.sleep(1);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}).start();
} else if (wheel > 0) {
new Thread(() -> {
for (int i = 0; i < 20; i++) {
offset = MathHelper.clamp_int(offset - 1, 0, getListMaxScroll());
try {
sleep(1);
Thread.sleep(1);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
}.start();
} else if (wheel > 0) {
new Thread(){
public void run(){
for (int i = 0; i < 20; i++) {
offset = MathHelper.clamp_int(offset - 1, 0, getListMaxScroll());
try {
sleep(1);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
}.start();
}).start();
}
try {
super.handleMouseInput();

10
src/main/java/net/minecraft/client/network/NetHandlerPlayClient.java
View File

@ -11,7 +11,6 @@ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
import com.google.common.collect.Maps;
import dev.resent.Resent;
import dev.resent.event.impl.ClientChatEvent;
import dev.resent.event.impl.EntityStatusEvent;
import dev.resent.module.impl.misc.AutoGG;
import dev.resent.util.misc.W;
@ -761,12 +760,9 @@ public class NetHandlerPlayClient implements INetHandlerPlayClient {
this.gameController.ingameGUI.setRecordPlaying(packetIn.getChatComponent(), false);
} else {
ClientChatEvent event = new ClientChatEvent(packetIn.getChatComponent().getUnformattedText());
Resent.INSTANCE.events().post(event);
if (event.message.toLowerCase().contains("you won the match") && AutoGG.onWin.getValue()
|| event.message.toLowerCase().contains("was killed by")
&& event.message.contains(Minecraft.getMinecraft().thePlayer.getName()) || event.message.toLowerCase().contains("you lost the") && AutoGG.onLose.getValue()) {
if (packetIn.getChatComponent().getUnformattedText().toLowerCase().contains("you won the match") && AutoGG.onWin.getValue()
|| packetIn.getChatComponent().getUnformattedText().toLowerCase().contains("was killed by")
&& packetIn.getChatComponent().getUnformattedText().contains(Minecraft.getMinecraft().thePlayer.getName()) || packetIn.getChatComponent().getUnformattedText().toLowerCase().contains("you lost the") && AutoGG.onLose.getValue()) {
if (W.autoGG().isEnabled()) {
switch (hasSaid) {
case "hasSaid1":