Skip to content

Commit 0cbc495

Browse files
committed
v1.4.1: Added QOL features.
Added several features: - Destroying the Ender Storage block in survival will now drop with the power maintained in inventory. - Right clicking the Ender Storage block will now also tell you the % full. - General updates to Forge and changing code editors.
1 parent f8725d9 commit 0cbc495

20 files changed

Lines changed: 205 additions & 46 deletions

.classpath

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<classpath>
33
<classpathentry kind="src" path="src/main/java"/>
44
<classpathentry kind="src" path="src/main/resources"/>
5-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
6-
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/net.darkhax.tesla/Tesla-1.12/1.0.61/ed868f35c02b42425cc486529d22f4d6200f0810/Tesla-1.12-1.0.61.jar" sourcepath="C:/Users/sean/.gradle/caches/modules-2/files-2.1/net.darkhax.tesla/Tesla-1.12/1.0.61/4b23147639e7839e6b0b846c3573746acb556dfe/Tesla-1.12-1.0.61-sources.jar"/>
7-
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/minecraft/net/minecraftforge/forge/1.12.2-14.23.0.2491/snapshot/20170624/forgeSrc-1.12.2-14.23.0.2491.jar" sourcepath="C:/Users/sean/.gradle/caches/minecraft/net/minecraftforge/forge/1.12.2-14.23.0.2491/snapshot/20170624/forgeSrc-1.12.2-14.23.0.2491-sources.jar"/>
5+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
6+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
7+
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/minecraft/net/minecraftforge/forge/1.12.2-14.23.4.2705/snapshot/20171003/forgeSrc-1.12.2-14.23.4.2705.jar" sourcepath="C:/Users/sean/.gradle/caches/minecraft/net/minecraftforge/forge/1.12.2-14.23.4.2705/snapshot/20171003/forgeSrc-1.12.2-14.23.4.2705-sources.jar"/>
88
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.1/f7be08ec23c21485b9b5a1cf1654c2ec8c58168d/jsr305-3.0.1.jar" sourcepath="C:/Users/sean/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.1/a2926c057ca3b662b9db194c869bdbe7d3bb8aef/jsr305-3.0.1-sources.jar"/>
99
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/com.mojang/patchy/1.1/aef610b34a1be37fa851825f12372b78424d8903/patchy-1.1.jar" sourcepath="C:/Users/sean/.gradle/caches/modules-2/files-2.1/com.mojang/patchy/1.1/5e398295fbcb8fb590e3e3bddace13f659792e50/patchy-1.1-sources.jar"/>
1010
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/oshi-project/oshi-core/1.1/9ddf7b048a8d701be231c0f4f95fd986198fd2d8/oshi-core-1.1.jar" sourcepath="C:/Users/sean/.gradle/caches/modules-2/files-2.1/oshi-project/oshi-core/1.1/1ec1ab1e6ac5a1572edfd0dd9ac95e83684b8a65/oshi-core-1.1-sources.jar"/>
@@ -20,7 +20,7 @@
2020
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/net.java.jutils/jutils/1.0.0/e12fe1fda814bd348c1579329c86943d2cd3c6a6/jutils-1.0.0.jar" sourcepath="C:/Users/sean/.gradle/caches/modules-2/files-2.1/net.java.jutils/jutils/1.0.0/d18678a00b216863206a1bb6190507e02a32971b/jutils-1.0.0-sources.jar"/>
2121
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.0/c4ba5371a29ac9b2ad6129b1d39ea38750043eff/gson-2.8.0.jar" sourcepath="C:/Users/sean/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.0/baf95d8519fc1a11d388f8543cb40cd2bb9d66dc/gson-2.8.0-sources.jar"/>
2222
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/com.mojang/authlib/1.5.25/9834cdf236c22e84b946bba989e2f94ef5897c3c/authlib-1.5.25.jar" sourcepath="C:/Users/sean/.gradle/caches/modules-2/files-2.1/com.mojang/authlib/1.5.25/18840707f662a3236542716fff61c659584f3e6c/authlib-1.5.25-sources.jar"/>
23-
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/com.mojang/realms/1.10.17/e6a623bf93a230b503b0e3ae18c196fcd5aa3299/realms-1.10.17.jar"/>
23+
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/com.mojang/realms/1.10.22/bd0dccebdf3744c75f1ca20063f16e8f7d5e663f/realms-1.10.22.jar"/>
2424
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.8.1/a698750c16740fd5b3871425f4cb3bbaa87f529d/commons-compress-1.8.1.jar" sourcepath="C:/Users/sean/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.8.1/3caea4421428752206c7a94c3e3097f0c47f1bb8/commons-compress-1.8.1-sources.jar"/>
2525
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.3.3/18f4247ff4572a074444572cee34647c43e7c9c7/httpclient-4.3.3.jar" sourcepath="C:/Users/sean/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.3.3/65cba03c4f6207f2885f88206fcf52c53f8d111b/httpclient-4.3.3-sources.jar"/>
2626
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.1.3/f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f/commons-logging-1.1.3.jar" sourcepath="C:/Users/sean/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.1.3/28bb0405fddaf04f15058fbfbe01fe2780d7d3b6/commons-logging-1.1.3-sources.jar"/>
@@ -45,6 +45,7 @@
4545
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/org.scala-lang.modules/scala-xml_2.11/1.0.2/820fbca7e524b530fdadc594c39d49a21ea0337e/scala-xml_2.11-1.0.2.jar" sourcepath="C:/Users/sean/.gradle/caches/modules-2/files-2.1/org.scala-lang.modules/scala-xml_2.11/1.0.2/312c3557d1ca0b34820f3b3fc5404a47936ceb26/scala-xml_2.11-1.0.2-sources.jar"/>
4646
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/lzma/lzma/0.0.1/521616dc7487b42bef0e803bd2fa3faf668101d7/lzma-0.0.1.jar"/>
4747
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/net.sf.trove4j/trove4j/3.0.3/42ccaf4761f0dfdfa805c9e340d99a755907e2dd/trove4j-3.0.3.jar" sourcepath="C:/Users/sean/.gradle/caches/modules-2/files-2.1/net.sf.trove4j/trove4j/3.0.3/109c5be93362e6e651e417c51d1863477a22969c/trove4j-3.0.3-sources.jar"/>
48+
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-artifact/3.5.3/7dc72b6d6d8a6dced3d294ed54c2cc3515ade9f4/maven-artifact-3.5.3.jar" sourcepath="C:/Users/sean/.gradle/caches/modules-2/files-2.1/org.apache.maven/maven-artifact/3.5.3/25c6b5e0103ae09bc1cac02ee6dff968bacbdba9/maven-artifact-3.5.3-sources.jar"/>
4849
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/com.paulscode/codecjorbis/20101023/c73b5636faf089d9f00e8732a829577de25237ee/codecjorbis-20101023.jar" sourcepath="C:/Users/sean/.gradle/caches/modules-2/files-2.1/com.paulscode/codecjorbis/20101023/4ca2436396bc14ebd78b7db1d4e11ca607c8705e/codecjorbis-20101023-sources.jar"/>
4950
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/com.paulscode/codecwav/20101023/12f031cfe88fef5c1dd36c563c0a3a69bd7261da/codecwav-20101023.jar" sourcepath="C:/Users/sean/.gradle/caches/modules-2/files-2.1/com.paulscode/codecwav/20101023/71ec00b9b9c1a6a2c3a8a25f481a23ddb5b21ddb/codecwav-20101023-sources.jar"/>
5051
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/com.paulscode/libraryjavasound/20101123/5c5e304366f75f9eaa2e8cca546a1fb6109348b3/libraryjavasound-20101123.jar" sourcepath="C:/Users/sean/.gradle/caches/modules-2/files-2.1/com.paulscode/libraryjavasound/20101123/945ff5711de27751cf699641d1ea316ba6cf7589/libraryjavasound-20101123-sources.jar"/>
@@ -57,6 +58,7 @@
5758
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/ca.weblite/java-objc-bridge/1.0.0/6ef160c3133a78de015830860197602ca1c855d3/java-objc-bridge-1.0.0.jar" sourcepath="C:/Users/sean/.gradle/caches/modules-2/files-2.1/ca.weblite/java-objc-bridge/1.0.0/865837a198189aee737019561ece842827f24278/java-objc-bridge-1.0.0-sources.jar"/>
5859
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/org.fusesource.jansi/jansi/1.11/655c643309c2f45a56a747fda70e3fadf57e9f11/jansi-1.11.jar" sourcepath="C:/Users/sean/.gradle/caches/modules-2/files-2.1/org.fusesource.jansi/jansi/1.11/2f0e4b53b6b0eec426dad7118bf54b3deb58000b/jansi-1.11-sources.jar"/>
5960
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-actors/2.11.0/8ccfb6541de179bb1c4d45cf414acee069b7f78b/scala-actors-2.11.0.jar" sourcepath="C:/Users/sean/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-actors/2.11.0/e1dfa274766d5278166b0d660294fe96396693b2/scala-actors-2.11.0-sources.jar"/>
61+
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/org.codehaus.plexus/plexus-utils/3.1.0/60eecb6f15abdb1c653ad80abaac6fe188b3feaa/plexus-utils-3.1.0.jar" sourcepath="C:/Users/sean/.gradle/caches/modules-2/files-2.1/org.codehaus.plexus/plexus-utils/3.1.0/d4062783613c4c6cf909c939d15fd1f2b584db03/plexus-utils-3.1.0-sources.jar"/>
6062
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput-platform/2.0.5/7ff832a6eb9ab6a767f1ade2b548092d0fa64795/jinput-platform-2.0.5-natives-linux.jar"/>
6163
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput-platform/2.0.5/385ee093e01f587f30ee1c8a2ee7d408fd732e16/jinput-platform-2.0.5-natives-windows.jar"/>
6264
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput-platform/2.0.5/53f9c919f34d2ca9de8c51fc4e1e8282029a9232/jinput-platform-2.0.5-natives-osx.jar"/>
@@ -65,6 +67,6 @@
6567
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl-platform/2.9.4-nightly-20150209/bcab850f8f487c3f4c4dbabde778bb82bd1a40ed/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar"/>
6668
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/minecraft/deobfedDeps/compileDummy.jar"/>
6769
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/minecraft/deobfedDeps/providedDummy.jar"/>
68-
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/minecraft/net/minecraftforge/forge/1.12.2-14.23.0.2491/start"/>
70+
<classpathentry kind="lib" path="C:/Users/sean/.gradle/caches/minecraft/net/minecraftforge/forge/1.12.2-14.23.4.2705/start"/>
6971
<classpathentry kind="output" path="bin"/>
7072
</classpath>

.project

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@
55
<projects/>
66
<natures>
77
<nature>org.eclipse.jdt.core.javanature</nature>
8+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
89
</natures>
910
<buildSpec>
1011
<buildCommand>
1112
<name>org.eclipse.jdt.core.javabuilder</name>
1213
<arguments/>
1314
</buildCommand>
15+
<buildCommand>
16+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
17+
<arguments/>
18+
</buildCommand>
1419
</buildSpec>
1520
<linkedResources/>
1621
</projectDescription>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
connection.project.dir=
2+
eclipse.preferences.version=1
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#
2-
#Fri Jan 19 10:27:41 PST 2018
2+
#Mon Jun 25 16:33:37 PDT 2018
33
org.eclipse.jdt.core.compiler.debug.localVariable=generate
4-
org.eclipse.jdt.core.compiler.compliance=1.6
4+
org.eclipse.jdt.core.compiler.compliance=1.8
55
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
66
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
7-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
7+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
88
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
99
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
1010
eclipse.preferences.version=1
1111
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
12-
org.eclipse.jdt.core.compiler.source=1.6
12+
org.eclipse.jdt.core.compiler.source=1.8
1313
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"java.configuration.updateBuildConfiguration": "automatic"
3+
}

.vscode/tasks.json

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
{
2+
// See https://go.microsoft.com/fwlink/?LinkId=733558
3+
// for the documentation about the tasks.json format
4+
"version": "2.0.0",
5+
"tasks": [
6+
{
7+
"label": "Setup workspace",
8+
"type": "shell",
9+
"command": "./gradlew.bat setupDecompWorkspace",
10+
"group": "build",
11+
"presentation": {
12+
"reveal": "always",
13+
"panel": "new"
14+
}
15+
},
16+
17+
{
18+
"label": "Build",
19+
"type": "shell",
20+
"command": "./gradlew.bat build",
21+
"group": "build",
22+
"presentation": {
23+
"reveal": "always",
24+
"panel": "new"
25+
}
26+
},
27+
28+
{
29+
"label": "Run Client",
30+
"type": "shell",
31+
"command": "./gradlew.bat runClient",
32+
"group": "build",
33+
"presentation": {
34+
"reveal": "always",
35+
"panel": "new"
36+
}
37+
},
38+
39+
{
40+
"label": "Run Server",
41+
"type": "shell",
42+
"command": "./gradlew.bat runServer",
43+
"group": "build",
44+
"presentation": {
45+
"reveal": "always",
46+
"panel": "new"
47+
}
48+
},
49+
50+
{
51+
"label": "Build eclipse project",
52+
"type": "shell",
53+
"command": "./gradlew.bat eclipse",
54+
"group": "build",
55+
"presentation": {
56+
"reveal": "always",
57+
"panel": "new"
58+
}
59+
}
60+
]
61+
}

ExpPower_Client.launch

Lines changed: 0 additions & 1 deletion
This file was deleted.

ExpPower_Server.launch

Lines changed: 0 additions & 1 deletion
This file was deleted.

ExponentialPower_Client.launch

Lines changed: 0 additions & 13 deletions
This file was deleted.

ExponentialPower_Server.launch

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)