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

.idea/gradle.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>

.idea/workspace.xml

@@ -5,7 +5,22 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="7c16cb29-fd95-4a14-bee8-e94e1bc0dd58" name="Changes" comment="Maybe fix settings stuff">
+      <change beforePath="$PROJECT_DIR$/.classpath" beforeDir="false" afterPath="$PROJECT_DIR$/.classpath" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/7.3.1/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.3.1/executionHistory/executionHistory.bin" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/7.3.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.3.1/executionHistory/executionHistory.lock" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/7.3.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.3.1/fileHashes/fileHashes.bin" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/7.3.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.3.1/fileHashes/fileHashes.lock" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/file-system.probe" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.project" beforeDir="false" afterPath="$PROJECT_DIR$/.project" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.settings/org.eclipse.buildship.core.prefs" beforeDir="false" afterPath="$PROJECT_DIR$/.settings/org.eclipse.buildship.core.prefs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/desktopRuntime/eclipseProject/.classpath" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/desktopRuntime/eclipseProject/.project" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/desktopRuntime/eclipseProject/.settings/org.eclipse.jdt.core.prefs" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/desktopRuntime/eclipseProject/eaglercraftDebugRuntime.launch" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/javascript/classes.js" beforeDir="false" afterPath="$PROJECT_DIR$/javascript/classes.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -50,13 +65,14 @@
       </list>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="RESET_MODE" value="HARD" />
     <option name="SIGN_OFF_COMMIT" value="true" />
   </component>
-  <component name="GitHubPullRequestSearchHistory"><![CDATA[{
-  "lastFilter": {
-    "state": "OPEN"
+  <component name="GitHubPullRequestSearchHistory">{
+  &quot;lastFilter&quot;: {
+    &quot;state&quot;: &quot;OPEN&quot;
   }
-}]]></component>
+}</component>
   <component name="GithubPullRequestsUISettings">
     <option name="selectedUrlAndAccountId">
       <UrlAndAccount>
@@ -76,21 +92,22 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "run.code.analysis.last.selected.profile": "pProject Default",
-    "settings.editor.selected.configurable": "preferences.pluginManager",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/kay_j/IdeaProjects/Resent-1.8&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;run.code.analysis.last.selected.profile&quot;: &quot;pProject Default&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RunManager" selected="Gradle.Resent-1.8 [jar]">
     <configuration name="Resent-1.8 [assemble]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
@@ -293,4 +310,9 @@
     <MESSAGE value="Maybe fix settings stuff" />
     <option name="LAST_COMMIT_MESSAGE" value="Maybe fix settings stuff" />
   </component>
+  <component name="com.intellij.coverage.CoverageDataManagerImpl">
+    <SUITE FILE_PATH="coverage/eaglercraft_workspace$MainClass.ic" NAME="MainClass Coverage Results" MODIFIED="1672600255481" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+      <FILTER>net.lax1dude.eaglercraft.v1_8.internal.teavm.*</FILTER>
+    </SUITE>
+  </component>
 </project>

.project

@@ -22,7 +22,7 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>0</id>
+			<id>1</id>
 			<name></name>
 			<type>30</type>
 			<matcher>

.settings/org.eclipse.buildship.core.prefs

@@ -1,13 +1,13 @@
-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
+arguments=
 auto.sync=false
 build.scans.enabled=false
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.project.dir=
 eclipse.preferences.version=1
-gradle.user.home=/workspace/.gradle
-java.home=/home/gitpod/.sdkman/candidates/java/11.0.17.fx-zulu
+gradle.user.home=
+java.home=
 jvm.arguments=
 offline.mode=false
-override.workspace.settings=true
-show.console.view=true
-show.executions.view=true
+override.workspace.settings=false
+show.console.view=false
+show.executions.view=false

desktopRuntime/eclipseProject/.classpath

@@ -7,17 +7,17 @@
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/../eaglercraft_1.8_workspace/desktopRuntime/CompileEPK.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/../eaglercraft_1.8_workspace/desktopRuntime/Java-WebSocket-1.5.1-with-dependencies.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/../eaglercraft_1.8_workspace/desktopRuntime/MakeOfflineDownload.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/../eaglercraft_1.8_workspace/desktopRuntime/codecjorbis-20101023.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/../eaglercraft_1.8_workspace/desktopRuntime/codecwav-20101023.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl-egl.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl-glfw.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl-jemalloc.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl-openal.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl-opengles.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/../eaglercraft_1.8_workspace/desktopRuntime/soundsystem-20120107.jar"/>
+	<classpathentry kind="lib" path="C:/Users/kay_j/Downloads/eaglercraftx-1.8-main/../eaglercraft_1.8_workspace/desktopRuntime/codecjorbis-20101023.jar"/>
+	<classpathentry kind="lib" path="C:/Users/kay_j/Downloads/eaglercraftx-1.8-main/../eaglercraft_1.8_workspace/desktopRuntime/codecwav-20101023.jar"/>
+	<classpathentry kind="lib" path="C:/Users/kay_j/Downloads/eaglercraftx-1.8-main/../eaglercraft_1.8_workspace/desktopRuntime/CompileEPK.jar"/>
+	<classpathentry kind="lib" path="C:/Users/kay_j/Downloads/eaglercraftx-1.8-main/../eaglercraft_1.8_workspace/desktopRuntime/Java-WebSocket-1.5.1-with-dependencies.jar"/>
+	<classpathentry kind="lib" path="C:/Users/kay_j/Downloads/eaglercraftx-1.8-main/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl-egl.jar"/>
+	<classpathentry kind="lib" path="C:/Users/kay_j/Downloads/eaglercraftx-1.8-main/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl-glfw.jar"/>
+	<classpathentry kind="lib" path="C:/Users/kay_j/Downloads/eaglercraftx-1.8-main/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl-jemalloc.jar"/>
+	<classpathentry kind="lib" path="C:/Users/kay_j/Downloads/eaglercraftx-1.8-main/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl-openal.jar"/>
+	<classpathentry kind="lib" path="C:/Users/kay_j/Downloads/eaglercraftx-1.8-main/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl-opengles.jar"/>
+	<classpathentry kind="lib" path="C:/Users/kay_j/Downloads/eaglercraftx-1.8-main/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl.jar"/>
+	<classpathentry kind="lib" path="C:/Users/kay_j/Downloads/eaglercraftx-1.8-main/../eaglercraft_1.8_workspace/desktopRuntime/MakeOfflineDownload.jar"/>
+	<classpathentry kind="lib" path="C:/Users/kay_j/Downloads/eaglercraftx-1.8-main/../eaglercraft_1.8_workspace/desktopRuntime/soundsystem-20120107.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

desktopRuntime/eclipseProject/.project

@@ -18,12 +18,12 @@
 		<link>
 			<name>src_lwjgl_java</name>
 			<type>2</type>
-			<location>/workspace/Resent-1.8/../eaglercraft_1.8_workspace/src/lwjgl/java</location>
+			<location>C:/Users/kay_j/Downloads/eaglercraftx-1.8-main/../eaglercraft_1.8_workspace/src/lwjgl/java</location>
 		</link>
 		<link>
 			<name>src_main_java</name>
 			<type>2</type>
-			<location>/workspace/Resent-1.8/../eaglercraft_1.8_workspace/src/main/java</location>
+			<location>C:/Users/kay_j/Downloads/eaglercraftx-1.8-main/../eaglercraft_1.8_workspace/src/main/java</location>
 		</link>
 	</linkedResources>
 </projectDescription>

desktopRuntime/eclipseProject/eaglercraftDebugRuntime.launch

@@ -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"/>
@@ -18,5 +19,5 @@
     <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="eclipseProject"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="eclipseProject"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djava.library.path=."/>
-    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/workspace/Resent-1.8/../eaglercraft_1.8_workspace/desktopRuntime"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="C:/Users/kay_j/Downloads/eaglercraftx-1.8-main/../eaglercraft_1.8_workspace/desktopRuntime"/>
 </launchConfiguration>

desktopRuntime/resources/assets/eagler/CREDITS.txt

@@ -126,6 +126,34 @@
  
  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  
+ Project Name: NVIDIA FXAA
+ Project Author: Timothy Lottes, NVIDIA
+ Project URL: https://gist.github.com/kosua20/0c506b81b3812ac900048059d2383126 
+ 
+ Used For: generating and applying patch files in build system
+ 
+ * ==============================================================================
+ * 
+ * 
+ *                     NVIDIA FXAA 3.11 by TIMOTHY LOTTES
+ * 
+ * 
+ * ------------------------------------------------------------------------------
+ * COPYRIGHT (C) 2010, 2011 NVIDIA CORPORATION. ALL RIGHTS RESERVED.
+ * ------------------------------------------------------------------------------
+ * TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THIS SOFTWARE IS PROVIDED
+ * *AS IS* AND NVIDIA AND ITS SUPPLIERS DISCLAIM ALL WARRANTIES, EITHER EXPRESS
+ * OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL NVIDIA
+ * OR ITS SUPPLIERS BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT, OR
+ * CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR
+ * LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION,
+ * OR ANY OTHER PECUNIARY LOSS) ARISING OUT OF THE USE OF OR INABILITY TO USE
+ * THIS SOFTWARE, EVEN IF NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGES.
+ 
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ 
  Project Name: java-diff-utils
  Project Author: Google, forked by wumpz
  Project URL: https://java-diff-utils.github.io/java-diff-utils/

desktopRuntime/resources/assets/eagler/glsl/accel_particle.vsh

@@ -47,18 +47,12 @@ void main() {
 
 	float particleSize = u_texCoordSize2f_particleSize1f.z * p_particleSize_texCoordsSize_2i.x;
 
-	float f1 = u_transformParam_1_2_3_4_f.x;
-	float f2 = u_transformParam_1_2_3_4_f.y;
-	float f3 = u_transformParam_1_2_3_4_f.z;
-	float f4 = u_transformParam_1_2_3_4_f.w;
-	float f5 = u_transformParam_5_f;
-
 	vec3 pos3f = p_position3f;
-	pos3f.x += f1 * particleSize * a_position2f.x;
-	pos3f.x += f4 * particleSize * a_position2f.y;
-	pos3f.y += f2 * particleSize * a_position2f.y;
-	pos3f.z += f3 * particleSize * a_position2f.x;
-	pos3f.z += f5 * particleSize * a_position2f.y;
+	pos3f.x += u_transformParam_1_2_3_4_f.x * particleSize * a_position2f.x;
+	pos3f.x += u_transformParam_1_2_3_4_f.w * particleSize * a_position2f.y;
+	pos3f.y += u_transformParam_1_2_3_4_f.y * particleSize * a_position2f.y;
+	pos3f.z += u_transformParam_1_2_3_4_f.z * particleSize * a_position2f.x;
+	pos3f.z += u_transformParam_5_f * particleSize * a_position2f.y;
 
 	gl_Position = u_matrixTransform * vec4(pos3f, 1.0);
 }

desktopRuntime/resources/assets/minecraft/lang/en_US.lang

@@ -75,6 +75,8 @@ eaglercraft.options.hud.note=Check 'Video Settings' for the option to hide XYZ
 eaglercraft.options.hud.24h=24h Day
 eaglercraft.options.chunkFix=Chunk Lag Fix
 eaglercraft.options.fog=Fog
+eaglercraft.options.fxaa=FXAA Antialiasing
+eaglercraft.options.fxaa.auto=Auto
 
 eaglercraft.key.function=Function
 eaglercraft.key.zoomCamera=Zoom Camera