1
0

Hub is now working...partially im lazy to add hub games and "secret areas" those will be added soon, also premade hub world!

This commit is contained in:
labalityowo
2023-05-21 19:00:25 +07:00
parent 10c0c0ef6f
commit 1b907cb3b4
18 changed files with 163 additions and 9 deletions

View File

@ -80,7 +80,8 @@ public class TreasureManager extends MiniPlugin
addTreasureType(new IlluminatedTreasure()); addTreasureType(new IlluminatedTreasure());
addTreasureType(new OmegaTreasure()); addTreasureType(new OmegaTreasure());
addTreasureType(new MinestrikeTreasure()); addTreasureType(new MinestrikeTreasure());
addTreasureType(new MOBATreasure()); //TODO: MOBA
//addTreasureType(new MOBATreasure());
addTreasureType(new GingerbreadTreasure()); addTreasureType(new GingerbreadTreasure());
addTreasureType(new TrickOrTreatTreasure2017()); addTreasureType(new TrickOrTreatTreasure2017());
addTreasureType(new TrickOrTreatTreasure2016()); addTreasureType(new TrickOrTreatTreasure2016());

View File

@ -82,7 +82,7 @@ public class GingerbreadTreasure extends Treasure
addPetReward(PetType.GINGERBREAD_MAN, rarity, 20); addPetReward(PetType.GINGERBREAD_MAN, rarity, 20);
// Win Effect // Win Effect
addGadgetReward(getGadget(WinEffectWinterWarfare.class), rarity, 25); //addGadgetReward(getGadget(WinEffectWinterWarfare.class), rarity, 25);
// Taunts // Taunts
addGadgetReward(getGadget(FrostBreathTaunt.class), rarity, 20); addGadgetReward(getGadget(FrostBreathTaunt.class), rarity, 20);

View File

@ -159,7 +159,9 @@ public class Hub extends JavaPlugin implements IRelation
new MessageManager(this, incognito, clientManager, preferenceManager, ignoreManager, punish, friendManager, require(Chat.class)); new MessageManager(this, incognito, clientManager, preferenceManager, ignoreManager, punish, friendManager, require(Chat.class));
new MemoryFix(this); new MemoryFix(this);
new FileUpdater(GenericServer.HUB);
//new FileUpdater(GenericServer.HUB);
new CustomTagFix(this, packetHandler); new CustomTagFix(this, packetHandler);
new PacketsInteractionFix(this, packetHandler); new PacketsInteractionFix(this, packetHandler);
new ResourcePackManager(this, portal); new ResourcePackManager(this, portal);

View File

@ -245,7 +245,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
require(HubPlayerManager.class); require(HubPlayerManager.class);
require(AdminPunch.class); require(AdminPunch.class);
require(StaffBuild.class); require(StaffBuild.class);
require(SecretAreas.class); // require(SecretAreas.class);
// require(TreasureHuntManager.class); // require(TreasureHuntManager.class);
new GameRejoinManager(this) new GameRejoinManager(this)

View File

@ -52,7 +52,8 @@ public class HubPlugin extends MiniPlugin
_npcManager = require(NewNPCManager.class); _npcManager = require(NewNPCManager.class);
setupWorld(); setupWorld();
addHubGames(); //TODO: WorldConfig :D
//addHubGames();
} }
protected void setupWorld() protected void setupWorld()

View File

@ -159,6 +159,7 @@ public class ServerManager extends MiniPlugin
_playersPlaying = new HashMap<>(); _playersPlaying = new HashMap<>();
_serverNPCTeleport = HashBiMap.create(); _serverNPCTeleport = HashBiMap.create();
/*
_hubManager.getWorldData().getSpongeLocations().forEach((key, locations) -> _hubManager.getWorldData().getSpongeLocations().forEach((key, locations) ->
{ {
String[] split = key.split(" "); String[] split = key.split(" ");
@ -176,6 +177,7 @@ public class ServerManager extends MiniPlugin
_serverNPCTeleport.put(npcName, location); _serverNPCTeleport.put(npcName, location);
}); });
*/
DonationManager donationManager = require(DonationManager.class); DonationManager donationManager = require(DonationManager.class);

View File

@ -0,0 +1,3 @@
AMPLIFIERS:
ip: 127.0.0.1
port: 1000

View File

@ -0,0 +1,2 @@
ACCOUNT localhost root root
PLAYER_STATS localhost root root

View File

@ -0,0 +1,8 @@
webServer: http://127.0.0.1:1000/
serverstatus:
name: Lobby-1
us: true
group: Lobby
connectionurl: 127.0.0.1:3306
username: root
password: root

View File

@ -0,0 +1,4 @@
127.0.0.1 6379 MASTER DefaultConnection
127.0.0.1 6379 SLAVE DefaultConnection
127.0.0.1 6379 MASTER ServerStatus
127.0.0.1 6379 SLAVE ServerStatus

View File

@ -0,0 +1,25 @@
MAP_NAME:Lobby
MAP_AUTHOR:Mineplex
MIN_X:-256
MAX_X:256
MIN_Z:-256
MAX_Z:256
MIN_Y:0
MAX_Y:256
CUSTOM_NAME:MISSIONS
CUSTOM_LOCS:11,72,-19:
CUSTOM_NAME:TREASURE CHEST
CUSTOM_LOCS:-20,73,-6:-20,73,6:20,73,-6:20,73,6:
CUSTOM_NAME:LOOK_AT
CUSTOM_LOCS:0,74,1:
CUSTOM_NAME:CARL
CUSTOM_LOCS:16,72,16:
CUSTOM_NAME:SPAWN
CUSTOM_LOCS:0,74,0:

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -3,7 +3,7 @@
-- https://www.phpmyadmin.net/ -- https://www.phpmyadmin.net/
-- --
-- Host: 127.0.0.1 -- Host: 127.0.0.1
-- Generation Time: May 20, 2023 at 05:51 PM -- Generation Time: May 21, 2023 at 09:35 AM
-- Server version: 10.4.22-MariaDB -- Server version: 10.4.22-MariaDB
-- PHP Version: 7.4.27 -- PHP Version: 7.4.27
@ -242,6 +242,18 @@ CREATE TABLE `accounttasks` (
-- -------------------------------------------------------- -- --------------------------------------------------------
--
-- Table structure for table `accountteamspeak`
--
CREATE TABLE `accountteamspeak` (
`accountId` int(11) NOT NULL,
`teamspeakId` int(11) NOT NULL,
`linkDate` datetime NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- --------------------------------------------------------
-- --
-- Table structure for table `accountthanktransactions` -- Table structure for table `accountthanktransactions`
-- --
@ -302,6 +314,22 @@ CREATE TABLE `bonus` (
-- -------------------------------------------------------- -- --------------------------------------------------------
--
-- Table structure for table `botspam`
--
CREATE TABLE `botspam` (
`id` int(11) NOT NULL,
`text` varchar(200) NOT NULL,
`punishments` int(11) NOT NULL,
`enabled` tinyint(1) NOT NULL,
`createdBy` varchar(100) NOT NULL,
`enabledBy` varchar(100) NOT NULL,
`disabledBy` varchar(100) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- --------------------------------------------------------
-- --
-- Table structure for table `communities` -- Table structure for table `communities`
-- --
@ -407,6 +435,17 @@ CREATE TABLE `forumlink` (
-- -------------------------------------------------------- -- --------------------------------------------------------
--
-- Table structure for table `hubnews`
--
CREATE TABLE `hubnews` (
`newsId` int(11) NOT NULL,
`newsValue` text NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- --------------------------------------------------------
-- --
-- Table structure for table `incognitostaff` -- Table structure for table `incognitostaff`
-- --
@ -567,6 +606,18 @@ CREATE TABLE `preferences` (
-- -------------------------------------------------------- -- --------------------------------------------------------
--
-- Table structure for table `rankbenefits`
--
CREATE TABLE `rankbenefits` (
`id` int(11) NOT NULL,
`accountId` int(11) DEFAULT NULL,
`benefit` varchar(100) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- --------------------------------------------------------
-- --
-- Table structure for table `reporthandlers` -- Table structure for table `reporthandlers`
-- --
@ -728,12 +779,24 @@ ALTER TABLE `accounts`
ADD UNIQUE KEY `uuidIndex` (`uuid`), ADD UNIQUE KEY `uuidIndex` (`uuid`),
ADD UNIQUE KEY `nameIndex` (`name`); ADD UNIQUE KEY `nameIndex` (`name`);
--
-- Indexes for table `accountteamspeak`
--
ALTER TABLE `accountteamspeak`
ADD PRIMARY KEY (`accountId`);
-- --
-- Indexes for table `bonus` -- Indexes for table `bonus`
-- --
ALTER TABLE `bonus` ALTER TABLE `bonus`
ADD PRIMARY KEY (`accountId`); ADD PRIMARY KEY (`accountId`);
--
-- Indexes for table `botspam`
--
ALTER TABLE `botspam`
ADD PRIMARY KEY (`id`);
-- --
-- Indexes for table `communities` -- Indexes for table `communities`
-- --
@ -746,6 +809,12 @@ ALTER TABLE `communities`
ALTER TABLE `forumlink` ALTER TABLE `forumlink`
ADD PRIMARY KEY (`accountId`); ADD PRIMARY KEY (`accountId`);
--
-- Indexes for table `hubnews`
--
ALTER TABLE `hubnews`
ADD PRIMARY KEY (`newsId`);
-- --
-- Indexes for table `incognitostaff` -- Indexes for table `incognitostaff`
-- --
@ -765,6 +834,13 @@ ALTER TABLE `items`
ALTER TABLE `polls` ALTER TABLE `polls`
ADD PRIMARY KEY (`id`); ADD PRIMARY KEY (`id`);
--
-- Indexes for table `rankbenefits`
--
ALTER TABLE `rankbenefits`
ADD PRIMARY KEY (`id`),
ADD KEY `accountId` (`accountId`);
-- --
-- Indexes for table `reports` -- Indexes for table `reports`
-- --
@ -809,19 +885,25 @@ ALTER TABLE `accountpunishments`
-- AUTO_INCREMENT for table `accountranks` -- AUTO_INCREMENT for table `accountranks`
-- --
ALTER TABLE `accountranks` ALTER TABLE `accountranks`
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=3;
-- --
-- AUTO_INCREMENT for table `accounts` -- AUTO_INCREMENT for table `accounts`
-- --
ALTER TABLE `accounts` ALTER TABLE `accounts`
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=2;
-- --
-- AUTO_INCREMENT for table `bonus` -- AUTO_INCREMENT for table `bonus`
-- --
ALTER TABLE `bonus` ALTER TABLE `bonus`
MODIFY `accountId` int(11) NOT NULL AUTO_INCREMENT; MODIFY `accountId` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=2;
--
-- AUTO_INCREMENT for table `botspam`
--
ALTER TABLE `botspam`
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
-- --
-- AUTO_INCREMENT for table `communities` -- AUTO_INCREMENT for table `communities`
@ -829,6 +911,12 @@ ALTER TABLE `bonus`
ALTER TABLE `communities` ALTER TABLE `communities`
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
--
-- AUTO_INCREMENT for table `hubnews`
--
ALTER TABLE `hubnews`
MODIFY `newsId` int(11) NOT NULL AUTO_INCREMENT;
-- --
-- AUTO_INCREMENT for table `items` -- AUTO_INCREMENT for table `items`
-- --
@ -841,6 +929,12 @@ ALTER TABLE `items`
ALTER TABLE `polls` ALTER TABLE `polls`
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
--
-- AUTO_INCREMENT for table `rankbenefits`
--
ALTER TABLE `rankbenefits`
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
-- --
-- AUTO_INCREMENT for table `reports` -- AUTO_INCREMENT for table `reports`
-- --
@ -877,11 +971,23 @@ ALTER TABLE `accountpolls`
ADD CONSTRAINT `accountpolls_ibfk_1` FOREIGN KEY (`accountId`) REFERENCES `accounts` (`id`), ADD CONSTRAINT `accountpolls_ibfk_1` FOREIGN KEY (`accountId`) REFERENCES `accounts` (`id`),
ADD CONSTRAINT `accountpolls_ibfk_2` FOREIGN KEY (`pollId`) REFERENCES `polls` (`id`); ADD CONSTRAINT `accountpolls_ibfk_2` FOREIGN KEY (`pollId`) REFERENCES `polls` (`id`);
--
-- Constraints for table `accountteamspeak`
--
ALTER TABLE `accountteamspeak`
ADD CONSTRAINT `accountTeamspeak_accounts_null_fk` FOREIGN KEY (`accountId`) REFERENCES `accounts` (`id`);
-- --
-- Constraints for table `bonus` -- Constraints for table `bonus`
-- --
ALTER TABLE `bonus` ALTER TABLE `bonus`
ADD CONSTRAINT `bonus_ibfk_1` FOREIGN KEY (`accountId`) REFERENCES `accounts` (`id`); ADD CONSTRAINT `bonus_ibfk_1` FOREIGN KEY (`accountId`) REFERENCES `accounts` (`id`);
--
-- Constraints for table `rankbenefits`
--
ALTER TABLE `rankbenefits`
ADD CONSTRAINT `rankbenefits_ibfk_1` FOREIGN KEY (`accountId`) REFERENCES `accounts` (`id`);
COMMIT; COMMIT;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;