diff --git a/MultiArena-TheBridge/.classpath b/MultiArena-TheBridge/.classpath index c433ce8..b5b3d9a 100644 --- a/MultiArena-TheBridge/.classpath +++ b/MultiArena-TheBridge/.classpath @@ -1,7 +1,16 @@ - - + + + + + + + + + + + @@ -13,5 +22,10 @@ - + + + + + + diff --git a/MultiArena-TheBridge/.gitignore b/MultiArena-TheBridge/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/MultiArena-TheBridge/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/MultiArena-TheBridge/.project b/MultiArena-TheBridge/.project index a6fe83b..dca9020 100644 --- a/MultiArena-TheBridge/.project +++ b/MultiArena-TheBridge/.project @@ -10,8 +10,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature diff --git a/MultiArena-TheBridge/.settings/org.eclipse.core.resources.prefs b/MultiArena-TheBridge/.settings/org.eclipse.core.resources.prefs index c1dd79e..38b05f5 100644 --- a/MultiArena-TheBridge/.settings/org.eclipse.core.resources.prefs +++ b/MultiArena-TheBridge/.settings/org.eclipse.core.resources.prefs @@ -8,3 +8,5 @@ encoding//src/cx/sfy/TheBridge/packets/PacketMain.java=UTF-8 encoding//src/cx/sfy/TheBridge/packets/Reflection.java=UTF-8 encoding//src/cx/sfy/TheBridge/team/TeamFour.java=UTF-8 encoding//src/cx/sfy/TheBridge/utils/ScoreboardUtil.java=UTF-8 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/MultiArena-TheBridge/.settings/org.eclipse.jdt.core.prefs b/MultiArena-TheBridge/.settings/org.eclipse.jdt.core.prefs index 5caa538..2d1de9d 100644 --- a/MultiArena-TheBridge/.settings/org.eclipse.jdt.core.prefs +++ b/MultiArena-TheBridge/.settings/org.eclipse.jdt.core.prefs @@ -9,5 +9,6 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/MultiArena-TheBridge/.settings/org.eclipse.m2e.core.prefs b/MultiArena-TheBridge/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..14b697b --- /dev/null +++ b/MultiArena-TheBridge/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/MultiArena-TheBridge/config.yml b/MultiArena-TheBridge/config.yml index b7c2e83..5ea14a0 100644 --- a/MultiArena-TheBridge/config.yml +++ b/MultiArena-TheBridge/config.yml @@ -1,136 +1,163 @@ -mainLobby: null -server: ServerName -update: true -cages: false -permFormat: pex user add -defaultCage: "default" -chat: - enabled: true - lobby: "&b[TheBridge] &e: &7" - ingame: "[] : &7" - global: "&6[GLOBAL] : &7" -commands: - whitelist: true - list: - - /myCommand -archievements: - disable: false -remove: - absorption: false - regeneration: false -bow: - seconds: 3 -shop: - size: 27 - glass: - slot: 4 - icon: STAINED_GLASS - data: 0 - amount: 1 - close: - slot: 22 - icon: BARRIER - data: 0 - amount: 1 -coins: - normal: - kill: 2 - win: 50 - goals: 0 - four: - kill: 2 - win: 50 - goals: 0 -xp: - normal: - kill: 1 - win: 10 - goals: 0 - four: - kill: 1 - win: 10 - goals: 0 -items: - shop: - enabled: false - material: DIAMOND - data: 0 - amount: 1 - slot: 3 - nameItem: "&aThe Bridge | Shop" - loreItem: |- - &7Click to open - &7shop of the bridge. - hotbar: - enabled: false - material: CHEST - data: 0 - amount: 1 - slot: 5 - nameItem: "&aHotbar Editor" - loreItem: |- - &7Click to open - &7hotbar editor. - menu: - enabled: false - material: BOOK - data: 0 - amount: 1 - slot: 4 - nameItem: "&aGame Selector" - loreItem: |- - &7Click to open - &7menu of select games. - random: - enabled: false - material: FEATHER - data: 0 - amount: 1 - slot: 8 - nameItem: "&eRandom Join" - loreItem: |- - &7Click to random - &7join a game. -names: - red: "Red" - blue: "Blue" - yellow: "Yellow" - green: "Green" -signs: - waiting: 5 - starting: 4 - pregame: 6 - ingame: 14 - finish: 11 - restart: 15 -MySQL: - enabled: false - username: Insider - password: spigot - database: Martu - host: 127.0.0.1 - port: 3306 -stats: null -tops: - normal: - kills: null - wins: null - goals: null - four: - kills: null - wins: null - goals: null -title: - prestart: - fadein: 0 - stayin: 21 - fadeout: 0 - start: - fadein: 0 - stayin: 21 - fadeout: 0 - restart: - fadein: 0 - stayin: 21 - fadeout: 0 +mainLobby: null +server: ServerName +update: true +cages: false +permFormat: pex user add +defaultCage: default +defaultArrow: default +chat: + enabled: true + lobby: '&b[TheBridge] &e: &7' + ingame: '[] : &7' + global: '&6[GLOBAL] : &7' +commands: + whitelist: true + list: + - /myCommand +archievements: + disable: false +remove: + absorption: false + regeneration: false +bow: + seconds: 3 +shop: + size: 27 + glass: + slot: 3 + icon: STAINED_GLASS + data: 0 + amount: 1 + arrow: + slot: 5 + icon: ARROW + data: 0 + amount: 1 + close: + slot: 22 + icon: BARRIER + data: 0 + amount: 1 +coins: + normal: + kill: 2 + win: 50 + goals: 0 + four: + kill: 2 + win: 50 + goals: 0 +xp: + normal: + kill: 1 + win: 10 + goals: 0 + four: + kill: 1 + win: 10 + goals: 0 +items: + shop: + enabled: false + material: DIAMOND + data: 0 + amount: 1 + slot: 3 + nameItem: '&aThe Bridge | Shop' + loreItem: |- + &7Click to open + &7shop of the bridge. + hotbar: + enabled: false + material: CHEST + data: 0 + amount: 1 + slot: 5 + nameItem: '&aHotbar Editor' + loreItem: |- + &7Click to open + &7hotbar editor. + menu: + enabled: false + material: BOOK + data: 0 + amount: 1 + slot: 4 + nameItem: '&aGame Selector' + loreItem: |- + &7Click to open + &7menu of select games. + random: + enabled: false + material: FEATHER + data: 0 + amount: 1 + slot: 0 + nameItem: '&eRandom Join' + loreItem: |- + &7Click to random + &7join a game. + lobby: + enabled: false + material: REDSTONE + data: 0 + amount: 1 + slot: 8 + server: lobby + nameItem: '&eReturn to Lobby' + loreItem: |- + &7Click to return + &7to lobby. + archievements: + enabled: false + material: NOTEBLOCK + data: 0 + amount: 1 + slot: 7 + nameItem: '&eArchievements Menu' + loreItem: |- + &7Click to return + &7open archevements menu. +names: + red: Red + blue: Blue + yellow: Yellow + green: Green +signs: + waiting: 5 + starting: 4 + pregame: 6 + ingame: 14 + finish: 11 + restart: 15 +MySQL: + enabled: false + username: Insider + password: spigot + database: Martu + host: 127.0.0.1 + port: 3306 +stats: null +tops: + normal: + kills: null + wins: null + goals: null + four: + kills: null + wins: null + goals: null +title: + prestart: + fadein: 0 + stayin: 21 + fadeout: 0 + start: + fadein: 0 + stayin: 21 + fadeout: 0 + restart: + fadein: 0 + stayin: 21 + fadeout: 0 kit: null \ No newline at end of file diff --git a/MultiArena-TheBridge/lang.yml b/MultiArena-TheBridge/lang.yml index 93e6fa1..35bc437 100644 --- a/MultiArena-TheBridge/lang.yml +++ b/MultiArena-TheBridge/lang.yml @@ -1,396 +1,404 @@ -prefix: "&6&lTheBridge &7:" -error: "&c&lERROR!" -signs: - normal: - line-1: "&lTheBridge Normal" - line-2: - line-3: "Map: " - line-4: "&7/" - four: - line-1: "&lTheBridge Four" - line-2: - line-3: "Map: " - line-4: "&7/" -states: - waiting: "&aWaiting..." - starting: "&eStarting" - pregame: "&cPre-Game" - ingame: "&4In-Game" - finish: "&9Finishing" - restarting: "&5Restarting" -shop: - title: "&aThe Bridge | Shop" - glass: - nameItem: "&aCage Shop" - loreItem: |- - &7Click to open - &7the cage Shop. - close: - nameItem: "&cClose" - loreItem: |- - &7Click to close - &7this shop -holograms: - your: "Your" - portal: - you: - - "&l Goal" - - "&7Defend!" - enemy: - - "&l Goal" - - "&eJump in to score!" -tops: - normal: - kills: - - "&b&lTop TheBridge Kills" - - "&aNormal mode" - - - wins: - - "&b&lTop TheBridge Winners" - - "&aNormal mode" - - - goals: - - "&b&lTop TheBridge Goal scorers" - - "&aNormal mode" - - - four: - kills: - - "&b&lTop TheBridge Kills" - - "&aFour mode" - - - wins: - - "&b&lTop TheBridge Winners" - - "&aFour mode" - - - goals: - - "&b&lTop TheBridge Goal scorers" - - "&aFour mode" - - -stats: -- "&a%player_name% &6&lThe Bridge &astatistics" -- "&aNormal Kills: &6%bridges_normal_kills%" -- "&aNormal Wins: &6%bridges_normal_wins%" -- "&aNormal Goals: &6%bridges_normal_goals%" -- "&aFour Kills: &6%bridges_four_kills%" -- "&aFour Wins: &6%bridges_four_wins%" -- "&aFour Goals: &6%bridges_four_goals%" -- "&aBlocks Placed: &6%bridges_blocks_placed%" -- "&aBlocks Broken: &6%bridges_blocks_broken%" -- "&aCoins: &6%bridges_coins%" -- "&aXP: &6%bridges_xp%" -deathMessages: - void: &7was thrown into the void - damage: &7was killed - custom: &7was death - player: "&7 by &7." - none: . -messages: - noPermission: "&cYou dont have permissions to run this command." - noBreak: "&cYou can only break blocks allowed blocks." - noPlace: "&cYou are not allowed to build here." - starting: "&eThe game starts in &b