Skip to content

Commit

Permalink
Overhaul
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sefiraat
Sefiraat committed Jan 10, 2022
1 parent 98c61ad commit d26cb5e
Show file tree
Hide file tree
Showing 28 changed files with 1,107 additions and 361 deletions.
24 changes: 0 additions & 24 deletions .github/workflows/package.yml
View file

This file was deleted.

1 change: 0 additions & 1 deletion .npmrc
View file

This file was deleted.

275 changes: 137 additions & 138 deletions dependency-reduced-pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,140 +1,139 @@
<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>io.github.sefiraat</groupId>
<artifactId>networks</artifactId>
<version>MODIFIED_1.0.1</version>
<build>
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
<defaultGoal>clean package</defaultGoal>
<resources>
<resource>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>**/*.*</include>
<include>tags/*.json</include>
</includes>
</resource>
</resources>
<finalName>${project.name} v${project.version}</finalName>
<plugins>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>3.3.1-SNAPSHOT</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
<configuration>
<relocations>
<relocation>
<pattern>org.bstats</pattern>
<shadedPattern>io.github.sefiraat.alone.bstats</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*</exclude>
</excludes>
</filter>
</filters>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
<repository>
<id>jeff-media-public</id>
<url>https://hub.jeff-media.com/nexus/repository/jeff-media-public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots/>
<id>snapshots</id>
<name>maven-snapshots</name>
<url>https://repository.apache.org/content/repositories/snapshots/</url>
</pluginRepository>
<pluginRepository>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots/>
<id>central</id>
<name>Maven Plugin Repository</name>
<url>https://repo1.maven.org/maven2</url>
</pluginRepository>
</pluginRepositories>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.17.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.Slimefun</groupId>
<artifactId>Slimefun4</artifactId>
<version>b8f7dc</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.20</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.github.mooy1</groupId>
<artifactId>InfinityExpansion</artifactId>
<version>90e11bc</version>
<scope>provided</scope>
</dependency>
</dependencies>
<distributionManagement>
<repository>
<id>central</id>
<name>sefi-central</name>
<url>https://sefiraat.jfrog.io/artifactory/default-maven-remote</url>
</repository>
<snapshotRepository>
<id>snapshots</id>
<name>sefi-snapshot</name>
<url>https://sefiraat.jfrog.io/artifactory/default-maven-remote</url>
</snapshotRepository>
</distributionManagement>
<properties>
<sonar.issue.ignore.multicriteria.e3.ruleKey>java:S2245</sonar.issue.ignore.multicriteria.e3.ruleKey>
<sonar.issue.ignore.multicriteria.e3.resourceKey>**</sonar.issue.ignore.multicriteria.e3.resourceKey>
<sonar.issue.ignore.multicriteria>e1,e2,e3</sonar.issue.ignore.multicriteria>
<maven.compiler.source>16</maven.compiler.source>
<sonar.issue.ignore.multicriteria.e2.ruleKey>java:S125</sonar.issue.ignore.multicriteria.e2.ruleKey>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<sonar.organization>sefiraat</sonar.organization>
<sonar.projectKey>Crystamae_Historia</sonar.projectKey>
<maven.compiler.target>16</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonar.issue.ignore.multicriteria.e1.resourceKey>**</sonar.issue.ignore.multicriteria.e1.resourceKey>
<sonar.issue.ignore.multicriteria.e2.resourceKey>**</sonar.issue.ignore.multicriteria.e2.resourceKey>
<sonar.issue.ignore.multicriteria.e1.ruleKey>java:S6212</sonar.issue.ignore.multicriteria.e1.ruleKey>
</properties>
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>io.github.sefiraat</groupId>
<artifactId>networks</artifactId>
<version>MODIFIED_1.0.2</version>
<build>
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
<defaultGoal>clean package</defaultGoal>
<resources>
<resource>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>**/*.*</include>
<include>tags/*.json</include>
</includes>
</resource>
</resources>
<finalName>${project.name} v${project.version}</finalName>
<plugins>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>3.3.1-SNAPSHOT</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
<configuration>
<relocations>
<relocation>
<pattern>org.bstats</pattern>
<shadedPattern>io.github.sefiraat.alone.bstats</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*</exclude>
</excludes>
</filter>
</filters>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
<repository>
<id>jeff-media-public</id>
<url>https://hub.jeff-media.com/nexus/repository/jeff-media-public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots />
<id>snapshots</id>
<name>maven-snapshots</name>
<url>https://repository.apache.org/content/repositories/snapshots/</url>
</pluginRepository>
<pluginRepository>
<releases>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots />
<id>central</id>
<name>Maven Plugin Repository</name>
<url>https://repo1.maven.org/maven2</url>
</pluginRepository>
</pluginRepositories>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.17.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.Slimefun</groupId>
<artifactId>Slimefun4</artifactId>
<version>b8f7dc</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.20</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.github.mooy1</groupId>
<artifactId>InfinityExpansion</artifactId>
<version>90e11bc</version>
<scope>provided</scope>
</dependency>
</dependencies>
<distributionManagement>
<repository>
<id>central</id>
<name>sefi-central</name>
<url>https://sefiraat.jfrog.io/artifactory/default-maven-local</url>
</repository>
<snapshotRepository>
<id>snapshots</id>
<name>sefi-snapshot</name>
<url>https://sefiraat.jfrog.io/artifactory/default-maven-local</url>
</snapshotRepository>
</distributionManagement>
<properties>
<sonar.issue.ignore.multicriteria.e3.ruleKey>java:S2245</sonar.issue.ignore.multicriteria.e3.ruleKey>
<sonar.issue.ignore.multicriteria.e3.resourceKey>**</sonar.issue.ignore.multicriteria.e3.resourceKey>
<sonar.issue.ignore.multicriteria>e1,e2,e3</sonar.issue.ignore.multicriteria>
<maven.compiler.source>16</maven.compiler.source>
<sonar.issue.ignore.multicriteria.e2.ruleKey>java:S125</sonar.issue.ignore.multicriteria.e2.ruleKey>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<sonar.organization>sefiraat</sonar.organization>
<sonar.projectKey>Crystamae_Historia</sonar.projectKey>
<maven.compiler.target>16</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonar.issue.ignore.multicriteria.e1.resourceKey>**</sonar.issue.ignore.multicriteria.e1.resourceKey>
<sonar.issue.ignore.multicriteria.e2.resourceKey>**</sonar.issue.ignore.multicriteria.e2.resourceKey>
<sonar.issue.ignore.multicriteria.e1.ruleKey>java:S6212</sonar.issue.ignore.multicriteria.e1.ruleKey>
</properties>
</project>
6 changes: 3 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.github.sefiraat</groupId>
<artifactId>networks</artifactId>
<version>MODIFIED_1.0.1</version>
<version>MODIFIED_1.0.2</version>

<distributionManagement>
<repository>
<id>central</id>
<name>sefi-central</name>
<url>https://sefiraat.jfrog.io/artifactory/default-maven-remote</url>
<url>https://sefiraat.jfrog.io/artifactory/default-maven-local</url>
</repository>
<snapshotRepository>
<id>snapshots</id>
<name>sefi-snapshot</name>
<url>https://sefiraat.jfrog.io/artifactory/default-maven-remote</url>
<url>https://sefiraat.jfrog.io/artifactory/default-maven-local</url>
</snapshotRepository>
</distributionManagement>

Expand Down
22 changes: 20 additions & 2 deletions src/main/java/io/github/sefiraat/networks/NetworkStorage.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.github.sefiraat.networks;

import io.github.sefiraat.networks.network.NetworkNode;
import io.github.sefiraat.networks.network.NodeDefinition;
import lombok.experimental.UtilityClass;
import org.bukkit.Location;
Expand All @@ -10,10 +11,27 @@
@UtilityClass
public class NetworkStorage {

protected static final Map<Location, NodeDefinition> ALL_NETWORK_OBJECTS = new HashMap<>();
private static final Map<Location, NodeDefinition> ALL_NETWORK_OBJECTS = new HashMap<>();

public static void removeNode(Location location) {
final NodeDefinition nodeDefinition = ALL_NETWORK_OBJECTS.remove(location);

if (nodeDefinition == null) {
return;
}

final NetworkNode node = nodeDefinition.getNode();

if (node == null) {
return;
}

for (NetworkNode childNode : nodeDefinition.getNode().getChildrenNodes()) {
removeNode(childNode.getNodePosition());
}
}

public static Map<Location, NodeDefinition> getAllNetworkObjects() {
return ALL_NETWORK_OBJECTS;
}

}
1 change: 0 additions & 1 deletion src/main/java/io/github/sefiraat/networks/managers/ListenerManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ public ListenerManager() {
private void addListener(Listener listener) {
Networks.getPluginManager().registerEvents(listener, Networks.getInstance());
}

}
Loading

0 comments on commit d26cb5e

Please sign in to comment.