TotalFreedomMC/TF-LibsDisguises
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-LibsDisguises.git synced 2024-05-28 23:31:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge https://github.com/libraryaddict/LibsDisguises

Browse source
This commit is contained in:
Telesphoreo 2022-03-25 15:51:06 -05:00
parent 4c74493464 1bd07cc848
commit 5635c05843
9 changed files with 48 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nms/pom.xml
View file

@ -8,7 +8,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>LibsDisguises</groupId> <groupId>LibsDisguises</groupId>
<version>10.0.27-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

5
nms/v1_17_R1/pom.xml
View file

@ -5,13 +5,14 @@
<parent> <parent>
<artifactId>nms</artifactId> <artifactId>nms</artifactId>
<groupId>LibsDisguises</groupId> <groupId>LibsDisguises</groupId>
<version>10.0.27-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>v1_17_R1</artifactId> <artifactId>v1_17_R1</artifactId>
<version>1.0-SNAPSHOT</version>
<properties> <properties>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
@ -38,7 +39,7 @@
<dependency> <dependency>
<groupId>LibsDisguises</groupId> <groupId>LibsDisguises</groupId>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<version>${project.version}</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.comphenix.protocol</groupId> <groupId>com.comphenix.protocol</groupId>

7
nms/v1_18_R1/pom.xml
View file

@ -5,19 +5,20 @@
<parent> <parent>
<artifactId>nms</artifactId> <artifactId>nms</artifactId>
<groupId>LibsDisguises</groupId> <groupId>LibsDisguises</groupId>
<version>10.0.27-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>v1_18_R1</artifactId> <artifactId>v1_18_R1</artifactId>
<version>1.0-SNAPSHOT</version>
<properties> <properties>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spigot.version>1.18-R0.1-SNAPSHOT</spigot.version> <spigot.version>1.18.1-R0.1-SNAPSHOT</spigot.version>
</properties> </properties>
<dependencies> <dependencies>
@ -37,7 +38,7 @@
<dependency> <dependency>
<groupId>LibsDisguises</groupId> <groupId>LibsDisguises</groupId>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<version>${project.version}</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.comphenix.protocol</groupId> <groupId>com.comphenix.protocol</groupId>

24
nms/v1_18_R2/pom.xml
View file

@ -5,12 +5,13 @@
<parent> <parent>
<artifactId>nms</artifactId> <artifactId>nms</artifactId>
<groupId>LibsDisguises</groupId> <groupId>LibsDisguises</groupId>
<version>10.0.27-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>v1_18_R2</artifactId> <artifactId>v1_18_R2</artifactId>
<version>1.0-SNAPSHOT</version>
<properties> <properties>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
@ -37,12 +38,31 @@
<dependency> <dependency>
<groupId>LibsDisguises</groupId> <groupId>LibsDisguises</groupId>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<version>${project.version}</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.comphenix.protocol</groupId> <groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib</artifactId> <artifactId>ProtocolLib</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.mojang</groupId>
<artifactId>authlib</artifactId>
<version>3.3.39</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>it.unimi.dsi</groupId>
<artifactId>fastutil</artifactId>
<version>8.5.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.mojang</groupId>
<artifactId>datafixerupper</artifactId>
<version>4.1.27</version>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>

12
plugin/pom.xml
View file

@ -5,12 +5,14 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>LibsDisguises</groupId> <groupId>LibsDisguises</groupId>
<version>10.0.27-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>LibsDisguises</artifactId> <artifactId>LibsDisguises</artifactId>
<version>10.0.28-SNAPSHOT</version>
<properties> <properties>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
@ -180,14 +182,14 @@
<dependency> <dependency>
<groupId>LibsDisguises</groupId> <groupId>LibsDisguises</groupId>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<version>${project.version}</version> <version>1.0-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>LibsDisguises</groupId> <groupId>LibsDisguises</groupId>
<artifactId>v1_17_R1</artifactId> <artifactId>v1_17_R1</artifactId>
<version>${project.version}</version> <version>1.0-SNAPSHOT</version>
<classifier>remapped-spigot</classifier> <classifier>remapped-spigot</classifier>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
@ -195,7 +197,7 @@
<dependency> <dependency>
<groupId>LibsDisguises</groupId> <groupId>LibsDisguises</groupId>
<artifactId>v1_18_R1</artifactId> <artifactId>v1_18_R1</artifactId>
<version>${project.version}</version> <version>1.0-SNAPSHOT</version>
<classifier>remapped-spigot</classifier> <classifier>remapped-spigot</classifier>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
@ -203,7 +205,7 @@
<dependency> <dependency>
<groupId>LibsDisguises</groupId> <groupId>LibsDisguises</groupId>
<artifactId>v1_18_R2</artifactId> <artifactId>v1_18_R2</artifactId>
<version>${project.version}</version> <version>1.0-SNAPSHOT</version>
<classifier>remapped-spigot</classifier> <classifier>remapped-spigot</classifier>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>

4
plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
View file

@ -552,7 +552,7 @@ public class DisguiseUtilities {
} }
// If you're on 1.18.. // If you're on 1.18..
return new String[]{"4.8.0", "538"}; return new String[]{"4.8.0"};
} }
public static boolean isProtocolLibOutdated() { public static boolean isProtocolLibOutdated() {
@ -2292,6 +2292,8 @@ public class DisguiseUtilities {
return list.toArray(new String[0]); return list.toArray(new String[0]);
}*/ }*/
public static String quote(String string) { public static String quote(String string) {
string = string.replace("\n", "\\n");
if (!string.isEmpty() && !string.contains(" ") && !string.startsWith("\"") && !string.endsWith("\"")) { if (!string.isEmpty() && !string.contains(" ") && !string.startsWith("\"") && !string.endsWith("\"")) {
return string; return string;
} }

6
plugin/src/main/resources/configs/players.yml
View file

@ -18,9 +18,9 @@ ViewSelfDisguisesDefault: true
HearSelfDisguise: true HearSelfDisguise: true
# Some disguises are rather big and tall and block your vision # Some disguises are rather big and tall and block your vision
# By default those disguises are enabled despite misgivings, such as zombies, players, etc. # By default those disguises are disabled, such as zombies, players, etc.
# The baby versions however, should be short enough that it's a non-issue # The baby versions however, are normally short enough that it's a non-issue
TallSelfDisguises: true TallSelfDisguises: false
# How should the plugin handle self disguises scoreboards? It disables pushing in whichever team they're assigned. # How should the plugin handle self disguises scoreboards? It disables pushing in whichever team they're assigned.
# If you want them to be able to push again when they undisguise, set this to CREATE_SCOREBOARD # If you want them to be able to push again when they undisguise, set this to CREATE_SCOREBOARD

2
pom.xml
View file

@ -6,7 +6,7 @@
<groupId>LibsDisguises</groupId> <groupId>LibsDisguises</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>10.0.27-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<modules> <modules>
<module>shared</module> <module>shared</module>

5
shared/pom.xml
View file

@ -5,11 +5,14 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>LibsDisguises</groupId> <groupId>LibsDisguises</groupId>
<version>10.0.27-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<version>1.0-SNAPSHOT</version>
<properties> <properties>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>