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

Merge branch 'new' of https://github.com/ThisIsALegitUsername/Resent-1.8 into new

Browse Source
This commit is contained in:
ThisIsALegitUsername 2023-04-05 08:34:16 -06:00
commit d94ffce9c9
13 changed files with 123573 additions and 123438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
desktopRuntime/resources/assets/minecraft/resent/gear.png → desktopRuntime/resources/assets/eagler/gui/gear2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
desktopRuntime/resources/assets/minecraft/resent/house.png → desktopRuntime/resources/assets/eagler/gui/house.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
javascript/assets.epk
View File

Binary file not shown.

61679
javascript/badwifi/Resent_3.6_patch_1.8_International.html
View File

File diff suppressed because one or more lines are too long

61679
javascript/badwifi/Resent_3.6_patch__1.8_US.html
View File

File diff suppressed because one or more lines are too long

BIN
javascript/badwifi/assets.epk
View File

Binary file not shown.

61655
javascript/badwifi/classes.js
View File

File diff suppressed because it is too large Load Diff

61655
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

5
src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java
View File

@ -130,8 +130,9 @@ public class PlatformAudio {
public void errorMessage(String parString1, String parString2, int parInt1) {
if (!parString2.isEmpty()) {
logger.error("Error in class \"{}\"!", parString1);
logger.error(parString2);
// stfu pls
//logger.error("Error in class \"{}\"!", parString1);
//logger.error(parString2);
}
}
}

26
src/main/java/dev/resent/util/misc/TimerUtil.java Normal file
View File

@ -0,0 +1,26 @@
package dev.resent.util.misc;
public class TimerUtil {
private static long halfSecond = 500000000;
private long lastTime;
private long getDeltaTime(){
return (System.nanoTime()-lastTime);
}
private void updateTime(){
this.lastTime = System.nanoTime();
}
public TimerUtil() {
this.lastTime = System.nanoTime();
}
public boolean hasHalfSecondPassoed() {
if (getDeltaTime() >= halfSecond) {
updateTime();
return true;
}
else return false;
}
}

290
src/main/java/dev/resent/visual/ui/clickgui/rewrite/ClickGuiRewrite.java
View File

@ -7,7 +7,6 @@ import dev.resent.client.Resent;
import dev.resent.module.base.Mod;
import dev.resent.module.base.setting.BooleanSetting;
import dev.resent.module.base.setting.Setting;
import dev.resent.util.misc.FuncUtils;
import dev.resent.util.misc.GlUtils;
import dev.resent.util.render.Color;
import dev.resent.util.render.RenderUtils;
@ -25,159 +24,173 @@ import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.EntityRenderer;
import net.minecraft.util.ChatAllowedCharacters;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
public class ClickGuiRewrite extends GuiScreen{
public class ClickGuiRewrite extends GuiScreen {
public FontRenderer fr;
public ArrayList<Comp> comps = new ArrayList<>();
public FontRenderer fr;
public ArrayList < Comp > comps = new ArrayList < > ();
public float x, y, width, height;
public Animation introAnimation;
public ScaledResolution sr;
public boolean closing;
public boolean closing, isSearchFocused;
public Mod selectedMod;
public String searchString = "";
public SimpleAnimation partAnimation = new SimpleAnimation(0);
public int backgroundColor = new Color(18, 18, 18).getRGB(),
primaryColor = 0xFF000000,
secondaryColor = new Color(33, 33, 33).getRGB(),
onSurfaceColor = new Color(3, 218, 197).getRGB(),
secondaryFontColor = new Color(187, 134, 252).getRGB();
primaryColor = 0xFF000000,
secondaryColor = new Color(33, 33, 33).getRGB(),
onSurfaceColor = new Color(3, 218, 197).getRGB(),
secondaryFontColor = new Color(187, 134, 252).getRGB();
public int partOffset = 0, scrollOffset = 0;
public String part = "Home";
@Override
public void drawScreen(int mouseX, int mouseY, float var3) {
int offset = 0;
int offset = 0;
GlUtils.startScale((this.x + this.width) / 2, (this.y + this.height) / 2, introAnimation != null ? (float) introAnimation.getValue() : 1);
//Navigation bar
RenderUtils.drawRoundedRect(x, y, x+width-60, y+height, 32, secondaryColor);
RenderUtils.drawRoundedRect(x, y, x + width - 60, y + height, 32, secondaryColor);
//Background overlay
RenderUtils.drawRoundedRect(x+60, y, x+width, y+height, 32, backgroundColor);
Gui.drawRect(x+60, y, x+102, y+height, backgroundColor);
//Seperating line
Gui.drawRect(x, y+90, x+width, y+95, secondaryColor);
RenderUtils.drawRoundedRect(x + 60, y, x + width, y + height, 32, backgroundColor);
Gui.drawRect(x + 60, y, x + 102, y + height, backgroundColor);
//Separating line
Gui.drawRect(x, y + 90, x + width, y + 95, secondaryColor);
//Title
GlStateManager.pushMatrix();
GlStateManager.translate(x+80, y+36, 0);
GlStateManager.scale(3.5f, 3.5f, 1);
GlStateManager.translate(-(x+80), -(y+36), 0);
fr.drawString("Resent", x+80, y+36, -1, false);
GlStateManager.translate(x + 80, y + 36, 0);
GlStateManager.scale(3.5F, 3.5F, 1);
GlStateManager.translate(-(x + 80), -(y + 36), 0);
fr.drawString("Resent", x + 80, y + 36, -1, false);
GlStateManager.popMatrix();
//Navigation selection
RenderUtils.drawRoundedRect(x+15, (int)y+115+partAnimation.getValue(), x+45, y+145+partAnimation.getValue(), 8, secondaryFontColor);
RenderUtils.drawRoundedRect(x + 15, (int) y + 115 + partAnimation.getValue(), x + 45, y + 145 + partAnimation.getValue(), 8, secondaryFontColor);
//Navigation icons
GlStateManager.color(1, 1, 1);
mc.getTextureManager().bindTexture(new ResourceLocation("/resent/house.png"));
Gui.drawModalRectWithCustomSizedTexture(x+20, (int)y+120, 0, 0, 20, 20, 20, 20);
mc.getTextureManager().bindTexture(new ResourceLocation("/resent/gear.png"));
Gui.drawModalRectWithCustomSizedTexture(x+20, (int)y+170, 0, 0, 20, 20, 20, 20);
GlStateManager.color(1, 1, 1);
mc.getTextureManager().bindTexture(new ResourceLocation("eagler:gui/house.png"));
Gui.drawModalRectWithCustomSizedTexture(x + 20, (int) y + 120, 0, 0, 20, 20, 20, 20);
mc.getTextureManager().bindTexture(new ResourceLocation("eagler:gui/gear2.png"));
Gui.drawModalRectWithCustomSizedTexture(x + 20, (int) y + 170, 0, 0, 20, 20, 20, 20);
//Search
RenderUtils.drawRoundedRect(x+width-300, y+25, x+width-50, y+65, 9, secondaryColor);
RenderUtils.drawRoundedRect(x + width - 300, y + 25, x + width - 50, y + 65, 9, secondaryColor);
GlStateManager.pushMatrix();
GlStateManager.translate(x+width-290, y+40, 0);
GlStateManager.scale(1.5f, 1.5f, 1);
GlStateManager.translate(-(x+width-290), -(y+40), 0);
if(searchString.length() > 0) {
fr.drawString(searchString, x+width-290, y+40, secondaryFontColor, false);
}else {
fr.drawString("Search", x+width-290, y+40, new Color(97, 97, 97).getRGB(), false);
GlStateManager.translate(x + width - 290, y + 40, 0);
GlStateManager.scale(1.5F, 1.5F, 1);
GlStateManager.translate(-(x + width - 290), -(y + 40), 0);
if (searchString.length() > 0) {
fr.drawString(searchString, x + width - 290, y + 40, secondaryFontColor, false);
} else {
fr.drawString(EnumChatFormatting.ITALIC + "Search", x + width - 290, y + 40, new Color(97, 97, 97).getRGB(), false);
}
if (isSearchFocused) {
drawRect(x + width - 290 + fr.getStringWidth(searchString), y + 38, x + width - 289 + fr.getStringWidth(searchString), y + 50, secondaryFontColor);
}
GlStateManager.popMatrix();
//Draw module button
for(Mod m : Resent.INSTANCE.modManager.modules){
if(!m.isAdmin() && m.getName().toLowerCase().startsWith(searchString.toLowerCase()) && selectedMod == null) {
if(y+115+offset+scrollOffset > y+95 && y+185+offset+scrollOffset < y+height) {
//Body
RenderUtils.drawRoundedRect(x+80, y+115+offset+scrollOffset, x+width-20, y+185+offset+scrollOffset, 16, secondaryColor);
//Gear
if(m.doesHaveSetting()) {
GlStateManager.color(1, 1, 1);
mc.getTextureManager().bindTexture(new ResourceLocation("/resent/gear.png"));
Gui.drawModalRectWithCustomSizedTexture(x+width-60, (int)y+140+offset+scrollOffset, 0, 0, 20, 20, 20, 20);
}
//RenderUtils.drawRoundedRect(x+width-60, y+140+offset, x+width-40, y+160+offset, 4, -1);
//Toggle
RenderUtils.drawRoundedRect(x+90, y+125+offset+scrollOffset, x+140, y+175+offset+scrollOffset, 8, new Color(66, 66, 66).getRGB());
GlUtils.startScale(x+90, y+140+offset+scrollOffset, 2);
fr.drawString(m.getName(), x+120, y+140+offset+scrollOffset, -1, false);
GlStateManager.popMatrix();
if(isMouseInside(mouseX, mouseY, x+80, y+115+offset+scrollOffset, x+width-20, y+185+offset+scrollOffset)) {
fr.drawString(m.getDescription(), mouseX+8, mouseY, onSurfaceColor, false);
}
}
offset += 80;
}
for (Mod m: Resent.INSTANCE.modManager.modules) {
if (!m.isAdmin() && m.getName().toLowerCase().startsWith(searchString.toLowerCase()) && selectedMod == null) {
if (y + 115 + offset + scrollOffset > y + 95 && y + 185 + offset + scrollOffset < y + height) {
//Body
RenderUtils.drawRoundedRect(x + 80, y + 115 + offset + scrollOffset, x + width - 20, y + 185 + offset + scrollOffset, 16, secondaryColor);
//Gear
if (m.doesHaveSetting()) {
GlStateManager.color(1, 1, 1);
mc.getTextureManager().bindTexture(new ResourceLocation("eagler:gui/gear2.png"));
Gui.drawModalRectWithCustomSizedTexture(x + width - 60, (int) y + 140 + offset + scrollOffset, 0, 0, 20, 20, 20, 20);
}
//RenderUtils.drawRoundedRect(x+width-60, y+140+offset, x+width-40, y+160+offset, 4, -1);
//Toggle
RenderUtils.drawRoundedRect(x + 90, y + 125 + offset + scrollOffset, x + 140, y + 175 + offset + scrollOffset, 8, new Color(66, 66, 66).getRGB());
GlUtils.startScale(x + 90, y + 140 + offset + scrollOffset, 2);
fr.drawString(m.getName(), x + 120, y + 140 + offset + scrollOffset, -1, false);
GlStateManager.popMatrix();
if (isMouseInside(mouseX, mouseY, x + 80, y + 115 + offset + scrollOffset, x + width - 20, y + 185 + offset + scrollOffset)) {
fr.drawString(m.getDescription(), mouseX + 8, mouseY, onSurfaceColor, false);
}
}
offset += 80;
}
}
GlStateManager.popMatrix();
if(selectedMod != null){
for (Comp comp : comps) {
if (selectedMod != null) {
for (Comp comp: comps) {
comp.drawScreen(mouseX, mouseY);
}
}
if (closing) {
comps.clear();
if(introAnimation == null) {
mc.displayGuiScreen(null);
return;
}
if (introAnimation == null) {
mc.displayGuiScreen(null);
return;
}
introAnimation.setDirection(Direction.BACKWARDS);
if (introAnimation.isDone(Direction.BACKWARDS)) {
mc.displayGuiScreen(null);
}
}
}
@Override
protected void mouseClicked(int mouseX, int mouseY, int mouseButton) {
if(isMouseInside(mouseX, mouseY, x+20, (int)y+170, x+40, (int)y+190)) {
partAnimation.setAnimation(50-partOffset, 10);
}else if(isMouseInside(mouseX, mouseY, x+20, (int)y+120, x+40, (int)y+140)) {
partAnimation.setAnimation(0-partOffset, 10);
}
int offset = 0;
for(Mod m : Resent.INSTANCE.modManager.modules){
if(!m.isAdmin()) {
if(isMouseInside(mouseX, mouseY, x+width-60, y+140+offset, x+width-40, y+160+offset) && mouseButton == 0 && m.doesHaveSetting()){
for(Setting s : m.settings){
if(s instanceof BooleanSetting){
comps.add(new CompCheck(4, 4, selectedMod, s));
}
}
}
offset += 80;
}
if (isMouseInside(mouseX, mouseY, x + 20, (int) y + 170, x + 40, (int) y + 190)) {
partAnimation.setAnimation(50 - partOffset, 10);
} else if (isMouseInside(mouseX, mouseY, x + 20, (int) y + 120, x + 40, (int) y + 140)) {
partAnimation.setAnimation(0 - partOffset, 10);
}
if(selectedMod != null){
for(Comp c : comps){
if (isMouseInside(mouseX, mouseY, x + width - 300, y + 25, x + width - 50, y + 65)) {
isSearchFocused = true;
} else {
isSearchFocused = false;
}
int offset = 0;
for (Mod m: Resent.INSTANCE.modManager.modules) {
if (!m.isAdmin()) {
if (isMouseInside(mouseX, mouseY, x + width - 60, y + 140 + offset, x + width - 40, y + 160 + offset) && mouseButton == 0 && m.doesHaveSetting()) {
for (Setting s: m.settings) {
if (s instanceof BooleanSetting) {
comps.add(new CompCheck(4, 4, selectedMod, s));
}
}
}
offset += 80;
}
}
if (selectedMod != null) {
for (Comp c: comps) {
c.mouseClicked(mouseX, mouseY, mouseButton);
}
}
@ -187,11 +200,11 @@ public class ClickGuiRewrite extends GuiScreen{
@Override
public void initGui() {
sr = new ScaledResolution(mc);
x = sr.getScaledWidth()/10;
y = sr.getScaledHeight()/10;
width = sr.getScaledWidth()/1.25f;
height = sr.getScaledHeight()/1.25f;
introAnimation = Theme.getAnimation(500, 1, 3, 3.8f, 1.35f, false);
x = sr.getScaledWidth() / 10;
y = sr.getScaledHeight() / 10;
width = sr.getScaledWidth() / 1.25F;
height = sr.getScaledHeight() / 1.25F;
introAnimation = Theme.getAnimation(500, 1, 3, 3.8F, 1.35F, false);
fr = mc.fontRendererObj;
}
@ -201,47 +214,46 @@ public class ClickGuiRewrite extends GuiScreen{
closing = true;
}
if(selectedMod != null){
for(Comp c : comps){
if (selectedMod != null) {
for (Comp c: comps) {
c.keyTyped(par1, key);
}
}
// Search box stuff
else if(key == KeyboardConstants.KEY_BACK) {
if(searchString.length() != 0) {
searchString = searchString.substring(0, searchString.length()-1);
}
}else {
if(searchString.length() <= 18) {
String balls = ChatAllowedCharacters.filterAllowedCharacters(String.valueOf(par1));
if(balls != null && balls != "") {
searchString += String.valueOf(par1);
scrollOffset = 0;
}
}
else if (key == KeyboardConstants.KEY_BACK && isSearchFocused) {
if (searchString.length() != 0) {
searchString = searchString.substring(0, searchString.length() - 1);
}
} else {
if (searchString.length() <= 18 && isSearchFocused) {
String balls = ChatAllowedCharacters.filterAllowedCharacters(String.valueOf(par1));
if (balls != null && balls != "") {
searchString += String.valueOf(par1);
scrollOffset = 0;
}
}
}
}
@Override
public void handleMouseInput() throws IOException {
int scroll = Mouse.getEventDWheel();
if(scroll > 0) {
scrollOffset = MathHelper.clamp_int(scrollOffset+80, getMaxScroll(), 0);
}else if(scroll < 0) {
scrollOffset = MathHelper.clamp_int(scrollOffset-80, getMaxScroll(), 0);
}
super.handleMouseInput();
}
public void handleMouseInput() throws IOException {
int scroll = Mouse.getEventDWheel();
public boolean isMouseInside(double mouseX, double mouseY, double x, double y, double width, double height) {
if (scroll > 0) {
scrollOffset = MathHelper.clamp_int(scrollOffset + 80, getMaxScroll(), 0);
} else if (scroll < 0) {
scrollOffset = MathHelper.clamp_int(scrollOffset - 80, getMaxScroll(), 0);
}
super.handleMouseInput();
}
public boolean isMouseInside(double mouseX, double mouseY, double x, double y, double width, double height) {
return (mouseX >= x && mouseX <= width) && (mouseY >= y && mouseY <= height);
}
public int getMaxScroll() {
return Resent.INSTANCE.modManager.modules.size() * -68;
}
}
public int getMaxScroll() {
return Resent.INSTANCE.modManager.modules.size() * -69;
}
}

20
src/main/java/net/minecraft/client/gui/ScaledResolution.java
View File

@ -53,6 +53,26 @@ public class ScaledResolution {
this.scaledHeight = MathHelper.ceiling_double_int(this.scaledHeightD);
}
public ScaledResolution(Minecraft parMinecraft, int uwu) {
this.scaledWidth = parMinecraft.displayWidth;
this.scaledHeight = parMinecraft.displayHeight;
this.scaleFactor = 1;
boolean flag = parMinecraft.isUnicode();
while (this.scaleFactor < uwu && this.scaledWidth / (this.scaleFactor + 1) >= 320 && this.scaledHeight / (this.scaleFactor + 1) >= 240) {
++this.scaleFactor;
}
if (flag && this.scaleFactor % 2 != 0 && this.scaleFactor != 1) {
--this.scaleFactor;
}
this.scaledWidthD = (double) this.scaledWidth / (double) this.scaleFactor;
this.scaledHeightD = (double) this.scaledHeight / (double) this.scaleFactor;
this.scaledWidth = MathHelper.ceiling_double_int(this.scaledWidthD);
this.scaledHeight = MathHelper.ceiling_double_int(this.scaledHeightD);
}
public int getScaledWidth() {
return this.scaledWidth;
}