Skip to content

Commit

Permalink
Remove TEControl.handleBlockUpdate
Browse files Browse the repository at this point in the history 
it is buggy, breaking ProjectRed's Relocation in combination with Forge Multipart CBE.
Fixes #1653, fixes #1456
Also remove EnderIOProxy, since we don't support it in 1.12 and EnderIO has a rewrite incoming for future MC versions.
  • Loading branch information
@bziemons
bziemons committed Sep 25, 2022
1 parent f55d227 commit 4a0a91b
Show file tree
Hide file tree
Showing 15 changed files with 0 additions and 303 deletions.
1 change: 0 additions & 1 deletion common/logisticspipes/LPConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ private LPConstants() {}
public static final String thermalExpansionModID = "thermalexpansion";
public static final String enderCoreModID = "endercore";
public static final String neiModID = "notenoughitems";
public static final String enderioModID = "enderio";
public static final String thermalDynamicsModID = "thermaldynamics";
public static final String cclrenderModID = "cclrender";
public static final String ironChestModID = "ironchest";
Expand Down
5 changes: 0 additions & 5 deletions common/logisticspipes/LogisticsEventListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,11 +295,6 @@ public void clientLoggedIn(ClientConnectedToServerEvent event) {
}
}

@SubscribeEvent
public void onBlockUpdate(BlockEvent.NeighborNotifyEvent event) {
TEControl.handleBlockUpdate(event.getWorld(), LPTickHandler.getWorldInfo(event.getWorld()), event.getPos());
}

@SubscribeEvent
@SideOnly(Side.CLIENT)
public void onItemStackToolTip(ItemTooltipEvent event) {
Expand Down
3 changes: 0 additions & 3 deletions common/logisticspipes/LogisticsPipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@
import logisticspipes.proxy.ic2.IC2ProgressProvider;
import logisticspipes.proxy.progressprovider.MachineProgressProvider;
import logisticspipes.proxy.recipeproviders.LogisticsCraftingTable;
import logisticspipes.proxy.specialconnection.EnderIOTransceiverConnection;
import logisticspipes.proxy.specialconnection.SpecialPipeConnection;
import logisticspipes.proxy.specialconnection.SpecialTileConnection;
import logisticspipes.proxy.specialtankhandler.SpecialTankHandler;
Expand Down Expand Up @@ -486,8 +485,6 @@ public void postInit(FMLPostInitializationEvent event) {

//SimpleServiceLocator.specialpipeconnection.registerHandler(new TeleportPipes());
//SimpleServiceLocator.specialtileconnection.registerHandler(new TesseractConnection());
//SimpleServiceLocator.specialtileconnection.registerHandler(new EnderIOHyperCubeConnection());
SimpleServiceLocator.specialtileconnection.registerHandler(new EnderIOTransceiverConnection());

//SimpleServiceLocator.addCraftingRecipeProvider(LogisticsWrapperHandler.getWrappedRecipeProvider("BuildCraft|Factory", "AutoWorkbench", AutoWorkbench.class));
//SimpleServiceLocator.addCraftingRecipeProvider(LogisticsWrapperHandler.getWrappedRecipeProvider("BuildCraft|Silicon", "AssemblyAdvancedWorkbench", AssemblyAdvancedWorkbench.class));
Expand Down
1 change: 0 additions & 1 deletion common/logisticspipes/asm/te/ITileEntityChangeListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ public interface ITileEntityChangeListener {

void pipeAdded(DoubleCoordinates pos, EnumFacing side);

void pipeModified(DoubleCoordinates pos);
}
4 changes: 0 additions & 4 deletions common/logisticspipes/pipes/basic/fluid/FluidRoutedPipe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,6 @@ public void setTile(TileEntity tile) {

@Override
public boolean logisitcsIsPipeConnected(TileEntity tile, EnumFacing dir) {
if (SimpleServiceLocator.enderIOProxy.isBundledPipe(tile)) {
return SimpleServiceLocator.enderIOProxy.isFluidConduit(tile, dir.getOpposite());
}

ITankUtil tank = PipeFluidUtil.INSTANCE.getTankUtilForTE(tile, dir.getOpposite());
return (tank != null && tank.containsTanks()) || tile instanceof LogisticsTileGenericPipe;
}
Expand Down
11 changes: 0 additions & 11 deletions common/logisticspipes/proxy/ProxyManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
import logisticspipes.proxy.interfaces.ICCLProxy;
import logisticspipes.proxy.interfaces.ICCProxy;
import logisticspipes.proxy.interfaces.ICraftingRecipeProvider;
import logisticspipes.proxy.interfaces.IEnderIOProxy;
import logisticspipes.proxy.interfaces.IEnderStorageProxy;
import logisticspipes.proxy.interfaces.IIC2Proxy;
import logisticspipes.proxy.interfaces.IIronChestProxy;
Expand Down Expand Up @@ -162,16 +161,6 @@ public static void load() {
@Override public@Nonnull ItemStack getItemForPosition(World world, EntityPlayer player, RayTraceResult objectMouseOver) {return null;}
}));

SimpleServiceLocator.setEnderIOProxy(ProxyManager.getWrappedProxy(LPConstants.enderioModID, IEnderIOProxy.class, null/*EnderIOProxy.class*/, new IEnderIOProxy() {
@Override public boolean isSendAndReceive(TileEntity tile) {return false;}
@Override public boolean isTransceiver(TileEntity tile) {return false;}
@Override public List<TileEntity> getConnectedTransceivers(TileEntity tile) {return null;}
@Override public boolean isEnderIO() {return false;}
@Override public boolean isItemConduit(TileEntity tile, EnumFacing dir) {return false;}
@Override public boolean isFluidConduit(TileEntity tile, EnumFacing dir) {return false;}
@Override public boolean isBundledPipe(TileEntity tile) {return false;}
}));

SimpleServiceLocator.setIronChestProxy(ProxyManager.getWrappedProxy(LPConstants.ironChestModID, IIronChestProxy.class, IronChestProxy.class, new IIronChestProxy() {
@Override public boolean isIronChest(TileEntity tile) {return false;}
@Override public @SideOnly(Side.CLIENT) boolean isChestGui(GuiScreen gui) {return false;}
Expand Down
7 changes: 0 additions & 7 deletions common/logisticspipes/proxy/SimpleServiceLocator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import logisticspipes.proxy.interfaces.ICCLProxy;
import logisticspipes.proxy.interfaces.ICCProxy;
import logisticspipes.proxy.interfaces.ICraftingRecipeProvider;
import logisticspipes.proxy.interfaces.IEnderIOProxy;
import logisticspipes.proxy.interfaces.IEnderStorageProxy;
import logisticspipes.proxy.interfaces.IIC2Proxy;
import logisticspipes.proxy.interfaces.IIronChestProxy;
Expand Down Expand Up @@ -152,12 +151,6 @@ public static void setPipeInformationManager(PipeInformationManager manager) {
SimpleServiceLocator.pipeInformationManager = manager;
}

public static IEnderIOProxy enderIOProxy;

public static void setEnderIOProxy(IEnderIOProxy proxy) {
SimpleServiceLocator.enderIOProxy = proxy;
}

public static IIronChestProxy ironChestProxy;

public static void setIronChestProxy(IIronChestProxy proxy) {
Expand Down
23 changes: 0 additions & 23 deletions common/logisticspipes/proxy/interfaces/IEnderIOProxy.java
View file

This file was deleted.

102 changes: 0 additions & 102 deletions common/logisticspipes/proxy/specialconnection/EnderIOTransceiverConnection.java
View file

This file was deleted.

3 changes: 0 additions & 3 deletions common/logisticspipes/renderer/newpipe/LogisticsNewRenderPipe.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -743,9 +743,6 @@ private static void fillObjectsToRenderList(List<RenderEntry> objectsToRender, L
AxisAlignedBB bb = block.getCollisionBoundingBox(coords.getBlockState(pipeTile.getWorld()), pipeTile.getWorld(), coords.getBlockPos());
if (bb == null) bb = Block.FULL_BLOCK_AABB;
bounds = new double[] { bb.minY, bb.minZ, bb.minX, bb.maxY, bb.maxZ, bb.maxX };
if (SimpleServiceLocator.enderIOProxy.isItemConduit(coords.getTileEntity(pipeTile.getWorld()), dir.getOpposite()) || SimpleServiceLocator.enderIOProxy.isFluidConduit(coords.getTileEntity(pipeTile.getWorld()), dir.getOpposite())) {
bounds = new double[] { 0.0249D, 0.0249D, 0.0249D, 0.9751D, 0.9751D, 0.9751D };
}
}
double bound = bounds[dir.ordinal() / 2 + (dir.ordinal() % 2 == 0 ? 3 : 0)];
ScaleObject key = new ScaleObject(model, bound);
Expand Down
9 changes: 0 additions & 9 deletions common/logisticspipes/routing/ServerRouter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,15 +161,6 @@ public void pipeAdded(DoubleCoordinates pos, EnumFacing side) {
}
}

@Override
public void pipeModified(DoubleCoordinates pos) {
if (connectionNeedsChecking == 0) {
connectionNeedsChecking = 1;
}
if (LogisticsPipes.isDEBUG()) {
causedBy.add(pos);
}
}
};
private Set<List<ITileEntityChangeListener>> listenedPipes = new HashSet<>();
private Set<LPTileEntityObject> oldTouchedPipes = new HashSet<>();
Expand Down
69 changes: 0 additions & 69 deletions common/logisticspipes/routing/pathfinder/changedetection/LPWorldAccess.java
View file

This file was deleted.

Loading

0 comments on commit 4a0a91b

Please sign in to comment.