Move some things around

BauSystem_Base/build.gradle

@@ -17,25 +17,36 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.features.world;
+plugins {
+    id 'base'
+    id 'java'
+}
 
-import de.steamwar.linkage.Linked;
-import org.bukkit.ChatColor;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.SignChangeEvent;
+apply from: '../module.gradle'
 
-@Linked
-public class SignListener implements Listener {
+group 'steamwar'
+version '1.0'
 
-    @EventHandler
-    public void onSignChange(SignChangeEvent event) {
-        for (int i = 0; i <= 3; ++i) {
-            String line = event.getLine(i);
-            if (line == null)
-                continue;
-            line = ChatColor.translateAlternateColorCodes('&', line);
-            event.setLine(i, line);
+compileJava.options.encoding = 'UTF-8'
+
+sourceCompatibility = 17
+targetCompatibility = 17
+
+sourceSets {
+    main {
+        java {
+            srcDirs = ['src/', 'build/generated/sources/annotationProcessor/java/main/']
+        }
+        resources {
+            srcDirs = ['src/']
+            exclude '**/*.java', '**/*.kt'
         }
     }
 }
+
+dependencies {
+    implementation project(":BauSystem_PluginBase")
+
+    compileOnly libraries.base
+    annotationProcessor libraries.base
+}

BauSystem_Base/src/de/steamwar/bausystem/bauinfo/BauInfoBauGuiItem.java

@@ -1,23 +1,23 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   Copyright (C) 2024  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 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.
+ *   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/>.
+ *   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.bausystem.features.bau;
+package de.steamwar.bausystem.bauinfo;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
@@ -38,7 +38,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Linked
-public class BauInfoBauGuiItem extends BauGuiItem {
+public class beBauInfoBauGuiItem extends BauGuiItem {
 
     public BauInfoBauGuiItem() {
         super(7);

BauSystem_Base/src/de/steamwar/bausystem/bauinfo/InfoCommand.java

@@ -1,4 +1,23 @@
-package de.steamwar.bausystem.features.bau;
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.bausystem.bauinfo;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;

BauSystem_BuilderUtilities/src/de/steamwar/bausystem/itemframe/ItemFrameListener.java

@@ -1,23 +1,23 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   Copyright (C) 2024  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 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.
+ *   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/>.
+ *   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.bausystem.features.world;
+package de.steamwar.bausystem.itemframe;
 
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;

BauSystem_BuilderUtilities/src/de/steamwar/bausystem/material/MaterialCommand.java

@@ -1,23 +1,23 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   Copyright (C) 2024  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 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.
+ *   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/>.
+ *   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.bausystem.features.util;
+package de.steamwar.bausystem.material;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.SWUtils;

BauSystem_BuilderUtilities/src/de/steamwar/bausystem/material/MaterialLazyInit.java

@@ -1,23 +1,23 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   Copyright (C) 2024  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 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.
+ *   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/>.
+ *   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.bausystem.features.util;
+package de.steamwar.bausystem.material;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.inventory.SWItem;

BauSystem_BuilderUtilities/src/de/steamwar/bausystem/signeditor/SignEditFrom20.java

@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   Copyright (C) 2024  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
@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.features.world;
+package de.steamwar.bausystem.signeditor;
 
 import com.comphenix.tinyprotocol.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;

BauSystem_BuilderUtilities/src/de/steamwar/bausystem/signeditor/SignEditUntil19.java

@@ -1,23 +1,23 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   Copyright (C) 2024  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 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.
+ *   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/>.
+ *   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.bausystem.features.world;
+package de.steamwar.bausystem.signeditor;
 
 import com.comphenix.tinyprotocol.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;

BauSystem_BuilderUtilities/src/de/steamwar/bausystem/signeditor/SignListener.java

@@ -0,0 +1,41 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.bausystem.signeditor;
+
+import de.steamwar.linkage.Linked;
+import org.bukkit.ChatColor;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.SignChangeEvent;
+
+@Linked
+public class SignListener implements Listener {
+
+    @EventHandler
+    public void onSignChange(SignChangeEvent event) {
+        for (int i = 0; i <= 3; ++i) {
+            String line = event.getLine(i);
+            if (line == null)
+                continue;
+            line = ChatColor.translateAlternateColorCodes('&', line);
+            event.setLine(i, line);
+        }
+    }
+}

BauSystem_PluginBase/src/de/steamwar/bausystem/Permission.java

@@ -25,6 +25,7 @@ import de.steamwar.sql.BauweltMember;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.entity.Player;
 
+@FunctionalInterface
 public interface Permission {
 
     Permission OWNER = PermissionSystem.impl::isOwner;

BauSystem_PluginBase/src/de/steamwar/bausystem/region/Flag.java

@@ -36,7 +36,7 @@ public enum Flag {
     ITEMS(ItemMode.class, ItemMode.INACTIVE),
     NO_GRAVITY(NoGravityMode.class, NoGravityMode.INACTIVE),
     TESTBLOCK(TestblockMode.class, TestblockMode.NO_VALUE),
-    CHANGED(ChangedMode.class, ChangedMode.NO_CHANGE),
+    CHANGED(ChangedMode.class, ChangedMode.NOT_CHANGED),
     ;
 
     @Getter

BauSystem_PluginBase/src/de/steamwar/bausystem/region/flags/ChangedMode.java

@@ -27,8 +27,8 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum ChangedMode implements Flag.Value<ChangedMode> {
 
-    NO_CHANGE,
-    HAS_CHANGE;
+    NOT_CHANGED,
+    CHANGED;
 
     private static ChangedMode[] values;