mirror of
https://github.com/Melledy/Grasscutter.git
synced 2024-11-28 10:45:25 +00:00
9e5b57a043
* Remove more scene synchronized
* Fix worktop options not appearing
* Format code [skip actions]
* Fix delay with server tasks
* Format code [skip actions]
* Fully fix fairy clock (#2146)
* Fix scene transition
* fully fix fairy clock
* Re-add call to `Player#updatePlayerGameTime`
* Format code [skip actions]
* Initialize the script loader in `ResourceLoader#loadAll`
* Fix region removal checking
* Format code [skip actions]
* Use Lombok's `EqualsAndHashCode` for comparing scene regions
* Format code [skip actions]
* Move 'invalid gather object' to `trace`
* Add more information to the 'unknown condition handler' message
* Move invalid ability action to trace
* Make `KcpTunnel` public
* Validate the NPC being talked to
* Format code [skip actions]
* NPCs are not spawned server side; change logic to handle it
* Format code [skip actions]
* unload scene when there are no players (#2147)
* unload scene when there are no players
* Update src/main/java/emu/grasscutter/game/world/Scene.java
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
---------
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
* Check if a command should be copied or HTTP should be used
* Lint Code [skip actions]
* Fix character names rendering incorrectly
* Add basic troubleshooting command
* Implement handbook teleporting
also a few formatting changes and sort data by logical sense
* Fix listener `ConcurrentModificationException` issue
* Add color change to `Join the Community!`
* Lint Code [skip actions]
* Make clickable buttons appear clickable
* Remove 'Mechanicus' entities from the list of entities
* Format code [skip actions]
* Fix going back returning a blank screen
* Implement entity spawning
* Add setting level to entity card
* Add support for 'plain text' mode
* Make descriptions of objects scrollable
* Lint Code [skip actions]
* Format code [skip actions]
* Change the way existing hooks work
* Format code [skip actions]
* Upgrade Javalin to 5.5.0 & Fix project warnings
* Upgrade logging libraries
* Fix gacha mappings static file issue
* Add temporary backwards compatability for `ServerHelper`
* Format code [skip actions]
* Remove artifact signatures from VCS
* Fix forge queue data protocol definition
* Run `spotlessApply`
* Format code [skip actions]
* Download data required for building artifacts
* Add call for Facebook logins
* Add the wiki page as a submodule
* Format code [skip actions]
* Update translation (#2150)
* Update translation
* Update translation
* Separate the dispatch and game servers (pt. 1)
gacha is still broken, handbook still needs to be done
* Format code [skip actions]
* Separate the dispatch and game servers (pt. 2)
this commit fixes the gacha page
* Add description for '/troubleshoot'
* Set default avatar talent level to 10
* Separate the dispatch and game servers (pt. 3)
implement handbook across servers!
* Format code [skip actions]
* Update GitHub Actions to use 'download-file' over 'wget'
* Gm handbook lmao (#2149)
* Fix font issue
* Fix avatars
* Fix text overflow in commands
* Fix virtualized lists and items page 😭😭
* magix why 💀
* use hover style in all minicards
* button
* remove console.log
* lint
* Add icons
* magix asked
* Fix overflow padding issue
* Fix achievement text overflow
* remove icons from repo
* Change command icon
* Add the wiki page as a submodule
* total magix moment
* fix text overflow in commands
* Fix discord button
* Make text scale on Minicard
* import icons and font from another source
* Add hover effects to siebar buttons
* move font and readme to submodule repo
* Make data folder a submodule
* import icons and font from data submodule
* Update README.md
* total magix moment
* magix moment v2
* submodule change
* Import `.webp` files
* Resize `HomeButton`
* Fix 'Copy Command' reappearing after changing pages
---------
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
* Lint Code [skip actions]
* Download data for the build, not for the lint
* format imports
this is really just to see if build handbook works kek
* Implement proper handbook authentication (pt. 1)
* Implement proper handbook authentication (pt. 2)
* Format code [skip actions]
* Add quest data dumping for the handbook
* Change colors to fit _something suitable_
* Format code [skip actions]
* Fix force pushing to branches after linting
* Fix logic of `SetPlayerPropReq`
* Move more group loading to `trace`
* Add handbook IP authentication in hybrid mode
* Fix player level up not displaying on the client properly
* Format code [skip actions]
* Fix game time locking
* Format code [skip actions]
* Update player properties
* Format code [skip actions]
* Move `warn`s for groups to `debug`
* Fix player pausing
* Move more logs to `trace`
* Use `removeItemById` for deleting items via quests
* Clean up logger more
* Pause in-game time when the world is paused
* Format code [skip actions]
* More player property documentation
* Multi-threaded resource loading
* Format code [skip actions]
* Add quest widgets
* Add quests page (basic impl.)
* Add/fix colors
also fix tailwind
* Remove banned packets
client modifications already perform the job of blocking malicious packets from being executed, no point in having this if self-windy is wanted
* Re-add `BeginCameraSceneLookNotify`
* Fix being unable to attack (#2157)
* Add `PlayerOpenChestEvent`
* Add methods to get players from the server
* Add static methods to register an event handler
* Add `PlayerEnterDungeonEvent`
* Remove legacy documentation from `PlayerMoveEvent`
* Add `PlayerChatEvent`
* Add defaults to `Position`
* Clean up `.utils`
* Revert `Multi-threaded resource loading`
* Fix changing target UID when talking to the server
* Lint Code [skip actions]
* Format code [skip actions]
* fix NPC talk triggering main quest in 46101 (#2158)
Make it so that only talks where the param matches the talkId are checked.
* Format code [skip actions]
* Partially fix Chasing Shadows (#2159)
* Partially fix Chasing Shadows
* Go ahead and move it before the return before Magix tells me to.
* Format code [skip actions]
* Bring back period lol (#2160)
* Disable SNI for the HTTPS server
* Add `EntityCreationEvent`
* Add initial startup message
this is so the server appears like its preparing to start
* Format code [skip actions]
* Enable debug mode for plugin loggers if enabled for the primary logger
* Add documentation about `WorldAreaConfigData`
* Make more fields in excels accessible
* Remove deprecated fields from `GetShopRsp`
* Run `spotlessApply` on definitions
* Add `PlayerEnterAreaEvent`
* Optimize event calls
* Fix event invokes
* Format code [skip actions]
* Remove manual autofinish for main quests. (#2162)
* Add world areas to the textmap cache
* Format code [skip actions]
* Don't overdefine variables in extended classes (#2163)
* Add dumper for world areas
* Format code [skip actions]
* instantiate personalLineList (#2165)
* Fix protocol definitions
thank you Nazrin! (+ hiro for raw definitions)
* Fix the background color leaking from the character widget
* Change HTML spacing to 2 spaces
* Implement hiding widgets
* Change scrollbar to a vibrant color
* Add _some_ scaling to the home buttons and its text
* Build the handbook with Gradle
* Fix the 'finer details' with the handbook UI
* Lint Code [skip actions]
* Fix target destination for the Gradle-built handbook
* Implement fetching a player across servers & Add a chainable JsonObject
useful for plugins! might be used in grasscutter eventually
* Fix GitHub actions
* Fix event calling & canceling
* Run `spotlessApply`
* Rename fields (might be wrong)
* Add/update all/more protocol definitions
* Add/update all/more protocol definitions
* Remove outdated packet
* Fix protocol definitions
* Format code [skip actions]
* Implement some lua variables for less console spam (#2172)
* Implement some lua variables for less console spam
* Add GetHostQuestState
This fixes some chapter 3 stuff.
* Format code [skip actions]
* Fix merge import
* Format code [skip actions]
* Fully fix fairy clock for real this time (#2167)
* Fully fix fairy clock For real this time
* Make it so relogging keeps the time lock state.
* Refactor out questLockTime
* Per Hartie, the client packet needs to be changed too
* Update src/main/java/emu/grasscutter/game/world/World.java
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
* Update src/main/java/emu/grasscutter/server/packet/recv/HandlerClientLockGameTimeNotify.java
* Remove all code not needed to get clock working
---------
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
* Implement a proper ability system (#2166)
* Apply fix `21dec2fe`
* Apply fix `89d01d5f`
* Apply fix `d900f154`
this one was already implemented; updated to use call from previous commit
* Ability changing commit
TODO: change info to debug
* Remove use of deprecated methods/fields
* Temp commit v2
(Adding LoseHP and some fixes)
* Oopsie
* Probably fix monster battle
* Fix issue with reflecting into fields
* Fix some things
* Fix ability names for 3.6 resources
* Improve logging
---------
Co-authored-by: StartForKiller <jesussanz2003@gmail.com>
* Format code [skip actions]
* Add system for sending messages between servers
* Format some code
* Remove protocol definitions from Spotless
* Default debug to false; enable with `-debug`
* Implement completely useless global value copying
* HACK: Return the avatar which holds the weapon when the weapon is referred to by ID
* Add properties to `AbilityModifier`
* Change the way HTML is served after authentication
* Use thread executors to speed up the database loading process
* Format code [skip actions]
* Add system for setting handbook address and port
* Lint Code [skip actions]
* Format code [skip actions]
* Fix game-related data not saving
* Format code [skip actions]
* Fix handbook server details
* Lint Code [skip actions]
* Format code [skip actions]
* Use the headers provided by a context to get the IP address
should acknowledge #1975
* Format code [skip actions]
* Move more logs to `trace`
* Format code [skip actions]
* more trace
* Fix something and implement weapon entities
* Format code [skip actions]
* Fix `EntityWeapon`
* Remove deprecated API & Fix resource checking
* Fix unnecessary warning for first-time setup
* Implement handbook request limiting
* Format code [skip actions]
* Fix new avatar weapons being null
* Format code [skip actions]
* Fix issue with 35303 being un-completable & Try to fix fulfilled quest conditions being met
* Load activity config on server startup
* Require plugins to specify an API version and match with the server
* Add default open state ignore list
* Format code [skip actions]
* Quick fix for questing, needs more investigation
This would make the questing work again
* Remove existing hack for 35303
* Fix ignored open states from being set
* Format code [skip actions]
* fix the stupidest bug ive ever seen
* Optimize player kicking on server close
* Format code [skip actions]
* Re-add hack to fix 35303
* Update GitHub actions
* Format code [skip actions]
* Potentially fix issues with regions
* Download additional handbook data
* Revert "Potentially fix issues with regions"
This reverts commit 84e3823695
.
---------
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: scooterboo <lewasite@yahoo.com>
Co-authored-by: Tesutarin <105267106+Tesutarin@users.noreply.github.com>
Co-authored-by: Scald <104459145+Arikatsu@users.noreply.github.com>
Co-authored-by: StartForKiller <jesussanz2003@gmail.com>
221 lines
6.8 KiB
Bash
221 lines
6.8 KiB
Bash
#!/usr/bin/env bash
|
|
|
|
# Grasscutter install script for GNU/Linux - Simpler version
|
|
# This installer doesn't ask you to install dependencies, you have to install them manually
|
|
# Made by TurtleIdiot and modified by syktyvkar (and then again modified by Blue)
|
|
|
|
# Stops the installer if any command has a non-zero exit status
|
|
set -e
|
|
|
|
# Checks for root
|
|
if [ $EUID != 0 ]; then
|
|
echo "Please run the installer as root (sudo)!"
|
|
exit
|
|
fi
|
|
|
|
is_command() {
|
|
# Checks if given command is available
|
|
local check_command="$1"
|
|
command -v "${check_command}" > /dev/null 2>&1
|
|
}
|
|
|
|
# IP validation
|
|
valid_ip() {
|
|
local ip=$1
|
|
local stat=1
|
|
|
|
if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
|
|
OIFS=$IFS
|
|
IFS="."
|
|
ip=($ip)
|
|
IFS=$OIFS
|
|
[[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \
|
|
&& ${ip[2]} -le 255 && ${ip[3]} -le 255 ]]
|
|
stat=$?
|
|
fi
|
|
return $stat
|
|
}
|
|
echo "#################################"
|
|
echo ""
|
|
echo "This script will take for granted that you have all dependencies installed (mongodb, openjdk-17-jre/jre17-openjdk, wget, openssl, unzip, git, curl, base-devel), in fact, this script is recommended to update your current server installation, and it should run from the same folder as grasscutter.jar"
|
|
echo "#################################"
|
|
echo ""
|
|
echo "If you are using version > 2.8 of the client, make sure to use the patched metadata if you don't use Cultivation."
|
|
echo "Search for METADATA here: https://discord.gg/grasscutter."
|
|
echo ""
|
|
echo "#################################"
|
|
echo "You can find plugins here: https://discord.com/channels/965284035985305680/970830969919664218"
|
|
echo ""
|
|
echo "Grasscutter will be installed to script's running directory"
|
|
echo "Do you wish to proceed and install Grasscutter?"
|
|
select yn in "Yes" "No" ; do
|
|
case $yn in
|
|
Yes ) break;;
|
|
No )
|
|
echo "Aborting..."
|
|
exit;;
|
|
esac
|
|
done
|
|
|
|
if [ -d "./resources" ]
|
|
then
|
|
echo "It's recommended to remove resources folder"
|
|
echo "Remove resources folder?"
|
|
select yn in "Yes" "No" ; do
|
|
case $yn in
|
|
Yes )
|
|
rm -rf resources
|
|
break;;
|
|
No )
|
|
echo "Aborting..."
|
|
exit;;
|
|
esac
|
|
done
|
|
echo "You may need to remove data folder and config.json to apply some updates"
|
|
echo "#################################"
|
|
fi
|
|
|
|
|
|
|
|
# Allows choice between stable and dev branch
|
|
echo "Please select the branch you wish to install"
|
|
echo -e "!!NOTE!!: stable is the recommended branch.\nDo *NOT* use development unless you have a reason to and know what you're doing"
|
|
select branch in "stable" "development" ; do
|
|
case $branch in
|
|
stable )
|
|
break;;
|
|
development )
|
|
break;;
|
|
esac
|
|
done
|
|
|
|
echo -e "Using $branch branch for installing server \n"
|
|
|
|
# Prompt IP address for config.json and for generating new keystore.p12 file
|
|
echo "Please enter the IP address that will be used to connect to the server"
|
|
echo "This can be a local or a public IP address"
|
|
echo "This IP address will be used to generate SSL certificates, so it is important it is correct!"
|
|
|
|
while : ; do
|
|
read -p "Enter server IP: " SERVER_IP
|
|
if valid_ip $SERVER_IP; then
|
|
break;
|
|
else
|
|
echo "Invalid IP address. Try again."
|
|
fi
|
|
done
|
|
|
|
echo "Beginning Grasscutter installation..."
|
|
|
|
|
|
# Download resources
|
|
echo "Downloading Grasscutter BinOutputs..."
|
|
git clone --single-branch https://github.com/Koko-boya/Grasscutter_Resources.git Grasscutter-bins
|
|
mv ./Grasscutter-bins/Resources ./resources
|
|
rm -rf Grasscutter-bins # takes ~350M of drive space after moving BinOutputs... :sob:
|
|
|
|
# Download and build jar
|
|
echo "Downloading Grasscutter source code..."
|
|
git clone --single-branch -b $branch https://github.com/Grasscutters/Grasscutter.git Grasscutter-src #change this to download a fork
|
|
|
|
echo "Building grasscutter.jar..."
|
|
cd Grasscutter-src
|
|
chmod +x ./gradlew #just in case
|
|
./gradlew --no-daemon jar
|
|
mv $(find -name "grasscutter*.jar" -type f) ../grasscutter.jar
|
|
echo "Building grasscutter.jar done!"
|
|
cd ..
|
|
|
|
# Generate handbook/config
|
|
echo "Grasscutter will be started to generate data files"
|
|
java -jar grasscutter.jar -version
|
|
|
|
# Replaces "127.0.0.1" with given IP
|
|
echo "Replacing IP address in server config..."
|
|
sed -i "s/127.0.0.1/$SERVER_IP/g" config.json
|
|
# Generates new keystore.p12 with the server's IP address
|
|
# This is done to prevent a "Connection Timed Out" error from appearing
|
|
# after clicking to enter the door in the main menu/title screen
|
|
# This issue only exists when connecting to a server *other* than localhost
|
|
# since the default keystore.p12 has only been made for localhost
|
|
|
|
mkdir certs
|
|
cd certs
|
|
echo "Generating CA key and certificate pair..."
|
|
openssl req -x509 -nodes -days 25202 -newkey rsa:2048 -subj "/C=GB/ST=Essex/L=London/O=Grasscutters/OU=Grasscutters/CN=$SERVER_IP" -keyout CAkey.key -out CAcert.crt
|
|
|
|
echo "Generating SSL key and certificate pair..."
|
|
openssl genpkey -out ssl.key -algorithm rsa
|
|
|
|
# Creates a conf file in order to generate a csr
|
|
cat > csr.conf <<EOF
|
|
[ req ]
|
|
default_bits = 2048
|
|
prompt = no
|
|
default_md = sha256
|
|
req_extensions = req_ext
|
|
distinguished_name = dn
|
|
|
|
[ dn ]
|
|
C = GB
|
|
ST = Essex
|
|
L = London
|
|
O = Grasscutters
|
|
OU = Grasscutters
|
|
CN = $SERVER_IP
|
|
|
|
[ req_ext ]
|
|
subjectAltName = @alt_names
|
|
|
|
[ alt_names ]
|
|
IP.1 = $SERVER_IP
|
|
EOF
|
|
|
|
# Creates csr using key and conf
|
|
openssl req -new -key ssl.key -out ssl.csr -config csr.conf
|
|
|
|
# Creates conf to finalise creation of certificate
|
|
cat > cert.conf <<EOF
|
|
|
|
authorityKeyIdentifier=keyid,issuer
|
|
basicConstraints=CA:FALSE
|
|
keyUsage = digitalSignature, nonRepudiation, keyEncipherment, keyAgreement, dataEncipherment
|
|
subjectAltName = @alt_names
|
|
|
|
[alt_names]
|
|
IP.1 = $SERVER_IP
|
|
|
|
EOF
|
|
|
|
# Creates SSL cert
|
|
openssl x509 -req -in ssl.csr -CA CAcert.crt -CAkey CAkey.key -CAcreateserial -out ssl.crt -days 25202 -sha256 -extfile cert.conf
|
|
|
|
echo "Generating keystore.p12 from key and certificate..."
|
|
openssl pkcs12 -export -out keystore.p12 -inkey ssl.key -in ssl.crt -certfile CAcert.crt -passout pass:123456
|
|
|
|
cd ../
|
|
mv ./certs/keystore.p12 ./keystore.p12
|
|
echo "Done!"
|
|
|
|
# Running scripts as sudo makes all Grasscutter files to be owned by root
|
|
# which may cause problems editing .jsons...
|
|
if [ $SUDO_USER ]; then
|
|
echo "Changing Grasscutter files owner to current user..."
|
|
chown -R $SUDO_USER:$SUDO_USER ./*
|
|
fi
|
|
|
|
echo "Removing unnecessary files..."
|
|
rm -rf ./certs ./Grasscutter-src
|
|
|
|
echo "All done!"
|
|
echo "-=-=-=-=-=--- !! IMPORTANT !! ---=-=-=-=-=-"
|
|
echo "Please make sure that ports 80, 443, 8888 and 22102 are OPEN (both tcp and udp)"
|
|
echo "In order to run the server, run the following command:"
|
|
echo " sudo java -jar grasscutter.jar"
|
|
echo "The GM Handbook of all supported languages will be generated automatically when you start the server for the first time."
|
|
echo "You must run it using sudo as port 443 is a privileged port"
|
|
echo "To play, use the IP you provided earlier ($SERVER_IP) via GrassClipper or Fiddler"
|
|
echo ""
|
|
|
|
exit
|