diff --git a/.gitignore b/.gitignore index 262b09d..300efd3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.env.production world/ world_nether/ world_the_end/ @@ -7,6 +8,7 @@ ops.json banned-players.json banned-ips.json .console_history +server.properties PUSH-TO-PRODUCTION.sh PUSH-TO-DEVELOPMENT.sh PUSH-TO-PRODUCTION.bat diff --git a/plugins/BoostedAudio/config.yml b/plugins/BoostedAudio/config.yml deleted file mode 100644 index 74adad8..0000000 --- a/plugins/BoostedAudio/config.yml +++ /dev/null @@ -1,165 +0,0 @@ -# /$$$$$$$ /$$ /$$ /$$$$$$ /$$ /$$ /$$$$$$ /$$$$$$ -# | $$__ $$ | $$ | $$ /$$__ $$ | $$|__/ /$$__ $$ /$$$_ $$ -# | $$ \ $$ /$$$$$$ /$$$$$$ /$$$$$$$ /$$$$$$ /$$$$$$ /$$$$$$$| $$ \ $$ /$$ /$$ /$$$$$$$ /$$ /$$$$$$ |__/ \ $$ | $$$$\ $$ -# | $$$$$$$ /$$__ $$ /$$__ $$ /$$_____/|_ $$_/ /$$__ $$ /$$__ $$| $$$$$$$$| $$ | $$ /$$__ $$| $$ /$$__ $$ /$$$$$$/ | $$ $$ $$ -# | $$__ $$| $$ \ $$| $$ \ $$| $$$$$$ | $$ | $$$$$$$$| $$ | $$| $$__ $$| $$ | $$| $$ | $$| $$| $$ \ $$ /$$____/ | $$\ $$$$ -# | $$ \ $$| $$ | $$| $$ | $$ \____ $$ | $$ /$$| $$_____/| $$ | $$| $$ | $$| $$ | $$| $$ | $$| $$| $$ | $$ | $$ | $$ \ $$$ -# | $$$$$$$/| $$$$$$/| $$$$$$/ /$$$$$$$/ | $$$$/| $$$$$$$| $$$$$$$| $$ | $$| $$$$$$/| $$$$$$$| $$| $$$$$$/ | $$$$$$$$ /$$| $$$$$$/ -# |_______/ \______/ \______/ |_______/ \___/ \_______/ \_______/|__/ |__/ \______/ \_______/|__/ \______/ |________/|__/ \______/ -# -# BoostedAudio 2.0 - ProximityVoiceChat and Music | Made by SuperMax_8 -# Wiki: https://supermax-8.gitbook.io/boostedaudio/ - -# Show debug messages, websocket connections and others, useful if you want to come on the discord for support -debugMode: false - -# Update notifications and others -notification: true - -# Set the working mode of the plugin -# - Diffuser: This will make the server diffuse to the mainProxyWebsocketLink -# - Host: Make this server the main server (default mode for spigot) -# Example the multiserv/multiproxy setup you can do this: -# - Proxy1: MainHost host mode -# - Proxy2: Diffuser mode -# - Spigot1,2,3,4: Diffuser mode -diffuser: true -# Use the same param as the clientWebSocketLink in the main proxy config -mainProxyWebsocketLink: wss://185.229.220.128:24991 -# If this is the spigot config: let it empty and a secret will be generated, put it in the bungee config same place -# If this a proxy config: put the secrets of the spigot servers here -# You can also manually define the secret here (Use unique strong secret) -secrets: -- D4wiFs0bnOYlCVF8tF9YYw -# The name of the server used on the proxy (only for diffuser servers) -# Diffuser Spigot: It's the name you see when you do /server -# Diffuser Proxy: Use a random name -proxyServerName: lobby - -# Web client -client-link: http://185.229.220.128:24990 -# The self-host web server, useful to host the audio panel and audio files -autoHost: false -autoHostPort: 8080 - -# Web Socket -clientWebSocketLink: wss://localhost:8081 -webSocket: - webSocketPort: 8081 - webSocketHostName: 0.0.0.0 - -# SSL, ssl will be used for WebClient if enabled, and WebSocket -# Even ssl option is false the socket & autohost will still be https and wss with a self-signed certificate -# You can use a .jks file OR use 2 pem files named cert.pem and key.pem -ssl: - ssl: false - keystorePassword: YOUR_PASSWORD - keystoreFileName: keystore.jks - -# Stun & Turn servers -# These servers are used for webrtc (the proximity chat technology) -# By default, the plugin uses free ones -# If you have a lot of players or problems with inconsistent proximity chat connections, -# using turn made for your server can resolve proximity chat connections problems -# https://github.com/coturn/coturn Free open src project to host yourself a stun/turn server -# https://www.metered.ca/tools/openrelay/ They have a free plan with 50GB for stun/turn servers -# If useCustomIce is false it will use default iceServers, set this param to true to provide custom ice -useCustomIce: false -iceServers: -- '{urls: ''stun:stun2.l.google.com:19302''},' -- '{urls: ''turn:freeturn.net:3479'', username: ''free'', credential: ''free''}' - -#VoiceChat -voicechat: - # If the system is enabled - voicechat: true - - # The maximum distance at which players can be heard - maxVoiceDistance: 30 - - # The calculation model for the distance volume attenuation - # linear, inverse, exponential - distanceModel: exponential - - # This property defines the distance from which the sound begins to attenuate - refDistance: 4 - - # This property controls how quickly the sound attenuates as distance increases - rolloffFactor: 1 - -# Send the connection message when the player connects -sendOnConnect: true -# Delay of the connection message in tick when the player connects -sendOnConnectDelay: 30 - -# Send a packet map in the second hand -sendQRcodeOnConnect: true - -# The file format of the audio -# wav, m4a, webm, ogg, mp3, flac -# Using, for example, mp3 can reduce the file size and the time to download -# Using flac or wav can up the audio quality and size -audioDownloaderFormat: wav - -# Messages -# If you want to add the generated url in the message, for example, geyser compatibility you can add the placeholder {link} in the message -# connectionMessage: "§6Join the audio client by clicking here! Link: {link}" -# You can use a simple String or a list of strings here for lines -connectionMessage: -- §6Join the audio client by clicking here! -connectionHoverMessage: Click here - -# QRcode map item name -qrCodeTitle: §6Scan me to connect to the audio - -# BoostedAudio placeholders from PlaceHolderAPI config -connectedSymbol: §f🔊 -mutedSymbol: §c🔇 -notconnectedSymbol: '' - -# Don't use if you are not sure -# If this is true, it means that the plugin will no longer auto params the client (modify the index.html in webhost directory) -# this property allows you to fully customize the client by modifying the code of the client -customClient: false - -# WORKS ONLY WITH THE PREMIUM VERSION -# Custom placeholder in the client html, if you custom the client you even can add new placeholder if you need it, -# inside placeholder you can use html directly (if the placeholder target is not a tag parameter) -# if you want more customization with like images or things - -# Others skin api -# https://cravatar.eu/avatar/ -# https://crafatar.com/ -# https://crafthead.net/ -# You can use the variables uuid or username, for the player name or uuid -clientConfig: -- '{skinAPI}="https://cravatar.eu/avatar/" + username' -- '{mainColor}=#262c3c' -- '{primaryColor}=#202433' -- '{secondaryColor}=#205295' -- '{accentColor}=#4797de' -- '{bg-img}=https://i.imgur.com/6MelMqC.jpg' -- '{bg-opacity}=80' -- '{title}=BoostedAudio' -- '{page-title}=BoostedAudio Client' -- '{ambient-volume}=Ambient Volume' -- '{voice-volume}=Voice Volume' -- '{click-to-connect}=Click on the page to connect' -- '{userList}=User List' -- '{you-are-mute}=You have been muted by the server' -- '{search-placeholder}=Search...' -- '{user-count-label}=Players you can hear:' -- '{settings-title}=Settings' -- '{settings-label}=Parameters of the audio client' -- '{settings-microphone-device-label}=Microphone Device' -- '{settings-micThreshold-label}=Microphone sensitivity' -- '{settings-micThreshold-description}=Sensivity of the microphone in dB, the noise bellow this dB amount will be cancel, the bar moving represent your current mic volume' -- '{settings-noiseSuppression-label}=Noise Suppression' -- '{settings-noiseSuppression-description}=Removes noise from your microphone audio' -- '{settings-echoCancellation-label}=Echo Cancellation' -- '{settings-echoCancellation-description}=Removes echo from your microphone audio' -- '{settings-close-button-label}=Close Settings' - - -# NEVER CHANGE THIS VALUE -config-version: 1 diff --git a/plugins/BoostedAudio/default.jks b/plugins/BoostedAudio/default.jks deleted file mode 100644 index 3f4e9dd..0000000 Binary files a/plugins/BoostedAudio/default.jks and /dev/null differ diff --git a/plugins/BoostedAudio/language.yml b/plugins/BoostedAudio/language.yml deleted file mode 100644 index a8ac9f3..0000000 --- a/plugins/BoostedAudio/language.yml +++ /dev/null @@ -1,109 +0,0 @@ -# Language file for BoostedAudio - -# You can rename the file like you want if there is the word lang in the name it will be loaded as lang file -# If you have translated the file in another language and want to make it public, you can message me on the support discord - -audio: §6§lAudio -audio_desc: §7Show the audio files of the selfHost webserver -speakers: §6§lSpeakers -speaker_desc: §7Edit the speakers -regions: §6§lRegions -region_desc: §7Edit the audio played when a player enters a worldguard region -worldguard_error: §c§lYou need to install WorldGuard to use this feature -hologram_error: §c§lYou need to install a hologram plugin to use this feature, I recommend DecentHolograms - -leftclick_to_open_in_the_world_you_are: §e§lLeftClick to open directly in the world you are -rightclick_to_open_the_world_selection: §9§lRightClick to open the world selection -directory: §lDirectory -previous: §lPrevious -previous_desc: §7Click to show back -next: §lNext -next_desc: §7Click to show next - -file_in_dir: '§8File in directory: {0}' -click_to_open: §7Click to open - -download_start: §7Download starting... -download_end: '§2Download end ! Link (Click to copy the link): §7{0}' - -enter_folder_name: §7Enter a folder name -enter_sound: §7Enter a sound link -enter_playlist_name: §7Enter a playlist name -playlist_list: §6§lPlaylist List -playlist_desc: §7Create playlist, a group of multiple audio links -playlist_edit: §6§lPlaylist Edit -add_sound: §7Add a sound -add_playlist: §7Add a playlist -add_folder: §7Add a folder - -show_all: §2Now showing all speakers -no_longer_show_all: §8No longer showing all speakers - -path: '§7Path: {0}' -left_click_copy: §7Left click to copy path -right_click_volume: §9Right click to modify audio file gain (volume) -shift_click_delete: §cShift right click to delete file -harmonized_message: §aAudio file {0} Harmonized at {1} dB ! -ffmpeg_message: §cYou need to have ffmpeg in libs, check the wiki -wrong_values: §cWrong values ! -enter_chat_gain_adjustment: '§7Enter in the chat the gain adjustment, §6WARNING: Modifying gain can decrease audio quality if you do it to many times, I recommend having a save of your audios file in local' -left_click_edit: §7LeftClick to edit -shift_right_to_remove: §c§lShift RightClick to remove -confirm_edition: §2Confirm edition -click_copy_clipboard: §7Click to copy to clipboard - -choose_world_title: §lChoose World - -regions_title: §lRegions of world {0} -add_region: §2§lAdd region audio -add_region_desc: §7Add a new speaker at your location - -enter_region: §7Enter a valid worldguard region in chat -enter_links_or_playlist: §7Enter a valid link or links in chat, separate multiple links with ; OR enter a playlist name -links_copy_chat: §6Click here to copy paste in the chat the current links config -enter_maxVoiceDistance: §7Enter a max distance -enter_distanceModel: §7Enter a distance model -enter_RefDistance: §7Enter the refDistance -enter_RefFactor: §7Enter the refFactor - -speakers_title: §lSpeakers of world {0} -add_speaker: §2§lAdd speaker -add_speaker_desc: §7Add a new speaker at your location - - -link_or_playlist: '§7Links Or Playlist: §f{0}' -region: '§7Region: §f{0}' -fadein: '§7Fade in: §f{0}ms' -fadeout: '§7Fade out: §f{0}ms' -loop: '§7Loop: §f{0}' -location: '§7Location: §f{0}' -maxdistance: '§7Max distance: §f{0}' -distancemodel: '§7Distance model: §f{0}' -refdistance: '§7Ref distance: §f{0}' -rollofffactor: '§7Rolloff factor: §f{0}' -synchronous: '§7Synchronous: §f{0}' - -users_on_server: '§7Users on server:' -player_already_muted: §cPlayer is already muted -player_now_muted: §7Player §f§l{0} §7is now muted ! -player_already_unmuted: §cPlayer is already unmuted -player_now_unmuted: §7Player §f§l{0} §7is now unmuted ! - -youreNowMuted: §cYou have muted yourself -youreNowUnMuted: §7You have unmuted yourself - -command_help: §7Show this help -command_open_edition: Open edition GUI -command_showall: §7Show all speakers with holograms, left-click on a holo to edit the speaker -command_userlist: List the players connected to the audio panel on the server, the players in red are muted -command_mute: - §8Mute a player in proximity chat -command_unmute: - §8UnMute a player in proximity chat -command_download: - §8Download a song from youtube/soundcloud on the webhost of the main server -command_play1: §8- Play a sound for a player if he's connected -command_play2: §8- Play a sound for all players on the server -command_playradius1: §8- Play a sound for a players if connected in radius at your location/location of the command block -command_playradius2: §8- Play a sound for players if connected in radius at a location -command_stop1: §8- Stop a sound for a player if he's connected -command_stop2: §8- Stop a sound for all players on the server -command_stopradius1: §8- Stop a sound for a player if connected in radius at your location/location of the command block -command_stopradius2: §8- Stop a sound for players if connected in radius at a location diff --git a/plugins/BoostedAudio/libs/BA-dependencies.jar b/plugins/BoostedAudio/libs/BA-dependencies.jar deleted file mode 100644 index 32e3121..0000000 Binary files a/plugins/BoostedAudio/libs/BA-dependencies.jar and /dev/null differ diff --git a/plugins/BoostedAudio/libs/Java-WebSocket-1.4.1.jar b/plugins/BoostedAudio/libs/Java-WebSocket-1.4.1.jar deleted file mode 100644 index ee47ca8..0000000 Binary files a/plugins/BoostedAudio/libs/Java-WebSocket-1.4.1.jar and /dev/null differ diff --git a/plugins/BoostedAudio/libs/commons-lang3-3.13.0.jar b/plugins/BoostedAudio/libs/commons-lang3-3.13.0.jar deleted file mode 100644 index 891540f..0000000 Binary files a/plugins/BoostedAudio/libs/commons-lang3-3.13.0.jar and /dev/null differ diff --git a/plugins/BoostedAudio/libs/core-3.5.2.jar b/plugins/BoostedAudio/libs/core-3.5.2.jar deleted file mode 100644 index 714bda4..0000000 Binary files a/plugins/BoostedAudio/libs/core-3.5.2.jar and /dev/null differ diff --git a/plugins/BoostedAudio/libs/ffmpeg-0.7.0.jar b/plugins/BoostedAudio/libs/ffmpeg-0.7.0.jar deleted file mode 100644 index 67d03b6..0000000 Binary files a/plugins/BoostedAudio/libs/ffmpeg-0.7.0.jar and /dev/null differ diff --git a/plugins/BoostedAudio/libs/gson-2.10.1.jar b/plugins/BoostedAudio/libs/gson-2.10.1.jar deleted file mode 100644 index a88c5bd..0000000 Binary files a/plugins/BoostedAudio/libs/gson-2.10.1.jar and /dev/null differ diff --git a/plugins/BoostedAudio/libs/javase-3.5.2.jar b/plugins/BoostedAudio/libs/javase-3.5.2.jar deleted file mode 100644 index 50d6d63..0000000 Binary files a/plugins/BoostedAudio/libs/javase-3.5.2.jar and /dev/null differ diff --git a/plugins/BoostedAudio/webhost/index.html b/plugins/BoostedAudio/webhost/index.html deleted file mode 100644 index 4bbf2ce..0000000 --- a/plugins/BoostedAudio/webhost/index.html +++ /dev/null @@ -1,1511 +0,0 @@ - - - - - - - BoostedAudio Client - - - - - - - -
- -
-
-

Click on the page to connect

-
-
- - - - -
-
- -
-

BoostedAudio

-
- -
- - -
- -
- - -
- -
- - - - - - - - - - - - - - - -
- - - -
- - - - -
-
- -

User List

- -
- -
- -
-
- - - -
-

Players you can hear:

-

0

-
- - - - - -
-
- -
-

- -
- - - - - - - - - - - - - - -
- -
-
- -
- -

Powered - by BoostedAudio

-
-
-
-
- - - - - - diff --git a/plugins/BoostedAudio[FREE]-2.16.19.jar b/plugins/BoostedAudio[FREE]-2.16.19.jar deleted file mode 100644 index 793cbfa..0000000 Binary files a/plugins/BoostedAudio[FREE]-2.16.19.jar and /dev/null differ diff --git a/server.properties b/server.template.properties similarity index 98% rename from server.properties rename to server.template.properties index a629025..39ecf69 100644 --- a/server.properties +++ b/server.template.properties @@ -52,7 +52,7 @@ resource-pack-prompt= resource-pack-sha1= server-ip=0.0.0.0 server-name=Unknown Server -server-port=25011 +server-port=${SERVER_PORT} simulation-distance=10 spawn-animals=false spawn-monsters=false