Merge Master ._.
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
Dieser Commit ist enthalten in:
Ursprung
e55b0481c4
Commit
cfacfce82e
@ -23,7 +23,7 @@ import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
||||
import de.steamwar.core.Core;
|
||||
import de.steamwar.core.VersionDependent;
|
||||
import de.steamwar.sql.NoClipboardException;
|
||||
import de.steamwar.sql.Schematic;
|
||||
import de.steamwar.sql.SchematicNode;
|
||||
import de.steamwar.sql.SchematicType;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.configuration.ConfigurationSection;
|
||||
@ -88,7 +88,7 @@ public class CheckSchemType {
|
||||
return types.get(type);
|
||||
}
|
||||
|
||||
public AutoCheckResult autoCheck(Schematic schematic) {
|
||||
public AutoCheckResult autoCheck(SchematicNode schematic) {
|
||||
AutoCheckResult result = new AutoCheckResult(this);
|
||||
Clipboard clipboard;
|
||||
try {
|
||||
|
@ -64,7 +64,7 @@ public class GUI {
|
||||
if(!node.isDir()) {
|
||||
inv.setItem(0, SWItem.getMaterial("WOOD_AXE"), "§eLaden", click -> {
|
||||
player.closeInventory();
|
||||
SchematicSystem.SCHEMATIC_COMMAND.loadSchem(player, node);
|
||||
SchematicSystem.getInstance().SCHEMATIC_COMMAND.loadSchem(player, node);
|
||||
});
|
||||
}
|
||||
|
||||
@ -95,7 +95,7 @@ public class GUI {
|
||||
});
|
||||
inv.setItem(4, SWItem.getMaterial("MAGENTA_GLAZED_TERRACOTTA"), "§eDownload", click -> {
|
||||
player.closeInventory();
|
||||
SchematicSystem.SCHEMATIC_COMMAND.download(player, node);
|
||||
SchematicSystem.getInstance().SCHEMATIC_COMMAND.download(player, node);
|
||||
});
|
||||
}
|
||||
SWItem skull = SWItem.getPlayerSkull("MHF_STEVE");
|
||||
@ -163,7 +163,7 @@ public class GUI {
|
||||
|
||||
SWListInv<SchematicType> inv = new SWListInv<>(p, "Typ ändern", types, (clickType, schematicType) -> {
|
||||
p.closeInventory();
|
||||
SchematicSystem.SCHEMATIC_COMMAND.changeType(p, schem, schematicType);
|
||||
SchematicSystem.getInstance().SCHEMATIC_COMMAND.changeType(p, schem, schematicType);
|
||||
});
|
||||
inv.setCallback(-999, (ClickType click) -> p.closeInventory());
|
||||
inv.open();
|
||||
|
@ -124,7 +124,7 @@ public class SchematicCommand extends SWCommand {
|
||||
player.sendMessage("§7--==( §eSteam§8War §eSchematic-System §7)==--");
|
||||
player.sendMessage("§7Anzahl an Schematics: §e" + SchematicNode.countNodes());
|
||||
player.sendMessage("§7Von dir einsehbar: §e" + SchematicNode.getAllSchematicsAccessibleByUser(getUser(player).getId()).size());
|
||||
player.sendMessage("§7Autoren: §e" + Arrays.toString(SchematicSystem.INSTANCE.getDescription().getAuthors().toArray()));
|
||||
player.sendMessage("§7Autoren: §e" + Arrays.toString(SchematicSystem.getInstance().getDescription().getAuthors().toArray()));
|
||||
}
|
||||
|
||||
@Register("list")
|
||||
|
@ -1,60 +0,0 @@
|
||||
<?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/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>steamwar</groupId>
|
||||
<artifactId>SchematicSystem</artifactId>
|
||||
<version>1.0</version>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
<main.basedir>${project.basedir}/..</main.basedir>
|
||||
</properties>
|
||||
|
||||
<artifactId>SchematicSystem_Main</artifactId>
|
||||
<version>1.0</version>
|
||||
|
||||
<build>
|
||||
<defaultGoal>clean verify -U</defaultGoal>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-shade-plugin</artifactId>
|
||||
<version>3.2.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>shade</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
<finalName>schematicsystem</finalName>
|
||||
</build>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>steamwar</groupId>
|
||||
<artifactId>SchematicSystem_15</artifactId>
|
||||
<version>1.0</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>steamwar</groupId>
|
||||
<artifactId>SchematicSystem_8</artifactId>
|
||||
<version>1.0</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>steamwar</groupId>
|
||||
<artifactId>SchematicSystem_Core</artifactId>
|
||||
<version>1.0</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
1
pom.xml
1
pom.xml
@ -32,7 +32,6 @@
|
||||
<modules>
|
||||
<module>SchematicSystem_8</module>
|
||||
<module>SchematicSystem_15</module>
|
||||
<module>SchematicSystem_Main</module>
|
||||
<module>SchematicSystem_Core</module>
|
||||
</modules>
|
||||
|
||||
|
In neuem Issue referenzieren
Einen Benutzer sperren