From 4c0e32d0f031384c36270f20afcf633f5243a4bd Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sat, 26 Jul 2025 15:25:39 +0300 Subject: [PATCH 1/8] make world trackable by git, upload lobby map --- .dockerignore | 10 ++++++---- .gitattributes | 1 + .gitignore | 8 +++++--- src/bukkit.yml | 2 +- src/server.properties | 4 ++-- src/world/datapacks/bukkit/pack.mcmeta | 6 ++++++ src/world/level.dat | Bin 0 -> 3055 bytes src/world/paper-world.yml | 6 ++++++ src/world/region/r.0.0.mca | 3 +++ src/world/session.lock | 1 + src/world/uid.dat | 1 + 11 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 src/world/datapacks/bukkit/pack.mcmeta create mode 100644 src/world/level.dat create mode 100644 src/world/paper-world.yml create mode 100644 src/world/region/r.0.0.mca create mode 100644 src/world/session.lock create mode 100644 src/world/uid.dat diff --git a/.dockerignore b/.dockerignore index 7c6c245..010a001 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,9 +4,11 @@ */versions */plugins/.paper-remapped -*/world -*/world_nether -*/world_the_end +src/world/advancements +src/world/stats +src/world/data +src/world/playerdata +src/world/level.dat_old */.console_history @@ -39,7 +41,7 @@ src/plugins/FancyNpcs/skins src/plugins/FancyNpcs/.data src/plugins/ImageFrame/data -src/plugins/ImageFrame/player +src/plugins/ImageFrame/players src/plugins/ImageFrame/upload src/map-color-cache.dat diff --git a/.gitattributes b/.gitattributes index 7c32d5f..be3418a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ *.jar filter=lfs diff=lfs merge=lfs -text +*.mca filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index 4523285..010a001 100644 --- a/.gitignore +++ b/.gitignore @@ -4,9 +4,11 @@ */versions */plugins/.paper-remapped -*/world -*/world_nether -*/world_the_end +src/world/advancements +src/world/stats +src/world/data +src/world/playerdata +src/world/level.dat_old */.console_history diff --git a/src/bukkit.yml b/src/bukkit.yml index 7693721..b2cf2b1 100644 --- a/src/bukkit.yml +++ b/src/bukkit.yml @@ -1,5 +1,5 @@ settings: - allow-end: true + allow-end: false warn-on-overload: true permissions-file: permissions.yml update-folder: update diff --git a/src/server.properties b/src/server.properties index 81b4188..153981c 100644 --- a/src/server.properties +++ b/src/server.properties @@ -1,8 +1,8 @@ #Minecraft server properties -#Sun Jun 01 21:52:42 EEST 2025 +#Sat Jul 26 14:26:48 EEST 2025 accepts-transfers=false allow-flight=false -allow-nether=true +allow-nether=false broadcast-console-to-ops=true broadcast-rcon-to-ops=true bug-report-link= diff --git a/src/world/datapacks/bukkit/pack.mcmeta b/src/world/datapacks/bukkit/pack.mcmeta new file mode 100644 index 0000000..ec1d06c --- /dev/null +++ b/src/world/datapacks/bukkit/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "Data pack for resources provided by Bukkit plugins", + "pack_format": 48 + } +} diff --git a/src/world/level.dat b/src/world/level.dat new file mode 100644 index 0000000000000000000000000000000000000000..84d0244adc1eaa361cf4f4bb93b8eaed07ebcc16 GIT binary patch literal 3055 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 literal 0 HcmV?d00001 diff --git a/src/world/paper-world.yml b/src/world/paper-world.yml new file mode 100644 index 0000000..dcfd90c --- /dev/null +++ b/src/world/paper-world.yml @@ -0,0 +1,6 @@ +# This is a world configuration file for Paper. +# This file may start empty but can be filled with settings to override ones in the config/paper-world-defaults.yml +# +# World: world (minecraft:overworld) + +_version: 31 diff --git a/src/world/region/r.0.0.mca b/src/world/region/r.0.0.mca new file mode 100644 index 0000000..45ba20c --- /dev/null +++ b/src/world/region/r.0.0.mca @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df564d9ffdf86a279fb318086cdb87402a1df27821489dc633f50b47066074ae +size 4243456 diff --git a/src/world/session.lock b/src/world/session.lock new file mode 100644 index 0000000..0d7e5f8 --- /dev/null +++ b/src/world/session.lock @@ -0,0 +1 @@ +☃ \ No newline at end of file diff --git a/src/world/uid.dat b/src/world/uid.dat new file mode 100644 index 0000000..5c054fc --- /dev/null +++ b/src/world/uid.dat @@ -0,0 +1 @@ +hDXOκxn7 \ No newline at end of file -- 2.45.2 From eb44538f7b289bb1c36fa9c4061ca489c58f2f44 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sat, 26 Jul 2025 17:00:39 +0300 Subject: [PATCH 2/8] create survival npc and holohrams with links make npc and hologram files trackable by git --- .dockerignore | 4 - .gitignore | 4 - src/plugins/FancyHolograms/holograms.yml | 89 +++++++++++++++ ...wbGFzdGljLXN0ZWF2ZS0yMjI5MjUxMS5wbmc=.json | 10 ++ src/plugins/FancyNpcs/npcs.yml | 108 ++++++++++++++++++ 5 files changed, 207 insertions(+), 8 deletions(-) create mode 100644 src/plugins/FancyHolograms/holograms.yml create mode 100644 src/plugins/FancyNpcs/.data/skins/aHR0cHM6Ly93d3cubWluZWNyYWZ0c2tpbnMuY29tL3VwbG9hZHMvc2tpbnMvMjAyNC8wMS8yOC9wbGFzdGljLXN0ZWF2ZS0yMjI5MjUxMS5wbmc=.json create mode 100644 src/plugins/FancyNpcs/npcs.yml diff --git a/.dockerignore b/.dockerignore index 010a001..b484ad8 100644 --- a/.dockerignore +++ b/.dockerignore @@ -32,13 +32,9 @@ src/plugins/CustomizablePlayerModels src/plugins/CarbonChat/users src/plugins/CarbonChat/libraries -src/plugins/FancyHolograms/holograms.yml src/plugins/FancyHolograms/logs -src/plugins/FancyNpcs/npcs.yml src/plugins/FancyNpcs/logs -src/plugins/FancyNpcs/skins -src/plugins/FancyNpcs/.data src/plugins/ImageFrame/data src/plugins/ImageFrame/players diff --git a/.gitignore b/.gitignore index 010a001..b484ad8 100644 --- a/.gitignore +++ b/.gitignore @@ -32,13 +32,9 @@ src/plugins/CustomizablePlayerModels src/plugins/CarbonChat/users src/plugins/CarbonChat/libraries -src/plugins/FancyHolograms/holograms.yml src/plugins/FancyHolograms/logs -src/plugins/FancyNpcs/npcs.yml src/plugins/FancyNpcs/logs -src/plugins/FancyNpcs/skins -src/plugins/FancyNpcs/.data src/plugins/ImageFrame/data src/plugins/ImageFrame/players diff --git a/src/plugins/FancyHolograms/holograms.yml b/src/plugins/FancyHolograms/holograms.yml new file mode 100644 index 0000000..4b9b115 --- /dev/null +++ b/src/plugins/FancyHolograms/holograms.yml @@ -0,0 +1,89 @@ +version: 2 # DO NOT CHANGE +holograms: + teleport_survival: + type: TEXT + location: + world: world + x: 255.5 + y: 3.057499885559082 + z: 262.5 + yaw: -180.0 + pitch: 0.0 + visibility_distance: -1 + visibility: ALL + persistent: true + scale_x: 1.0 + scale_y: 1.0 + scale_z: 1.0 + translation_x: 0.0 + translation_y: 0.0 + translation_z: 0.0 + shadow_radius: 0.0 + shadow_strength: 1.0 + text: + - Bebrashield SMP + - Ванильный полуприватный SMP сервер. + - Без приватов, гриферства и донатов. + - Для игры требуется привязка Discord. + - Кликните, чтобы войти. + text_shadow: false + see_through: false + text_alignment: center + update_text_interval: -1 + linkedNpc: teleport_survival + link_bebrashield_discord: + type: TEXT + location: + world: world + x: 261.5 + y: 2.25 + z: 261.5 + yaw: 135.0 + pitch: 0.0 + visibility_distance: 32 + visibility: ALL + persistent: true + scale_x: 1.0 + scale_y: 1.0 + scale_z: 1.0 + translation_x: 0.0 + translation_y: 0.0 + translation_z: 0.0 + shadow_radius: 0.0 + shadow_strength: 1.0 + billboard: fixed + text: + - discord.gg/xsyy7d8RfG + - Клик + text_shadow: false + see_through: false + text_alignment: center + update_text_interval: -1 + link_bebrashield_site: + type: TEXT + location: + world: world + x: 249.5 + y: 2.25 + z: 261.5 + yaw: -135.0 + pitch: 0.0 + visibility_distance: 32 + visibility: ALL + persistent: true + scale_x: 1.0 + scale_y: 1.0 + scale_z: 1.0 + translation_x: 0.0 + translation_y: 0.0 + translation_z: 0.0 + shadow_radius: 0.0 + shadow_strength: 1.0 + billboard: fixed + text: + - bebrashield.net + - Клик + text_shadow: false + see_through: false + text_alignment: center + update_text_interval: -1 diff --git a/src/plugins/FancyNpcs/.data/skins/aHR0cHM6Ly93d3cubWluZWNyYWZ0c2tpbnMuY29tL3VwbG9hZHMvc2tpbnMvMjAyNC8wMS8yOC9wbGFzdGljLXN0ZWF2ZS0yMjI5MjUxMS5wbmc=.json b/src/plugins/FancyNpcs/.data/skins/aHR0cHM6Ly93d3cubWluZWNyYWZ0c2tpbnMuY29tL3VwbG9hZHMvc2tpbnMvMjAyNC8wMS8yOC9wbGFzdGljLXN0ZWF2ZS0yMjI5MjUxMS5wbmc=.json new file mode 100644 index 0000000..e810784 --- /dev/null +++ b/src/plugins/FancyNpcs/.data/skins/aHR0cHM6Ly93d3cubWluZWNyYWZ0c2tpbnMuY29tL3VwbG9hZHMvc2tpbnMvMjAyNC8wMS8yOC9wbGFzdGljLXN0ZWF2ZS0yMjI5MjUxMS5wbmc=.json @@ -0,0 +1,10 @@ +{ + "skinData": { + "identifier": "https://www.minecraftskins.com/uploads/skins/2024/01/28/plastic-steave-22292511.png", + "variant": "AUTO", + "textureValue": "ewogICJ0aW1lc3RhbXAiIDogMTYxOTYwMzgwNDUzMSwKICAicHJvZmlsZUlkIiA6ICI5MWZlMTk2ODdjOTA0NjU2YWExZmMwNTk4NmRkM2ZlNyIsCiAgInByb2ZpbGVOYW1lIiA6ICJoaGphYnJpcyIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9lNjM1OWRhZTI2MWY3ZDE4NWM1ZjJlODY4NWI3NzMzOGYzNTA3NzA0NDI1OWY1NDVmYjRjNDdlZWJjYmU1ODEiCiAgICB9CiAgfQp9", + "textureSignature": "gGS8/1ncRjGJQQjR2gkIRZ0o8UZQfcDTB8syPdBw92+fb1Qr5HEpeprrqgsni4UDQaZabXiVZ3wwSk2KPjOXeQlQxrA+hffGNQPCFLokP/JNIG4cv3MhAycGiqdvXmDgPf1JmPhEe6yao6n20QrMuiDrXgCFRBebIczaCZ+4Ep2vihgpmjvn5CQev11ffKLdLX342a5Ke+Fzxmish8n9NSOm9nIzT6QQaZinqymPj55FlINm4bVd41b0L0En06TCPzMsD+rdrtpztb4l6wRF9Yk6ZVxZxZbrjeRy96g19eej6LC/jQXqFE3i1tui36fd1pkUkpY2OUhMdRwQevm2rB3t4C1ZZzvYSDYILOxxqMgsmB6SQ1HQkCBLMbz4nI0YNczCEw5cPDcJASJw6zUUBVu3+S/FOWywdKmsXeiEbkhC4fZtleqeR5VVmd1PzO/ds0Z9coHDbufxU3Ugd/VLheGqtkTCBaA9jIYJjB12Stml7GNV8KwgnDgHTZjcGY2rGx2l5LIglHfioSXrWnKFsDKAo3uDfZPkDEK+c3JbJ8ZLqkOSXfB/8Sq74e2EUAYlSg6xQVUFiUGX1oXiYBi+9WVlUAdy7dYV/ZM9RSvHDcO43dT4nY1Qoav/sv+MIoZc1T4431wg7MCaymn2ubG8RJ0GYYhHYK0psObCAcgD5L0=" + }, + "lastUpdated": 1753534291786, + "timeToLive": 604800000 +} \ No newline at end of file diff --git a/src/plugins/FancyNpcs/npcs.yml b/src/plugins/FancyNpcs/npcs.yml new file mode 100644 index 0000000..e84252c --- /dev/null +++ b/src/plugins/FancyNpcs/npcs.yml @@ -0,0 +1,108 @@ +npcs: + f1f898d7-f4f1-4e23-98d4-7ee00c038677: + name: teleport_survival + creator: 3ce31233-217d-3258-8b5e-1f458c4f8e9d + displayName: + type: PLAYER + location: + world: world + x: 255.5 + y: 0.9375 + z: 262.5 + yaw: -180.0 + pitch: 0.0 + showInTab: false + spawnEntity: true + collidable: true + glowing: false + glowingColor: white + turnToPlayer: true + turnToPlayerDistance: -1 + interactionCooldown: 0.0 + scale: 1.0 + visibility_distance: -1 + skin: + identifier: https://www.minecraftskins.com/uploads/skins/2024/01/28/plastic-steave-22292511.png + variant: AUTO + mirrorSkin: false + actions: + ANY_CLICK: + '1': + action: play_sound + value: minecraft:block.portal.travel + '2': + action: wait + value: '3' + '3': + action: send_to_server + value: survival + fd03518b-3465-4a90-9982-5d8a62d8f3e1: + name: link_bebrashield_discord + creator: 3ce31233-217d-3258-8b5e-1f458c4f8e9d + displayName: + type: INTERACTION + location: + world: world + x: 261.5 + y: 2.0 + z: 261.5 + yaw: -35.550262 + pitch: 11.700032 + showInTab: false + spawnEntity: true + collidable: true + glowing: false + glowingColor: white + turnToPlayer: false + turnToPlayerDistance: -1 + interactionCooldown: 0.0 + scale: 1.0 + visibility_distance: -1 + skin: + mirrorSkin: false + attributes: + width: '1.5' + actions: + ANY_CLICK: + '1': + action: play_sound + value: minecraft:entity.experience_orb.pickup + '2': + action: message + value: Discord: + https://discord.gg/xsyy7d8RfG + 26dee80c-9004-47c6-bbc0-343fe2f2fba7: + name: link_bebrashield_site + creator: 3ce31233-217d-3258-8b5e-1f458c4f8e9d + displayName: + type: INTERACTION + location: + world: world + x: 249.5 + y: 2.0 + z: 261.5 + yaw: -121.19934 + pitch: 76.49999 + showInTab: false + spawnEntity: true + collidable: true + glowing: false + glowingColor: white + turnToPlayer: false + turnToPlayerDistance: -1 + interactionCooldown: 0.0 + scale: 1.0 + visibility_distance: -1 + skin: + mirrorSkin: false + attributes: + width: '1.5' + actions: + ANY_CLICK: + '1': + action: play_sound + value: minecraft:entity.experience_orb.pickup + '2': + action: message + value: Сайт: + https://bebrashield.net -- 2.45.2 From 6c75d1fa0724235b3c377fdf107e64ef9e5578dd Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sat, 26 Jul 2025 17:19:13 +0300 Subject: [PATCH 3/8] create and configure worldguard region aroud the spawn in lobby --- src/plugins/RegionTeleport/spawnlocations.yml | 7 +++++ .../WorldGuard/worlds/world/regions.yml | 30 +++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/src/plugins/RegionTeleport/spawnlocations.yml b/src/plugins/RegionTeleport/spawnlocations.yml index e69de29..5e9191b 100644 --- a/src/plugins/RegionTeleport/spawnlocations.yml +++ b/src/plugins/RegionTeleport/spawnlocations.yml @@ -0,0 +1,7 @@ +spawn: + world: world + x: 255.5 + y: 1.0 + z: 258.5 + yaw: 0.0 + pitch: 0.0 diff --git a/src/plugins/WorldGuard/worlds/world/regions.yml b/src/plugins/WorldGuard/worlds/world/regions.yml index c7bf788..003b5aa 100644 --- a/src/plugins/WorldGuard/worlds/world/regions.yml +++ b/src/plugins/WorldGuard/worlds/world/regions.yml @@ -10,6 +10,36 @@ # REMEMBER TO KEEP PERIODICAL BACKUPS. # regions: + spawn: + min: {x: 206, y: 0, z: 206} + max: {x: 304, y: 32, z: 304} + members: {} + flags: {other-explosion: deny, lava-fire: deny, water-flow: deny, use: deny, + invincible: allow, snow-fall: deny, leaf-decay: deny, firework-damage: deny, + heal-min-health: 20.0, coral-fade: deny, wind-charge-burst: deny, feed-delay: 0, + mob-damage: deny, ravager-grief: deny, heal-delay: 0, use-anvil: deny, + mushroom-growth: deny, respawn-anchors: deny, lightning: deny, wither-damage: deny, + ice-form: deny, chorus-fruit-teleport: deny, regiontp-on-exit: spawn, + feed-amount: 20, player-loot-drop: deny, enderman-grief: deny, pvp: deny, + mob-spawning: deny, crop-growth: deny, moisture-change: deny, natural-hunger-drain: deny, + exit-override: false, creeper-explosion: deny, send-chat: allow, vine-growth: deny, + heal-max-health: 0.0, damage-animals: deny, snow-melt: deny, receive-chat: allow, + exit-via-teleport: deny, tnt: deny, ghast-fireball: deny, entity-item-frame-destroy: deny, + regiontp-on-entry: spawn, time-lock: '18000', feed-max-hunger: 0, deny-message: '', + natural-health-regen: deny, frosted-ice-form: deny, mycelium-spread: deny, + ice-melt: deny, block-trampling: deny, vehicle-destroy: deny, interact: deny, + chest-access: deny, ride: deny, weather-lock: clear, fire-spread: deny, + enderdragon-block-damage: deny, sleep: deny, mob-loot-drop: deny, sculk-growth: deny, + vehicle-place: deny, snowman-trails: deny, rock-growth: deny, entity-painting-destroy: deny, + heal-amount: 20, teleport-message: '', exit-deny-message: '', breeze-charge-explosion: deny, + lighter: deny, use-dripleaf: deny, pistons: deny, enderpearl: deny, item-drop: deny, + soil-dry: deny, exp-drops: deny, copper-fade: deny, fall-damage: deny, + game-mode: adventure, item-pickup: deny, item-frame-rotation: deny, potion-splash: deny, + frosted-ice-melt: deny, entry-deny-message: '', lava-flow: deny, grass-growth: deny, + feed-min-hunger: 20} + owners: {} + type: cuboid + priority: 0 __global__: members: {} flags: {} -- 2.45.2 From ee94836afd33a61e20948d89e9afc6e4c0ec9fee Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sat, 26 Jul 2025 17:49:56 +0300 Subject: [PATCH 4/8] add and configure Spawn plugin to teleport player to spawn on join --- src/plugins/Spawn-2.4.1.jar | 3 ++ src/plugins/Spawn/config.yml | 98 ++++++++++++++++++++++++++++++++++ src/plugins/Spawn/location.yml | 7 +++ src/plugins/Spawn/messages.yml | 43 +++++++++++++++ 4 files changed, 151 insertions(+) create mode 100644 src/plugins/Spawn-2.4.1.jar create mode 100644 src/plugins/Spawn/config.yml create mode 100644 src/plugins/Spawn/location.yml create mode 100644 src/plugins/Spawn/messages.yml diff --git a/src/plugins/Spawn-2.4.1.jar b/src/plugins/Spawn-2.4.1.jar new file mode 100644 index 0000000..c16a07c --- /dev/null +++ b/src/plugins/Spawn-2.4.1.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b9c4d150d0d0f741a392520e39b770246e58fbb1f51bcf1c8e90f113161e9be +size 74610 diff --git a/src/plugins/Spawn/config.yml b/src/plugins/Spawn/config.yml new file mode 100644 index 0000000..9bd74bc --- /dev/null +++ b/src/plugins/Spawn/config.yml @@ -0,0 +1,98 @@ +# ____ _ _ _ _ +# / ___| _ __ __ ___ ___ __ | |__ _ _ _ __ ___ ___| | ____ _ _ _(_) ___| |_ +# \___ \| '_ \ / _` \ \ /\ / / '_ \ | '_ \| | | | | '__/ _ \ / __| |/ / _` | | | | |/ _ \ __| +# ___) | |_) | (_| |\ V V /| | | | | |_) | |_| | | | | (_) | (__| < (_| | |_| | | __/ |_ +# |____/| .__/ \__,_| \_/\_/ |_| |_| |_.__/ \__, | |_| \___/ \___|_|\_\__, |\__,_|_|\___|\__| +# |_| |___/ |_| +# Wiki - https://github.com/rockquiet/Spawn/wiki + +plugin: + # if the plugin should search for updates on server start + # this will only send a message to the console, not to an admin joining the server + update-checks: true + # a list of worlds where the plugin should or should not work + # DISABLED: world-list is not used + # BLACKLIST: the plugin will not work in worlds listed below + # WHITELIST: the plugin will only work in worlds listed below + list-type: disabled + world-list: [] + # restrict the usage to specific game modes (only for players teleporting themselves) + gamemode-restricted: false + # possible values: SURVIVAL, ADVENTURE, CREATIVE, SPECTATOR + gamemode-list: [] + +# use the player's current head rotation instead of the defined one on teleport +use-player-head-rotation: + enabled: false + +# toggle if the player takes fall damage on teleport +fall-damage: + enabled: false + +# teleport the player to spawn on join +teleport-on-join: + enabled: true + # teleport the player ONLY on first join + only-first-join: false + +# cooldown for /spawn command +teleport-cooldown: + enabled: false + # how long in SECONDS the player has to wait before teleporting to spawn again + seconds: 10 + +# delay until teleport for /spawn command +teleport-delay: + enabled: false + # the delay in SECONDS until the player gets teleported to spawn + seconds: 3 + # toggle if the teleport should be canceled if the player moves + cancel-on-move: true + # toggle if the player should get the blindness effect during delay + # the effect will not work properly if a short delay time is used + blindness: false + +# toggle if the player should be teleported to spawn if they fall into the void +teleport-out-of-void: + enabled: false + # the height at which the player gets teleported out of the void to spawn + # Minecraft playable Altitude: -64 -> 320 [integer] + check-height: -64 + +# toggle if the player should be teleported to spawn if they die +teleport-on-respawn: + enabled: true + # toggle if the bed spawn-point should be ignored + ignore-bed-spawn: true + # toggle if the respawn anchor spawn-point should be ignored + ignore-anchor-spawn: true + +# toggle if the player should be teleported to spawn if they enter a world other than the spawn world +teleport-on-world-change: + enabled: false + # toggle if the world should also be checked on join + # this can interfere with teleport on join + check-on-join: false + +# spawns particles on teleport +particles: + enabled: false + # all particles: https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Particle.html + # use these for 1.8: https://hub.spigotmc.org/nexus/service/local/repositories/snapshots/archive/org/spigotmc/spigot-api/1.8.8-R0.1-SNAPSHOT/spigot-api-1.8.8-R0.1-20160221.082514-43-javadoc.jar/!/org/bukkit/Effect.html + particle: PORTAL + # the number of particles which get used + amount: 40 + +# play a sound on teleport +sounds: + enabled: false + # all sounds: https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Sound.html + # sounds for Minecraft 1.8 - 1.20: https://docs.andre601.ch/Spigot-Sounds/sounds/ + sound: ENTITY_ENDERMAN_TELEPORT + # the volume of the sound + volume: 1.0 + # the pitch of the sound + pitch: 1.0 + +# used for auto updating this file, do not change +file-version: 5 diff --git a/src/plugins/Spawn/location.yml b/src/plugins/Spawn/location.yml new file mode 100644 index 0000000..5e9191b --- /dev/null +++ b/src/plugins/Spawn/location.yml @@ -0,0 +1,7 @@ +spawn: + world: world + x: 255.5 + y: 1.0 + z: 258.5 + yaw: 0.0 + pitch: 0.0 diff --git a/src/plugins/Spawn/messages.yml b/src/plugins/Spawn/messages.yml new file mode 100644 index 0000000..53f203c --- /dev/null +++ b/src/plugins/Spawn/messages.yml @@ -0,0 +1,43 @@ +# Spawn by rockquiet +# MiniMessage formatting is supported on 1.18.2+ Paper based servers -> https://docs.advntr.dev/minimessage/format.html +# Legacy formatting is supported -> https://minecraft.wiki/w/Formatting_codes +# to disable a message set it to: '' + +# remove %prefix% from a message if it should not use it +prefix: '&7[&2Spawn&7]&r' + +# successful teleport to spawn +#teleport: '%prefix% &aTeleported to Spawn.' +teleport: '' +# successfully teleported another player to spawn - /spawn %player% +teleport-other: '%prefix% &aSuccessfully teleported &2%player% &ato Spawn.' +# if the player to be teleported is offline - /spawn %player% +player-not-found: '%prefix% &cPlayer &4%player% &cnot found!' + +# when the player wants to teleport but has an active teleport cooldown +cooldown-left: '%prefix% &cPlease wait &4%cooldown% &csecond(s) before teleporting again.' + +# time left until the player gets teleported to spawn +delay-left: '%prefix% &6You will be teleported in &e%delay% &6second(s).' +# delayed teleport failed because the player moved +teleport-canceled: '%prefix% &cTeleport canceled because you moved!' + +# spawn set at current position +spawn-set: '%prefix% &aSpawn set successfully.' + +# all files reloaded +reload: '%prefix% &aAll files reloaded successfully.' + +# no spawn set in config - set one with /spawn set +no-spawn: '%prefix% &cNo Spawn is set!' +# plugin is disabled in current world +world-disabled: '%prefix% &cYou are not allowed to use this here!' +# player is not in allowed game mode +gamemode-restricted: '%prefix% &cYou are not allowed to use this while in &4%gamemode%&c!' +# player does not have permission to execute the command +no-permission: '%prefix% &cNo permissions!' +# command cannot be used in console +no-player: '%prefix% &cCommand can only be used by players!' + +# used for auto updating this file, do not change +file-version: 3 -- 2.45.2 From 1c064e04e85885e9435772b5a6829eceee1dc5c9 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sat, 26 Jul 2025 19:39:15 +0300 Subject: [PATCH 5/8] change colors and sounds in menus --- src/plugins/zMenu/inventories/links.yml | 13 +++++++------ src/plugins/zMenu/inventories/main.yml | 16 ++++++++-------- src/plugins/zMenu/inventories/servers.yml | 18 ++++++++++++------ 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/src/plugins/zMenu/inventories/links.yml b/src/plugins/zMenu/inventories/links.yml index f02758f..fd18ad7 100644 --- a/src/plugins/zMenu/inventories/links.yml +++ b/src/plugins/zMenu/inventories/links.yml @@ -15,7 +15,7 @@ items: sound: ENTITY_EXPERIENCE_ORB_PICKUP - type: message messages: - - "Сайт: https://bebrashield.net" + - "Сайт: https://bebrashield.net" - type: close discord: @@ -31,7 +31,7 @@ items: sound: ENTITY_EXPERIENCE_ORB_PICKUP - type: message messages: - - "Discord: https://discord.gg/xsyy7d8RfG" + - "Discord: https://discord.gg/xsyy7d8RfG" - type: close telegram: @@ -47,15 +47,16 @@ items: sound: ENTITY_EXPERIENCE_ORB_PICKUP - type: message messages: - - "Telegram: https://t.me/+h28WP38F2_RjZjg6" + - "Telegram: https://t.me/+h28WP38F2_RjZjg6" - type: close back: slot: 16 item: material: arrow - name: "Назад" + name: "Назад" actions: - type: sound - sound: ENTITY_EXPERIENCE_ORB_PICKUP - - type: back + sound: ENTITY_ITEM_PICKUP + - type: inventory + inventory: main diff --git a/src/plugins/zMenu/inventories/main.yml b/src/plugins/zMenu/inventories/main.yml index a0055e3..5b49fc3 100644 --- a/src/plugins/zMenu/inventories/main.yml +++ b/src/plugins/zMenu/inventories/main.yml @@ -6,12 +6,12 @@ items: slot: 10 item: material: paper - name: "Выбор сервера" + name: "Выбор сервера" lore: - "Список серверов с описанием и быстрым подключением." actions: - type: sound - sound: ENTITY_EXPERIENCE_ORB_PICKUP + sound: ENTITY_ITEM_PICKUP - type: inventory inventory: servers @@ -19,12 +19,12 @@ items: slot: 12 item: material: chain - name: "Ссылки" + name: "Ссылки" lore: - "Ресурсы Бебрашилда." actions: - type: sound - sound: ENTITY_EXPERIENCE_ORB_PICKUP + sound: ENTITY_ITEM_PICKUP - type: inventory inventory: links @@ -32,7 +32,7 @@ items: slot: 14 item: material: diamond - name: "Поддержать" + name: "Поддержать" lore: - "Поддержите монетой, если нравится играть на сервере." - "" @@ -46,15 +46,15 @@ items: sound: ENTITY_EXPERIENCE_ORB_PICKUP - type: message messages: - - "Способы поддержки: https://bebrashield.net/donate" + - "Способы поддержки: https://bebrashield.net/donate" - type: close close: slot: 16 item: material: barrier - name: "Закрыть" + name: "Закрыть" actions: - type: sound - sound: ENTITY_EXPERIENCE_ORB_PICKUP + sound: BLOCK_CHEST_CLOSE - type: close diff --git a/src/plugins/zMenu/inventories/servers.yml b/src/plugins/zMenu/inventories/servers.yml index b8f71f4..cb9fb3d 100644 --- a/src/plugins/zMenu/inventories/servers.yml +++ b/src/plugins/zMenu/inventories/servers.yml @@ -6,21 +6,27 @@ items: slot: 10 item: material: creeper_head - name: "Выживание" + name: "Выживание" lore: - - "Классический опыт игры с косметическими модификациями." + - "Ванильный полуприватный SMP сервер." + - "Без приватов, гриферства и донатов." + - "Для игры требуется привязка Discord." + - "Кликните, чтобы войти." actions: - type: sound - sound: ENTITY_EXPERIENCE_ORB_PICKUP + sound: BLOCK_PORTAL_TRAVEL - type: connect + delay: 60 # 3 seconds server: survival + - type: close back: slot: 16 item: material: arrow - name: "Назад" + name: "Назад" actions: - type: sound - sound: ENTITY_EXPERIENCE_ORB_PICKUP - - type: back + sound: ENTITY_ITEM_PICKUP + - type: inventory + inventory: main -- 2.45.2 From a11297f72c9ba28d7f0cc0657f3964f4469a9402 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sat, 26 Jul 2025 21:55:44 +0300 Subject: [PATCH 6/8] fix typo in donate item description in main menu --- src/plugins/zMenu/inventories/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/zMenu/inventories/main.yml b/src/plugins/zMenu/inventories/main.yml index 5b49fc3..a17541f 100644 --- a/src/plugins/zMenu/inventories/main.yml +++ b/src/plugins/zMenu/inventories/main.yml @@ -36,7 +36,7 @@ items: lore: - "Поддержите монетой, если нравится играть на сервере." - "" - - "Все пожертвования сначала будут использованы на улучшение срвера," + - "Все пожертвования сначала будут использованы на улучшение севера," - "а уже потом на колу и чипсы разработчикам." - "" - "Кликните, чтобы получить ссылку в чате." -- 2.45.2 From e0c5451479f142713b51aa7f6d7a5b7a6289dbc7 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sat, 26 Jul 2025 22:05:34 +0300 Subject: [PATCH 7/8] remove unnecessary symlinks from Dockerfile --- .dockerignore | 2 -- .gitignore | 2 -- Dockerfile | 28 ++-------------------------- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/.dockerignore b/.dockerignore index b484ad8..332cff8 100644 --- a/.dockerignore +++ b/.dockerignore @@ -36,9 +36,7 @@ src/plugins/FancyHolograms/logs src/plugins/FancyNpcs/logs -src/plugins/ImageFrame/data src/plugins/ImageFrame/players -src/plugins/ImageFrame/upload src/map-color-cache.dat src/plugins/DiscordSRV/accounts.aof diff --git a/.gitignore b/.gitignore index b484ad8..332cff8 100644 --- a/.gitignore +++ b/.gitignore @@ -36,9 +36,7 @@ src/plugins/FancyHolograms/logs src/plugins/FancyNpcs/logs -src/plugins/ImageFrame/data src/plugins/ImageFrame/players -src/plugins/ImageFrame/upload src/map-color-cache.dat src/plugins/DiscordSRV/accounts.aof diff --git a/Dockerfile b/Dockerfile index 75c1cf7..dc98c26 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,12 +22,6 @@ RUN touch ${DATA_PATH}/usercache.json && \ ln -sf ${DATA_PATH}/usercache.json ${CONFIG_PATH} RUN touch ${DATA_PATH}/whitelist.json && \ ln -sf ${DATA_PATH}/whitelist.json ${CONFIG_PATH} -RUN mkdir ${DATA_PATH}/world && \ - ln -sf ${DATA_PATH}/world ${CONFIG_PATH} -RUN mkdir ${DATA_PATH}/world_nether && \ - ln -sf ${DATA_PATH}/world_nether ${CONFIG_PATH} -RUN mkdir ${DATA_PATH}/world_the_end && \ - ln -sf ${DATA_PATH}/world_the_end ${CONFIG_PATH} # Add symlinks to Plasmo Voice files RUN touch ${DATA_PATH}/pv-voice_mutes.json && \ @@ -50,34 +44,16 @@ RUN mkdir -p ${DATA_PATH}/CustomizablePlayerModels && \ RUN mkdir -p ${DATA_PATH}/FancyHolograms/logs && \ ln -sf ${DATA_PATH}/FancyHolograms/logs/ \ ${CONFIG_PATH}/plugins/FancyHolograms/logs && \ - touch ${DATA_PATH}/FancyHolograms/holograms.yml && \ - ln -sf ${DATA_PATH}/FancyHolograms/holograms.yml \ - ${CONFIG_PATH}/plugins/FancyHolograms/holograms.yml # Add symlinks to FancyNpcs files -RUN mkdir -p ${DATA_PATH}/FancyNpcs/.data && \ - ln -sf ${DATA_PATH}/FancyNpcs/.data/ \ - ${CONFIG_PATH}/plugins/FancyNpcs/.data && \ - mkdir -p ${DATA_PATH}/FancyNpcs/logs && \ +RUN mkdir -p ${DATA_PATH}/FancyNpcs/logs && \ ln -sf ${DATA_PATH}/FancyNpcs/logs/ \ ${CONFIG_PATH}/plugins/FancyNpcs/logs && \ - mkdir -p ${DATA_PATH}/FancyNpcs/skins && \ - ln -sf ${DATA_PATH}/FancyNpcs/skins/ \ - ${CONFIG_PATH}/plugins/FancyNpcs/skins && \ - touch ${DATA_PATH}/FancyNpcs/npcs.yml && \ - ln -sf ${DATA_PATH}/FancyNpcs/npcs.yml \ - ${CONFIG_PATH}/plugins/FancyNpcs/npcs.yml # Add symlinks to ImageFrame files -RUN mkdir -p ${DATA_PATH}/ImageFrame/data && \ - ln -sf ${DATA_PATH}/ImageFrame/data/ \ - ${CONFIG_PATH}/plugins/ImageFrame/data && \ - mkdir -p ${DATA_PATH}/ImageFrame/players && \ +RUN mkdir -p ${DATA_PATH}/ImageFrame/players && \ ln -sf ${DATA_PATH}/ImageFrame/players/ \ ${CONFIG_PATH}/plugins/ImageFrame/players && \ - mkdir -p ${DATA_PATH}/ImageFrame/upload && \ - ln -sf ${DATA_PATH}/ImageFrame/upload/ \ - ${CONFIG_PATH}/plugins/ImageFrame/upload # Add symlinks to DiscordSRV files RUN mkdir -p ${DATA_PATH}/DiscordSRV && \ -- 2.45.2 From 81e82f05c79446d95970db493fa1b5e0ee8829ef Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sat, 26 Jul 2025 22:10:07 +0300 Subject: [PATCH 8/8] make ImageFrame files trackable by git --- .dockerignore | 2 +- .gitattributes | 1 + .gitignore | 2 +- Dockerfile | 5 ----- src/plugins/ImageFrame/data/deletedMaps.bin | 3 +++ .../players/3ce31233-217d-3258-8b5e-1f458c4f8e9d.json | 6 ++++++ 6 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 src/plugins/ImageFrame/data/deletedMaps.bin create mode 100644 src/plugins/ImageFrame/players/3ce31233-217d-3258-8b5e-1f458c4f8e9d.json diff --git a/.dockerignore b/.dockerignore index 332cff8..4c1d8ac 100644 --- a/.dockerignore +++ b/.dockerignore @@ -36,7 +36,7 @@ src/plugins/FancyHolograms/logs src/plugins/FancyNpcs/logs -src/plugins/ImageFrame/players +src/plugins/ImageFrame/upload src/map-color-cache.dat src/plugins/DiscordSRV/accounts.aof diff --git a/.gitattributes b/.gitattributes index be3418a..cae7e5c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ *.jar filter=lfs diff=lfs merge=lfs -text *.mca filter=lfs diff=lfs merge=lfs -text +src/plugins/ImageFrame/data/* filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index 332cff8..4c1d8ac 100644 --- a/.gitignore +++ b/.gitignore @@ -36,7 +36,7 @@ src/plugins/FancyHolograms/logs src/plugins/FancyNpcs/logs -src/plugins/ImageFrame/players +src/plugins/ImageFrame/upload src/map-color-cache.dat src/plugins/DiscordSRV/accounts.aof diff --git a/Dockerfile b/Dockerfile index dc98c26..2d0e038 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,11 +50,6 @@ RUN mkdir -p ${DATA_PATH}/FancyNpcs/logs && \ ln -sf ${DATA_PATH}/FancyNpcs/logs/ \ ${CONFIG_PATH}/plugins/FancyNpcs/logs && \ -# Add symlinks to ImageFrame files -RUN mkdir -p ${DATA_PATH}/ImageFrame/players && \ - ln -sf ${DATA_PATH}/ImageFrame/players/ \ - ${CONFIG_PATH}/plugins/ImageFrame/players && \ - # Add symlinks to DiscordSRV files RUN mkdir -p ${DATA_PATH}/DiscordSRV && \ touch ${DATA_PATH}/DiscordSRV/accounts.aof && \ diff --git a/src/plugins/ImageFrame/data/deletedMaps.bin b/src/plugins/ImageFrame/data/deletedMaps.bin new file mode 100644 index 0000000..6010a2b --- /dev/null +++ b/src/plugins/ImageFrame/data/deletedMaps.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df3f619804a92fdb4057192dc43dd748ea778adc52bc498ce80524c014b81119 +size 4 diff --git a/src/plugins/ImageFrame/players/3ce31233-217d-3258-8b5e-1f458c4f8e9d.json b/src/plugins/ImageFrame/players/3ce31233-217d-3258-8b5e-1f458c4f8e9d.json new file mode 100644 index 0000000..92c92ff --- /dev/null +++ b/src/plugins/ImageFrame/players/3ce31233-217d-3258-8b5e-1f458c4f8e9d.json @@ -0,0 +1,6 @@ +{ + "uuid": "3ce31233-217d-3258-8b5e-1f458c4f8e9d", + "preferences": { + "viewAnimatedMaps": "unset" + } +} -- 2.45.2