13
0

Versionssupport für 1.8, 1.9 und 1.10 #35

Zusammengeführt
Lixfel hat 10 Commits von OldVersionSupport nach master 2019-12-22 17:25:07 +01:00 zusammengeführt
7 geänderte Dateien mit 35 neuen und 17 gelöschten Zeilen
Nur Änderungen aus Commit be8e2e4f90 werden angezeigt - Alle Commits anzeigen

Datei anzeigen

@ -4,7 +4,7 @@
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>
<artifactId>SchematicSystem_14</artifactId>
<artifactId>SchematicSystem_15</artifactId>
<version>1.0</version>
<parent>
@ -35,7 +35,7 @@
<dependency>
<groupId>steamwar</groupId>
<artifactId>Spigot</artifactId>
<version>1.14</version>
<version>1.15</version>
<scope>provided</scope>
</dependency>
<dependency>

Datei anzeigen

@ -16,7 +16,7 @@ import java.util.List;
import java.util.Set;
import java.util.logging.Level;
class CheckSchemType_14 {
class CheckSchemType_15 {
private static final Set<Material> INVENTORY = EnumSet.of(
Material.CHEST,
Material.TRAPPED_CHEST,
@ -42,13 +42,31 @@ class CheckSchemType_14 {
Material.LIME_SHULKER_BOX,
Material.MAGENTA_SHULKER_BOX,
Material.PINK_SHULKER_BOX,
Material.PURPLE_SHULKER_BOX);
//TODO: New Inventory Items
//TODO: Adding flowers
private static final Set<Material> FLOWERS = EnumSet.of(
Material.CORNFLOWER);
Material.PURPLE_SHULKER_BOX,
Material.LECTERN,
Material.BEACON,
Material.BARREL);
private CheckSchemType_14(){}
private static final Set<Material> FLOWERS = EnumSet.of(
Material.CORNFLOWER,
Material.FERN,
Material.DANDELION,
Material.POPPY,
Material.BLUE_ORCHID,
Material.ALLIUM,
Material.AZURE_BLUET,
Material.RED_TULIP,
Material.ORANGE_TULIP,
Material.WHITE_TULIP,
Material.PINK_TULIP,
Material.OXEYE_DAISY,
Material.CORNFLOWER,
Material.LILY_OF_THE_VALLEY,
Material.WITHER_ROSE,
Material.BROWN_MUSHROOM,
Material.RED_MUSHROOM);
private CheckSchemType_15(){}
static void autoCheck(Schematic schematic, List<String> errors, List<String> warnings, ICheckSchemType type) {
Clipboard clipboard;

Datei anzeigen

@ -16,8 +16,8 @@ import org.bukkit.entity.Player;
import java.io.IOException;
class WorldEdit_14 {
private WorldEdit_14(){}
class WorldEdit_15 {
private WorldEdit_15(){}
static EditSession pasteSchematic(Player player, Schematic schematic) throws Schematic.WrongVersionException, IOException, NoClipboardException {
World weWorld = new BukkitWorld(player.getWorld());

Datei anzeigen

@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>steamwar</groupId>
<artifactId>SchematicSystem_14</artifactId>
<artifactId>SchematicSystem_15</artifactId>
<version>1.0</version>
<scope>compile</scope>
</dependency>

Datei anzeigen

@ -60,8 +60,8 @@ public class CheckSchemType implements ICheckSchemType {
public void autoCheck(Schematic schematic, List<String> errors, List<String> warnings) {
switch(Core.getVersion()){
case 14:
CheckSchemType_14.autoCheck(schematic, errors, warnings, this);
case 15:
CheckSchemType_15.autoCheck(schematic, errors, warnings, this);
break;
default:
CheckSchemType_12.autoCheck(schematic, errors, warnings, this);

Datei anzeigen

@ -13,8 +13,8 @@ public class WorldEdit {
public static EditSession pasteSchematic(Player player, Schematic schematic) throws Schematic.WrongVersionException, IOException, NoClipboardException {
switch(Core.getVersion()){
case 14:
return WorldEdit_14.pasteSchematic(player, schematic);
case 15:
return WorldEdit_15.pasteSchematic(player, schematic);
default:
return WorldEdit_12.pasteSchematic(player, schematic);
}

Datei anzeigen

@ -37,7 +37,7 @@
<modules>
<module>SchematicSystem_12</module>
<module>SchematicSystem_14</module>
<module>SchematicSystem_15</module>
<module>SchematicSystem_API</module>
<module>SchematicSystem_Main</module>
</modules>