Skip to content

Commit

Permalink
🔀 Merge pull request #6 from sculkmp/main
Browse files Browse the repository at this point in the history
  • Loading branch information
@SenseiTarzan
SenseiTarzan authored Aug 19, 2024
2 parents 30e9fb2 + d5e0f88 commit 772e6c5
Show file tree
Hide file tree
Showing 4 changed files with 94 additions and 68 deletions.
14 changes: 7 additions & 7 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
target/
.idea/*
.idea/
!.idea/fileTemplates/includes/File Header.java
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
Expand All @@ -24,9 +25,8 @@ plugins/
resource_packs/
logs/
worlds/
server.properties
whitelist.txt
op.txt
banned-ip.txt
banned-players.txt
sculk.yml
server.json
whitelist.json
op.json
banned-ips.json
banned-players.json
16 changes: 16 additions & 0 deletions .idea/fileTemplates/includes/File Header.java
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

130 changes: 70 additions & 60 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,69 +111,72 @@

<dependencies>
<dependency>
<groupId>org.cloudburstmc.protocol</groupId>
<artifactId>bedrock-connection</artifactId>
<version>3.0.0.Beta1-SNAPSHOT</version>
<scope>compile</scope>
<groupId>com.bugsnag</groupId>
<version>[3.0,4.0)</version>
<artifactId>bugsnag</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
<groupId>org.bstats</groupId>
<artifactId>bstats-base</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j2.version}</version>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
<version>5.0.2</version>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.7</version>
<groupId>it.unimi.dsi</groupId>
<artifactId>fastutil</artifactId>
<version>8.5.12</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.cloudburstmc.protocol</groupId>
<artifactId>bedrock-connection</artifactId>
<version>${protocol.version}</version>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.26</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.cloudburstmc.netty</groupId>
<artifactId>netty-transport-raknet</artifactId>
<version>${raklib.version}</version>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty.version}</version>
<classifier>linux-x86_64</classifier>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j2.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>${netty.version}</version>
<classifier>osx-x86_64</classifier>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.21</version>
</dependency>
<dependency>
<groupId>com.onyxdevtools</groupId>
<artifactId>onyx-android</artifactId>
<version>1.4.1</version>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
<version>2.4.1</version>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
<version>3.4.4</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.34</version>
<scope>provided</scope>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<version>2.14.6</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jline</groupId>
Expand Down Expand Up @@ -218,36 +221,43 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
<scope>compile</scope>
<groupId>org.cloudburstmc.protocol</groupId>
<artifactId>bedrock-codec</artifactId>
<version>${protocol.version}</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
<version>3.4.4</version>
<groupId>org.cloudburstmc.protocol</groupId>
<artifactId>bedrock-connection</artifactId>
<version>${protocol.version}</version>
</dependency>
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<version>2.14.6</version>
<scope>compile</scope>
<groupId>org.cloudburstmc.netty</groupId>
<artifactId>netty-transport-raknet</artifactId>
<version>${raklib.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.9</version>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty.version}</version>
<classifier>linux-x86_64</classifier>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.14.0</version>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>${netty.version}</version>
<classifier>osx-x86_64</classifier>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.0</version>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>9.10.1</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/log4j2.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="WARN" packages="net.minecrell.terminalconsole" shutdownHook="disable">
<Configuration status="WARN" shutdownHook="disable">
<Appenders>
<TerminalConsole name="Console">
<PatternLayout noConsoleNoAnsi="true"
Expand Down

0 comments on commit 772e6c5

Please sign in to comment.