Permalink
Browse files

Merge branch '1.13-dev' of https://github.com/EngineHub/CommandHelper

  • Loading branch information...
PseudoKnight committed Aug 29, 2018
2 parents d4744f5 + eb709da commit 7277e87c4bb988b0244e258f4e478b01a4f29a01
Showing with 6,068 additions and 6,196 deletions.
  1. +4 −4 pom.xml
  2. +2 −12 src/main/java/com/laytonsmith/abstraction/Convertor.java
  3. +0 −6 src/main/java/com/laytonsmith/abstraction/MCBannerMeta.java
  4. +0 −5 src/main/java/com/laytonsmith/abstraction/MCEgg.java
  5. +2 −0 src/main/java/com/laytonsmith/abstraction/MCEnchantment.java
  6. +6 −0 src/main/java/com/laytonsmith/abstraction/MCFurnaceRecipe.java
  7. +0 −1 src/main/java/com/laytonsmith/abstraction/MCHumanEntity.java
  8. +4 −0 src/main/java/com/laytonsmith/abstraction/MCItemMeta.java
  9. +3 −14 src/main/java/com/laytonsmith/abstraction/MCItemStack.java
  10. +0 −6 src/main/java/com/laytonsmith/abstraction/MCLightningStrike.java
  11. +33 −18 src/main/java/com/laytonsmith/abstraction/MCLivingEntity.java
  12. +6 −0 src/main/java/com/laytonsmith/abstraction/MCMapMeta.java
  13. +0 −10 src/main/java/com/laytonsmith/abstraction/MCMaterialData.java
  14. +4 −2 src/main/java/com/laytonsmith/abstraction/MCPlayer.java
  15. +4 −0 src/main/java/com/laytonsmith/abstraction/MCPlayerInventory.java
  16. +4 −5 src/main/java/com/laytonsmith/abstraction/MCPotionMeta.java
  17. +1 −0 src/main/java/com/laytonsmith/abstraction/MCProjectileSource.java
  18. +6 −1 src/main/java/com/laytonsmith/abstraction/MCServer.java
  19. +4 −0 src/main/java/com/laytonsmith/abstraction/MCShapedRecipe.java
  20. +4 −0 src/main/java/com/laytonsmith/abstraction/MCShapelessRecipe.java
  21. +0 −5 src/main/java/com/laytonsmith/abstraction/MCSnowball.java
  22. +0 −11 src/main/java/com/laytonsmith/abstraction/MCSpawnEggMeta.java
  23. +0 −5 src/main/java/com/laytonsmith/abstraction/MCTeam.java
  24. +16 −0 src/main/java/com/laytonsmith/abstraction/MCTropicalFishBucketMeta.java
  25. +0 −5 src/main/java/com/laytonsmith/abstraction/MCVehicle.java
  26. +7 −1 src/main/java/com/laytonsmith/abstraction/MCWorld.java
  27. +4 −32 src/main/java/com/laytonsmith/abstraction/StaticLayer.java
  28. +0 −5 src/main/java/com/laytonsmith/abstraction/blocks/MCBanner.java
  29. +10 −8 src/main/java/com/laytonsmith/abstraction/blocks/MCBlock.java
  30. +8 −0 src/main/java/com/laytonsmith/abstraction/blocks/MCBlockData.java
  31. +0 −17 src/main/java/com/laytonsmith/abstraction/blocks/MCBlockState.java
  32. +8 −3 src/main/java/com/laytonsmith/abstraction/blocks/MCMaterial.java
  33. +46 −94 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitConvertor.java
  34. +0 −12 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCBannerMeta.java
  35. +2 −1 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCBlockStateMeta.java
  36. +33 −3 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCCommandMap.java
  37. +3 −3 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCCommandSender.java
  38. +5 −0 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCEnchantment.java
  39. +8 −18 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCEntityEquipment.java
  40. +12 −0 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCFurnaceRecipe.java
  41. +11 −0 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCItemMeta.java
  42. +12 −42 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCItemStack.java
  43. +15 −0 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCMapMeta.java
  44. +0 −56 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCMaterialData.java
  45. +11 −5 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCPlayerInventory.java
  46. +11 −18 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCPotionMeta.java
  47. +4 −17 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCScoreboard.java
  48. +29 −27 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCServer.java
  49. +10 −7 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCShapedRecipe.java
  50. +11 −7 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCShapelessRecipe.java
  51. +1 −6 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCSkullMeta.java
  52. +0 −31 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCSpawnEggMeta.java
  53. +4 −48 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCTeam.java
  54. +53 −0 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCTropicalFishBucketMeta.java
  55. +98 −142 src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCWorld.java
  56. +7 −1 src/main/java/com/laytonsmith/abstraction/bukkit/blocks/BukkitMCBanner.java
  57. +25 −17 src/main/java/com/laytonsmith/abstraction/bukkit/blocks/BukkitMCBlock.java
  58. +45 −0 src/main/java/com/laytonsmith/abstraction/bukkit/blocks/BukkitMCBlockData.java
  59. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/blocks/BukkitMCBlockProjectileSource.java
  60. +0 −22 src/main/java/com/laytonsmith/abstraction/bukkit/blocks/BukkitMCBlockState.java
  61. +21 −8 src/main/java/com/laytonsmith/abstraction/bukkit/blocks/BukkitMCMaterial.java
  62. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCAgeable.java
  63. +8 −6 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCAreaEffectCloud.java
  64. +7 −12 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCArmorStand.java
  65. +1 −5 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCBoat.java
  66. +4 −22 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCCreeper.java
  67. +12 −0 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCDrowned.java
  68. +10 −28 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCEnderCrystal.java
  69. +1 −5 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCEnderDragon.java
  70. +3 −15 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCEnderSignal.java
  71. +7 −7 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCEnderman.java
  72. +17 −96 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCEntity.java
  73. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCEntityProjectileSource.java
  74. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCExperienceOrb.java
  75. +2 −16 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCFallingBlock.java
  76. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCFireball.java
  77. +0 −19 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCGuardian.java
  78. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCHanging.java
  79. +1 −128 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCHorse.java
  80. +4 −15 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCHumanEntity.java
  81. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCItem.java
  82. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCLightningStrike.java
  83. +49 −82 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCLivingEntity.java
  84. +0 −10 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCLlama.java
  85. +7 −7 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCMinecart.java
  86. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCPainting.java
  87. +49 −115 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCPlayer.java
  88. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCProjectile.java
  89. +2 −11 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCShulker.java
  90. +0 −20 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCSkeleton.java
  91. +2 −11 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCSnowman.java
  92. +2 −2 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCStorageMinecart.java
  93. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCTNT.java
  94. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCTameable.java
  95. +6 −4 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCTippedArrow.java
  96. +15 −0 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCTrident.java
  97. +67 −0 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCTropicalFish.java
  98. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCVehicle.java
  99. +0 −19 src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCZombie.java
  100. +0 −11 src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitBlockEvents.java
  101. +28 −42 src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitEntityEvents.java
  102. +2 −6 src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitInventoryEvents.java
  103. +3 −85 src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitPlayerEvents.java
  104. +2 −2 src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitVehicleEvents.java
  105. +1 −1 src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitWeatherEvents.java
  106. +7 −3 src/main/java/com/laytonsmith/abstraction/bukkit/events/drivers/BukkitEntityListener.java
  107. +0 −16 src/main/java/com/laytonsmith/abstraction/bukkit/events/drivers/BukkitPlayerListener.java
  108. +5 −2 src/main/java/com/laytonsmith/abstraction/bukkit/events/drivers/BukkitVehicleListener.java
  109. +0 −2 src/main/java/com/laytonsmith/abstraction/entities/MCAbstractHorse.java
  110. +3 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCAgeable.java
  111. +2 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCArmorStand.java
  112. +0 −2 src/main/java/com/laytonsmith/abstraction/entities/MCArrow.java
  113. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCBoat.java
  114. +4 −0 src/main/java/com/laytonsmith/abstraction/entities/MCDrowned.java
  115. +4 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCEnderCrystal.java
  116. +3 −3 src/main/java/com/laytonsmith/abstraction/entities/MCEnderman.java
  117. +3 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCExperienceOrb.java
  118. +0 −2 src/main/java/com/laytonsmith/abstraction/entities/MCFallingBlock.java
  119. +1 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCFireball.java
  120. +0 −2 src/main/java/com/laytonsmith/abstraction/entities/MCFishHook.java
  121. +0 −4 src/main/java/com/laytonsmith/abstraction/entities/MCGuardian.java
  122. +2 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCHanging.java
  123. +0 −15 src/main/java/com/laytonsmith/abstraction/entities/MCHorse.java
  124. +4 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCItem.java
  125. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCItemFrame.java
  126. +8 −0 src/main/java/com/laytonsmith/abstraction/entities/MCLightningStrike.java
  127. +0 −2 src/main/java/com/laytonsmith/abstraction/entities/MCLlamaSpit.java
  128. +3 −4 src/main/java/com/laytonsmith/abstraction/entities/MCMinecart.java
  129. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCOcelot.java
  130. +1 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCPainting.java
  131. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCParrot.java
  132. +0 −3 src/main/java/com/laytonsmith/abstraction/entities/MCPig.java
  133. +5 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCProjectile.java
  134. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCRabbit.java
  135. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCSheep.java
  136. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCShulkerBullet.java
  137. +0 −5 src/main/java/com/laytonsmith/abstraction/entities/MCSkeleton.java
  138. +0 −7 src/main/java/com/laytonsmith/abstraction/entities/MCSnowball.java
  139. +3 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCTNT.java
  140. +3 −1 src/main/java/com/laytonsmith/abstraction/{ → entities}/MCTameable.java
  141. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCThrownPotion.java
  142. +5 −0 src/main/java/com/laytonsmith/abstraction/entities/MCTrident.java
  143. +32 −0 src/main/java/com/laytonsmith/abstraction/entities/MCTropicalFish.java
  144. +7 −0 src/main/java/com/laytonsmith/abstraction/entities/MCVehicle.java
  145. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCVillager.java
  146. +0 −7 src/main/java/com/laytonsmith/abstraction/entities/MCWither.java
  147. +0 −2 src/main/java/com/laytonsmith/abstraction/entities/MCWitherSkull.java
  148. +0 −1 src/main/java/com/laytonsmith/abstraction/entities/MCWolf.java
  149. +0 −4 src/main/java/com/laytonsmith/abstraction/entities/MCZombie.java
  150. +2 −2 src/main/java/com/laytonsmith/abstraction/enums/MCArt.java
  151. +70 −67 src/main/java/com/laytonsmith/abstraction/enums/MCBiomeType.java
  152. +6 −56 src/main/java/com/laytonsmith/abstraction/enums/MCDamageCause.java
  153. +1 −1 src/main/java/com/laytonsmith/abstraction/enums/MCDyeColor.java
  154. +1 −50 src/main/java/com/laytonsmith/abstraction/enums/MCEffect.java
  155. +60 −66 src/main/java/com/laytonsmith/abstraction/enums/MCEntityType.java
  156. +3 −0 src/main/java/com/laytonsmith/abstraction/enums/MCGameRule.java
  157. +3 −3 src/main/java/com/laytonsmith/abstraction/enums/MCInventoryType.java
  158. +0 −11 src/main/java/com/laytonsmith/abstraction/enums/MCNameTagVisibility.java
  159. +139 −51 src/main/java/com/laytonsmith/abstraction/enums/MCParticle.java
  160. +136 −0 src/main/java/com/laytonsmith/abstraction/enums/MCPotionEffectType.java
  161. +2 −0 src/main/java/com/laytonsmith/abstraction/enums/MCPotionType.java
  162. +0 −10 src/main/java/com/laytonsmith/abstraction/enums/MCSkeletonType.java
  163. +676 −758 src/main/java/com/laytonsmith/abstraction/enums/MCSound.java
  164. +2 −1 src/main/java/com/laytonsmith/abstraction/enums/MCSpawnReason.java
  165. +2 −0 src/main/java/com/laytonsmith/abstraction/enums/MCVersion.java
  166. +2 −1 src/main/java/com/laytonsmith/abstraction/enums/MCWorldType.java
  167. +0 −6 src/main/java/com/laytonsmith/abstraction/enums/MCZombieType.java
  168. +15 −97 src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCBiomeType.java
  169. +0 −10 src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCEnderDragonPhase.java
  170. +12 −13 src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCEntityType.java
  171. +0 −10 src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCItemFlag.java
  172. +538 −0 src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCLegacyMaterial.java
  173. +0 −10 src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCOption.java
  174. +0 −10 src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCOptionStatus.java
  175. +0 −10 src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCParrotType.java
  176. +57 −21 src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCParticle.java
  177. +0 −10 src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCPatternShape.java
  178. +83 −0 src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCPotionEffectType.java
  179. +0 −10 src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCRabbitType.java
  180. +1 −433 src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCSound.java
  181. +0 −10 src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCSoundCategory.java
  182. +0 −16 src/main/java/com/laytonsmith/abstraction/events/MCChatTabCompleteEvent.java
  183. +2 −1 src/main/java/com/laytonsmith/abstraction/events/MCEntityChangeBlockEvent.java
  184. +1 −1 src/main/java/com/laytonsmith/abstraction/events/MCHangingBreakEvent.java
  185. +1 −1 src/main/java/com/laytonsmith/abstraction/events/MCItemDespawnEvent.java
  186. +1 −1 src/main/java/com/laytonsmith/abstraction/events/MCItemSpawnEvent.java
  187. +1 −1 src/main/java/com/laytonsmith/abstraction/events/MCLightningStrikeEvent.java
  188. +0 −6 src/main/java/com/laytonsmith/abstraction/events/MCNotePlayEvent.java
  189. +1 −1 src/main/java/com/laytonsmith/abstraction/events/MCPlayerDropItemEvent.java
  190. +1 −1 src/main/java/com/laytonsmith/abstraction/events/MCPlayerPickupItemEvent.java
  191. +0 −18 src/main/java/com/laytonsmith/abstraction/events/MCPlayerPreLoginEvent.java
  192. +1 −1 src/main/java/com/laytonsmith/abstraction/events/MCProjectileHitEvent.java
  193. +1 −1 src/main/java/com/laytonsmith/abstraction/events/MCProjectileLaunchEvent.java
  194. +1 −1 ...onsmith/abstraction/events/{MCVehicleEnitityCollideEvent.java → MCVehicleEntityCollideEvent.java}
  195. +15 −4 src/main/java/com/laytonsmith/commandhelper/CommandHelperPlugin.java
  196. +2 −6 src/main/java/com/laytonsmith/commandhelper/CommandHelperServerListener.java
  197. +2 −1 src/main/java/com/laytonsmith/core/CHVersion.java
  198. +333 −188 src/main/java/com/laytonsmith/core/ObjectGenerator.java
  199. +21 −82 src/main/java/com/laytonsmith/core/Static.java
  200. +5 −6 src/main/java/com/laytonsmith/core/events/Driver.java
  201. +1 −1 src/main/java/com/laytonsmith/core/events/Prefilters.java
  202. +442 −384 src/main/java/com/laytonsmith/core/events/drivers/BlockEvents.java
  203. +152 −48 src/main/java/com/laytonsmith/core/events/drivers/EntityEvents.java
  204. +79 −23 src/main/java/com/laytonsmith/core/events/drivers/InventoryEvents.java
  205. +92 −206 src/main/java/com/laytonsmith/core/events/drivers/PlayerEvents.java
  206. +29 −9 src/main/java/com/laytonsmith/core/events/drivers/VehicleEvents.java
  207. +1 −3 src/main/java/com/laytonsmith/core/functions/BossBar.java
  208. +349 −134 src/main/java/com/laytonsmith/core/functions/Enchantments.java
  209. +140 −163 src/main/java/com/laytonsmith/core/functions/EntityManagement.java
  210. +480 −19 src/main/java/com/laytonsmith/core/functions/Environment.java
  211. +170 −54 src/main/java/com/laytonsmith/core/functions/InventoryManagement.java
  212. +21 −16 src/main/java/com/laytonsmith/core/functions/ItemMeta.java
  213. +232 −82 src/main/java/com/laytonsmith/core/functions/Minecraft.java
  214. +164 −51 src/main/java/com/laytonsmith/core/functions/MobManagement.java
  215. +179 −119 src/main/java/com/laytonsmith/core/functions/PlayerManagement.java
  216. +44 −15 src/main/java/com/laytonsmith/core/functions/PluginMeta.java
  217. +4 −3 src/main/java/com/laytonsmith/core/functions/Recipes.java
  218. +1 −1 src/main/java/com/laytonsmith/core/functions/Reflection.java
  219. +0 −97 src/main/java/com/laytonsmith/core/functions/Sandbox.java
  220. +79 −67 src/main/java/com/laytonsmith/core/functions/Scoreboards.java
  221. +36 −19 src/main/java/com/laytonsmith/core/functions/World.java
  222. +6 −31 src/main/java/com/laytonsmith/tools/Interpreter.java
  223. +0 −756 src/main/resources/data_names.txt
  224. +11 −16 src/main/resources/functionDocs/entity_spec
  225. +1 −0 src/main/resources/plugin.yml
  226. +9 −6 src/main/resources/samp_aliases.txt
  227. +1 −0 src/main/resources/siteDeploy/DocDirectory
  228. +90 −90 src/main/resources/syntax-templates/geshi/default.php
  229. +2 −2 src/test/java/com/laytonsmith/core/functions/EnchantmentsTest.java
  230. +6 −35 src/test/java/com/laytonsmith/testing/StaticTest.java
View
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.sk89q</groupId>
<artifactId>commandhelper</artifactId>
<version>3.3.2-SNAPSHOT</version>
<version>3.3.3-SNAPSHOT</version>
<name>CommandHelper</name>
<description>CommandHelper is a full blown scripting language built right into Minecraft</description>
<inceptionYear>2010</inceptionYear>
@@ -171,9 +171,9 @@
<!-- Bukkit -->
<dependency>
<!-- GPL -->
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.12.2-R0.1-SNAPSHOT</version>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.13.1-R0.1-SNAPSHOT</version>
</dependency>
<!-- Used for storing and retreiving Constructs in a storage transparent medium: JSONs -->
@@ -39,27 +39,17 @@
MCServer GetServer();
MCItemStack GetItemStack(int type, int qty);
MCItemStack GetItemStack(int type, int data, int qty);
MCItemStack GetItemStack(MCMaterial type, int qty);
MCItemStack GetItemStack(MCMaterial type, int data, int qty);
MCItemStack GetItemStack(String type, int qty);
MCItemStack GetItemStack(String type, int data, int qty);
MCPotionData GetPotionData(MCPotionType type, boolean extended, boolean upgraded);
void Startup(CommandHelperPlugin chp);
int LookupItemId(String materialName);
String LookupMaterialName(int id);
MCMaterial GetMaterialFromLegacy(String name, int data);
MCMaterial getMaterial(int id);
MCMaterial GetMaterialFromLegacy(int id, int data);
MCMaterial GetMaterial(String name);
@@ -1,15 +1,11 @@
package com.laytonsmith.abstraction;
import com.laytonsmith.abstraction.enums.MCDyeColor;
import java.util.List;
public interface MCBannerMeta extends MCItemMeta {
void addPattern(MCPattern pattern);
MCDyeColor getBaseColor();
MCPattern getPattern(int i);
List<MCPattern> getPatterns();
@@ -18,8 +14,6 @@
void removePattern(int i);
void setBaseColor(MCDyeColor color);
void setPattern(int i, MCPattern pattern);
void setPatterns(List<MCPattern> patterns);

This file was deleted.

Oops, something went wrong.
@@ -7,4 +7,6 @@
int getMaxLevel();
String getName();
String getKey();
}
@@ -1,8 +1,14 @@
package com.laytonsmith.abstraction;
import com.laytonsmith.abstraction.blocks.MCMaterial;
public interface MCFurnaceRecipe extends MCRecipe {
String getKey();
MCItemStack getInput();
void setInput(MCItemStack input);
void setInput(MCMaterial mat);
}
@@ -32,7 +32,6 @@
MCInventoryView openWorkbench(MCLocation loc, boolean force);
//MCInventoryView openWorkbench(MCLocation location, boolean force);
void setGameMode(MCGameMode mode);
void setItemInHand(MCItemStack item);
@@ -106,4 +106,8 @@
boolean isUnbreakable();
void setUnbreakable(boolean unbreakable);
int getDamage();
void setDamage(int damage);
}
@@ -4,19 +4,12 @@
import java.util.Map;
public interface MCItemStack extends AbstractionObject {
MCMaterialData getData();
short getDurability();
/**
* @deprecated Magic value
*/
@Deprecated
int getTypeId();
void setDurability(short data);
void addEnchantment(MCEnchantment e, int level);
void addUnsafeEnchantment(MCEnchantment e, int level);
@@ -27,23 +20,19 @@
MCMaterial getType();
/**
* @deprecated Magic value
*/
@Deprecated
void setTypeId(int type);
void setType(MCMaterial type);
int maxStackSize();
int getAmount();
void setAmount(int amt);
void setData(int data);
boolean hasItemMeta();
MCItemMeta getItemMeta();
void setItemMeta(MCItemMeta im);
boolean isEmpty();
}

This file was deleted.

Oops, something went wrong.
@@ -1,26 +1,21 @@
package com.laytonsmith.abstraction;
import com.laytonsmith.abstraction.blocks.MCBlock;
import com.laytonsmith.abstraction.blocks.MCMaterial;
import com.laytonsmith.abstraction.enums.MCPotionEffectType;
import com.laytonsmith.core.constructs.Target;
import java.util.HashSet;
import java.util.List;
public interface MCLivingEntity extends MCEntity, MCProjectileSource {
void addEffect(int potionID, int strength, int ticks, boolean ambient, boolean particles, Target t);
boolean addEffect(MCPotionEffectType type, int strength, int ticks, boolean ambient, boolean particles, boolean icon);
boolean removeEffect(int potionID);
boolean removeEffect(MCPotionEffectType type);
void removeEffects();
/**
* Returns the maximum effect id, inclusive.
*
* @return
*/
int getMaxEffect();
List<MCEffect> getEffects();
void damage(double amount);
@@ -53,11 +48,11 @@
MCLivingEntity getTarget(Target t);
MCBlock getTargetBlock(HashSet<Short> transparent, int maxDistance);
MCBlock getTargetBlock(HashSet<MCMaterial> transparent, int maxDistance);
MCBlock getTargetSpace(int maxDistance);
List<MCBlock> getLineOfSight(HashSet<Short> transparent, int maxDistance);
List<MCBlock> getLineOfSight(HashSet<MCMaterial> transparent, int maxDistance);
boolean hasLineOfSight(MCEntity other);
@@ -105,6 +100,10 @@
void setAI(Boolean ai);
boolean isCollidable();
void setCollidable(boolean collidable);
/**
* Kills the entity. In some cases, this will be equivalent to setHealth(0), but may not be, so this method should
* be used instead.
@@ -113,30 +112,42 @@
class MCEffect {
private int potionID;
private MCPotionEffectType type;
private int strength;
private int ticksRemaining;
private boolean ambient;
private boolean particles;
private boolean icon;
public MCEffect(int potionID, int strength, int ticks, boolean ambient) {
this.potionID = potionID;
public MCEffect(MCPotionEffectType type, int strength, int ticks, boolean ambient) {
this.type = type;
this.strength = strength;
this.ticksRemaining = ticks;
this.ambient = ambient;
this.particles = true;
this.icon = true;
}
public MCEffect(int potionID, int strength, int ticks, boolean ambient, boolean particles) {
this.potionID = potionID;
public MCEffect(MCPotionEffectType type, int strength, int ticks, boolean ambient, boolean particles) {
this.type = type;
this.strength = strength;
this.ticksRemaining = ticks;
this.ambient = ambient;
this.particles = particles;
this.icon = particles;
}
public int getPotionID() {
return potionID;
public MCEffect(MCPotionEffectType type, int strength, int ticks, boolean ambient, boolean particles, boolean icon) {
this.type = type;
this.strength = strength;
this.ticksRemaining = ticks;
this.ambient = ambient;
this.particles = particles;
this.icon = icon;
}
public MCPotionEffectType getPotionEffectType() {
return type;
}
public int getStrength() {
@@ -154,5 +165,9 @@ public boolean isAmbient() {
public boolean hasParticles() {
return particles;
}
public boolean showIcon() {
return icon;
}
}
}
@@ -2,6 +2,12 @@
public interface MCMapMeta extends MCItemMeta {
boolean hasMapId();
int getMapId();
void setMapId(int id);
MCColor getColor();
void setColor(MCColor color);

This file was deleted.

Oops, something went wrong.
@@ -1,7 +1,9 @@
package com.laytonsmith.abstraction;
import com.laytonsmith.abstraction.blocks.MCBlockData;
import com.laytonsmith.abstraction.enums.MCInstrument;
import com.laytonsmith.abstraction.enums.MCParticle;
import com.laytonsmith.abstraction.enums.MCPotionEffectType;
import com.laytonsmith.abstraction.enums.MCSound;
import com.laytonsmith.abstraction.enums.MCSoundCategory;
import com.laytonsmith.abstraction.enums.MCWeather;
@@ -65,7 +67,7 @@
void kickPlayer(String message);
@Override
boolean removeEffect(int effect);
boolean removeEffect(MCPotionEffectType type);
void resetPlayerTime();
@@ -109,7 +111,7 @@
String getHost();
void sendBlockChange(MCLocation loc, int material, byte data);
void sendBlockChange(MCLocation loc, MCBlockData data);
void sendSignTextChange(MCLocation loc, String[] lines);
@@ -10,6 +10,8 @@
void setBoots(MCItemStack stack);
void setItemInMainHand(MCItemStack stack);
void setItemInOffHand(MCItemStack stack);
MCItemStack getHelmet();
@@ -20,6 +22,8 @@
MCItemStack getBoots();
MCItemStack getItemInMainHand();
MCItemStack getItemInOffHand();
int getHeldItemSlot();
@@ -1,6 +1,7 @@
package com.laytonsmith.abstraction;
import com.laytonsmith.abstraction.MCLivingEntity.MCEffect;
import com.laytonsmith.abstraction.enums.MCPotionEffectType;
import com.laytonsmith.core.constructs.Target;
import java.util.List;
@@ -10,17 +11,15 @@
void setBasePotionData(MCPotionData pd);
boolean addCustomEffect(int potionID, int strength, int ticks, boolean ambient, boolean overwrite, Target t);
boolean addCustomEffect(MCPotionEffectType type, int strength, int ticks, boolean ambient, boolean particles, boolean icon, boolean force, Target t);
boolean clearCustomEffects();
List<MCEffect> getCustomEffects();
boolean hasCustomEffect(int id);
boolean hasCustomEffect(MCPotionEffectType type);
boolean hasCustomEffects();
boolean removeCustomEffect(int id);
boolean setMainEffect(int id);
boolean removeCustomEffect(MCPotionEffectType type);
}
@@ -1,6 +1,7 @@
package com.laytonsmith.abstraction;
import com.laytonsmith.PureUtilities.Vector3D;
import com.laytonsmith.abstraction.entities.MCProjectile;
import com.laytonsmith.abstraction.enums.MCProjectileType;
public interface MCProjectileSource extends AbstractionObject {
Oops, something went wrong.

0 comments on commit 7277e87

Please sign in to comment.