mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-12-25 01:57:56 +01:00
rename Travertine -> FlameCord
This commit is contained in:
LinsaFTW
parent
68d0e61f4f
commit
e703520dd2
2
.github/workflows/flamecord-build.yml
vendored
2
.github/workflows/flamecord-build.yml
vendored
@ -47,4 +47,4 @@ jobs:
|
||||
uses: actions/upload-artifact@v2.2.3
|
||||
with:
|
||||
name: FlameCord-JDK${{ matrix.java }}
|
||||
path: Travertine-Proxy/bootstrap/target/Travertine.jar
|
||||
path: FlameCord-Proxy/bootstrap/target/FlameCord.jar
|
||||
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,4 +1,4 @@
|
||||
Travertine-Proxy
|
||||
FlameCord-Proxy
|
||||
|
||||
# intellij
|
||||
*.iml
|
||||
|
||||
@ -3,25 +3,25 @@ Contributing to FlameCord
|
||||
WaterfallMC has a very lenient policy towards PRs, but would prefer that you try and adhere to the following guidelines.
|
||||
|
||||
## Understanding Patches
|
||||
Patches to FlameCord are very simple, but center around the directory 'Travertine-Proxy'
|
||||
Patches to FlameCord are very simple, but center around the directory 'FlameCord-Proxy'
|
||||
|
||||
Assuming you already have forked the repository:
|
||||
|
||||
1. Pull the latest changes from the main repository
|
||||
2. Type `./flamecord p` in git bash to apply the changes from upstream
|
||||
3. cd into `Travertine-Proxy` for proxy changes
|
||||
3. cd into `FlameCord-Proxy` for proxy changes
|
||||
|
||||
This directory is not a git repository in the traditional sense:
|
||||
|
||||
- Every single commit in Travertine-Proxy is a patch.
|
||||
- 'origin/master' points to a directory similar to Travertine-Proxy but for FlameCord
|
||||
- Typing `git status` should show that we are 10 or 11 commits ahead of master, meaning we have 10 or 11 patches that FlameCord, Travertine, Waterfall, and Bungeecord don't
|
||||
- If it says something like `212 commits ahead, 207 commits behind`, then type `git fetch` to update Travertine
|
||||
- Every single commit in FlameCord-Proxy is a patch.
|
||||
- 'origin/master' points to a directory similar to FlameCord-Proxy but for FlameCord
|
||||
- Typing `git status` should show that we are 10 or 11 commits ahead of master, meaning we have 10 or 11 patches that FlameCord, FlameCord, Waterfall, and Bungeecord don't
|
||||
- If it says something like `212 commits ahead, 207 commits behind`, then type `git fetch` to update FlameCord
|
||||
|
||||
## Adding Patches
|
||||
Adding patches to FlameCord is very simple:
|
||||
|
||||
1. Modify `Travertine-Proxy` with the appropriate changes
|
||||
1. Modify `FlameCord-Proxy` with the appropriate changes
|
||||
2. Type `git add .` to add your changes
|
||||
3. Run `git commit` with the desired patch message
|
||||
4. Run `./flamecord rb` in the main directory to convert your commit into a new patch
|
||||
|
||||
30
README.md
30
README.md
@ -1,18 +1,18 @@
|
||||
FlameCord
|
||||
=======
|
||||
|
||||
FlameCord is a patch for Travertine to fix possible exploits and add useful functionalities.
|
||||
FlameCord is a patch for FlameCord to fix possible exploits and add useful functionalities.
|
||||
|
||||
FlameCord is compiled like Travertine does; Please follow the CONTRIBUTING.md file. If you need help you can always contact us on Discord.
|
||||
FlameCord is compiled like FlameCord does; Please follow the CONTRIBUTING.md file. If you need help you can always contact us on Discord.
|
||||
|
||||
To compile FlameCord you need the same requirements as Travertine, and run the command `./flamecord b` to get the corresponding jar.
|
||||
To compile FlameCord you need the same requirements as FlameCord, and run the command `./flamecord b` to get the corresponding jar.
|
||||
|
||||
<a href="https://discord.gg/gF36AT3"><img src="https://discord.com/assets/4ff060e44afc171e9622fbe589c2c09e.png" width=10% height=10%><img/><a/> <a href="https://www.mc-market.org/resources/13492/"><img src="https://www.mc-market.org/styles/mcmarketv2/xenforo/logo.png" width=10% height=10%><img/><a/>
|
||||
|
||||
Travertine [](https://papermc.io/ci/job/Travertine/)
|
||||
FlameCord [](https://papermc.io/ci/job/FlameCord/)
|
||||
=======
|
||||
|
||||
Travertine is Waterfall with additional protocols. Waterfall is a fork of the well-known [BungeeCord](https://github.com/SpigotMC/BungeeCord) server teleportation suite.
|
||||
FlameCord is Waterfall with additional protocols. Waterfall is a fork of the well-known [BungeeCord](https://github.com/SpigotMC/BungeeCord) server teleportation suite.
|
||||
|
||||
Waterfall focuses on three main areas:
|
||||
|
||||
@ -20,29 +20,29 @@ Waterfall focuses on three main areas:
|
||||
* **Features**: Waterfall aims to include more features than canonical BungeeCord.
|
||||
* **Scalability**: Waterfall should be able to handle a large number of concurrent players, given a reasonably modern CPU, memory, and good network connection.
|
||||
|
||||
Travertine focuses on one main area:
|
||||
FlameCord focuses on one main area:
|
||||
|
||||
* **Additional Client Version Support**: Travertine aims to support client versions older then what is supported in upstream. This includes 1.7 support. Additionally Travertine may release Snapshot and PRE Client support patches as time permits.
|
||||
* **Additional Client Version Support**: FlameCord aims to support client versions older then what is supported in upstream. This includes 1.7 support. Additionally FlameCord may release Snapshot and PRE Client support patches as time permits.
|
||||
|
||||
## Why fork Waterfall?
|
||||
|
||||
Travertine has a goal of adding additional protocol versions.
|
||||
FlameCord has a goal of adding additional protocol versions.
|
||||
|
||||
Travertine was forked because of the fact that Waterfall intends to only support protocol versions supported by upstream BungeeCord.
|
||||
FlameCord was forked because of the fact that Waterfall intends to only support protocol versions supported by upstream BungeeCord.
|
||||
|
||||
Travertine will track upstream Waterfall and merge changes as needed.
|
||||
FlameCord will track upstream Waterfall and merge changes as needed.
|
||||
|
||||
## How to (Server Admins)
|
||||
|
||||
Download a copy of Travertine.jar from our homepage here: [Travertine](https://papermc.io/downloads#Travertine)
|
||||
Download a copy of FlameCord.jar from our homepage here: [FlameCord](https://papermc.io/downloads#FlameCord)
|
||||
|
||||
Travertine requires **Java 8** or above.
|
||||
FlameCord requires **Java 8** or above.
|
||||
|
||||
## How To (Compiling from source)
|
||||
|
||||
To compile Travertine, you need JDK8, git, bash, maven, and an internet connection.
|
||||
To compile FlameCord, you need JDK8, git, bash, maven, and an internet connection.
|
||||
|
||||
Clone this repo, run `./travertine b` from *bash*, get jar from `Travertine-Proxy/bootstrap/target`
|
||||
Clone this repo, run `./flamecord b` from *bash*, get jar from `FlameCord-Proxy/bootstrap/target`
|
||||
|
||||
## Join us
|
||||
|
||||
@ -54,4 +54,4 @@ Special Thanks To
|
||||
-----------------
|
||||
|
||||
|
||||
[YourKit](https://yourkit.com/), makers of the outstanding Java profiler, supports open source projects of all kinds with their full-featured [Java](https://yourkit.com/features/) and [.NET](https://yourkit.com/dotnet/features/) application profilers. We thank them for granting Travertine an OSS license so that we can make our software the best it can be.
|
||||
[YourKit](https://yourkit.com/), makers of the outstanding Java profiler, supports open source projects of all kinds with their full-featured [Java](https://yourkit.com/features/) and [.NET](https://yourkit.com/dotnet/features/) application profilers. We thank them for granting FlameCord an OSS license so that we can make our software the best it can be.
|
||||
|
||||
@ -31,7 +31,7 @@ index 6a5193fe..e82073d4 100644
|
||||
|
||||
BungeeCord bungee = new BungeeCord();
|
||||
ProxyServer.setInstance( bungee );
|
||||
- bungee.getLogger().info( "Enabled Travertine version " + bungee.getVersion() );
|
||||
- bungee.getLogger().info( "Enabled FlameCord version " + bungee.getVersion() );
|
||||
+ // FlameCord - Use bungee name
|
||||
+ bungee.getLogger().info( "Enabled " + bungee.getName() + " version " + bungee.getVersion() );
|
||||
bungee.start();
|
||||
@ -53,7 +53,7 @@ index d4fad294..7994c1c1 100644
|
||||
Map<String, Object> val = entry.getValue();
|
||||
String name = entry.getKey();
|
||||
String addr = get( "address", "localhost:25565", val );
|
||||
- String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another Travertine - Forced Host", val ) );
|
||||
- String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another FlameCord - Forced Host", val ) );
|
||||
+ // FlameCord - Use Bungee name instead
|
||||
+ String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another " + BungeeCord.getInstance().getName() + " - Forced Host", val ) );
|
||||
boolean restricted = get( "restricted", false, val );
|
||||
|
||||
@ -17,7 +17,7 @@ index 00749538..7b99c466 100644
|
||||
+ user.getServer().disconnect();
|
||||
} else
|
||||
{
|
||||
// Travertine start
|
||||
// FlameCord start
|
||||
@@ -364,13 +365,15 @@ public class ServerConnector extends PacketHandler
|
||||
user.setDimension( login.getDimension() );
|
||||
|
||||
@ -56,7 +56,7 @@ index ad3bdee5..c05714ba 100644
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
|
||||
@@ -92,6 +92,7 @@ public class UpstreamBridge extends PacketHandler
|
||||
}
|
||||
// Travertine end
|
||||
// FlameCord end
|
||||
}
|
||||
+ // FlameCord - Remove "Quitting" reason
|
||||
con.getServer().disconnect( "Quitting" );
|
||||
|
||||
@ -36,7 +36,7 @@ index 5407c20a..e9937428 100644
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
// Travertine start
|
||||
// FlameCord start
|
||||
if ( ProtocolConstants.isBeforeOrEq( handshake.getProtocolVersion() , ProtocolConstants.MINECRAFT_1_8 ) )
|
||||
{
|
||||
@@ -304,11 +321,11 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
|
||||
@ -15,7 +15,7 @@ index d54d8539..0dd2884d 100644
|
||||
+ // FlameCord - Use elseIfs
|
||||
if ( pluginMessage.getTag().equals( con.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand" ) )
|
||||
{
|
||||
// Travertine start
|
||||
// FlameCord start
|
||||
@@ -313,8 +314,7 @@ public class DownstreamBridge extends PacketHandler
|
||||
con.unsafe().sendPacket( pluginMessage );
|
||||
throw CancelSendSignal.INSTANCE;
|
||||
|
||||
@ -25,7 +25,7 @@ index 522bd93d..494375cd 100644
|
||||
+ brand.release();
|
||||
+ }
|
||||
}
|
||||
// Travertine end
|
||||
// FlameCord end
|
||||
}
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
|
||||
index 474551d3..8716d0c8 100644
|
||||
|
||||
10
pom.xml
10
pom.xml
@ -3,16 +3,16 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
<artifactId>travertine-super</artifactId>
|
||||
<artifactId>flamecord-super</artifactId>
|
||||
<version>dev-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<name>Travertine-Super</name>
|
||||
<description>Super project for Travertine.</description>
|
||||
<url>https://github.com/WaterfallMC/Travertine</url>
|
||||
<name>FlameCord-Super</name>
|
||||
<description>Super project for FlameCord.</description>
|
||||
<url>https://github.com/WaterfallMC/FlameCord</url>
|
||||
|
||||
<modules>
|
||||
<module>Travertine-Proxy</module>
|
||||
<module>FlameCord-Proxy</module>
|
||||
</modules>
|
||||
|
||||
<build>
|
||||
|
||||
@ -67,7 +67,7 @@ applyPatch BungeeCord Waterfall-Proxy HEAD
|
||||
popd
|
||||
basedir=$(dirname "$basedir")
|
||||
|
||||
# Apply travertine patches
|
||||
# Apply flamecord patches
|
||||
applyPatch Waterfall/Waterfall-Proxy FlameCord-Proxy HEAD
|
||||
|
||||
enableCommitSigningIfNeeded
|
||||
|
||||
Loading…
Reference in New Issue
Block a user