This repository has been archived by the owner on Apr 7, 2021. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 134
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #138 from DragonetMC/indev
Indev to Master
- Loading branch information
Showing
264 changed files
with
6,225 additions
and
5,353 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <actions> | ||
| <action> | ||
| <actionName>debug</actionName> | ||
| <packagings> | ||
| <packaging>jar</packaging> | ||
| </packagings> | ||
| <goals> | ||
| <goal>process-classes</goal> | ||
| <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal> | ||
| </goals> | ||
| <properties> | ||
| <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath org.dragonet.proxy.DragonProxy</exec.args> | ||
| <exec.executable>java</exec.executable> | ||
| <jpda.listen>true</jpda.listen> | ||
| </properties> | ||
| </action> | ||
| </actions> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,148 @@ | ||
| <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>org.dragonet.proxy</groupId> | ||
| <artifactId>DragonProxy-parent</artifactId> | ||
| <version>1.0.0</version> | ||
| <packaging>pom</packaging> | ||
| <name>DragonProxy</name> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <artifactId>proxy</artifactId> | ||
| <version>0.2.2.1</version> | ||
| <name>DragonProxy</name> | ||
| <groupId>org.dragonet.proxy</groupId> | ||
|
|
||
| <build> | ||
| <defaultGoal>package</defaultGoal> | ||
| </build> | ||
| <modules> | ||
| <!--<module>protocol</module>--> | ||
| <module>proxy</module> | ||
| </modules> | ||
| <build> | ||
| <finalName>dragonproxy-${project.version}</finalName> | ||
| <directory>${project.basedir}/target</directory> | ||
| <resources> | ||
| <resource> | ||
| <directory>${project.basedir}/src/main/resources</directory> | ||
| </resource> | ||
| </resources> | ||
| <defaultGoal>package</defaultGoal> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <version>3.7.0</version> | ||
| <configuration> | ||
| <source>1.8</source> | ||
| <target>1.8</target> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-shade-plugin</artifactId> | ||
| <version>3.1.0</version> | ||
| <configuration> | ||
| <transformers> | ||
| <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> | ||
| </transformers> | ||
| <filters> | ||
| <filter> | ||
| <artifact>*:*</artifact> | ||
| <excludes> | ||
| <exclude>junit:junit</exclude> | ||
| <exclude>**/*.html</exclude> | ||
| <exclude>**/*.txt</exclude> | ||
| </excludes> | ||
| </filter> | ||
| </filters> | ||
| <minimizeJar>true</minimizeJar> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>shade</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-jar-plugin</artifactId> | ||
| <version>3.0.2</version> | ||
| <configuration> | ||
| <archive> | ||
| <manifestEntries> | ||
| <Main-Class>org.dragonet.proxy.DragonProxy</Main-Class> | ||
| <Sealed>true</Sealed> | ||
| </manifestEntries> | ||
| <manifestSections> | ||
| <manifestSection> | ||
| <name>org/dragonet/proxy</name> | ||
| <manifestEntries> | ||
| <Sealed>true</Sealed> | ||
| </manifestEntries> | ||
| </manifestSection> | ||
| </manifestSections> | ||
| </archive> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| <description>A proxy for Minecraft: Pocket Editions to join Minecraft desktop(Java) version servers.</description> | ||
| <url>http://dragonet.org/</url> | ||
| <repositories> | ||
| <repository> | ||
| <id>sonatype</id> | ||
| <name>Sonatype Nexus</name> | ||
| <layout>default</layout> | ||
| <url>https://oss.sonatype.org/content/repositories/public/</url> | ||
| </repository> | ||
| <repository> | ||
| <id>maven-repo</id> | ||
| <url>https://raw.githubusercontent.com/JRakNet/MavenRepository/master</url> | ||
| </repository> | ||
| <repository> | ||
| <id>egg82-ninja</id> | ||
| <url>https://www.myget.org/F/egg82-java/maven/</url> | ||
| </repository> | ||
| <repository> | ||
| <id>jitpack.io</id> | ||
| <url>https://jitpack.io</url> | ||
| </repository> | ||
| </repositories> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>net.marfgamer</groupId> | ||
| <artifactId>jraknet</artifactId> | ||
| <version>2.8.2</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.Steveice10</groupId> | ||
| <artifactId>MCProtocolLib</artifactId> | ||
| <version>-SNAPSHOT</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.Steveice10</groupId> | ||
| <artifactId>MCAuthLib</artifactId> | ||
| <version>-SNAPSHOT</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.yaml</groupId> | ||
| <artifactId>snakeyaml</artifactId> | ||
| <version>1.19</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.commons</groupId> | ||
| <artifactId>commons-lang3</artifactId> | ||
| <version>3.7</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.guava</groupId> | ||
| <artifactId>guava</artifactId> | ||
| <version>23.4-jre</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>ninja.egg82.lib</groupId> | ||
| <artifactId>egg82-lib</artifactId> | ||
| <version>2.6.32</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <version>4.12</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| <properties> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> | ||
| </properties> | ||
| </project> |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.