Prepare having more of the kind.

NoCheatPlus · Apr 29, 2017 · 6d16bce · 6d16bce
1 parent 04d5253
commit 6d16bce
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 25 deletions.
diff --git a/.../src/main/java/fr/neatmonster/nocheatplus/compat/blocks/AbstractBlockPropertiesPatch.java b/.../src/main/java/fr/neatmonster/nocheatplus/compat/blocks/AbstractBlockPropertiesPatch.java
@@ -0,0 +1,24 @@
+package fr.neatmonster.nocheatplus.compat.blocks;
+
+import fr.neatmonster.nocheatplus.components.registry.activation.Activation;
+
+public abstract class AbstractBlockPropertiesPatch implements IPatchBlockPropertiesSetup {
+
+    protected final Activation activation = new Activation();
+
+    @Override
+    public boolean isAvailable() {
+        return activation.isAvailable();
+    }
+
+    @Override
+    public String getNeutralDescription() {
+        return activation.getNeutralDescription();
+    }
+
+    @Override
+    public boolean advertise() {
+        return activation.advertise();
+    }
+
+}
diff --git a/...main/java/fr/neatmonster/nocheatplus/compat/blocks/init/vanilla/VanillaBlocksFactory.java b/...main/java/fr/neatmonster/nocheatplus/compat/blocks/init/vanilla/VanillaBlocksFactory.java
@@ -21,7 +21,6 @@
 import fr.neatmonster.nocheatplus.compat.blocks.BlockPropertiesSetup;
 import fr.neatmonster.nocheatplus.compat.blocks.IPatchBlockPropertiesSetup;
 import fr.neatmonster.nocheatplus.compat.blocks.init.vanilla.special.MultiClientProtocolWaterLilyPatch;
-import fr.neatmonster.nocheatplus.components.registry.activation.IActivation;
 import fr.neatmonster.nocheatplus.config.WorldConfigProvider;
 import fr.neatmonster.nocheatplus.logging.StaticLog;
 

diff --git a/...ter/nocheatplus/compat/blocks/init/vanilla/special/MultiClientProtocolWaterLilyPatch.java b/...ter/nocheatplus/compat/blocks/init/vanilla/special/MultiClientProtocolWaterLilyPatch.java
@@ -2,8 +2,7 @@
 
 import org.bukkit.Material;
 
-import fr.neatmonster.nocheatplus.compat.blocks.IPatchBlockPropertiesSetup;
-import fr.neatmonster.nocheatplus.components.registry.activation.Activation;
+import fr.neatmonster.nocheatplus.compat.blocks.AbstractBlockPropertiesPatch;
 import fr.neatmonster.nocheatplus.config.WorldConfigProvider;
 import fr.neatmonster.nocheatplus.utilities.map.BlockFlags;
 import fr.neatmonster.nocheatplus.utilities.map.BlockProperties;
@@ -14,35 +13,22 @@
  * @author asofold
  *
  */
-public class MultiClientProtocolWaterLilyPatch implements IPatchBlockPropertiesSetup {
+public class MultiClientProtocolWaterLilyPatch extends AbstractBlockPropertiesPatch {
     // TODO: Later just dump these into the generic registry (on activation), let BlockProperties fetch.
 
-    private final Activation activation = new Activation()
-            .neutralDescription("WATER_LILY block shape patch for multi client protocol support around 1.7.x - 1.11.x.")
-            .advertise(true)
-            .pluginExist("ViaVersion")
-            // TODO: Other/More ?
-            ;
+    public MultiClientProtocolWaterLilyPatch() {
+        activation
+        .neutralDescription("WATER_LILY block shape patch for multi client protocol support around 1.7.x - 1.11.x.")
+        .advertise(true)
+        .pluginExist("ViaVersion")
+        // TODO: Other/More ?
+        ;
+    }
 
     @Override
     public void setupBlockProperties(WorldConfigProvider<?> worldConfigProvider) {
         BlockFlags.addFlags(Material.WATER_LILY, 
                 BlockProperties.F_GROUND | BlockProperties.F_HEIGHT8_1 | BlockProperties.F_GROUND_HEIGHT);
     }
 
-    @Override
-    public boolean isAvailable() {
-        return activation.isAvailable();
-    }
-
-    @Override
-    public String getNeutralDescription() {
-        return activation.getNeutralDescription();
-    }
-
-    @Override
-    public boolean advertise() {
-        return activation.advertise();
-    }
-
 }