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

Fix desktop runtime & do some clickgui improvements

Browse Source
This commit is contained in:
ThisIsALegitUsername 2023-02-22 21:50:37 -05:00
parent 8cd569776d
commit 0c9587107e
9 changed files with 31455 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.vscode/settings.json vendored
View File

@ -1,4 +1,5 @@
{
"liveServer.settings.root": "/javascript/",
"java.dependency.packagePresentation": "hierarchical",
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx4G -Xms100m -Xlog:disable",
"editor.tabCompletion": "on",

4
desktopRuntime/eclipseProject/eaglercraftDebugRuntime.launch
View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/eclipseProject/src_main_java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/MainClass.java"/>
<listEntry value="/eclipseProject/src_lwjgl_java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/MainClass.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@ -14,6 +15,7 @@
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.lax1dude.eaglercraft.v1_8.internal.lwjgl.MainClass"/>
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="eclipseProject"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="eclipseProject"/>

BIN
javascript/assets.epk
View File

Binary file not shown.

31453
javascript/classes.js
View File

File diff suppressed because it is too large Load Diff

6
javascript/classes.js.map
View File

File diff suppressed because one or more lines are too long

7
src/main/java/dev/resent/module/impl/hud/KeyStrokes.java
View File

@ -38,13 +38,6 @@ public class KeyStrokes extends RenderMod {
public boolean wasPressed2;
public long lastPressed2;
public float getSize(ModeSetting size) {
if (size.getValue() == "Small") return 0.75f;
if (size.getValue() == "Normal") return 1.0f;
if (size.getValue() == "Large") return 1.25f;
return 1.0f;
}
public int getLeftCPS() {
final long leftTime = System.currentTimeMillis() + 100L;
FuncUtils.removeIf(clicks, beenLeftTime -> beenLeftTime + 1200L < leftTime + 200L);

2
src/main/java/dev/resent/module/impl/misc/Cape.java
View File

@ -20,6 +20,6 @@ public class Cape extends Mod{
public ModeSetting amogus = new ModeSetting("amogus", "", "asdfasdf", "asdfasdf 1");
public Cape(){
addSetting(open, ratio, amogus);
addSetting(amogus, open, ratio);
}
}

12
src/main/java/dev/resent/ui/ClickGUI.java
View File

@ -22,6 +22,7 @@ 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.util.EnumChatFormatting;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
@ -89,7 +90,7 @@ public class ClickGUI extends GuiScreen {
}
if (s instanceof ModeSetting) {
if (isMouseInside(mouseX, mouseY, this.x + 24, height - 9 + 50 + var, this.x + 24 + fr.getStringWidth(s.name + ": " + ((ModeSetting)s).getValue()), height - 9 + 50 + var + 9) && mouseButton == 0)
if (isMouseInside(mouseX, mouseY, this.x + 24 + fr.getStringWidth(s.name + ": " + ((ModeSetting)s).getValue()), height - 9 + 50 + var, this.x + 24 + fr.getStringWidth(s.name + ": " + ((ModeSetting)s).getValue() + " >"), height - 9 + 50 + var + 9) && mouseButton == 0)
((ModeSetting)s).next();
}
@ -165,9 +166,6 @@ public class ClickGUI extends GuiScreen {
GlStateManager.color(1, 1, 1);
this.mc.getTextureManager().bindTexture(new ResourceLocation("eagler:gui/gear.png"));
Gui.drawModalRectWithCustomSizedTexture(this.x + 99 + xo, height - 2 - fh * -(off) + 51 + 1 - offset, 0, 0, 8, 8, 8, 8);
//if (isMouseInside(mouseX, mouseY, this.x + 90 + xo - 1 + 10, height - 2 - fh * -(off) + 51 + 1 - offset, this.x + 90 + xo - 1 + 10 + fr.getStringWidth("o"), height - 2 - fh * -(off) + 51 + 1 - offset + 9)) GlStateManager.color(1, 1, 1, 0.6f); else {
//GlStateManager.color(1, 1, 1, 0.75f);
//}
GlStateManager.disableBlend();
}
@ -181,8 +179,8 @@ public class ClickGUI extends GuiScreen {
for (int amogus = 0; amogus < this.modWatching.settings.size(); amogus++) {
Setting s = this.modWatching.settings.get(amogus);
if(s instanceof CustomRectSettingDraw){
Gui.drawRect(x+21, height+39+var, x+26+fr.getStringWidth(s.name), height+var+51, isMouseInside(mouseX, mouseY, x+21, height+39+var, x+26+fr.getStringWidth(s.name), height+var+51) ? new Color(0, 0, 130, 70).getRGB() : new Color(0, 0, 100, 70).getRGB());
RenderUtils.drawRectOutline(x+21, height+39+var, x+26+fr.getStringWidth(s.name), height+var+51, -1);
Gui.drawRect(x+21, height+39+var, x+27+fr.getStringWidth(s.name), height+var+51, isMouseInside(mouseX, mouseY, x+21, height+39+var, x+26+fr.getStringWidth(s.name), height+var+51) ? new Color(20, 20, 100, 70).getRGB() : new Color(20, 50, 170).getRGB());
RenderUtils.drawRectOutline(x+21, height+39+var, x+27+fr.getStringWidth(s.name), height+var+51, -1);
fr.drawStringWithShadow(s.name, this.x + 24, height +41 + var, -1);
var += 3;
}
@ -196,7 +194,7 @@ public class ClickGUI extends GuiScreen {
}
}
if (s instanceof ModeSetting) {
fr.drawStringWithShadow(s.name + ": " + ((ModeSetting)s).getValue(), this.x + 18 + 6, height - 9 + 50 + var, -1);
fr.drawStringWithShadow(s.name + ": " + ((ModeSetting)s).getValue() + EnumChatFormatting.RED + " >", this.x + 18 + 6, height - 9 + 50 + var, -1);
}
var += 11;

8
src/main/java/net/minecraft/client/renderer/EntityRenderer.java
View File

@ -1094,12 +1094,8 @@ public class EntityRenderer implements IResourceManagerReloadListener {
this.mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
RenderHelper.disableStandardItemLighting();
this.mc.mcProfiler.endStartSection("terrain_setup");
new Thread() {
public void run() {
renderglobal.setupTerrain(entity, (double) partialTicks, frustum, frameCount++, mc.thePlayer.isSpectator());
}
}
.start();
renderglobal.setupTerrain(entity, (double) partialTicks, frustum, frameCount++, mc.thePlayer.isSpectator());
if (pass == 0 || pass == 2) {
this.mc.mcProfiler.endStartSection("updatechunks");
this.mc.renderGlobal.updateChunks(finishTimeNano);