Further improve the event

Author: Java0

src/main/java/com/mcgoodtime/productionline/event/PLEvent.java

@@ -24,14 +24,20 @@
  */
 package com.mcgoodtime.productionline.event;
 
+import com.mcgoodtime.productionline.tiles.tilewireless.TileTributary;
+import com.mcgoodtime.productionline.tiles.tilewireless.TileWaterSource;
 import com.mcgoodtime.productionline.tiles.tilewireless.TileWireless;
+import gnu.trove.map.custom_hash.TObjectByteCustomHashMap;
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.event.world.BlockEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Production Line event listener.
  *
@@ -47,31 +53,31 @@ public void onPlayerCrafting(PlayerEvent.ItemCraftedEvent event) {
     }
 */
 
-    private TileWireless lastDecive ;
+    List<TileWaterSource> playerWaterSources;
 
     @SubscribeEvent
     public void onBlockPlayerPlaced(BlockEvent.EntityPlaceEvent event) {
         TileEntity currentPlacedBlock = event.getWorld().getTileEntity(event.getPos());
 
-        if (event.getPlacedBlock().getBlock() instanceof ITileEntityProvider && currentPlacedBlock instanceof  TileWireless){
-            TileWireless currentDecive = (TileWireless) currentPlacedBlock;
+        if (event.getPlacedBlock().getBlock() instanceof ITileEntityProvider && currentPlacedBlock instanceof TileWireless){
+            TileWireless currentDevice = (TileWireless) currentPlacedBlock;
             if(!(event.getWorld().isRemote) && event.getEntity()instanceof EntityPlayer){
-                currentDecive.setOwner(event.getEntity());
+                currentDevice.setOwner(event.getEntity());
+            }
+
+            if(currentDevice instanceof TileWaterSource){
+               playerWaterSources.add((TileWaterSource) currentDevice);
             }
-            if(lastDecive!=null && lastDecive.sameOwner(event.getEntity())){
-                if(currentDecive.inRange(lastDecive.getPos())){
-                    currentDecive.link(lastDecive);
-                    lastDecive.link(currentDecive);
-                    for(TileWireless deciveInOtherTiles : lastDecive.getLinkedWirelessDecives()){
-                        if(currentDecive.inRange(deciveInOtherTiles.getPos())){
-                            currentDecive.link(deciveInOtherTiles);
-                            deciveInOtherTiles.link(currentDecive);
+            if(currentDevice instanceof TileTributary){
+                if(!playerWaterSources.isEmpty()){
+                    for (TileWaterSource waterSource : playerWaterSources){
+                        if(waterSource.sameOwner(currentDevice.getOwner()) && waterSource.inRange(currentDevice.getPos())){
+                            currentDevice.link(waterSource);
+                            waterSource.link(currentDevice);
                         }
                     }
                 }
             }
-            lastDecive = currentDecive;
-
         }else {
             return;
         }
@@ -81,12 +87,14 @@ public void onBlockPlayerPlaced(BlockEvent.EntityPlaceEvent event) {
     @SubscribeEvent
     public void onPlayerBreaked(BlockEvent.BreakEvent event){
         TileEntity curretBreakedBlock = event.getWorld().getTileEntity(event.getPos());
-
         if(curretBreakedBlock != null && curretBreakedBlock.isInvalid()){
             if(event.getState().getBlock() instanceof ITileEntityProvider && curretBreakedBlock instanceof TileWireless){
-                TileWireless curretDecive = (TileWireless) curretBreakedBlock;
-                for(TileWireless deciveInOtherTiles : curretDecive.getLinkedWirelessDecives()){
-                    deciveInOtherTiles.unlink(curretDecive);
+                TileWireless curretDevice = (TileWireless) curretBreakedBlock;
+                if(curretBreakedBlock instanceof TileWaterSource){
+                    playerWaterSources.remove(curretDevice);
+                }
+                for(TileWireless deviceInOtherTiles : curretDevice.getLinkedWirelessDecives()){
+                    deviceInOtherTiles.unlink(curretDevice);
                 }
             }
         }else {

src/main/java/com/mcgoodtime/productionline/tiles/tilewireless/IWireless.java

@@ -9,6 +9,8 @@ public interface IWireless {
 
     void setOwner(Entity player);
 
+    Entity getOwner();
+
     void link(TileWireless tile);
 
     void unlink(TileWireless tile);

src/main/java/com/mcgoodtime/productionline/tiles/tilewireless/TileTributary.java

@@ -0,0 +1,4 @@
+package com.mcgoodtime.productionline.tiles.tilewireless;
+
+public class TileTributary extends  TileWireless{
+}

src/main/java/com/mcgoodtime/productionline/tiles/tilewireless/TileWaterSource.java

@@ -1,13 +1,5 @@
 package com.mcgoodtime.productionline.tiles.tilewireless;
 
-import ibxm.Player;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ITickable;
-import net.minecraft.util.math.BlockPos;
-
-import java.util.Map;
-import java.util.UUID;
-
 public class TileWaterSource extends TileWireless {
 
     @Override
@@ -16,4 +8,6 @@ public void update() {
     }
 
 
+
+
 }

src/main/java/com/mcgoodtime/productionline/tiles/tilewireless/TileWireless.java

@@ -6,6 +6,7 @@
 import net.minecraft.util.math.BlockPos;
 
 import java.util.List;
+import java.util.Objects;
 
 public class TileWireless extends TileEntity implements IWireless, ITickable {
 
@@ -15,7 +16,7 @@ public class TileWireless extends TileEntity implements IWireless, ITickable {
     private final int Y = this.pos.getY();
     private final int Z = this.pos.getZ();
 
-    Entity owner;
+    private Entity owner;
 
     @Override
     public void update() {
@@ -32,17 +33,24 @@ public void setOwner(Entity player) {
         this.owner = player;
     }
 
+    @Override
+    public Entity getOwner() {
+        return owner;
+    }
+
     public boolean sameOwner(Entity player){
-        return player.equals(this.owner) ? true : false;
+        return Objects.equals(owner.getUniqueID(),player.getUniqueID());
     }
 
     public boolean inRange(BlockPos pos) {
+
+        boolean isSelf = pos.getX() != X && pos.getY() != Y && pos.getZ() != Z;
         boolean x_InRange = pos.getX() <= X+getRange(0) && pos.getX()>=X-getRange(0);
         boolean y_InRange = pos.getY() <= Y+getRange(1) && pos.getY()>=Y-getRange(1);
         boolean z_InRange = pos.getZ() <= Z+getRange(2) && pos.getZ()>=Z-getRange(2);
-        boolean notSelf = pos.getX() != X && pos.getY() != Y && pos.getZ() != Z;
 
-        return x_InRange && y_InRange && z_InRange && notSelf ? true : false;
+
+        return isSelf && x_InRange && y_InRange && z_InRange  ? true : false;
 
     }