Permalink
Browse files

Merge branch 'master' into new-html-docs

  • Loading branch information...
LadyCailin committed Nov 8, 2017
2 parents e0c028c + 93326ff commit 9e9ded6e0461d9c4d0a1e2b3234c4a65d8a61ef4
Showing with 4,280 additions and 3,918 deletions.
  1. +1 −13 pom.xml
  2. +541 −541 src/main/java/com/laytonsmith/PureUtilities/ClassLoading/ClassDiscovery.java
  3. +171 −171 src/main/java/com/laytonsmith/PureUtilities/Common/ClassUtils.java
  4. +6 −3 src/main/java/com/laytonsmith/abstraction/MCHumanEntity.java
  5. +1 −0 src/main/java/com/laytonsmith/abstraction/MCInventory.java
  6. +3 −0 src/main/java/com/laytonsmith/abstraction/MCPlayer.java
  7. +2 −0 src/main/java/com/laytonsmith/abstraction/MCServer.java
  8. +2 −0 src/main/java/com/laytonsmith/abstraction/MCWorld.java
  9. +7 −14 src/main/java/com/laytonsmith/abstraction/blocks/MCBlockState.java
  10. +35 −21 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitConvertor.java
  11. +0 −3 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCCommand.java
  12. +9 −3 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCInventory.java
  13. +6 −2 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCItemStack.java
  14. +1 −7 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCObjective.java
  15. +20 −33 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCPlayerInventory.java
  16. +4 −27 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCScoreboard.java
  17. +49 −93 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCServer.java
  18. +33 −23 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCWorld.java
  19. +15 −21 src/main/java/com/laytonsmith/abstraction/bukkit/blocks/BukkitMCBlock.java
  20. +10 −4 src/main/java/com/laytonsmith/abstraction/bukkit/blocks/BukkitMCBlockState.java
  21. +0 −12 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCFishHook.java
  22. +25 −6 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCHumanEntity.java
  23. +34 −6 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCPlayer.java
  24. +25 −0 src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitBlockEvents.java
  25. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitEntityEvents.java
  26. +10 −3 src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitMiscEvents.java
  27. +6 −6 src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitPlayerEvents.java
  28. +6 −0 src/main/java/com/laytonsmith/abstraction/bukkit/events/drivers/BukkitBlockListener.java
  29. +0 −1 src/main/java/com/laytonsmith/abstraction/bukkit/events/drivers/BukkitEntityListener.java
  30. +11 −10 src/main/java/com/laytonsmith/abstraction/bukkit/events/drivers/BukkitPlayerListener.java
  31. +1 −12 src/main/java/com/laytonsmith/abstraction/entities/MCFishHook.java
  32. +1 −1 src/main/java/com/laytonsmith/abstraction/enums/MCEffect.java
  33. +1 −1 src/main/java/com/laytonsmith/abstraction/enums/MCSound.java
  34. +10 −0 src/main/java/com/laytonsmith/abstraction/events/MCBlockFadeEvent.java
  35. +3 −1 .../java/com/laytonsmith/abstraction/events/{MCConsoleCommandEvent.java → MCServerCommandEvent.java}
  36. +0 −22 src/main/java/com/laytonsmith/annotations/event.java
  37. +0 −1 src/main/java/com/laytonsmith/commandhelper/CommandHelperListener.java
  38. +2 −7 src/main/java/com/laytonsmith/commandhelper/CommandHelperPlugin.java
  39. +43 −39 src/main/java/com/laytonsmith/commandhelper/CommandHelperServerListener.java
  40. +9 −15 src/main/java/com/laytonsmith/core/AliasCore.java
  41. +0 −1 src/main/java/com/laytonsmith/core/CHLog.java
  42. +1,905 −1,893 src/main/java/com/laytonsmith/core/MethodScriptCompiler.java
  43. +111 −158 src/main/java/com/laytonsmith/core/ObjectGenerator.java
  44. +2 −2 src/main/java/com/laytonsmith/core/Optimizable.java
  45. +45 −39 src/main/java/com/laytonsmith/core/Script.java
  46. +1 −4 src/main/java/com/laytonsmith/core/Static.java
  47. +0 −34 src/main/java/com/laytonsmith/core/environments/CommandHelperEnvironment.java
  48. +28 −21 src/main/java/com/laytonsmith/core/events/AbstractEvent.java
  49. +4 −23 src/main/java/com/laytonsmith/core/events/BoundEvent.java
  50. +1 −0 src/main/java/com/laytonsmith/core/events/Driver.java
  51. +4 −73 src/main/java/com/laytonsmith/core/events/EventUtils.java
  52. +105 −36 src/main/java/com/laytonsmith/core/events/drivers/BlockEvents.java
  53. +75 −30 src/main/java/com/laytonsmith/core/events/drivers/EntityEvents.java
  54. +15 −15 src/main/java/com/laytonsmith/core/events/drivers/InventoryEvents.java
  55. +52 −46 src/main/java/com/laytonsmith/core/events/drivers/PlayerEvents.java
  56. +83 −7 src/main/java/com/laytonsmith/core/events/drivers/ServerEvents.java
  57. +6 −2 src/main/java/com/laytonsmith/core/events/drivers/VehicleEvents.java
  58. +21 −0 src/main/java/com/laytonsmith/core/events/drivers/WeatherEvents.java
  59. +10 −2 src/main/java/com/laytonsmith/core/events/drivers/WorldEvents.java
  60. +8 −6 src/main/java/com/laytonsmith/core/functions/Compiler.java
  61. +31 −23 src/main/java/com/laytonsmith/core/functions/EntityManagement.java
  62. +10 −16 src/main/java/com/laytonsmith/core/functions/Environment.java
  63. +1 −12 src/main/java/com/laytonsmith/core/functions/EventBinding.java
  64. +13 −9 src/main/java/com/laytonsmith/core/functions/IncludeCache.java
  65. +100 −96 src/main/java/com/laytonsmith/core/functions/InventoryManagement.java
  66. +22 −22 src/main/java/com/laytonsmith/core/functions/Meta.java
  67. +37 −38 src/main/java/com/laytonsmith/core/functions/Minecraft.java
  68. +301 −13 src/main/java/com/laytonsmith/core/functions/PlayerManagement.java
  69. +13 −12 src/main/java/com/laytonsmith/core/functions/Reflection.java
  70. +104 −87 src/main/java/com/laytonsmith/core/functions/Sandbox.java
  71. +13 −7 src/main/java/com/laytonsmith/core/packetjumper/PacketJumper.java
  72. +3 −2 src/main/java/com/laytonsmith/persistence/DataSourceFactory.java
  73. +3 −2 src/main/java/com/laytonsmith/persistence/DataSourceFilter.java
  74. +3 −2 src/main/java/com/laytonsmith/persistence/ThreadsafeDataSource.java
  75. +1 −1 src/main/java/com/laytonsmith/tools/Interpreter.java
  76. +2 −2 src/main/java/com/laytonsmith/tools/Manager.java
  77. +3 −3 src/main/resources/docs/Architecture
  78. +6 −12 src/main/resources/docs/Beginner's_Guide
  79. +11 −6 src/main/resources/docs/Compatibility
  80. +0 −1 src/main/resources/docs/Data_Manager
  81. +0 −4 src/main/resources/functionDocs/entity_spec
  82. +13 −13 src/main/resources/mainlogo
  83. +10 −20 src/test/java/com/laytonsmith/core/functions/MetaTest.java
View
14 pom.xml
@@ -145,10 +145,6 @@
<id>maven-central</id>
<url>http://repo1.maven.org/maven2/</url>
</repository>
<!--repository>
<id>zml2008</id>
<url>http://files.zachsthings.com/repo/</url>
</repository-->
<repository>
<id>Plugin Metrics</id>
@@ -176,7 +172,7 @@
<!-- GPL -->
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.12.1-R0.1-SNAPSHOT</version>
<version>1.12.2-R0.1-SNAPSHOT</version>
</dependency>
<!-- Used for storing and retreiving Constructs in a storage transparent medium: JSONs -->
@@ -195,14 +191,6 @@
<version>1.0</version>
</dependency>
<!-- Used for potion effects
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>minecraft-server</artifactId>
<version>1.8.1</version>
<type>jar</type>
</dependency> -->
<!-- Used for IRC hooks -->
<!--<dependency> NOT READY YET
<groupId>org.jibble</groupId>
Oops, something went wrong.

0 comments on commit 9e9ded6

Please sign in to comment.