From 43115ef1d49a0182052eaaf8d453478fbdfd26d3 Mon Sep 17 00:00:00 2001
From: ThisIsALegitUsername <andrewsouchien@gmail.com>
Date: Tue, 27 Dec 2022 21:26:30 +0000
Subject: [PATCH] Port FPS to 1.8, remove instances of EaglerAdapter

---
 bin/main/dev/resent/module/impl/hud/FPS.class | Bin 1472 -> 1965 bytes
 .../dev/resent/module/impl/hud/Freelook.class | Bin 2228 -> 2193 bytes
 .../resent/module/impl/hud/KeyStrokes.class   | Bin 5943 -> 4423 bytes
 .../resent/module/impl/hud/Watermark.class    | Bin 1691 -> 1755 bytes
 .../module/impl/misc/ChunkBorders.class       | Bin 1389 -> 1453 bytes
 bin/main/net/minecraft/client/Minecraft.class | Bin 66673 -> 66673 bytes
 .../dev/resent/module/impl/hud/Freelook.java  |   4 ++--
 .../resent/module/impl/hud/KeyStrokes.java    |   2 +-
 .../dev/resent/module/impl/hud/Watermark.java |   2 +-
 .../resent/module/impl/misc/ChunkBorders.java |   2 +-
 .../dev/resent/ui/mods/GuiScreenModule.java   |   2 +-
 .../java/dev/resent/ui/mods/Settings.java     |   2 +-
 .../java/net/minecraft/client/Minecraft.java  |   2 +-
 13 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/main/dev/resent/module/impl/hud/FPS.class b/bin/main/dev/resent/module/impl/hud/FPS.class
index 146b4661d1bb6e17ce57692149cfb3c1ce6cc4f6..c38d5e1b55205b056373f7003558f5c4e545f483 100644
GIT binary patch
delta 873
zcmaJ-OK(y^6#j-sc@0*HP1{(bCN;e@Hu$bW>jQ;yD+QEVEVY)~GKEX&Ez*n1ik%x*
z4J-eHE~@03Xf&=|_?JwKX8@B%tD8A<X3qCIUwv-}z2AR+`~u)I8v9<i-Rr>!ra7+R
zdi%Y7rsYC}VYs3_(?V6vD21|ST{lY6hF&d-x*M|$11s@NHhkKPFm7^qaEoC`N&bn5
z1eYXpl;aNWGPsLky-^|{15+h5&M}7sv1zrMFp3OgiW*E-T89fq+?XfiszfFwa)Dv$
zFwwt!^qof}GR={}eKKS2^kOj_S4i}L=24lJhO>C+!Xm@jy~0p?&=F`YA;)l}B+MQ%
zrx(rgKZ2_a9vVyty;L?mM3v`QkxTH!)2YR^L`<Da5VfON*PhEAJ>ghGfk0+iWU5+I
z)EUkt4Pl11bwg~_wM{d$XSiCzFm<yTiginGFq<K-4C@>lpdEVj-I$@RR|VbeN-*!C
zzfF#k6lX7Fr*l-gUDJzGsB&yeoSW<}Y1M|1!FM=nc*@|F{(kRiR7p-8+*5Z=@wl1~
zQd)o3)Hb#jwA!N7ZqGVCPo>}>HDG+QgOeRx{e<vxVCDmEyu)n^v4Cpfo`sZ!2d=`K
zw%>VTVjLH7i4Y8raD`4E-KSyeviSQf9W1xgPNnr2GPRs|g@NwGd~ag)8={jIwAYCI
zUzmP{v+$BinTn07VqwdIk=rL$JI>P?pbWq;X^r3*MxkO17wCnb=}Gnt*XhX#_JjTz
JcB!$!`~|#y&jtVh

delta 395
zcmaivOG^S#9L3L7Q)k8y1gXH_ZUSkMJxt5&ojUfgAPrj8=v>De<BW`xEn4&$Vm^n9
zK!}PS>%K={Bf6E#pv~bN{y)y)-;cg2^84rG3xG8C?&PrlCWI_O^g`=tDO0nIRKam<
zCyZr+O3iXu*EV}hrwzN^;il$t+oB!EuA8i#qq0<OG1}zJ)ae1YSi{kp?u^drmqzjE
znDQ>QY?t<UmkVB&k-<s?67mG`<o<Bc>j#vv69UO#uFAO4awUvoJ%SBvdI^7Ck+6+I
z2s;E*x94&1IuJ_~Q6f-^hn4D?S}2#)Dgh}I1awEc@*YN>YiamF#E<e5GN-Ynd*oh4
z@?lnJ@aGc4obZuf3iDVHiC`6rLKWe&g8pt8ogQFvfVBa(ypLeAtU?|V|8GqExltCa
HKJ0!0Wdcur

diff --git a/bin/main/dev/resent/module/impl/hud/Freelook.class b/bin/main/dev/resent/module/impl/hud/Freelook.class
index 13c2c324b79679ab914305bd44d177c6b01fff89..9c82d91d38f4cc113d7c4e8ef5ddab9c06911ad4 100644
GIT binary patch
delta 21
ccmdlYI8kte789f2WNjunCM$)_c}#9>06?e(JOBUy

delta 56
zcmbOzxJ7V-787IPWNjun)nY3JE>73P^qkZp$CSi^lGGxF<ixzZ{1SzvRE46{;{2Sl
L)RfKMOm1ud=?xMD

diff --git a/bin/main/dev/resent/module/impl/hud/KeyStrokes.class b/bin/main/dev/resent/module/impl/hud/KeyStrokes.class
index 43472f30b5b8910b2ed33e67ac1b1ec7a9abf789..871114b08d833f15c68af01cc2c2c96b2d2afe95 100644
GIT binary patch
delta 702
zcmb7>%}(1u5XWZ?3C2W4aO|bqKqwy}fqp@uKqY7awE~0%2#L#L55cXy8?Cn#PI(Bw
z0EkE6fCLgfp-O$Is)JJ!4(@@=X!gG|zn%H-W#w1V`TghW1^`~e?3rU#^X~&0n0W>r
z!z0@aIv16XT`<I;_p3M()lkS<^`q8G+c3=XE6KS%&~Q(r5yu?wWUeGP>KjU4oGq65
z2ad;e^bGo392nHx90qZ-!0FEHi_6?K!UW!GR9D)p%O#A2^q0^Jg(h9eH4$MO8^~O2
zQ1}UR_AYq$a?UQnXaR~amZ&FBlLf1k+~lV=ZFtGx`IgietMG`%@l;d~!W78sTJ47z
z&2Wc-Q$zCw56t3*o0_o7pogT*pmx~QI(;pE*f4!@YTxFbQG=_#YY#sKA(Bg<@x(Qn
z42Uath9!f2*Nq%7nrDFGU}|&+WdP1Kly>`HT*AmtI$2Prm``sCFiv@)Sp^kRf$}O$
zP`oEtq%{eX8HCD1LZgLvMZerew1>z-Og}`l2yY%inEOZANgrw<-u}mlsf<0AGlzIb
IyIU~x7t(!*asU7T

literal 5943
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

diff --git a/bin/main/dev/resent/module/impl/hud/Watermark.class b/bin/main/dev/resent/module/impl/hud/Watermark.class
index d6002289378a8dc685b62bb367ab62cce106a1a8..c80ad25e2be509b4efbbd07b29f7c7e20f282534 100644
GIT binary patch
delta 156
zcmbQudz*K{V#X_z_c1Hi2Uq5mBvvS-78T_eDdguVl;mfp<|!yyE9odWD5O>tq$Zc7
zrYIz)m82Falw@QULlkgvV%1lyqYzw@Sdy9SnOl%wRN|lKlA4>Cm*SF|oRe4t6wlA|
cOUzA07@L{LQe2XnxS5MlgO!nOvN2l*0EqcFcK`qY

delta 64
zcmcc3JDYdHV#X<x|1m48gk+>DWabv+7nLaFrIzUBBvu%vl%}NWr6#85q!uL?C8m|=
UO`gc4wAq(Ym6efwaxq&5020j>hyVZp

diff --git a/bin/main/dev/resent/module/impl/misc/ChunkBorders.class b/bin/main/dev/resent/module/impl/misc/ChunkBorders.class
index 6280e19656e1d8734053b9356610518295af7be4..49820b9fb4859ea8d5a1cead63f54a8a1f64652d 100644
GIT binary patch
delta 164
zcmaFMwU&EAI}?lE#7^b<;L5y`#0rJfqN4mFh5S5)lKkw{JOw3dB^?C^h180I)Z~)X
z6otgJlGGxFl8nq^hypH7ton*|6oN|<OEQx^a|`l|O8oO&QgajYQe0A#a}tYy;`w=g
kiMgo=V>9zuic3-xCkHZ`Ob%f*+#JIAhnbOWav-Y=0NhA9z5oCK

delta 72
zcmZ3>{g!J&I}`J}iJi(SAsML(nYjh|MI{P(sU><ji4}$^r75X;sfp=1sYS^}iD@Nz
alRq*mO`gJN2*R7EF#cg?WS=~dRR#d(!y0b@

diff --git a/bin/main/net/minecraft/client/Minecraft.class b/bin/main/net/minecraft/client/Minecraft.class
index 1f4c84e091dcf78ab17a0fb81b09ccdd9f5ea2af..80e12c90867eba81f23930fc47eb7e0346fda272 100644
GIT binary patch
delta 16
Xcmey^!Sb<#WkdW@M$XL%O9kTrK_mv@

delta 16
Xcmey^!Sb<#WkdW@My|~XO9kTrK`I8~

diff --git a/src/main/java/dev/resent/module/impl/hud/Freelook.java b/src/main/java/dev/resent/module/impl/hud/Freelook.java
index 9a93a4db..96f9f57f 100644
--- a/src/main/java/dev/resent/module/impl/hud/Freelook.java
+++ b/src/main/java/dev/resent/module/impl/hud/Freelook.java
@@ -6,7 +6,7 @@ import dev.resent.event.impl.EventUpdate;
 import dev.resent.module.base.Category;
 import dev.resent.module.base.Mod;
 import dev.resent.util.misc.W;
-import net.lax1dude.eaglercraft.EaglerAdapter;
+import net.lax1dude.eaglercraft.v1_8.Keyboard;
 import net.minecraft.client.Minecraft;
 
 @SuppressWarnings("all")
@@ -36,7 +36,7 @@ public class Freelook extends Mod {
                 mc.gameSettings.thirdPersonView = previousePrespective;
             }
 
-    if (EaglerAdapter.getEventKey() == 6 && mc.gameSettings.keyBindFunction.pressed) {
+    if (Keyboard.getEventKey() == 6 && mc.gameSettings.keyBindFunction.pressed) {
         perspectiveToggled = false;
     }
 }
diff --git a/src/main/java/dev/resent/module/impl/hud/KeyStrokes.java b/src/main/java/dev/resent/module/impl/hud/KeyStrokes.java
index 645c6c96..00b3bbd8 100644
--- a/src/main/java/dev/resent/module/impl/hud/KeyStrokes.java
+++ b/src/main/java/dev/resent/module/impl/hud/KeyStrokes.java
@@ -10,7 +10,7 @@ import dev.resent.setting.ModeSetting;
 import dev.resent.util.misc.FuncUtils;
 import dev.resent.util.render.RainbowUtil;
 import dev.resent.util.render.RenderUtils;
-import net.lax1dude.eaglercraft.EaglerAdapter;
+GlStateManager.popMatrix();
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 
diff --git a/src/main/java/dev/resent/module/impl/hud/Watermark.java b/src/main/java/dev/resent/module/impl/hud/Watermark.java
index 47169206..eeb155e0 100644
--- a/src/main/java/dev/resent/module/impl/hud/Watermark.java
+++ b/src/main/java/dev/resent/module/impl/hud/Watermark.java
@@ -4,7 +4,7 @@ import dev.resent.Resent;
 import dev.resent.module.base.Category;
 import dev.resent.module.base.RenderModule;
 import dev.resent.util.render.Color;
-import net.lax1dude.eaglercraft.EaglerAdapter;
+GlStateManager.popMatrix();
 import net.minecraft.src.FontRenderer;
 
 public class Watermark extends RenderModule{
diff --git a/src/main/java/dev/resent/module/impl/misc/ChunkBorders.java b/src/main/java/dev/resent/module/impl/misc/ChunkBorders.java
index d46e2235..8d826733 100644
--- a/src/main/java/dev/resent/module/impl/misc/ChunkBorders.java
+++ b/src/main/java/dev/resent/module/impl/misc/ChunkBorders.java
@@ -4,7 +4,7 @@ import dev.resent.Resent;
 import dev.resent.event.impl.RenderWorldEvent;
 import dev.resent.module.base.Category;
 import dev.resent.module.base.Mod;
-import net.lax1dude.eaglercraft.EaglerAdapter;
+GlStateManager.popMatrix();
 import net.minecraft.src.AxisAlignedBB;
 import net.minecraft.src.RenderGlobal;
 import net.minecraft.src.RenderManager;
diff --git a/src/main/java/dev/resent/ui/mods/GuiScreenModule.java b/src/main/java/dev/resent/ui/mods/GuiScreenModule.java
index f2f4ca58..d9ac0a3b 100644
--- a/src/main/java/dev/resent/ui/mods/GuiScreenModule.java
+++ b/src/main/java/dev/resent/ui/mods/GuiScreenModule.java
@@ -7,7 +7,7 @@ import dev.resent.module.base.Mod;
 import dev.resent.setting.BooleanSetting;
 import dev.resent.setting.Setting;
 import dev.resent.util.misc.Keyboard;
-import net.lax1dude.eaglercraft.EaglerAdapter;
+GlStateManager.popMatrix();
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.src.GuiButton;
diff --git a/src/main/java/dev/resent/ui/mods/Settings.java b/src/main/java/dev/resent/ui/mods/Settings.java
index 9dd6aea9..59a2f934 100644
--- a/src/main/java/dev/resent/ui/mods/Settings.java
+++ b/src/main/java/dev/resent/ui/mods/Settings.java
@@ -9,7 +9,7 @@ import dev.resent.setting.Setting;
 import dev.resent.util.misc.Keyboard;
 import dev.resent.util.render.Color;
 import dev.resent.util.render.RenderUtils;
-import net.lax1dude.eaglercraft.EaglerAdapter;
+GlStateManager.popMatrix();
 import net.minecraft.client.Minecraft;
 import net.minecraft.src.FontRenderer;
 import net.minecraft.client.gui.Gui;
diff --git a/src/main/java/net/minecraft/client/Minecraft.java b/src/main/java/net/minecraft/client/Minecraft.java
index 76b216b4..f2654839 100644
--- a/src/main/java/net/minecraft/client/Minecraft.java
+++ b/src/main/java/net/minecraft/client/Minecraft.java
@@ -212,7 +212,7 @@ public class Minecraft implements IThreadListener {
 	public GameSettings gameSettings;
 	public MouseHelper mouseHelper;
 	private final String launchedVersion;
-	private static int debugFPS;
+	public static int debugFPS;
 	private int rightClickDelayTimer;
 	private String serverName;
 	private int serverPort;