Compare commits
No commits in common. "master" and "universal" have entirely different histories.
108 changed files with 1433 additions and 4010 deletions
|
|
@ -2,30 +2,31 @@ on: [push]
|
|||
jobs:
|
||||
build:
|
||||
runs-on: docker
|
||||
container: eclipse-temurin:21-alpine
|
||||
container: debian:sid
|
||||
steps:
|
||||
- name: Install build dependencies
|
||||
run: apk add nodejs curl tar zstd
|
||||
- name: Install JDK and other deps
|
||||
run: apt update && apt install --no-install-recommends -y openjdk-21-jdk-headless maven git nodejs curl zstd
|
||||
|
||||
- name: Checkout
|
||||
uses: https://github.com/actions/checkout@v4
|
||||
- name: Clone repository
|
||||
run: git clone -b ${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} https://git.m724.eu/Minecon724/tweaks724.git .
|
||||
|
||||
- name: Download NMS
|
||||
run: ./tools/download_nms.sh ~
|
||||
|
||||
|
||||
- name: Build for 1.21.4
|
||||
run: ./mvnw package -Dproject.minecraft.version=1.21.4 -Dproject.craftbukkit.version=v1_21_R3
|
||||
|
||||
- name: Build for 1.21.3
|
||||
run: ./mvnw package -Dproject.minecraft.version=1.21.3 -Dproject.craftbukkit.version=v1_21_R2
|
||||
|
||||
- name: Build for 1.21.1
|
||||
run: ./mvnw package -Dproject.minecraft.version=1.21.1 -Dproject.craftbukkit.version=v1_21_R1
|
||||
run: mvn package -Dproject.minecraft.version=1.21.1 -Dproject.nms.version=v1_21_R1
|
||||
|
||||
- name: Build for 1.21.3
|
||||
run: mvn package -Dproject.minecraft.version=1.21.3 -Dproject.nms.version=v1_21_R2
|
||||
|
||||
- name: Build for 1.21.4
|
||||
run: mvn package -Dproject.minecraft.version=1.21.4 -Dproject.nms.version=v1_21_R3
|
||||
|
||||
|
||||
|
||||
- name: Upload artifacts
|
||||
uses: https://github.com/actions/upload-artifact@v3
|
||||
with:
|
||||
path: target/tweaks-*.jar
|
||||
path: target
|
||||
19
.mvn/wrapper/maven-wrapper.properties
vendored
19
.mvn/wrapper/maven-wrapper.properties
vendored
|
|
@ -1,19 +0,0 @@
|
|||
# Licensed to the Apache Software Foundation (ASF) under one
|
||||
# or more contributor license agreements. See the NOTICE file
|
||||
# distributed with this work for additional information
|
||||
# regarding copyright ownership. The ASF licenses this file
|
||||
# to you under the Apache License, Version 2.0 (the
|
||||
# "License"); you may not use this file except in compliance
|
||||
# with the License. You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing,
|
||||
# software distributed under the License is distributed on an
|
||||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
# KIND, either express or implied. See the License for the
|
||||
# specific language governing permissions and limitations
|
||||
# under the License.
|
||||
wrapperVersion=3.3.2
|
||||
distributionType=only-script
|
||||
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
|
||||
5
DEVELOPMENT.md
Normal file
5
DEVELOPMENT.md
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
To setup NMS:
|
||||
1. Download BuildTools, move it into an empty directory and open terminal
|
||||
2. ```
|
||||
java -jar BuildTools.jar --rev 1.21.1 --remapped
|
||||
```
|
||||
65
README.md
65
README.md
|
|
@ -12,37 +12,37 @@ Please report all suspicious behavior. You can do so on any of those:
|
|||
Stuff no<sub><sup>t many</sup></sub> other plugins do.
|
||||
|
||||
Dependencies:
|
||||
- **1.21.1 and newer**
|
||||
- **1.21.1**, recommended as the plugin uses NMS for some stuff \
|
||||
However, it's not forced, so it's quite probable it'll work on other versions. Please test. If you get an error, it's most often because of a module using NMS. Disable that module, and report the error \
|
||||
Why not latest? The focus is on [a widely used version](https://bstats.org/global/bukkit) that has [good mod support](https://modrinth.com/modpack/fabulously-optimized/versions?c=release)
|
||||
- [ProtocolLib](https://www.spigotmc.org/resources/protocollib.1997/)
|
||||
- To use modules marked <sup><sub>N</sub></sup>, you must use a JAR [made for the exact server version.](/Minecon724/tweaks724/src/branch/master/docs/BUILDING.md)
|
||||
|
||||
# Features
|
||||
|
||||
<sup><sub>N</sub></sup> - requires a specific version \
|
||||
<sup><sub>P</sub></sup> - requires ProtocolLib
|
||||
|
||||
### Expand world border <sup><sub>N</sub></sup>
|
||||
### Expand world border
|
||||
Expands the world border to 30,000,000 (from 29,999,984)
|
||||
|
||||
### Hide world border <sup><sub>P</sub></sup>
|
||||
### Hide world border
|
||||
Hides the world border. It's still there, just invisible.
|
||||
|
||||
### Server brand <sup><sub>N P</sub></sup>
|
||||
### Server brand
|
||||
Modify the F3 brand, optionally include player's ping and server performance
|
||||
|
||||
### Doors
|
||||
Open two doors with one click. Knock on doors.
|
||||
|
||||
### MOTD <sup><sub>N P</sub></sup>
|
||||
### MOTD
|
||||
Random MOTD for every ping
|
||||
|
||||
### Chat mods <sup><sub>N</sub></sup>
|
||||
- Chat rooms players can freely create and join. Alerts like death and join messages are only within the player's chat room.
|
||||
- Proximity chat
|
||||
### Chat rooms
|
||||
Chat rooms players can freely create and join. Alerts like death and join messages are only within the player's chat room.
|
||||
|
||||
`/chat` - switch chat room \
|
||||
`/chatmanage` - create, delete, modify etc. (`tweaks724.chatmanage`)
|
||||
|
||||
### Proximity chat
|
||||
Self-explanatory
|
||||
|
||||
### Compass
|
||||
Holding a compass shows a bar with 4 directions and stuff like beds, lodestones, death pos (TODO) etc.
|
||||
|
||||
|
|
@ -52,23 +52,20 @@ Self-discipline with a pomodoro timer that's actually forced
|
|||
`/pomodoro` (`tweaks724.pomodoro`)
|
||||
|
||||
### Updater
|
||||
Checks for updates of ALL* your plugins \
|
||||
Updates are still installed manually \
|
||||
Updates ALL* your plugins \
|
||||
<sub>*Those on SpigotMC and that release updates there</sub>
|
||||
|
||||
`/updates` - shows available updates (`tweaks724.updates`)
|
||||
|
||||
### Hardcore <sup><sub>N P</sub></sup>
|
||||
### Hardcore
|
||||
Hardcore hearts by chance
|
||||
|
||||
### Sleep
|
||||
Sleeping doesn't skip night, but speeds it up. The more players, the faster it goes.
|
||||
- Instant sleep \
|
||||
One can instantly skip, but only a part of the night. \
|
||||
There's 5 players on the server. A night is 10 minutes long. \
|
||||
Each player can instantly skip 2 minutes of the night at any time, even if others aren't sleeping
|
||||
- Heal \
|
||||
Sleeping heals
|
||||
One can instantly skip, but only a part of the night. \
|
||||
There's 5 players on the server. A night is 10 minutes long. \
|
||||
Each player can instantly skip 2 minutes of the night at any time, even if others aren't sleeping
|
||||
|
||||
### Authentication
|
||||
Players are given a unique subdomain like "\<key>.example.com" and they must use it to join \
|
||||
|
|
@ -79,38 +76,14 @@ It can be enabled that new players can't join the server without a key
|
|||
### Full join
|
||||
Players with `tweaks724.bypass-full` can join even when the server is full
|
||||
|
||||
### Emergency alerts <sup><sub>P</sub></sup>
|
||||
### Emergency alerts
|
||||
Issue messages that the player needs to read to keep playing, and that make an attention grabbing sound
|
||||
|
||||
`/emergencyalerts` (`tweaks724.emergencyalerts`)
|
||||
|
||||
### Remote redstone
|
||||
Adds a "gateway" item that are controlled over internet. \
|
||||
[RETSTONE.md for more info](/Minecon724/tweaks724/src/branch/master/docs/RETSTONE.md)
|
||||
|
||||
### Knockback
|
||||
Control knockback dealt by entities
|
||||
|
||||
### Kill switch
|
||||
Quickly kills (terminates) the server on trigger, via command or HTTP request.
|
||||
[KILLSWITCH.md for more info](/Minecon724/tweaks724/src/branch/master/docs/KILLSWITCH.md)
|
||||
|
||||
### Swing through grass
|
||||
Self-explanatory
|
||||
|
||||
### Durability alert
|
||||
Self-explanatory too.
|
||||
|
||||
`/durabilityalert` (`tweaks724.durabilityalert`)
|
||||
|
||||
### Word coords
|
||||
Convert coordinates to easier to remember words
|
||||
|
||||
`/wordcoords` (`tweaks724.tauth`)
|
||||
|
||||
### Utility commands
|
||||
|
||||
- `/ping` - displays player ping <sup><sub>P</sub></sup> \
|
||||
- `/ping` - displays player ping \
|
||||
**Ping is calculated by the plugin**. \
|
||||
That allows for more precision (decimal places) and to get the ping immediately after a player join
|
||||
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
First, download NMS. There are two ways:
|
||||
|
||||
- Use `tools/download_nms.sh`
|
||||
- Download BuildTools, move it into an empty directory and run:
|
||||
```
|
||||
java -jar BuildTools.jar --rev 1.21.4 --remapped
|
||||
```
|
||||
You must run this for every version you want to build for.
|
||||
|
||||
|
||||
|
||||
Then build the plugin:
|
||||
|
||||
1. Clone this repository:
|
||||
```
|
||||
git clone https://git.m724.eu/Minecon724/tweaks724
|
||||
cd tweaks724
|
||||
```
|
||||
- You might want to `checkout` a release:
|
||||
```
|
||||
git checkout tags/tweaks-0.1.12
|
||||
```
|
||||
2. For the "native" version:
|
||||
```
|
||||
./mvnw package
|
||||
```
|
||||
For another compatible version:
|
||||
```
|
||||
./mvnw package -Dproject.craftbukkit.version=v1_21_R3 -Dproject.minecraft.version=1.21.4
|
||||
```
|
||||
|
||||
Look for `tweaks-0.1.12+1.21.4.jar` in `target/`
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
Killswitch immediately stops the server.
|
||||
|
||||
### Warning
|
||||
This terminates the server process, meaning it's like you'd pull the power. \
|
||||
So you will lose some progress (since the last auto save), or worst case your world (or other data) gets corrupted.
|
||||
|
||||
Terminal froze after kill? `reset`
|
||||
|
||||
### Over a command
|
||||
No key is required. \
|
||||
`/servkill` is the command. Permission: `tweaks724.servkill`. \
|
||||
You must grant the permission manually, like with a permission plugin - it's not automatically assigned even to OPs.
|
||||
|
||||
### Over HTTP
|
||||
HTTP is insecure, meaning others *could* intercept your request to the server and get your key. \
|
||||
To encrypt, put this behind a proxy to get HTTPS or a VPN (directly to the server, not a commercial VPN) \
|
||||
Or regenerate the key after every usage.
|
||||
|
||||
Make a GET request to `/key/<base64 encoded key>`
|
||||
|
||||
Example:
|
||||
```
|
||||
https://127.0.0.1:57932/key/lNwANMSZhLiTWhNxSoqQ5Q==
|
||||
|_ server address _| |_ base64 encoded key _|
|
||||
```
|
||||
|
||||
The response is a 404 no matter what. Either way, you will notice that the server has stopped.
|
||||
|
||||
The key is generated to `plugins/Tweaks724/storage/killswitch key` \
|
||||
To use it with HTTP server, encode it to base64.
|
||||
|
||||
Rate limit is 1 request / 5 minutes
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
Here's the documentation.
|
||||
|
||||
Click above on a file to read more about a topic.
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
## Remote redstone
|
||||
|
||||
See [retstone.py](retstone.py) for usage example
|
||||
|
||||
### Glossary
|
||||
gateways - the blocks (daylight detector) that read or emit redstone with a specified power, controlled with UDP packets \
|
||||
packet - a bunch of bytes sent over the internet, that do something with a specified gateway
|
||||
|
||||
### Crafting
|
||||
|
||||
To craft a gateway, combine:
|
||||
- nether star
|
||||
- ender chest
|
||||
- chorus flower
|
||||
- daylight detector
|
||||
|
||||
### Usage
|
||||
Each gateway has an ID assigned. To view it, shift right-click a gateway.
|
||||
|
||||
To destroy a gateway, use silk touch.
|
||||
|
||||
### How it works
|
||||
A packet is int / 4 bytes / 32 bits
|
||||
|
||||
Packet format:
|
||||
```
|
||||
[ 01 ] [ 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 ] [ 29 30 31 32 ]
|
||||
action bits 2-28 of repeater id payload
|
||||
```
|
||||
|
||||
- action: `1` to write, `0` to read
|
||||
- payload: power level if writing
|
||||
|
||||
If writing, no response \
|
||||
If reading, response is the power level, or 0 if not powered or no repeater with that ID (or not loaded)
|
||||
|
||||
Reading powers the block down of course \
|
||||
BUT you should power it down (or read), wait some, and then read again
|
||||
|
||||
**WARNING** the socket is not ratelimited or protected in any way. \
|
||||
Though it should be hard to bruteforce, because there's no feedback
|
||||
|
||||
### Retstone
|
||||
|
||||
**Network** translates to **reto** in Esperanto \
|
||||
So retsomething means networked something (posto - mail, retposto - email, ejo - place (site), retejo - website, etc.) \
|
||||
And sometimes we use network instead of internet, same is in that language \
|
||||
Hence retstone
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
# Copyright (C) 2024 Minecon724
|
||||
# Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
# in the project root for the full license text.
|
||||
|
||||
import socket, struct
|
||||
|
||||
ENDPOINT = ("127.0.0.1", 57931)
|
||||
|
||||
def get_power(repeater_id: int) -> int | None:
|
||||
message = repeater_id & 0x7FFFFFF0
|
||||
|
||||
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
|
||||
sock.sendto(message.to_bytes(4), ENDPOINT)
|
||||
|
||||
return struct.unpack(">b", sock.recvfrom(1)[0])[0]
|
||||
|
||||
def set_power(repeater_id: int, power: int):
|
||||
message = repeater_id & 0x7FFFFFF0
|
||||
message |= 0x80000000
|
||||
message |= power & 0xF
|
||||
|
||||
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
|
||||
sock.sendto(message.to_bytes(4), ENDPOINT)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
from argparse import ArgumentParser
|
||||
|
||||
parser = ArgumentParser()
|
||||
parser.add_argument("repeater_id", help="The repeater ID", type=int)
|
||||
parser.add_argument("-p", "--power", help="Power the repeater with specified power. Leave to read.", type=int)
|
||||
parser.add_argument("-c", "--copy", help="Copy input of one repeater to another. If combined with power, power is added.", type=int)
|
||||
args = parser.parse_args()
|
||||
|
||||
if args.copy is None:
|
||||
if args.power is None:
|
||||
power = get_power(args.repeater_id)
|
||||
print(power)
|
||||
else:
|
||||
set_power(args.repeater_id, args.power)
|
||||
else:
|
||||
while True:
|
||||
power = get_power(args.repeater_id)
|
||||
set_power(args.copy, power)
|
||||
259
mvnw
vendored
259
mvnw
vendored
|
|
@ -1,259 +0,0 @@
|
|||
#!/bin/sh
|
||||
# ----------------------------------------------------------------------------
|
||||
# Licensed to the Apache Software Foundation (ASF) under one
|
||||
# or more contributor license agreements. See the NOTICE file
|
||||
# distributed with this work for additional information
|
||||
# regarding copyright ownership. The ASF licenses this file
|
||||
# to you under the Apache License, Version 2.0 (the
|
||||
# "License"); you may not use this file except in compliance
|
||||
# with the License. You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing,
|
||||
# software distributed under the License is distributed on an
|
||||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
# KIND, either express or implied. See the License for the
|
||||
# specific language governing permissions and limitations
|
||||
# under the License.
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# Apache Maven Wrapper startup batch script, version 3.3.2
|
||||
#
|
||||
# Optional ENV vars
|
||||
# -----------------
|
||||
# JAVA_HOME - location of a JDK home dir, required when download maven via java source
|
||||
# MVNW_REPOURL - repo url base for downloading maven distribution
|
||||
# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
|
||||
# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
set -euf
|
||||
[ "${MVNW_VERBOSE-}" != debug ] || set -x
|
||||
|
||||
# OS specific support.
|
||||
native_path() { printf %s\\n "$1"; }
|
||||
case "$(uname)" in
|
||||
CYGWIN* | MINGW*)
|
||||
[ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
|
||||
native_path() { cygpath --path --windows "$1"; }
|
||||
;;
|
||||
esac
|
||||
|
||||
# set JAVACMD and JAVACCMD
|
||||
set_java_home() {
|
||||
# For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
|
||||
if [ -n "${JAVA_HOME-}" ]; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ]; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
JAVACCMD="$JAVA_HOME/jre/sh/javac"
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
JAVACCMD="$JAVA_HOME/bin/javac"
|
||||
|
||||
if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
|
||||
echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
|
||||
echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
else
|
||||
JAVACMD="$(
|
||||
'set' +e
|
||||
'unset' -f command 2>/dev/null
|
||||
'command' -v java
|
||||
)" || :
|
||||
JAVACCMD="$(
|
||||
'set' +e
|
||||
'unset' -f command 2>/dev/null
|
||||
'command' -v javac
|
||||
)" || :
|
||||
|
||||
if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
|
||||
echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
# hash string like Java String::hashCode
|
||||
hash_string() {
|
||||
str="${1:-}" h=0
|
||||
while [ -n "$str" ]; do
|
||||
char="${str%"${str#?}"}"
|
||||
h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
|
||||
str="${str#?}"
|
||||
done
|
||||
printf %x\\n $h
|
||||
}
|
||||
|
||||
verbose() { :; }
|
||||
[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
|
||||
|
||||
die() {
|
||||
printf %s\\n "$1" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
trim() {
|
||||
# MWRAPPER-139:
|
||||
# Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
|
||||
# Needed for removing poorly interpreted newline sequences when running in more
|
||||
# exotic environments such as mingw bash on Windows.
|
||||
printf "%s" "${1}" | tr -d '[:space:]'
|
||||
}
|
||||
|
||||
# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
|
||||
while IFS="=" read -r key value; do
|
||||
case "${key-}" in
|
||||
distributionUrl) distributionUrl=$(trim "${value-}") ;;
|
||||
distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
|
||||
esac
|
||||
done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties"
|
||||
[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties"
|
||||
|
||||
case "${distributionUrl##*/}" in
|
||||
maven-mvnd-*bin.*)
|
||||
MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
|
||||
case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
|
||||
*AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
|
||||
:Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
|
||||
:Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
|
||||
:Linux*x86_64*) distributionPlatform=linux-amd64 ;;
|
||||
*)
|
||||
echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
|
||||
distributionPlatform=linux-amd64
|
||||
;;
|
||||
esac
|
||||
distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
|
||||
;;
|
||||
maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
|
||||
*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
|
||||
esac
|
||||
|
||||
# apply MVNW_REPOURL and calculate MAVEN_HOME
|
||||
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
|
||||
[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
|
||||
distributionUrlName="${distributionUrl##*/}"
|
||||
distributionUrlNameMain="${distributionUrlName%.*}"
|
||||
distributionUrlNameMain="${distributionUrlNameMain%-bin}"
|
||||
MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
|
||||
MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
|
||||
|
||||
exec_maven() {
|
||||
unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
|
||||
exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
|
||||
}
|
||||
|
||||
if [ -d "$MAVEN_HOME" ]; then
|
||||
verbose "found existing MAVEN_HOME at $MAVEN_HOME"
|
||||
exec_maven "$@"
|
||||
fi
|
||||
|
||||
case "${distributionUrl-}" in
|
||||
*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
|
||||
*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
|
||||
esac
|
||||
|
||||
# prepare tmp dir
|
||||
if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
|
||||
clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
|
||||
trap clean HUP INT TERM EXIT
|
||||
else
|
||||
die "cannot create temp dir"
|
||||
fi
|
||||
|
||||
mkdir -p -- "${MAVEN_HOME%/*}"
|
||||
|
||||
# Download and Install Apache Maven
|
||||
verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
|
||||
verbose "Downloading from: $distributionUrl"
|
||||
verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
|
||||
|
||||
# select .zip or .tar.gz
|
||||
if ! command -v unzip >/dev/null; then
|
||||
distributionUrl="${distributionUrl%.zip}.tar.gz"
|
||||
distributionUrlName="${distributionUrl##*/}"
|
||||
fi
|
||||
|
||||
# verbose opt
|
||||
__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
|
||||
[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
|
||||
|
||||
# normalize http auth
|
||||
case "${MVNW_PASSWORD:+has-password}" in
|
||||
'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
|
||||
has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
|
||||
esac
|
||||
|
||||
if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
|
||||
verbose "Found wget ... using wget"
|
||||
wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
|
||||
elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
|
||||
verbose "Found curl ... using curl"
|
||||
curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
|
||||
elif set_java_home; then
|
||||
verbose "Falling back to use Java to download"
|
||||
javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
|
||||
targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
|
||||
cat >"$javaSource" <<-END
|
||||
public class Downloader extends java.net.Authenticator
|
||||
{
|
||||
protected java.net.PasswordAuthentication getPasswordAuthentication()
|
||||
{
|
||||
return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
|
||||
}
|
||||
public static void main( String[] args ) throws Exception
|
||||
{
|
||||
setDefault( new Downloader() );
|
||||
java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
|
||||
}
|
||||
}
|
||||
END
|
||||
# For Cygwin/MinGW, switch paths to Windows format before running javac and java
|
||||
verbose " - Compiling Downloader.java ..."
|
||||
"$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
|
||||
verbose " - Running Downloader.java ..."
|
||||
"$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
|
||||
fi
|
||||
|
||||
# If specified, validate the SHA-256 sum of the Maven distribution zip file
|
||||
if [ -n "${distributionSha256Sum-}" ]; then
|
||||
distributionSha256Result=false
|
||||
if [ "$MVN_CMD" = mvnd.sh ]; then
|
||||
echo "Checksum validation is not supported for maven-mvnd." >&2
|
||||
echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
|
||||
exit 1
|
||||
elif command -v sha256sum >/dev/null; then
|
||||
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then
|
||||
distributionSha256Result=true
|
||||
fi
|
||||
elif command -v shasum >/dev/null; then
|
||||
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
|
||||
distributionSha256Result=true
|
||||
fi
|
||||
else
|
||||
echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
|
||||
echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
|
||||
exit 1
|
||||
fi
|
||||
if [ $distributionSha256Result = false ]; then
|
||||
echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
|
||||
echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# unzip and move
|
||||
if command -v unzip >/dev/null; then
|
||||
unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
|
||||
else
|
||||
tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
|
||||
fi
|
||||
printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url"
|
||||
mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
|
||||
|
||||
clean || :
|
||||
exec_maven "$@"
|
||||
149
mvnw.cmd
vendored
149
mvnw.cmd
vendored
|
|
@ -1,149 +0,0 @@
|
|||
<# : batch portion
|
||||
@REM ----------------------------------------------------------------------------
|
||||
@REM Licensed to the Apache Software Foundation (ASF) under one
|
||||
@REM or more contributor license agreements. See the NOTICE file
|
||||
@REM distributed with this work for additional information
|
||||
@REM regarding copyright ownership. The ASF licenses this file
|
||||
@REM to you under the Apache License, Version 2.0 (the
|
||||
@REM "License"); you may not use this file except in compliance
|
||||
@REM with the License. You may obtain a copy of the License at
|
||||
@REM
|
||||
@REM http://www.apache.org/licenses/LICENSE-2.0
|
||||
@REM
|
||||
@REM Unless required by applicable law or agreed to in writing,
|
||||
@REM software distributed under the License is distributed on an
|
||||
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
@REM KIND, either express or implied. See the License for the
|
||||
@REM specific language governing permissions and limitations
|
||||
@REM under the License.
|
||||
@REM ----------------------------------------------------------------------------
|
||||
|
||||
@REM ----------------------------------------------------------------------------
|
||||
@REM Apache Maven Wrapper startup batch script, version 3.3.2
|
||||
@REM
|
||||
@REM Optional ENV vars
|
||||
@REM MVNW_REPOURL - repo url base for downloading maven distribution
|
||||
@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
|
||||
@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output
|
||||
@REM ----------------------------------------------------------------------------
|
||||
|
||||
@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
|
||||
@SET __MVNW_CMD__=
|
||||
@SET __MVNW_ERROR__=
|
||||
@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
|
||||
@SET PSModulePath=
|
||||
@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
|
||||
IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
|
||||
)
|
||||
@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
|
||||
@SET __MVNW_PSMODULEP_SAVE=
|
||||
@SET __MVNW_ARG0_NAME__=
|
||||
@SET MVNW_USERNAME=
|
||||
@SET MVNW_PASSWORD=
|
||||
@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*)
|
||||
@echo Cannot start maven from wrapper >&2 && exit /b 1
|
||||
@GOTO :EOF
|
||||
: end batch / begin powershell #>
|
||||
|
||||
$ErrorActionPreference = "Stop"
|
||||
if ($env:MVNW_VERBOSE -eq "true") {
|
||||
$VerbosePreference = "Continue"
|
||||
}
|
||||
|
||||
# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
|
||||
$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
|
||||
if (!$distributionUrl) {
|
||||
Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
|
||||
}
|
||||
|
||||
switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
|
||||
"maven-mvnd-*" {
|
||||
$USE_MVND = $true
|
||||
$distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
|
||||
$MVN_CMD = "mvnd.cmd"
|
||||
break
|
||||
}
|
||||
default {
|
||||
$USE_MVND = $false
|
||||
$MVN_CMD = $script -replace '^mvnw','mvn'
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
# apply MVNW_REPOURL and calculate MAVEN_HOME
|
||||
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
|
||||
if ($env:MVNW_REPOURL) {
|
||||
$MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" }
|
||||
$distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')"
|
||||
}
|
||||
$distributionUrlName = $distributionUrl -replace '^.*/',''
|
||||
$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
|
||||
$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
|
||||
if ($env:MAVEN_USER_HOME) {
|
||||
$MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain"
|
||||
}
|
||||
$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
|
||||
$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
|
||||
|
||||
if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
|
||||
Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
|
||||
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
|
||||
exit $?
|
||||
}
|
||||
|
||||
if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
|
||||
Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
|
||||
}
|
||||
|
||||
# prepare tmp dir
|
||||
$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
|
||||
$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
|
||||
$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
|
||||
trap {
|
||||
if ($TMP_DOWNLOAD_DIR.Exists) {
|
||||
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
|
||||
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
|
||||
}
|
||||
}
|
||||
|
||||
New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
|
||||
|
||||
# Download and Install Apache Maven
|
||||
Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
|
||||
Write-Verbose "Downloading from: $distributionUrl"
|
||||
Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
|
||||
|
||||
$webclient = New-Object System.Net.WebClient
|
||||
if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
|
||||
$webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
|
||||
}
|
||||
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
|
||||
$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
|
||||
|
||||
# If specified, validate the SHA-256 sum of the Maven distribution zip file
|
||||
$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
|
||||
if ($distributionSha256Sum) {
|
||||
if ($USE_MVND) {
|
||||
Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
|
||||
}
|
||||
Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
|
||||
if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
|
||||
Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
|
||||
}
|
||||
}
|
||||
|
||||
# unzip and move
|
||||
Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
|
||||
Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null
|
||||
try {
|
||||
Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
|
||||
} catch {
|
||||
if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
|
||||
Write-Error "fail to move MAVEN_HOME"
|
||||
}
|
||||
} finally {
|
||||
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
|
||||
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
|
||||
}
|
||||
|
||||
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
|
||||
63
pom.xml
63
pom.xml
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
~ Copyright (C) 2025 Minecon724
|
||||
~ Copyright (C) 2024 Minecon724
|
||||
~ Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
~ in the project root for the full license text.
|
||||
-->
|
||||
|
|
@ -10,15 +10,15 @@
|
|||
|
||||
<groupId>eu.m724</groupId>
|
||||
<artifactId>tweaks</artifactId>
|
||||
<version>0.1.15-SNAPSHOT</version>
|
||||
<version>0.1.10-SNAPSHOT</version>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>21</maven.compiler.source>
|
||||
<maven.compiler.target>21</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
|
||||
<project.craftbukkit.version>v1_21_R3</project.craftbukkit.version>
|
||||
<project.minecraft.version>1.21.4</project.minecraft.version>
|
||||
<project.nms.version>v1_21_R1</project.nms.version>
|
||||
<project.minecraft.version>1.21.1</project.minecraft.version>
|
||||
<project.spigot.version>${project.minecraft.version}-R0.1-SNAPSHOT</project.spigot.version>
|
||||
</properties>
|
||||
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
</goals>
|
||||
<configuration>
|
||||
<target>
|
||||
<replace token="v1_21_R3" value="${project.craftbukkit.version}" dir="src/main">
|
||||
<replace token="v1_21_R1" value="${project.nms.version}" dir="src/main">
|
||||
<include name="**/*.java" />
|
||||
</replace>
|
||||
</target>
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
</goals>
|
||||
<configuration>
|
||||
<target>
|
||||
<replace token="${project.craftbukkit.version}" value="v1_21_R3" dir="src/main">
|
||||
<replace token="${project.nms.version}" value="v1_21_R1" dir="src/main">
|
||||
<include name="**/*.java" />
|
||||
</replace>
|
||||
</target>
|
||||
|
|
@ -67,6 +67,37 @@
|
|||
</executions>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-shade-plugin</artifactId>
|
||||
<version>3.6.0</version>
|
||||
<configuration>
|
||||
<createDependencyReducedPom>false</createDependencyReducedPom>
|
||||
<minimizeJar>true</minimizeJar>
|
||||
<artifactSet>
|
||||
<includes>
|
||||
<include>eu.m724:tweaks</include>
|
||||
</includes>
|
||||
</artifactSet>
|
||||
<filters>
|
||||
<filter>
|
||||
<artifact>*</artifact>
|
||||
<excludes>
|
||||
<exclude>META-INF/**</exclude>
|
||||
</excludes>
|
||||
</filter>
|
||||
</filters>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>shade</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>net.md-5</groupId>
|
||||
<artifactId>specialsource-maven-plugin</artifactId>
|
||||
|
|
@ -80,8 +111,10 @@
|
|||
<id>remap-obf</id>
|
||||
<configuration>
|
||||
<srgIn>org.spigotmc:minecraft-server:${project.spigot.version}:txt:maps-mojang</srgIn>
|
||||
<remappedDependencies>org.spigotmc:spigot:${project.spigot.version}:jar:remapped-mojang</remappedDependencies>
|
||||
<reverse>true</reverse>
|
||||
<remappedDependencies>org.spigotmc:spigot:${project.spigot.version}:jar:remapped-mojang</remappedDependencies>
|
||||
<remappedArtifactAttached>true</remappedArtifactAttached>
|
||||
<remappedClassifierName>remapped-obf-temp-dont-use</remappedClassifierName>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
|
|
@ -91,6 +124,7 @@
|
|||
</goals>
|
||||
<id>remap-spigot</id>
|
||||
<configuration>
|
||||
<inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf-temp-dont-use.jar</inputFile>
|
||||
<srgIn>org.spigotmc:minecraft-server:${project.spigot.version}:csrg:maps-spigot</srgIn>
|
||||
<remappedDependencies>org.spigotmc:spigot:${project.spigot.version}:jar:remapped-obf</remappedDependencies>
|
||||
</configuration>
|
||||
|
|
@ -118,6 +152,11 @@
|
|||
<id>dmulloy2-repo</id>
|
||||
<url>https://repo.dmulloy2.net/repository/public/</url>
|
||||
</repository>
|
||||
<!-- this repo has no ipv6 so keep that in mind -->
|
||||
<repository>
|
||||
<id>maxhenkel-repo</id>
|
||||
<url>https://maven.maxhenkel.de/repository/public</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>m724-repo</id>
|
||||
<url>https://git.m724.eu/api/packages/Minecon724/maven</url>
|
||||
|
|
@ -128,7 +167,7 @@
|
|||
<dependency>
|
||||
<groupId>org.spigotmc</groupId>
|
||||
<artifactId>spigot-api</artifactId>
|
||||
<version>1.21.1-R0.1-SNAPSHOT</version>
|
||||
<version>${project.spigot.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
@ -144,10 +183,16 @@
|
|||
<version>5.3.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>de.maxhenkel.voicechat</groupId>
|
||||
<artifactId>voicechat-api</artifactId>
|
||||
<version>2.5.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>eu.m724</groupId>
|
||||
<artifactId>mstats-spigot</artifactId>
|
||||
<version>0.1.2</version>
|
||||
<version>0.1.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
|||
|
|
@ -1,65 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks;
|
||||
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
public class DebugLogger {
|
||||
static Logger logger;
|
||||
|
||||
public static void info(String message, Object... format) {
|
||||
log(Level.INFO, message, format);
|
||||
}
|
||||
|
||||
public static void warning(String message, Object... format) {
|
||||
log(Level.WARNING, message, format);
|
||||
}
|
||||
|
||||
public static void severe(String message, Object... format) {
|
||||
log(Level.SEVERE, message, format);
|
||||
}
|
||||
|
||||
public static void fine(String message, Object... format) {
|
||||
log(Level.FINE, message, format);
|
||||
}
|
||||
|
||||
public static void finer(String message, Object... format) {
|
||||
log(Level.FINER, message, format);
|
||||
}
|
||||
|
||||
private static void log(Level level, String message, Object... format) {
|
||||
if (logger.getLevel().intValue() > level.intValue()) return;
|
||||
|
||||
var caller = Thread.currentThread().getStackTrace()[3].getClassName();
|
||||
|
||||
if (caller.equals(TweaksModule.class.getName())) {
|
||||
var pcaller = Thread.currentThread().getStackTrace()[4].getClassName();
|
||||
if (pcaller.endsWith("Module"))
|
||||
caller = pcaller;
|
||||
}
|
||||
|
||||
if (caller.startsWith("eu.m724.tweaks."))
|
||||
caller = caller.substring(15);
|
||||
|
||||
message = "[" + caller + "] " + message.formatted(format);
|
||||
|
||||
if (level.intValue() < Level.INFO.intValue()) { // levels below info are never logged even if set for some reason
|
||||
// colors text gray (cyan is close to gray)
|
||||
if (level == Level.FINE) {
|
||||
message = "\033[38;5;250m" + message + "\033[39m";
|
||||
} else {
|
||||
message = "\033[38;5;245m" + message + "\033[39m";
|
||||
}
|
||||
level = Level.INFO;
|
||||
}
|
||||
|
||||
logger.log(level, message);
|
||||
}
|
||||
}
|
||||
|
|
@ -28,15 +28,11 @@ public class Language {
|
|||
return INSTANCE.resourceBundle.getString(key);
|
||||
}
|
||||
|
||||
public static String getString(String key, Object... format) {
|
||||
return INSTANCE.resourceBundle.getString(key).formatted(format);
|
||||
}
|
||||
|
||||
public static BaseComponent getComponent(String key, ChatColor color) {
|
||||
return new ComponentBuilder(getString(key)).color(color).build();
|
||||
}
|
||||
|
||||
public static BaseComponent getComponent(String key, ChatColor color, Object... format) {
|
||||
return new ComponentBuilder(getString(key, format)).color(color).build();
|
||||
return new ComponentBuilder(getString(key).formatted(format)).color(color).build();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
133
src/main/java/eu/m724/tweaks/TweaksConfig.java
Normal file
133
src/main/java/eu/m724/tweaks/TweaksConfig.java
Normal file
|
|
@ -0,0 +1,133 @@
|
|||
/*
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks;
|
||||
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
public record TweaksConfig(
|
||||
boolean metrics,
|
||||
|
||||
boolean worldborderExpand,
|
||||
boolean worldborderHide,
|
||||
|
||||
boolean brandEnabled,
|
||||
String brandText,
|
||||
boolean brandShowPing,
|
||||
boolean brandShowMspt,
|
||||
|
||||
boolean doorEnabled,
|
||||
boolean doorDoubleOpen,
|
||||
boolean doorKnocking,
|
||||
|
||||
boolean motdEnabled,
|
||||
String motdSet,
|
||||
|
||||
boolean chatEnabled,
|
||||
boolean chatLocalEvents,
|
||||
String chatDefaultName,
|
||||
int chatRadius,
|
||||
|
||||
boolean compassEnabled,
|
||||
int compassWidth,
|
||||
int compassPrecision,
|
||||
|
||||
boolean pomodoroEnabled,
|
||||
boolean pomodoroForce,
|
||||
|
||||
boolean updaterEnabled,
|
||||
|
||||
boolean hardcoreEnabled,
|
||||
float hardcoreChance,
|
||||
|
||||
boolean sleepEnabled,
|
||||
boolean sleepInstant,
|
||||
|
||||
boolean authEnabled,
|
||||
boolean authForce,
|
||||
String authDomain
|
||||
) {
|
||||
public static final int CONFIG_VERSION = 1;
|
||||
private static TweaksConfig config;
|
||||
|
||||
public static TweaksConfig getConfig() {
|
||||
return config;
|
||||
}
|
||||
|
||||
public static TweaksConfig load(Plugin plugin) {
|
||||
plugin.saveDefaultConfig();
|
||||
FileConfiguration config = plugin.getConfig();
|
||||
|
||||
int configVersion = config.getInt("magic number don't modify this", 0);
|
||||
RuntimeException exception = new RuntimeException("Config version is %d, expected %d".formatted(configVersion, CONFIG_VERSION));
|
||||
if (configVersion == 0) {
|
||||
throw exception;
|
||||
} else if (configVersion > CONFIG_VERSION) {
|
||||
throw new RuntimeException("Please follow update instructions", exception);
|
||||
} else if (configVersion < CONFIG_VERSION) {
|
||||
throw new RuntimeException("Did you downgrade the plugin? Remove config.yml and let the plugin re-create it", exception);
|
||||
}
|
||||
|
||||
boolean metrics = config.getBoolean("metrics");
|
||||
|
||||
boolean worldborderExpand = config.getBoolean("worldborder.expand");
|
||||
boolean worldborderHide = config.getBoolean("worldborder.hide");
|
||||
|
||||
boolean brandEnabled = config.getBoolean("brand.enabled");
|
||||
String brandText = config.getString("brand.text");
|
||||
boolean brandShowPing = config.getBoolean("brand.showPing");
|
||||
boolean brandShowMspt = config.getBoolean("brand.showMspt");
|
||||
|
||||
boolean doorDoubleOpen = config.getBoolean("doors.doubleOpen");
|
||||
boolean doorKnocking = config.getBoolean("doors.knocking");
|
||||
boolean doorEnabled = doorDoubleOpen || doorKnocking;
|
||||
|
||||
String motdSet = config.getString("motd.set");
|
||||
boolean motdEnabled = !(motdSet.equals("false") || motdSet.isBlank());
|
||||
|
||||
boolean chatEnabled = config.getBoolean("chat.enabled");
|
||||
boolean chatLocalEvents = config.getBoolean("chat.localEvents");
|
||||
String chatDefaultName = config.getString("chat.defaultName");
|
||||
int chatRadius = config.getInt("chat.radius");
|
||||
|
||||
boolean compassEnabled = config.getBoolean("compass.enabled");
|
||||
int compassWidth = config.getInt("compass.width");
|
||||
int compassPrecision = config.getInt("compass.precision");
|
||||
|
||||
boolean pomodoroEnabled = config.getBoolean("pomodoro.enabled");
|
||||
boolean pomodoroForce = config.getBoolean("pomodoro.force");
|
||||
|
||||
boolean updaterEnabled = config.getBoolean("updater.enabled");
|
||||
|
||||
boolean hardcoreEnabled = config.getBoolean("hardcore.enabled");
|
||||
float hardcoreChance = (float) config.getDouble("hardcore.chance");
|
||||
|
||||
boolean sleepEnabled = config.getBoolean("sleep.enabled");
|
||||
boolean sleepInstant = config.getBoolean("sleep.instant");
|
||||
|
||||
boolean authEnabled = config.getBoolean("auth.enabled");
|
||||
boolean authForce = config.getBoolean("auth.force");
|
||||
String authHostname = config.getString("auth.domain");
|
||||
|
||||
TweaksConfig.config = new TweaksConfig(
|
||||
metrics,
|
||||
worldborderExpand, worldborderHide,
|
||||
brandEnabled, brandText, brandShowPing, brandShowMspt,
|
||||
doorEnabled, doorDoubleOpen, doorKnocking,
|
||||
motdEnabled, motdSet,
|
||||
chatEnabled, chatLocalEvents, chatDefaultName, chatRadius,
|
||||
compassEnabled, compassWidth, compassPrecision,
|
||||
pomodoroEnabled, pomodoroForce,
|
||||
updaterEnabled,
|
||||
hardcoreEnabled, hardcoreChance,
|
||||
sleepEnabled, sleepInstant,
|
||||
authEnabled, authForce, authHostname
|
||||
);
|
||||
|
||||
return TweaksConfig.config;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
|
@ -7,40 +7,32 @@
|
|||
package eu.m724.tweaks;
|
||||
|
||||
import eu.m724.mstats.MStatsPlugin;
|
||||
import eu.m724.tweaks.config.TweaksConfig;
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
import eu.m724.tweaks.module.alert.AlertModule;
|
||||
import eu.m724.tweaks.module.auth.AuthModule;
|
||||
import eu.m724.tweaks.module.chat.ChatModule;
|
||||
import eu.m724.tweaks.module.door.DoorKnockModule;
|
||||
import eu.m724.tweaks.module.door.DoorOpenModule;
|
||||
import eu.m724.tweaks.module.durability.DurabilityModule;
|
||||
import eu.m724.tweaks.module.full.FullModule;
|
||||
import eu.m724.tweaks.module.hardcore.HardcoreModule;
|
||||
import eu.m724.tweaks.module.killswitch.KillswitchModule;
|
||||
import eu.m724.tweaks.module.knockback.KnockbackModule;
|
||||
import eu.m724.tweaks.module.motd.MotdModule;
|
||||
import eu.m724.tweaks.module.ping.F3NameListener;
|
||||
import eu.m724.tweaks.module.ping.PingChecker;
|
||||
import eu.m724.tweaks.module.pomodoro.PomodoroModule;
|
||||
import eu.m724.tweaks.module.redstone.RedstoneModule;
|
||||
import eu.m724.tweaks.module.sleep.SleepModule;
|
||||
import eu.m724.tweaks.module.swing.SwingModule;
|
||||
import eu.m724.tweaks.module.updater.UpdaterModule;
|
||||
import eu.m724.tweaks.module.wordcoords.WordCoordsModule;
|
||||
import eu.m724.tweaks.module.worldborder.WorldBorderExpandModule;
|
||||
import eu.m724.tweaks.module.worldborder.WorldBorderHideModule;
|
||||
import eu.m724.tweaks.alert.AlertManager;
|
||||
import eu.m724.tweaks.auth.AuthManager;
|
||||
import eu.m724.tweaks.chat.ChatCommands;
|
||||
import eu.m724.tweaks.chat.ChatManager;
|
||||
import eu.m724.tweaks.door.DoorManager;
|
||||
import eu.m724.tweaks.full.FullListener;
|
||||
import eu.m724.tweaks.hardcore.HardcoreManager;
|
||||
import eu.m724.tweaks.motd.MotdManager;
|
||||
import eu.m724.tweaks.ping.F3NameListener;
|
||||
import eu.m724.tweaks.ping.PingChecker;
|
||||
import eu.m724.tweaks.ping.PingCommands;
|
||||
import eu.m724.tweaks.pomodoro.PomodoroCommands;
|
||||
import eu.m724.tweaks.pomodoro.PomodoroManager;
|
||||
import eu.m724.tweaks.sleep.SleepManager;
|
||||
import eu.m724.tweaks.updater.UpdaterCommands;
|
||||
import eu.m724.tweaks.updater.UpdaterManager;
|
||||
import eu.m724.tweaks.worldborder.WorldBorderManager;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Locale;
|
||||
import java.util.logging.Level;
|
||||
import java.util.Objects;
|
||||
|
||||
public class TweaksPlugin extends MStatsPlugin {
|
||||
private static TweaksPlugin INSTANCE;
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
long start = System.nanoTime();
|
||||
INSTANCE = this;
|
||||
|
||||
if (getServer().getPluginManager().getPlugin("ProtocolLib") == null) {
|
||||
getLogger().severe("ProtocolLib is required for this plugin.");
|
||||
|
|
@ -49,141 +41,84 @@ public class TweaksPlugin extends MStatsPlugin {
|
|||
return;
|
||||
}
|
||||
|
||||
TweaksConfig config;
|
||||
try {
|
||||
config = TweaksConfig.load(this);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException("Exception loading config", e);
|
||||
}
|
||||
TweaksConfig config = TweaksConfig.load(this);
|
||||
new Language(Locale.US); // TODO
|
||||
|
||||
getLogger().setLevel(config.debug() ? Level.FINEST : Level.INFO);
|
||||
DebugLogger.logger = getLogger();
|
||||
|
||||
if (config.debug()) {
|
||||
DebugLogger.warning("Debug harms performance");
|
||||
}
|
||||
|
||||
DebugLogger.fine("Language");
|
||||
new Language(Locale.of(config.locale())); // TODO
|
||||
DebugLogger.fine(Language.getString("languageNotice", Language.getString("language"), Language.getString("languageEnglish")));
|
||||
|
||||
var runningVersion = getServer().getBukkitVersion();
|
||||
var targetVersion = getTargetVersion();
|
||||
|
||||
if (!runningVersion.equals(targetVersion)) {
|
||||
// the incompatibility can be between 1.21.4-R0.1-SNAPSHOT and 1.21.4-R1-SNAPSHOT
|
||||
var runningMc = runningVersion.split("-")[0];
|
||||
var targetMc = targetVersion.split("-")[0];
|
||||
if (!runningMc.equals(targetMc)) {
|
||||
targetVersion = targetMc;
|
||||
runningVersion = runningMc;
|
||||
}
|
||||
|
||||
getLogger().warning("This plugin was built for %s. This server is running %s.".formatted(targetVersion, runningVersion));
|
||||
getLogger().warning("Some modules will not work. Disable those modules, or make a compatible build yourself:");
|
||||
getLogger().warning("https://git.m724.eu/Minecon724/tweaks724/src/branch/master/docs/BUILDING.md");
|
||||
}
|
||||
|
||||
/* start modules */
|
||||
|
||||
if (config.worldborderHide()) {
|
||||
TweaksModule.init(WorldBorderHideModule.class);
|
||||
}
|
||||
|
||||
if (config.worldborderExpand()) {
|
||||
TweaksModule.init(WorldBorderExpandModule.class);
|
||||
}
|
||||
// whether enabled is handled inside
|
||||
new WorldBorderManager().init(this);
|
||||
|
||||
if (config.chatEnabled()) {
|
||||
TweaksModule.init(ChatModule.class);
|
||||
ChatManager chatManager = new ChatManager(this);
|
||||
chatManager.init();
|
||||
|
||||
ChatCommands chatCommands = new ChatCommands(chatManager);
|
||||
Objects.requireNonNull(getCommand("chat")).setExecutor(chatCommands);
|
||||
Objects.requireNonNull(getCommand("chatmanage")).setExecutor(chatCommands);
|
||||
}
|
||||
|
||||
if (config.doorKnocking()) {
|
||||
TweaksModule.init(DoorKnockModule.class);
|
||||
}
|
||||
|
||||
if (config.doorDoubleOpen()) {
|
||||
TweaksModule.init(DoorOpenModule.class);
|
||||
if (config.doorEnabled()) {
|
||||
new DoorManager().init(this);
|
||||
}
|
||||
|
||||
if (config.brandEnabled()) {
|
||||
DebugLogger.fine("Enabling Brand");
|
||||
new F3NameListener(this).init();
|
||||
}
|
||||
|
||||
DebugLogger.fine("Enabling Ping");
|
||||
new PingChecker(this).init(getCommand("ping"));
|
||||
new PingChecker(this).init();
|
||||
Objects.requireNonNull(getCommand("ping")).setExecutor(new PingCommands());
|
||||
|
||||
/*if (getServer().getPluginManager().getPlugin("voicechat") != null) {
|
||||
new MusicPlayer(this).init();
|
||||
} else {
|
||||
getLogger().warning("To use voice extensions, install \"Simple Voice Chat\"");
|
||||
}*/
|
||||
|
||||
if (config.motdEnabled()) {
|
||||
TweaksModule.init(MotdModule.class);
|
||||
try {
|
||||
new MotdManager(this).init();
|
||||
} catch (IOException e) {
|
||||
getLogger().severe("Failed to initialize MOTD extension");
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
if (config.pomodoroEnabled()) {
|
||||
TweaksModule.init(PomodoroModule.class);
|
||||
new PomodoroManager(this).init();
|
||||
getCommand("pomodoro").setExecutor(new PomodoroCommands());
|
||||
}
|
||||
|
||||
if (config.updaterEnabled()) {
|
||||
TweaksModule.init(UpdaterModule.class);
|
||||
try {
|
||||
new UpdaterManager(this).init();
|
||||
getCommand("updates").setExecutor(new UpdaterCommands());
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
if (config.hardcoreEnabled()) {
|
||||
TweaksModule.init(HardcoreModule.class);
|
||||
new HardcoreManager().init(this);
|
||||
}
|
||||
|
||||
if (config.sleepEnabled()) {
|
||||
TweaksModule.init(SleepModule.class);
|
||||
new SleepManager().init(this);
|
||||
}
|
||||
|
||||
if (config.authEnabled()) {
|
||||
TweaksModule.init(AuthModule.class);
|
||||
new AuthManager(this).init(getCommand("tauth"));
|
||||
}
|
||||
|
||||
TweaksModule.init(AlertModule.class);
|
||||
new AlertManager(this).init(getCommand("emergencyalert"));
|
||||
|
||||
TweaksModule.init(FullModule.class);
|
||||
this.getServer().getPluginManager().registerEvents(new FullListener(), this);
|
||||
|
||||
if (config.redstoneEnabled()) {
|
||||
TweaksModule.init(RedstoneModule.class);
|
||||
}
|
||||
|
||||
TweaksModule.init(KnockbackModule.class);
|
||||
|
||||
if (config.killswitchEnabled()) {
|
||||
TweaksModule.init(KillswitchModule.class);
|
||||
}
|
||||
|
||||
if (config.swingEnabled()) {
|
||||
TweaksModule.init(SwingModule.class);
|
||||
}
|
||||
|
||||
TweaksModule.init(DurabilityModule.class);
|
||||
|
||||
TweaksModule.init(WordCoordsModule.class);
|
||||
|
||||
/* end modules */
|
||||
|
||||
if (config.metrics()) {
|
||||
DebugLogger.fine("Enabling Metrics");
|
||||
if (config.metrics())
|
||||
mStats(1);
|
||||
}
|
||||
|
||||
DebugLogger.fine("Took %.3f milliseconds", (System.nanoTime() - start) / 1000000.0);
|
||||
}
|
||||
|
||||
private String getTargetVersion() {
|
||||
var permission = getServer().getPluginManager().getPermission("7weaks724.ignore.this");
|
||||
|
||||
var desc = permission.getDescription().substring("Internal, not for use. ".length()).split(",");
|
||||
var version = desc[0];
|
||||
|
||||
return version;
|
||||
getLogger().info("Took %.3f milliseconds".formatted((System.nanoTime() - start) / 1000000.0));
|
||||
}
|
||||
|
||||
public boolean hasResource(String resource) {
|
||||
return this.getClassLoader().getResource(resource) != null;
|
||||
}
|
||||
|
||||
public static TweaksPlugin getInstance() {
|
||||
return INSTANCE;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.alert;
|
||||
package eu.m724.tweaks.alert;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Material;
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.alert;
|
||||
package eu.m724.tweaks.alert;
|
||||
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.command.Command;
|
||||
|
|
@ -20,9 +20,9 @@ public class AlertCommand implements CommandExecutor {
|
|||
private List<String> pending;
|
||||
private long when;
|
||||
|
||||
private final AlertModule manager;
|
||||
private final AlertManager manager;
|
||||
|
||||
public AlertCommand(AlertModule manager) {
|
||||
public AlertCommand(AlertManager manager) {
|
||||
this.manager = manager;
|
||||
}
|
||||
|
||||
|
|
@ -51,7 +51,7 @@ public class AlertCommand implements CommandExecutor {
|
|||
} else if (args[0].equalsIgnoreCase("confirm")) {
|
||||
sender.sendMessage("CONFIRM must be in all caps");
|
||||
} else if (args[0].equalsIgnoreCase("cancel")) {
|
||||
if (AlertModule.current != null) {
|
||||
if (AlertManager.current != null) {
|
||||
manager.stop();
|
||||
sender.sendMessage("Cancelled alert");
|
||||
} else if (pending != null) {
|
||||
|
|
@ -86,7 +86,7 @@ public class AlertCommand implements CommandExecutor {
|
|||
|
||||
if (pending != null) {
|
||||
when = System.currentTimeMillis();
|
||||
if (AlertModule.current != null) {
|
||||
if (AlertManager.current != null) {
|
||||
sender.sendMessage("Broadcasting a new alert will cancel the currently active one");
|
||||
}
|
||||
sender.sendMessage("Please confirm broadcast with /emergencyalert CONFIRM within 15 seconds");
|
||||
90
src/main/java/eu/m724/tweaks/alert/AlertManager.java
Normal file
90
src/main/java/eu/m724/tweaks/alert/AlertManager.java
Normal file
|
|
@ -0,0 +1,90 @@
|
|||
/*
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.alert;
|
||||
|
||||
import com.comphenix.protocol.PacketType;
|
||||
import com.comphenix.protocol.ProtocolLibrary;
|
||||
import com.comphenix.protocol.events.ListenerPriority;
|
||||
import com.comphenix.protocol.events.PacketAdapter;
|
||||
import com.comphenix.protocol.events.PacketContainer;
|
||||
import com.comphenix.protocol.events.PacketEvent;
|
||||
import eu.m724.tweaks.TweaksPlugin;
|
||||
import org.bukkit.command.PluginCommand;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class AlertManager {
|
||||
private final TweaksPlugin plugin;
|
||||
|
||||
private BukkitTask notifyTask;
|
||||
static Alert current;
|
||||
static Map<Player, Integer> pages = new HashMap<>();
|
||||
|
||||
public AlertManager(TweaksPlugin plugin) {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
public void init(PluginCommand command) {
|
||||
command.setExecutor(new AlertCommand(this));
|
||||
|
||||
ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(
|
||||
plugin,
|
||||
ListenerPriority.NORMAL,
|
||||
PacketType.Play.Client.ENCHANT_ITEM
|
||||
) {
|
||||
@Override
|
||||
public void onPacketReceiving(PacketEvent event) {
|
||||
if (current == null) return;
|
||||
if (!current.isOpen(event.getPlayer())) return;
|
||||
|
||||
PacketContainer packet = event.getPacket();
|
||||
|
||||
int windowId, buttonId;
|
||||
windowId = packet.getIntegers().read(0);
|
||||
buttonId = packet.getIntegers().read(1);
|
||||
|
||||
var page = pages.getOrDefault(event.getPlayer(),1);
|
||||
|
||||
if (buttonId == 1) { // prev page
|
||||
page--;
|
||||
} else if (buttonId == 2) { // nextc page
|
||||
page++;
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
||||
pages.put(event.getPlayer(), page);
|
||||
var npacket = new PacketContainer(PacketType.Play.Server.WINDOW_DATA);
|
||||
npacket.getIntegers().write(0, windowId);
|
||||
npacket.getIntegers().write(1, 0);
|
||||
npacket.getIntegers().write(2, page);
|
||||
ProtocolLibrary.getProtocolManager().sendServerPacket(event.getPlayer(), npacket);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public Alert start(String... content) {
|
||||
stop();
|
||||
current = new Alert(content);
|
||||
notifyTask = new AlertRunnable(current, v -> this.stop()).runTaskTimer(plugin, 0, 10);
|
||||
return current;
|
||||
}
|
||||
|
||||
public void stop() {
|
||||
if (current == null) return;
|
||||
for (Player player : plugin.getServer().getOnlinePlayers()) {
|
||||
if (current.isOpen(player))
|
||||
player.closeInventory();
|
||||
}
|
||||
pages.clear();
|
||||
notifyTask.cancel();
|
||||
current = null;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.alert;
|
||||
package eu.m724.tweaks.alert;
|
||||
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import net.md_5.bungee.api.ChatMessageType;
|
||||
|
|
@ -1,13 +1,12 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.auth;
|
||||
package eu.m724.tweaks.auth;
|
||||
|
||||
import eu.m724.tweaks.Language;
|
||||
import eu.m724.tweaks.config.TweaksConfig;
|
||||
import eu.m724.tweaks.TweaksConfig;
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
import net.md_5.bungee.api.chat.ClickEvent;
|
||||
|
|
@ -51,7 +50,7 @@ public class AuthCommands implements CommandExecutor {
|
|||
.underlined(true)
|
||||
.color(ChatColor.GRAY)
|
||||
.event(new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, hostname))
|
||||
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(Language.getString("clickToCopy"))))
|
||||
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text("Click to copy")))
|
||||
.build();
|
||||
sender.spigot().sendMessage(component);
|
||||
} else {
|
||||
|
|
@ -1,21 +1,19 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.auth;
|
||||
package eu.m724.tweaks.auth;
|
||||
|
||||
import eu.m724.tweaks.DebugLogger;
|
||||
import eu.m724.tweaks.Language;
|
||||
import eu.m724.tweaks.config.TweaksConfig;
|
||||
import eu.m724.tweaks.TweaksConfig;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerLoginEvent;
|
||||
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
|
||||
public class AuthListener implements Listener {
|
||||
private final AuthStorage authStorage;
|
||||
|
|
@ -42,10 +40,6 @@ public class AuthListener implements Listener {
|
|||
allowed = true; // key just assigned
|
||||
} catch (FileNotFoundException | AuthStorage.AlreadyClaimedException | AuthStorage.InvalidKeyException e) {
|
||||
allowed = !force; // If forced all players must have a key
|
||||
} catch (IOException e) {
|
||||
DebugLogger.severe("Error assigning key to player. " + e.getMessage());
|
||||
event.disallow(PlayerLoginEvent.Result.KICK_OTHER, Language.getString("authKickError"));
|
||||
allowed = true; // to skip the below checks
|
||||
}
|
||||
}
|
||||
|
||||
25
src/main/java/eu/m724/tweaks/auth/AuthManager.java
Normal file
25
src/main/java/eu/m724/tweaks/auth/AuthManager.java
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
/*
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.auth;
|
||||
|
||||
import org.bukkit.command.PluginCommand;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
public class AuthManager {
|
||||
private final AuthStorage authStorage;
|
||||
private final Plugin plugin;
|
||||
|
||||
public AuthManager(Plugin plugin) {
|
||||
this.plugin = plugin;
|
||||
this.authStorage = new AuthStorage(plugin);
|
||||
}
|
||||
|
||||
public void init(PluginCommand command) {
|
||||
plugin.getServer().getPluginManager().registerEvents(new AuthListener(authStorage), plugin);
|
||||
command.setExecutor(new AuthCommands(authStorage));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,34 +1,30 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.auth;
|
||||
package eu.m724.tweaks.auth;
|
||||
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
import java.io.*;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.security.SecureRandom;
|
||||
import java.util.Random;
|
||||
import java.util.UUID;
|
||||
|
||||
public class AuthStorage {
|
||||
private static final char[] KEY_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789".toCharArray();
|
||||
private static final int KEY_LENGTH = 10;
|
||||
private static final SecureRandom RANDOM = new SecureRandom();
|
||||
|
||||
private final File playersDirectory;
|
||||
private final File keysDirectory;
|
||||
|
||||
AuthStorage(Plugin plugin) {
|
||||
File directory = new File(plugin.getDataFolder(), "storage/auth");
|
||||
File directory = new File(plugin.getDataFolder(), "auth storage");
|
||||
this.playersDirectory = new File(directory, "players");
|
||||
this.keysDirectory = new File(directory, "keys");
|
||||
|
||||
keysDirectory.mkdirs();
|
||||
directory.mkdir();
|
||||
keysDirectory.mkdir();
|
||||
playersDirectory.mkdir();
|
||||
}
|
||||
|
||||
|
|
@ -76,7 +72,7 @@ public class AuthStorage {
|
|||
byte[] bytes = is.readNBytes(50);
|
||||
return new String(bytes, StandardCharsets.UTF_8);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
throw new RuntimeException(e); // TODO
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -126,7 +122,7 @@ public class AuthStorage {
|
|||
* @throws FileNotFoundException if no such key
|
||||
* @throws AlreadyClaimedException if key is claimed or user owns another key
|
||||
*/
|
||||
void assignOwner(String key, UUID uuid) throws IOException, FileNotFoundException, AlreadyClaimedException {
|
||||
void assignOwner(String key, UUID uuid) throws FileNotFoundException, AlreadyClaimedException {
|
||||
if (isInvalid(key)) throw new InvalidKeyException();
|
||||
|
||||
if (getUserOfKey(key) != null) throw new AlreadyClaimedException();
|
||||
|
|
@ -141,25 +137,34 @@ public class AuthStorage {
|
|||
|
||||
try (FileOutputStream os = new FileOutputStream(file)) {
|
||||
os.write(byteBuffer.array());
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e); // TODO
|
||||
}
|
||||
|
||||
File file2 = new File(playersDirectory, uuid.toString());
|
||||
|
||||
try (FileOutputStream os = new FileOutputStream(file2)) {
|
||||
os.write(key.getBytes(StandardCharsets.UTF_8));
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e); // TODO
|
||||
}
|
||||
}
|
||||
|
||||
// TODO improve
|
||||
String generateKey() {
|
||||
StringBuilder builder = new StringBuilder();
|
||||
char[] chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789".toCharArray();
|
||||
Random random = new Random();
|
||||
int length = random.nextInt(8, 10);
|
||||
|
||||
for (int i=0; i<KEY_LENGTH; i++) {
|
||||
builder.append(KEY_CHARS[RANDOM.nextInt(KEY_CHARS.length)]);
|
||||
StringBuilder key = new StringBuilder();
|
||||
|
||||
for (int i=0; i<length; i++) {
|
||||
key.append(chars[random.nextInt(chars.length)]);
|
||||
}
|
||||
|
||||
return builder.toString();
|
||||
return key.toString();
|
||||
}
|
||||
|
||||
static class InvalidKeyException extends RuntimeException { }
|
||||
static class AlreadyClaimedException extends Exception { }
|
||||
static class InvalidKeyException extends RuntimeException {}
|
||||
static class AlreadyClaimedException extends Exception {}
|
||||
}
|
||||
196
src/main/java/eu/m724/tweaks/chat/ChatCommands.java
Normal file
196
src/main/java/eu/m724/tweaks/chat/ChatCommands.java
Normal file
|
|
@ -0,0 +1,196 @@
|
|||
/*
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.chat;
|
||||
|
||||
import eu.m724.tweaks.Language;
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class ChatCommands implements CommandExecutor {
|
||||
private final ChatManager manager;
|
||||
|
||||
public ChatCommands(ChatManager manager) {
|
||||
this.manager = manager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCommand(@NotNull CommandSender sender, Command command, @NotNull String label, String[] args) {
|
||||
if (command.getName().equals("chat")) {
|
||||
Player player = (Player) sender;
|
||||
ChatRoom chatRoom = manager.getPlayerChatRoom(player);
|
||||
|
||||
if (args.length == 0) { // show room
|
||||
player.spigot().sendMessage(chatRoom.getInfoComponent());
|
||||
} else { // join room
|
||||
String id = args[0];
|
||||
|
||||
if (id.equals(chatRoom.id)) {
|
||||
sender.spigot().sendMessage(Language.getComponent("chatAlreadyHere", ChatColor.GRAY));
|
||||
return true;
|
||||
}
|
||||
|
||||
String password = null;
|
||||
if (args.length > 1) {
|
||||
password = Arrays.stream(args).skip(1).collect(Collectors.joining(" "));
|
||||
}
|
||||
|
||||
boolean authenticated = false;
|
||||
BaseComponent component = null;
|
||||
ChatRoom newRoom = manager.getById(id);
|
||||
if (newRoom != null) {
|
||||
if (newRoom.password != null) {
|
||||
if (newRoom.password.equals(password)) {
|
||||
authenticated = true;
|
||||
} else if (password == null) {
|
||||
component = Language.getComponent("chatPasswordProtected", ChatColor.RED);
|
||||
} else {
|
||||
component = Language.getComponent("chatWrongPassword", ChatColor.RED);
|
||||
}
|
||||
} else {
|
||||
authenticated = true;
|
||||
}
|
||||
} else {
|
||||
component = Language.getComponent("chatNoSuchRoom", ChatColor.RED, id);
|
||||
}
|
||||
|
||||
if (authenticated) {
|
||||
/*component = new ComponentBuilder(Language.getComponent("chatJoined", ChatColor.GOLD))
|
||||
.append(" ")
|
||||
.append(ChatFormatUtils.formatChatRoom(chatRoom)).color(newRoom.color)
|
||||
.build();*/
|
||||
player.sendMessage("");
|
||||
manager.setPlayerChatRoom(newRoom, player);
|
||||
} else {
|
||||
player.spigot().sendMessage(component);
|
||||
}
|
||||
|
||||
}
|
||||
} else if (command.getName().equals("chatmanage")) {
|
||||
Player player = (Player) sender;
|
||||
ChatRoom chatRoom = manager.getPlayerChatRoom(player);
|
||||
boolean isOwner = player.equals(chatRoom.owner);
|
||||
|
||||
if (args.length > 1) {
|
||||
String action = args[0];
|
||||
String argument = args[1];
|
||||
|
||||
switch (action) {
|
||||
case "create" -> {
|
||||
try {
|
||||
ChatRoom newRoom = manager.createChatRoom(argument, null, player);
|
||||
sender.sendMessage("Created a chat room. Join it: /c " + newRoom.id);
|
||||
sender.sendMessage("You might also want to protect it with a password: /cm setpassword");
|
||||
} catch (ChatManager.InvalidIdException e) {
|
||||
sender.sendMessage("ID is invalid: " + e.getMessage());
|
||||
} catch (ChatManager.ChatRoomExistsException e) {
|
||||
sender.sendMessage("Room %s already exists".formatted(argument));
|
||||
} catch (IOException e) {
|
||||
sender.sendMessage("Failed to create room");
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
case "delete" -> {
|
||||
if (argument.equals(chatRoom.id)) {
|
||||
if (isOwner) {
|
||||
manager.deleteChatRoom(chatRoom);
|
||||
sender.sendMessage("Room %s deleted".formatted(chatRoom.id));
|
||||
} else {
|
||||
sender.sendMessage("You're not the owner of %s, please enter the room you want to make changes in".formatted(chatRoom.id));
|
||||
}
|
||||
} else {
|
||||
sender.sendMessage("Pass %s as an argument to confirm".formatted(chatRoom.id));
|
||||
}
|
||||
}
|
||||
case "setowner" -> {
|
||||
if (isOwner) {
|
||||
Player newOwner = Bukkit.getPlayer(argument);
|
||||
if (newOwner != null && newOwner.isOnline()) {
|
||||
chatRoom.owner = newOwner;
|
||||
try {
|
||||
manager.saveChatRoom(chatRoom);
|
||||
sender.sendMessage("Owner changed to " + newOwner.getName());
|
||||
} catch (IOException e) {
|
||||
sender.sendMessage("Failed to change owner");
|
||||
e.printStackTrace();
|
||||
}
|
||||
} else {
|
||||
sender.sendMessage("Player must be online");
|
||||
}
|
||||
} else {
|
||||
sender.sendMessage("You're not the owner of %s, please enter the room you want to make changes in".formatted(chatRoom.id));
|
||||
}
|
||||
}
|
||||
case "setpassword" -> {
|
||||
if (isOwner) {
|
||||
chatRoom.password = Arrays.stream(args).skip(1).collect(Collectors.joining(" "));
|
||||
try {
|
||||
manager.saveChatRoom(chatRoom);
|
||||
sender.sendMessage("Password changed");
|
||||
} catch (IOException e) {
|
||||
sender.sendMessage("Failed to change password");
|
||||
e.printStackTrace();
|
||||
}
|
||||
} else {
|
||||
sender.sendMessage("You're not the owner of %s, please enter the room you want to make changes in".formatted(chatRoom.id));
|
||||
}
|
||||
}
|
||||
case "setcolor" -> {
|
||||
if (isOwner) {
|
||||
ChatColor newColor = ChatColor.of(argument);
|
||||
if (newColor != null) {
|
||||
chatRoom.color = newColor;
|
||||
try {
|
||||
manager.saveChatRoom(chatRoom);
|
||||
sender.sendMessage("Message color changed to " + newColor.getName());
|
||||
} catch (IOException e) {
|
||||
sender.sendMessage("Failed to change color");
|
||||
e.printStackTrace();
|
||||
}
|
||||
} else {
|
||||
sender.sendMessage("Invalid color");
|
||||
}
|
||||
} else {
|
||||
sender.sendMessage("You're not the owner of %s, please enter the room you want to make changes in".formatted(chatRoom.id));
|
||||
}
|
||||
}
|
||||
default -> {
|
||||
sender.sendMessage("Actions: create, delete, setowner, setpassword, setcolor");
|
||||
}
|
||||
}
|
||||
} else if (args.length > 0) {
|
||||
switch (args[0]) {
|
||||
case "create" ->
|
||||
sender.sendMessage("Please pass a room name as an argument. The room name must be of characters and digits.");
|
||||
case "delete" ->
|
||||
sender.sendMessage("You want to delete room %s. Confirm by passing its name as an argument for this action.".formatted(chatRoom.id));
|
||||
case "setowner" ->
|
||||
sender.sendMessage("To transfer ownership of room %s, pass the new owner name as an argument for this action.".formatted(chatRoom.id));
|
||||
case "setpassword" ->
|
||||
sender.sendMessage("To change the password of room %s, pass the new password as an argument for this action.".formatted(chatRoom.id));
|
||||
case "setcolor" ->
|
||||
sender.sendMessage("To change the message color of room %s, pass the new color as an argument for this action. #hex or color name.".formatted(chatRoom.id));
|
||||
default ->
|
||||
sender.sendMessage("Actions: create, delete, setowner, setpassword, setcolor");
|
||||
}
|
||||
} else {
|
||||
sender.sendMessage("Actions: create, delete, setowner, setpassword, setcolor");
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.chat;
|
||||
package eu.m724.tweaks.chat;
|
||||
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.chat;
|
||||
package eu.m724.tweaks.chat;
|
||||
|
||||
import eu.m724.tweaks.config.TweaksConfig;
|
||||
import eu.m724.tweaks.TweaksConfig;
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
import net.md_5.bungee.api.chat.ComponentBuilder;
|
||||
|
|
@ -14,8 +14,8 @@ import net.md_5.bungee.api.chat.TextComponent;
|
|||
import net.md_5.bungee.api.chat.TranslatableComponent;
|
||||
import net.md_5.bungee.chat.ComponentSerializer;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import org.bukkit.craftbukkit.v1_21_R3.CraftRegistry;
|
||||
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPlayer;
|
||||
import org.bukkit.craftbukkit.v1_21_R1.CraftRegistry;
|
||||
import org.bukkit.craftbukkit.v1_21_R1.entity.CraftPlayer;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
|
|
@ -25,14 +25,13 @@ import org.bukkit.event.player.PlayerJoinEvent;
|
|||
import org.bukkit.event.player.PlayerQuitEvent;
|
||||
|
||||
public class ChatListener implements Listener {
|
||||
private final ChatModule chatModule;
|
||||
private final ChatManager chatManager;
|
||||
private final String defaultRoom = TweaksConfig.getConfig().chatDefaultName();
|
||||
private final boolean localEvents = TweaksConfig.getConfig().chatLocalEvents();
|
||||
private final int radius;
|
||||
|
||||
public ChatListener(ChatModule chatModule) {
|
||||
this.chatModule = chatModule;
|
||||
|
||||
public ChatListener(ChatManager chatManager) {
|
||||
this.chatManager = chatManager;
|
||||
if (TweaksConfig.getConfig().chatRadius() < 0) {
|
||||
radius = 0;
|
||||
} else {
|
||||
|
|
@ -53,7 +52,7 @@ public class ChatListener implements Listener {
|
|||
@EventHandler
|
||||
public void onPlayerJoin(PlayerJoinEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
ChatRoom chatRoom = chatModule.getPlayerChatRoom(player);
|
||||
ChatRoom chatRoom = chatManager.getPlayerChatRoom(player);
|
||||
|
||||
if (localEvents) {
|
||||
var cb = new ComponentBuilder()
|
||||
|
|
@ -78,7 +77,7 @@ public class ChatListener implements Listener {
|
|||
@EventHandler
|
||||
public void onPlayerQuit(PlayerQuitEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
ChatRoom chatRoom = chatModule.removePlayer(player);
|
||||
ChatRoom chatRoom = chatManager.removePlayer(player);
|
||||
|
||||
if (localEvents) {
|
||||
var cb = new ComponentBuilder()
|
||||
|
|
@ -104,7 +103,7 @@ public class ChatListener implements Listener {
|
|||
public void onPlayerDeath(PlayerDeathEvent event) {
|
||||
if (localEvents) {
|
||||
Player player = event.getEntity();
|
||||
ChatRoom chatRoom = chatModule.getPlayerChatRoom(player);
|
||||
ChatRoom chatRoom = chatManager.getPlayerChatRoom(player);
|
||||
|
||||
// would be easier on Paper but this is not Paper
|
||||
BaseComponent deathMessage = ComponentSerializer.deserialize(Component.Serializer.toJson(((CraftPlayer)player).getHandle().getCombatTracker().getDeathMessage(), CraftRegistry.getMinecraftRegistry()));
|
||||
|
|
@ -125,7 +124,7 @@ public class ChatListener implements Listener {
|
|||
|
||||
// broadcast to killer if available
|
||||
if (player.getLastDamageCause().getDamageSource().getCausingEntity() instanceof Player killer) {
|
||||
ChatRoom chatRoom2 = chatModule.getPlayerChatRoom(killer);
|
||||
ChatRoom chatRoom2 = chatManager.getPlayerChatRoom(killer);
|
||||
if (chatRoom != chatRoom2) {
|
||||
if (proximityFor(chatRoom)) {
|
||||
chatRoom2.broadcastNear(killer.getLocation(), radius, component);
|
||||
|
|
@ -143,7 +142,7 @@ public class ChatListener implements Listener {
|
|||
@EventHandler
|
||||
public void onAsyncPlayerChat(AsyncPlayerChatEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
ChatRoom chatRoom = chatModule.getPlayerChatRoom(player);
|
||||
ChatRoom chatRoom = chatManager.getPlayerChatRoom(player);
|
||||
String message = event.getMessage();
|
||||
|
||||
var component = new ComponentBuilder()
|
||||
|
|
@ -1,45 +1,45 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.chat;
|
||||
package eu.m724.tweaks.chat;
|
||||
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
import eu.m724.tweaks.TweaksConfig;
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import net.md_5.bungee.api.chat.ComponentBuilder;
|
||||
import org.bukkit.NamespacedKey;
|
||||
import org.bukkit.OfflinePlayer;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.persistence.PersistentDataType;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class ChatModule extends TweaksModule {
|
||||
private final NamespacedKey chatRoomKey = new NamespacedKey(getPlugin(), "chatRoom");
|
||||
private final String defaultRoom = getConfig().chatDefaultName();
|
||||
public class ChatManager {
|
||||
private final Plugin plugin;
|
||||
private final NamespacedKey chatRoomKey;
|
||||
private final String defaultRoom;
|
||||
|
||||
private final Map<Player, ChatRoom> playerMap = new HashMap<>();
|
||||
private final Map<String, ChatRoom> roomIdMap = new HashMap<>();
|
||||
|
||||
public ChatManager(Plugin plugin) {
|
||||
this.plugin = plugin;
|
||||
this.chatRoomKey = new NamespacedKey(plugin, "chatRoom");
|
||||
this.defaultRoom = TweaksConfig.getConfig().chatDefaultName();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onInit() {
|
||||
if (getPlugin().getServer().isEnforcingSecureProfiles()) {
|
||||
public void init() {
|
||||
if (plugin.getServer().isEnforcingSecureProfiles()) {
|
||||
throw new RuntimeException("Please disable enforce-secure-profile in server.properties to use chatrooms");
|
||||
}
|
||||
|
||||
ChatRoomLoader.init(getPlugin());
|
||||
getById(defaultRoom);
|
||||
registerEvents(new ChatListener(this));
|
||||
|
||||
var chatCommands = new ChatCommands(this);
|
||||
registerCommand("chat", chatCommands);
|
||||
registerCommand("chatmanage", chatCommands);
|
||||
|
||||
plugin.getServer().getPluginManager().registerEvents(new ChatListener(this), plugin);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -69,7 +69,7 @@ public class ChatModule extends TweaksModule {
|
|||
if (id.equals(defaultRoom)) {
|
||||
chatRoom = new ChatRoom(defaultRoom, null, null);
|
||||
} else {
|
||||
chatRoom = ChatRoomLoader.load(id);
|
||||
chatRoom = ChatRoomLoader.load(plugin, id);
|
||||
}
|
||||
roomIdMap.put(id, chatRoom);
|
||||
}
|
||||
|
|
@ -155,28 +155,28 @@ public class ChatModule extends TweaksModule {
|
|||
case 0:
|
||||
break;
|
||||
case 1:
|
||||
throw new InvalidIdException("ID is too short, it must be at least 2 chars long");
|
||||
throw new InvalidIdException("ID is too short, make it at least 2 chars");
|
||||
case 2:
|
||||
throw new InvalidIdException("ID is too long, it mustn't be longer than 20 chars");
|
||||
throw new InvalidIdException("ID is too long, make it 20 chars or shorter");
|
||||
case 4:
|
||||
throw new InvalidIdException("ID must be of characters a-z and numbers 0-9");
|
||||
throw new InvalidIdException("ID must be composed from characters a-z and numbers 0-9");
|
||||
}
|
||||
|
||||
if (getById(id) != null)
|
||||
throw new ChatRoomExistsException();
|
||||
|
||||
ChatRoom chatRoom = new ChatRoom(id, password, owner);
|
||||
ChatRoomLoader.save(chatRoom);
|
||||
ChatRoomLoader.save(plugin, chatRoom);
|
||||
return chatRoom;
|
||||
}
|
||||
|
||||
void saveChatRoom(ChatRoom chatRoom) throws IOException {
|
||||
ChatRoomLoader.save(chatRoom);
|
||||
ChatRoomLoader.save(plugin, chatRoom);
|
||||
}
|
||||
|
||||
public void deleteChatRoom(ChatRoom chatRoom) {
|
||||
roomIdMap.remove(chatRoom.id);
|
||||
ChatRoomLoader.getFile(chatRoom.id).delete();
|
||||
ChatRoomLoader.getFile(plugin, chatRoom.id).delete();
|
||||
chatRoom.players.forEach(player -> setPlayerChatRoom(getById(defaultRoom), player));
|
||||
}
|
||||
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.chat;
|
||||
package eu.m724.tweaks.chat;
|
||||
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.chat;
|
||||
package eu.m724.tweaks.chat;
|
||||
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import org.bukkit.Bukkit;
|
||||
|
|
@ -13,25 +13,23 @@ import org.bukkit.plugin.Plugin;
|
|||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.UUID;
|
||||
|
||||
public class ChatRoomLoader {
|
||||
private static File chatRoomsDir;
|
||||
|
||||
static void init(Plugin plugin) {
|
||||
chatRoomsDir = new File(plugin.getDataFolder(), "storage/rooms");
|
||||
chatRoomsDir.mkdirs();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the file of persistent storage of a chat room
|
||||
* @return the file or null if ID is invalid
|
||||
*/
|
||||
static File getFile(String id) {
|
||||
if (validateId(id) != 0)
|
||||
return null;
|
||||
static File getFile(Plugin plugin, String id) {
|
||||
Path chatRoomsPath = Paths.get(plugin.getDataFolder().getPath(), "rooms");
|
||||
chatRoomsPath.toFile().mkdirs();
|
||||
|
||||
return new File(chatRoomsDir, id + ".yml");
|
||||
if (validateId(id) != 0)
|
||||
throw new RuntimeException("Invalid id: " + id);
|
||||
|
||||
return Paths.get(chatRoomsPath.toFile().getPath(), id + ".yml").toFile();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -64,10 +62,9 @@ public class ChatRoomLoader {
|
|||
* @param id the id of the chat room
|
||||
* @return the chat room or null if no such chat room
|
||||
*/
|
||||
static ChatRoom load(String id) {
|
||||
File chatRoomFile = getFile(id);
|
||||
if (chatRoomFile == null || !chatRoomFile.exists())
|
||||
return null;
|
||||
static ChatRoom load(Plugin plugin, String id) {
|
||||
File chatRoomFile = getFile(plugin, id);
|
||||
if (!chatRoomFile.exists()) return null;
|
||||
|
||||
YamlConfiguration configuration = YamlConfiguration.loadConfiguration(chatRoomFile);
|
||||
|
||||
|
|
@ -92,15 +89,14 @@ public class ChatRoomLoader {
|
|||
*
|
||||
* @throws IOException if saving failed
|
||||
*/
|
||||
static void save(ChatRoom chatRoom) throws IOException {
|
||||
static void save(Plugin plugin, ChatRoom chatRoom) throws IOException {
|
||||
YamlConfiguration configuration = new YamlConfiguration();
|
||||
configuration.set("password", chatRoom.password);
|
||||
configuration.set("color", chatRoom.color.getName());
|
||||
// TODO consider just making this str to make it easier
|
||||
configuration.set("owner.msb", chatRoom.owner.getUniqueId().getMostSignificantBits());
|
||||
configuration.set("owner.lsb", chatRoom.owner.getUniqueId().getLeastSignificantBits());
|
||||
|
||||
File chatRoomFile = getFile(chatRoom.id);
|
||||
File chatRoomFile = getFile(plugin, chatRoom.id);
|
||||
configuration.save(chatRoomFile);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.compass;
|
||||
package eu.m724.tweaks.compass;
|
||||
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
import eu.m724.tweaks.TweaksConfig;
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import net.md_5.bungee.api.ChatMessageType;
|
||||
import net.md_5.bungee.api.chat.ComponentBuilder;
|
||||
|
|
@ -25,9 +25,9 @@ import java.util.LinkedHashMap;
|
|||
import java.util.Map;
|
||||
|
||||
// TODO dimension check
|
||||
public class CompassModule extends TweaksModule implements Listener {
|
||||
private final int precision = getConfig().compassPrecision(); // degrees every point
|
||||
private final int width = getConfig().compassWidth(); // points left to right
|
||||
public class CompassListener implements Listener {
|
||||
private final int precision = TweaksConfig.getConfig().compassPrecision(); // degrees every point
|
||||
private final int width = TweaksConfig.getConfig().compassWidth(); // points left to right
|
||||
|
||||
private final Map<Integer, String> points = Map.of(
|
||||
0, ChatColor.DARK_GRAY + "S",
|
||||
|
|
@ -36,11 +36,6 @@ public class CompassModule extends TweaksModule implements Listener {
|
|||
270, ChatColor.DARK_GRAY + "E"
|
||||
);
|
||||
|
||||
@Override
|
||||
protected void onInit() {
|
||||
registerEvents(this);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {
|
||||
if (event.getMainHandItem().getType() == Material.COMPASS || event.getOffHandItem().getType() == Material.COMPASS) {
|
||||
21
src/main/java/eu/m724/tweaks/compass/CompassManager.java
Normal file
21
src/main/java/eu/m724/tweaks/compass/CompassManager.java
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
/*
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.compass;
|
||||
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
public class CompassManager {
|
||||
private final Plugin plugin;
|
||||
|
||||
public CompassManager(Plugin plugin) {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
public void init() {
|
||||
plugin.getServer().getPluginManager().registerEvents(new CompassListener(), plugin);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.compass;
|
||||
package eu.m724.tweaks.compass;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
|
@ -1,143 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.config;
|
||||
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
class ConfigLoader {
|
||||
private final FileConfiguration configuration;
|
||||
private final List<String> missing = new ArrayList<>();
|
||||
|
||||
ConfigLoader(FileConfiguration configuration) {
|
||||
this.configuration = configuration;
|
||||
}
|
||||
|
||||
List<String> getMissing() {
|
||||
return missing;
|
||||
}
|
||||
|
||||
TweaksConfig load() {
|
||||
boolean metrics = configuration.getBoolean("metrics", false);
|
||||
boolean debug = configuration.getBoolean("debug", false);
|
||||
String locale = configuration.getString("locale", "US");
|
||||
|
||||
boolean worldborderExpand = getBoolean("worldborder.expand");
|
||||
boolean worldborderHide = getBoolean("worldborder.hide");
|
||||
|
||||
boolean brandEnabled = getBoolean("brand.enabled");
|
||||
String brandText = getString("brand.text");
|
||||
boolean brandShowPing = getBoolean("brand.showPing");
|
||||
boolean brandShowMspt = getBoolean("brand.showMspt");
|
||||
|
||||
boolean doorDoubleOpen = getBoolean("doors.doubleOpen");
|
||||
boolean doorKnocking = getBoolean("doors.knocking");
|
||||
|
||||
boolean motdEnabled = getBoolean("motd.enabled");
|
||||
String motdSet = getString("motd.set");
|
||||
|
||||
boolean chatEnabled = getBoolean("chat.enabled");
|
||||
boolean chatLocalEvents = getBoolean("chat.localEvents");
|
||||
String chatDefaultName = getString("chat.defaultName");
|
||||
int chatRadius = getInt("chat.radius");
|
||||
|
||||
boolean compassEnabled = getBoolean("compass.enabled");
|
||||
int compassWidth = getInt("compass.width");
|
||||
int compassPrecision = getInt("compass.precision");
|
||||
|
||||
boolean pomodoroEnabled = getBoolean("pomodoro.enabled");
|
||||
boolean pomodoroForce = getBoolean("pomodoro.force");
|
||||
|
||||
boolean updaterEnabled = getBoolean("updater.enabled");
|
||||
|
||||
boolean hardcoreEnabled = getBoolean("hardcore.enabled");
|
||||
double hardcoreChance = getDouble("hardcore.chance");
|
||||
|
||||
boolean sleepEnabled = getBoolean("sleep.enabled");
|
||||
boolean sleepInstant = getBoolean("sleep.instant");
|
||||
double sleepHeal = getDouble("sleep.heal");
|
||||
|
||||
boolean authEnabled = getBoolean("auth.enabled");
|
||||
boolean authForce = getBoolean("auth.force");
|
||||
String authHostname = getString("auth.domain");
|
||||
|
||||
boolean redstoneEnabled = getBoolean("retstone.enabled");
|
||||
String redstoneListen = getString("retstone.listen");
|
||||
|
||||
// this is processed when initing knockback module
|
||||
Map<String, Object> knockbackModifiers = getValues("knockback");
|
||||
|
||||
boolean killswitchEnabled = getBoolean("killswitch.enabled");
|
||||
String killswitchListen = getString("killswitch.listen");
|
||||
|
||||
boolean swingEnabled = getBoolean("swing.enabled");
|
||||
|
||||
return new TweaksConfig(
|
||||
metrics, debug, locale,
|
||||
worldborderExpand, worldborderHide,
|
||||
brandEnabled, brandText, brandShowPing, brandShowMspt,
|
||||
doorDoubleOpen, doorKnocking,
|
||||
motdEnabled, motdSet,
|
||||
chatEnabled, chatLocalEvents, chatDefaultName, chatRadius,
|
||||
compassEnabled, compassWidth, compassPrecision,
|
||||
pomodoroEnabled, pomodoroForce,
|
||||
updaterEnabled,
|
||||
hardcoreEnabled, hardcoreChance,
|
||||
sleepEnabled, sleepInstant, sleepHeal,
|
||||
authEnabled, authForce, authHostname,
|
||||
redstoneEnabled, redstoneListen,
|
||||
knockbackModifiers,
|
||||
killswitchEnabled, killswitchListen,
|
||||
swingEnabled
|
||||
);
|
||||
}
|
||||
|
||||
private double getDouble(String key) {
|
||||
if (!configuration.contains(key))
|
||||
missing.add(key);
|
||||
|
||||
// we return the whatever default value
|
||||
return configuration.getDouble(key);
|
||||
}
|
||||
|
||||
private int getInt(String key) {
|
||||
if (!configuration.contains(key))
|
||||
missing.add(key);
|
||||
|
||||
return configuration.getInt(key);
|
||||
}
|
||||
|
||||
private boolean getBoolean(String key) {
|
||||
if (!configuration.contains(key))
|
||||
missing.add(key);
|
||||
|
||||
return configuration.getBoolean(key);
|
||||
}
|
||||
|
||||
private String getString(String key) {
|
||||
if (!configuration.contains(key))
|
||||
missing.add(key);
|
||||
|
||||
return configuration.getString(key);
|
||||
}
|
||||
|
||||
private Map<String, Object> getValues(String key) {
|
||||
var cs = configuration.getConfigurationSection(key);
|
||||
|
||||
if (cs == null) {
|
||||
missing.add(key);
|
||||
// the default is null, which is bad
|
||||
return new HashMap<>();
|
||||
}
|
||||
|
||||
return cs.getValues(false);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.config;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
class MissingFieldsException extends Exception {
|
||||
private final List<String> missing;
|
||||
|
||||
MissingFieldsException(List<String> missing) {
|
||||
this.missing = missing;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMessage() {
|
||||
return String.join(", ", missing);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,103 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.config;
|
||||
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public record TweaksConfig(
|
||||
boolean metrics,
|
||||
boolean debug,
|
||||
String locale,
|
||||
|
||||
boolean worldborderExpand,
|
||||
boolean worldborderHide,
|
||||
|
||||
boolean brandEnabled,
|
||||
String brandText,
|
||||
boolean brandShowPing,
|
||||
boolean brandShowMspt,
|
||||
|
||||
boolean doorDoubleOpen,
|
||||
boolean doorKnocking,
|
||||
|
||||
boolean motdEnabled,
|
||||
String motdSet,
|
||||
|
||||
boolean chatEnabled,
|
||||
boolean chatLocalEvents,
|
||||
String chatDefaultName,
|
||||
int chatRadius,
|
||||
|
||||
boolean compassEnabled,
|
||||
int compassWidth,
|
||||
int compassPrecision,
|
||||
|
||||
boolean pomodoroEnabled,
|
||||
boolean pomodoroForce,
|
||||
|
||||
boolean updaterEnabled,
|
||||
|
||||
boolean hardcoreEnabled,
|
||||
double hardcoreChance,
|
||||
|
||||
boolean sleepEnabled,
|
||||
boolean sleepInstant,
|
||||
double sleepHeal,
|
||||
|
||||
boolean authEnabled,
|
||||
boolean authForce,
|
||||
String authDomain,
|
||||
|
||||
boolean redstoneEnabled,
|
||||
String redstoneListen,
|
||||
|
||||
Map<String, Object> knockbackModifiers,
|
||||
|
||||
boolean killswitchEnabled,
|
||||
String killswitchListen,
|
||||
|
||||
boolean swingEnabled
|
||||
) {
|
||||
public static final int CONFIG_VERSION = 2;
|
||||
private static TweaksConfig config;
|
||||
|
||||
public static TweaksConfig getConfig() {
|
||||
return config;
|
||||
}
|
||||
|
||||
public static TweaksConfig load(Plugin plugin) throws Exception {
|
||||
plugin.saveDefaultConfig();
|
||||
var pluginConfig = plugin.getConfig();
|
||||
|
||||
var configVersion = pluginConfig.getInt("magic number don't modify this", 0);
|
||||
var exception = new RuntimeException("Config version is %d, expected %d".formatted(configVersion, CONFIG_VERSION));
|
||||
|
||||
if (configVersion == 0) {
|
||||
throw exception;
|
||||
} else if (configVersion < CONFIG_VERSION) {
|
||||
throw new Exception("Please follow update instructions https://www.spigotmc.org/resources/tweaks724.121057/updates", exception);
|
||||
} else if (configVersion > CONFIG_VERSION) {
|
||||
throw new Exception("Did you downgrade the plugin? Delete config.yml and let the plugin re-create it", exception);
|
||||
}
|
||||
|
||||
var loader = new ConfigLoader(pluginConfig);
|
||||
var config = loader.load();
|
||||
|
||||
if (loader.getMissing().isEmpty()) {
|
||||
TweaksConfig.config = config;
|
||||
return config;
|
||||
} else {
|
||||
throw new Exception(
|
||||
"One or more fields are missing from config.yml. Did you follow the update instructions? https://www.spigotmc.org/resources/tweaks724.121057/updates",
|
||||
new MissingFieldsException(loader.getMissing())
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,12 +1,11 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.door;
|
||||
package eu.m724.tweaks.door;
|
||||
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.Sound;
|
||||
|
|
@ -23,12 +22,7 @@ import org.bukkit.util.RayTraceResult;
|
|||
|
||||
import java.util.concurrent.ThreadLocalRandom;
|
||||
|
||||
public class DoorKnockModule extends TweaksModule implements Listener {
|
||||
@Override
|
||||
protected void onInit() {
|
||||
registerEvents(this);
|
||||
}
|
||||
|
||||
public class DoorKnockListener implements Listener {
|
||||
@EventHandler
|
||||
public void onBlockDamageAbort(BlockDamageAbortEvent event) {
|
||||
Block block = event.getBlock();
|
||||
24
src/main/java/eu/m724/tweaks/door/DoorManager.java
Normal file
24
src/main/java/eu/m724/tweaks/door/DoorManager.java
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
/*
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.door;
|
||||
|
||||
import eu.m724.tweaks.TweaksConfig;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
public class DoorManager {
|
||||
|
||||
public void init(Plugin plugin) {
|
||||
if (TweaksConfig.getConfig().doorKnocking()) {
|
||||
plugin.getServer().getPluginManager().registerEvents(new DoorKnockListener(), plugin);
|
||||
}
|
||||
|
||||
if (TweaksConfig.getConfig().doorDoubleOpen()) {
|
||||
plugin.getServer().getPluginManager().registerEvents(new DoorOpenListener(), plugin);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,12 +1,11 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.door;
|
||||
package eu.m724.tweaks.door;
|
||||
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
import org.bukkit.*;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.block.BlockFace;
|
||||
|
|
@ -16,11 +15,7 @@ import org.bukkit.event.Listener;
|
|||
import org.bukkit.event.block.Action;
|
||||
import org.bukkit.event.player.PlayerInteractEvent;
|
||||
|
||||
public class DoorOpenModule extends TweaksModule implements Listener {
|
||||
@Override
|
||||
protected void onInit() {
|
||||
registerEvents(this);
|
||||
}
|
||||
public class DoorOpenListener implements Listener {
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerInteract(PlayerInteractEvent event) {
|
||||
|
|
@ -76,4 +71,5 @@ public class DoorOpenModule extends TweaksModule implements Listener {
|
|||
location.getBlock().setBlockData(nextDoor);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,22 +1,16 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.full;
|
||||
package eu.m724.tweaks.full;
|
||||
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerLoginEvent;
|
||||
|
||||
public class FullModule extends TweaksModule implements Listener {
|
||||
@Override
|
||||
protected void onInit() {
|
||||
registerEvents(this);
|
||||
}
|
||||
|
||||
public class FullListener implements Listener {
|
||||
@EventHandler
|
||||
public void onPlayerLogin(PlayerLoginEvent event) {
|
||||
if (event.getResult() == PlayerLoginEvent.Result.KICK_FULL && event.getPlayer().hasPermission("tweaks724.bypass-full")) {
|
||||
35
src/main/java/eu/m724/tweaks/hardcore/HardcoreManager.java
Normal file
35
src/main/java/eu/m724/tweaks/hardcore/HardcoreManager.java
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
/*
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.hardcore;
|
||||
|
||||
import com.comphenix.protocol.PacketType;
|
||||
import com.comphenix.protocol.ProtocolLibrary;
|
||||
import com.comphenix.protocol.events.*;
|
||||
import eu.m724.tweaks.TweaksConfig;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
public class HardcoreManager {
|
||||
private final float chance = TweaksConfig.getConfig().hardcoreChance();
|
||||
|
||||
public void init(Plugin plugin) {
|
||||
ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(
|
||||
plugin,
|
||||
ListenerPriority.NORMAL,
|
||||
PacketType.Play.Server.LOGIN
|
||||
) {
|
||||
@Override
|
||||
public void onPacketSending(PacketEvent event) {
|
||||
PacketContainer packet = event.getPacket();
|
||||
int entityId = packet.getIntegers().read(0);
|
||||
|
||||
if (chance > ((48271 * entityId) % 65537) / 65537f) // gotta be fast
|
||||
// the "is hardcore" boolean https://wiki.vg/Protocol#Login_.28play.29
|
||||
packet.getBooleans().write(0, true);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -1,89 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module;
|
||||
|
||||
import com.comphenix.protocol.PacketType;
|
||||
import com.comphenix.protocol.ProtocolLibrary;
|
||||
import com.comphenix.protocol.events.ListenerPriority;
|
||||
import com.comphenix.protocol.events.PacketAdapter;
|
||||
import com.comphenix.protocol.events.PacketEvent;
|
||||
import eu.m724.tweaks.DebugLogger;
|
||||
import eu.m724.tweaks.config.TweaksConfig;
|
||||
import eu.m724.tweaks.TweaksPlugin;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.event.Listener;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
public abstract class TweaksModule {
|
||||
protected abstract void onInit();
|
||||
|
||||
void init() {
|
||||
var name = getClass().getSimpleName();
|
||||
DebugLogger.finer("Initializing " + name);
|
||||
long start = System.nanoTime();
|
||||
|
||||
this.onInit();
|
||||
|
||||
long end = System.nanoTime();
|
||||
DebugLogger.fine("Initialized %s in %d µs", name, (end - start) / 1000);
|
||||
}
|
||||
|
||||
protected TweaksPlugin getPlugin() {
|
||||
return TweaksPlugin.getInstance();
|
||||
}
|
||||
|
||||
protected TweaksConfig getConfig() {
|
||||
return TweaksConfig.getConfig();
|
||||
}
|
||||
|
||||
protected void registerEvents(Listener listener) {
|
||||
DebugLogger.finer("Registered listener: " + listener.getClass().getName());
|
||||
getPlugin().getServer().getPluginManager().registerEvents(listener, getPlugin());
|
||||
}
|
||||
|
||||
protected void onPacketSend(PacketType packetType, Consumer<PacketEvent> consumer) {
|
||||
ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(getPlugin(), ListenerPriority.NORMAL, packetType) {
|
||||
@Override
|
||||
public void onPacketSending(PacketEvent event) {
|
||||
consumer.accept(event);
|
||||
}
|
||||
});
|
||||
|
||||
DebugLogger.finer("Registered packet send: " + packetType.name());
|
||||
}
|
||||
|
||||
protected void onPacketReceive(PacketType packetType, Consumer<PacketEvent> consumer) {
|
||||
ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(getPlugin(), ListenerPriority.NORMAL, packetType) {
|
||||
@Override
|
||||
public void onPacketReceiving(PacketEvent event) {
|
||||
consumer.accept(event);
|
||||
}
|
||||
});
|
||||
|
||||
DebugLogger.finer("Registered packet receive: " + packetType.name());
|
||||
}
|
||||
|
||||
protected void registerCommand(String command, CommandExecutor executor) {
|
||||
getPlugin().getCommand(command).setExecutor(executor);
|
||||
DebugLogger.finer("Registered command: " + command);
|
||||
}
|
||||
|
||||
public static <T extends TweaksModule> T init(Class<T> clazz) {
|
||||
T module;
|
||||
try {
|
||||
module = clazz.getDeclaredConstructor().newInstance();
|
||||
} catch (InstantiationException | NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
module.init();
|
||||
|
||||
return module;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.alert;
|
||||
|
||||
import com.comphenix.protocol.PacketType;
|
||||
import com.comphenix.protocol.ProtocolLibrary;
|
||||
import com.comphenix.protocol.events.PacketContainer;
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.scheduler.BukkitTask;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class AlertModule extends TweaksModule {
|
||||
private BukkitTask notifyTask;
|
||||
static Alert current;
|
||||
static Map<Player, Integer> pages = new HashMap<>();
|
||||
|
||||
@Override
|
||||
protected void onInit() {
|
||||
registerCommand("emergencyalert", new AlertCommand(this));
|
||||
|
||||
onPacketReceive(PacketType.Play.Client.ENCHANT_ITEM, (event) -> {
|
||||
if (current == null) return;
|
||||
if (!current.isOpen(event.getPlayer())) return;
|
||||
|
||||
PacketContainer packet = event.getPacket();
|
||||
|
||||
int windowId, buttonId;
|
||||
windowId = packet.getIntegers().read(0);
|
||||
buttonId = packet.getIntegers().read(1);
|
||||
|
||||
var page = pages.getOrDefault(event.getPlayer(),1);
|
||||
|
||||
if (buttonId == 1) { // prev page
|
||||
page--;
|
||||
} else if (buttonId == 2) { // nextc page
|
||||
page++;
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
||||
pages.put(event.getPlayer(), page);
|
||||
var npacket = new PacketContainer(PacketType.Play.Server.WINDOW_DATA);
|
||||
npacket.getIntegers().write(0, windowId);
|
||||
npacket.getIntegers().write(1, 0);
|
||||
npacket.getIntegers().write(2, page);
|
||||
ProtocolLibrary.getProtocolManager().sendServerPacket(event.getPlayer(), npacket);
|
||||
});
|
||||
}
|
||||
|
||||
public Alert start(String... content) {
|
||||
stop();
|
||||
current = new Alert(content);
|
||||
notifyTask = new AlertRunnable(current, v -> this.stop()).runTaskTimer(getPlugin(), 0, 10);
|
||||
return current;
|
||||
}
|
||||
|
||||
public void stop() {
|
||||
if (current == null) return;
|
||||
for (Player player : getPlugin().getServer().getOnlinePlayers()) {
|
||||
if (current.isOpen(player))
|
||||
player.closeInventory();
|
||||
}
|
||||
pages.clear();
|
||||
notifyTask.cancel();
|
||||
current = null;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.auth;
|
||||
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
|
||||
public class AuthModule extends TweaksModule {
|
||||
@Override
|
||||
protected void onInit() {
|
||||
var authStorage = new AuthStorage(getPlugin());
|
||||
|
||||
registerEvents(new AuthListener(authStorage));
|
||||
registerCommand("tauth", new AuthCommands(authStorage));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,247 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.chat;
|
||||
|
||||
import eu.m724.tweaks.Language;
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
import net.md_5.bungee.api.chat.ClickEvent;
|
||||
import net.md_5.bungee.api.chat.ComponentBuilder;
|
||||
import net.md_5.bungee.api.chat.HoverEvent;
|
||||
import net.md_5.bungee.api.chat.hover.content.Text;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class ChatCommands implements CommandExecutor {
|
||||
private final ChatModule manager;
|
||||
|
||||
public ChatCommands(ChatModule manager) {
|
||||
this.manager = manager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCommand(@NotNull CommandSender sender, Command command, @NotNull String label, String[] args) {
|
||||
if (command.getName().equals("chat")) {
|
||||
Player player = (Player) sender;
|
||||
ChatRoom chatRoom = manager.getPlayerChatRoom(player);
|
||||
|
||||
if (args.length == 0) { // show room
|
||||
player.spigot().sendMessage(chatRoom.getInfoComponent());
|
||||
} else { // join room
|
||||
String id = args[0];
|
||||
|
||||
if (id.equals(chatRoom.id)) {
|
||||
sender.spigot().sendMessage(Language.getComponent("chatAlreadyHere", ChatColor.GRAY));
|
||||
return true;
|
||||
}
|
||||
|
||||
String password = null;
|
||||
if (args.length > 1) {
|
||||
password = Arrays.stream(args).skip(1).collect(Collectors.joining(" "));
|
||||
}
|
||||
|
||||
boolean authenticated = false;
|
||||
BaseComponent component = null;
|
||||
ChatRoom newRoom = manager.getById(id);
|
||||
if (newRoom != null) {
|
||||
if (newRoom.password != null) {
|
||||
if (newRoom.password.equals(password)) {
|
||||
authenticated = true;
|
||||
} else if (password == null) {
|
||||
component = Language.getComponent("chatPasswordProtected", ChatColor.RED);
|
||||
} else {
|
||||
component = Language.getComponent("chatWrongPassword", ChatColor.RED);
|
||||
}
|
||||
} else {
|
||||
authenticated = true;
|
||||
}
|
||||
} else {
|
||||
if (ChatRoomLoader.validateId(id) == 0) {
|
||||
component = Language.getComponent("chatNoSuchRoom", ChatColor.RED, id);
|
||||
} else {
|
||||
component = Language.getComponent("chatNoSuchRoomInvalidId", ChatColor.RED, id);
|
||||
}
|
||||
}
|
||||
|
||||
if (authenticated) {
|
||||
/*component = new ComponentBuilder(Language.getComponent("chatJoined", ChatColor.GOLD))
|
||||
.append(" ")
|
||||
.append(ChatFormatUtils.formatChatRoom(chatRoom)).color(newRoom.color)
|
||||
.build();*/
|
||||
player.sendMessage("");
|
||||
manager.setPlayerChatRoom(newRoom, player);
|
||||
} else {
|
||||
player.spigot().sendMessage(component);
|
||||
}
|
||||
|
||||
}
|
||||
} else if (command.getName().equals("chatmanage")) {
|
||||
Player player = (Player) sender;
|
||||
ChatRoom chatRoom = manager.getPlayerChatRoom(player);
|
||||
boolean isOwner = player.equals(chatRoom.owner);
|
||||
|
||||
String action = args.length > 0 ? args[0] : null;
|
||||
String argument = args.length > 1 ? args[1] : null;
|
||||
|
||||
switch (action) {
|
||||
case "create" -> {
|
||||
if (argument == null) {
|
||||
sender.sendMessage("Please pass a room name as an argument. The room name can contain only characters and digits.");
|
||||
return true;
|
||||
}
|
||||
|
||||
try {
|
||||
ChatRoom newRoom = manager.createChatRoom(argument, null, player);
|
||||
|
||||
var component = new ComponentBuilder("Created a chat room. Join it: ").color(ChatColor.GOLD)
|
||||
.append("/c " + newRoom.id).color(ChatColor.AQUA)
|
||||
.event(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/c " + newRoom.id))
|
||||
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(Language.getString("clickToExecuteCommand"))))
|
||||
.append("\n")
|
||||
.append("To protect it with a password, join it and use ").color(ChatColor.GRAY)
|
||||
.append("/cm setpassword <password>").color(ChatColor.DARK_PURPLE)
|
||||
.event(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/cm setpassword "))
|
||||
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(Language.getString("clickToExecuteCommand"))));
|
||||
|
||||
sender.spigot().sendMessage(component.build());
|
||||
} catch (ChatModule.InvalidIdException e) {
|
||||
var component = new ComponentBuilder("ID is invalid: ").color(ChatColor.GRAY)
|
||||
.append(e.getMessage()).color(ChatColor.RED);
|
||||
|
||||
sender.spigot().sendMessage(component.build());
|
||||
} catch (ChatModule.ChatRoomExistsException e) {
|
||||
sender.sendMessage("Room %s already exists".formatted(argument));
|
||||
} catch (IOException e) {
|
||||
sender.sendMessage("Error creating room");
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
case "delete" -> {
|
||||
if (isOwner) {
|
||||
if (argument == null) {
|
||||
sender.sendMessage("You want to delete room \"%s\". Confirm by passing the ID as an argument.".formatted(chatRoom.id));
|
||||
return true;
|
||||
}
|
||||
|
||||
if (argument.equals(chatRoom.id)) {
|
||||
manager.deleteChatRoom(chatRoom);
|
||||
sender.sendMessage("Room %s deleted".formatted(chatRoom.id));
|
||||
} else {
|
||||
sender.sendMessage("Pass \"%s\" as an argument to confirm".formatted(chatRoom.id));
|
||||
}
|
||||
} else {
|
||||
sender.sendMessage("You're not the owner of %s, please enter the room you want to make changes in".formatted(chatRoom.id));
|
||||
}
|
||||
}
|
||||
case "setowner" -> {
|
||||
if (isOwner) {
|
||||
if (argument == null) {
|
||||
sender.sendMessage("To transfer ownership of room %s, pass the new owner name as an argument for this action.".formatted(chatRoom.id));
|
||||
return true;
|
||||
}
|
||||
|
||||
Player newOwner = Bukkit.getPlayer(argument);
|
||||
if (newOwner != null && newOwner.isOnline()) {
|
||||
chatRoom.owner = newOwner;
|
||||
try {
|
||||
manager.saveChatRoom(chatRoom);
|
||||
sender.sendMessage("Owner changed to " + newOwner.getName());
|
||||
} catch (IOException e) {
|
||||
sender.sendMessage("Error changing owner");
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
} else {
|
||||
sender.sendMessage("Player must be online");
|
||||
}
|
||||
} else {
|
||||
sender.sendMessage("You're not the owner of %s, please enter the room you want to make changes in".formatted(chatRoom.id));
|
||||
}
|
||||
}
|
||||
case "setpassword" -> {
|
||||
if (isOwner) {
|
||||
if (argument == null) {
|
||||
sender.sendMessage("To change the password of room %s, pass the new password as an argument for this action.".formatted(chatRoom.id));
|
||||
return true;
|
||||
}
|
||||
|
||||
chatRoom.password = Arrays.stream(args).skip(1).collect(Collectors.joining(" "));
|
||||
try {
|
||||
manager.saveChatRoom(chatRoom);
|
||||
|
||||
var component = new ComponentBuilder("Password changed to ").color(ChatColor.GREEN)
|
||||
.append("(hover to view)").color(ChatColor.AQUA)
|
||||
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(chatRoom.password)))
|
||||
.append("\n")
|
||||
.append("To unset, ").color(ChatColor.GRAY)
|
||||
.append("/cm unsetpassword").color(ChatColor.DARK_PURPLE)
|
||||
.event(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/cm unsetpassword"))
|
||||
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(Language.getString("clickToExecuteCommand"))));
|
||||
|
||||
sender.spigot().sendMessage(component.build());
|
||||
} catch (IOException e) {
|
||||
sender.sendMessage("Error changing password");
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
} else {
|
||||
sender.sendMessage("You're not the owner of %s, please enter the room you want to make changes in".formatted(chatRoom.id));
|
||||
}
|
||||
}
|
||||
case "unsetpassword" -> {
|
||||
if (isOwner) {
|
||||
chatRoom.password = null;
|
||||
try {
|
||||
manager.saveChatRoom(chatRoom);
|
||||
sender.sendMessage("Password removed from " + chatRoom.id);
|
||||
} catch (IOException e) {
|
||||
sender.sendMessage("Error removing password");
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
} else {
|
||||
sender.sendMessage("You're not the owner of %s, please enter the room you want to make changes in".formatted(chatRoom.id));
|
||||
}
|
||||
}
|
||||
case "setcolor" -> {
|
||||
if (isOwner) {
|
||||
if (argument == null) {
|
||||
sender.sendMessage("To change the message color of room %s, pass the new color as an argument for this action. #hex or color name.".formatted(chatRoom.id));
|
||||
return true;
|
||||
}
|
||||
|
||||
ChatColor newColor = ChatColor.of(argument);
|
||||
if (newColor != null) {
|
||||
chatRoom.color = newColor;
|
||||
try {
|
||||
manager.saveChatRoom(chatRoom);
|
||||
sender.sendMessage("Message color changed to " + newColor.getName());
|
||||
} catch (IOException e) {
|
||||
sender.sendMessage("Error changing color");
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
} else {
|
||||
sender.sendMessage("Invalid color");
|
||||
}
|
||||
} else {
|
||||
sender.sendMessage("You're not the owner of %s, please enter the room you want to make changes in".formatted(chatRoom.id));
|
||||
}
|
||||
}
|
||||
case null, default -> {
|
||||
sender.sendMessage("Actions: create, delete, setowner, setpassword, unsetpassword, setcolor");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.durability;
|
||||
|
||||
import eu.m724.tweaks.TweaksPlugin;
|
||||
import org.bukkit.NamespacedKey;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerJoinEvent;
|
||||
import org.bukkit.event.player.PlayerQuitEvent;
|
||||
import org.bukkit.persistence.PersistentDataType;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
public class DPlayerProperties implements Listener {
|
||||
private final NamespacedKey namespacedKey = new NamespacedKey(TweaksPlugin.getInstance(), "durability_enabled");
|
||||
private final Set<Player> players = new HashSet<>();
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerJoin(PlayerJoinEvent event) {
|
||||
var player = event.getPlayer();
|
||||
|
||||
if (player.hasPermission("tweaks724.durabilityalert")) {
|
||||
var enabled = player.getPersistentDataContainer().get(namespacedKey, PersistentDataType.BOOLEAN);
|
||||
if (enabled != null && enabled) {
|
||||
players.add(player);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerQuit(PlayerQuitEvent event) {
|
||||
players.remove(event.getPlayer());
|
||||
}
|
||||
|
||||
Set<Player> getPlayers() {
|
||||
return Set.copyOf(players);
|
||||
}
|
||||
|
||||
boolean isPlayerEnabled(Player player) {
|
||||
return players.contains(player);
|
||||
}
|
||||
|
||||
void disableForPlayer(Player player) {
|
||||
players.remove(player);
|
||||
player.getPersistentDataContainer().set(namespacedKey, PersistentDataType.BOOLEAN, false);
|
||||
}
|
||||
|
||||
void enableForPlayer(Player player) {
|
||||
players.add(player);
|
||||
player.getPersistentDataContainer().set(namespacedKey, PersistentDataType.BOOLEAN, true);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.durability;
|
||||
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class DurabilityCaches {
|
||||
private final Map<Player, Long> lastFullReminder = new HashMap<>();
|
||||
// BAD
|
||||
private final Map<Player, Map<Material, Long>> lastUse = new HashMap<>();
|
||||
// BAD
|
||||
private final Map<Player, Map<Material, Long>> lastPing = new HashMap<>();
|
||||
|
||||
boolean shouldFullRemind(Player player, long now) {
|
||||
var lfr = lastFullReminder.getOrDefault(player, 0L);
|
||||
|
||||
if (now - lfr > 300 * 1000) {
|
||||
lastFullReminder.put(player, now);
|
||||
return true;
|
||||
} else if (now - lfr < 3 * 1000) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
boolean shouldRemind(Player player, ItemStack itemStack, long now) {
|
||||
var lu = lastUse.computeIfAbsent(player, (k) -> new HashMap<>()).getOrDefault(itemStack.getType(), 0L);
|
||||
|
||||
if (now - lu > 180 * 1000) {
|
||||
lastUse.get(player).put(itemStack.getType(), now);
|
||||
return true;
|
||||
} else if (now - lu < 3 * 1000) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
boolean shouldPing(Player player, ItemStack itemStack, long now) {
|
||||
var lp = lastPing.computeIfAbsent(player, (k) -> new HashMap<>()).getOrDefault(itemStack.getType(), 0L);
|
||||
|
||||
if (now - lp > 60 * 1000) {
|
||||
lastPing.get(player).put(itemStack.getType(), now);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.durability;
|
||||
|
||||
import eu.m724.tweaks.Language;
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
public class DurabilityCommands implements CommandExecutor {
|
||||
private final DPlayerProperties properties;
|
||||
|
||||
public DurabilityCommands(DPlayerProperties properties) {
|
||||
this.properties = properties;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
|
||||
if (!(sender instanceof Player player)) {
|
||||
sender.sendMessage("Only players can use this command");
|
||||
return true;
|
||||
}
|
||||
|
||||
if (properties.isPlayerEnabled(player)) {
|
||||
properties.disableForPlayer(player);
|
||||
sender.spigot().sendMessage(Language.getComponent("durabilityDisabled", ChatColor.GRAY));
|
||||
} else {
|
||||
properties.enableForPlayer(player);
|
||||
sender.spigot().sendMessage(Language.getComponent("durabilityEnabled", ChatColor.GRAY));
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,155 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.durability;
|
||||
|
||||
import eu.m724.tweaks.DebugLogger;
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import net.md_5.bungee.api.ChatMessageType;
|
||||
import net.md_5.bungee.api.chat.ComponentBuilder;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.Sound;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerItemDamageEvent;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.inventory.meta.Damageable;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
|
||||
import java.awt.Color;
|
||||
|
||||
public class DurabilityModule extends TweaksModule implements Listener {
|
||||
private final DurabilityCaches cache = new DurabilityCaches();
|
||||
private final DPlayerProperties properties = new DPlayerProperties();
|
||||
|
||||
@Override
|
||||
protected void onInit() {
|
||||
registerEvents(this);
|
||||
|
||||
registerCommand("durabilityalert", new DurabilityCommands(properties));
|
||||
|
||||
new BukkitRunnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
properties.getPlayers().forEach(p -> refreshBar(p));
|
||||
}
|
||||
}.runTaskTimerAsynchronously(getPlugin(), 0, 40);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerItemDamage(PlayerItemDamageEvent event) {
|
||||
refreshBar(event.getPlayer(), event.getItem(), event.getDamage());
|
||||
}
|
||||
|
||||
private void refreshBar(Player player) {
|
||||
refreshBar(player, null, -1);
|
||||
}
|
||||
|
||||
private void refreshBar(Player player, ItemStack justDamaged, int damage) {
|
||||
if (!properties.isPlayerEnabled(player)) return;
|
||||
|
||||
var items = new ItemStack[] {
|
||||
player.getInventory().getHelmet(),
|
||||
player.getInventory().getChestplate(),
|
||||
player.getInventory().getLeggings(),
|
||||
player.getInventory().getBoots(),
|
||||
player.getInventory().getItemInMainHand(),
|
||||
player.getInventory().getItemInOffHand()
|
||||
};
|
||||
|
||||
var builder = new ComponentBuilder();
|
||||
|
||||
var now = System.currentTimeMillis();
|
||||
var all = cache.shouldFullRemind(player, now);
|
||||
|
||||
for (var itemStack : items) {
|
||||
if (itemStack == null || !itemStack.hasItemMeta()) continue;
|
||||
|
||||
if (itemStack.getItemMeta() instanceof Damageable meta) {
|
||||
var target = itemStack.equals(justDamaged);
|
||||
|
||||
var maxDurability = itemStack.getType().getMaxDurability();
|
||||
var durability = maxDurability - meta.getDamage() - (target ? damage : 0);
|
||||
durability = Math.max(0, durability);
|
||||
var percentage = (double) durability / maxDurability;
|
||||
|
||||
var notify = durability < 30 && (durability < 10 || percentage < 0.1);
|
||||
|
||||
var remind = cache.shouldRemind(player, itemStack, now);
|
||||
var important = target && notify && cache.shouldPing(player, itemStack, now);
|
||||
|
||||
DebugLogger.finer("%s's %s: %d / %d (%.2f%%)%s%s", player.getName(), itemStack.getType().name(), durability, maxDurability, percentage * 100, notify ? " notify" : "", important ? " important" : "");
|
||||
|
||||
if (notify || all || remind) {
|
||||
var longName = remind || important;
|
||||
var label = longName ? getMaterialLongName(itemStack.getType()) : getMaterialShortName(itemStack.getType());
|
||||
var labelColor = percentage > 0 ? matColor(itemStack.getType()) : ChatColor.DARK_RED;
|
||||
|
||||
var percentageStr = (int) (percentage * 100) + "%";
|
||||
var percentageColor = mixColor(labelColor, ChatColor.DARK_RED, 1.0 - percentage * 10);
|
||||
|
||||
builder.append(label + " ").color(labelColor);
|
||||
builder.append(percentageStr + " ").color(percentageColor);
|
||||
|
||||
if (important) {
|
||||
player.playSound(player, Sound.BLOCK_ANVIL_PLACE, 0.5f, 1.5f);
|
||||
player.sendTitle("", labelColor + label + " " + percentageColor + percentageStr, 5, 20, 5);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var component = builder.create();
|
||||
if (component.length > 0)
|
||||
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, component);
|
||||
}
|
||||
|
||||
private String getMaterialLongName(Material material) {
|
||||
var sp = material.name().split("_");
|
||||
var str = sp[sp.length - 1];
|
||||
return str.charAt(0) + str.substring(1).toLowerCase();
|
||||
}
|
||||
|
||||
private String getMaterialShortName(Material material) {
|
||||
return getMaterialLongName(material).substring(0, 2);
|
||||
}
|
||||
|
||||
private ChatColor mixColor(ChatColor from, ChatColor to, double percentage) {
|
||||
percentage = Math.clamp(percentage, 0.0, 1.0);
|
||||
|
||||
var diffR = to.getColor().getRed() - from.getColor().getRed();
|
||||
var diffG = to.getColor().getGreen() - from.getColor().getGreen();
|
||||
var diffB = to.getColor().getBlue() - from.getColor().getBlue();
|
||||
|
||||
var r = from.getColor().getRed() + (int) (diffR * percentage);
|
||||
var g = from.getColor().getGreen() + (int) (diffG * percentage);
|
||||
var b = from.getColor().getBlue() + (int) (diffB * percentage);
|
||||
|
||||
return ChatColor.of(new Color(r, g, b));
|
||||
}
|
||||
|
||||
private ChatColor matColor(Material material) {
|
||||
var color = ChatColor.DARK_GRAY;
|
||||
|
||||
if (material.name().startsWith("DIAMOND_")) {
|
||||
color = ChatColor.AQUA;
|
||||
} else if (material.name().startsWith("NETHERITE_")) {
|
||||
color = ChatColor.DARK_PURPLE;
|
||||
} else if (material.name().startsWith("IRON_")) {
|
||||
color = ChatColor.WHITE;
|
||||
} else if (material.name().startsWith("STONE_")) {
|
||||
color = ChatColor.GRAY;
|
||||
} else if (material.name().startsWith("WOODEN_")) {
|
||||
color = ChatColor.DARK_GREEN;
|
||||
} else if (material.name().startsWith("GOLDEN_")) {
|
||||
color = ChatColor.GOLD;
|
||||
}
|
||||
|
||||
return color;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.hardcore;
|
||||
|
||||
import com.comphenix.protocol.PacketType;
|
||||
import com.comphenix.protocol.events.PacketContainer;
|
||||
import eu.m724.tweaks.DebugLogger;
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
import net.minecraft.world.level.levelgen.RandomSupport;
|
||||
import net.minecraft.world.level.levelgen.Xoroshiro128PlusPlus;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.math.BigInteger;
|
||||
|
||||
// how we do it is much faster than any Random
|
||||
public class HardcoreModule extends TweaksModule {
|
||||
private final Xoroshiro128PlusPlus rng;
|
||||
private final long chanceLong;
|
||||
|
||||
public HardcoreModule() {
|
||||
this.rng = new Xoroshiro128PlusPlus(
|
||||
RandomSupport.generateUniqueSeed(),
|
||||
RandomSupport.generateUniqueSeed()
|
||||
);
|
||||
|
||||
this.chanceLong = BigInteger.valueOf(Long.MIN_VALUE)
|
||||
.add(
|
||||
new BigDecimal(
|
||||
BigInteger.valueOf(Long.MAX_VALUE).subtract(BigInteger.valueOf(Long.MIN_VALUE))
|
||||
).multiply(
|
||||
BigDecimal.valueOf(getConfig().hardcoreChance())
|
||||
).toBigInteger()
|
||||
).longValue();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onInit() {
|
||||
DebugLogger.fine("Chance long: " + chanceLong);
|
||||
|
||||
onPacketSend(PacketType.Play.Server.LOGIN, (event) -> {
|
||||
PacketContainer packet = event.getPacket();
|
||||
|
||||
if (rng.nextLong() < chanceLong)
|
||||
// the "is hardcore" boolean https://wiki.vg/Protocol#Login_.28play.29
|
||||
packet.getBooleans().write(0, true);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -1,118 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.killswitch;
|
||||
|
||||
import com.sun.net.httpserver.HttpExchange;
|
||||
import com.sun.net.httpserver.HttpHandler;
|
||||
import com.sun.net.httpserver.HttpServer;
|
||||
import eu.m724.tweaks.DebugLogger;
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.net.InetSocketAddress;
|
||||
import java.nio.file.Files;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.security.SecureRandom;
|
||||
import java.util.Base64;
|
||||
|
||||
public class KillswitchModule extends TweaksModule implements CommandExecutor, HttpHandler {
|
||||
private final Ratelimit ratelimit = new Ratelimit();
|
||||
|
||||
private byte[] secret;
|
||||
private String secretEncoded;
|
||||
|
||||
private void loadKey(File file) {
|
||||
if (file.exists()) {
|
||||
try {
|
||||
this.secret = Files.readAllBytes(file.toPath());
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException("Reading killswitch key", e);
|
||||
}
|
||||
DebugLogger.fine("Loaded key");
|
||||
} else {
|
||||
byte[] buf = new byte[16];
|
||||
|
||||
try {
|
||||
SecureRandom.getInstanceStrong().nextBytes(buf);
|
||||
Files.write(file.toPath(), buf);
|
||||
} catch (IOException | NoSuchAlgorithmException e) {
|
||||
throw new RuntimeException("Generating killswitch key", e);
|
||||
}
|
||||
|
||||
this.secret = buf;
|
||||
DebugLogger.info("Killswitch key generated and saved to " + file.getPath());
|
||||
}
|
||||
|
||||
this.secretEncoded = Base64.getEncoder().encodeToString(secret);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onInit() {
|
||||
registerCommand("servkill", this);
|
||||
|
||||
if (getConfig().killswitchListen() != null) {
|
||||
loadKey(new File(getPlugin().getDataFolder(), "storage/killswitch key"));
|
||||
|
||||
ratelimit.runTaskTimerAsynchronously(getPlugin(), 0, 20 * 300);
|
||||
|
||||
var listenAddress = getConfig().killswitchListen().split(":");
|
||||
InetSocketAddress bindAddress;
|
||||
if (listenAddress.length == 1) {
|
||||
bindAddress = new InetSocketAddress(Integer.parseInt(listenAddress[0]));
|
||||
} else {
|
||||
bindAddress = new InetSocketAddress(listenAddress[0], Integer.parseInt(listenAddress[1]));
|
||||
}
|
||||
|
||||
try {
|
||||
HttpServer server = HttpServer.create(bindAddress, 0);
|
||||
server.createContext("/", this);
|
||||
server.setExecutor(null);
|
||||
server.start();
|
||||
DebugLogger.fine("server started");
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException("Starting HTTP server", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void kill() {
|
||||
Runtime.getRuntime().halt(0);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
|
||||
kill();
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handle(HttpExchange exchange) throws IOException {
|
||||
exchange.sendResponseHeaders(404, -1);
|
||||
|
||||
var path = exchange.getRequestURI().getPath();
|
||||
if (!path.startsWith("/key/")) return;
|
||||
|
||||
var address = exchange.getRemoteAddress().getAddress();
|
||||
if (!ratelimit.submitRequest(address)) {
|
||||
DebugLogger.fine(address + " is ratelimited");
|
||||
return;
|
||||
}
|
||||
|
||||
var key = path.substring(5);
|
||||
if (key.equals(secretEncoded)) {
|
||||
DebugLogger.fine("Got a request with valid key");
|
||||
kill();
|
||||
} else {
|
||||
DebugLogger.fine("Got a request with invalid key");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.killswitch;
|
||||
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
|
||||
import java.net.InetAddress;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
public class Ratelimit extends BukkitRunnable {
|
||||
private Set<InetAddress> requests = new HashSet<>();
|
||||
|
||||
boolean submitRequest(InetAddress address) {
|
||||
return requests.add(address);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
requests = new HashSet<>();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.knockback;
|
||||
|
||||
import eu.m724.tweaks.DebugLogger;
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
import org.bukkit.entity.EntityType;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.entity.EntityKnockbackByEntityEvent;
|
||||
import org.bukkit.util.Vector;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class KnockbackModule extends TweaksModule implements Listener {
|
||||
private final Map<EntityType, Vector> modifiers = new HashMap<>();
|
||||
|
||||
@Override
|
||||
protected void onInit() {
|
||||
getConfig().knockbackModifiers().forEach((k, v) -> {
|
||||
EntityType type;
|
||||
double mod;
|
||||
|
||||
String line = "(%s: %s)".formatted(k, v);
|
||||
|
||||
if (v instanceof Double d) {
|
||||
mod = d;
|
||||
} else if (v instanceof Integer i) {
|
||||
mod = i;
|
||||
} else {
|
||||
DebugLogger.warning("In " + line + " the value is not a number ");
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
type = EntityType.valueOf(k);
|
||||
} catch (IllegalArgumentException e) {
|
||||
DebugLogger.warning("In" + line + " the key is not a valid entity type");
|
||||
DebugLogger.warning("Valid entity types: https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/entity/EntityType.html");
|
||||
return;
|
||||
}
|
||||
|
||||
if (mod == 1) return;
|
||||
modifiers.put(type, new Vector(mod, mod >= 1 ? mod : 1, mod)); // don't touch vertical
|
||||
});
|
||||
|
||||
if (!modifiers.isEmpty()) {
|
||||
registerEvents(this);
|
||||
|
||||
try {
|
||||
Class.forName("com.destroystokyo.paper.event.entity.EntityKnockbackByEntityEvent");
|
||||
DebugLogger.warning("Ignore that. Server performance will NOT be affected.");
|
||||
} catch (ClassNotFoundException ignored) { }
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onEntityKnockbackByEntity(EntityKnockbackByEntityEvent event) {
|
||||
var modifier = modifiers.get(event.getSourceEntity().getType());
|
||||
if (modifier != null) {
|
||||
event.setFinalKnockback(event.getKnockback().multiply(modifier));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,108 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.motd;
|
||||
|
||||
import com.comphenix.protocol.PacketType;
|
||||
import com.comphenix.protocol.events.InternalStructure;
|
||||
import com.comphenix.protocol.events.PacketContainer;
|
||||
import com.comphenix.protocol.reflect.StructureModifier;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonParseException;
|
||||
import com.google.gson.JsonParser;
|
||||
import eu.m724.tweaks.DebugLogger;
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
import net.md_5.bungee.api.chat.TextComponent;
|
||||
import net.md_5.bungee.chat.ComponentSerializer;
|
||||
import net.minecraft.SharedConstants;
|
||||
import net.minecraft.core.RegistryAccess;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.network.protocol.status.ServerStatus;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.FileAlreadyExistsException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.Arrays;
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.ThreadLocalRandom;
|
||||
|
||||
public class MotdModule extends TweaksModule {
|
||||
@Override
|
||||
protected void onInit() {
|
||||
Path motdSetPath = getPlugin().getDataFolder().toPath().resolve("motd sets").resolve(getConfig().motdSet() + ".txt");
|
||||
|
||||
// create "motd sets" directory
|
||||
try {
|
||||
Files.createDirectories(motdSetPath);
|
||||
} catch (FileAlreadyExistsException ignored) {
|
||||
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
// if this is a builtin set
|
||||
if (!Files.exists(motdSetPath) && getPlugin().hasResource("motd sets/" + motdSetPath.getFileName()))
|
||||
getPlugin().saveResource("motd sets/" + motdSetPath.getFileName(), false);
|
||||
|
||||
if (!Files.exists(motdSetPath)) {
|
||||
throw new RuntimeException("MOTD set \"%s\" doesn't exist".formatted(getConfig().motdSet()));
|
||||
}
|
||||
|
||||
String fileContent;
|
||||
try {
|
||||
fileContent = Files.readString(motdSetPath);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException("Reading motd set", e);
|
||||
}
|
||||
|
||||
// MOTDs are split with an empty line
|
||||
Component[] motds = Arrays.stream(fileContent.split("\n\n"))
|
||||
.map(entry -> {
|
||||
entry = entry.strip();
|
||||
JsonElement json = null;
|
||||
|
||||
try {
|
||||
json = JsonParser.parseString(entry);
|
||||
DebugLogger.finer("JSON line: %s...", entry.substring(0, Math.min(entry.length(), 10)));
|
||||
} catch (JsonParseException e) {
|
||||
DebugLogger.finer("JSON line: %s...", entry.substring(0, Math.min(entry.length(), 10)));
|
||||
}
|
||||
|
||||
if (json == null) {
|
||||
json = ComponentSerializer.toJson(TextComponent.fromLegacy(entry));
|
||||
}
|
||||
|
||||
return Component.Serializer.fromJson(json, RegistryAccess.EMPTY);
|
||||
})
|
||||
.toArray(Component[]::new);
|
||||
|
||||
onPacketSend(PacketType.Status.Server.SERVER_INFO, (event) -> {
|
||||
PacketContainer packet = event.getPacket();
|
||||
|
||||
Component motd = motds[ThreadLocalRandom.current().nextInt(motds.length)];
|
||||
|
||||
ServerStatus serverStatus = (ServerStatus) packet.getStructures().read(0).getHandle();
|
||||
|
||||
/* this:
|
||||
* removes server mod prefix (Paper, Spigot, any brand)
|
||||
* hides players
|
||||
*/
|
||||
ServerStatus newStatus = new ServerStatus(
|
||||
motd,
|
||||
Optional.empty(),
|
||||
Optional.of(new ServerStatus.Version(
|
||||
SharedConstants.getCurrentVersion().getName(),
|
||||
SharedConstants.getProtocolVersion()
|
||||
)),
|
||||
serverStatus.favicon(),
|
||||
false
|
||||
);
|
||||
|
||||
packet.getStructures().write(0, new InternalStructure(newStatus, new StructureModifier<>(ServerStatus.class)));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.pomodoro;
|
||||
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
|
||||
public class PomodoroModule extends TweaksModule {
|
||||
@Override
|
||||
protected void onInit() {
|
||||
registerEvents(new PomodoroListener());
|
||||
new PomodoroRunnable().runTaskTimerAsynchronously(getPlugin(), 0, 20L);
|
||||
|
||||
registerCommand("pomodoro", new PomodoroCommands());
|
||||
}
|
||||
}
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.redstone;
|
||||
|
||||
import eu.m724.tweaks.DebugLogger;
|
||||
import eu.m724.tweaks.Language;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.NamespacedKey;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.inventory.ShapelessRecipe;
|
||||
import org.bukkit.persistence.PersistentDataType;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
public class GatewayItem {
|
||||
private final NamespacedKey gatewayKey;
|
||||
|
||||
public GatewayItem(Plugin plugin) {
|
||||
var start = System.nanoTime();
|
||||
|
||||
this.gatewayKey = new NamespacedKey(plugin, "gateway");
|
||||
var recipe = new ShapelessRecipe(gatewayKey, itemStack());
|
||||
|
||||
// this takes a long time for some reason. The first one especially
|
||||
// do this somewhere off measure to JIT and skew the measurement: new RecipeChoice.MaterialChoice(Material.DIRT);
|
||||
recipe.addIngredient(Material.NETHER_STAR);
|
||||
recipe.addIngredient(Material.ENDER_CHEST);
|
||||
recipe.addIngredient(Material.CHORUS_FLOWER);
|
||||
recipe.addIngredient(Material.DAYLIGHT_DETECTOR);
|
||||
|
||||
plugin.getServer().addRecipe(recipe);
|
||||
|
||||
DebugLogger.finer("Adding the recipe took %d ms, which is a long time", (System.nanoTime() - start) / 1000000);
|
||||
}
|
||||
|
||||
public ItemStack itemStack() {
|
||||
var itemStack = new ItemStack(Material.DAYLIGHT_DETECTOR);
|
||||
var meta = itemStack.getItemMeta();
|
||||
|
||||
meta.setItemName(Language.getString("redstoneGatewayItem"));
|
||||
meta.getPersistentDataContainer().set(gatewayKey, PersistentDataType.BOOLEAN, true);
|
||||
meta.setEnchantmentGlintOverride(true);
|
||||
|
||||
itemStack.setItemMeta(meta);
|
||||
return itemStack;
|
||||
}
|
||||
|
||||
public boolean isGateway(ItemStack itemStack) {
|
||||
var meta = itemStack.getItemMeta();
|
||||
if (meta == null) return false;
|
||||
var value = meta.getPersistentDataContainer().get(gatewayKey, PersistentDataType.BOOLEAN);
|
||||
|
||||
return value != null;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.redstone;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
public class RedstoneCommands implements CommandExecutor {
|
||||
private final GatewayItem gatewayItem;
|
||||
|
||||
public RedstoneCommands(GatewayItem gatewayItem) {
|
||||
this.gatewayItem = gatewayItem;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
|
||||
if (args.length > 0) {
|
||||
if (args[0].equals("give")) {
|
||||
Player player = null;
|
||||
|
||||
if (args.length > 1) {
|
||||
player = Bukkit.getPlayerExact(args[1]);
|
||||
if (player == null) {
|
||||
sender.sendMessage("No player named " + args[1]);
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
if (sender instanceof Player) {
|
||||
player = (Player) sender;
|
||||
} else {
|
||||
sender.sendMessage("Specify a player to give to, or be a player");
|
||||
}
|
||||
}
|
||||
|
||||
var itemStack = gatewayItem.itemStack();
|
||||
player.getInventory().addItem(itemStack);
|
||||
sender.sendMessage("Given to " + player.getName());
|
||||
}
|
||||
} else {
|
||||
sender.sendMessage("Argument needed");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,179 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.redstone;
|
||||
|
||||
import com.google.common.collect.BiMap;
|
||||
import com.google.common.collect.HashBiMap;
|
||||
import eu.m724.tweaks.DebugLogger;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.Particle;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.block.data.AnaloguePowerable;
|
||||
import org.bukkit.metadata.FixedMetadataValue;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ThreadLocalRandom;
|
||||
|
||||
public class RedstoneGateways {
|
||||
private final Plugin plugin;
|
||||
|
||||
private final BiMap<Integer, Location> gatewaysById = HashBiMap.create();
|
||||
private final Map<Integer, Byte> gatewaysByPower = new HashMap<>();
|
||||
|
||||
public RedstoneGateways(Plugin plugin) {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
/* Event */
|
||||
|
||||
int onPlace(Block block) {
|
||||
var repeaterId = ThreadLocalRandom.current().nextInt() & 0x7FFFFFF0;
|
||||
|
||||
gatewaysById.put(repeaterId, block.getLocation());
|
||||
block.setMetadata("rid", new FixedMetadataValue(plugin, repeaterId));
|
||||
|
||||
RedstoneStore.getInstance().saveRepeaterData(block.getLocation(), repeaterId, (byte) 0);
|
||||
|
||||
return repeaterId;
|
||||
}
|
||||
|
||||
void onBreak(int repeaterId) {
|
||||
delete(repeaterId);
|
||||
}
|
||||
|
||||
void delete(int repeaterId) {
|
||||
var location = gatewaysById.remove(repeaterId);
|
||||
if (location == null) return;
|
||||
gatewaysByPower.remove(repeaterId);
|
||||
|
||||
RedstoneStore.getInstance().deleteSavedRepeaterData(location);
|
||||
}
|
||||
|
||||
/* Get functions */
|
||||
|
||||
private boolean isValid(int repeaterId) {
|
||||
// check if there's a repeater with such ID stored
|
||||
// if not, we're not loading because it's loaded as the block is
|
||||
var loc = gatewaysById.get(repeaterId);
|
||||
if (loc == null) {
|
||||
DebugLogger.fine("isValid: Delete because no loc");
|
||||
delete(repeaterId);
|
||||
return false;
|
||||
}
|
||||
|
||||
// check if chunk the block is in is loaded
|
||||
// you may think it could be simplified, but it can't without loading the chunk (to check if it's loaded)
|
||||
var isLoaded = loc.getWorld().isChunkLoaded(loc.getBlockX() / 16, loc.getBlockZ() / 16);
|
||||
if (!isLoaded) return false;
|
||||
|
||||
// check if the block is correct type
|
||||
if (loc.getBlock().getType() != Material.DAYLIGHT_DETECTOR) {
|
||||
DebugLogger.fine("isValid: Delete because not sensor");
|
||||
delete(repeaterId);
|
||||
return false;
|
||||
}
|
||||
|
||||
// check if the block has the same ID bound
|
||||
var meta = loc.getBlock().getMetadata("rid");
|
||||
if (meta.isEmpty() || meta.getFirst().asInt() != repeaterId) {
|
||||
DebugLogger.fine("isValid: Delete because no meta");
|
||||
delete(repeaterId);
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public int getId(Block block) {
|
||||
if (block.hasMetadata("rid")) {
|
||||
var id = block.getMetadata("rid").getFirst().asInt();
|
||||
return id;
|
||||
}
|
||||
|
||||
var id = gatewaysById.inverse().get(block.getLocation());
|
||||
|
||||
if (id == null) {
|
||||
// not in memory, check if repeater
|
||||
var d = RedstoneStore.getInstance().getSavedRepeaterData(block.getLocation());
|
||||
|
||||
if (d == null) {
|
||||
block.setMetadata("rid", new FixedMetadataValue(plugin, Integer.MIN_VALUE));
|
||||
return Integer.MIN_VALUE;
|
||||
}
|
||||
|
||||
id = d.getKey();
|
||||
block.setMetadata("rid", new FixedMetadataValue(plugin, id));
|
||||
|
||||
gatewaysById.put(id, block.getLocation());
|
||||
gatewaysByPower.put(id, d.getValue());
|
||||
}
|
||||
|
||||
if (!isValid(id)) return Integer.MIN_VALUE;
|
||||
|
||||
return id;
|
||||
}
|
||||
|
||||
Block getBlock(int repeaterId) {
|
||||
var location = gatewaysById.get(repeaterId);
|
||||
if (location == null) return null;
|
||||
|
||||
if (!isValid(repeaterId)) return null;
|
||||
|
||||
var storedId = location.getBlock().getMetadata("rid").getFirst().asInt();
|
||||
if (storedId != repeaterId) {
|
||||
DebugLogger.fine("attempted retrieve, but doesn't exist, deleting " + repeaterId);
|
||||
delete(repeaterId);
|
||||
return null;
|
||||
}
|
||||
|
||||
DebugLogger.fine("retrieved " + repeaterId);
|
||||
|
||||
return location.getBlock();
|
||||
}
|
||||
|
||||
/* Control functions */
|
||||
|
||||
byte getInboundPower(int repeaterId) {
|
||||
var block = getBlock(repeaterId);
|
||||
if (block == null) return -1;
|
||||
|
||||
block.getWorld().spawnParticle(Particle.LAVA, block.getLocation().add(0.5, 0.5, 0.5), 3);
|
||||
|
||||
var power = (byte) block.getBlockPower();
|
||||
DebugLogger.fine("Got " + repeaterId + " receives " + power);
|
||||
return power;
|
||||
}
|
||||
|
||||
byte getOutboundPower(int repeaterId) {
|
||||
var block = getBlock(repeaterId);
|
||||
if (block == null) return -1;
|
||||
|
||||
var power = gatewaysByPower.getOrDefault(repeaterId, (byte) 0);
|
||||
DebugLogger.fine("Got " + repeaterId + " outputs " + power);
|
||||
return power;
|
||||
}
|
||||
|
||||
void setPower(int repeaterId, byte power) {
|
||||
if (power < 0 || power > 15)
|
||||
throw new IllegalArgumentException("Power should be 0-15, but is " + power);
|
||||
|
||||
var block = getBlock(repeaterId);
|
||||
if (block == null) return;
|
||||
|
||||
var data = (AnaloguePowerable) block.getBlockData();
|
||||
|
||||
gatewaysByPower.put(repeaterId, power);
|
||||
data.setPower(power);
|
||||
|
||||
block.getWorld().spawnParticle(Particle.LAVA, block.getLocation().add(0.5, 0.5, 0.5), 3);
|
||||
|
||||
DebugLogger.fine("Set power of " + repeaterId + " to " + power);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,91 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.redstone;
|
||||
|
||||
import eu.m724.tweaks.DebugLogger;
|
||||
import eu.m724.tweaks.Language;
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import net.md_5.bungee.api.chat.ClickEvent;
|
||||
import net.md_5.bungee.api.chat.ComponentBuilder;
|
||||
import net.md_5.bungee.api.chat.HoverEvent;
|
||||
import net.md_5.bungee.api.chat.hover.content.Text;
|
||||
import org.bukkit.enchantments.Enchantment;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.block.Action;
|
||||
import org.bukkit.event.block.BlockBreakEvent;
|
||||
import org.bukkit.event.block.BlockPlaceEvent;
|
||||
import org.bukkit.event.block.BlockRedstoneEvent;
|
||||
import org.bukkit.event.player.PlayerInteractEvent;
|
||||
|
||||
public class RedstoneListener implements Listener {
|
||||
private final RedstoneGateways redstoneGateways;
|
||||
private final GatewayItem gatewayItem;
|
||||
|
||||
public RedstoneListener(RedstoneGateways redstoneGateways, GatewayItem gatewayItem) {
|
||||
this.redstoneGateways = redstoneGateways;
|
||||
this.gatewayItem = gatewayItem;
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onBlockPlace(BlockPlaceEvent event) {
|
||||
if (!gatewayItem.isGateway(event.getItemInHand())) return;
|
||||
|
||||
var block = event.getBlockPlaced();
|
||||
var id = redstoneGateways.onPlace(block);
|
||||
|
||||
DebugLogger.fine("Gateway placed: " + id);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onBlockBreak(BlockBreakEvent event) {
|
||||
var id = redstoneGateways.getId(event.getBlock());
|
||||
if (id == Integer.MIN_VALUE) return;
|
||||
|
||||
redstoneGateways.onBreak(id);
|
||||
|
||||
if (event.getPlayer().getInventory().getItemInMainHand().containsEnchantment(Enchantment.SILK_TOUCH)) {
|
||||
event.setDropItems(false);
|
||||
event.getBlock().getWorld().dropItemNaturally(event.getBlock().getLocation(), gatewayItem.itemStack());
|
||||
}
|
||||
|
||||
DebugLogger.fine("Gateway broken: " + id);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerInteract(PlayerInteractEvent event) {
|
||||
if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
|
||||
if (!event.getPlayer().isSneaking()) return;
|
||||
|
||||
var id = redstoneGateways.getId(event.getClickedBlock());
|
||||
if (id == Integer.MIN_VALUE) return;
|
||||
|
||||
// TODO find a less lame way of showing ID
|
||||
var component = new ComponentBuilder("Gateway ID: ").color(ChatColor.GOLD)
|
||||
.append(String.valueOf(id)).color(ChatColor.AQUA)
|
||||
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(Language.getString("clickToCopy"))))
|
||||
.event(new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, String.valueOf(id)))
|
||||
.build();
|
||||
|
||||
event.getPlayer().spigot().sendMessage(component);
|
||||
|
||||
// cancel block place
|
||||
event.setCancelled(true);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onBlockRedstone(BlockRedstoneEvent event) {
|
||||
var block = event.getBlock();
|
||||
|
||||
var id = redstoneGateways.getId(block);
|
||||
if (id == Integer.MIN_VALUE) return;
|
||||
|
||||
event.setNewCurrent(redstoneGateways.getOutboundPower(id));
|
||||
|
||||
DebugLogger.fine("Gateway redstone event: " + id);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,99 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.redstone;
|
||||
|
||||
import eu.m724.tweaks.DebugLogger;
|
||||
import eu.m724.tweaks.config.TweaksConfig;
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.*;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
public class RedstoneModule extends TweaksModule {
|
||||
private final RedstoneGateways redstoneGateways = new RedstoneGateways(getPlugin());
|
||||
|
||||
private DatagramSocket socket;
|
||||
private RedstoneStateUpdateRunnable runnable;
|
||||
|
||||
@Override
|
||||
protected void onInit() {
|
||||
RedstoneStore.init(getPlugin());
|
||||
var gatewayItem = new GatewayItem(getPlugin());
|
||||
|
||||
registerEvents(new RedstoneListener(redstoneGateways, gatewayItem));
|
||||
registerCommand("retstone", new RedstoneCommands(gatewayItem));
|
||||
|
||||
this.runnable = new RedstoneStateUpdateRunnable(redstoneGateways);
|
||||
this.runnable.runTaskTimer(getPlugin(), 0, 20); // TODO configurable
|
||||
|
||||
var listenAddress = TweaksConfig.getConfig().redstoneListen().split(":");
|
||||
InetSocketAddress bindAddress;
|
||||
if (listenAddress.length == 1) {
|
||||
bindAddress = new InetSocketAddress(Integer.parseInt(listenAddress[0]));
|
||||
} else {
|
||||
bindAddress = new InetSocketAddress(listenAddress[0], Integer.parseInt(listenAddress[1]));
|
||||
}
|
||||
|
||||
try {
|
||||
initSocket(bindAddress);
|
||||
} catch (SocketException e) {
|
||||
throw new RuntimeException("Starting socket", e);
|
||||
}
|
||||
}
|
||||
|
||||
private void initSocket(SocketAddress bindAddress) throws SocketException {
|
||||
socket = new DatagramSocket(bindAddress);
|
||||
|
||||
Executors.newSingleThreadExecutor().execute(() -> {
|
||||
byte[] buf = new byte[4];
|
||||
|
||||
while (!socket.isClosed()) {
|
||||
DatagramPacket packet
|
||||
= new DatagramPacket(buf, buf.length);
|
||||
try {
|
||||
socket.receive(packet);
|
||||
} catch (IOException e) {
|
||||
DebugLogger.severe("Error reading packet: " + e.getMessage());
|
||||
continue;
|
||||
}
|
||||
|
||||
boolean write = (buf[0] >> 7 & 1) == 1;
|
||||
byte data = (byte) (buf[3] & 0xF);
|
||||
int gatewayId = ((buf[0] & 0x7F) << 24) | ((buf[1] & 0xFF) << 16) | ((buf[2] & 0xFF) << 8) | (buf[3] & 0xF0);
|
||||
|
||||
if (write) {
|
||||
enqueueUpdate(gatewayId, data);
|
||||
} else {
|
||||
var newPacket = new DatagramPacket(new byte[1], 1, packet.getSocketAddress());
|
||||
|
||||
enqueueRetrieve(gatewayId, value -> {
|
||||
DebugLogger.fine("Retrieved for " + gatewayId + " power " + value);
|
||||
newPacket.setData(new byte[] { (byte) Math.max(value, 0) });
|
||||
|
||||
try {
|
||||
socket.send(newPacket);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException("Sending response to get repeater value", e);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void enqueueUpdate(int gatewayId, byte power) {
|
||||
DebugLogger.finer("Update enqueued " + gatewayId + " " + power);
|
||||
runnable.enqueueUpdate(gatewayId, power);
|
||||
}
|
||||
|
||||
private void enqueueRetrieve(int gatewayId, Consumer<Byte> consumer) {
|
||||
DebugLogger.finer("Retrieve enqueued " + gatewayId);
|
||||
runnable.enqueueRetrieve(gatewayId, consumer);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.redstone;
|
||||
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
public class RedstoneStateUpdateRunnable extends BukkitRunnable {
|
||||
private Map<Integer, Byte> updateQueue = new HashMap<>();
|
||||
private Map<Integer, Consumer<Byte>> retrieveQueue = new HashMap<>();
|
||||
|
||||
private final RedstoneGateways redstoneGateways;
|
||||
|
||||
RedstoneStateUpdateRunnable(RedstoneGateways redstoneGateways) {
|
||||
this.redstoneGateways = redstoneGateways;
|
||||
}
|
||||
|
||||
void enqueueUpdate(int gatewayId, byte power) {
|
||||
updateQueue.put(gatewayId, power);
|
||||
}
|
||||
|
||||
void enqueueRetrieve(int repeaterId, Consumer<Byte> consumer) {
|
||||
retrieveQueue.put(repeaterId, consumer);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
var updateQueue = this.updateQueue;
|
||||
this.updateQueue = new HashMap<>();
|
||||
|
||||
var retrieveQueue = this.retrieveQueue;
|
||||
this.retrieveQueue = new HashMap<>();
|
||||
|
||||
updateQueue.forEach((key, value) -> redstoneGateways.setPower(key, value));
|
||||
retrieveQueue.forEach((key, value) -> value.accept(redstoneGateways.getInboundPower(key)));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.redstone;
|
||||
|
||||
import com.google.common.primitives.Ints;
|
||||
import eu.m724.tweaks.DebugLogger;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
|
||||
public class RedstoneStore {
|
||||
private static RedstoneStore INSTANCE;
|
||||
|
||||
private final File directory;
|
||||
|
||||
private RedstoneStore(Plugin plugin) {
|
||||
this.directory = new File(plugin.getDataFolder(), "storage/redstone");
|
||||
directory.mkdirs();
|
||||
}
|
||||
|
||||
static void init(Plugin plugin) {
|
||||
INSTANCE = new RedstoneStore(plugin);
|
||||
}
|
||||
|
||||
static RedstoneStore getInstance() {
|
||||
return INSTANCE;
|
||||
}
|
||||
|
||||
Pair<Integer, Byte> getSavedRepeaterData(Location location) {
|
||||
var file = getFile(location);
|
||||
if (!file.exists()) return null;
|
||||
|
||||
byte[] bytes;
|
||||
|
||||
try {
|
||||
// TODO read just 4 bytes
|
||||
bytes = Files.readAllBytes(file.toPath());
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException("Loading saved gateway data", e);
|
||||
}
|
||||
|
||||
var gatewayId = Ints.fromByteArray(bytes) & ~0xF;
|
||||
var powerLevel = (byte) (bytes[3] & 0xF);
|
||||
|
||||
DebugLogger.fine("load " + location + " " + gatewayId + " " + powerLevel);
|
||||
|
||||
return Pair.of(gatewayId, powerLevel);
|
||||
}
|
||||
|
||||
void saveRepeaterData(Location location, int gatewayId, byte powerLevel) {
|
||||
var file = getFile(location);
|
||||
byte[] bytes = Ints.toByteArray((gatewayId & ~0xF) | (powerLevel & 0xF));
|
||||
|
||||
try {
|
||||
Files.write(file.toPath(), bytes);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException("Saving repeater data", e);
|
||||
}
|
||||
|
||||
DebugLogger.fine("save " + location + " " + gatewayId + " " + powerLevel);
|
||||
}
|
||||
|
||||
void deleteSavedRepeaterData(Location location) {
|
||||
getFile(location).delete();
|
||||
}
|
||||
|
||||
private File getFile(Location location) {
|
||||
return new File(directory, location.getWorld().getName() + " " + location.getBlockX() + " " + location.getBlockY() + " " + location.getBlockZ());
|
||||
}
|
||||
}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.sleep;
|
||||
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
|
||||
public class SleepModule extends TweaksModule {
|
||||
@Override
|
||||
protected void onInit() {
|
||||
registerEvents(new SleepListener());
|
||||
|
||||
if (!getConfig().sleepInstant())
|
||||
new TimeForwardRunnable(getPlugin()).runTaskTimer(getPlugin(), 0, 1); // TODO maybe not
|
||||
}
|
||||
}
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.sleep;
|
||||
|
||||
import org.bukkit.GameRule;
|
||||
import org.bukkit.Server;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
|
||||
public class TimeForwardRunnable extends BukkitRunnable {
|
||||
private final Server server;
|
||||
|
||||
public TimeForwardRunnable(Plugin plugin) {
|
||||
this.server = plugin.getServer();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
for (World world : server.getWorlds()) {
|
||||
var gameRuleValue = world.getGameRuleValue(GameRule.PLAYERS_SLEEPING_PERCENTAGE);
|
||||
if (gameRuleValue == null) gameRuleValue = 100;
|
||||
double percentage = gameRuleValue / 100.0;
|
||||
|
||||
int playersSleeping = SleepState.playersSleeping;
|
||||
//System.out.println(playersSleeping);
|
||||
if (playersSleeping == 0) return;
|
||||
|
||||
int onlinePlayers = (int) (world.getPlayers().size() / percentage);
|
||||
|
||||
double sleepPercentage = (double) playersSleeping / onlinePlayers;
|
||||
|
||||
// we want sleep to take 200 ticks which is 10 seconds assuming all palyres onilien
|
||||
|
||||
long time = world.getTime();
|
||||
long untilDay = 23459 - time;
|
||||
|
||||
if (untilDay == 0) return;
|
||||
|
||||
long perSkip = 200 + (100000 / -untilDay);
|
||||
perSkip = Math.clamp(perSkip, 20, 200);
|
||||
perSkip = (long) (perSkip * sleepPercentage);
|
||||
|
||||
world.setTime(world.getTime() + perSkip);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.swing;
|
||||
|
||||
import eu.m724.tweaks.DebugLogger;
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.attribute.Attribute;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.block.BlockBreakEvent;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
public class SwingModule extends TweaksModule implements Listener {
|
||||
private final Set<Material> tools = new HashSet<>();
|
||||
|
||||
@Override
|
||||
protected void onInit() {
|
||||
Arrays.stream(Material.values())
|
||||
.filter(m -> m.name().contains("SWORD"))
|
||||
.forEach(tools::add);
|
||||
|
||||
DebugLogger.finer("Tools: " + tools.size());
|
||||
|
||||
registerEvents(this);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onBreak(BlockBreakEvent event) {
|
||||
var type = event.getBlock().getType();
|
||||
if (type.isOccluding()) return;
|
||||
|
||||
var player = event.getPlayer();
|
||||
var tool = player.getInventory().getItemInMainHand().getType();
|
||||
Entity entity = null;
|
||||
|
||||
if (tools.contains(tool)) { // if sword, raycast to hit farther
|
||||
var result = player.getWorld().rayTraceEntities(
|
||||
player.getEyeLocation(),
|
||||
player.getEyeLocation().getDirection(),
|
||||
player.getAttribute(Attribute.PLAYER_ENTITY_INTERACTION_RANGE).getValue(),
|
||||
e -> e != player
|
||||
);
|
||||
|
||||
if (result != null)
|
||||
entity = result.getHitEntity();
|
||||
} else {
|
||||
entity = event.getBlock().getWorld()
|
||||
.getNearbyEntities(event.getBlock().getLocation().add(0.5, 0.5, 0.5), 0.5, 0.5, 0.5)
|
||||
.stream().filter(e -> (e instanceof LivingEntity && e != player))
|
||||
.findFirst().orElse(null);
|
||||
}
|
||||
|
||||
if (entity != null) {
|
||||
player.attack(entity);
|
||||
DebugLogger.fine("Swing " + player.getName() + " hit " + entity.getName());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,98 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.updater;
|
||||
|
||||
import eu.m724.tweaks.DebugLogger;
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
import eu.m724.tweaks.module.updater.backend.UpdateChecker;
|
||||
import eu.m724.tweaks.module.updater.backend.VersionCache;
|
||||
import eu.m724.tweaks.module.updater.object.ResourceVersion;
|
||||
import eu.m724.tweaks.module.updater.object.SpigotResource;
|
||||
import eu.m724.tweaks.module.updater.object.VersionedResource;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class UpdaterModule extends TweaksModule {
|
||||
@Override
|
||||
protected void onInit() {
|
||||
var resources = loadInstalledPlugins();
|
||||
|
||||
// load installed versions from cache
|
||||
var cacheFile = new File(getPlugin().getDataFolder(), "storage/cache/updater");
|
||||
|
||||
final var installedVersions = loadInstalledVersionCache(cacheFile);
|
||||
|
||||
var versionedResources = resources.stream()
|
||||
.map(res -> new VersionedResource(
|
||||
res, installedVersions.stream().filter(iv -> iv.resourceId() == res.resourceId()).findFirst().orElse(null), null
|
||||
))
|
||||
.collect(Collectors.toSet());
|
||||
|
||||
|
||||
var updateChecker = new UpdateChecker(getPlugin().getLogger(), cacheFile, versionedResources);
|
||||
updateChecker.runTaskTimerAsynchronously(getPlugin(), 600, 12 * 3600 * 20); // 12 hours
|
||||
|
||||
registerCommand("updates", new UpdaterCommands(updateChecker));
|
||||
}
|
||||
|
||||
private Set<ResourceVersion> loadInstalledVersionCache(File cacheFile) {
|
||||
try (FileInputStream inputStream = new FileInputStream(cacheFile)) {
|
||||
return VersionCache.loadAll(inputStream);
|
||||
} catch (FileNotFoundException ignored) {
|
||||
} catch (IOException e) {
|
||||
DebugLogger.warning("Error loading installed version cache, starting fresh. " + e.getMessage());
|
||||
}
|
||||
|
||||
return new HashSet<>();
|
||||
}
|
||||
|
||||
private Set<SpigotResource> loadInstalledPlugins() {
|
||||
File installedPluginsYml = new File(getPlugin().getDataFolder(), "installed_plugins.yml");
|
||||
|
||||
if (!installedPluginsYml.exists()) {
|
||||
getPlugin().saveResource("installed_plugins.yml", false);
|
||||
}
|
||||
|
||||
YamlConfiguration configuration = YamlConfiguration.loadConfiguration(installedPluginsYml);
|
||||
|
||||
Plugin[] plugins = getPlugin().getServer().getPluginManager().getPlugins();
|
||||
Set<SpigotResource> spigotResources = new HashSet<>();
|
||||
|
||||
for (Plugin plugin : plugins) {
|
||||
String pluginName = plugin.getName();
|
||||
|
||||
if (!configuration.isSet(pluginName)) {
|
||||
configuration.set(pluginName, -1);
|
||||
continue;
|
||||
}
|
||||
|
||||
int pluginId = configuration.getInt(pluginName);
|
||||
if (pluginId > 0) {
|
||||
spigotResources.add(
|
||||
new SpigotResource(plugin, pluginId, pluginName)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
configuration.save(installedPluginsYml);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException("Failed to update installed_plugins.yml", e);
|
||||
}
|
||||
|
||||
return spigotResources;
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -1,115 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.updater.backend;
|
||||
|
||||
import eu.m724.tweaks.DebugLogger;
|
||||
import eu.m724.tweaks.Language;
|
||||
import eu.m724.tweaks.module.updater.object.VersionedResource;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.HashSet;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.CompletionException;
|
||||
import java.util.logging.Logger;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class UpdateChecker extends BukkitRunnable {
|
||||
private final Logger logger;
|
||||
private final File cacheFile;
|
||||
private final Set<VersionedResource> resources;
|
||||
|
||||
private final Set<VersionedResource> availableUpdates = new HashSet<>();
|
||||
private long lastChecked = -1;
|
||||
|
||||
public UpdateChecker(Logger logger, File cacheFile, Set<VersionedResource> resources) {
|
||||
this.logger = logger;
|
||||
this.cacheFile = cacheFile;
|
||||
this.resources = resources; // TODO make a copy?
|
||||
}
|
||||
|
||||
private void checkAll() {
|
||||
DebugLogger.fine("Checking for updates");
|
||||
lastChecked = System.currentTimeMillis();
|
||||
availableUpdates.clear();
|
||||
var errors = 0;
|
||||
|
||||
for (VersionedResource versionedResource : Set.copyOf(resources)) {
|
||||
String pluginName = versionedResource.resource().plugin().getName();
|
||||
int page = versionedResource.running() != null ? versionedResource.running().page() : 1;
|
||||
|
||||
try {
|
||||
VersionedResource newResource = new VersionScanner(versionedResource.resource(), page).join(); // this runs async so it's ok
|
||||
if (!versionedResource.equals(newResource)) {
|
||||
resources.remove(versionedResource);
|
||||
|
||||
if (newResource.running() == null) {
|
||||
var pluginVersion = versionedResource.resource().plugin().getDescription().getVersion();
|
||||
var message = "";
|
||||
|
||||
if (pluginVersion.endsWith("-SNAPSHOT")) {
|
||||
message = "Is it a development build?";
|
||||
} else if (versionedResource.running() != null) {
|
||||
message = "Did you downgrade it? If so, clear cache (delete Tweaks724/storage/cache/updater)";
|
||||
}
|
||||
|
||||
DebugLogger.warning("This version of %s doesn't exist on SpigotMC. %s", pluginName, message);
|
||||
errors++;
|
||||
} else {
|
||||
if (!newResource.running().equals(newResource.latest())) {
|
||||
availableUpdates.add(newResource);
|
||||
}
|
||||
}
|
||||
|
||||
resources.add(newResource);
|
||||
}
|
||||
} catch (CompletionException e) {
|
||||
DebugLogger.severe("Unable to refresh %s: %s".formatted(pluginName, e.getMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
if (errors > 0) {
|
||||
DebugLogger.info("To disable the updater for specific plugins, refer to updater_config.yml");
|
||||
}
|
||||
}
|
||||
|
||||
private void alert() {
|
||||
int n = availableUpdates.size();
|
||||
if (n == 0) return;
|
||||
logger.info(Language.getString("updateAvailableNotice", n));
|
||||
|
||||
availableUpdates.stream()
|
||||
.map(u -> "- %s (%s -> %s)".formatted(u.resource().name(), u.running().label(), u.latest().label()))
|
||||
.forEach(logger::info);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
checkAll();
|
||||
|
||||
DebugLogger.finer("Done checking, now saving");
|
||||
cacheFile.getParentFile().mkdirs();
|
||||
try (FileOutputStream outputStream = new FileOutputStream(cacheFile)) {
|
||||
VersionCache.writeAll(outputStream, resources.stream().map(VersionedResource::running).filter(Objects::nonNull).collect(Collectors.toSet()));
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
alert();
|
||||
}
|
||||
|
||||
public long getLastChecked() {
|
||||
return lastChecked;
|
||||
}
|
||||
|
||||
public Set<VersionedResource> getAvailableUpdates() {
|
||||
return availableUpdates;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.wordcoords;
|
||||
|
||||
import eu.m724.tweaks.DebugLogger;
|
||||
import eu.m724.tweaks.module.wordcoords.converter.Decoder;
|
||||
import eu.m724.tweaks.module.wordcoords.converter.Encoder;
|
||||
|
||||
import java.util.NoSuchElementException;
|
||||
|
||||
public class WordCoordsConverter {
|
||||
private final Encoder encoder;
|
||||
private final Decoder decoder;
|
||||
|
||||
|
||||
public WordCoordsConverter(WordList wordList) {
|
||||
this.encoder = new Encoder(wordList);
|
||||
this.decoder = new Decoder(wordList);
|
||||
|
||||
DebugLogger.fine("Words: %d (%d bits)", wordList.getWordCount(), wordList.getBitsPerWord());
|
||||
DebugLogger.fine("Bits per word: %d", wordList.getBitsPerWord());
|
||||
}
|
||||
|
||||
public String[] encode(int x, int z) {
|
||||
return encoder.encode(x, z);
|
||||
}
|
||||
|
||||
public int[] decode(String[] words) throws NoSuchElementException {
|
||||
return decoder.decode(words);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,118 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.wordcoords;
|
||||
|
||||
import eu.m724.tweaks.Language;
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class WordCoordsModule extends TweaksModule implements CommandExecutor {
|
||||
private WordList wordList;
|
||||
private WordCoordsConverter converter;
|
||||
|
||||
@Override
|
||||
protected void onInit() {
|
||||
try {
|
||||
this.wordList = WordList.fromFile(getPlugin().getDataFolder().toPath().resolve("storage/wordlist.txt"));
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
this.converter = new WordCoordsConverter(wordList);
|
||||
|
||||
registerCommand("wordcoords", this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
|
||||
int x = 0, z = 0;
|
||||
String[] words = new String[0];
|
||||
|
||||
boolean encode = false; // means encode pos to words
|
||||
|
||||
if (args.length == 0) {
|
||||
if (!(sender instanceof Player player)) {
|
||||
sender.sendMessage(Language.getString("wordCoordsPlayerOnly"));
|
||||
return true;
|
||||
}
|
||||
|
||||
x = player.getLocation().getBlockX();
|
||||
z = player.getLocation().getBlockZ();
|
||||
|
||||
encode = true;
|
||||
} else {
|
||||
if (args.length > 1) {
|
||||
try {
|
||||
double dx = Double.parseDouble(args[0]);
|
||||
double dz = Double.parseDouble(args[args.length > 2 ? 2 : 1]);
|
||||
|
||||
if (dx > Integer.MAX_VALUE || dx < Integer.MIN_VALUE || dz > Integer.MAX_VALUE || dz < Integer.MIN_VALUE) {
|
||||
sender.spigot().sendMessage(Language.getComponent("wordCoordsOutOfRange", ChatColor.RED));
|
||||
return true;
|
||||
}
|
||||
|
||||
x = (int) dx;
|
||||
z = (int) dz;
|
||||
|
||||
encode = true;
|
||||
} catch (NumberFormatException ignored) { }
|
||||
}
|
||||
|
||||
if (!encode) {
|
||||
String strArgs = String.join(" ", args);
|
||||
words = smartDetectWords(strArgs);
|
||||
}
|
||||
}
|
||||
|
||||
if (encode) {
|
||||
words = converter.encode(x, z);
|
||||
|
||||
sender.sendMessage("%d, %d encodes to ///%s".formatted(x, z, String.join(".", words)));
|
||||
} else {
|
||||
int[] xz = converter.decode(words);
|
||||
x = xz[0];
|
||||
z = xz[1];
|
||||
|
||||
sender.sendMessage("///%s decodes to around %d, %d".formatted(String.join(".", words), x, z));
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private String[] smartDetectWords(String str) {
|
||||
List<String> words = new ArrayList<>();
|
||||
StringBuilder currentWord = new StringBuilder();
|
||||
|
||||
for (int i=0; i<str.length(); i++) {
|
||||
char c = str.charAt(i);
|
||||
|
||||
if (Character.isLetter(c)) {
|
||||
currentWord.append(c);
|
||||
} else {
|
||||
if (!currentWord.isEmpty()) {
|
||||
words.add(currentWord.toString());
|
||||
currentWord.setLength(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!currentWord.isEmpty()) {
|
||||
words.add(currentWord.toString());
|
||||
}
|
||||
|
||||
return words.toArray(String[]::new);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.wordcoords;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
public class WordList {
|
||||
private final List<String> wordList;
|
||||
private final int bitsPerWord;
|
||||
|
||||
public WordList(List<String> words) {
|
||||
this.wordList = words;
|
||||
this.bitsPerWord = 32 - Integer.numberOfLeadingZeros(words.size()) - 1;
|
||||
}
|
||||
|
||||
public String getWord(int index) {
|
||||
return wordList.get(index);
|
||||
}
|
||||
|
||||
public int getWordIndex(String word) {
|
||||
return wordList.indexOf(word);
|
||||
}
|
||||
|
||||
public String[] getWords(int... indexes) {
|
||||
return Arrays.stream(indexes)
|
||||
.mapToObj(this::getWord)
|
||||
.toArray(String[]::new);
|
||||
}
|
||||
|
||||
public int[] getIndexes(String... words) {
|
||||
return Arrays.stream(words)
|
||||
.mapToInt(wordList::indexOf)
|
||||
.toArray();
|
||||
}
|
||||
|
||||
public int getWordCount() {
|
||||
return wordList.size();
|
||||
}
|
||||
|
||||
public int getBitsPerWord() {
|
||||
return bitsPerWord;
|
||||
}
|
||||
|
||||
public static WordList fromFile(Path path) throws IOException {
|
||||
try (var lines = Files.lines(path)) {
|
||||
var list = lines.filter(s -> !s.isBlank())
|
||||
.map(String::toLowerCase)
|
||||
.distinct()
|
||||
.toList();
|
||||
|
||||
return new WordList(list);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -1,76 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.wordcoords.converter;
|
||||
|
||||
import eu.m724.tweaks.DebugLogger;
|
||||
import eu.m724.tweaks.module.wordcoords.WordList;
|
||||
|
||||
import java.util.NoSuchElementException;
|
||||
|
||||
public class Decoder {
|
||||
private final WordList wordList;
|
||||
private final int bitsPerWord;
|
||||
|
||||
public Decoder(WordList wordList) {
|
||||
this.wordList = wordList;
|
||||
this.bitsPerWord = wordList.getBitsPerWord();
|
||||
}
|
||||
|
||||
public int[] decode(String[] words) throws NoSuchElementException {
|
||||
int[] wordIndexes = new int[words.length];
|
||||
|
||||
for (int i=0; i<words.length; i++) {
|
||||
wordIndexes[i] = wordList.getWordIndex(words[i]);
|
||||
if (wordIndexes[i] == -1)
|
||||
throw new NoSuchElementException(words[i]);
|
||||
}
|
||||
|
||||
return decode(wordIndexes);
|
||||
}
|
||||
|
||||
public int[] decode(int[] wordIndexes) {
|
||||
int bitsRequired = wordIndexes.length * wordList.getBitsPerWord();
|
||||
int bitsRequiredPerCoordinate = bitsRequired / 2;
|
||||
DebugLogger.finer("Bits required: %d (per coord: %d)", bitsRequired, bitsRequiredPerCoordinate);
|
||||
|
||||
|
||||
long combinedValue = wordIndexesToCombinedValue(wordIndexes);
|
||||
DebugLogger.finer("Combined value: %d", combinedValue);
|
||||
|
||||
|
||||
int[] decodedCoords = decodeCoords(combinedValue, bitsRequiredPerCoordinate);
|
||||
int xCoord = decodedCoords[0];
|
||||
int zCoord = decodedCoords[1];
|
||||
DebugLogger.info("Chunk: %d, %d", xCoord, zCoord);
|
||||
|
||||
return new int[] { xCoord * 16 + 8, zCoord * 16 + 8 }; // +8 to make it center of chunk
|
||||
}
|
||||
|
||||
private long wordIndexesToCombinedValue(int[] wordIndexes) {
|
||||
long combinedValue = 0;
|
||||
|
||||
for (int i=0; i<wordIndexes.length; i++) {
|
||||
combinedValue |= wordIndexes[i];
|
||||
combinedValue <<= bitsPerWord;
|
||||
}
|
||||
|
||||
combinedValue >>= bitsPerWord;
|
||||
|
||||
return combinedValue;
|
||||
}
|
||||
|
||||
private int[] decodeCoords(long combinedValue, int bitsRequiredPerCoordinate) {
|
||||
int coordinateMask = (1 << bitsRequiredPerCoordinate) - 1;
|
||||
int coordinateOffset = 1 << (bitsRequiredPerCoordinate - 1);
|
||||
|
||||
int z = (int) (combinedValue & coordinateMask) - coordinateOffset;
|
||||
int x = (int) (combinedValue >> bitsRequiredPerCoordinate) - coordinateOffset;
|
||||
|
||||
return new int[] { x, z };
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,82 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.wordcoords.converter;
|
||||
|
||||
import eu.m724.tweaks.DebugLogger;
|
||||
import eu.m724.tweaks.module.wordcoords.WordList;
|
||||
|
||||
public class Encoder {
|
||||
private final WordList wordList;
|
||||
private final int bitsPerWord;
|
||||
|
||||
public Encoder(WordList wordList) {
|
||||
this.wordList = wordList;
|
||||
this.bitsPerWord = wordList.getBitsPerWord();
|
||||
}
|
||||
|
||||
public String[] encode(int xCoord, int zCoord) {
|
||||
xCoord = Math.floorDiv(xCoord, 16);
|
||||
zCoord = Math.floorDiv(zCoord, 16);
|
||||
DebugLogger.finer("Chunk: %d, %d", xCoord, zCoord);
|
||||
|
||||
|
||||
int wordsRequired = findWordsRequired(xCoord, zCoord);
|
||||
DebugLogger.finer("Words required: %d", wordsRequired);
|
||||
|
||||
int bitsRequired = wordsRequired * bitsPerWord;
|
||||
int bitsRequiredPerCoordinate = bitsRequired / 2;
|
||||
DebugLogger.finer("Bits required: %d (per coord: %d)", bitsRequired, bitsRequiredPerCoordinate);
|
||||
|
||||
|
||||
int encodedX = encodeCoord(xCoord, bitsRequiredPerCoordinate);
|
||||
int encodedZ = encodeCoord(zCoord, bitsRequiredPerCoordinate);
|
||||
DebugLogger.finer("Encoded coordinates: %d, %d", encodedX, encodedZ);
|
||||
|
||||
|
||||
long combinedValue = ((long) encodedX << bitsRequiredPerCoordinate) | encodedZ;
|
||||
DebugLogger.finer("Combined value: %d", combinedValue);
|
||||
|
||||
|
||||
int[] wordIndexes = combinedValueToWordIndexes(combinedValue, wordsRequired);
|
||||
return wordList.getWords(wordIndexes);
|
||||
}
|
||||
|
||||
private int findBitsRequiredPerCoordinate(int x, int z) {
|
||||
int n = Math.max(Math.abs(x), Math.abs(z));
|
||||
return n == 0 ? 1 : 32 - Integer.numberOfLeadingZeros(n);
|
||||
}
|
||||
|
||||
private int findWordsRequired(int x, int z) {
|
||||
int brpc = findBitsRequiredPerCoordinate(x, z);
|
||||
return Math.ceilDiv(brpc * 2, wordList.getBitsPerWord());
|
||||
}
|
||||
|
||||
private int encodeCoord(int coord, int bitsRequiredPerCoordinate) {
|
||||
// Bitmask and offset for positive integer conversion
|
||||
int coordinateMask = (1 << bitsRequiredPerCoordinate) - 1;
|
||||
int coordinateOffset = 1 << (bitsRequiredPerCoordinate - 1);
|
||||
|
||||
// Encode coordinates with offset into positive range
|
||||
return (coordinateOffset + coord) & coordinateMask;
|
||||
}
|
||||
|
||||
private int[] combinedValueToWordIndexes(long combinedValue, int wordsRequired) {
|
||||
int bitsRequired = wordsRequired * bitsPerWord;
|
||||
|
||||
// Break into word indexes
|
||||
int[] wordIndexes = new int[wordsRequired];
|
||||
int currentIndex = wordsRequired; // Start filling from end of array
|
||||
|
||||
for (int remainingBits = bitsRequired; remainingBits > 0; remainingBits -= bitsPerWord) {
|
||||
int wordMask = (1 << bitsPerWord) - 1;
|
||||
wordIndexes[--currentIndex] = (int) (combinedValue & wordMask);
|
||||
combinedValue >>= bitsPerWord;
|
||||
}
|
||||
|
||||
return wordIndexes;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.worldborder;
|
||||
|
||||
import com.comphenix.protocol.PacketType;
|
||||
import com.comphenix.protocol.events.PacketContainer;
|
||||
import eu.m724.tweaks.module.TweaksModule;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
public class WorldBorderHideModule extends TweaksModule {
|
||||
private static final int EXTENSION_RADIUS = 512;
|
||||
|
||||
@Override
|
||||
protected void onInit() {
|
||||
getPlugin().getServer().getMessenger().registerOutgoingPluginChannel(getPlugin(), "tweaks724:worldborder");
|
||||
|
||||
byte[] infoArray = ByteBuffer.allocate(4).putInt(EXTENSION_RADIUS).array();
|
||||
|
||||
onPacketSend(PacketType.Play.Server.INITIALIZE_BORDER, (event) -> {
|
||||
PacketContainer packet = event.getPacket();
|
||||
// old diameter
|
||||
packet.getDoubles().write(2, packet.getDoubles().read(2) + EXTENSION_RADIUS * 2);
|
||||
// new diameter
|
||||
packet.getDoubles().write(3, packet.getDoubles().read(3) + EXTENSION_RADIUS * 2);
|
||||
|
||||
// border radius
|
||||
packet.getIntegers().write(0, packet.getIntegers().read(0) + EXTENSION_RADIUS);
|
||||
// warning distance
|
||||
packet.getIntegers().write(1, packet.getIntegers().read(1) + EXTENSION_RADIUS);
|
||||
|
||||
event.getPlayer().sendPluginMessage(getPlugin(), "tweaks724:worldborder", infoArray);
|
||||
});
|
||||
|
||||
onPacketSend(PacketType.Play.Server.SET_BORDER_SIZE, (event) -> {
|
||||
PacketContainer packet = event.getPacket();
|
||||
// diameter
|
||||
packet.getDoubles().write(0, packet.getDoubles().read(0) + EXTENSION_RADIUS * 2);
|
||||
});
|
||||
|
||||
onPacketSend(PacketType.Play.Server.SET_BORDER_WARNING_DISTANCE, (event) -> {
|
||||
PacketContainer packet = event.getPacket();
|
||||
// warning distance
|
||||
packet.getIntegers().write(0, packet.getIntegers().read(0) + EXTENSION_RADIUS);
|
||||
});
|
||||
}
|
||||
}
|
||||
103
src/main/java/eu/m724/tweaks/motd/MotdManager.java
Normal file
103
src/main/java/eu/m724/tweaks/motd/MotdManager.java
Normal file
|
|
@ -0,0 +1,103 @@
|
|||
/*
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.motd;
|
||||
|
||||
import com.comphenix.protocol.PacketType;
|
||||
import com.comphenix.protocol.ProtocolLibrary;
|
||||
import com.comphenix.protocol.events.*;
|
||||
import com.comphenix.protocol.reflect.StructureModifier;
|
||||
import com.google.gson.JsonElement;
|
||||
import eu.m724.tweaks.TweaksConfig;
|
||||
import eu.m724.tweaks.TweaksPlugin;
|
||||
import net.md_5.bungee.api.chat.TextComponent;
|
||||
import net.md_5.bungee.chat.ComponentSerializer;
|
||||
import net.minecraft.SharedConstants;
|
||||
import net.minecraft.core.RegistryAccess;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.network.protocol.status.ServerStatus;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.util.Arrays;
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.ThreadLocalRandom;
|
||||
|
||||
public class MotdManager {
|
||||
private final TweaksPlugin plugin;
|
||||
|
||||
private Component[] motds;
|
||||
|
||||
public MotdManager(TweaksPlugin plugin) {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
public void init() throws IOException {
|
||||
// TODO adding more MOTD features would require checking whether to enable set
|
||||
|
||||
String motdSetName = TweaksConfig.getConfig().motdSet();
|
||||
String motdSetPath = "motd sets/" + motdSetName + ".txt";
|
||||
File motdSetsFile = new File(plugin.getDataFolder(), motdSetPath);
|
||||
|
||||
// create "motd sets" directory
|
||||
motdSetsFile.getParentFile().mkdirs();
|
||||
|
||||
// if this is a builtin set
|
||||
if (!motdSetsFile.exists() && plugin.hasResource(motdSetPath))
|
||||
plugin.saveResource(motdSetPath, false);
|
||||
|
||||
if (!motdSetsFile.exists()) {
|
||||
throw new RuntimeException("MOTD set \"%s\" doesn't exist".formatted(motdSetName));
|
||||
}
|
||||
|
||||
String fileContent = Files.readString(motdSetsFile.toPath());
|
||||
// MOTDs are split with an empty line
|
||||
motds = Arrays.stream(fileContent.split("\n\n"))
|
||||
.map(s -> {
|
||||
JsonElement json = ComponentSerializer.toJson(TextComponent.fromLegacy(s.strip()));
|
||||
return Component.Serializer.fromJson(json, RegistryAccess.EMPTY);
|
||||
})
|
||||
.toArray(Component[]::new);
|
||||
|
||||
registerListener(plugin);
|
||||
}
|
||||
|
||||
private void registerListener(Plugin plugin) {
|
||||
ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(
|
||||
plugin,
|
||||
ListenerPriority.NORMAL,
|
||||
PacketType.Status.Server.SERVER_INFO
|
||||
) {
|
||||
@Override
|
||||
public void onPacketSending(PacketEvent event) {
|
||||
PacketContainer packet = event.getPacket();
|
||||
|
||||
Component motd = motds[ThreadLocalRandom.current().nextInt(motds.length)];
|
||||
|
||||
ServerStatus serverStatus = (ServerStatus) packet.getStructures().read(0).getHandle();
|
||||
|
||||
/* this:
|
||||
* removes server mod prefix (Paper, Spigot, any brand)
|
||||
* hides players
|
||||
*/
|
||||
ServerStatus newStatus = new ServerStatus(
|
||||
motd,
|
||||
Optional.empty(),
|
||||
Optional.of(new ServerStatus.Version(
|
||||
SharedConstants.getCurrentVersion().getName(),
|
||||
SharedConstants.getProtocolVersion()
|
||||
)),
|
||||
serverStatus.favicon(),
|
||||
false
|
||||
);
|
||||
|
||||
packet.getStructures().write(0, new InternalStructure(newStatus, new StructureModifier<>(ServerStatus.class)));
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -1,16 +1,16 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.ping;
|
||||
package eu.m724.tweaks.ping;
|
||||
|
||||
import com.comphenix.protocol.PacketType;
|
||||
import com.comphenix.protocol.ProtocolLibrary;
|
||||
import com.comphenix.protocol.events.*;
|
||||
import com.comphenix.protocol.reflect.StructureModifier;
|
||||
import eu.m724.tweaks.config.TweaksConfig;
|
||||
import eu.m724.tweaks.TweaksConfig;
|
||||
import net.minecraft.network.protocol.common.custom.BrandPayload;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.ping;
|
||||
package eu.m724.tweaks.ping;
|
||||
|
||||
import com.comphenix.protocol.PacketType;
|
||||
import com.comphenix.protocol.ProtocolLibrary;
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.ping;
|
||||
package eu.m724.tweaks.ping;
|
||||
|
||||
import org.bukkit.plugin.Plugin;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
|
|
@ -1,12 +1,11 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.ping;
|
||||
package eu.m724.tweaks.ping;
|
||||
|
||||
import org.bukkit.command.PluginCommand;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
public class PingChecker {
|
||||
|
|
@ -16,10 +15,8 @@ public class PingChecker {
|
|||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
public void init(PluginCommand pingCommand) {
|
||||
public void init() {
|
||||
new KeepAlivePingChecker(plugin).start();
|
||||
new MsptChecker().init(plugin); // TODO should this be here
|
||||
|
||||
pingCommand.setExecutor(new PingCommands());
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.ping;
|
||||
package eu.m724.tweaks.ping;
|
||||
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.ping;
|
||||
package eu.m724.tweaks.ping;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.pomodoro;
|
||||
package eu.m724.tweaks.pomodoro;
|
||||
|
||||
public class PlayerPomodoro {
|
||||
private int pomodori = 0;
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.pomodoro;
|
||||
package eu.m724.tweaks.pomodoro;
|
||||
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.pomodoro;
|
||||
package eu.m724.tweaks.pomodoro;
|
||||
|
||||
import eu.m724.tweaks.config.TweaksConfig;
|
||||
import eu.m724.tweaks.TweaksConfig;
|
||||
import net.md_5.bungee.api.chat.ComponentBuilder;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
22
src/main/java/eu/m724/tweaks/pomodoro/PomodoroManager.java
Normal file
22
src/main/java/eu/m724/tweaks/pomodoro/PomodoroManager.java
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
/*
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.pomodoro;
|
||||
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
public class PomodoroManager {
|
||||
private final Plugin plugin;
|
||||
|
||||
public PomodoroManager(Plugin plugin) {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
public void init() {
|
||||
plugin.getServer().getPluginManager().registerEvents(new PomodoroListener(), plugin);
|
||||
new PomodoroRunnable(plugin).runTaskTimerAsynchronously(plugin, 0, 20L);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.pomodoro;
|
||||
package eu.m724.tweaks.pomodoro;
|
||||
|
||||
import eu.m724.tweaks.TweaksPlugin;
|
||||
import eu.m724.tweaks.config.TweaksConfig;
|
||||
import eu.m724.tweaks.Language;
|
||||
import eu.m724.tweaks.TweaksConfig;
|
||||
import net.md_5.bungee.api.ChatMessageType;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Sound;
|
||||
|
|
@ -16,12 +16,15 @@ import org.bukkit.scheduler.BukkitRunnable;
|
|||
|
||||
public class PomodoroRunnable extends BukkitRunnable {
|
||||
private final boolean force = TweaksConfig.getConfig().pomodoroForce();
|
||||
private final Plugin plugin = TweaksPlugin.getInstance(); // used only to kick
|
||||
private final Plugin plugin;
|
||||
|
||||
public PomodoroRunnable(Plugin plugin) {
|
||||
this.plugin = plugin; // only used for kicking
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
long now = System.nanoTime();
|
||||
|
||||
Bukkit.getOnlinePlayers().forEach(player -> {
|
||||
PlayerPomodoro pomodoro = Pomodoros.get(player);
|
||||
if (pomodoro == null) return;
|
||||
|
|
@ -34,8 +37,7 @@ public class PomodoroRunnable extends BukkitRunnable {
|
|||
player.playSound(player.getLocation(), Sound.BLOCK_ANVIL_FALL, 1.0f, 0.5f);
|
||||
if (remaining < -60 && force) {
|
||||
plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, () -> {
|
||||
pomodoro.next();
|
||||
player.kickPlayer(Pomodoros.formatTimer(pomodoro, pomodoro.getRemainingSeconds(now)).toLegacyText());
|
||||
player.kickPlayer(Language.getString("pomodoroEndKick"));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.pomodoro;
|
||||
package eu.m724.tweaks.pomodoro;
|
||||
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
|
|
@ -30,7 +30,7 @@ public class Pomodoros {
|
|||
return timers.remove(player.getUniqueId()) != null;
|
||||
}
|
||||
|
||||
static BaseComponent formatTimer(PlayerPomodoro pomodoro, long remaining) {
|
||||
static BaseComponent[] formatTimer(PlayerPomodoro pomodoro, long remaining) {
|
||||
ComponentBuilder builder = new ComponentBuilder();
|
||||
|
||||
if (pomodoro.isBreak()) {
|
||||
|
|
@ -66,6 +66,6 @@ public class Pomodoros {
|
|||
builder.append(" o").color(color);
|
||||
}
|
||||
|
||||
return builder.build();
|
||||
return builder.create();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.sleep;
|
||||
package eu.m724.tweaks.sleep;
|
||||
|
||||
import eu.m724.tweaks.config.TweaksConfig;
|
||||
import eu.m724.tweaks.TweaksConfig;
|
||||
import org.bukkit.GameRule;
|
||||
import org.bukkit.attribute.Attribute;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
|
|
@ -21,7 +21,6 @@ import java.util.Set;
|
|||
|
||||
public class SleepListener implements Listener {
|
||||
private final boolean instant = TweaksConfig.getConfig().sleepInstant();
|
||||
private final double heal = TweaksConfig.getConfig().sleepHeal() * 2; // hearts to half hearts
|
||||
|
||||
private final Set<Player> skippedCurrentNight = new HashSet<>();
|
||||
private long lastDay = 0;
|
||||
|
|
@ -31,21 +30,18 @@ public class SleepListener implements Listener {
|
|||
if (event.getBedEnterResult() == PlayerBedEnterEvent.BedEnterResult.OK) {
|
||||
SleepState.playersSleeping++;
|
||||
|
||||
var player = event.getPlayer();
|
||||
var world = player.getWorld();
|
||||
if (instant) {
|
||||
World world = event.getPlayer().getWorld();
|
||||
|
||||
long day = world.getFullTime() / 24000;
|
||||
if (day != lastDay) skippedCurrentNight.clear();
|
||||
lastDay = day;
|
||||
long day = world.getFullTime() / 24000;
|
||||
if (day != lastDay) skippedCurrentNight.clear();
|
||||
lastDay = day;
|
||||
|
||||
if (skippedCurrentNight.add(player)) {
|
||||
if (instant) {
|
||||
double onePlayerRatio = 1 / (player.getServer().getOnlinePlayers().size() * (world.getGameRuleValue(GameRule.PLAYERS_SLEEPING_PERCENTAGE) / 100.0));
|
||||
if (!skippedCurrentNight.contains(event.getPlayer())) {
|
||||
double onePlayerRatio = 1 / (event.getPlayer().getServer().getOnlinePlayers().size() * (world.getGameRuleValue(GameRule.PLAYERS_SLEEPING_PERCENTAGE) / 100.0));
|
||||
world.setTime(Math.min(world.getTime() + (long) (10917 * onePlayerRatio), 23459));
|
||||
skippedCurrentNight.add(event.getPlayer());
|
||||
}
|
||||
|
||||
var maxHealth = player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getBaseValue();
|
||||
player.setHealth(Math.min(player.getHealth() + heal, maxHealth));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -57,9 +53,8 @@ public class SleepListener implements Listener {
|
|||
}
|
||||
|
||||
@EventHandler
|
||||
public void onTimeSkip(TimeSkipEvent event) {
|
||||
if (event.getSkipReason() == TimeSkipEvent.SkipReason.NIGHT_SKIP) {
|
||||
public void onPlayerBedLeave(TimeSkipEvent event) {
|
||||
if (event.getSkipReason() == TimeSkipEvent.SkipReason.NIGHT_SKIP)
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
18
src/main/java/eu/m724/tweaks/sleep/SleepManager.java
Normal file
18
src/main/java/eu/m724/tweaks/sleep/SleepManager.java
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
/*
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.sleep;
|
||||
|
||||
import eu.m724.tweaks.TweaksConfig;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
public class SleepManager {
|
||||
public void init(Plugin plugin) {
|
||||
plugin.getServer().getPluginManager().registerEvents(new SleepListener(), plugin);
|
||||
if (!TweaksConfig.getConfig().sleepInstant())
|
||||
new TimeForwardRunnable(plugin).runTaskTimer(plugin, 0, 1); // TODO maybe not
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.sleep;
|
||||
package eu.m724.tweaks.sleep;
|
||||
|
||||
public class SleepState {
|
||||
static int playersSleeping;
|
||||
50
src/main/java/eu/m724/tweaks/sleep/TimeForwardRunnable.java
Normal file
50
src/main/java/eu/m724/tweaks/sleep/TimeForwardRunnable.java
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
/*
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.sleep;
|
||||
|
||||
import org.bukkit.GameRule;
|
||||
import org.bukkit.Server;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
|
||||
public class TimeForwardRunnable extends BukkitRunnable {
|
||||
private final Server server;
|
||||
private final World world; // TODO multi worlds
|
||||
|
||||
private final double percentage;
|
||||
|
||||
public TimeForwardRunnable(Plugin plugin) {
|
||||
this.server = plugin.getServer();
|
||||
this.world = server.getWorld("world");
|
||||
this.percentage = (world.getGameRuleValue(GameRule.PLAYERS_SLEEPING_PERCENTAGE) / 100.0);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
int playersSleeping = SleepState.playersSleeping;
|
||||
//System.out.println(playersSleeping);
|
||||
if (playersSleeping == 0) return;
|
||||
|
||||
int onlinePlayers = (int) (server.getOnlinePlayers().size() / percentage); // TODO optimize remove size every tick maybe
|
||||
|
||||
double sleepPercentage = (double) playersSleeping / onlinePlayers;
|
||||
|
||||
// we want sleep to take 200 ticks which is 10 seconds assuming all palyres onilien
|
||||
|
||||
long time = world.getTime();
|
||||
long untilDay = 23459 - time;
|
||||
|
||||
if (untilDay == 0) return;
|
||||
|
||||
long perSkip = 200 + (100000 / -untilDay);
|
||||
perSkip = Math.clamp(perSkip, 20, 200);
|
||||
perSkip = (long) (perSkip * sleepPercentage);
|
||||
|
||||
world.setTime(world.getTime() + perSkip);
|
||||
}
|
||||
}
|
||||
60
src/main/java/eu/m724/tweaks/updater/PluginScanner.java
Normal file
60
src/main/java/eu/m724/tweaks/updater/PluginScanner.java
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
/*
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.updater;
|
||||
|
||||
import eu.m724.tweaks.updater.cache.SpigotResource;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
public class PluginScanner {
|
||||
private final Plugin thisPlugin;
|
||||
|
||||
PluginScanner(Plugin thisPlugin) {
|
||||
this.thisPlugin = thisPlugin;
|
||||
}
|
||||
|
||||
public Set<SpigotResource> load() throws IOException {
|
||||
File installedPluginsYml = new File(thisPlugin.getDataFolder(), "installed_plugins.yml");
|
||||
|
||||
if (!installedPluginsYml.exists()) {
|
||||
thisPlugin.saveResource("installed_plugins.yml", false);
|
||||
}
|
||||
|
||||
YamlConfiguration configuration = YamlConfiguration.loadConfiguration(installedPluginsYml);
|
||||
|
||||
|
||||
Plugin[] plugins = thisPlugin.getServer().getPluginManager().getPlugins();
|
||||
Set<SpigotResource> spigotResources = new HashSet<>();
|
||||
|
||||
for (Plugin plugin : plugins) {
|
||||
// System.out.println("Found " + plugin.getName());
|
||||
String pluginName = plugin.getName();
|
||||
|
||||
if (!configuration.isSet(pluginName)) {
|
||||
configuration.set(pluginName, -1);
|
||||
continue;
|
||||
}
|
||||
|
||||
int pluginId = configuration.getInt(pluginName);
|
||||
if (pluginId > 0) {
|
||||
spigotResources.add(
|
||||
new SpigotResource(plugin, pluginId, pluginName)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
configuration.save(installedPluginsYml);
|
||||
|
||||
return spigotResources;
|
||||
|
||||
}
|
||||
}
|
||||
92
src/main/java/eu/m724/tweaks/updater/UpdateChecker.java
Normal file
92
src/main/java/eu/m724/tweaks/updater/UpdateChecker.java
Normal file
|
|
@ -0,0 +1,92 @@
|
|||
/*
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.updater;
|
||||
|
||||
import eu.m724.tweaks.Language;
|
||||
import eu.m724.tweaks.updater.cache.VersionedResource;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
import org.bukkit.scheduler.BukkitRunnable;
|
||||
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.time.LocalTime;
|
||||
import java.time.ZoneOffset;
|
||||
import java.util.HashSet;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.CompletionException;
|
||||
import java.util.logging.Logger;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class UpdateChecker extends BukkitRunnable {
|
||||
private final Set<VersionedResource> resources;
|
||||
private final Logger logger;
|
||||
|
||||
static final Set<VersionedResource> availableUpdates = new HashSet<>();
|
||||
static LocalTime lastChecked = null;
|
||||
|
||||
UpdateChecker(Plugin plugin, Set<VersionedResource> resources) {
|
||||
this.logger = Logger.getLogger(plugin.getLogger().getName() + "." + getClass().getSimpleName());
|
||||
this.resources = resources; // TODO make a copy?
|
||||
}
|
||||
|
||||
private void checkAll() {
|
||||
//logger.info("Checking for updates");
|
||||
lastChecked = LocalTime.now(ZoneOffset.UTC);
|
||||
availableUpdates.clear();
|
||||
|
||||
for (VersionedResource versionedResource : Set.copyOf(resources)) {
|
||||
String pluginName = versionedResource.resource().plugin().getName();
|
||||
//logger.info(versionedResource.resource().resourceId() + " " + versionedResource.resource().plugin().getName());
|
||||
int page = versionedResource.running() != null ? versionedResource.running().page() : 1;
|
||||
|
||||
try {
|
||||
VersionedResource newResource = new VersionFinder(versionedResource.resource(), page).join(); // this runs async so it's ok
|
||||
if (!versionedResource.equals(newResource)) {
|
||||
resources.remove(versionedResource);
|
||||
if (newResource.running() == null) {
|
||||
logger.info("Unable to find installed version of %s".formatted(pluginName));
|
||||
if (versionedResource.running() != null) {
|
||||
logger.info("Did you downgrade %s? If so, clear cache".formatted(pluginName));
|
||||
}
|
||||
} else {
|
||||
if (!newResource.running().equals(newResource.latest())) {
|
||||
availableUpdates.add(newResource);
|
||||
//logger.info("Update available for %s. %d -> %d".formatted(pluginName, newResource.running().updateId(), newResource.latest().updateId()));
|
||||
}
|
||||
}
|
||||
resources.add(newResource);
|
||||
}
|
||||
} catch (CompletionException e) {
|
||||
logger.severe("Unable to refresh %s: %s".formatted(pluginName, e.getMessage()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void alert() {
|
||||
int n = availableUpdates.size();
|
||||
if (n == 0) return;
|
||||
logger.info(Language.getString("updateAvailableNotice").formatted(n));
|
||||
|
||||
availableUpdates.stream()
|
||||
.map(u -> "- %s (%s -> %s)".formatted(u.resource().name(), u.running().label(), u.latest().label()))
|
||||
.forEach(logger::info);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
checkAll();
|
||||
|
||||
try (FileOutputStream outputStream = new FileOutputStream(UpdaterManager.cacheFile)) {
|
||||
VersionCheckCache.writeAll(outputStream, resources.stream().map(VersionedResource::running).filter(Objects::nonNull).collect(Collectors.toSet()));
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
alert();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,14 +1,13 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.updater;
|
||||
package eu.m724.tweaks.updater;
|
||||
|
||||
import eu.m724.tweaks.Language;
|
||||
import eu.m724.tweaks.module.updater.backend.UpdateChecker;
|
||||
import eu.m724.tweaks.module.updater.object.VersionedResource;
|
||||
import eu.m724.tweaks.updater.cache.VersionedResource;
|
||||
import net.md_5.bungee.api.ChatColor;
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
import net.md_5.bungee.api.chat.ClickEvent;
|
||||
|
|
@ -21,40 +20,32 @@ import org.bukkit.command.CommandSender;
|
|||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.awt.*;
|
||||
import java.time.Instant;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
|
||||
public class UpdaterCommands implements CommandExecutor {
|
||||
private final UpdateChecker updateChecker;
|
||||
|
||||
public UpdaterCommands(UpdateChecker updateChecker) {
|
||||
this.updateChecker = updateChecker;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
|
||||
var lastChecked = updateChecker.getLastChecked();
|
||||
if (updateChecker.getLastChecked() == -1) {
|
||||
if (UpdateChecker.lastChecked == null) {
|
||||
sender.sendMessage(Language.getString("updatesNotChecked"));
|
||||
return true;
|
||||
}
|
||||
|
||||
int n = updateChecker.getAvailableUpdates().size();
|
||||
String lastChecked = UpdateChecker.lastChecked.format(DateTimeFormatter.ofPattern("HH:mm"));
|
||||
int n = UpdateChecker.availableUpdates.size();
|
||||
|
||||
if (n > 0) {
|
||||
sender.spigot().sendMessage(
|
||||
Language.getComponent("updateAvailableNotice", ChatColor.GRAY, n)
|
||||
new ComponentBuilder(Language.getString("updateAvailableNotice").formatted(n)).color(ChatColor.GRAY).build()
|
||||
);
|
||||
|
||||
int i = 0;
|
||||
for (VersionedResource v : updateChecker.getAvailableUpdates()) {
|
||||
for (VersionedResource v : UpdateChecker.availableUpdates) {
|
||||
sender.spigot().sendMessage(
|
||||
new ComponentBuilder(++i + ". ").color(ChatColor.GRAY).build(), resourceToBaseComponent(v)
|
||||
);
|
||||
}
|
||||
} else {
|
||||
var lastCheckedFormat = DateTimeFormatter.ofPattern("HH:mm").format(Instant.ofEpochMilli(lastChecked));
|
||||
sender.spigot().sendMessage(Language.getComponent("updatesNoUpdates", ChatColor.GREEN, lastCheckedFormat));
|
||||
sender.sendMessage(Language.getString("updatesNoUpdates").formatted(lastChecked));
|
||||
}
|
||||
|
||||
return true;
|
||||
|
|
@ -80,7 +71,7 @@ public class UpdaterCommands implements CommandExecutor {
|
|||
.event(
|
||||
new HoverEvent(
|
||||
HoverEvent.Action.SHOW_TEXT,
|
||||
new Text(Language.getString("updatesClickToOpen", v.latest().description().title()))
|
||||
new Text(Language.getString("updatesClickToOpen").formatted(v.latest().description().title()))
|
||||
)
|
||||
)
|
||||
.build();
|
||||
56
src/main/java/eu/m724/tweaks/updater/UpdaterManager.java
Normal file
56
src/main/java/eu/m724/tweaks/updater/UpdaterManager.java
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
/*
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.updater;
|
||||
|
||||
import eu.m724.tweaks.updater.cache.ResourceVersion;
|
||||
import eu.m724.tweaks.updater.cache.SpigotResource;
|
||||
import eu.m724.tweaks.updater.cache.VersionedResource;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class UpdaterManager {
|
||||
static File cacheFile;
|
||||
|
||||
private final Plugin plugin;
|
||||
|
||||
public UpdaterManager(Plugin plugin) {
|
||||
this.plugin = plugin;
|
||||
cacheFile = new File(plugin.getDataFolder(), "cache/updater");
|
||||
}
|
||||
|
||||
public void init() throws IOException {
|
||||
// scan installed plugins
|
||||
Set<SpigotResource> resources = new PluginScanner(plugin).load();
|
||||
|
||||
cacheFile.getParentFile().mkdirs(); // TODO move this somewhere else
|
||||
|
||||
// load installed versions from cache
|
||||
Set<ResourceVersion> installedVersions;
|
||||
try (FileInputStream inputStream = new FileInputStream(cacheFile)) {
|
||||
installedVersions = VersionCheckCache.loadAll(inputStream);
|
||||
} catch (FileNotFoundException e) {
|
||||
installedVersions = new HashSet<>();
|
||||
}
|
||||
|
||||
final Set<ResourceVersion> ivf = installedVersions;
|
||||
Set<VersionedResource> versionedResources = resources.stream()
|
||||
.map(res -> new VersionedResource(
|
||||
res, ivf.stream().filter(iv -> iv.resourceId() == res.resourceId()).findFirst().orElse(null), null
|
||||
)).collect(Collectors.toSet());
|
||||
|
||||
|
||||
new UpdateChecker(plugin, versionedResources)
|
||||
.runTaskTimerAsynchronously(plugin, 600, 12 * 3600 * 20);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.updater.backend;
|
||||
package eu.m724.tweaks.updater;
|
||||
|
||||
import eu.m724.tweaks.module.updater.object.ResourceVersion;
|
||||
import eu.m724.tweaks.updater.cache.ResourceVersion;
|
||||
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileOutputStream;
|
||||
|
|
@ -15,7 +15,7 @@ import java.io.OutputStream;
|
|||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
public class VersionCache {
|
||||
public class VersionCheckCache {
|
||||
private static final byte FILE_VERSION = 1;
|
||||
|
||||
public static Set<ResourceVersion> loadAll(FileInputStream inputStream) throws IOException {
|
||||
|
|
@ -1,20 +1,19 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.updater.backend;
|
||||
package eu.m724.tweaks.updater;
|
||||
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.JsonParser;
|
||||
import eu.m724.tweaks.DebugLogger;
|
||||
import eu.m724.tweaks.module.updater.object.SpigotResource;
|
||||
import eu.m724.tweaks.module.updater.object.ResourceVersion;
|
||||
import eu.m724.tweaks.module.updater.object.UpdateDescription;
|
||||
import eu.m724.tweaks.module.updater.object.VersionedResource;
|
||||
import eu.m724.tweaks.updater.cache.SpigotResource;
|
||||
import eu.m724.tweaks.updater.cache.ResourceVersion;
|
||||
import eu.m724.tweaks.updater.cache.UpdateDescription;
|
||||
import eu.m724.tweaks.updater.cache.VersionedResource;
|
||||
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
|
|
@ -27,24 +26,23 @@ import java.util.concurrent.Executors;
|
|||
|
||||
// TODO optimize
|
||||
|
||||
public class VersionScanner extends CompletableFuture<VersionedResource> {
|
||||
public class VersionFinder extends CompletableFuture<VersionedResource> {
|
||||
private final SpigotResource resource;
|
||||
private final int fromPage;
|
||||
|
||||
VersionScanner(SpigotResource resource, int fromPage) {
|
||||
VersionFinder(SpigotResource resource, int fromPage) {
|
||||
this.resource = resource;
|
||||
this.fromPage = fromPage;
|
||||
|
||||
start();
|
||||
}
|
||||
|
||||
VersionScanner(SpigotResource resource) {
|
||||
VersionFinder(SpigotResource resource) {
|
||||
this(resource, 1);
|
||||
}
|
||||
|
||||
private void start() {
|
||||
DebugLogger.finer("Scanning %s (#%d) from page %d", resource.name(), resource.resourceId(), fromPage);
|
||||
|
||||
//System.out.printf("STarting for %d %s\n", resource.resourceId(), resource.plugin().getName());
|
||||
try (ExecutorService executor = Executors.newSingleThreadExecutor()) {
|
||||
executor.execute(() -> {
|
||||
try {
|
||||
|
|
@ -53,14 +51,13 @@ public class VersionScanner extends CompletableFuture<VersionedResource> {
|
|||
|
||||
int page;
|
||||
for (page = fromPage; page < 1000; page++) {
|
||||
DebugLogger.finer("Scan %s now at page %d", resource.name(), page);
|
||||
|
||||
//System.out.println("Page " + page);
|
||||
String url = "https://api.spigotmc.org/simple/0.2/index.php?action=getResourceUpdates&page=%d&id=%d".formatted(page, resource.resourceId());
|
||||
|
||||
HttpRequest request;
|
||||
try {
|
||||
request = HttpRequest.newBuilder(new URI(url))
|
||||
.header("User-Agent", "twu/1") // tweaks updater v1
|
||||
.header("User-Agent", "twu/1")
|
||||
.build();
|
||||
} catch (URISyntaxException e) {
|
||||
throw new RuntimeException(e);
|
||||
|
|
@ -71,7 +68,6 @@ public class VersionScanner extends CompletableFuture<VersionedResource> {
|
|||
|
||||
String body = response.body();
|
||||
if (body.isBlank()) {
|
||||
DebugLogger.finer("Body is blank, stopping");
|
||||
page--;
|
||||
break;
|
||||
}
|
||||
|
|
@ -79,7 +75,15 @@ public class VersionScanner extends CompletableFuture<VersionedResource> {
|
|||
JsonArray jsonArray = JsonParser.parseString(body).getAsJsonArray();
|
||||
for (JsonElement ele : jsonArray) {
|
||||
JsonObject versionJson = ele.getAsJsonObject();
|
||||
|
||||
if (isRunningVersion(versionJson)) {
|
||||
runningVersion = new ResourceVersion(
|
||||
resource.resourceId(),
|
||||
page,
|
||||
versionJson.get("id").getAsInt(),
|
||||
versionJson.get("resource_version").getAsString(),
|
||||
null // no need for changelog of running version
|
||||
);
|
||||
}
|
||||
latestVersion = new ResourceVersion(
|
||||
resource.resourceId(),
|
||||
page,
|
||||
|
|
@ -90,17 +94,14 @@ public class VersionScanner extends CompletableFuture<VersionedResource> {
|
|||
versionJson.get("message").getAsString()
|
||||
)
|
||||
);
|
||||
|
||||
if (isRunningVersion(versionJson))
|
||||
runningVersion = latestVersion;
|
||||
|
||||
DebugLogger.finer("%s - %s #%d", resource.name(), latestVersion.updateId(), latestVersion.updateId());
|
||||
//System.out.printf("%d %d %s\n", page, versionJson.get("id").getAsInt(), versionJson.get("resource_version").getAsString());
|
||||
}
|
||||
|
||||
if (jsonArray.size() < 10) break;
|
||||
}
|
||||
|
||||
}
|
||||
//System.out.println("Done");
|
||||
|
||||
if (page > 999) {
|
||||
throw new Exception("Too many pages");
|
||||
|
|
@ -116,8 +117,7 @@ public class VersionScanner extends CompletableFuture<VersionedResource> {
|
|||
}
|
||||
|
||||
private boolean isRunningVersion(JsonObject versionJson) {
|
||||
// TODO make it work with more advanced strings
|
||||
return versionJson.get("resource_version").getAsString()
|
||||
.equals(resource.plugin().getDescription().getVersion());
|
||||
// TODO
|
||||
return versionJson.get("resource_version").getAsString().equals(resource.plugin().getDescription().getVersion());
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.updater.object;
|
||||
package eu.m724.tweaks.updater.cache;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.updater.object;
|
||||
package eu.m724.tweaks.updater.cache;
|
||||
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
|
|
@ -12,4 +12,5 @@ public record SpigotResource(
|
|||
Plugin plugin,
|
||||
int resourceId,
|
||||
String name
|
||||
) { }
|
||||
) {
|
||||
}
|
||||
|
|
@ -1,12 +1,13 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.updater.object;
|
||||
package eu.m724.tweaks.updater.cache;
|
||||
|
||||
public record UpdateDescription(
|
||||
String title,
|
||||
String description
|
||||
) { }
|
||||
) {
|
||||
}
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* Copyright (C) 2025 Minecon724
|
||||
* Copyright (C) 2024 Minecon724
|
||||
* Tweaks724 is licensed under the GNU General Public License. See the LICENSE.md file
|
||||
* in the project root for the full license text.
|
||||
*/
|
||||
|
||||
package eu.m724.tweaks.module.updater.object;
|
||||
package eu.m724.tweaks.updater.cache;
|
||||
|
||||
public record VersionedResource(
|
||||
SpigotResource resource,
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue