Skip to content

Commit

Permalink
Make it compilable in my env
Browse files Browse the repository at this point in the history
  • Loading branch information
HoverEpic committed Jan 31, 2017
1 parent 6da5ba2 commit faf0b1a
Show file tree
Hide file tree
Showing 9 changed files with 302 additions and 285 deletions.
2 changes: 1 addition & 1 deletion dependency-reduced-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>dev.wolveringer</groupId>
<artifactId>BungeeUtil</artifactId>
<version>2.1.0</version>
<version>2.2.0</version>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
Expand Down
327 changes: 164 additions & 163 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,175 +1,176 @@
<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>dev.wolveringer</groupId>
<artifactId>BungeeUtil</artifactId>
<version>2.2.0</version>
<packaging>jar</packaging>
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>dev.wolveringer</groupId>
<artifactId>BungeeUtil</artifactId>
<version>2.2.0</version>
<packaging>jar</packaging>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
</repository>
</distributionManagement>
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
</repository>
</distributionManagement>

<repositories>
<repository>
<id>ossrh-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>
<repositories>
<repository>
<id>ossrh-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>

<build>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<!-- Replacing the version -->
<resource>
<directory>src/main/resources</directory>
<includes>
<include>bungee.yml</include>
<include>plugin.yml</include>
</includes>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<resources>
<!-- Replacing the version -->
<resource>
<directory>src/main/resources</directory>
<includes>
<include>bungee.yml</include>
<include>plugin.yml</include>
</includes>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
</plugin>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<excludes>
<exclude>io.netty:**</exclude>
<exclude>net.md-5:**</exclude>
</excludes>
</artifactSet>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<excludes>
<exclude>io.netty:**</exclude>
<exclude>net.md-5:**</exclude>
</excludes>
</artifactSet>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<properties>
<bungeeyml.location>src/main/resources/bungee.yml</bungeeyml.location>
<bungeecord.version>1.11-SNAPSHOT</bungeecord.version>
</properties>
<properties>
<bungeeyml.location>src/main/resources/bungee.yml</bungeeyml.location>
<bungeecord.version>1.11-SNAPSHOT</bungeecord.version>
</properties>

<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.0.41.Final</version>
</dependency>
<!-- https://mvnrepository.com/artifact/junit/junit -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>
<!-- https://github.com/WolverinDEV/BungeeCord -->
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>${bungeecord.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-proxy</artifactId>
<version>${bungeecord.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20160212</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.8</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.9.2</version>
</dependency>
<dependency>
<groupId>dev.wolveringer</groupId>
<artifactId>TerminalUtils</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
<dependency>
<groupId>dev.wolveringer.lib</groupId>
<artifactId>NBTTag</artifactId>
<version>1.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>dev.wolveringer</groupId>
<artifactId>YamlConfiguration</artifactId>
<version>1.2-SNAPSHOT</version>
</dependency>
</dependencies>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.0.41.Final</version>
</dependency>
<!-- https://mvnrepository.com/artifact/junit/junit -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>
<!-- https://github.com/WolverinDEV/BungeeCord -->
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>${bungeecord.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-proxy</artifactId>
<version>${bungeecord.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20160212</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.8</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.9.2</version>
</dependency>
<dependency>
<groupId>dev.wolveringer</groupId>
<artifactId>TerminalUtils</artifactId>
<version>1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
<dependency>
<groupId>dev.wolveringer.lib</groupId>
<artifactId>NBTTag</artifactId>
<version>1.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>dev.wolveringer</groupId>
<artifactId>YamlConfiguration</artifactId>
<version>1.2-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion src/main/java/dev/wolveringer/bungeeutil/commands/RamStatistics.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import dev.wolveringer.bungeeutil.statistics.RamStatistics.RamStatistic;
import dev.wolveringer.bungeeutil.terminal.TerminalListener;
import dev.wolveringer.terminal.graph.TerminalGraph;
import dev.wolveringer.terminal.string.ColoredString;
import dev.wolveringer.string.ColoredString;
import jline.TerminalFactory;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.CommandSender;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/dev/wolveringer/bungeeutil/netty/WarpedChannelWrapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,9 +338,9 @@ public void setCompressionThreshold(int compressionThreshold) {
case BUNGEECORD:
this.addBefore(PipelineUtils.PACKET_DECODER, "decompress", new PacketDecompressor());
break;
case WATERFALL:
this.addBefore(PipelineUtils.PACKET_DECODER, "decompress", new PacketDecompressor(compressionThreshold));
break;
// case WATERFALL:
// this.addBefore(PipelineUtils.PACKET_DECODER, "decompress", new PacketDecompressor(compressionThreshold));
// break;
default:
break;
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/dev/wolveringer/bungeeutil/netty/WarpedMinecraftDecoder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) t
case BUNGEECORD:
bungeePacket = prot.createPacket(packetId, this.getProtocolVersion());
break;
case WATERFALL:
bungeePacket = prot.createPacket(packetId, this.getProtocolVersion(), false); //Dont support forge
break;
// case WATERFALL:
// bungeePacket = prot.createPacket(packetId, this.getProtocolVersion(), false); //Dont support forge
// break;
default:
break;
}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/dev/wolveringer/bungeeutil/packetlib/handler/MainPacketHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import dev.wolveringer.bungeeutil.item.Item;
import dev.wolveringer.bungeeutil.item.ItemStack;
import dev.wolveringer.bungeeutil.item.ItemStack.Click;
import dev.wolveringer.bungeeutil.item.ItemStack.ClickType;
import dev.wolveringer.bungeeutil.item.ItemStack.InteractType;
import dev.wolveringer.bungeeutil.item.meta.CraftItemMeta;
import dev.wolveringer.bungeeutil.packetlib.PacketHandleEvent;
Expand Down
Loading

0 comments on commit faf0b1a

Please sign in to comment.