Permalink
Browse files

Mostly mindless s/Construct/Mixed replacement is done.

Need to fix the remaining compile errors individually.
  • Loading branch information...
LadyCailin committed Nov 15, 2018
1 parent 370cda3 commit 224b8d2ab4e6f4173835c85651480c14372ea718
Showing with 1,104 additions and 1,098 deletions.
  1. +6 −6 src/main/java/com/laytonsmith/core/functions/AbstractFunction.java
  2. +95 −95 src/main/java/com/laytonsmith/core/functions/ArrayHandling.java
  3. +62 −63 src/main/java/com/laytonsmith/core/functions/BasicLogic.java
  4. +9 −9 src/main/java/com/laytonsmith/core/functions/BossBar.java
  5. +6 −6 src/main/java/com/laytonsmith/core/functions/BukkitMetadata.java
  6. +27 −27 src/main/java/com/laytonsmith/core/functions/ByteArrays.java
  7. +3 −3 src/main/java/com/laytonsmith/core/functions/Clipboard.java
  8. +27 −26 src/main/java/com/laytonsmith/core/functions/Cmdline.java
  9. +12 −12 src/main/java/com/laytonsmith/core/functions/Commands.java
  10. +11 −10 src/main/java/com/laytonsmith/core/functions/Compiler.java
  11. +3 −2 src/main/java/com/laytonsmith/core/functions/CompositeFunction.java
  12. +15 −15 src/main/java/com/laytonsmith/core/functions/Crypto.java
  13. +89 −89 src/main/java/com/laytonsmith/core/functions/DataHandling.java
  14. +10 −9 src/main/java/com/laytonsmith/core/functions/DataTransformations.java
  15. +11 −11 src/main/java/com/laytonsmith/core/functions/Debug.java
  16. +16 −16 src/main/java/com/laytonsmith/core/functions/Echoes.java
  17. +16 −16 src/main/java/com/laytonsmith/core/functions/Enchantments.java
  18. +66 −66 src/main/java/com/laytonsmith/core/functions/EntityManagement.java
  19. +33 −33 src/main/java/com/laytonsmith/core/functions/Environment.java
  20. +21 −21 src/main/java/com/laytonsmith/core/functions/EventBinding.java
  21. +10 −11 src/main/java/com/laytonsmith/core/functions/Exceptions.java
  22. +9 −9 src/main/java/com/laytonsmith/core/functions/ExecutionQueue.java
  23. +5 −5 src/main/java/com/laytonsmith/core/functions/ExtensionMeta.java
  24. +12 −12 src/main/java/com/laytonsmith/core/functions/FileHandling.java
  25. +1 −2 src/main/java/com/laytonsmith/core/functions/Function.java
  26. +43 −43 src/main/java/com/laytonsmith/core/functions/InventoryManagement.java
  27. +9 −9 src/main/java/com/laytonsmith/core/functions/ItemMeta.java
  28. +4 −4 src/main/java/com/laytonsmith/core/functions/Marquee.java
  29. +65 −65 src/main/java/com/laytonsmith/core/functions/Math.java
  30. +20 −20 src/main/java/com/laytonsmith/core/functions/Meta.java
  31. +22 −22 src/main/java/com/laytonsmith/core/functions/Minecraft.java
  32. +43 −43 src/main/java/com/laytonsmith/core/functions/MobManagement.java
  33. +3 −2 src/main/java/com/laytonsmith/core/functions/OAuth.java
  34. +2 −2 src/main/java/com/laytonsmith/core/functions/Performance.java
  35. +2 −2 src/main/java/com/laytonsmith/core/functions/Permissions.java
  36. +8 −7 src/main/java/com/laytonsmith/core/functions/Persistence.java
  37. +88 −88 src/main/java/com/laytonsmith/core/functions/PlayerManagement.java
  38. +7 −7 src/main/java/com/laytonsmith/core/functions/PluginMeta.java
  39. +6 −6 src/main/java/com/laytonsmith/core/functions/Recipes.java
  40. +12 −12 src/main/java/com/laytonsmith/core/functions/Reflection.java
  41. +8 −8 src/main/java/com/laytonsmith/core/functions/Regex.java
  42. +4 −4 src/main/java/com/laytonsmith/core/functions/ResourceManager.java
  43. +12 −11 src/main/java/com/laytonsmith/core/functions/SQL.java
  44. +10 −10 src/main/java/com/laytonsmith/core/functions/Sandbox.java
  45. +13 −13 src/main/java/com/laytonsmith/core/functions/Scheduling.java
  46. +24 −23 src/main/java/com/laytonsmith/core/functions/Scoreboards.java
  47. +34 −34 src/main/java/com/laytonsmith/core/functions/StringHandling.java
  48. +3 −3 src/main/java/com/laytonsmith/core/functions/TaskHandling.java
  49. +10 −10 src/main/java/com/laytonsmith/core/functions/Threading.java
  50. +13 −13 src/main/java/com/laytonsmith/core/functions/Trades.java
  51. +6 −6 src/main/java/com/laytonsmith/core/functions/Weather.java
  52. +18 −17 src/main/java/com/laytonsmith/core/functions/Web.java
  53. +35 −35 src/main/java/com/laytonsmith/core/functions/World.java
  54. +5 −5 src/main/java/com/laytonsmith/core/functions/XGUI.java
@@ -15,13 +15,13 @@
import com.laytonsmith.core.constructs.CClosure;
import com.laytonsmith.core.constructs.CString;
import com.laytonsmith.core.constructs.CVoid;
import com.laytonsmith.core.constructs.Construct;
import com.laytonsmith.core.constructs.IVariable;
import com.laytonsmith.core.constructs.IVariableList;
import com.laytonsmith.core.constructs.Target;
import com.laytonsmith.core.environments.Environment;
import com.laytonsmith.core.exceptions.ConfigCompileException;
import com.laytonsmith.core.exceptions.ConfigRuntimeException;
import com.laytonsmith.core.natives.interfaces.Mixed;
import com.laytonsmith.core.snapins.PackagePermission;
import com.laytonsmith.tools.docgen.DocGenTemplates;
import com.laytonsmith.tools.docgen.DocGenTemplates.Generator.GenerateException;
@@ -51,7 +51,7 @@ protected AbstractFunction() {
* @return
*/
@Override
public Construct execs(Target t, Environment env, Script parent, ParseTree... nodes) {
public Mixed execs(Target t, Environment env, Script parent, ParseTree... nodes) {
return CVoid.VOID;
}
@@ -83,7 +83,7 @@ public final boolean appearInDocumentation() {
* @param args
* @return
*/
public Construct optimize(Target t, Construct... args) throws ConfigCompileException {
public Mixed optimize(Target t, Mixed... args) throws ConfigCompileException {
return null;
}
@@ -134,18 +134,18 @@ public LogLevel profileAt() {
}
@Override
public String profileMessage(Construct... args) {
public String profileMessage(Mixed... args) {
StringBuilder b = new StringBuilder();
boolean first = true;
for(Construct ccc : args) {
for(Mixed ccc : args) {
if(!first) {
b.append(", ");
}
first = false;
if(ccc instanceof CArray) {
//Arrays take too long to toString, so we don't want to actually toString them here if
//we don't need to.
b.append("<arrayNotShown size:" + ((CArray) ccc).size() + ">");
b.append("<arrayNotShown size:").append(((CArray) ccc).size()).append(">");
} else if(ccc instanceof CClosure) {
//The toString of a closure is too long, so let's not output them either.
b.append("<closureNotShown>");
Oops, something went wrong.

0 comments on commit 224b8d2

Please sign in to comment.