From d053c9b1bc6ce876c337616666aa25a355c5e329 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sun, 19 Jul 2020 01:09:06 +0200 Subject: [PATCH] Post-Merge Fixes --- .../render/tesr/ChestTileEntityRenderer.java | 1 - .../java/appeng/hooks/ClientTickHandler.java | 3 +- src/main/java/appeng/hooks/TickHandler.java | 39 ------------------- .../java/appeng/me/cluster/IAECluster.java | 1 - .../tile/qnb/QuantumBridgeBlockEntity.java | 11 ------ .../tile/spatial/SpatialPylonBlockEntity.java | 7 ---- 6 files changed, 2 insertions(+), 60 deletions(-) diff --git a/src/main/java/appeng/client/render/tesr/ChestTileEntityRenderer.java b/src/main/java/appeng/client/render/tesr/ChestTileEntityRenderer.java index 7e0c6a324..16a3d4cb9 100644 --- a/src/main/java/appeng/client/render/tesr/ChestTileEntityRenderer.java +++ b/src/main/java/appeng/client/render/tesr/ChestTileEntityRenderer.java @@ -151,7 +151,6 @@ public class ChestTileEntityRenderer extends BlockEntityRenderer getPlayerColors() { + public Map getPlayerColors() { if (!Platform.isServer()) { return this.cliPlayerColors; } diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index b2be14922..868a04411 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/src/main/java/appeng/hooks/TickHandler.java @@ -19,12 +19,10 @@ package appeng.hooks; import java.util.ArrayDeque; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.List; import java.util.Map; import java.util.Queue; import java.util.Set; @@ -35,20 +33,8 @@ import com.google.common.base.Stopwatch; import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.Multimap; -import net.minecraft.world.IWorld; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.event.TickEvent.ClientTickEvent; -import net.minecraftforge.event.TickEvent.Phase; -import net.minecraftforge.event.TickEvent.ServerTickEvent; -import net.minecraftforge.event.TickEvent.WorldTickEvent; -import net.minecraftforge.event.world.WorldEvent; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.fml.DistExecutor.SafeRunnable; -import appeng.api.networking.IGridNode; -import appeng.api.parts.CableRenderMode; import appeng.api.util.AEColor; import appeng.core.AEConfig; import appeng.core.AELog; @@ -58,18 +44,11 @@ import appeng.me.Grid; import appeng.tile.AEBaseBlockEntity; import appeng.util.IWorldCallable; import appeng.util.Platform; -import com.google.common.base.Stopwatch; -import com.google.common.collect.LinkedListMultimap; -import com.google.common.collect.Multimap; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; import net.minecraft.server.MinecraftServer; import net.minecraft.server.world.ServerWorld; -import net.minecraft.world.World; import net.minecraft.world.WorldAccess; -import java.util.*; -import java.util.concurrent.TimeUnit; - public class TickHandler { private static final TickHandler INSTANCE = new TickHandler(); @@ -92,24 +71,6 @@ public class TickHandler { return INSTANCE; } - public static void setup(IEventBus eventBus) { - eventBus.addListener(INSTANCE::onServerTick); - eventBus.addListener(INSTANCE::onWorldTick); - eventBus.addListener(INSTANCE::onUnloadWorld); - - // DistExecutor does not like functional interfaces - DistExecutor.safeRunWhenOn(Dist.CLIENT, () -> new SafeRunnable() { - - private static final long serialVersionUID = 5221919736953944125L; - - @Override - public void run() { - eventBus.addListener(INSTANCE::onClientTick); - - } - }); - } - public Map getPlayerColors() { return this.srvPlayerColors; } diff --git a/src/main/java/appeng/me/cluster/IAECluster.java b/src/main/java/appeng/me/cluster/IAECluster.java index 4cb34f05c..4edd3d9a2 100644 --- a/src/main/java/appeng/me/cluster/IAECluster.java +++ b/src/main/java/appeng/me/cluster/IAECluster.java @@ -20,7 +20,6 @@ package appeng.me.cluster; import java.util.Iterator; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import appeng.api.networking.IGridHost; diff --git a/src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java b/src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java index 081e3aeb5..58f2dee72 100644 --- a/src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java +++ b/src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java @@ -33,18 +33,7 @@ import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.Direction; import alexiil.mc.lib.attributes.item.impl.EmptyFixedItemInv; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.client.model.data.IModelData; -import net.minecraftforge.client.model.data.ModelDataMap; -import net.minecraftforge.client.model.data.ModelProperty; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.wrapper.EmptyHandler; import appeng.api.definitions.IBlockDefinition; import appeng.api.networking.GridFlags; diff --git a/src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java b/src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java index f4cfb7414..0470847ae 100644 --- a/src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java +++ b/src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java @@ -24,15 +24,8 @@ import java.util.EnumSet; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.network.PacketByteBuf; import net.minecraft.util.math.Direction; -import javax.annotation.Nonnull; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.client.model.data.IModelData; -import net.minecraftforge.client.model.data.ModelDataMap; -import net.minecraftforge.client.model.data.ModelProperty; import appeng.api.networking.GridFlags; import appeng.api.networking.events.MENetworkChannelsChanged;