Skip to content

Commit

Permalink
fixed the build
Browse files Browse the repository at this point in the history
lets not repack the whole obfuscated vanilla into our jar, instead we
now repack a jar that only consists of the resources from the default
resource pack.
also this broke the build because for some reason the vanilla main got
invoked.
also updated to java 1.8, because for years people have had it and it
has some interesting features like inline λs.
  • Loading branch information
pixelcmtd committed Jan 17, 2022
1 parent 80264d6 commit 00419bb
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.class
eclipse/Client/assets/*
cxclient.jar
4 changes: 2 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</target>
<target depends="fmt" name="compile" description="compile the source">
<mkdir dir="eclipse/Client/bin/"/>
<javac srcdir="src/" destdir="eclipse/Client/bin/" source="7" target="7">
<javac srcdir="src/" destdir="eclipse/Client/bin/" source="8" target="8">
<classpath>
<fileset dir="jars/libraries/">
<include name="**/*.jar"/>
Expand All @@ -23,7 +23,7 @@
<attribute name="Class-Path" value="."/>
</manifest>
<fileset dir="eclipse/Client/bin"/>
<zipfileset excludes="META-INF/*.SF" src="jars/versions/1.8.8/1.8.8.jar"/>
<zipfileset excludes="META-INF/*.SF" src="jars/versions/res.jar"/>
<zipfileset excludes="META-INF/*.SF" src="jars/libraries/oshi-project/oshi-core/1.1/oshi-core-1.1.jar"/>
<zipfileset excludes="META-INF/*.SF" src="jars/libraries/net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar"/>
<zipfileset excludes="META-INF/*.SF" src="jars/libraries/net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar"/>
Expand Down
3 changes: 1 addition & 2 deletions eclipse/Client/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="module" value="true"/>
</attributes>
Expand Down Expand Up @@ -30,7 +30,6 @@
<classpathentry kind="lib" path="jars/libraries/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar"/>
<classpathentry kind="lib" path="jars/libraries/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar"/>
<classpathentry kind="lib" path="jars/libraries/com/mojang/authlib/1.5.21/authlib-1.5.21.jar"/>
<classpathentry kind="lib" path="jars/libraries/com/mojang/realms/1.7.39/realms-1.7.39.jar"/>
<classpathentry kind="lib" path="jars/libraries/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar"/>
<classpathentry kind="lib" path="jars/libraries/org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar"/>
<classpathentry kind="lib" path="jars/libraries/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar"/>
Expand Down
2 changes: 2 additions & 0 deletions eclipse/Client/.settings/org.eclipse.core.runtime.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
line.separator=\n
10 changes: 7 additions & 3 deletions eclipse/Client/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
Binary file added jars/versions/res.jar
Binary file not shown.

0 comments on commit 00419bb

Please sign in to comment.