From 88aa07ccb29d694553cd60684c5f678aacbf0fdd Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Wed, 3 Aug 2022 19:10:26 +0200
Subject: [PATCH] Update FlatteningWrapper

Signed-off-by: yoyosource <yoyosource@nidido.de>
---
 .../bausystem/utils/FlatteningWrapper15.java  |  2 +-
 .../bausystem/linkage/LinkageUtils.java       |  2 +-
 .../bausystem/utils/FlatteningWrapper.java    | 34 ++++++++-----------
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java b/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java
index 71a4325e..ea349be6 100644
--- a/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java
+++ b/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java
@@ -63,7 +63,7 @@ import java.io.IOException;
 import java.util.*;
 import java.util.logging.Level;
 
-public class FlatteningWrapper15 implements FlatteningWrapper.IFlatteningWrapper {
+public class FlatteningWrapper15 implements FlatteningWrapper {
 
     @Override
     public boolean isNoBook(ItemStack item) {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/linkage/LinkageUtils.java b/BauSystem_Main/src/de/steamwar/bausystem/linkage/LinkageUtils.java
index 7ba894ae..6d39bace 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/linkage/LinkageUtils.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/linkage/LinkageUtils.java
@@ -45,7 +45,7 @@ public class LinkageUtils {
     {
         objectMap.put(Config.class, Config.getInstance());
         objectMap.put(BauSystem.class, BauSystem.getInstance());
-        objectMap.put(FlatteningWrapper.IFlatteningWrapper.class, FlatteningWrapper.impl);
+        objectMap.put(FlatteningWrapper.class, FlatteningWrapper.impl);
         objectMap.put(NMSWrapper.INMSWrapper.class, NMSWrapper.impl);
     }
 
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/utils/FlatteningWrapper.java b/BauSystem_Main/src/de/steamwar/bausystem/utils/FlatteningWrapper.java
index ebed2038..430bfe90 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/utils/FlatteningWrapper.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/utils/FlatteningWrapper.java
@@ -35,29 +35,25 @@ import org.bukkit.util.Vector;
 
 import java.io.File;
 
-public class FlatteningWrapper {
-    private FlatteningWrapper() {}
+public interface FlatteningWrapper {
+    FlatteningWrapper impl = VersionDependent.getVersionImpl(BauSystem.getInstance());
 
-    public static final IFlatteningWrapper impl = VersionDependent.getVersionImpl(BauSystem.getInstance());
+    boolean isNoBook(ItemStack item);
 
-    public interface IFlatteningWrapper {
-        boolean isNoBook(ItemStack item);
+    boolean isUnpusheable(Material material);
+    boolean isBreakingOnPush(Material material);
 
-        boolean isUnpusheable(Material material);
-        boolean isBreakingOnPush(Material material);
+    boolean isWorldEditCommand(String command);
+    void setSelection(Player p, Point minPoint, Point maxPoint);
 
-        boolean isWorldEditCommand(String command);
-        void setSelection(Player p, Point minPoint, Point maxPoint);
+    EditSession paste(File file, Point pastePoint, PasteOptions pasteOptions);
+    EditSession paste(Clipboard clipboard, Point pastePoint, PasteOptions pasteOptions);
+    void changeColor(Clipboard clipboard, Color color) throws WorldEditException;
+    boolean backup(Point minPoint, Point maxPoint, File file);
 
-        EditSession paste(File file, Point pastePoint, PasteOptions pasteOptions);
-        EditSession paste(Clipboard clipboard, Point pastePoint, PasteOptions pasteOptions);
-        void changeColor(Clipboard clipboard, Color color) throws WorldEditException;
-        boolean backup(Point minPoint, Point maxPoint, File file);
+    boolean inWater(World world, Vector tntPosition);
 
-        boolean inWater(World world, Vector tntPosition);
-
-        Material getTraceShowMaterial();
-        Material getTraceHideMaterial();
-        Material getTraceXZMaterial();
-    }
+    Material getTraceShowMaterial();
+    Material getTraceHideMaterial();
+    Material getTraceXZMaterial();
 }