Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: augesrob-spigot/CraftUs-PROTOTYPE
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: Nitewriter/CraftUs-PROTOTYPE
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 4 commits
  • 89 files changed
  • 1 contributor

Commits on Nov 16, 2020

  1. Feature: Update project for IntelliJ and Maven

    - restructures source to standard IntelliJ project structure
    - adds Maven pom configuration
    - resolves many source code warnings
    - resolves many typos
    - resolves several null pointer exceptions for player damage events
    - resolves player voting bugs which only allowed one vote per color
    - adds admin save command
    - adjusts game to only assign one imposter
    - adds some more logging for debugging
    - adds a gitignore
    - updates readme to describe commands
    Nitewriter committed Nov 16, 2020
    Copy the full SHA
    976318c View commit details
  2. Merge pull request #1 from Nitewriter/feature/update-project-for-inte…

    …llij-and-maven
    
    Feature: Update project for IntelliJ and Maven
    Nitewriter authored Nov 16, 2020
    Copy the full SHA
    41a4c83 View commit details

Commits on Nov 17, 2020

  1. Feature: Update to Spigot 1.16.4

    - updates Spigot maven dependency to 1.16.4-R0.1
    - resolves Spigot deprecation warnings many components
    - resolves errors for removed Spigot interfaces
    - adds Spigot service maven dependency for private API access
    - removes Craftbukkit dependency
    - deletes unused message builder
    - resolves skull builder issues with newer Mojang APIs
    - resolves concurrency issue with open inventory call in matches runable
    - resolves material issues with button object used in tasks
    - updates readme
    Nitewriter committed Nov 17, 2020
    Copy the full SHA
    f6404fc View commit details
  2. Merge pull request #2 from Nitewriter/feature/update-to-spigot-1-16-4

    Feature: Update to Spigot 1.16.4
    Nitewriter authored Nov 17, 2020
    Copy the full SHA
    9e409df View commit details
Showing with 3,244 additions and 2,545 deletions.
  1. +60 −0 .gitignore
  2. +1 −0 .idea/.name
  3. +16 −0 .idea/compiler.xml
  4. +7 −0 .idea/encodings.xml
  5. +30 −0 .idea/jarRepositories.xml
  6. +13 −0 .idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
  7. +16 −0 .idea/misc.xml
  8. +8 −0 .idea/modules.xml
  9. +28 −0 .idea/runConfigurations/Build_CraftUs.xml
  10. +16 −0 .idea/runConfigurations/Debug_Spigot.xml
  11. +28 −0 .idea/runConfigurations/Package_CraftUs.xml
  12. +20 −0 .idea/saveactions_settings.xml
  13. +124 −0 .idea/uiDesigner.xml
  14. +6 −0 .idea/vcs.xml
  15. +55 −1 README.md
  16. +29 −0 craftus.iml
  17. +55 −0 pom.xml
  18. +0 −231 src/br/com/abidux/craftus/Main.java
  19. +0 −103 src/br/com/abidux/craftus/api/Maps.java
  20. +0 −288 src/br/com/abidux/craftus/api/Matches.java
  21. +0 −65 src/br/com/abidux/craftus/api/objects/CraftUsProfile.java
  22. +0 −49 src/br/com/abidux/craftus/api/objects/DeadPlayer.java
  23. +0 −31 src/br/com/abidux/craftus/api/objects/Map.java
  24. +0 −97 src/br/com/abidux/craftus/api/objects/Match.java
  25. +0 −35 src/br/com/abidux/craftus/api/objects/tasks/Button.java
  26. +0 −55 src/br/com/abidux/craftus/api/objects/tasks/CommsTask.java
  27. +0 −44 src/br/com/abidux/craftus/api/objects/tasks/ElectricTask.java
  28. +0 −42 src/br/com/abidux/craftus/api/objects/tasks/LevelTask.java
  29. +0 −62 src/br/com/abidux/craftus/api/objects/tasks/MazeTask.java
  30. +0 −51 src/br/com/abidux/craftus/api/objects/tasks/MeetingButton.java
  31. +0 −46 src/br/com/abidux/craftus/api/objects/tasks/MeteorTask.java
  32. +0 −49 src/br/com/abidux/craftus/api/objects/tasks/Task.java
  33. +0 −101 src/br/com/abidux/craftus/api/objects/tasks/WiresTask.java
  34. +0 −80 src/br/com/abidux/craftus/commands/CraftUs.java
  35. +0 −27 src/br/com/abidux/craftus/commands/Lobby.java
  36. +0 −23 src/br/com/abidux/craftus/commands/Search.java
  37. +0 −66 src/br/com/abidux/craftus/enums/Color.java
  38. +0 −27 src/br/com/abidux/craftus/enums/Heads.java
  39. +0 −33 src/br/com/abidux/craftus/enums/HeadsItem.java
  40. +0 −39 src/br/com/abidux/craftus/enums/Messages.java
  41. +0 −57 src/br/com/abidux/craftus/listeners/Chat.java
  42. +0 −54 src/br/com/abidux/craftus/listeners/CloseInv.java
  43. +0 −20 src/br/com/abidux/craftus/listeners/DropItem.java
  44. +0 −332 src/br/com/abidux/craftus/listeners/InvClick.java
  45. +0 −17 src/br/com/abidux/craftus/listeners/Join.java
  46. +0 −32 src/br/com/abidux/craftus/listeners/Move.java
  47. +0 −187 src/br/com/abidux/craftus/listeners/PlayerInteract.java
  48. +0 −23 src/br/com/abidux/craftus/listeners/QuitEvent.java
  49. +0 −73 src/br/com/abidux/craftus/utils/ItemBuilder.java
  50. +0 −39 src/br/com/abidux/craftus/utils/MessageBuilder.java
  51. +0 −58 src/br/com/abidux/craftus/utils/SkullBuilder.java
  52. +249 −0 src/main/java/com/abidux/craftus/Main.java
  53. +103 −0 src/main/java/com/abidux/craftus/api/GameMaps.java
  54. +1 −1 src/{br → main/java}/com/abidux/craftus/api/MatchState.java
  55. +372 −0 src/main/java/com/abidux/craftus/api/Matches.java
  56. +1 −1 src/{br → main/java}/com/abidux/craftus/api/PlayerType.java
  57. +60 −0 src/main/java/com/abidux/craftus/api/objects/CraftUsProfile.java
  58. +50 −0 src/main/java/com/abidux/craftus/api/objects/DeadPlayer.java
  59. +31 −0 src/main/java/com/abidux/craftus/api/objects/GameMap.java
  60. +102 −0 src/main/java/com/abidux/craftus/api/objects/Match.java
  61. +34 −0 src/main/java/com/abidux/craftus/api/objects/tasks/Button.java
  62. +56 −0 src/main/java/com/abidux/craftus/api/objects/tasks/CommsCrewTask.java
  63. +50 −0 src/main/java/com/abidux/craftus/api/objects/tasks/CrewTask.java
  64. +46 −0 src/main/java/com/abidux/craftus/api/objects/tasks/ElectricCrewTask.java
  65. +44 −0 src/main/java/com/abidux/craftus/api/objects/tasks/LevelCrewTask.java
  66. +67 −0 src/main/java/com/abidux/craftus/api/objects/tasks/MazeCrewTask.java
  67. +52 −0 src/main/java/com/abidux/craftus/api/objects/tasks/MeetingButton.java
  68. +46 −0 src/main/java/com/abidux/craftus/api/objects/tasks/MeteorCrewTask.java
  69. +106 −0 src/main/java/com/abidux/craftus/api/objects/tasks/WiresCrewTask.java
  70. +86 −0 src/main/java/com/abidux/craftus/commands/CraftUs.java
  71. +30 −0 src/main/java/com/abidux/craftus/commands/Lobby.java
  72. +24 −0 src/main/java/com/abidux/craftus/commands/Search.java
  73. +41 −0 src/main/java/com/abidux/craftus/enums/DisplayMessage.java
  74. +28 −0 src/main/java/com/abidux/craftus/enums/HeadArt.java
  75. +34 −0 src/main/java/com/abidux/craftus/enums/HeadItem.java
  76. +67 −0 src/main/java/com/abidux/craftus/enums/PlayerColor.java
  77. +56 −0 src/main/java/com/abidux/craftus/listeners/Chat.java
  78. +72 −0 src/main/java/com/abidux/craftus/listeners/CloseInv.java
  79. +19 −0 src/main/java/com/abidux/craftus/listeners/DropItem.java
  80. +353 −0 src/main/java/com/abidux/craftus/listeners/InvClick.java
  81. +17 −0 src/main/java/com/abidux/craftus/listeners/Join.java
  82. +40 −0 src/main/java/com/abidux/craftus/listeners/Move.java
  83. +209 −0 src/main/java/com/abidux/craftus/listeners/PlayerInteract.java
  84. +23 −0 src/main/java/com/abidux/craftus/listeners/QuitEvent.java
  85. +6 −4 src/{br → main/java}/com/abidux/craftus/utils/HologramBuilder.java
  86. +90 −0 src/main/java/com/abidux/craftus/utils/ItemBuilder.java
  87. +64 −0 src/main/java/com/abidux/craftus/utils/SkullBuilder.java
  88. 0 src/{ → main/resources}/config.yml
  89. +3 −2 src/{ → main/resources}/plugin.yml
60 changes: 60 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/
target/

# mpeltonen/sbt-idea plugin
.idea_modules/

# macOS
.DS_Store
.AppleDouble
.LSOverride

1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__commons_lang_commons_lang_2_6.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions .idea/runConfigurations/Build_CraftUs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions .idea/runConfigurations/Debug_Spigot.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions .idea/runConfigurations/Package_CraftUs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/saveactions_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

124 changes: 124 additions & 0 deletions .idea/uiDesigner.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading