Merge pull request #155 from sgdc3/master

Improve POM and fix dead code
2024-11-03 14:50:30 +01:00 · 2016-03-06 16:48:41 +00:00 · 2016-03-06 16:48:41 +00:00 · ffb4fb5c5a
Commit ffb4fb5c5a
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,116 @@
-target/
-.idea/
+### Java files ###
+*.class
+
+# Package Files
+#*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+
+
+### Intellij ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
+# Ignore project files
 *.iml
+
+# Ignore IDEA directory
+.idea/*
+
+# Include the project's code style settings file
+!.idea/codeStyleSettings.xml
+
+# Include the project's dictionary
+!.idea/dictionaries/
+!.idea/dictionaries/*
+
+# File-based project format:
+*.ipr
+*.iws
+
+### Plugin-specific files: ###
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+
+
+
+### Eclipse ###
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
+
+
+### Maven ###
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+
+
+
+### NetBeans ###
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+nbactions.xml
+nb-configuration.xml
+.nb-gradle/
+
+
+
+### Git ###
+# Don't exclude the .gitignore itself
+!.gitignore
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,12 @@
+sudo: false
+
+language: java
+jdk: oraclejdk7
+
+cache:
+  directories:
+    - '$HOME/.m2/repository'
+
+script:
+  - mvn dependency:purge-local-repository -DactTransitively=false -DreResolve=false
+  - mvn clean install -B -U
--- a/3
+++ b/3
@ -0,0 +1,3 @@
+License:
+--------
+You may modify this work, all rights are still owned by myself excluding any files in the spacebase package as they belong to the respected contributors. Please credit the original author (myself) when forking etc. (or if it helped you understand the new protocol or netty!)
--- a/circle.yml
+++ b/circle.yml
@ -0,0 +1,11 @@
+machine:
+  java:
+    version: oraclejdk7
+general:
+  artifacts:
+    - "target/*.jar"
+test:
+  override:
+    - mvn clean install -B
+  post:
+    - cp ./target/*.jar $CIRCLE_ARTIFACTS
--- a/pom.xml
+++ b/pom.xml
@ -1,20 +1,107 @@
 <?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/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         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>us.myles</groupId>
-    <artifactId>ViaVersion</artifactId>
-    <version>0.5.5</version>
+    <artifactId>viaversion</artifactId>
+    <version>0.5.6-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>ViaVersion</name>
+    <description>Allow 1.8 clients to join 1.9 bukkit servers!</description>
+    <inceptionYear>2016</inceptionYear>
+    <url>https://www.spigotmc.org/resources/viaversion.19254/</url>
+
+    <prerequisites>
+        <maven>3.3.3</maven>
+    </prerequisites>
+
+    <properties>
+        <!-- Project Properties -->
+        <projectEncoding>UTF-8</projectEncoding>
+        <project.build.sourceEncoding>${projectEncoding}</project.build.sourceEncoding>
+        <project.build.outputEncoding>${projectEncoding}</project.build.outputEncoding>
+        <jdkVersion>1.7</jdkVersion>
+        <!-- <testJreVersion>1.7</testJreVersion> -->
+
+        <!-- Change Bukkit Version HERE! -->
+        <bukkitVersion>1.8.8-R0.1-SNAPSHOT</bukkitVersion>
+    </properties>
+
    <build>
-        <finalName>ViaVersion-${project.version}</finalName>
+        <finalName>${project.name}-${project.version}</finalName>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <!-- <testSourceDirectory>src/test/java</testSourceDirectory> -->
+
+        <resources>
+            <resource>
+                <targetPath>.</targetPath>
+                <filtering>false</filtering>
+                <directory>.</directory>
+                <includes>
+                    <include>LICENSE</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>.</targetPath>
+                <filtering>true</filtering>
+                <directory>src/main/resources/</directory>
+                <includes>
+                    <include>*</include>
+                </includes>
+            </resource>
+        </resources>
+		<!--
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+            </testResource>
+        </testResources>
+		-->
+
        <plugins>
+            <!-- Maven Java Compiler -->
            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+                <configuration>
+                    <source>${jdkVersion}</source>
+                    <target>${jdkVersion}</target>
+					<!--
+                    <testSource>${testJreVersion}</testSource>
+                    <testTarget>${testJreVersion}</testTarget>
+					-->
+                </configuration>
+            </plugin>
+            <!-- Unit Test Plugin
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.19.1</version>
+                <configuration>
+                    <argLine>-Dfile.encoding=${projectEncoding} ${argLine}</argLine>
+                </configuration>
+            </plugin>
+			-->
+            <!-- Libs Shading and Relocation -->
+            <plugin>
+                <!--Relocate all lib we use in order to fix class loading errors if we use different versions
+                than already loaded libs (i.e. by Mojang -> gson)-->
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-shade-plugin</artifactId>
-                <version>1.4</version>
+                <version>2.4.3</version>
                <configuration>
                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <minimizeJar>false</minimizeJar>
+					<relocations>
+						<relocation>
+							<pattern>org.spacehq.opennbt</pattern>
+							<shadedPattern>us.myles.viaversion.libs.opennbt</shadedPattern>
+						</relocation>
+					</relocations>
                </configuration>
                <executions>
                    <execution>
@ -25,62 +112,63 @@
                    </execution>
                </executions>
            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <version>3.5.1</version>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
        </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
    </build>
-    <dependencies>
-        <dependency>
-            <groupId>org.spacehq</groupId>
-            <artifactId>opennbt</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>1.8.8-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-all</artifactId>
-            <version>4.0.20.Final</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>18.0</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
+
    <repositories>
+        <!-- SpigotMC Repo (Bukkit API) -->
        <repository>
            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots</url>
        </repository>
+
+		<!-- SpaceHQ Repo-->
        <repository>
            <id>spacehq-repo</id>
            <url>https://repo.spacehq.org/content/repositories/releases/</url>
        </repository>
    </repositories>
+
+    <dependencies>
+        <!-- Bukkit API, http://www.spigotmc.org/ or http://bukkit.org/ -->
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <version>${bukkitVersion}</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <artifactId>junit</artifactId>
+                    <groupId>junit</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>gson</artifactId>
+                    <groupId>com.google.code.gson</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>persistence-api</artifactId>
+                    <groupId>javax.persistence</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+		<!-- NBT Edit Library -->
+        <dependency>
+            <groupId>org.spacehq</groupId>
+            <artifactId>opennbt</artifactId>
+            <version>1.0</version>
+			<scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+
+		<!-- Netty (Network Library) -->
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>4.0.20.Final</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
 </project>
--- a/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java
+++ b/src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java
@ -53,12 +53,12 @@ public class OutgoingTransformer {

        PacketType packet = PacketType.getOutgoingPacket(info.getState(), packetID);
        int original = packetID;
-        if (packet.getPacketID() != -1) {
-            packetID = packet.getNewPacketID();
-        }
        if (packet == null) {
            throw new RuntimeException("Outgoing Packet not found? " + packetID + " State: " + info.getState() + " Version: " + info.getProtocol());
        }
+        if (packet.getPacketID() != -1) {
+            packetID = packet.getNewPacketID();
+        }
        if (ViaVersion.getInstance().isDebug()) {
            if (packet != PacketType.PLAY_CHUNK_DATA && packet != PacketType.PLAY_KEEP_ALIVE && packet != PacketType.PLAY_TIME_UPDATE && (!packet.name().toLowerCase().contains("move") && !packet.name().toLowerCase().contains("look"))) {
                System.out.println("Direction " + packet.getDirection().name() + " Packet Type: " + packet + " New ID: " + packetID + " Original: " + original + " Size: " + input.readableBytes());