From d8b4f0d5527bdbbe6027b7eccecb92cfa6d501b4 Mon Sep 17 00:00:00 2001 From: Krapht Date: Sat, 11 Aug 2012 23:36:38 +0200 Subject: [PATCH] removed imports of NetworkMod, changed getCollidingBoundingBoxes to addCollidingBlockToList --- .../buildcraft/core/CoreProxy.java | 2 +- .../buildcraft/mod_BuildCraftBuilders.java | 2 +- .../buildcraft/mod_BuildCraftCore.java | 2 +- .../buildcraft/mod_BuildCraftEnergy.java | 2 +- .../buildcraft/mod_BuildCraftFactory.java | 2 +- .../buildcraft/mod_BuildCraftSilicon.java | 2 +- .../buildcraft/mod_BuildCraftTransport.java | 2 +- .../buildcraft/core/CoreProxy.java | 2 +- .../buildcraft/mod_BuildCraftBuilders.java | 2 +- .../buildcraft/mod_BuildCraftCore.java | 2 +- .../buildcraft/mod_BuildCraftEnergy.java | 2 +- .../buildcraft/mod_BuildCraftFactory.java | 2 +- .../buildcraft/mod_BuildCraftSilicon.java | 2 +- .../buildcraft/mod_BuildCraftTransport.java | 2 +- .../core/network/BuildCraftPacket.java | 2 +- common/buildcraft/factory/BlockFrame.java | 18 ++++++++++-------- .../buildcraft/transport/BlockGenericPipe.java | 17 +++++++++-------- 17 files changed, 34 insertions(+), 31 deletions(-) diff --git a/buildcraft_client/buildcraft/core/CoreProxy.java b/buildcraft_client/buildcraft/core/CoreProxy.java index 69f5408b..67b73099 100644 --- a/buildcraft_client/buildcraft/core/CoreProxy.java +++ b/buildcraft_client/buildcraft/core/CoreProxy.java @@ -31,7 +31,7 @@ import net.minecraft.src.StringTranslate; import net.minecraft.src.World; import net.minecraft.src.WorldClient; import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraft.src.forge.NetworkMod; + import cpw.mods.fml.client.SpriteHelper; import cpw.mods.fml.common.FMLCommonHandler; diff --git a/buildcraft_client/buildcraft/mod_BuildCraftBuilders.java b/buildcraft_client/buildcraft/mod_BuildCraftBuilders.java index 8a3bd1c6..4d92d219 100644 --- a/buildcraft_client/buildcraft/mod_BuildCraftBuilders.java +++ b/buildcraft_client/buildcraft/mod_BuildCraftBuilders.java @@ -12,7 +12,7 @@ package buildcraft; import buildcraft.BuildCraftBuilders; import buildcraft.builders.ClientBuilderHook; import buildcraft.core.DefaultProps; -import net.minecraft.src.forge.NetworkMod; + public class mod_BuildCraftBuilders extends NetworkMod { diff --git a/buildcraft_client/buildcraft/mod_BuildCraftCore.java b/buildcraft_client/buildcraft/mod_BuildCraftCore.java index dbfba2d2..93844410 100644 --- a/buildcraft_client/buildcraft/mod_BuildCraftCore.java +++ b/buildcraft_client/buildcraft/mod_BuildCraftCore.java @@ -21,7 +21,7 @@ import net.minecraft.src.RenderBlocks; import net.minecraft.src.RenderItem; import net.minecraft.src.Tessellator; import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraft.src.forge.NetworkMod; + import org.lwjgl.opengl.GL11; diff --git a/buildcraft_client/buildcraft/mod_BuildCraftEnergy.java b/buildcraft_client/buildcraft/mod_BuildCraftEnergy.java index 7b7af8cf..71d2a60c 100644 --- a/buildcraft_client/buildcraft/mod_BuildCraftEnergy.java +++ b/buildcraft_client/buildcraft/mod_BuildCraftEnergy.java @@ -22,7 +22,7 @@ import buildcraft.mod_BuildCraftCore.EntityRenderIndex; import net.minecraft.src.ModLoader; import net.minecraft.src.World; -import net.minecraft.src.forge.NetworkMod; + public class mod_BuildCraftEnergy extends NetworkMod { diff --git a/buildcraft_client/buildcraft/mod_BuildCraftFactory.java b/buildcraft_client/buildcraft/mod_BuildCraftFactory.java index 460d297f..69818d78 100644 --- a/buildcraft_client/buildcraft/mod_BuildCraftFactory.java +++ b/buildcraft_client/buildcraft/mod_BuildCraftFactory.java @@ -26,7 +26,7 @@ import buildcraft.factory.TileTank; import buildcraft.mod_BuildCraftCore.EntityRenderIndex; import net.minecraft.src.ModLoader; -import net.minecraft.src.forge.NetworkMod; + public class mod_BuildCraftFactory extends NetworkMod { diff --git a/buildcraft_client/buildcraft/mod_BuildCraftSilicon.java b/buildcraft_client/buildcraft/mod_BuildCraftSilicon.java index d4abc6f6..e76edd9a 100644 --- a/buildcraft_client/buildcraft/mod_BuildCraftSilicon.java +++ b/buildcraft_client/buildcraft/mod_BuildCraftSilicon.java @@ -13,7 +13,7 @@ import net.minecraft.src.Block; import net.minecraft.src.IBlockAccess; import net.minecraft.src.RenderBlocks; import net.minecraft.src.Tessellator; -import net.minecraft.src.forge.NetworkMod; + import org.lwjgl.opengl.GL11; diff --git a/buildcraft_client/buildcraft/mod_BuildCraftTransport.java b/buildcraft_client/buildcraft/mod_BuildCraftTransport.java index 7743ed89..1c84e978 100644 --- a/buildcraft_client/buildcraft/mod_BuildCraftTransport.java +++ b/buildcraft_client/buildcraft/mod_BuildCraftTransport.java @@ -23,7 +23,7 @@ import net.minecraft.src.ModLoader; import net.minecraft.src.RenderBlocks; import net.minecraft.src.TileEntity; import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraft.src.forge.NetworkMod; + public class mod_BuildCraftTransport extends NetworkMod { diff --git a/buildcraft_server/buildcraft/core/CoreProxy.java b/buildcraft_server/buildcraft/core/CoreProxy.java index 395a1cf7..973f2283 100644 --- a/buildcraft_server/buildcraft/core/CoreProxy.java +++ b/buildcraft_server/buildcraft/core/CoreProxy.java @@ -26,7 +26,7 @@ import net.minecraft.src.ItemStack; import net.minecraft.src.ModLoader; import net.minecraft.src.Packet; import net.minecraft.src.World; -import net.minecraft.src.forge.NetworkMod; + public class CoreProxy { diff --git a/buildcraft_server/buildcraft/mod_BuildCraftBuilders.java b/buildcraft_server/buildcraft/mod_BuildCraftBuilders.java index a77b95c9..9443a08e 100644 --- a/buildcraft_server/buildcraft/mod_BuildCraftBuilders.java +++ b/buildcraft_server/buildcraft/mod_BuildCraftBuilders.java @@ -10,7 +10,7 @@ package buildcraft; import buildcraft.core.DefaultProps; -import net.minecraft.src.forge.NetworkMod; + public class mod_BuildCraftBuilders extends NetworkMod { diff --git a/buildcraft_server/buildcraft/mod_BuildCraftCore.java b/buildcraft_server/buildcraft/mod_BuildCraftCore.java index 6ff6d16e..038829e9 100644 --- a/buildcraft_server/buildcraft/mod_BuildCraftCore.java +++ b/buildcraft_server/buildcraft/mod_BuildCraftCore.java @@ -16,7 +16,7 @@ import buildcraft.core.DefaultProps; import net.minecraft.server.MinecraftServer; import net.minecraft.src.ModLoader; -import net.minecraft.src.forge.NetworkMod; + public class mod_BuildCraftCore extends NetworkMod { diff --git a/buildcraft_server/buildcraft/mod_BuildCraftEnergy.java b/buildcraft_server/buildcraft/mod_BuildCraftEnergy.java index 29d85f4f..6dd2e6af 100644 --- a/buildcraft_server/buildcraft/mod_BuildCraftEnergy.java +++ b/buildcraft_server/buildcraft/mod_BuildCraftEnergy.java @@ -16,7 +16,7 @@ import buildcraft.energy.TileEngine; import net.minecraft.src.ModLoader; import net.minecraft.src.World; -import net.minecraft.src.forge.NetworkMod; + public class mod_BuildCraftEnergy extends NetworkMod { diff --git a/buildcraft_server/buildcraft/mod_BuildCraftFactory.java b/buildcraft_server/buildcraft/mod_BuildCraftFactory.java index 861d728e..8e924d5c 100644 --- a/buildcraft_server/buildcraft/mod_BuildCraftFactory.java +++ b/buildcraft_server/buildcraft/mod_BuildCraftFactory.java @@ -10,7 +10,7 @@ package buildcraft; import buildcraft.core.DefaultProps; -import net.minecraft.src.forge.NetworkMod; + public class mod_BuildCraftFactory extends NetworkMod { diff --git a/buildcraft_server/buildcraft/mod_BuildCraftSilicon.java b/buildcraft_server/buildcraft/mod_BuildCraftSilicon.java index a1463097..5773c7fe 100644 --- a/buildcraft_server/buildcraft/mod_BuildCraftSilicon.java +++ b/buildcraft_server/buildcraft/mod_BuildCraftSilicon.java @@ -10,7 +10,7 @@ package buildcraft; import buildcraft.core.DefaultProps; -import net.minecraft.src.forge.NetworkMod; + public class mod_BuildCraftSilicon extends NetworkMod { diff --git a/buildcraft_server/buildcraft/mod_BuildCraftTransport.java b/buildcraft_server/buildcraft/mod_BuildCraftTransport.java index 87ccf540..85fa12b5 100644 --- a/buildcraft_server/buildcraft/mod_BuildCraftTransport.java +++ b/buildcraft_server/buildcraft/mod_BuildCraftTransport.java @@ -12,7 +12,7 @@ package buildcraft; import buildcraft.core.DefaultProps; import net.minecraft.src.ModLoader; import net.minecraft.src.TileEntity; -import net.minecraft.src.forge.NetworkMod; + public class mod_BuildCraftTransport extends NetworkMod { diff --git a/common/buildcraft/core/network/BuildCraftPacket.java b/common/buildcraft/core/network/BuildCraftPacket.java index 11df4cff..0afe9d72 100644 --- a/common/buildcraft/core/network/BuildCraftPacket.java +++ b/common/buildcraft/core/network/BuildCraftPacket.java @@ -8,7 +8,7 @@ import buildcraft.core.DefaultProps; import net.minecraft.src.Packet; import net.minecraft.src.Packet250CustomPayload; -import net.minecraft.src.forge.packets.ForgePacket; + public abstract class BuildCraftPacket extends ForgePacket { diff --git a/common/buildcraft/factory/BlockFrame.java b/common/buildcraft/factory/BlockFrame.java index d41ced5a..2336fe8c 100644 --- a/common/buildcraft/factory/BlockFrame.java +++ b/common/buildcraft/factory/BlockFrame.java @@ -10,6 +10,7 @@ package buildcraft.factory; import java.util.ArrayList; +import java.util.List; import java.util.Random; import buildcraft.BuildCraftCore; @@ -19,6 +20,7 @@ import buildcraft.core.Utils; import net.minecraft.src.AxisAlignedBB; import net.minecraft.src.Block; +import net.minecraft.src.Entity; import net.minecraft.src.IBlockAccess; import net.minecraft.src.ItemStack; import net.minecraft.src.Material; @@ -108,38 +110,38 @@ public class BlockFrame extends Block implements IFramePipeConnection { @SuppressWarnings("rawtypes") @Override - public void getCollidingBoundingBoxes(World world, int i, int j, int k, AxisAlignedBB axisalignedbb, ArrayList arraylist) { + public void addCollidingBlockToList(World world, int i, int j, int k, AxisAlignedBB axisalignedbb, List arraylist, Entity par7Entity) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.getCollidingBoundingBoxes(world, i, j, k, axisalignedbb, arraylist); + super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); if (Utils.checkLegacyPipesConnections(world, i, j, k, i - 1, j, k)) { setBlockBounds(0.0F, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.getCollidingBoundingBoxes(world, i, j, k, axisalignedbb, arraylist); + super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkLegacyPipesConnections(world, i, j, k, i + 1, j, k)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, 1.0F, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.getCollidingBoundingBoxes(world, i, j, k, axisalignedbb, arraylist); + super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkLegacyPipesConnections(world, i, j, k, i, j - 1, k)) { setBlockBounds(Utils.pipeMinPos, 0.0F, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.getCollidingBoundingBoxes(world, i, j, k, axisalignedbb, arraylist); + super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkLegacyPipesConnections(world, i, j, k, i, j + 1, k)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, 1.0F, Utils.pipeMaxPos); - super.getCollidingBoundingBoxes(world, i, j, k, axisalignedbb, arraylist); + super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkLegacyPipesConnections(world, i, j, k, i, j, k - 1)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, 0.0F, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.getCollidingBoundingBoxes(world, i, j, k, axisalignedbb, arraylist); + super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkLegacyPipesConnections(world, i, j, k, i, j, k + 1)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, 1.0F); - super.getCollidingBoundingBoxes(world, i, j, k, axisalignedbb, arraylist); + super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 97ad6eff..1152f137 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -10,6 +10,7 @@ package buildcraft.transport; import java.util.ArrayList; +import java.util.List; import java.util.Random; import java.util.TreeMap; @@ -65,40 +66,40 @@ public class BlockGenericPipe extends BlockContainer { @SuppressWarnings("rawtypes") @Override - public void getCollidingBoundingBoxes(World world, int i, int j, int k, AxisAlignedBB axisalignedbb, ArrayList arraylist) { + public void addCollidingBlockToList(World world, int i, int j, int k, AxisAlignedBB axisalignedbb, List arraylist, Entity par7Entity) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.getCollidingBoundingBoxes(world, i, j, k, axisalignedbb, arraylist); + super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); TileEntity tile1 = world.getBlockTileEntity(i, j, k); if (Utils.checkPipesConnections(world, tile1, i - 1, j, k)) { setBlockBounds(0.0F, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.getCollidingBoundingBoxes(world, i, j, k, axisalignedbb, arraylist); + super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkPipesConnections(world, tile1, i + 1, j, k)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, 1.0F, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.getCollidingBoundingBoxes(world, i, j, k, axisalignedbb, arraylist); + super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkPipesConnections(world, tile1, i, j - 1, k)) { setBlockBounds(Utils.pipeMinPos, 0.0F, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.getCollidingBoundingBoxes(world, i, j, k, axisalignedbb, arraylist); + super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkPipesConnections(world, tile1, i, j + 1, k)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, 1.0F, Utils.pipeMaxPos); - super.getCollidingBoundingBoxes(world, i, j, k, axisalignedbb, arraylist); + super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkPipesConnections(world, tile1, i, j, k - 1)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, 0.0F, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.getCollidingBoundingBoxes(world, i, j, k, axisalignedbb, arraylist); + super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkPipesConnections(world, tile1, i, j, k + 1)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, 1.0F); - super.getCollidingBoundingBoxes(world, i, j, k, axisalignedbb, arraylist); + super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);