Skip to content

Commit d26cb5e

Browse files
SefiraatSefiraat
committed
Overhaul
1 parent 98c61ad commit d26cb5e

28 files changed

+1107
-361
lines changed

‎.github/workflows/package.yml‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎.npmrc‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎dependency-reduced-pom.xml‎

Lines changed: 137 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -1,140 +1,139 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
5-
<groupId>io.github.sefiraat</groupId>
6-
<artifactId>networks</artifactId>
7-
<version>MODIFIED_1.0.1</version>
8-
<build>
9-
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
10-
<defaultGoal>clean package</defaultGoal>
11-
<resources>
12-
<resource>
13-
<filtering>true</filtering>
14-
<directory>${basedir}/src/main/resources</directory>
15-
<includes>
16-
<include>**/*.*</include>
17-
<include>tags/*.json</include>
18-
</includes>
19-
</resource>
20-
</resources>
21-
<finalName>${project.name} v${project.version}</finalName>
22-
<plugins>
23-
<plugin>
24-
<artifactId>maven-shade-plugin</artifactId>
25-
<version>3.3.1-SNAPSHOT</version>
26-
<executions>
27-
<execution>
28-
<phase>package</phase>
29-
<goals>
30-
<goal>shade</goal>
31-
</goals>
32-
</execution>
33-
</executions>
34-
<configuration>
35-
<relocations>
36-
<relocation>
37-
<pattern>org.bstats</pattern>
38-
<shadedPattern>io.github.sefiraat.alone.bstats</shadedPattern>
39-
</relocation>
40-
</relocations>
41-
<filters>
42-
<filter>
43-
<artifact>*:*</artifact>
44-
<excludes>
45-
<exclude>META-INF/*</exclude>
46-
</excludes>
47-
</filter>
48-
</filters>
49-
</configuration>
50-
</plugin>
51-
</plugins>
52-
</build>
53-
<repositories>
54-
<repository>
55-
<id>spigot-repo</id>
56-
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
57-
</repository>
58-
<repository>
59-
<id>jitpack.io</id>
60-
<url>https://jitpack.io</url>
61-
</repository>
62-
<repository>
63-
<id>jeff-media-public</id>
64-
<url>https://hub.jeff-media.com/nexus/repository/jeff-media-public/</url>
65-
</repository>
66-
</repositories>
67-
<pluginRepositories>
68-
<pluginRepository>
69-
<releases>
70-
<updatePolicy>never</updatePolicy>
71-
</releases>
72-
<snapshots/>
73-
<id>snapshots</id>
74-
<name>maven-snapshots</name>
75-
<url>https://repository.apache.org/content/repositories/snapshots/</url>
76-
</pluginRepository>
77-
<pluginRepository>
78-
<releases>
79-
<updatePolicy>never</updatePolicy>
80-
</releases>
81-
<snapshots/>
82-
<id>central</id>
83-
<name>Maven Plugin Repository</name>
84-
<url>https://repo1.maven.org/maven2</url>
85-
</pluginRepository>
86-
</pluginRepositories>
87-
<dependencies>
88-
<dependency>
89-
<groupId>org.spigotmc</groupId>
90-
<artifactId>spigot-api</artifactId>
91-
<version>1.17.1-R0.1-SNAPSHOT</version>
92-
<scope>provided</scope>
93-
</dependency>
94-
<dependency>
95-
<groupId>com.github.Slimefun</groupId>
96-
<artifactId>Slimefun4</artifactId>
97-
<version>b8f7dc</version>
98-
<scope>provided</scope>
99-
</dependency>
100-
<dependency>
101-
<groupId>org.projectlombok</groupId>
102-
<artifactId>lombok</artifactId>
103-
<version>1.18.20</version>
104-
<scope>provided</scope>
105-
</dependency>
106-
<dependency>
107-
<groupId>io.github.mooy1</groupId>
108-
<artifactId>InfinityExpansion</artifactId>
109-
<version>90e11bc</version>
110-
<scope>provided</scope>
111-
</dependency>
112-
</dependencies>
113-
<distributionManagement>
114-
<repository>
115-
<id>central</id>
116-
<name>sefi-central</name>
117-
<url>https://sefiraat.jfrog.io/artifactory/default-maven-remote</url>
118-
</repository>
119-
<snapshotRepository>
120-
<id>snapshots</id>
121-
<name>sefi-snapshot</name>
122-
<url>https://sefiraat.jfrog.io/artifactory/default-maven-remote</url>
123-
</snapshotRepository>
124-
</distributionManagement>
125-
<properties>
126-
<sonar.issue.ignore.multicriteria.e3.ruleKey>java:S2245</sonar.issue.ignore.multicriteria.e3.ruleKey>
127-
<sonar.issue.ignore.multicriteria.e3.resourceKey>**</sonar.issue.ignore.multicriteria.e3.resourceKey>
128-
<sonar.issue.ignore.multicriteria>e1,e2,e3</sonar.issue.ignore.multicriteria>
129-
<maven.compiler.source>16</maven.compiler.source>
130-
<sonar.issue.ignore.multicriteria.e2.ruleKey>java:S125</sonar.issue.ignore.multicriteria.e2.ruleKey>
131-
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
132-
<sonar.organization>sefiraat</sonar.organization>
133-
<sonar.projectKey>Crystamae_Historia</sonar.projectKey>
134-
<maven.compiler.target>16</maven.compiler.target>
135-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
136-
<sonar.issue.ignore.multicriteria.e1.resourceKey>**</sonar.issue.ignore.multicriteria.e1.resourceKey>
137-
<sonar.issue.ignore.multicriteria.e2.resourceKey>**</sonar.issue.ignore.multicriteria.e2.resourceKey>
138-
<sonar.issue.ignore.multicriteria.e1.ruleKey>java:S6212</sonar.issue.ignore.multicriteria.e1.ruleKey>
139-
</properties>
2+
<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/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>io.github.sefiraat</groupId>
5+
<artifactId>networks</artifactId>
6+
<version>MODIFIED_1.0.2</version>
7+
<build>
8+
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
9+
<defaultGoal>clean package</defaultGoal>
10+
<resources>
11+
<resource>
12+
<filtering>true</filtering>
13+
<directory>${basedir}/src/main/resources</directory>
14+
<includes>
15+
<include>**/*.*</include>
16+
<include>tags/*.json</include>
17+
</includes>
18+
</resource>
19+
</resources>
20+
<finalName>${project.name} v${project.version}</finalName>
21+
<plugins>
22+
<plugin>
23+
<artifactId>maven-shade-plugin</artifactId>
24+
<version>3.3.1-SNAPSHOT</version>
25+
<executions>
26+
<execution>
27+
<phase>package</phase>
28+
<goals>
29+
<goal>shade</goal>
30+
</goals>
31+
</execution>
32+
</executions>
33+
<configuration>
34+
<relocations>
35+
<relocation>
36+
<pattern>org.bstats</pattern>
37+
<shadedPattern>io.github.sefiraat.alone.bstats</shadedPattern>
38+
</relocation>
39+
</relocations>
40+
<filters>
41+
<filter>
42+
<artifact>*:*</artifact>
43+
<excludes>
44+
<exclude>META-INF/*</exclude>
45+
</excludes>
46+
</filter>
47+
</filters>
48+
</configuration>
49+
</plugin>
50+
</plugins>
51+
</build>
52+
<repositories>
53+
<repository>
54+
<id>spigot-repo</id>
55+
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
56+
</repository>
57+
<repository>
58+
<id>jitpack.io</id>
59+
<url>https://jitpack.io</url>
60+
</repository>
61+
<repository>
62+
<id>jeff-media-public</id>
63+
<url>https://hub.jeff-media.com/nexus/repository/jeff-media-public/</url>
64+
</repository>
65+
</repositories>
66+
<pluginRepositories>
67+
<pluginRepository>
68+
<releases>
69+
<updatePolicy>never</updatePolicy>
70+
</releases>
71+
<snapshots />
72+
<id>snapshots</id>
73+
<name>maven-snapshots</name>
74+
<url>https://repository.apache.org/content/repositories/snapshots/</url>
75+
</pluginRepository>
76+
<pluginRepository>
77+
<releases>
78+
<updatePolicy>never</updatePolicy>
79+
</releases>
80+
<snapshots />
81+
<id>central</id>
82+
<name>Maven Plugin Repository</name>
83+
<url>https://repo1.maven.org/maven2</url>
84+
</pluginRepository>
85+
</pluginRepositories>
86+
<dependencies>
87+
<dependency>
88+
<groupId>org.spigotmc</groupId>
89+
<artifactId>spigot-api</artifactId>
90+
<version>1.17.1-R0.1-SNAPSHOT</version>
91+
<scope>provided</scope>
92+
</dependency>
93+
<dependency>
94+
<groupId>com.github.Slimefun</groupId>
95+
<artifactId>Slimefun4</artifactId>
96+
<version>b8f7dc</version>
97+
<scope>provided</scope>
98+
</dependency>
99+
<dependency>
100+
<groupId>org.projectlombok</groupId>
101+
<artifactId>lombok</artifactId>
102+
<version>1.18.20</version>
103+
<scope>provided</scope>
104+
</dependency>
105+
<dependency>
106+
<groupId>io.github.mooy1</groupId>
107+
<artifactId>InfinityExpansion</artifactId>
108+
<version>90e11bc</version>
109+
<scope>provided</scope>
110+
</dependency>
111+
</dependencies>
112+
<distributionManagement>
113+
<repository>
114+
<id>central</id>
115+
<name>sefi-central</name>
116+
<url>https://sefiraat.jfrog.io/artifactory/default-maven-local</url>
117+
</repository>
118+
<snapshotRepository>
119+
<id>snapshots</id>
120+
<name>sefi-snapshot</name>
121+
<url>https://sefiraat.jfrog.io/artifactory/default-maven-local</url>
122+
</snapshotRepository>
123+
</distributionManagement>
124+
<properties>
125+
<sonar.issue.ignore.multicriteria.e3.ruleKey>java:S2245</sonar.issue.ignore.multicriteria.e3.ruleKey>
126+
<sonar.issue.ignore.multicriteria.e3.resourceKey>**</sonar.issue.ignore.multicriteria.e3.resourceKey>
127+
<sonar.issue.ignore.multicriteria>e1,e2,e3</sonar.issue.ignore.multicriteria>
128+
<maven.compiler.source>16</maven.compiler.source>
129+
<sonar.issue.ignore.multicriteria.e2.ruleKey>java:S125</sonar.issue.ignore.multicriteria.e2.ruleKey>
130+
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
131+
<sonar.organization>sefiraat</sonar.organization>
132+
<sonar.projectKey>Crystamae_Historia</sonar.projectKey>
133+
<maven.compiler.target>16</maven.compiler.target>
134+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
135+
<sonar.issue.ignore.multicriteria.e1.resourceKey>**</sonar.issue.ignore.multicriteria.e1.resourceKey>
136+
<sonar.issue.ignore.multicriteria.e2.resourceKey>**</sonar.issue.ignore.multicriteria.e2.resourceKey>
137+
<sonar.issue.ignore.multicriteria.e1.ruleKey>java:S6212</sonar.issue.ignore.multicriteria.e1.ruleKey>
138+
</properties>
140139
</project>

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>io.github.sefiraat</groupId>
88
<artifactId>networks</artifactId>
9-
<version>MODIFIED_1.0.1</version>
9+
<version>MODIFIED_1.0.2</version>
1010

1111
<distributionManagement>
1212
<repository>
1313
<id>central</id>
1414
<name>sefi-central</name>
15-
<url>https://sefiraat.jfrog.io/artifactory/default-maven-remote</url>
15+
<url>https://sefiraat.jfrog.io/artifactory/default-maven-local</url>
1616
</repository>
1717
<snapshotRepository>
1818
<id>snapshots</id>
1919
<name>sefi-snapshot</name>
20-
<url>https://sefiraat.jfrog.io/artifactory/default-maven-remote</url>
20+
<url>https://sefiraat.jfrog.io/artifactory/default-maven-local</url>
2121
</snapshotRepository>
2222
</distributionManagement>
2323

‎src/main/java/io/github/sefiraat/networks/NetworkStorage.java‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.github.sefiraat.networks;
22

3+
import io.github.sefiraat.networks.network.NetworkNode;
34
import io.github.sefiraat.networks.network.NodeDefinition;
45
import lombok.experimental.UtilityClass;
56
import org.bukkit.Location;
@@ -10,10 +11,27 @@
1011
@UtilityClass
1112
public class NetworkStorage {
1213

13-
protected static final Map<Location, NodeDefinition> ALL_NETWORK_OBJECTS = new HashMap<>();
14+
private static final Map<Location, NodeDefinition> ALL_NETWORK_OBJECTS = new HashMap<>();
15+
16+
public static void removeNode(Location location) {
17+
final NodeDefinition nodeDefinition = ALL_NETWORK_OBJECTS.remove(location);
18+
19+
if (nodeDefinition == null) {
20+
return;
21+
}
22+
23+
final NetworkNode node = nodeDefinition.getNode();
24+
25+
if (node == null) {
26+
return;
27+
}
28+
29+
for (NetworkNode childNode : nodeDefinition.getNode().getChildrenNodes()) {
30+
removeNode(childNode.getNodePosition());
31+
}
32+
}
1433

1534
public static Map<Location, NodeDefinition> getAllNetworkObjects() {
1635
return ALL_NETWORK_OBJECTS;
1736
}
18-
1937
}

‎src/main/java/io/github/sefiraat/networks/managers/ListenerManager.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@ public ListenerManager() {
1313
private void addListener(Listener listener) {
1414
Networks.getPluginManager().registerEvents(listener, Networks.getInstance());
1515
}
16-
1716
}

0 commit comments

Comments
 (0)