Commit Graph

46 Commits

Author SHA1 Message Date
Sam
36c0c56f27 World Events and Sheets rewrite 2017-01-19 21:15:06 +00:00
Sam
8d47e80066 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-12 18:03:07 +00:00
Nate Mortensen
8384c47e53 Create Lifetime system for managing Listeners with a defined duration.
This commit introduces a Component system focused around Games, which is completely
backwards compatible, as well as designed to be flexible enough for later improvements
such as dependency injection. Each GameState is associated with a phase of the
PhasedLifetime that each Game has. Components can be registered with a specific phased
or the entirety of the Lifetime. Refer to the javadocs for Lifetime and PhasedLifetime
for more details.  Currently the main two Component types are ICommand and
ListenerComponent.

This commit includes the first refactoring into using this system, which is replacing
the Wizards minigame's usage of Miniplugin with a Lifetimed Component, allowing for
the shop to be appropriately registered and unregistered.  This change allows for
Wizards to be run more than once on the same server instance.  Previously, attempting
to register the Miniplugin twice would result in the minigame failing to start after
the initial registration.

This commit additionally includes slight refactoring within GameCreationManager as
required for the Lifetime system to function correctly.  These changes ensure that
Games are only disabled once, whereas before they could be repeatedly disabled.
The previous implementation of disable(), along with the classes that override it,
functioned correctly despite being called several times.

Finally, this commit adds in changes to the pom to allow for unit testing.
2017-01-11 15:07:47 -06:00
Sam
d0f3aff051 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-10 11:21:20 +00:00
cnr
b7e738b4e8 Revert commits from #302
This reverts commits from the range 062fdd3^..a0beeab

Changes from #302 are on hold until a later date.
2016-12-08 20:41:46 -07:00
Sam
58613fa77f Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-08 19:42:55 +00:00
Nate Mortensen
833c52d0f2 Create Lifetime system for managing Listeners with a defined duration.
This commit introduces a Component system focused around Games, which is completely
backwards compatible, as well as designed to be flexible enough for later improvements
such as dependency injection. Each GameState is associated with a phase of the
PhasedLifetime that each Game has. Components can be registered with a specific phased
or the entirety of the Lifetime. Refer to the javadocs for Lifetime and PhasedLifetime
for more details.  Currently the main two Component types are ICommand and
ListenerComponent.

This commit includes the first refactoring into using this system, which is replacing
the Wizards minigame's usage of Miniplugin with a Lifetimed Component, allowing for
the shop to be appropriately registered and unregistered.  This change allows for
Wizards to be run more than once on the same server instance.  Previously, attempting
to register the Miniplugin twice would result in the minigame failing to start after
the initial registration.

This commit additionally includes slight refactoring within GameCreationManager as
required for the Lifetime system to function correctly.  These changes ensure that
Games are only disabled once, whereas before they could be repeatedly disabled.
The previous implementation of disable(), along with the classes that override it,
functioned correctly despite being called several times.

Finally, this commit adds in changes to the pom to allow for unit testing.
2016-12-07 13:20:04 -06:00
Sam
19a214b454 Gem Hunters base 2016-12-06 19:28:23 +00:00
Sam
142cf4dd93 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-17 19:41:47 +00:00
Shaun Bennett
c250796bdf Fix pom.xml formatting 2016-11-16 22:37:25 -05:00
AlexTheCoder
4fc2b875d4 Add a clans map generator to codebase 2016-11-16 22:37:25 -05:00
samczsun
e7b744f527 UHC rewrite 2016-10-28 17:56:08 -04:00
Shaun Bennett
62d08e74e3 Remove voting code 2016-10-12 22:54:14 -04:00
Keir Nellyer
b24429783b Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-09-22 16:28:16 +01:00
Shaun Bennett
9be26a92d1 Remove NCP 2016-09-21 22:21:49 -04:00
Keir Nellyer
acd63c90a1 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-09-05 14:26:06 +01:00
AlexTheCoder
8ca214a4d8 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game 2016-08-30 01:37:14 -04:00
Keir Nellyer
1854b71757 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-08-05 17:05:01 +01:00
AlexTheCoder
0ecdce4edc Add clans hub to maven 2016-07-25 10:58:32 -04:00
Keir Nellyer
dc566c8fb3 Remove redundant ReportServer entry from Maven POM 2016-07-07 17:59:55 -04:00
xGamingDudex
6d9e84b817 Merge branch 'develop' of
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
feature/mavericks-master-builders

Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/F.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/BuildData.java
2016-06-30 23:08:31 +02:00
xGamingDudex
d6afe986ea Update and mavericks-review-hub plugin [stand alone]
Added NBT Utils
Added Format util for color
Fixed bounding box calculations in UtilBlock
Improved getPlugin in UtilServer
Added BuildDataCylinder
Added Particle support for saving builds
Added Debug command to BuildMavericks
Changed some backend DB stuff for saving builds

Added mavericks-review-hub plugin:
*
2016-06-17 14:14:39 +02:00
Shaun Bennett
1377e6724f Merge with develop 2016-05-24 19:10:55 +10:00
Shaun Bennett
efb264dd75 Hook into Booster API 2016-05-20 16:58:58 +10:00
Keir Nellyer
a663cb3e01 Revert "Revert "Report system (version 1)""
This reverts commit d0d2de1e21.

# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-05-04 15:24:29 +01:00
Conrad
d0d2de1e21 Revert "Report system (version 1)" 2016-04-30 14:53:59 -04:00
Keir Nellyer
6a00f26d5f Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-29 23:42:27 +01:00
Shaun Bennett
4477a215f4 Update to Redis 2.8.1 and clean up repositories (#26) 2016-04-16 22:51:20 -05:00
Shaun Bennett
16dacbe3b3 Update to Redis 2.8.1 and clean up repositories 2016-04-17 12:58:44 +10:00
Keir Nellyer
390b2878dc Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-07 14:28:30 +01:00
git
0284fed2a9 Update patch 2016-02-28 13:12:59 +13:00
Keir Nellyer
99150db2d7 Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
2016-02-22 19:02:54 +00:00
md_5
81f9ca0bc2 Fix mysql 2016-02-19 20:10:01 +11:00
md_5
d575266522 Fix sentry 2016-02-19 19:44:36 +11:00
md_5
f7b8dada6d Add Sentry to BungeeCord too. 2016-02-07 21:40:51 +11:00
Keir Nellyer
eb329ec845 Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 2016-02-01 22:38:51 +00:00
md_5
e887bbf543 Pooling with later jedis versions doesn't work on Bungee. 2016-02-01 18:13:50 +11:00
Keir Nellyer
b547ad5f89 Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 2016-01-31 23:38:58 +00:00
md_5
cc1ecbe0b8 Add Eclipse magic. 2016-02-01 10:24:49 +11:00
Keir Nellyer
9601eabfeb Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-01-31 17:38:08 +00:00
md_5
478b92db44 Add example maven settings.xml 2016-01-31 09:44:46 +11:00
Keir Nellyer
3fc11e5c8a For some reason this didn't get committed with the previous stuff. 2016-01-27 21:54:34 +00:00
Shaun Bennett
0a5791a92f Go back to compile scope, need to talk to md_5 about this 2016-01-20 13:13:20 -05:00
Shaun Bennett
037a2f8353 Change craftbukkit to provided scope, add ascii.png to Hub and Arcade, new /bversion command 2016-01-20 13:04:31 -05:00
Shaun Bennett
8977735baf Include a version.properties in maven build 2016-01-20 11:57:21 -05:00
md_5
bb4091c7a6 Use Maven for Compilation 2016-01-20 11:20:58 +11:00