From efab07be752ba0d27fbd53e788679f1f00b93255 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Wed, 29 Sep 2021 16:52:52 -0500
Subject: [PATCH] Oops

---
 .DS_Store                     | Bin 0 -> 6148 bytes
 dependency-reduced-pom.xml    | 192 ++++++++++++++++++++++++++++++++++
 pom.xml                       |   2 +-
 src/main/resources/plugin.yml |  14 ---
 4 files changed, 193 insertions(+), 15 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 dependency-reduced-pom.xml

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..d3ca248c0cc2e374018422cc1d2f785b1e02a796
GIT binary patch
literal 6148
zcmeHK&2G~`5S~p!YX>2MgwzTN$ro;EloY6x15%nMhe&`BMsNVs+HsUxa=nr5G?WmO
zJ5K-yUV-P}33wJx@a<0k$H0+RXh)j;W_M?1cRy=)y+p*i)1XCEBO(hbuu?_w8xj3N
z3sTZ8Hjv32F$FZDn1*y#@HP#G0mHyWV?gZP8*<l9<j(!Me|IQBOF&cXW`R32Ax<aM
zpjRlPLBxlC#C^nz!($)X_$CDw(KWhHA^DV2517&zc?6E24OqntpVl&LBEx_Vs80{c
zrG9=qcC+C9m)Ws*Yu+|JM&5nQ?E$cX*#v9(zph1;G4F(id9TuV&1-`)^58edI<vg5
zWa#5B4CQ?NSvt{de)cC(m}br97gj1)E^TaDR@JIrslIfN`OM9{Y?^kx<hiIl^0H%J
z+fO);e%PM>G#t$iYu68WoOxk9N@Q>tjNtO(Sr`X=*5%VUNM#;Zby${d*@w05`Fyv%
zS9e<NyNkLrZ|^qi&YjzPi-m1%-D=$%9G#rKp1)bVeUHUM7><4^S2eES1B~1vPu(Pr
zcq~X;#jJb{o&y8=BUqQuVQe#`VZbnOu^ABOg98=V(YRD7j}8>_2>`61Sqg0NJ0M~l
zjUA0kh3J7W6$(_LOg}N03P-!6{W=<#3RO5U{rF&dWTsyzOpcEHj&vv1QD{oTfMFod
zKv`95;{Nad`Td^{GBv}1Vc@@FfK_^KuZtz=yS1=5ao0M~Bd8GJw^S%YQ0VJe8saM6
chDt%7BMe|i<5D47Am&Fv(qIb1z&~Z+I}M+*d;kCd

literal 0
HcmV?d00001

diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
new file mode 100644
index 00000000..9baef62e
--- /dev/null
+++ b/dependency-reduced-pom.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>LibsDisguises</groupId>
+  <artifactId>LibsDisguises</artifactId>
+  <version>10.0.26-SNAPSHOT</version>
+  <build>
+    <defaultGoal>exec:java clean install</defaultGoal>
+    <resources>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>plugin.yml</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>${project.basedir}</directory>
+        <includes>
+          <include>README.md</include>
+        </includes>
+      </resource>
+    </resources>
+    <finalName>LibsDisguises</finalName>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.0.0-M1</version>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.6.0</version>
+        <executions>
+          <execution>
+            <id>my-execution</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>java</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <includePluginDependencies>true</includePluginDependencies>
+          <mainClass>me.libraryaddict.disguise.utilities.watchers.CompileMethods</mainClass>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.4</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <minimizeJar>true</minimizeJar>
+          <artifactSet>
+            <includes>
+              <include>net.kyori:*</include>
+            </includes>
+          </artifactSet>
+          <relocations>
+            <relocation>
+              <pattern>net.kyori</pattern>
+              <shadedPattern>ld-shaded.net.kyori</shadedPattern>
+            </relocation>
+          </relocations>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <repositories>
+    <repository>
+      <id>md_5-releases</id>
+      <url>https://repo.md-5.net/content/groups/public/</url>
+    </repository>
+    <repository>
+      <id>spigot-repo</id>
+      <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+    </repository>
+    <repository>
+      <id>papermc</id>
+      <url>https://papermc.io/repo/repository/maven-public/</url>
+    </repository>
+    <repository>
+      <id>dmulloy2-repo</id>
+      <url>https://repo.dmulloy2.net/nexus/repository/public/</url>
+    </repository>
+  </repositories>
+  <dependencies>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>9.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <version>1.18.16</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.comphenix.protocol</groupId>
+      <artifactId>ProtocolLib</artifactId>
+      <version>4.7.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot-api</artifactId>
+      <version>[1.17,]</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot</artifactId>
+      <version>[1.17,]</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.1</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>hamcrest-core</artifactId>
+          <groupId>org.hamcrest</groupId>
+        </exclusion>
+      </exclusions>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.destroystokyo.paper</groupId>
+      <artifactId>paper-api</artifactId>
+      <version>[1.16,]</version>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>net.md-5</groupId>
+      <artifactId>bungeecord-chat</artifactId>
+      <version>1.12-SNAPSHOT</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+  <distributionManagement>
+    <repository>
+      <id>md_5-releases</id>
+      <url>https://repo.md-5.net/content/repositories/releases/</url>
+    </repository>
+    <snapshotRepository>
+      <id>md_5-snapshots</id>
+      <url>https://repo.md-5.net/content/repositories/snapshots/</url>
+    </snapshotRepository>
+  </distributionManagement>
+  <properties>
+    <maven.build.timestamp.format>dd/MM/yyyy HH:mm</maven.build.timestamp.format>
+    <lombok.version>1.18.16</lombok.version>
+    <junit.version>4.13.1</junit.version>
+    <adventure-minimessage.version>4.1.0-SNAPSHOT</adventure-minimessage.version>
+    <asm.version>9.0</asm.version>
+    <build.number>unknown</build.number>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <bungeecord-chat.version>1.12-SNAPSHOT</bungeecord-chat.version>
+    <spigot.version>[1.17,]</spigot.version>
+    <protocollib.version>4.7.0</protocollib.version>
+    <timestamp>${maven.build.timestamp}</timestamp>
+    <adventure-api.version>4.7.0</adventure-api.version>
+    <paper-api.version>[1.16,]</paper-api.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <adventure-serializer.version>4.7.0</adventure-serializer.version>
+  </properties>
+</project>
diff --git a/pom.xml b/pom.xml
index fd35b8fe..e7f0ad7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
 
         <asm.version>9.0</asm.version>
         <lombok.version>1.18.16</lombok.version>
-        <protocollib.version>4.7.0-SNAPSHOT</protocollib.version>
+        <protocollib.version>4.7.0</protocollib.version>
         <spigot.version>[1.17,]</spigot.version>
         <junit.version>4.13.1</junit.version>
         <paper-api.version>[1.16,]</paper-api.version>
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 6c56e050..2dd4bf50 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -57,20 +57,6 @@ commands:
     aliases: [dmodify, dmod, disgmodify, modifydisguise, moddisguise, mdisguise]
     permission: libsdisguises.seecmd.disguisemodify
     description: Modify your own disguise
-<<<<<<< HEAD
-=======
-  disguisemodifyplayer:
-    aliases: [dmodifyplayer, dmodplayer, disgmodifyplayer, dismodplayer, disgmodplayer, modifydisguiseplayer,
-              moddisguiseplayer, mdisguiseplayer, mdisgplayer, dmodifyuuid, dmoduuid, disgmodifyuuid, dismoduuid, disgmoduuid, modifydisguiseuuid,
-              moddisguiseuuid, mdisguiseuuid, mdisguuid]
-    permission: libsdisguises.seecmd.disguisemodifyplayer
-    description: Modify the disguise of a player
-  disguisemodifyradius:
-    aliases: [dmodifyradius, dmodradius, disgmodradius, dismodradius, modifydisguiseradius, modifydisgradius,
-              moddisguiseradius, mdisguiseradius, moddisgradius]
-    permission: libsdisguises.seecmd.disguisemodifyradius
-    description: Modify disguises in a radius
->>>>>>> 8ca5fd862a0ede80ec7732d3746322bd4176f8ea
   disguisemodifyentity:
     aliases: [dmodifyentity, dmodentity, disgmodentity, dismodentity, modifydisguiseentity, modifydisgentity,
               modifydentity, moddisguiseentity, moddisgentity, mdisguiseentity, mdisgentity]