Remove unnecessary event handler

Will be replaced by something new and shiny in the future.

diff --git a/src/main/java/com/irtimaled/bbor/common/CommonProxy.java b/src/main/java/com/irtimaled/bbor/common/CommonProxy.java
index 0021d4323f90f31290124535e727c878b80d5d4a..b1e17376f97858093595b82f3d63130be9b89719 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/common/CommonProxy.java
+++ b/src/main/java/com/irtimaled/bbor/common/CommonProxy.java
@@ -15,7 +15,6 @@ public class CommonProxy {
     protected DimensionCache dimensionCache;
     protected Set<VillageProcessor> villageProcessors = new HashSet<>();
 
-    private IVillageEventHandler eventHandler = null;
 
     public void worldLoaded(World world) {
         IChunkProvider chunkProvider = world.getChunkProvider();
@@ -26,7 +25,7 @@ public class CommonProxy {
             DimensionProcessor boundingBoxCache = new DimensionProcessor(dimensionType);
             dimensionCache.put(dimensionType, boundingBoxCache);
             if (ConfigManager.drawVillages.getBoolean()) {
-                villageProcessors.add(new VillageProcessor(world, dimensionType, eventHandler, boundingBoxCache));
+                villageProcessors.add(new VillageProcessor(world, boundingBoxCache));
             }
         }
     }
@@ -47,10 +46,6 @@ public class CommonProxy {
         dimensionCache = new DimensionCache();
     }
 
-    public void setEventHandler(IVillageEventHandler eventHandler) {
-        this.eventHandler = eventHandler;
-    }
-
     public DimensionCache getDimensionCache() {
         return dimensionCache;
     }

diff --git a/src/main/java/com/irtimaled/bbor/common/IVillageEventHandler.java b/src/main/java/com/irtimaled/bbor/common/IVillageEventHandler.java
deleted file mode 100644 (file)
index d28efff..0000000
--- a/src/main/java/com/irtimaled/bbor/common/IVillageEventHandler.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.irtimaled.bbor.common;
-
-import com.irtimaled.bbor.common.models.BoundingBox;
-import net.minecraft.world.dimension.DimensionType;
-
-public interface IVillageEventHandler {
-    void villageRemoved(DimensionType dimensionType, BoundingBox bb);
-}

diff --git a/src/main/java/com/irtimaled/bbor/common/VillageProcessor.java b/src/main/java/com/irtimaled/bbor/common/VillageProcessor.java
index 2bdbe6ea2dd49020d4728301a614b843a571d54d..26c37118b9081b174fa2589bda7d4ad6bad8d4ed 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/common/VillageProcessor.java
+++ b/src/main/java/com/irtimaled/bbor/common/VillageProcessor.java
@@ -4,7 +4,6 @@ import com.irtimaled.bbor.common.models.BoundingBoxVillage;
 import net.minecraft.village.Village;
 import net.minecraft.village.VillageCollection;
 import net.minecraft.world.World;
-import net.minecraft.world.dimension.DimensionType;
 
 import java.util.HashMap;
 import java.util.List;
@@ -12,16 +11,12 @@ import java.util.Map;
 
 public class VillageProcessor {
     private World world;
-    private DimensionType dimensionType;
-    private IVillageEventHandler eventHandler;
     private BoundingBoxCache boundingBoxCache;
     private Map<Integer, BoundingBoxVillage> villageCache = new HashMap<>();
     private boolean closed = false;
 
-    VillageProcessor(World world, DimensionType dimensionType, IVillageEventHandler eventHandler, BoundingBoxCache boundingBoxCache) {
+    VillageProcessor(World world, BoundingBoxCache boundingBoxCache) {
         this.world = world;
-        this.dimensionType = dimensionType;
-        this.eventHandler = eventHandler;
         this.boundingBoxCache = boundingBoxCache;
     }
 
@@ -33,8 +28,7 @@ public class VillageProcessor {
         VillageCollection villageCollection = world.getVillageCollection();
         if (villageCollection != null) {
             List<Village> villages = villageCollection.getVillageList();
-            for(int i = 0; i < villages.size(); i++) {
-                Village village = villages.get(i);
+            for (Village village : villages) {
                 int villageId = village.hashCode();
                 BoundingBoxVillage newVillage = oldVillages.get(villageId);
                 if (newVillage != null && newVillage.matches(village)) {
@@ -48,9 +42,6 @@ public class VillageProcessor {
         }
         for (BoundingBoxVillage village : oldVillages.values()) {
             boundingBoxCache.removeBoundingBox(village);
-            if (eventHandler != null) {
-                eventHandler.villageRemoved(dimensionType, village);
-            }
         }
         for (BoundingBoxVillage village : newVillages.values()) {
             boundingBoxCache.addBoundingBox(village);
@@ -61,7 +52,6 @@ public class VillageProcessor {
     public void close() {
         closed = true;
         world = null;
-        eventHandler = null;
         boundingBoxCache = null;
         villageCache.clear();
     }