Im done.
This commit is contained in:
parent
3cec84fbe1
commit
3763d622fd
|
@ -67,3 +67,5 @@ libraries/*.jar
|
||||||
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
||||||
hs_err_pid*
|
hs_err_pid*
|
||||||
>>>>>>> 354c5c7d98801e512c3da0913cd1824a9cf4b2cf
|
>>>>>>> 354c5c7d98801e512c3da0913cd1824a9cf4b2cf
|
||||||
|
|
||||||
|
/run
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,2 @@
|
||||||
|
#Fri Jun 24 19:31:05 CEST 2022
|
||||||
|
gradle.version=7.1
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1,172 +0,0 @@
|
||||||
|
|
||||||
<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/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>net.techcable.tacospigot</groupId>
|
|
||||||
<artifactId>parent</artifactId>
|
|
||||||
<version>dev-SNAPSHOT</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<groupId>net.techcable.tacospigot</groupId>
|
|
||||||
<artifactId>api</artifactId>
|
|
||||||
<version>1.8.8-R0.2-SNAPSHOT</version>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
|
|
||||||
<name>TacoSpigot-API</name>
|
|
||||||
<url>https://github.com/TacoSpigot</url>
|
|
||||||
<description>An enhanced plugin API for Minecraft servers.</description>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<!--PaperSpigot - Bump to 1.8 - This will haunt me -->
|
|
||||||
<additionalparam>-Xdoclint:none</additionalparam>
|
|
||||||
<maven.compiler.source>1.8</maven.compiler.source>
|
|
||||||
<maven.compiler.target>1.8</maven.compiler.target>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<!-- just until we get deployment to central approved -->
|
|
||||||
<distributionManagement>
|
|
||||||
<repository>
|
|
||||||
<id>destroystokyo-releases</id>
|
|
||||||
<url>https://repo.destroystokyo.com/content/repositories/releases/</url>
|
|
||||||
</repository>
|
|
||||||
<snapshotRepository>
|
|
||||||
<id>destroystokyo-snapshots</id>
|
|
||||||
<url>https://repo.destroystokyo.com/content/repositories/snapshots/</url>
|
|
||||||
</snapshotRepository>
|
|
||||||
</distributionManagement>
|
|
||||||
|
|
||||||
<!-- required until fixed plexus-compiler-eclipse is deployed -->
|
|
||||||
<pluginRepositories>
|
|
||||||
<pluginRepository>
|
|
||||||
<id>spigotmc-public</id>
|
|
||||||
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
|
|
||||||
</pluginRepository>
|
|
||||||
</pluginRepositories>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.sf.trove4j</groupId>
|
|
||||||
<artifactId>trove4j</artifactId>
|
|
||||||
<version>3.0.3</version>
|
|
||||||
<!-- Trove Provided by CraftBukkit -->
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>commons-lang</groupId>
|
|
||||||
<artifactId>commons-lang</artifactId>
|
|
||||||
<version>2.6</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.googlecode.json-simple</groupId>
|
|
||||||
<artifactId>json-simple</artifactId>
|
|
||||||
<version>1.1.1</version>
|
|
||||||
<type>jar</type>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<!-- bundled with Minecraft, should be kept in sync -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.google.guava</groupId>
|
|
||||||
<artifactId>guava</artifactId>
|
|
||||||
<version>17.0</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<!-- bundled with Minecraft, should be kept in sync -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.google.code.gson</groupId>
|
|
||||||
<artifactId>gson</artifactId>
|
|
||||||
<version>2.9.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.avaje</groupId>
|
|
||||||
<artifactId>ebean</artifactId>
|
|
||||||
<version>2.8.1</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.yaml</groupId>
|
|
||||||
<artifactId>snakeyaml</artifactId>
|
|
||||||
<version>1.30</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.md-5</groupId>
|
|
||||||
<artifactId>bungeecord-chat</artifactId>
|
|
||||||
<version>1.8-SNAPSHOT</version>
|
|
||||||
<type>jar</type>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.projectlombok</groupId>
|
|
||||||
<artifactId>lombok</artifactId>
|
|
||||||
<version>1.18.22</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<!-- Thread Affinity -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.openhft</groupId>
|
|
||||||
<artifactId>affinity</artifactId>
|
|
||||||
<version>3.20.0</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- testing -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>junit</groupId>
|
|
||||||
<artifactId>junit</artifactId>
|
|
||||||
<version>4.12</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.hamcrest</groupId>
|
|
||||||
<artifactId>hamcrest-library</artifactId>
|
|
||||||
<version>1.3</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
|
||||||
<!-- versions after this appear to be broken -->
|
|
||||||
<version>3.1</version>
|
|
||||||
<configuration>
|
|
||||||
<!-- source and target are ignored if this isn't true -->
|
|
||||||
<optimize>true</optimize>
|
|
||||||
</configuration>
|
|
||||||
<dependencies>
|
|
||||||
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.codehaus.plexus</groupId>
|
|
||||||
<artifactId>plexus-compiler-eclipse</artifactId>
|
|
||||||
<version>2.5.0-spigotmc</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
|
||||||
<version>3.2.3</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<phase>package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>shade</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
<configuration>
|
|
||||||
<!-- utterly useless artifact from shade 2.x -->
|
|
||||||
<createDependencyReducedPom>false</createDependencyReducedPom>
|
|
||||||
<!-- when downloading via Maven we can pull depends individually -->
|
|
||||||
<shadedArtifactAttached>true</shadedArtifactAttached>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</project>
|
|
|
@ -1,62 +0,0 @@
|
||||||
public+synthetic org/bukkit/Bukkit/getOnlinePlayers()[Lorg/bukkit/entity/Player;
|
|
||||||
public+synthetic org/bukkit/Server/getOnlinePlayers()[Lorg/bukkit/entity/Player;
|
|
||||||
|
|
||||||
public+synthetic org/bukkit/entity/Damageable/damage(I)V
|
|
||||||
public+synthetic org/bukkit/entity/Damageable/damage(ILorg/bukkit/entity/Entity;)V
|
|
||||||
public+synthetic org/bukkit/entity/Damageable/getHealth()I
|
|
||||||
public+synthetic org/bukkit/entity/Damageable/getMaxHealth()I
|
|
||||||
public+synthetic org/bukkit/entity/Damageable/setHealth(I)V
|
|
||||||
public+synthetic org/bukkit/entity/Damageable/setMaxHealth(I)V
|
|
||||||
|
|
||||||
public+synthetic org/bukkit/entity/LivingEntity/getLastDamage()I
|
|
||||||
public+synthetic org/bukkit/entity/LivingEntity/setLastDamage(I)V
|
|
||||||
|
|
||||||
public+synthetic org/bukkit/entity/Minecart/getDamage()I
|
|
||||||
public+synthetic org/bukkit/entity/Minecart/setDamage(I)V
|
|
||||||
|
|
||||||
public+synthetic org/bukkit/entity/Projectile/getShooter()Lorg/bukkit/entity/LivingEntity;
|
|
||||||
public+synthetic org/bukkit/entity/Projectile/setShooter(Lorg/bukkit/entity/LivingEntity;)V
|
|
||||||
|
|
||||||
public+synthetic org/bukkit/event/entity/EntityDamageEvent/getDamage()I
|
|
||||||
public+synthetic org/bukkit/event/entity/EntityDamageEvent/setDamage(I)V
|
|
||||||
|
|
||||||
public+synthetic org/bukkit/event/entity/EntityRegainHealthEvent/getAmount()I
|
|
||||||
public+synthetic org/bukkit/event/entity/EntityRegainHealthEvent/setAmount(I)V
|
|
||||||
|
|
||||||
public+synthetic org/bukkit/event/vehicle/VehicleDamageEvent/getDamage()I
|
|
||||||
public+synthetic org/bukkit/event/vehicle/VehicleDamageEvent/setDamage(I)V
|
|
||||||
|
|
||||||
# CraftBukkit
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/CraftServer/getOnlinePlayers()[Lorg/bukkit/entity/Player;
|
|
||||||
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftArrow/getShooter()Lorg/bukkit/entity/LivingEntity;
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftArrow/setShooter(Lorg/bukkit/entity/LivingEntity;)V
|
|
||||||
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftEnderDragonPart/damage(I)V
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftEnderDragonPart/damage(ILorg/bukkit/entity/Entity;)V
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftEnderDragonPart/getHealth()I
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftEnderDragonPart/getMaxHealth()I
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftEnderDragonPart/setHealth(I)V
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftEnderDragonPart/setMaxHealth(I)V
|
|
||||||
|
|
||||||
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftFireball/getShooter()Lorg/bukkit/entity/LivingEntity;
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftFireball/setShooter(Lorg/bukkit/entity/LivingEntity;)V
|
|
||||||
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftFish/getShooter()Lorg/bukkit/entity/LivingEntity;
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftFish/setShooter(Lorg/bukkit/entity/LivingEntity;)V
|
|
||||||
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftLivingEntity/damage(I)V
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftLivingEntity/damage(ILorg/bukkit/entity/Entity;)V
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftLivingEntity/getHealth()I
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftLivingEntity/getMaxHealth()I
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftLivingEntity/setHealth(I)V
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftLivingEntity/setMaxHealth(I)V
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftLivingEntity/getLastDamage()I
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftLivingEntity/setLastDamage(I)V
|
|
||||||
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftMinecart/getDamage()I
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftMinecart/setDamage(I)V
|
|
||||||
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftProjectile/getShooter()Lorg/bukkit/entity/LivingEntity;
|
|
||||||
public+synthetic org/bukkit/craftbukkit/v1_8_R3/entity/CraftProjectile/setShooter(Lorg/bukkit/entity/LivingEntity;)V
|
|
|
@ -1,27 +0,0 @@
|
||||||
org/bukkit/Bukkit _INVALID_getOnlinePlayers ()[Lorg/bukkit/entity/Player; getOnlinePlayers
|
|
||||||
org/bukkit/Server _INVALID_getOnlinePlayers ()[Lorg/bukkit/entity/Player; getOnlinePlayers
|
|
||||||
|
|
||||||
org/bukkit/entity/Damageable _INVALID_damage (I)V damage
|
|
||||||
org/bukkit/entity/Damageable _INVALID_damage (ILorg/bukkit/entity/Entity;)V damage
|
|
||||||
org/bukkit/entity/Damageable _INVALID_getHealth ()I getHealth
|
|
||||||
org/bukkit/entity/Damageable _INVALID_getMaxHealth ()I getMaxHealth
|
|
||||||
org/bukkit/entity/Damageable _INVALID_setHealth (I)V setHealth
|
|
||||||
org/bukkit/entity/Damageable _INVALID_setMaxHealth (I)V setMaxHealth
|
|
||||||
|
|
||||||
org/bukkit/entity/LivingEntity _INVALID_getLastDamage ()I getLastDamage
|
|
||||||
org/bukkit/entity/LivingEntity _INVALID_setLastDamage (I)V setLastDamage
|
|
||||||
|
|
||||||
org/bukkit/entity/Minecart _INVALID_getDamage ()I getDamage
|
|
||||||
org/bukkit/entity/Minecart _INVALID_setDamage (I)V setDamage
|
|
||||||
|
|
||||||
org/bukkit/entity/Projectile _INVALID_getShooter ()Lorg/bukkit/entity/LivingEntity; getShooter
|
|
||||||
org/bukkit/entity/Projectile _INVALID_setShooter (Lorg/bukkit/entity/LivingEntity;)V setShooter
|
|
||||||
|
|
||||||
org/bukkit/event/entity/EntityDamageEvent _INVALID_getDamage ()I getDamage
|
|
||||||
org/bukkit/event/entity/EntityDamageEvent _INVALID_setDamage (I)V setDamage
|
|
||||||
|
|
||||||
org/bukkit/event/entity/EntityRegainHealthEvent _INVALID_getAmount ()I getAmount
|
|
||||||
org/bukkit/event/entity/EntityRegainHealthEvent _INVALID_setAmount (I)V setAmount
|
|
||||||
|
|
||||||
org/bukkit/event/vehicle/VehicleDamageEvent _INVALID_getDamage ()I getDamage
|
|
||||||
org/bukkit/event/vehicle/VehicleDamageEvent _INVALID_setDamage (I)V setDamage
|
|
|
@ -1,306 +0,0 @@
|
||||||
<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/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<groupId>net.techcable.tacospigot</groupId>
|
|
||||||
<artifactId>server</artifactId>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
<version>1.8.8-R0.2-SNAPSHOT</version>
|
|
||||||
<name>TacoSpigot</name>
|
|
||||||
<url>https://github.com/TacoSpigot</url>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
<api.version>unknown</api.version>
|
|
||||||
<junit.version>4.11</junit.version>
|
|
||||||
<minecraft.version>1.8.8</minecraft.version>
|
|
||||||
<minecraft_version>1_8_R3</minecraft_version>
|
|
||||||
<buildtag.prefix>git-Bukkit-</buildtag.prefix>
|
|
||||||
<buildtag.suffix></buildtag.suffix>
|
|
||||||
<!--PaperSpigot - Bump to 1.8 - This will haunt me -->
|
|
||||||
<maven.compiler.source>1.8</maven.compiler.source>
|
|
||||||
<maven.compiler.target>1.8</maven.compiler.target>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>net.techcable.tacospigot</groupId>
|
|
||||||
<artifactId>parent</artifactId>
|
|
||||||
<version>dev-SNAPSHOT</version>
|
|
||||||
<relativePath>../pom.xml</relativePath>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.projectlombok</groupId>
|
|
||||||
<artifactId>lombok</artifactId>
|
|
||||||
<version>1.18.22</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.netty</groupId>
|
|
||||||
<artifactId>netty-all</artifactId>
|
|
||||||
<version>4.1.78.Final</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.slf4j</groupId>
|
|
||||||
<artifactId>slf4j-api</artifactId>
|
|
||||||
<version>1.7.32</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.sf.trove4j</groupId>
|
|
||||||
<artifactId>trove4j</artifactId>
|
|
||||||
<version>3.0.3</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>it.unimi.dsi</groupId>
|
|
||||||
<artifactId>fastutil</artifactId>
|
|
||||||
<version>7.0.12</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.techcable.tacospigot</groupId>
|
|
||||||
<artifactId>api</artifactId>
|
|
||||||
<version>${project.version}</version>
|
|
||||||
<type>jar</type>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.spigotmc</groupId>
|
|
||||||
<artifactId>minecraft-server</artifactId>
|
|
||||||
<version>${minecraft.version}-SNAPSHOT</version>
|
|
||||||
<type>jar</type>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.sf.jopt-simple</groupId>
|
|
||||||
<artifactId>jopt-simple</artifactId>
|
|
||||||
<version>3.2</version>
|
|
||||||
<type>jar</type>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>jline</groupId>
|
|
||||||
<artifactId>jline</artifactId>
|
|
||||||
<version>2.12</version>
|
|
||||||
<type>jar</type>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.xerial</groupId>
|
|
||||||
<artifactId>sqlite-jdbc</artifactId>
|
|
||||||
<version>3.7.2</version>
|
|
||||||
<type>jar</type>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>mysql</groupId>
|
|
||||||
<artifactId>mysql-connector-java</artifactId>
|
|
||||||
<version>8.0.29</version>
|
|
||||||
<type>jar</type>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<!-- testing -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>junit</groupId>
|
|
||||||
<artifactId>junit</artifactId>
|
|
||||||
<version>${junit.version}</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.mockito</groupId>
|
|
||||||
<artifactId>mockito-core</artifactId>
|
|
||||||
<version>1.10.19</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>it.unimi.dsi</groupId>
|
|
||||||
<artifactId>fastutil</artifactId>
|
|
||||||
<version>8.1.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.jafama</groupId>
|
|
||||||
<artifactId>jafama</artifactId>
|
|
||||||
<version>2.3.2</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.hamcrest</groupId>
|
|
||||||
<artifactId>hamcrest-library</artifactId>
|
|
||||||
<version>1.3</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.velocitypowered</groupId>
|
|
||||||
<artifactId>velocity-native</artifactId>
|
|
||||||
<version>1.1.0-SNAPSHOT</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.lz4</groupId>
|
|
||||||
<artifactId>lz4-java</artifactId>
|
|
||||||
<version>1.8.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.luben</groupId>
|
|
||||||
<artifactId>zstd-jni</artifactId>
|
|
||||||
<version>1.5.2-3</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.logging.log4j</groupId>
|
|
||||||
<artifactId>log4j-core</artifactId>
|
|
||||||
<version>2.17.2</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<!-- required until fixed plexus-compiler-eclipse is deployed -->
|
|
||||||
<pluginRepositories>
|
|
||||||
<pluginRepository>
|
|
||||||
<id>spigotmc-public</id>
|
|
||||||
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
|
|
||||||
</pluginRepository>
|
|
||||||
<!-- PaperSpigot - Repo for gitdescribe -->
|
|
||||||
<pluginRepository>
|
|
||||||
<id>destroystokyo</id>
|
|
||||||
<url>https://papermc.io/repo/repository/maven-public/</url>
|
|
||||||
</pluginRepository>
|
|
||||||
</pluginRepositories>
|
|
||||||
|
|
||||||
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
|
|
||||||
<build>
|
|
||||||
<defaultGoal>install</defaultGoal>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
|
||||||
<version>2.5</version>
|
|
||||||
<configuration>
|
|
||||||
<forceCreation>true</forceCreation> <!-- Required to prevent shading the jar multiple times -->
|
|
||||||
<archive>
|
|
||||||
<manifestEntries>
|
|
||||||
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
|
|
||||||
<Implementation-Title>CraftBukkit</Implementation-Title>
|
|
||||||
<Implementation-Version>RELEASE</Implementation-Version>
|
|
||||||
<Implementation-Vendor>Bukkit Team</Implementation-Vendor>
|
|
||||||
<Specification-Title>Bukkit</Specification-Title>
|
|
||||||
<Specification-Version>${api.version}</Specification-Version>
|
|
||||||
<Specification-Vendor>Bukkit Team</Specification-Vendor>
|
|
||||||
</manifestEntries>
|
|
||||||
<manifestSections>
|
|
||||||
<manifestSection>
|
|
||||||
<name>net/bukkit/</name>
|
|
||||||
<manifestEntries>
|
|
||||||
<Sealed>true</Sealed>
|
|
||||||
</manifestEntries>
|
|
||||||
</manifestSection>
|
|
||||||
<manifestSection>
|
|
||||||
<name>com/bukkit/</name>
|
|
||||||
<manifestEntries>
|
|
||||||
<Sealed>true</Sealed>
|
|
||||||
</manifestEntries>
|
|
||||||
</manifestSection>
|
|
||||||
<manifestSection>
|
|
||||||
<name>org/bukkit/</name>
|
|
||||||
<manifestEntries>
|
|
||||||
<Sealed>true</Sealed>
|
|
||||||
</manifestEntries>
|
|
||||||
</manifestSection>
|
|
||||||
</manifestSections>
|
|
||||||
</archive>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
|
||||||
<version>3.2.3</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<phase>package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>shade</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml
|
|
||||||
</dependencyReducedPomLocation> <!-- Paper -->
|
|
||||||
<createSourcesJar>false</createSourcesJar>
|
|
||||||
<relocations>
|
|
||||||
<relocation>
|
|
||||||
<pattern>joptsimple</pattern>
|
|
||||||
<shadedPattern>org.bukkit.craftbukkit.libs.joptsimple</shadedPattern>
|
|
||||||
</relocation>
|
|
||||||
<relocation>
|
|
||||||
<pattern>jline</pattern>
|
|
||||||
<shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
|
|
||||||
</relocation>
|
|
||||||
<relocation>
|
|
||||||
<pattern>org.ibex</pattern>
|
|
||||||
<shadedPattern>org.bukkit.craftbukkit.libs.org.ibex</shadedPattern>
|
|
||||||
</relocation>
|
|
||||||
<relocation>
|
|
||||||
<pattern>org.gjt</pattern>
|
|
||||||
<shadedPattern>org.bukkit.craftbukkit.libs.org.gjt</shadedPattern>
|
|
||||||
</relocation>
|
|
||||||
<relocation>
|
|
||||||
<pattern>org.bukkit.craftbukkit</pattern>
|
|
||||||
<shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern>
|
|
||||||
<excludes>
|
|
||||||
<exclude>org.bukkit.craftbukkit.Main*</exclude>
|
|
||||||
</excludes>
|
|
||||||
</relocation>
|
|
||||||
<relocation>
|
|
||||||
<pattern>net.minecraft.server</pattern>
|
|
||||||
<shadedPattern>net.minecraft.server.v${minecraft_version}</shadedPattern>
|
|
||||||
</relocation>
|
|
||||||
</relocations>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<!-- Gotta go after shade plugin -->
|
|
||||||
<!-- <plugin>
|
|
||||||
<groupId>net.md-5</groupId>
|
|
||||||
<artifactId>specialsource-maven-plugin</artifactId>
|
|
||||||
<version>1.2.1</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<phase>package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>remap</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<srgIn>${project.basedir}/deprecation-mappings.csrg</srgIn>
|
|
||||||
<accessIn>${project.basedir}/deprecation-mappings.at</accessIn>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>-->
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
|
||||||
<!-- versions after this appear to be broken -->
|
|
||||||
<version>3.8.1</version>
|
|
||||||
<configuration>
|
|
||||||
<!-- source and target are ignored if this isn't true -->
|
|
||||||
<optimize>true</optimize>
|
|
||||||
</configuration>
|
|
||||||
<dependencies>
|
|
||||||
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.codehaus.plexus</groupId>
|
|
||||||
<artifactId>plexus-compiler-eclipse</artifactId>
|
|
||||||
<version>2.5.0-spigotmc</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
|
||||||
<version>2.18</version>
|
|
||||||
<configuration>
|
|
||||||
<workingDirectory>${basedir}/target/test-server</workingDirectory>
|
|
||||||
<excludes>
|
|
||||||
<exclude>org/bukkit/craftbukkit/inventory/ItemStack*Test.java</exclude>
|
|
||||||
</excludes>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</project>
|
|
|
@ -1,58 +0,0 @@
|
||||||
package net.minecraft.server;
|
|
||||||
|
|
||||||
import io.netty.buffer.ByteBuf;
|
|
||||||
import io.netty.buffer.Unpooled;
|
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
|
||||||
import io.netty.handler.codec.ByteToMessageDecoder;
|
|
||||||
import io.netty.handler.codec.CorruptedFrameException;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class PacketSplitter extends ByteToMessageDecoder {
|
|
||||||
|
|
||||||
private final byte[] lenBuf = new byte[3]; // Paper
|
|
||||||
|
|
||||||
public PacketSplitter() {
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void decode(ChannelHandlerContext channelhandlercontext, ByteBuf bytebuf, List<Object> list) throws Exception {
|
|
||||||
// Paper start - if channel is not active just discard the packet
|
|
||||||
if (!channelhandlercontext.channel().isActive()) {
|
|
||||||
bytebuf.skipBytes(bytebuf.readableBytes());
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
bytebuf.markReaderIndex();
|
|
||||||
|
|
||||||
// Paper start - reuse temporary length buffer
|
|
||||||
byte[] abyte = lenBuf;
|
|
||||||
java.util.Arrays.fill(abyte, (byte) 0);
|
|
||||||
// Paper end
|
|
||||||
|
|
||||||
for(int var5 = 0; var5 < abyte.length; ++var5) {
|
|
||||||
if (!bytebuf.isReadable()) {
|
|
||||||
bytebuf.resetReaderIndex();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
abyte[var5] = bytebuf.readByte();
|
|
||||||
if (abyte[var5] >= 0) {
|
|
||||||
PacketDataSerializer var6 = new PacketDataSerializer(Unpooled.wrappedBuffer(abyte));
|
|
||||||
|
|
||||||
try {
|
|
||||||
int var7 = var6.e();
|
|
||||||
if (bytebuf.readableBytes() < var7) {
|
|
||||||
bytebuf.resetReaderIndex();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
list.add(bytebuf.readBytes(var7));
|
|
||||||
} finally {
|
|
||||||
var6.release();
|
|
||||||
}
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new CorruptedFrameException("length wider than 21-bit");
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,80 @@
|
||||||
|
plugins {
|
||||||
|
java
|
||||||
|
`java-library`
|
||||||
|
}
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
gradlePluginPortal()
|
||||||
|
maven(url = "https://libraries.minecraft.net")
|
||||||
|
maven(url = "https://oss.sonatype.org/content/groups/public")
|
||||||
|
maven(url = "https://hub.spigotmc.org/nexus/content/groups/public")
|
||||||
|
}
|
||||||
|
|
||||||
|
java {
|
||||||
|
withSourcesJar()
|
||||||
|
withJavadocJar()
|
||||||
|
}
|
||||||
|
|
||||||
|
group = "com.elevatemc.espigot"
|
||||||
|
version = "1.8.8-R0.1-SNAPSHOT"
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
java {
|
||||||
|
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||||
|
targetCompatibility = JavaVersion.VERSION_1_8
|
||||||
|
}
|
||||||
|
|
||||||
|
api("commons-lang:commons-lang:2.6")
|
||||||
|
api("org.avaje:ebean:2.8.1")
|
||||||
|
api("com.googlecode.json-simple:json-simple:1.1.1")
|
||||||
|
api("org.yaml:snakeyaml:1.30")
|
||||||
|
api("net.md-5:bungeecord-chat:1.8-SNAPSHOT")
|
||||||
|
compileOnlyApi("net.sf.trove4j:trove4j:3.0.3") // provided by server
|
||||||
|
|
||||||
|
// bundled with Minecraft, should be kept in sync
|
||||||
|
api("com.google.guava:guava:17.0")
|
||||||
|
api("com.google.code.gson:gson:2.2.4")
|
||||||
|
|
||||||
|
// testing
|
||||||
|
testImplementation("junit:junit:4.12")
|
||||||
|
testImplementation("org.hamcrest:hamcrest-library:1.3")
|
||||||
|
testImplementation("net.sf.trove4j:trove4j:3.0.3") // required by tests
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks {
|
||||||
|
val generateApiVersioningFile by registering {
|
||||||
|
inputs.property("version", project.version)
|
||||||
|
val pomProps = layout.buildDirectory.file("pom.properties")
|
||||||
|
outputs.file(pomProps)
|
||||||
|
doLast {
|
||||||
|
pomProps.get().asFile.writeText("version=${project.version}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
jar {
|
||||||
|
from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
|
||||||
|
into("META-INF/maven/${project.group}/${project.name.toLowerCase()}")
|
||||||
|
}
|
||||||
|
|
||||||
|
manifest {
|
||||||
|
attributes(
|
||||||
|
"Automatic-Module-Name" to "org.bukkit"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
withType<Javadoc> {
|
||||||
|
(options as StandardJavadocDocletOptions).let {
|
||||||
|
// hide warnings
|
||||||
|
it.addStringOption("Xdoclint:none", "-quiet")
|
||||||
|
|
||||||
|
it.links(
|
||||||
|
"https://guava.dev/releases/21.0/api/docs/",
|
||||||
|
"https://javadoc.io/doc/org.yaml/snakeyaml/1.28/",
|
||||||
|
"https://javadoc.io/doc/org.jetbrains/annotations-java5/21.0.1/",
|
||||||
|
"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -461,7 +461,7 @@ public enum Material {
|
||||||
private final Constructor<? extends MaterialData> ctor;
|
private final Constructor<? extends MaterialData> ctor;
|
||||||
private static Material[] byId = new Material[383];
|
private static Material[] byId = new Material[383];
|
||||||
private final static Map<String, Material> BY_NAME = Maps.newHashMap();
|
private final static Map<String, Material> BY_NAME = Maps.newHashMap();
|
||||||
private final int maxStack;
|
private int maxStack; // PandaSpigot - Make non-final
|
||||||
private final short durability;
|
private final short durability;
|
||||||
|
|
||||||
private Material(final int id) {
|
private Material(final int id) {
|
||||||
|
@ -516,6 +516,21 @@ public enum Material {
|
||||||
return maxStack;
|
return maxStack;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// PandaSpigot start - Add setMaxStackSize()
|
||||||
|
/**
|
||||||
|
* Sets the maximum amount of this material that can be held in a stack.
|
||||||
|
* <p>
|
||||||
|
* <b>This method is for internal use only. Use at your own risk.</b>
|
||||||
|
*
|
||||||
|
* @param maxStack The new maximum stack size for this material.
|
||||||
|
* @deprecated For internal use only.
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
|
public void setMaxStackSize(int maxStack) {
|
||||||
|
this.maxStack = maxStack;
|
||||||
|
}
|
||||||
|
// PandaSpigot end
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the maximum durability of this material
|
* Gets the maximum durability of this material
|
||||||
*
|
*
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue