Unifying naming, Changing maven build
Dieser Commit ist enthalten in:
Ursprung
6bd69fd2f6
Commit
0999ec7499
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
|||||||
.idea
|
.idea
|
||||||
target
|
target
|
||||||
|
dependency-reduced-pom.xml
|
@ -18,7 +18,7 @@ import java.util.List;
|
|||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
class CheckSchemType_v12 {
|
class CheckSchemType_12 {
|
||||||
private static final int TNT = Material.TNT.getId();
|
private static final int TNT = Material.TNT.getId();
|
||||||
private static final int SLIME = Material.SLIME_BLOCK.getId();
|
private static final int SLIME = Material.SLIME_BLOCK.getId();
|
||||||
private static final int DISPENSER = Material.DISPENSER.getId();
|
private static final int DISPENSER = Material.DISPENSER.getId();
|
||||||
@ -64,7 +64,7 @@ class CheckSchemType_v12 {
|
|||||||
FLOWERS = flowers;
|
FLOWERS = flowers;
|
||||||
}
|
}
|
||||||
|
|
||||||
private CheckSchemType_v12(){}
|
private CheckSchemType_12(){}
|
||||||
|
|
||||||
static void autoCheck(Schematic schematic, List<String> errors, List<String> warnings, ICheckSchemType type) {
|
static void autoCheck(Schematic schematic, List<String> errors, List<String> warnings, ICheckSchemType type) {
|
||||||
Clipboard clipboard;
|
Clipboard clipboard;
|
@ -21,7 +21,7 @@ import java.io.FileOutputStream;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
|
|
||||||
class WorldEdit_v12 {
|
class WorldEdit_12 {
|
||||||
|
|
||||||
static void saveSchematic(Player player, String name) throws IOException, EmptyClipboardException {
|
static void saveSchematic(Player player, String name) throws IOException, EmptyClipboardException {
|
||||||
ClipboardHolder clipboardHolder = FaweAPI.wrapPlayer(player).getSession().getClipboard();
|
ClipboardHolder clipboardHolder = FaweAPI.wrapPlayer(player).getSession().getClipboard();
|
@ -18,7 +18,7 @@ import java.util.List;
|
|||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
class CheckSchemType_v14 {
|
class CheckSchemType_14 {
|
||||||
private static final Set<Material> INVENTORY = EnumSet.of(
|
private static final Set<Material> INVENTORY = EnumSet.of(
|
||||||
Material.CHEST,
|
Material.CHEST,
|
||||||
Material.TRAPPED_CHEST,
|
Material.TRAPPED_CHEST,
|
||||||
@ -50,7 +50,7 @@ class CheckSchemType_v14 {
|
|||||||
private static final Set<Material> FLOWERS = EnumSet.of(
|
private static final Set<Material> FLOWERS = EnumSet.of(
|
||||||
Material.CORNFLOWER);
|
Material.CORNFLOWER);
|
||||||
|
|
||||||
private CheckSchemType_v14(){}
|
private CheckSchemType_14(){}
|
||||||
|
|
||||||
static void autoCheck(Schematic schematic, List<String> errors, List<String> warnings, ICheckSchemType type) {
|
static void autoCheck(Schematic schematic, List<String> errors, List<String> warnings, ICheckSchemType type) {
|
||||||
Clipboard clipboard;
|
Clipboard clipboard;
|
@ -21,8 +21,8 @@ import java.io.File;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
|
|
||||||
class WorldEdit_v14 {
|
class WorldEdit_14 {
|
||||||
private WorldEdit_v14(){}
|
private WorldEdit_14(){}
|
||||||
|
|
||||||
static void saveSchematic(Player player, String name) throws IOException, EmptyClipboardException {
|
static void saveSchematic(Player player, String name) throws IOException, EmptyClipboardException {
|
||||||
ClipboardHolder clipboardHolder = FaweAPI.wrapPlayer(player).getSession().getClipboard();
|
ClipboardHolder clipboardHolder = FaweAPI.wrapPlayer(player).getSession().getClipboard();
|
@ -27,22 +27,20 @@
|
|||||||
</resources>
|
</resources>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-assembly-plugin</artifactId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-shade-plugin</artifactId>
|
||||||
|
<version>3.2.1</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<phase>package</phase>
|
<phase>package</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>single</goal>
|
<goal>shade</goal>
|
||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
<configuration>
|
|
||||||
<descriptorRefs>
|
|
||||||
<descriptorRef>jar-with-dependencies</descriptorRef>
|
|
||||||
</descriptorRefs>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
|
<finalName>SchematicSystem</finalName>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -61,10 +61,10 @@ public class CheckSchemType implements ICheckSchemType {
|
|||||||
public void autoCheck(Schematic schematic, List<String> errors, List<String> warnings) {
|
public void autoCheck(Schematic schematic, List<String> errors, List<String> warnings) {
|
||||||
switch(Core.getVersion()){
|
switch(Core.getVersion()){
|
||||||
case 14:
|
case 14:
|
||||||
CheckSchemType_v14.autoCheck(schematic, errors, warnings, this);
|
CheckSchemType_14.autoCheck(schematic, errors, warnings, this);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
CheckSchemType_v12.autoCheck(schematic, errors, warnings, this);
|
CheckSchemType_12.autoCheck(schematic, errors, warnings, this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -15,29 +15,29 @@ public class WorldEdit {
|
|||||||
public static void saveSchematic(Player player, String name) throws IOException, EmptyClipboardException {
|
public static void saveSchematic(Player player, String name) throws IOException, EmptyClipboardException {
|
||||||
switch(Core.getVersion()){
|
switch(Core.getVersion()){
|
||||||
case 14:
|
case 14:
|
||||||
WorldEdit_v14.saveSchematic(player, name);
|
WorldEdit_14.saveSchematic(player, name);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
WorldEdit_v12.saveSchematic(player, name);
|
WorldEdit_12.saveSchematic(player, name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void loadClipboardToPlayer(Player player, Clipboard clipboard){
|
public static void loadClipboardToPlayer(Player player, Clipboard clipboard){
|
||||||
switch(Core.getVersion()){
|
switch(Core.getVersion()){
|
||||||
case 14:
|
case 14:
|
||||||
WorldEdit_v14.loadClipboardToPlayer(player, clipboard);
|
WorldEdit_14.loadClipboardToPlayer(player, clipboard);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
WorldEdit_v12.loadClipboardToPlayer(player, clipboard);
|
WorldEdit_12.loadClipboardToPlayer(player, clipboard);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static EditSession pasteSchematic(Player player, Schematic schematic){
|
public static EditSession pasteSchematic(Player player, Schematic schematic){
|
||||||
switch(Core.getVersion()){
|
switch(Core.getVersion()){
|
||||||
case 14:
|
case 14:
|
||||||
return WorldEdit_v14.pasteSchematic(player, schematic);
|
return WorldEdit_14.pasteSchematic(player, schematic);
|
||||||
default:
|
default:
|
||||||
return WorldEdit_v12.pasteSchematic(player, schematic);
|
return WorldEdit_12.pasteSchematic(player, schematic);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren