13
0

Unifying naming, Changing maven build

Dieser Commit ist enthalten in:
Lixfel 2019-11-20 14:12:17 +01:00
Ursprung 6bd69fd2f6
Commit 0999ec7499
8 geänderte Dateien mit 22 neuen und 23 gelöschten Zeilen

1
.gitignore vendored
Datei anzeigen

@ -1,2 +1,3 @@
.idea
target
dependency-reduced-pom.xml

Datei anzeigen

@ -18,7 +18,7 @@ import java.util.List;
import java.util.Set;
import java.util.logging.Level;
class CheckSchemType_v12 {
class CheckSchemType_12 {
private static final int TNT = Material.TNT.getId();
private static final int SLIME = Material.SLIME_BLOCK.getId();
private static final int DISPENSER = Material.DISPENSER.getId();
@ -64,7 +64,7 @@ class CheckSchemType_v12 {
FLOWERS = flowers;
}
private CheckSchemType_v12(){}
private CheckSchemType_12(){}
static void autoCheck(Schematic schematic, List<String> errors, List<String> warnings, ICheckSchemType type) {
Clipboard clipboard;

Datei anzeigen

@ -21,7 +21,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.file.Files;
class WorldEdit_v12 {
class WorldEdit_12 {
static void saveSchematic(Player player, String name) throws IOException, EmptyClipboardException {
ClipboardHolder clipboardHolder = FaweAPI.wrapPlayer(player).getSession().getClipboard();

Datei anzeigen

@ -18,7 +18,7 @@ import java.util.List;
import java.util.Set;
import java.util.logging.Level;
class CheckSchemType_v14 {
class CheckSchemType_14 {
private static final Set<Material> INVENTORY = EnumSet.of(
Material.CHEST,
Material.TRAPPED_CHEST,
@ -50,7 +50,7 @@ class CheckSchemType_v14 {
private static final Set<Material> FLOWERS = EnumSet.of(
Material.CORNFLOWER);
private CheckSchemType_v14(){}
private CheckSchemType_14(){}
static void autoCheck(Schematic schematic, List<String> errors, List<String> warnings, ICheckSchemType type) {
Clipboard clipboard;

Datei anzeigen

@ -21,8 +21,8 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
class WorldEdit_v14 {
private WorldEdit_v14(){}
class WorldEdit_14 {
private WorldEdit_14(){}
static void saveSchematic(Player player, String name) throws IOException, EmptyClipboardException {
ClipboardHolder clipboardHolder = FaweAPI.wrapPlayer(player).getSession().getClipboard();

Datei anzeigen

@ -27,22 +27,20 @@
</resources>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
<goal>shade</goal>
</goals>
</execution>
</executions>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
</plugin>
</plugins>
<finalName>SchematicSystem</finalName>
</build>
<dependencies>

Datei anzeigen

@ -61,10 +61,10 @@ public class CheckSchemType implements ICheckSchemType {
public void autoCheck(Schematic schematic, List<String> errors, List<String> warnings) {
switch(Core.getVersion()){
case 14:
CheckSchemType_v14.autoCheck(schematic, errors, warnings, this);
CheckSchemType_14.autoCheck(schematic, errors, warnings, this);
break;
default:
CheckSchemType_v12.autoCheck(schematic, errors, warnings, this);
CheckSchemType_12.autoCheck(schematic, errors, warnings, this);
}
}

Datei anzeigen

@ -15,29 +15,29 @@ public class WorldEdit {
public static void saveSchematic(Player player, String name) throws IOException, EmptyClipboardException {
switch(Core.getVersion()){
case 14:
WorldEdit_v14.saveSchematic(player, name);
WorldEdit_14.saveSchematic(player, name);
break;
default:
WorldEdit_v12.saveSchematic(player, name);
WorldEdit_12.saveSchematic(player, name);
}
}
public static void loadClipboardToPlayer(Player player, Clipboard clipboard){
switch(Core.getVersion()){
case 14:
WorldEdit_v14.loadClipboardToPlayer(player, clipboard);
WorldEdit_14.loadClipboardToPlayer(player, clipboard);
break;
default:
WorldEdit_v12.loadClipboardToPlayer(player, clipboard);
WorldEdit_12.loadClipboardToPlayer(player, clipboard);
}
}
public static EditSession pasteSchematic(Player player, Schematic schematic){
switch(Core.getVersion()){
case 14:
return WorldEdit_v14.pasteSchematic(player, schematic);
return WorldEdit_14.pasteSchematic(player, schematic);
default:
return WorldEdit_v12.pasteSchematic(player, schematic);
return WorldEdit_12.pasteSchematic(player, schematic);
}
}
}