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

refactored some stuffs

Browse Source
This commit is contained in:
ThisIsALegitUsername 2023-02-28 17:49:25 -05:00
parent 285fc5cd67
commit 1301e46b3c
5 changed files with 116 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/dev/resent/client/ClientInfo.java Normal file
View File

@ -0,0 +1,19 @@
package dev.resent.client;
public class ClientInfo {
public static final String name = "Resent";
public static final String version = "3.6";
public static final String release = Release.BETA.name;
public enum Release {
BETA("Beta"),
STABLE("Stable");
String name;
Release(String name) {
this.name = name;
}
}
}

72
src/main/java/dev/resent/client/Resent.java
View File

@ -1,90 +1,22 @@
package dev.resent.client; package dev.resent.client;
import java.io.PrintWriter;
import dev.resent.module.base.ModManager; import dev.resent.module.base.ModManager;
import dev.resent.module.base.RenderMod;
import dev.resent.module.base.setting.BooleanSetting;
import dev.resent.module.base.setting.ModeSetting;
import dev.resent.sound.SoundManager; import dev.resent.sound.SoundManager;
public class Resent { public class Resent {
static { static {
INSTANCE = new Resent(); INSTANCE = new Resent();
} }
public static final String NAME = "Resent", VERSION = "3.6";
public static final Resent INSTANCE; public static final Resent INSTANCE;
public SoundManager soundManager; public SoundManager soundManager;
public ModManager modManager; public ModManager modManager;
public SaveUtil saveUtil = new SaveUtil();
public void init() { public void init() {
Resent.INSTANCE.modManager = new ModManager(); Resent.INSTANCE.modManager = new ModManager();
Resent.INSTANCE.soundManager = new SoundManager(); Resent.INSTANCE.soundManager = new SoundManager();
} }
public void save(PrintWriter printwriter) {
Resent.INSTANCE.modManager.modules
.stream()
.forEach(m -> {
printwriter.println(m.getName() + ":" + m.isEnabled());
if (m instanceof RenderMod) {
printwriter.println(m.getName() + "_x:" + ((RenderMod) m).getX());
printwriter.println(m.getName() + "_y:" + ((RenderMod) m).getY());
printwriter.println(m.getName() + "_lastx:" + ((RenderMod) m).lastX);
printwriter.println(m.getName() + "_lasty:" + ((RenderMod) m).lastY);
}
m.settings
.stream()
.forEach(s -> {
if (s instanceof ModeSetting) {
printwriter.println(m.getName() + "_modesetting_" + s.name + ":" + ((ModeSetting) s).getValue());
}
if (s instanceof BooleanSetting) {
printwriter.println(m.getName() + "_boolsetting_" + s.name + ":" + ((BooleanSetting) s).getValue());
}
});
});
}
public void load(String[] astring) {
Resent.INSTANCE.modManager.modules
.stream()
.forEach(m -> {
if (astring[0].equals(m.getName())) {
m.setEnabled(astring[1].equals("true"));
}
if (m instanceof RenderMod) {
if (astring[0].equals(m.getName() + "_x")) {
((RenderMod) m).setX(Integer.parseInt(astring[1]));
}
if (astring[0].equals(m.getName() + "_y")) {
((RenderMod) m).setY(Integer.parseInt(astring[1]));
}
if (astring[0].equals(m.getName() + "_lastx")) {
((RenderMod) m).lastX = Integer.parseInt(astring[1]);
}
if (astring[0].equals(m.getName() + "_lasty")) {
((RenderMod) m).lastY = Integer.parseInt(astring[1]);
}
}
m.settings
.stream()
.forEach(se -> {
if (se instanceof ModeSetting) {
if (astring[0].equals(m.getName() + "_modesetting_" + se.name)) {
((ModeSetting) se).setValue(astring[1]);
}
}
if (se instanceof BooleanSetting) {
if (astring[0].equals(m.getName() + "_boolsetting_" + se.name)) {
((BooleanSetting) se).setValue(astring[1].equals("true"));
}
}
});
});
}
} }

75
src/main/java/dev/resent/client/SaveUtil.java Normal file
View File

@ -0,0 +1,75 @@
package dev.resent.client;
import java.io.PrintWriter;
import dev.resent.module.base.RenderMod;
import dev.resent.module.base.setting.BooleanSetting;
import dev.resent.module.base.setting.ModeSetting;
public class SaveUtil {
public void save(PrintWriter printwriter) {
Resent.INSTANCE.modManager.modules
.stream()
.forEach(m -> {
printwriter.println(m.getName() + ":" + m.isEnabled());
if (m instanceof RenderMod) {
printwriter.println(m.getName() + "_x:" + ((RenderMod) m).getX());
printwriter.println(m.getName() + "_y:" + ((RenderMod) m).getY());
printwriter.println(m.getName() + "_lastx:" + ((RenderMod) m).lastX);
printwriter.println(m.getName() + "_lasty:" + ((RenderMod) m).lastY);
}
m.settings
.stream()
.forEach(s -> {
if (s instanceof ModeSetting) {
printwriter.println(m.getName() + "_modesetting_" + s.name + ":" + ((ModeSetting) s).getValue());
}
if (s instanceof BooleanSetting) {
printwriter.println(m.getName() + "_boolsetting_" + s.name + ":" + ((BooleanSetting) s).getValue());
}
});
});
}
public void load(String[] astring) {
Resent.INSTANCE.modManager.modules
.stream()
.forEach(m -> {
if (astring[0].equals(m.getName())) {
m.setEnabled(astring[1].equals("true"));
}
if (m instanceof RenderMod) {
if (astring[0].equals(m.getName() + "_x")) {
((RenderMod) m).setX(Integer.parseInt(astring[1]));
}
if (astring[0].equals(m.getName() + "_y")) {
((RenderMod) m).setY(Integer.parseInt(astring[1]));
}
if (astring[0].equals(m.getName() + "_lastx")) {
((RenderMod) m).lastX = Integer.parseInt(astring[1]);
}
if (astring[0].equals(m.getName() + "_lasty")) {
((RenderMod) m).lastY = Integer.parseInt(astring[1]);
}
}
m.settings
.stream()
.forEach(se -> {
if (se instanceof ModeSetting) {
if (astring[0].equals(m.getName() + "_modesetting_" + se.name)) {
((ModeSetting) se).setValue(astring[1]);
}
}
if (se instanceof BooleanSetting) {
if (astring[0].equals(m.getName() + "_boolsetting_" + se.name)) {
((BooleanSetting) se).setValue(astring[1].equals("true"));
}
}
});
});
}
}

35
src/main/java/dev/resent/visual/ui/ClickGUI.java
View File

@ -2,6 +2,7 @@ package dev.resent.visual.ui;
import java.io.IOException; import java.io.IOException;
import dev.resent.client.ClientInfo;
import dev.resent.client.Resent; import dev.resent.client.Resent;
import dev.resent.module.base.Mod; import dev.resent.module.base.Mod;
import dev.resent.module.base.ModManager; import dev.resent.module.base.ModManager;
@ -31,7 +32,7 @@ import net.minecraft.util.ResourceLocation;
public class ClickGUI extends GuiScreen { public class ClickGUI extends GuiScreen {
public Animation introAnimation; public Animation introAnimation;
public Mod modWatching = null; public Mod openedMod = null;
public ScaledResolution sr; public ScaledResolution sr;
public int x, y, width, height; public int x, y, width, height;
public int offset = 0; public int offset = 0;
@ -55,26 +56,26 @@ public class ClickGUI extends GuiScreen {
if (isMouseInside(mouseX, mouseY, sr.getScaledWidth() / 2 - fr.getStringWidth("Edit Layout") / 2 - 5, sr.getScaledHeight() - y - 9, sr.getScaledWidth() / 2 - fr.getStringWidth("Edit Layout") / 2 + 5 + fr.getStringWidth("Edit Layout"), sr.getScaledHeight() - y + 5) && mouseButton == 0) { if (isMouseInside(mouseX, mouseY, sr.getScaledWidth() / 2 - fr.getStringWidth("Edit Layout") / 2 - 5, sr.getScaledHeight() - y - 9, sr.getScaledWidth() / 2 - fr.getStringWidth("Edit Layout") / 2 + 5 + fr.getStringWidth("Edit Layout"), sr.getScaledHeight() - y + 5) && mouseButton == 0) {
mc.displayGuiScreen(new HUDConfigScreen()); mc.displayGuiScreen(new HUDConfigScreen());
this.modWatching = null; this.openedMod = null;
} }
for (Mod m : Resent.INSTANCE.modManager.modsInCategory(selectedCategory) ) { for (Mod m : Resent.INSTANCE.modManager.modsInCategory(selectedCategory) ) {
int fh = 9; int fh = 9;
if (isMouseInside(mouseX, mouseY, this.x + 90 + xo - 1 + 10, height - 2 - fh * -(off) + 51 - 1 - offset, this.x + 90 + xo - 1 + 21, height + 30 - fh * (-off) + 30 - 1 + 2 - 1 - offset) && m.isHasSetting() && modWatching == null) { if (isMouseInside(mouseX, mouseY, this.x + 90 + xo - 1 + 10, height - 2 - fh * -(off) + 51 - 1 - offset, this.x + 90 + xo - 1 + 21, height + 30 - fh * (-off) + 30 - 1 + 2 - 1 - offset) && m.isHasSetting() && openedMod == null) {
// Open settings // Open settings
this.modWatching = m; this.openedMod = m;
} else if (isMouseInside(mouseX, mouseY, x - 9 + 2, height + 27 + 9 + 2, x - 9 + 6 + fr.getStringWidth("<"), height + 33 + 9 + 2 + fr.getStringWidth("<")) && mouseButton == 0) { } else if (isMouseInside(mouseX, mouseY, x - 9 + 2, height + 27 + 9 + 2, x - 9 + 6 + fr.getStringWidth("<"), height + 33 + 9 + 2 + fr.getStringWidth("<")) && mouseButton == 0) {
// Close settings // Close settings
this.modWatching = null; this.openedMod = null;
} else if (isMouseInside(mouseX, mouseY, width + 15, height - 10, width + 25, height + 7)) { } else if (isMouseInside(mouseX, mouseY, width + 15, height - 10, width + 25, height + 7)) {
// Close ui // Close ui
mc.displayGuiScreen(null); mc.displayGuiScreen(null);
this.modWatching = null; this.openedMod = null;
}else if(isMouseInside(mouseX, mouseY, this.x+48+xo, height-2-fh*-(off)+70-1-offset, this.x+80+xo, height+30-fh*-off+30+2-offset+17) && ModManager.clickGui.guiTheme.getValue() == "New" && modWatching == null){ }else if(isMouseInside(mouseX, mouseY, this.x+48+xo, height-2-fh*-(off)+70-1-offset, this.x+80+xo, height+30-fh*-off+30+2-offset+17) && ModManager.clickGui.guiTheme.getValue() == "New" && openedMod == null){
//toggle new //toggle new
m.toggle(); m.toggle();
} else if (isMouseInside(mouseX, mouseY, this.x + 10 + xo - 2 + 10, height - 2 - fh * -(off) + 50 - 2 - offset, this.x + 90 + xo + 22, height + 30 - fh * (-off) + 30 + 2 - offset) && mouseButton == 0 && modWatching == null && ModManager.clickGui.guiTheme.getValue() == "Classic revised") { } else if (isMouseInside(mouseX, mouseY, this.x + 10 + xo - 2 + 10, height - 2 - fh * -(off) + 50 - 2 - offset, this.x + 90 + xo + 22, height + 30 - fh * (-off) + 30 + 2 - offset) && mouseButton == 0 && openedMod == null && ModManager.clickGui.guiTheme.getValue() == "Classic revised") {
//toggle classic //toggle classic
m.toggle(); m.toggle();
} }
@ -86,10 +87,10 @@ public class ClickGUI extends GuiScreen {
} }
} }
if (modWatching != null) { if (openedMod != null) {
int var = 0; int var = 0;
for (int asdf = 0; asdf < this.modWatching.settings.size(); asdf++) { for (int asdf = 0; asdf < this.openedMod.settings.size(); asdf++) {
Setting s = this.modWatching.settings.get(asdf); Setting s = this.openedMod.settings.get(asdf);
if (s instanceof BooleanSetting) { if (s instanceof BooleanSetting) {
if (isMouseInside(mouseX, mouseY, this.x + 13, height - 9 + 50 - offset + var + 1, this.x + 20, height - 9 + 50 + 9 - offset + var - 1) && mouseButton == 0) { if (isMouseInside(mouseX, mouseY, this.x + 13, height - 9 + 50 - offset + var + 1, this.x + 20, height - 9 + 50 + 9 - offset + var - 1) && mouseButton == 0) {
@ -145,7 +146,7 @@ public class ClickGUI extends GuiScreen {
// background // background
drawRect(x - 10, y + 20, width + 35, height - 10, new Color(35, 39, 42, 200).getRGB()); drawRect(x - 10, y + 20, width + 35, height - 10, new Color(35, 39, 42, 200).getRGB());
fr.drawString(Resent.NAME + " Client " + Resent.VERSION, x + 8, height - 2, -1); fr.drawString(ClientInfo.name + " Client " + ClientInfo.version, x + 8, height - 2, -1);
//RenderUtils.drawRectOutline(sr.getScaledWidth() / 2 - fr.getStringWidth("Edit Layout") / 2 - 5, sr.getScaledHeight() - y - 9, sr.getScaledWidth() / 2 - fr.getStringWidth("Edit Layout") / 2 + 5 + fr.getStringWidth("Edit Layout"), sr.getScaledHeight() - y + 5, -1); //RenderUtils.drawRectOutline(sr.getScaledWidth() / 2 - fr.getStringWidth("Edit Layout") / 2 - 5, sr.getScaledHeight() - y - 9, sr.getScaledWidth() / 2 - fr.getStringWidth("Edit Layout") / 2 + 5 + fr.getStringWidth("Edit Layout"), sr.getScaledHeight() - y + 5, -1);
drawRect( drawRect(
@ -173,7 +174,7 @@ public class ClickGUI extends GuiScreen {
drawRect(x - 8, height + 29, width + 33, height + 30, -1); drawRect(x - 8, height + 29, width + 33, height + 30, -1);
GlUtils.stopScale(); GlUtils.stopScale();
for (Mod m : Resent.INSTANCE.modManager.modsInCategory(selectedCategory)) { for (Mod m : Resent.INSTANCE.modManager.modsInCategory(selectedCategory)) {
if (this.modWatching == null) { if (this.openedMod == null) {
int fh = 9; int fh = 9;
if (height - 2 - fh * -(off) + 50 - 2 - offset > height + 29 && height + 40 - fh * (-off) + 30 +15 - offset < y + 20 && (introAnimation != null ? introAnimation.isDone() : true)) { if (height - 2 - fh * -(off) + 50 - 2 - offset > height + 29 && height + 40 - fh * (-off) + 30 +15 - offset < y + 20 && (introAnimation != null ? introAnimation.isDone() : true)) {
// Enabled outline // Enabled outline
@ -206,13 +207,13 @@ public class ClickGUI extends GuiScreen {
fr.drawStringWithShadow(m.getName(), this.x + 20 + xo, height - fh * -(off) + 50 - offset, -1); fr.drawStringWithShadow(m.getName(), this.x + 20 + xo, height - fh * -(off) + 50 - offset, -1);
} }
} else if (this.modWatching != null) { } else if (this.openedMod != null) {
int var = 0; int var = 0;
fr.drawString("<", x - 9 + 4, height + 29 + 9 + 2, -1); fr.drawString("<", x - 9 + 4, height + 29 + 9 + 2, -1);
fr.drawStringWithShadow("Resent - " + modWatching.getName(), sr.getScaledWidth() / 2 - (fr.getStringWidth("Resent - " + modWatching.getName()) / 2), height + 29 - 9 - 2, -1); fr.drawStringWithShadow("Resent - " + openedMod.getName(), sr.getScaledWidth() / 2 - (fr.getStringWidth("Resent - " + openedMod.getName()) / 2), height + 29 - 9 - 2, -1);
for (int amogus = 0; amogus < this.modWatching.settings.size(); amogus++) { for (int amogus = 0; amogus < this.openedMod.settings.size(); amogus++) {
Setting s = this.modWatching.settings.get(amogus); Setting s = this.openedMod.settings.get(amogus);
if(s instanceof CustomRectSettingDraw){ if(s instanceof CustomRectSettingDraw){
drawRect(x+21, height+41+var, x+27+fr.getStringWidth(s.name), height+var+53, isMouseInside(mouseX, mouseY, x+21, height+39+var, x+26+fr.getStringWidth(s.name), height+var+51) ? new Color(150, 150, 150).getRGB() : new Color(211, 211, 211).getRGB()); drawRect(x+21, height+41+var, x+27+fr.getStringWidth(s.name), height+var+53, isMouseInside(mouseX, mouseY, x+21, height+39+var, x+26+fr.getStringWidth(s.name), height+var+51) ? new Color(150, 150, 150).getRGB() : new Color(211, 211, 211).getRGB());
//RenderUtils.drawRectOutline(x+21, height+41+var, x+27+fr.getStringWidth(s.name), height+var+53, -1); //RenderUtils.drawRectOutline(x+21, height+41+var, x+27+fr.getStringWidth(s.name), height+var+53, -1);

4
src/main/java/net/minecraft/client/settings/GameSettings.java
View File

@ -1042,7 +1042,7 @@ public class GameSettings {
} }
} }
Resent.INSTANCE.load(astring); Resent.INSTANCE.saveUtil.load(astring);
} catch (Exception var8) { } catch (Exception var8) {
logger.warn("Skipping bad option: " + s); logger.warn("Skipping bad option: " + s);
} }
@ -1158,7 +1158,7 @@ public class GameSettings {
printwriter.println("modelPart_" + enumplayermodelparts.getPartName() + ":" + this.setModelParts.contains(enumplayermodelparts)); printwriter.println("modelPart_" + enumplayermodelparts.getPartName() + ":" + this.setModelParts.contains(enumplayermodelparts));
} }
Resent.INSTANCE.save(printwriter); Resent.INSTANCE.saveUtil.save(printwriter);
printwriter.close(); printwriter.close();