upstream/CraftTweaker
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/CraftTweaker.git synced 2026-11-12 00:07:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed Java 7 compatibility due to accidental usage of Java 8-only methods

Browse Source 
- Fixed mod support loading even if the respective mod isn't present
- Fixed iterator implementations missing the remove method (fine in Java 8, but not in Java 7)
- Added /mt mods command
This commit is contained in:
Stan Hebben committed 2014-06-22 19:41:19 +02:00
1 parent 3827eba3e2
commit 8e47ca9317
11 files changed
+80 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ZenScript/src/main/java/stanhebben/zenscript/type/ZenTypeArray.java
-1
View File
@@ -9,7 +9,6 @@ package stanhebben.zenscript.type;
import stanhebben.zenscript.annotations.CompareType;
import stanhebben.zenscript.annotations.OperatorType;
import stanhebben.zenscript.compiler.IEnvironmentGlobal;
import stanhebben.zenscript.compiler.IEnvironmentMethod;
import stanhebben.zenscript.expression.Expression;
import stanhebben.zenscript.expression.ExpressionCompareGeneric;
import stanhebben.zenscript.expression.ExpressionInvalid;
ZenScript/src/main/java/stanhebben/zenscript/type/natives/JavaMethod.java
+5 -5
View File
@@ -114,7 +114,7 @@ public class JavaMethod {
this.method = method;
returnType = types.getType(method.getGenericReturnType());
parameterTypes = new ZenType[method.getParameterCount()];
parameterTypes = new ZenType[method.getParameterTypes().length];
optional = new boolean[parameterTypes.length];
for (int i = 0; i < parameterTypes.length; i++) {
parameterTypes[i] = types.getType(method.getGenericParameterTypes()[i]);
@@ -173,7 +173,7 @@ public class JavaMethod {
int result = PRIORITY_HIGH;
if (arguments.length > parameterTypes.length) {
if (method.isVarArgs()) {
ZenType arrayType = parameterTypes[method.getParameterCount() - 1];
ZenType arrayType = parameterTypes[method.getParameterTypes().length - 1];
ZenType baseType = ((ZenTypeArray) arrayType).getBaseType();
for (int i = parameterTypes.length - 1; i < arguments.length; i++) {
ZenType argType = arguments[i].getType();
@@ -205,7 +205,7 @@ public class JavaMethod {
int checkUntil = arguments.length;
if (arguments.length == parameterTypes.length && method.isVarArgs()) {
ZenType arrayType = parameterTypes[method.getParameterCount() - 1];
ZenType arrayType = parameterTypes[method.getParameterTypes().length - 1];
ZenType baseType = ((ZenTypeArray) arrayType).getBaseType();
ZenType argType = arguments[arguments.length - 1].getType();
@@ -265,8 +265,8 @@ public class JavaMethod {
return arguments;
}
Expression[] result = new Expression[method.getParameterCount()];
for (int i = arguments.length; i < method.getParameterCount(); i++) {
Expression[] result = new Expression[method.getParameterTypes().length];
for (int i = arguments.length; i < method.getParameterTypes().length; i++) {
result[i] = parameterTypes[i].defaultValue(position);
}