Fixed double client commands
This commit is contained in:
+6
-21
@@ -2,8 +2,8 @@ package mindustry.annotations.impl;
|
||||
|
||||
import com.sun.source.tree.*;
|
||||
import com.sun.source.util.*;
|
||||
import com.sun.tools.javac.code.*;
|
||||
import com.sun.tools.javac.code.Scope;
|
||||
import com.sun.tools.javac.code.*;
|
||||
import com.sun.tools.javac.code.Symbol.*;
|
||||
import com.sun.tools.javac.code.Type.*;
|
||||
import com.sun.tools.javac.tree.*;
|
||||
@@ -33,16 +33,16 @@ public class CallSuperAnnotationProcessor extends AbstractProcessor{
|
||||
if(e.getAnnotation(OverrideCallSuper.class) != null) return false;
|
||||
|
||||
CodeAnalyzerTreeScanner codeScanner = new CodeAnalyzerTreeScanner();
|
||||
codeScanner.setMethodName(e.getSimpleName().toString());
|
||||
codeScanner.methodName = e.getSimpleName().toString();
|
||||
|
||||
TreePath tp = trees.getPath(e.getEnclosingElement());
|
||||
codeScanner.scan(tp, trees);
|
||||
|
||||
if(codeScanner.isCallSuperUsed()){
|
||||
List list = codeScanner.getMethod().getBody().getStatements();
|
||||
if(codeScanner.callSuperUsed){
|
||||
List list = codeScanner.method.getBody().getStatements();
|
||||
|
||||
if(!doesCallSuper(list, codeScanner.getMethodName())){
|
||||
processingEnv.getMessager().printMessage(Kind.ERROR, "Overriding method '" + codeScanner.getMethodName() + "' must explicitly call super method from its parent class.", e);
|
||||
if(!doesCallSuper(list, codeScanner.methodName)){
|
||||
processingEnv.getMessager().printMessage(Kind.ERROR, "Overriding method '" + codeScanner.methodName + "' must explicitly call super method from its parent class.", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -146,20 +146,5 @@ public class CallSuperAnnotationProcessor extends AbstractProcessor{
|
||||
return super.visitMethod(methodTree, trees);
|
||||
}
|
||||
|
||||
public void setMethodName (String methodName) {
|
||||
this.methodName = methodName;
|
||||
}
|
||||
|
||||
public String getMethodName () {
|
||||
return methodName;
|
||||
}
|
||||
|
||||
public MethodTree getMethod () {
|
||||
return method;
|
||||
}
|
||||
|
||||
public boolean isCallSuperUsed () {
|
||||
return callSuperUsed;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
- Added new icons w/ smooth scaling
|
||||
- Added liquid void (Contributed by @GioIacca9)
|
||||
- Added bridge opacity slider (Contributed by @Quezler)
|
||||
- Added "underflow" gate (opposite of overflow gate)
|
||||
- Added "emojis" for most blocks and items into the font
|
||||
- Added new tech tree layout w/ better mod support
|
||||
- Added game log file, stored in data folder
|
||||
- Added new separator sprite/animation
|
||||
- Added list of affinity tiles to stats of certain blocks
|
||||
@@ -0,0 +1,9 @@
|
||||
- Added new icons w/ smooth scaling
|
||||
- Added liquid void (Contributed by @GioIacca9)
|
||||
- Added bridge opacity slider (Contributed by @Quezler)
|
||||
- Added "underflow" gate (opposite of overflow gate)
|
||||
- Added "emojis" for most blocks and items into the font
|
||||
- Added new tech tree layout w/ better mod support
|
||||
- Added game log file, stored in data folder
|
||||
- Added new separator sprite/animation
|
||||
- Added list of affinity tiles to stats of certain blocks
|
||||
@@ -0,0 +1,9 @@
|
||||
- Added new icons w/ smooth scaling
|
||||
- Added liquid void (Contributed by @GioIacca9)
|
||||
- Added bridge opacity slider (Contributed by @Quezler)
|
||||
- Added "underflow" gate (opposite of overflow gate)
|
||||
- Added "emojis" for most blocks and items into the font
|
||||
- Added new tech tree layout w/ better mod support
|
||||
- Added game log file, stored in data folder
|
||||
- Added new separator sprite/animation
|
||||
- Added list of affinity tiles to stats of certain blocks
|
||||
@@ -0,0 +1,9 @@
|
||||
- Added new icons w/ smooth scaling
|
||||
- Added liquid void (Contributed by @GioIacca9)
|
||||
- Added bridge opacity slider (Contributed by @Quezler)
|
||||
- Added "underflow" gate (opposite of overflow gate)
|
||||
- Added "emojis" for most blocks and items into the font
|
||||
- Added new tech tree layout w/ better mod support
|
||||
- Added game log file, stored in data folder
|
||||
- Added new separator sprite/animation
|
||||
- Added list of affinity tiles to stats of certain blocks
|
||||
@@ -829,7 +829,6 @@ public class ServerControl implements ApplicationListener{
|
||||
});
|
||||
|
||||
mods.eachClass(p -> p.registerServerCommands(handler));
|
||||
mods.eachClass(p -> p.registerClientCommands(netServer.clientCommands));
|
||||
}
|
||||
|
||||
private void readCommands(){
|
||||
|
||||
Reference in New Issue
Block a user