Merge pull request #107 from FoxDenStudio/cleanup/optimization-1

Cleanup/optimization 1
FoxDenStudio · Jul 20, 2018 · 5e6ccae · 5e6ccae
2 parents 5c55159 + 5fe81b8
commit 5e6ccae
Show file tree

Hide file tree

Showing 13 changed files with 184 additions and 109 deletions.
diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,9 @@ buildscript {
     dependencies {
         classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
         classpath 'org.spongepowered:spongegradle:0.8.2-SNAPSHOT'
-        classpath 'org.spongepowered:event-impl-gen:5.2.0-SNAPSHOT'
+        classpath 'org.spongepowered:event-impl-gen:5.1.0-SNAPSHOT'
+        //classpath 'gradle.plugin.org.spongepowered:event-impl-gen:5.0.2'
+        //classpath 'gradle.plugin.org.spongepowered:event-impl-gen:5.1.0-SNAPSHOT'
         classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Sun May 27 00:37:29 PDT 2018
+#Wed May 30 12:43:00 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/main/java/net/foxdenstudio/sponge/foxguard/plugin/FoxGuardMain.java b/src/main/java/net/foxdenstudio/sponge/foxguard/plugin/FoxGuardMain.java
@@ -50,6 +50,7 @@
 import net.foxdenstudio.sponge.foxguard.plugin.state.factory.ControllersStateFieldFactory;
 import net.foxdenstudio.sponge.foxguard.plugin.state.factory.HandlersStateFieldFactory;
 import net.foxdenstudio.sponge.foxguard.plugin.state.factory.RegionsStateFieldFactory;
+import net.foxdenstudio.sponge.foxguard.plugin.util.DebugManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.spongepowered.api.Game;
@@ -64,7 +65,6 @@
 import org.spongepowered.api.event.cause.EventContext;
 import org.spongepowered.api.event.entity.DamageEntityEvent;
 import org.spongepowered.api.event.entity.InteractEntityEvent;
-import org.spongepowered.api.event.entity.MoveEntityEvent;
 import org.spongepowered.api.event.entity.SpawnEntityEvent;
 import org.spongepowered.api.event.game.state.*;
 import org.spongepowered.api.event.world.ExplosionEvent;
@@ -242,9 +242,14 @@ public void registerCommands(GameInitializationEvent event) {
 
         fgDispatcher.register(new CommandPriority(), "priority", "prio", "level", "rank");
 
-        fgDispatcher.register(new CommandTest(), "test");
         fgDispatcher.register(new CommandLink2(true), "link2", "connect2", "attach2");
         fgDispatcher.register(new CommandLink2(false), "unlink2", "disconnect2", "detach2");
+
+        // DEBUG USE
+        //fgDispatcher.register(new CommandTest(), "test");
+        //fgDispatcher.register(DebugManager.INSTANCE, "debug");
+
+
         registerCoreCommands(fgDispatcher);
 
         game.getCommandManager().register(this, fgDispatcher, "foxguard", "foxg", "fguard", "fg");

diff --git a/src/main/java/net/foxdenstudio/sponge/foxguard/plugin/command/CommandHere.java b/src/main/java/net/foxdenstudio/sponge/foxguard/plugin/command/CommandHere.java
@@ -35,7 +35,7 @@
 import net.foxdenstudio.sponge.foxguard.plugin.FGManager;
 import net.foxdenstudio.sponge.foxguard.plugin.controller.IController;
 import net.foxdenstudio.sponge.foxguard.plugin.handler.IHandler;
-import net.foxdenstudio.sponge.foxguard.plugin.listener.PlayerMoveListenerNew;
+import net.foxdenstudio.sponge.foxguard.plugin.listener.PlayerMoveListener;
 import net.foxdenstudio.sponge.foxguard.plugin.region.IRegion;
 import net.foxdenstudio.sponge.foxguard.plugin.util.FGUtil;
 import org.spongepowered.api.Sponge;
@@ -85,7 +85,7 @@ public CommandResult process(CommandSource source, String arguments) throws Comm
         }
         AdvCmdParser.ParseResult parse = AdvCmdParser.builder().arguments(arguments).flagMapper(MAPPER).parse();
         boolean hud = false;
-        PlayerMoveListenerNew.HUDConfig hudConfig = new PlayerMoveListenerNew.HUDConfig(false, false, false);
+        PlayerMoveListener.HUDConfig hudConfig = new PlayerMoveListener.HUDConfig(false, false, false);
 
         String worldName = parse.flags.get("world");
         World world = null;
@@ -239,7 +239,7 @@ public CommandResult process(CommandSource source, String arguments) throws Comm
         if (hud) {
             Player player = (Player) source;
             if (CommandHUD.instance().getIsHUDEnabled().get(player)) {
-                PlayerMoveListenerNew instance = PlayerMoveListenerNew.getInstance();
+                PlayerMoveListener instance = PlayerMoveListener.getInstance();
                 instance.getHudConfigMap().put(player, hudConfig);
                 instance.renderHUD(player, regionList, handlerList, hudConfig);
                 instance.showScoreboard(player);

diff --git a/src/main/java/net/foxdenstudio/sponge/foxguard/plugin/config/ListenerModule.java b/src/main/java/net/foxdenstudio/sponge/foxguard/plugin/config/ListenerModule.java
@@ -1,7 +1,7 @@
 package net.foxdenstudio.sponge.foxguard.plugin.config;
 
 import net.foxdenstudio.sponge.foxguard.plugin.FoxGuardMain;
-import net.foxdenstudio.sponge.foxguard.plugin.listener.PlayerMoveListenerNew;
+import net.foxdenstudio.sponge.foxguard.plugin.listener.PlayerMoveListener;
 import org.spongepowered.api.event.entity.MoveEntityEvent;
 
 import javax.annotation.Nonnull;
@@ -25,7 +25,7 @@ public String setup(String setting) {
                 setting = getDefaultValue();
                 full = true;
             }
-            PlayerMoveListenerNew pml = new PlayerMoveListenerNew(true);
+            PlayerMoveListener pml = new PlayerMoveListener(true);
             plugin.registerListener(MoveEntityEvent.class, pml);
             //plugin.registerListeners(pml.new Listeners());
             return setting;

diff --git a/src/main/java/net/foxdenstudio/sponge/foxguard/plugin/listener/BlockChangeListener.java b/src/main/java/net/foxdenstudio/sponge/foxguard/plugin/listener/BlockChangeListener.java
@@ -31,6 +31,7 @@
 import net.foxdenstudio.sponge.foxguard.plugin.flag.FlagSet;
 import net.foxdenstudio.sponge.foxguard.plugin.handler.IHandler;
 import net.foxdenstudio.sponge.foxguard.plugin.object.IFGObject;
+import net.foxdenstudio.sponge.foxguard.plugin.util.DebugManager;
 import net.foxdenstudio.sponge.foxguard.plugin.util.ExtraContext;
 import net.foxdenstudio.sponge.foxguard.plugin.util.FGUtil;
 import org.spongepowered.api.block.BlockSnapshot;
@@ -67,6 +68,9 @@ public void handle(ChangeBlockEvent event) throws Exception {
                     || tr.getOriginal().getState().getType().equals(BlockTypes.GRASS)
                     && tr.getFinal().getState().getType().equals(BlockTypes.DIRT)) return;
         }
+
+        DebugManager.INSTANCE.printEvent(event);
+
         //DebugHelper.printBlockEvent(event);
         /*FlagOld typeFlag;
         if (event instanceof ChangeBlockEvent.Modify) typeFlag = FlagOld.BLOCK_MODIFY;
@@ -105,6 +109,7 @@ public void handle(ChangeBlockEvent event) throws Exception {
         }
         if(handlerSet.size() == 0) return;
 
+
         User user;
         if (event.getCause().containsType(Player.class)) {
             user = event.getCause().first(Player.class).get();
@@ -114,6 +119,8 @@ public void handle(ChangeBlockEvent event) throws Exception {
             user = null;
         }
 
+
+
         boolean[] flags = BASE_FLAG_SET.clone();
 
         if (event instanceof ChangeBlockEvent.Modify) flags[MODIFY.id] = true;

diff --git a/src/main/java/net/foxdenstudio/sponge/foxguard/plugin/listener/InteractEntityListener.java b/src/main/java/net/foxdenstudio/sponge/foxguard/plugin/listener/InteractEntityListener.java
@@ -26,10 +26,12 @@
 package net.foxdenstudio.sponge.foxguard.plugin.listener;
 
 import com.flowpowered.math.vector.Vector3d;
+import com.google.common.collect.ImmutableList;
 import net.foxdenstudio.sponge.foxguard.plugin.FGManager;
 import net.foxdenstudio.sponge.foxguard.plugin.FoxGuardMain;
 import net.foxdenstudio.sponge.foxguard.plugin.flag.FlagSet;
 import net.foxdenstudio.sponge.foxguard.plugin.handler.IHandler;
+import net.foxdenstudio.sponge.foxguard.plugin.listener.util.EntityFlagCalculator;
 import net.foxdenstudio.sponge.foxguard.plugin.listener.util.FGListenerUtil;
 import net.foxdenstudio.sponge.foxguard.plugin.object.IFGObject;
 import net.foxdenstudio.sponge.foxguard.plugin.util.ExtraContext;
@@ -51,6 +53,7 @@
 
 public class InteractEntityListener implements EventListener<InteractEntityEvent> {
 
+    private static final EntityFlagCalculator ENTITY_FLAG_CALCULATOR = EntityFlagCalculator.getInstance();
     private static final boolean[] BASE_FLAG_SET = FlagSet.arrayFromFlags(ROOT, DEBUFF, INTERACT, ENTITY);
 
     @Override
@@ -91,8 +94,7 @@ public void handle(InteractEntityEvent event) throws Exception {
             if (event instanceof InteractEntityEvent.Secondary.MainHand) flags[MAIN.id] = true;
             else if (event instanceof InteractEntityEvent.Secondary.OffHand) flags[OFF.id] = true;
         }
-        Entity entity = event.getTargetEntity();
-        FGListenerUtil.applyEntityFlags(entity, flags);
+        ENTITY_FLAG_CALCULATOR.applyEntityFlags(ImmutableList.of(event.getTargetEntity()), flags);
         FlagSet flagSet = new FlagSet(flags);
 
         List<IHandler> handlerList = new ArrayList<>(handlerSet);

diff --git a/...lugin/listener/PlayerMoveListenerNew.java → ...d/plugin/listener/PlayerMoveListener.java b/...lugin/listener/PlayerMoveListenerNew.java → ...d/plugin/listener/PlayerMoveListener.java
@@ -61,11 +61,11 @@
  * Created by Fox on 1/4/2016.
  * Project: SpongeForge
  */
-public class PlayerMoveListenerNew implements EventListener<MoveEntityEvent> {
+public class PlayerMoveListener implements EventListener<MoveEntityEvent> {
 
     private static final boolean[] BASE_FLAG_SET = FlagSet.arrayFromFlags(ROOT, DEBUFF, MOVE);
 
-    private static PlayerMoveListenerNew instance;
+    private static PlayerMoveListener instance;
 
     public final boolean full;
 
@@ -84,7 +84,7 @@ public class PlayerMoveListenerNew implements EventListener<MoveEntityEvent> {
     });
     private final Map<Player, HUDConfig> hudConfigMap = new WeakCacheMap<>((k, m) -> new HUDConfig());
 
-    public PlayerMoveListenerNew(boolean full) {
+    public PlayerMoveListener(boolean full) {
         this.full = full;
         if (instance == null) instance = this;
     }
@@ -360,7 +360,7 @@ public void showScoreboard(Player player) {
         player.setScoreboard(this.scoreboardMap.get(player));
     }
 
-    public static PlayerMoveListenerNew getInstance() {
+    public static PlayerMoveListener getInstance() {
         return instance;
     }
 

diff --git a/src/main/java/net/foxdenstudio/sponge/foxguard/plugin/listener/SpawnEntityListener.java b/src/main/java/net/foxdenstudio/sponge/foxguard/plugin/listener/SpawnEntityListener.java
@@ -30,6 +30,7 @@
 import net.foxdenstudio.sponge.foxguard.plugin.flag.Flag;
 import net.foxdenstudio.sponge.foxguard.plugin.flag.FlagSet;
 import net.foxdenstudio.sponge.foxguard.plugin.handler.IHandler;
+import net.foxdenstudio.sponge.foxguard.plugin.listener.util.EntityFlagCalculator;
 import net.foxdenstudio.sponge.foxguard.plugin.object.IFGObject;
 import net.foxdenstudio.sponge.foxguard.plugin.util.ExtraContext;
 import org.spongepowered.api.entity.Entity;
@@ -54,25 +55,20 @@
 
 public class SpawnEntityListener implements EventListener<SpawnEntityEvent> {
 
+    private static final EntityFlagCalculator ENTITY_FLAG_CALCULATOR = EntityFlagCalculator.getInstance();
     private static final boolean[] BASE_FLAG_SET = FlagSet.arrayFromFlags(ROOT, DEBUFF, SPAWN, ENTITY);
 
     @Override
     public void handle(SpawnEntityEvent event) throws Exception {
         if (event.isCancelled()) return;
-        if (event.getEntities().isEmpty()) return;
-        for (Entity entity : event.getEntities()) {
+        List<Entity> entities = event.getEntities();
+        if (entities.isEmpty()) return;
+
+        for (Entity entity : entities) {
             if (entity instanceof Player) return;
         }
-        User user;
-        if (event.getCause().containsType(Player.class)) {
-            user = event.getCause().first(Player.class).get();
-        } else if (event.getCause().containsType(User.class)) {
-            user = event.getCause().first(User.class).get();
-        } else {
-            user = null;
-        }
 
-        Entity oneEntity = event.getEntities().get(0);
+        //Entity oneEntity = event.getEntities().get(0);
         /*if (oneEntity instanceof Arrow) {
             Optional<UUID> creator = oneEntity.getCreator(), notifier = oneEntity.getNotifier();
 
@@ -89,29 +85,10 @@ public void handle(SpawnEntityEvent event) throws Exception {
             }
 
         }*/
-        boolean[] flags = BASE_FLAG_SET.clone();
-
-        if (oneEntity instanceof Living) {
-            flags[LIVING.id] = true;
-            if (oneEntity instanceof Agent) {
-                flags[AGENT.id] = true;
-                if (oneEntity instanceof Hostile) {
-                    flags[HOSTILE.id] = true;
-                } else if (oneEntity instanceof Human) {
-                    flags[HUMAN.id] = true;
-                } else {
-                    flags[PASSIVE.id] = true;
-                }
-            }
-        } else if (oneEntity instanceof Hanging) {
-            flags[HANGING.id] = true;
-        }
-
-        FlagSet flagSet = new FlagSet(flags);
 
         Set<IHandler> handlerSet = new HashSet<>();
 
-        for (Entity entity : event.getEntities()) {
+        for (Entity entity : entities) {
             Location<World> loc = entity.getLocation();
             Vector3d pos = loc.getPosition();
             World world = loc.getExtent();
@@ -122,10 +99,24 @@ public void handle(SpawnEntityEvent event) throws Exception {
                             .forEach(handlerSet::add));
         }
 
-
-
         //TODO maybe throw a warning
         if(handlerSet.size() == 0) return;
+
+        User user;
+        if (event.getCause().containsType(Player.class)) {
+            user = event.getCause().first(Player.class).get();
+        } else if (event.getCause().containsType(User.class)) {
+            user = event.getCause().first(User.class).get();
+        } else {
+            user = null;
+        }
+
+        boolean[] flags = BASE_FLAG_SET.clone();
+
+        ENTITY_FLAG_CALCULATOR.applyEntityFlags(entities, flags);
+
+        FlagSet flagSet = new FlagSet(flags);
+
         ArrayList<IHandler> handlerList = new ArrayList<>(handlerSet);
         Collections.sort(handlerList);
         int currPriority = handlerList.get(0).getPriority();

diff --git a/...main/java/net/foxdenstudio/sponge/foxguard/plugin/listener/util/EntityFlagCalculator.java b/...main/java/net/foxdenstudio/sponge/foxguard/plugin/listener/util/EntityFlagCalculator.java
@@ -51,7 +51,6 @@ public void applyEntityFlags(Collection<Entity> entities, boolean[] flags) {
         mini.apply(flags);
     }
 
-    @SuppressWarnings("Duplicates")
     private MiniFlagSet getMiniFlag(Map<Class<? extends Entity>, Entity> types) {
         MiniFlagSet mini = new MiniFlagSet();
         Set<Flag> totalFlags = new HashSet<>();
@@ -210,7 +209,7 @@ public void apply(boolean[] flagset) {
         }
     }
 
-    public static void main(String[] args) {
+    /*public static void main(String[] args) {
         EntityFlagCalculator calculator = EntityFlagCalculator.getInstance();
         FlagRegistry registry = FlagRegistry.getInstance();
         Entity entity = (Entity) Proxy.newProxyInstance(EntityFlagCalculator.class.getClassLoader(),
@@ -220,5 +219,5 @@ public static void main(String[] args) {
         for (Flag flag : flags) {
             System.out.println(flag.name);
         }
-    }
+    }*/
 }
diff --git a/src/main/java/net/foxdenstudio/sponge/foxguard/plugin/util/DebugHelper.java b/src/main/java/net/foxdenstudio/sponge/foxguard/plugin/util/DebugHelper.java