Skip to content

Commit 6745990

Browse files
GeorgeV220GeorgeV220
committed
New version support and code clean up
Added 1.16.4 support Some code cleanup "some" Added custom events Rewrite ReflectionUtil (this probably will be removed cause no need)
1 parent ee8181e commit 6745990

24 files changed

+370
-234
lines changed

‎Disguise.iml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
<orderEntry type="library" scope="PROVIDED" name="Maven: com.nametagedit:nametagedit:4.1.0" level="project" />
3434
<orderEntry type="library" scope="PROVIDED" name="Maven: com.github.MilkBowl:VaultAPI:1.7" level="project" />
3535
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.13.1-R0.1-SNAPSHOT" level="project" />
36+
<orderEntry type="library" scope="PROVIDED" name="Maven: com.comphenix.protocol:ProtocolLib:4.5.0" level="project" />
37+
<orderEntry type="library" scope="PROVIDED" name="Maven: cglib:cglib-nodep:3.2.5" level="project" />
38+
<orderEntry type="library" scope="PROVIDED" name="Maven: com.comphenix.executors:BukkitExecutors:1.1-SNAPSHOT" level="project" />
3639
<orderEntry type="module-library">
3740
<library name="Maven: net.minecraft.server:v1_8_R3:1.0">
3841
<CLASSES>
@@ -141,5 +144,14 @@
141144
<SOURCES />
142145
</library>
143146
</orderEntry>
147+
<orderEntry type="module-library">
148+
<library name="Maven: net.minecraft.server:v1_16_R3:1.0">
149+
<CLASSES>
150+
<root url="jar://$MODULE_DIR$/libs/spigot-1.16.4.jar!/" />
151+
</CLASSES>
152+
<JAVADOC />
153+
<SOURCES />
154+
</library>
155+
</orderEntry>
144156
</component>
145157
</module>

‎pom.xml

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -95,89 +95,102 @@
9595
<version>1.7</version>
9696
<scope>provided</scope>
9797
</dependency>
98+
<dependency>
99+
<groupId>com.comphenix.protocol</groupId>
100+
<artifactId>ProtocolLib</artifactId>
101+
<version>4.5.0</version>
102+
<scope>provided</scope>
103+
</dependency>
98104
<dependency>
99105
<groupId>net.minecraft.server</groupId>
100106
<artifactId>v1_8_R3</artifactId>
101107
<version>${project.version}</version>
102108
<scope>system</scope>
103-
<systemPath>${project.basedir}/libs/spigot.jar</systemPath>
109+
<systemPath>${pom.basedir}/libs/spigot.jar</systemPath>
104110
</dependency>
105111
<dependency>
106112
<groupId>net.minecraft.server</groupId>
107113
<artifactId>v1_9_R1</artifactId>
108114
<version>${project.version}</version>
109115
<scope>system</scope>
110-
<systemPath>${project.basedir}/libs/spigot-1.9.2.jar</systemPath>
116+
<systemPath>${pom.basedir}/libs/spigot-1.9.2.jar</systemPath>
111117
</dependency>
112118
<dependency>
113119
<groupId>net.minecraft.server</groupId>
114120
<artifactId>v1_9_R2</artifactId>
115121
<version>${project.version}</version>
116122
<scope>system</scope>
117-
<systemPath>${project.basedir}/libs/spigot-1.9.4.jar</systemPath>
123+
<systemPath>${pom.basedir}/libs/spigot-1.9.4.jar</systemPath>
118124
</dependency>
119125
<dependency>
120126
<groupId>net.minecraft.server</groupId>
121127
<artifactId>v1_10_R1</artifactId>
122128
<version>${project.version}</version>
123129
<scope>system</scope>
124-
<systemPath>${project.basedir}/libs/spigot-1.10.2.jar</systemPath>
130+
<systemPath>${pom.basedir}/libs/spigot-1.10.2.jar</systemPath>
125131
</dependency>
126132
<dependency>
127133
<groupId>net.minecraft.server</groupId>
128134
<artifactId>v1_11_R1</artifactId>
129135
<version>${project.version}</version>
130136
<scope>system</scope>
131-
<systemPath>${project.basedir}/libs/spigot-1.11.jar</systemPath>
137+
<systemPath>${pom.basedir}/libs/spigot-1.11.jar</systemPath>
132138
</dependency>
133139
<dependency>
134140
<groupId>net.minecraft.server</groupId>
135141
<artifactId>v1_12_R1</artifactId>
136142
<version>${project.version}</version>
137143
<scope>system</scope>
138-
<systemPath>${project.basedir}/libs/spigot-1.12.2.jar</systemPath>
144+
<systemPath>${pom.basedir}/libs/spigot-1.12.2.jar</systemPath>
139145
</dependency>
140146
<dependency>
141147
<groupId>net.minecraft.server</groupId>
142148
<artifactId>v1_13_R1</artifactId>
143149
<version>${project.version}</version>
144150
<scope>system</scope>
145-
<systemPath>${project.basedir}/libs/spigot-1.13.jar</systemPath>
151+
<systemPath>${pom.basedir}/libs/spigot-1.13.jar</systemPath>
146152
</dependency>
147153
<dependency>
148154
<groupId>net.minecraft.server</groupId>
149155
<artifactId>v1_13_R2</artifactId>
150156
<version>${project.version}</version>
151157
<scope>system</scope>
152-
<systemPath>${project.basedir}/libs/spigot-1.13.2.jar</systemPath>
158+
<systemPath>${pom.basedir}/libs/spigot-1.13.2.jar</systemPath>
153159
</dependency>
154160
<dependency>
155161
<groupId>net.minecraft.server</groupId>
156162
<artifactId>v1_14_R1</artifactId>
157163
<version>${project.version}</version>
158164
<scope>system</scope>
159-
<systemPath>${project.basedir}/libs/spigot-1.14.jar</systemPath>
165+
<systemPath>${pom.basedir}/libs/spigot-1.14.jar</systemPath>
160166
</dependency>
161167
<dependency>
162168
<groupId>net.minecraft.server</groupId>
163169
<artifactId>v1_15_R1</artifactId>
164170
<version>${project.version}</version>
165171
<scope>system</scope>
166-
<systemPath>${project.basedir}/libs/spigot-1.15.jar</systemPath>
172+
<systemPath>${pom.basedir}/libs/spigot-1.15.jar</systemPath>
167173
</dependency>
168174
<dependency>
169175
<groupId>net.minecraft.server</groupId>
170176
<artifactId>v1_16_R1</artifactId>
171177
<version>${project.version}</version>
172178
<scope>system</scope>
173-
<systemPath>${project.basedir}/libs/spigot-1.16.1.jar</systemPath>
179+
<systemPath>${pom.basedir}/libs/spigot-1.16.1.jar</systemPath>
174180
</dependency>
175181
<dependency>
176182
<groupId>net.minecraft.server</groupId>
177183
<artifactId>v1_16_R2</artifactId>
178184
<version>${project.version}</version>
179185
<scope>system</scope>
180-
<systemPath>${project.basedir}/libs/spigot-1.16.3.jar</systemPath>
186+
<systemPath>${pom.basedir}/libs/spigot-1.16.3.jar</systemPath>
187+
</dependency>
188+
<dependency>
189+
<groupId>net.minecraft.server</groupId>
190+
<artifactId>v1_16_R3</artifactId>
191+
<version>${project.version}</version>
192+
<scope>system</scope>
193+
<systemPath>${pom.basedir}/libs/spigot-1.16.4.jar</systemPath>
181194
</dependency>
182195
</dependencies>
183196
</project>

‎src/main/java/com/georgev22/disguise/Main.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.georgev22.disguise.commands.Disguise;
44
import com.georgev22.disguise.commands.Skin;
5-
import com.georgev22.disguise.handler.SkinUtils;
5+
import com.georgev22.disguise.utilities.SkinUtils;
66
import com.georgev22.disguise.listeners.CustomListeners;
77
import com.georgev22.disguise.listeners.LeaveListener;
88
import com.georgev22.disguise.listeners.LoginListener;

0 commit comments

Comments
 (0)