Skip to content

Commit 1ef2f8f

Browse files
MultitallentedMultitallented
committed
Refactored the crap out of this spaghetti
1 parent 10fe579 commit 1ef2f8f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+7829
-7051
lines changed

‎.gitignore

+120
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
*.iml
2+
/dependency-reduced-pom.xml
3+
.idea
4+
target
5+
6+
### macOS template
7+
# General
8+
.DS_Store
9+
.AppleDouble
10+
.LSOverride
11+
12+
# Icon must end with two \r
13+
Icon
14+
15+
# Thumbnails
16+
._*
17+
18+
# Files that might appear in the root of a volume
19+
.DocumentRevisions-V100
20+
.fseventsd
21+
.Spotlight-V100
22+
.TemporaryItems
23+
.Trashes
24+
.VolumeIcon.icns
25+
.com.apple.timemachine.donotpresent
26+
27+
# Directories potentially created on remote AFP share
28+
.AppleDB
29+
.AppleDesktop
30+
Network Trash Folder
31+
Temporary Items
32+
.apdisk
33+
34+
### Java template
35+
# Compiled class file
36+
*.class
37+
38+
# Log file
39+
*.log
40+
41+
# BlueJ files
42+
*.ctxt
43+
44+
# Mobile Tools for Java (J2ME)
45+
.mtj.tmp/
46+
47+
# Package Files #
48+
*.jar
49+
*.war
50+
*.nar
51+
*.ear
52+
*.zip
53+
*.tar.gz
54+
*.rar
55+
56+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
57+
hs_err_pid*
58+
59+
### Eclipse template
60+
.metadata
61+
bin/
62+
tmp/
63+
*.tmp
64+
*.bak
65+
*.swp
66+
*~.nib
67+
local.properties
68+
.settings/
69+
.loadpath
70+
.recommenders
71+
72+
# External tool builders
73+
.externalToolBuilders/
74+
75+
# Locally stored "Eclipse launch configurations"
76+
*.launch
77+
78+
# PyDev specific (Python IDE for Eclipse)
79+
*.pydevproject
80+
81+
# CDT-specific (C/C++ Development Tooling)
82+
.cproject
83+
84+
# CDT- autotools
85+
.autotools
86+
87+
# Java annotation processor (APT)
88+
.factorypath
89+
90+
# PDT-specific (PHP Development Tools)
91+
.buildpath
92+
93+
# sbteclipse plugin
94+
.target
95+
96+
# Tern plugin
97+
.tern-project
98+
99+
# TeXlipse plugin
100+
.texlipse
101+
102+
# STS (Spring Tool Suite)
103+
.springBeans
104+
105+
# Code Recommenders
106+
.recommenders/
107+
108+
# Annotation Processing
109+
.apt_generated/
110+
.apt_generated_test/
111+
112+
# Scala IDE specific (Scala & Java development for Eclipse)
113+
.cache-main
114+
.scala_dependencies
115+
.worksheet
116+
117+
# Uncomment this line if you wish to ignore the project description file.
118+
# Typically, this file would be tracked if it contains build/dependency configurations:
119+
#.project
120+

‎.idea/encodings.xml

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml

-13
This file was deleted.

‎.idea/libraries/Maven__junit_junit_4_10.xml

-13
This file was deleted.

‎.idea/libraries/Maven__org_bukkit_bukkit_1_13_1_R0_1_SNAPSHOT.xml

-13
This file was deleted.

‎.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml

-13
This file was deleted.

‎.idea/libraries/Maven__org_spigotmc_spigot_api_1_14_2_R0_1_SNAPSHOT.xml

-13
This file was deleted.

‎.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎DynamicShop.iml

+11-5
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,24 @@
3030
<SOURCES />
3131
</library>
3232
</orderEntry>
33-
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.14.2-R0.1-SNAPSHOT" level="project" />
33+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT" level="project" />
3434
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
3535
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
3636
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
3737
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.13-SNAPSHOT" level="project" />
3838
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
3939
<orderEntry type="library" scope="PROVIDED" name="Maven: net.milkbowl.vault:VaultAPI:1.7" level="project" />
40-
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.13.1-R0.1-SNAPSHOT" level="project" />
41-
<orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
42-
<orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
43-
<orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
4440
<orderEntry type="library" name="Maven: org.bstats:bstats-bukkit:1.4" level="project" />
4541
<orderEntry type="library" scope="PROVIDED" name="Maven: me.clip:placeholderapi:2.9.2" level="project" />
42+
<orderEntry type="module-library">
43+
<library name="Maven: com.gamingmesh.jobs:Jobs:4.15.7">
44+
<CLASSES>
45+
<root url="jar://$MODULE_DIR$/../dependencies/Jobs.jar!/" />
46+
</CLASSES>
47+
<JAVADOC />
48+
<SOURCES />
49+
</library>
50+
</orderEntry>
51+
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.6" level="project" />
4652
</component>
4753
</module>

‎dependency-reduced-pom.xml

+10-9
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
</build>
6363
<repositories>
6464
<repository>
65-
<id>spigotmc-repo</id>
66-
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
65+
<id>spigot-repo</id>
66+
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
6767
</repository>
6868
<repository>
6969
<id>sonatype</id>
@@ -86,7 +86,7 @@
8686
<dependency>
8787
<groupId>org.spigotmc</groupId>
8888
<artifactId>spigot-api</artifactId>
89-
<version>1.14.2-R0.1-SNAPSHOT</version>
89+
<version>1.14.4-R0.1-SNAPSHOT</version>
9090
<scope>provided</scope>
9191
<exclusions>
9292
<exclusion>
@@ -116,19 +116,20 @@
116116
<artifactId>VaultAPI</artifactId>
117117
<version>1.7</version>
118118
<scope>provided</scope>
119-
<exclusions>
120-
<exclusion>
121-
<artifactId>bukkit</artifactId>
122-
<groupId>org.bukkit</groupId>
123-
</exclusion>
124-
</exclusions>
125119
</dependency>
126120
<dependency>
127121
<groupId>me.clip</groupId>
128122
<artifactId>placeholderapi</artifactId>
129123
<version>2.9.2</version>
130124
<scope>provided</scope>
131125
</dependency>
126+
<dependency>
127+
<groupId>com.gamingmesh.jobs</groupId>
128+
<artifactId>Jobs</artifactId>
129+
<version>4.15.7</version>
130+
<scope>system</scope>
131+
<systemPath>${basedir}/../dependencies/Jobs.jar</systemPath>
132+
</dependency>
132133
</dependencies>
133134
<properties>
134135
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

‎pom.xml

+16-3
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878

7979
<repositories>
8080
<repository>
81-
<id>spigotmc-repo</id>
82-
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
81+
<id>spigot-repo</id>
82+
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
8383
</repository>
8484
<repository>
8585
<id>sonatype</id>
@@ -103,7 +103,7 @@
103103
<dependency>
104104
<groupId>org.spigotmc</groupId>
105105
<artifactId>spigot-api</artifactId>
106-
<version>1.14.2-R0.1-SNAPSHOT</version>
106+
<version>1.14.4-R0.1-SNAPSHOT</version>
107107
<scope>provided</scope>
108108
</dependency>
109109
<dependency>
@@ -124,5 +124,18 @@
124124
<version>2.9.2</version>
125125
<scope>provided</scope>
126126
</dependency>
127+
128+
<dependency>
129+
<groupId>com.gamingmesh.jobs</groupId>
130+
<artifactId>Jobs</artifactId>
131+
<scope>system</scope>
132+
<systemPath>${basedir}/../dependencies/Jobs.jar</systemPath>
133+
<version>4.15.7</version>
134+
</dependency>
135+
<dependency>
136+
<groupId>org.projectlombok</groupId>
137+
<artifactId>lombok</artifactId>
138+
<version>1.18.6</version>
139+
</dependency>
127140
</dependencies>
128141
</project>

0 commit comments

Comments
 (0)