From cf82fbe6f3d5484f092d4962fc6f3082400f198e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Wed, 2 Dec 2020 01:58:54 +0100
Subject: [PATCH] Convenience sided init/dispose in tile entity base class.

---
 .../bus/TileEntityDeviceBusElement.java       | 12 ++-----
 .../oc2/common/tile/AbstractTileEntity.java   | 32 +++++++++++++++++++
 .../oc2/common/tile/BusCableTileEntity.java   |  8 ++---
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/src/main/java/li/cil/oc2/common/bus/TileEntityDeviceBusElement.java b/src/main/java/li/cil/oc2/common/bus/TileEntityDeviceBusElement.java
index 47419eb3..7c946235 100644
--- a/src/main/java/li/cil/oc2/common/bus/TileEntityDeviceBusElement.java
+++ b/src/main/java/li/cil/oc2/common/bus/TileEntityDeviceBusElement.java
@@ -86,11 +86,7 @@ public final class TileEntityDeviceBusElement implements INBTSerializable<Compou
     }
 
     public void initialize() {
-        final World world = tileEntity.getWorld();
-        if (world == null || world.isRemote()) {
-            return;
-        }
-
+        final World world = Objects.requireNonNull(tileEntity.getWorld());
         ServerScheduler.schedule(world, () -> {
             if (tileEntity.isRemoved()) {
                 return;
@@ -149,11 +145,7 @@ public final class TileEntityDeviceBusElement implements INBTSerializable<Compou
     }
 
     private void scheduleBusScanInAdjacentBusElements() {
-        final World world = tileEntity.getWorld();
-        if (world == null || world.isRemote()) {
-            return;
-        }
-
+        final World world = Objects.requireNonNull(tileEntity.getWorld());
         final BlockPos pos = tileEntity.getPos();
         for (final Direction direction : Direction.values()) {
             final BlockPos neighborPos = pos.offset(direction);
diff --git a/src/main/java/li/cil/oc2/common/tile/AbstractTileEntity.java b/src/main/java/li/cil/oc2/common/tile/AbstractTileEntity.java
index 32ea3eb5..96a034da 100644
--- a/src/main/java/li/cil/oc2/common/tile/AbstractTileEntity.java
+++ b/src/main/java/li/cil/oc2/common/tile/AbstractTileEntity.java
@@ -3,6 +3,7 @@ package li.cil.oc2.common.tile;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.Direction;
+import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
 import org.jetbrains.annotations.NotNull;
@@ -22,9 +23,40 @@ public abstract class AbstractTileEntity extends TileEntity {
     }
 
     protected void initialize() {
+        final World world = getWorld();
+        if (world == null) {
+            return;
+        }
+
+        if (world.isRemote()) {
+            initializeClient();
+        } else {
+            initializeServer();
+        }
+    }
+
+    protected void initializeClient() {
+    }
+
+    protected void initializeServer() {
     }
 
     protected void dispose() {
+        final World world = getWorld();
+        if (world == null) {
+            return;
+        }
+        if (world.isRemote()) {
+            disposeClient();
+        } else {
+            disposeServer();
+        }
+    }
+
+    protected void disposeClient() {
+    }
+
+    protected void disposeServer() {
     }
 
     @NotNull
diff --git a/src/main/java/li/cil/oc2/common/tile/BusCableTileEntity.java b/src/main/java/li/cil/oc2/common/tile/BusCableTileEntity.java
index 51fe337c..b56033a0 100644
--- a/src/main/java/li/cil/oc2/common/tile/BusCableTileEntity.java
+++ b/src/main/java/li/cil/oc2/common/tile/BusCableTileEntity.java
@@ -23,14 +23,14 @@ public class BusCableTileEntity extends AbstractTileEntity {
     }
 
     @Override
-    public void initialize() {
-        super.initialize();
+    protected void initializeServer() {
+        super.initializeServer();
         busElement.initialize();
     }
 
     @Override
-    protected void dispose() {
-        super.dispose();
+    protected void disposeServer() {
+        super.disposeServer();
         busElement.dispose();
     }