Kaynağa Gözat

Project refactor

Moving all files to main folder.
Using Gradle to define, manage dependecies and build the project.
Upgraded Gradle wrapper.
Zoey76 9 yıl önce
ebeveyn
işleme
64f4db543e
100 değiştirilmiş dosya ile 39 ekleme ve 88 silme
  1. 2 0
      .gitignore
  2. 1 0
      .settings/.gitignore
  3. 0 0
      .settings/org.eclipse.core.resources.prefs
  4. 0 0
      .settings/org.eclipse.core.runtime.prefs
  5. 0 0
      .settings/org.eclipse.jdt.core.prefs
  6. 0 0
      .settings/org.eclipse.jdt.ui.prefs
  7. 0 0
      .settings/org.eclipse.wst.sse.core.prefs
  8. 0 0
      .settings/org.eclipse.wst.validation.prefs
  9. 0 11
      L2J_DataPack/.classpath
  10. 0 28
      L2J_DataPack/.project
  11. 0 6
      L2J_DataPack/.pydevproject
  12. 0 9
      L2J_DataPack/build.gradle
  13. 0 34
      L2J_DataPack/build.xml
  14. 36 0
      build.gradle
  15. 0 0
      dist/doc/L2J_DataPack_LICENSE.txt
  16. 0 0
      dist/doc/L2J_DataPack_README.txt
  17. 0 0
      dist/game/config/accessLevels.xml
  18. 0 0
      dist/game/config/adminCommands.xml
  19. 0 0
      dist/game/data/ItemAuctions.xml
  20. 0 0
      dist/game/data/MerchantPriceConfig.xml
  21. 0 0
      dist/game/data/Routes.xml
  22. 0 0
      dist/game/data/buylists/0000007.xml
  23. 0 0
      dist/game/data/buylists/0000382.xml
  24. 0 0
      dist/game/data/buylists/0000383.xml
  25. 0 0
      dist/game/data/buylists/0000423.xml
  26. 0 0
      dist/game/data/buylists/0009001.xml
  27. 0 0
      dist/game/data/buylists/0009002.xml
  28. 0 0
      dist/game/data/buylists/0009003.xml
  29. 0 0
      dist/game/data/buylists/0009004.xml
  30. 0 0
      dist/game/data/buylists/0009005.xml
  31. 0 0
      dist/game/data/buylists/0009006.xml
  32. 0 0
      dist/game/data/buylists/0009007.xml
  33. 0 0
      dist/game/data/buylists/0009008.xml
  34. 0 0
      dist/game/data/buylists/0009009.xml
  35. 0 0
      dist/game/data/buylists/0009010.xml
  36. 0 0
      dist/game/data/buylists/0009011.xml
  37. 0 0
      dist/game/data/buylists/0009012.xml
  38. 0 0
      dist/game/data/buylists/0009013.xml
  39. 0 0
      dist/game/data/buylists/0009014.xml
  40. 0 0
      dist/game/data/buylists/0009015.xml
  41. 0 0
      dist/game/data/buylists/0009016.xml
  42. 0 0
      dist/game/data/buylists/0009017.xml
  43. 0 0
      dist/game/data/buylists/0009018.xml
  44. 0 0
      dist/game/data/buylists/0009019.xml
  45. 0 0
      dist/game/data/buylists/0009020.xml
  46. 0 0
      dist/game/data/buylists/0009021.xml
  47. 0 0
      dist/game/data/buylists/0009022.xml
  48. 0 0
      dist/game/data/buylists/0009023.xml
  49. 0 0
      dist/game/data/buylists/0009024.xml
  50. 0 0
      dist/game/data/buylists/0009025.xml
  51. 0 0
      dist/game/data/buylists/0009026.xml
  52. 0 0
      dist/game/data/buylists/0009027.xml
  53. 0 0
      dist/game/data/buylists/0009028.xml
  54. 0 0
      dist/game/data/buylists/0009029.xml
  55. 0 0
      dist/game/data/buylists/0009030.xml
  56. 0 0
      dist/game/data/buylists/0009031.xml
  57. 0 0
      dist/game/data/buylists/0009032.xml
  58. 0 0
      dist/game/data/buylists/0009033.xml
  59. 0 0
      dist/game/data/buylists/0009034.xml
  60. 0 0
      dist/game/data/buylists/0009035.xml
  61. 0 0
      dist/game/data/buylists/0009036.xml
  62. 0 0
      dist/game/data/buylists/0009037.xml
  63. 0 0
      dist/game/data/buylists/0009038.xml
  64. 0 0
      dist/game/data/buylists/0009039.xml
  65. 0 0
      dist/game/data/buylists/0009040.xml
  66. 0 0
      dist/game/data/buylists/0009041.xml
  67. 0 0
      dist/game/data/buylists/0009042.xml
  68. 0 0
      dist/game/data/buylists/0009043.xml
  69. 0 0
      dist/game/data/buylists/0009044.xml
  70. 0 0
      dist/game/data/buylists/0009045.xml
  71. 0 0
      dist/game/data/buylists/0009046.xml
  72. 0 0
      dist/game/data/buylists/0009047.xml
  73. 0 0
      dist/game/data/buylists/0009048.xml
  74. 0 0
      dist/game/data/buylists/0009049.xml
  75. 0 0
      dist/game/data/buylists/0009050.xml
  76. 0 0
      dist/game/data/buylists/0009051.xml
  77. 0 0
      dist/game/data/buylists/0009052.xml
  78. 0 0
      dist/game/data/buylists/0009053.xml
  79. 0 0
      dist/game/data/buylists/0009148.xml
  80. 0 0
      dist/game/data/buylists/0009149.xml
  81. 0 0
      dist/game/data/buylists/0009901.xml
  82. 0 0
      dist/game/data/buylists/0009902.xml
  83. 0 0
      dist/game/data/buylists/0009903.xml
  84. 0 0
      dist/game/data/buylists/0009904.xml
  85. 0 0
      dist/game/data/buylists/0009905.xml
  86. 0 0
      dist/game/data/buylists/0009906.xml
  87. 0 0
      dist/game/data/buylists/0009907.xml
  88. 0 0
      dist/game/data/buylists/0009908.xml
  89. 0 0
      dist/game/data/buylists/0009909.xml
  90. 0 0
      dist/game/data/buylists/0009910.xml
  91. 0 0
      dist/game/data/buylists/0009911.xml
  92. 0 0
      dist/game/data/buylists/0009912.xml
  93. 0 0
      dist/game/data/buylists/0009913.xml
  94. 0 0
      dist/game/data/buylists/0009914.xml
  95. 0 0
      dist/game/data/buylists/0009915.xml
  96. 0 0
      dist/game/data/buylists/0009916.xml
  97. 0 0
      dist/game/data/buylists/0009917.xml
  98. 0 0
      dist/game/data/buylists/0009918.xml
  99. 0 0
      dist/game/data/buylists/0009919.xml
  100. 0 0
      dist/game/data/buylists/0009920.xml

+ 2 - 0
L2J_DataPack/.gitignore → .gitignore

@@ -3,3 +3,5 @@
 /.gradle/
 .DS_Store
 *.log
+.project
+.classpath

+ 1 - 0
.settings/.gitignore

@@ -0,0 +1 @@
+/gradle.prefs

+ 0 - 0
L2J_DataPack/.settings/org.eclipse.core.resources.prefs → .settings/org.eclipse.core.resources.prefs


+ 0 - 0
L2J_DataPack/.settings/org.eclipse.core.runtime.prefs → .settings/org.eclipse.core.runtime.prefs


+ 0 - 0
L2J_DataPack/.settings/org.eclipse.jdt.core.prefs → .settings/org.eclipse.jdt.core.prefs


+ 0 - 0
L2J_DataPack/.settings/org.eclipse.jdt.ui.prefs → .settings/org.eclipse.jdt.ui.prefs


+ 0 - 0
L2J_DataPack/.settings/org.eclipse.wst.sse.core.prefs → .settings/org.eclipse.wst.sse.core.prefs


+ 0 - 0
L2J_DataPack/.settings/org.eclipse.wst.validation.prefs → .settings/org.eclipse.wst.validation.prefs


+ 0 - 11
L2J_DataPack/.classpath

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry including="**/*.java" kind="src" path="dist/game/data/scripts" />
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8" />
-	<classpathentry combineaccessrules="false" kind="src" path="/L2J_Server" />
-	<classpathentry kind="lib" path="/L2J_Server/dist/libs/mmocore.jar" />
-	<classpathentry kind="lib" path="/L2J_Server/dist/libs/mockito-all-1.9.5.jar" />
-	<classpathentry kind="lib" path="/L2J_Server/dist/libs/slf4j-api-1.7.12.jar" />
-	<classpathentry kind="lib" path="/L2J_Server/dist/libs/testng-6.9.5.jar" />
-	<classpathentry kind="output" path="bin" />
-</classpath>

+ 0 - 28
L2J_DataPack/.project

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>L2J_DataPack</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.python.pydev.PyDevBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.python.pydev.pythonNature</nature>
-	</natures>
-</projectDescription>

+ 0 - 6
L2J_DataPack/.pydevproject

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse-pydev version="1.0"?>
-<pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-</pydev_project>

+ 0 - 9
L2J_DataPack/build.gradle

@@ -1,9 +0,0 @@
-defaultTasks('zip')
-
-task zip(type: Zip) {
-	baseName = 'build/L2J_DataPack'
-	from('dist')
-}
-task wrapper(type: Wrapper) {
-	gradleVersion = '2.2.1'
-}

+ 0 - 34
L2J_DataPack/build.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="L2J_DataPack" default="zip" basedir=".">
-	<description>
-		Copyright (C) 2004-2015 L2J DataPack
-		
-		This file is part of L2J DataPack.
-		
-		L2J DataPack is free software: you can redistribute it and/or modify
-		it under the terms of the GNU General Public License as published by
-		the Free Software Foundation, either version 3 of the License, or
-		(at your option) any later version.
-		
-		L2J DataPack is distributed in the hope that it will be useful,
-		but WITHOUT ANY WARRANTY; without even the implied warranty of
-		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-		General Public License for more details.
-		
-		You should have received a copy of the GNU General Public License
-		along with this program. If not, see "http://www.gnu.org/licenses/".
-	</description>
-
-	<property name="build" location="build" />
-
-	<target name="init" description="Create the output directory.">
-		<mkdir dir="${build}" />
-	</target>
-
-	<target name="zip" depends="init">
-		<tstamp>
-			<format property="build.date" pattern="yyyy-MM-dd"/>
-		</tstamp>
-		<zip destfile="${build}/L2J_DataPack_${build.date}.zip" basedir="dist" level="9" />
-	</target>
-</project>

+ 36 - 0
build.gradle

@@ -0,0 +1,36 @@
+apply plugin: 'java'
+
+defaultTasks('zip')
+
+sourceCompatibility = JavaVersion.VERSION_1_8
+
+sourceSets {
+	mainSource {
+		java {
+			srcDir('dist/game/data/scripts')
+		}
+	}
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+	compile 'org.slf4j:slf4j-api:1.7.12'
+	compile files('../L2J_Server/dist/libs/mmocore.jar')
+	compile project(':L2J_Server')
+	testCompile 'org.mockito:mockito-all:2.0.2-beta'
+	testCompile 'org.testng:testng:6.9.6'
+}
+
+task zip(type: Zip) {
+	def fileName = 'L2J_DataPack_' + new Date().format("yyyy-MM-dd")
+	baseName = fileName
+	from('dist')
+	println 'Build in build/distributions/' + fileName + '.zip'
+}
+
+task wrapper(type: Wrapper) {
+	gradleVersion = '2.6-rc-1'
+}

+ 0 - 0
L2J_DataPack/dist/doc/L2J_DataPack_LICENSE.txt → dist/doc/L2J_DataPack_LICENSE.txt


+ 0 - 0
L2J_DataPack/dist/doc/L2J_DataPack_README.txt → dist/doc/L2J_DataPack_README.txt


+ 0 - 0
L2J_DataPack/dist/game/config/accessLevels.xml → dist/game/config/accessLevels.xml


+ 0 - 0
L2J_DataPack/dist/game/config/adminCommands.xml → dist/game/config/adminCommands.xml


+ 0 - 0
L2J_DataPack/dist/game/data/ItemAuctions.xml → dist/game/data/ItemAuctions.xml


+ 0 - 0
L2J_DataPack/dist/game/data/MerchantPriceConfig.xml → dist/game/data/MerchantPriceConfig.xml


+ 0 - 0
L2J_DataPack/dist/game/data/Routes.xml → dist/game/data/Routes.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0000007.xml → dist/game/data/buylists/0000007.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0000382.xml → dist/game/data/buylists/0000382.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0000383.xml → dist/game/data/buylists/0000383.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0000423.xml → dist/game/data/buylists/0000423.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009001.xml → dist/game/data/buylists/0009001.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009002.xml → dist/game/data/buylists/0009002.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009003.xml → dist/game/data/buylists/0009003.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009004.xml → dist/game/data/buylists/0009004.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009005.xml → dist/game/data/buylists/0009005.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009006.xml → dist/game/data/buylists/0009006.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009007.xml → dist/game/data/buylists/0009007.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009008.xml → dist/game/data/buylists/0009008.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009009.xml → dist/game/data/buylists/0009009.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009010.xml → dist/game/data/buylists/0009010.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009011.xml → dist/game/data/buylists/0009011.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009012.xml → dist/game/data/buylists/0009012.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009013.xml → dist/game/data/buylists/0009013.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009014.xml → dist/game/data/buylists/0009014.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009015.xml → dist/game/data/buylists/0009015.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009016.xml → dist/game/data/buylists/0009016.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009017.xml → dist/game/data/buylists/0009017.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009018.xml → dist/game/data/buylists/0009018.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009019.xml → dist/game/data/buylists/0009019.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009020.xml → dist/game/data/buylists/0009020.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009021.xml → dist/game/data/buylists/0009021.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009022.xml → dist/game/data/buylists/0009022.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009023.xml → dist/game/data/buylists/0009023.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009024.xml → dist/game/data/buylists/0009024.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009025.xml → dist/game/data/buylists/0009025.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009026.xml → dist/game/data/buylists/0009026.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009027.xml → dist/game/data/buylists/0009027.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009028.xml → dist/game/data/buylists/0009028.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009029.xml → dist/game/data/buylists/0009029.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009030.xml → dist/game/data/buylists/0009030.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009031.xml → dist/game/data/buylists/0009031.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009032.xml → dist/game/data/buylists/0009032.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009033.xml → dist/game/data/buylists/0009033.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009034.xml → dist/game/data/buylists/0009034.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009035.xml → dist/game/data/buylists/0009035.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009036.xml → dist/game/data/buylists/0009036.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009037.xml → dist/game/data/buylists/0009037.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009038.xml → dist/game/data/buylists/0009038.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009039.xml → dist/game/data/buylists/0009039.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009040.xml → dist/game/data/buylists/0009040.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009041.xml → dist/game/data/buylists/0009041.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009042.xml → dist/game/data/buylists/0009042.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009043.xml → dist/game/data/buylists/0009043.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009044.xml → dist/game/data/buylists/0009044.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009045.xml → dist/game/data/buylists/0009045.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009046.xml → dist/game/data/buylists/0009046.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009047.xml → dist/game/data/buylists/0009047.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009048.xml → dist/game/data/buylists/0009048.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009049.xml → dist/game/data/buylists/0009049.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009050.xml → dist/game/data/buylists/0009050.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009051.xml → dist/game/data/buylists/0009051.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009052.xml → dist/game/data/buylists/0009052.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009053.xml → dist/game/data/buylists/0009053.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009148.xml → dist/game/data/buylists/0009148.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009149.xml → dist/game/data/buylists/0009149.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009901.xml → dist/game/data/buylists/0009901.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009902.xml → dist/game/data/buylists/0009902.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009903.xml → dist/game/data/buylists/0009903.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009904.xml → dist/game/data/buylists/0009904.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009905.xml → dist/game/data/buylists/0009905.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009906.xml → dist/game/data/buylists/0009906.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009907.xml → dist/game/data/buylists/0009907.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009908.xml → dist/game/data/buylists/0009908.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009909.xml → dist/game/data/buylists/0009909.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009910.xml → dist/game/data/buylists/0009910.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009911.xml → dist/game/data/buylists/0009911.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009912.xml → dist/game/data/buylists/0009912.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009913.xml → dist/game/data/buylists/0009913.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009914.xml → dist/game/data/buylists/0009914.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009915.xml → dist/game/data/buylists/0009915.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009916.xml → dist/game/data/buylists/0009916.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009917.xml → dist/game/data/buylists/0009917.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009918.xml → dist/game/data/buylists/0009918.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009919.xml → dist/game/data/buylists/0009919.xml


+ 0 - 0
L2J_DataPack/dist/game/data/buylists/0009920.xml → dist/game/data/buylists/0009920.xml


Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor