Fix crosshair colors + keystrokes improvement + possible fps improvement

This commit is contained in:
ThisIsALegitUsername 2023-01-10 14:31:01 +00:00
parent 587099f8a4
commit c380e5527a
17 changed files with 32146 additions and 2300019 deletions

View File

@ -1,13 +1,13 @@
arguments= arguments=--init-script /workspace/.vscode-remote/data/User/globalStorage/redhat.java/1.13.0/config_linux/org.eclipse.osgi/51/0/.cp/gradle/init/init.gradle --init-script /workspace/.vscode-remote/data/User/globalStorage/redhat.java/1.13.0/config_linux/org.eclipse.osgi/51/0/.cp/gradle/protobuf/init.gradle
auto.sync=false auto.sync=false
build.scans.enabled=false build.scans.enabled=false
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
connection.project.dir= connection.project.dir=
eclipse.preferences.version=1 eclipse.preferences.version=1
gradle.user.home= gradle.user.home=/workspace/.gradle
java.home= java.home=/home/gitpod/.sdkman/candidates/java/11.0.17.fx-zulu
jvm.arguments= jvm.arguments=
offline.mode=false offline.mode=false
override.workspace.settings=false override.workspace.settings=true
show.console.view=false show.console.view=true
show.executions.view=false show.executions.view=true

View File

@ -40,7 +40,7 @@ dependencies {
teavm { teavm {
compileScopes = null; compileScopes = null;
minifying = false; minifying = true;
maxTopLevelNames = 10000; maxTopLevelNames = 10000;
properties = null; properties = null;
debugInformationGenerated = false; debugInformationGenerated = false;
@ -71,10 +71,10 @@ teavm {
targetType = "JAVASCRIPT"; //org.teavm.tooling.TeaVMTargetType.JAVASCRIPT; targetType = "JAVASCRIPT"; //org.teavm.tooling.TeaVMTargetType.JAVASCRIPT;
cacheDirectory = null; cacheDirectory = null;
wasmVersion = "V_0x1"; //org.teavm.backend.wasm.render.WasmBinaryVersion.V_0x1; wasmVersion = "V_0x1"; //org.teavm.backend.wasm.render.WasmBinaryVersion.V_0x1;
minHeapSize = 4; minHeapSize = 108;
maxHeapSize = 128; maxHeapSize = 128;
outOfProcess = false; outOfProcess = false;
processMemory = 512; processMemory = 1024;
longjmpSupported = true; longjmpSupported = true;
heapDump = false; heapDump = false;

View File

@ -28,7 +28,7 @@ Compile it yourself here: https://gitlab.com/lax1dude/eaglercraftx-1.8/
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="description" content="EaglercraftX 1.8 Offline" /> <meta name="description" content="Resent client 1.8" />
<meta name="keywords" content="eaglercraft, eaglercraftx, minecraft, 1.8, 1.8.8" /> <meta name="keywords" content="eaglercraft, eaglercraftx, minecraft, 1.8, 1.8.8" />
<title>EaglercraftX 1.8</title> <title>EaglercraftX 1.8</title>
<meta property="og:locale" content="en-US" /> <meta property="og:locale" content="en-US" />

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -10,6 +10,6 @@ public class Crosshair extends Mod{
addSetting(color); addSetting(color);
} }
public static ModeSetting color = new ModeSetting("Hovered crosshair color", "", "White", "Red", "Yellow", "Green", "Blue", "Pink", "Orange", "Black"); public static ModeSetting color = new ModeSetting("Hovered crosshair color", "", "White", "Red", "Yellow", "Green", "Blue", "Black");
} }

View File

@ -6,23 +6,24 @@ import net.minecraft.client.gui.Gui;
public class RenderUtils { public class RenderUtils {
public static int getColor(ModeSetting asdf) { public static int getColor(ModeSetting asdf) {
switch (asdf.getValue()) { switch (asdf.getValue()) {
case "Red": case "Red":
return Color.RED.getRGB(); return new Color(255, 0, 0, 85).getRGB();
case "Yellow": case "Yellow":
return Color.YELLOW.getRGB(); return new Color(255, 255, 0, 85).getRGB();
case "Green": case "Green":
return Color.GREEN.getRGB(); return new Color(0, 255, 0, 85).getRGB();
case "Blue": case "Blue":
return Color.BLUE.getRGB(); return new Color(0, 0, 255, 85).getRGB();
case "Orange": case "Orange":
return Color.ORANGE.getRGB(); return new Color(255, 165, 0, 85).getRGB();
case "Pink": case "Pink":
return new Color(255, 102, 255).getRGB(); return new Color(255, 102, 255).getRGB();
case "Black": case "Black":
return Color.BLACK.getRGB(); return new Color(0, 0, 0, 85).getRGB();
case "White": case "White":
return -1; return new Color(255, 255, 255, 85).getRGB();
} }
return -1; return -1;
} }

View File

@ -171,13 +171,13 @@ public class GuiIngame extends Gui {
GlStateManager.enableBlend(); GlStateManager.enableBlend();
if (this.showCrosshair()) { if (this.showCrosshair()) {
GlStateManager.tryBlendFuncSeparate(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR, 1, 0); //GlStateManager.tryBlendFuncSeparate(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR, 1, 0);
GlStateManager.enableAlpha(); GlStateManager.enableAlpha();
Minecraft mc = Minecraft.getMinecraft(); Minecraft mc = Minecraft.getMinecraft();
Entity target = mc.pointedEntity; Entity target = mc.pointedEntity;
if(target != null && ModManager.crosshair.isEnabled()) if(target != null && ModManager.crosshair.isEnabled())
GlStateManager.color(RenderUtils.getColorWithoutRGB(Crosshair.color).getRed(), RenderUtils.getColorWithoutRGB(Crosshair.color).getBlue(), RenderUtils.getColorWithoutRGB(Crosshair.color).getGreen(), 1); GlStateManager.color(RenderUtils.getColorWithoutRGB(Crosshair.color).getRed(), RenderUtils.getColorWithoutRGB(Crosshair.color).getGreen(), RenderUtils.getColorWithoutRGB(Crosshair.color).getBlue());
this.drawTexturedModalRect(i / 2 - 7, j / 2 - 7, 0, 0, 16, 16); this.drawTexturedModalRect(i / 2 - 7, j / 2 - 7, 0, 0, 16, 16);
} }

View File

@ -1014,7 +1014,7 @@ public class GameSettings {
for(Mod m : Resent.INSTANCE.modManager.modules){ for(Mod m : Resent.INSTANCE.modManager.modules){
if(astring[0].equals(m.name)){ if(astring[0].equals(m.name)){
m.enabled = astring[1].equals("true"); m.setEnabled(astring[1].equals("true"));
} }
List<RenderModule> rmodules = new ArrayList<>(); List<RenderModule> rmodules = new ArrayList<>();