Merge branch 'master' into standalone

SpigotCore_18/build.gradle

@@ -44,6 +44,9 @@ sourceSets {
 
 dependencies {
     implementation project(":SpigotCore_Main")
+    implementation project(":SpigotCore_14")
+
+    compileOnly files("${project.rootDir}/lib/WorldEdit-1.15.jar")
 
     compileOnly 'org.spigotmc:spigot-api:1.18-R0.1-SNAPSHOT'
     compileOnly files("${project.rootDir}/lib/Spigot-1.18.jar")

SpigotCore_18/src/de/steamwar/core/WorldEditWrapper18.java

@@ -0,0 +1,46 @@
+/*
+ *    This file is a part of the SteamWar software.
+ *
+ *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Affero General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *    GNU Affero General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Affero General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.core;
+
+import com.sk89q.jnbt.NBTInputStream;
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
+import com.sk89q.worldedit.extent.clipboard.io.MCEditSchematicReader;
+import com.sk89q.worldedit.extent.clipboard.io.SpongeSchematicReader;
+import de.steamwar.sql.NoClipboardException;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class WorldEditWrapper18 extends WorldEditWrapper14 {
+
+    @Override
+    public Clipboard getClipboard(InputStream is, boolean schemFormat) throws IOException {
+        //Use FAWE reader due to FAWE capability of reading corrupt FAWE schems
+        try {
+            if(schemFormat){
+                return new SpongeSchematicReader(new NBTInputStream(is)).read();
+            }else{
+                return new MCEditSchematicReader(new NBTInputStream(is)).read();
+            }
+        } catch (NullPointerException e) {
+            throw new NoClipboardException();
+        }
+    }
+}

SpigotCore_Main/src/SpigotCore.properties

@@ -17,10 +17,10 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-SWLISINV_NEXT_PAGE_ACTIVE = §eSeite vor
-SWLISINV_NEXT_PAGE_INACTIVE = §7Seite vor
-SWLISINV_PREVIOUS_PAGE_ACTIVE = §eSeite zurück
-SWLISINV_PREVIOUS_PAGE_INACTIVE = §7Seite zurück
+SWLISINV_NEXT_PAGE_ACTIVE = §eSeite vor
+SWLISINV_NEXT_PAGE_INACTIVE = §7Seite vor
+SWLISINV_PREVIOUS_PAGE_ACTIVE = §eSeite zurück
+SWLISINV_PREVIOUS_PAGE_INACTIVE = §7Seite zurück
 
 SCHEM_SELECTOR_TITLE={0} auswählen: {1}
 SCHEM_SELECTOR_BACK=§eZurück