Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated imports with new forge package locations

Browse source 
Realigned old Vec3d class to new name Vec3
This commit is contained in:
Krapht 2012-08-11 17:38:39 +02:00
parent 518b33252c
commit 62a5cb1bb4
31 changed files with 49 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
buildcraft_client/buildcraft/core/CoreProxy.java
View file

@ -30,7 +30,7 @@ import net.minecraft.src.Packet;
import net.minecraft.src.StringTranslate; import net.minecraft.src.StringTranslate;
import net.minecraft.src.World; import net.minecraft.src.World;
import net.minecraft.src.WorldClient; import net.minecraft.src.WorldClient;
import net.minecraft.src.forge.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraft.src.forge.NetworkMod; import net.minecraft.src.forge.NetworkMod;
import cpw.mods.fml.client.SpriteHelper; import cpw.mods.fml.client.SpriteHelper;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;

2
buildcraft_client/buildcraft/core/RenderEntityBlock.java
View file

@ -15,7 +15,7 @@ import net.minecraft.src.IBlockAccess;
import net.minecraft.src.Render; import net.minecraft.src.Render;
import net.minecraft.src.Tessellator; import net.minecraft.src.Tessellator;
import net.minecraft.src.World; import net.minecraft.src.World;
import net.minecraft.src.forge.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

2
buildcraft_client/buildcraft/core/RenderLaser.java
View file

@ -4,7 +4,7 @@ import net.minecraft.src.Entity;
import net.minecraft.src.ModelBase; import net.minecraft.src.ModelBase;
import net.minecraft.src.ModelRenderer; import net.minecraft.src.ModelRenderer;
import net.minecraft.src.Render; import net.minecraft.src.Render;
import net.minecraft.src.forge.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

2
buildcraft_client/buildcraft/core/RenderRobot.java
View file

@ -4,7 +4,7 @@ import net.minecraft.src.Entity;
import net.minecraft.src.ModelBase; import net.minecraft.src.ModelBase;
import net.minecraft.src.ModelRenderer; import net.minecraft.src.ModelRenderer;
import net.minecraft.src.Render; import net.minecraft.src.Render;
import net.minecraft.src.forge.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

2
buildcraft_client/buildcraft/core/TextureLiquidsFX.java
View file

@ -10,7 +10,7 @@
package buildcraft.core; package buildcraft.core;
import net.minecraft.src.RenderEngine; import net.minecraft.src.RenderEngine;
import net.minecraft.src.forge.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;
import cpw.mods.fml.client.FMLTextureFX; import cpw.mods.fml.client.FMLTextureFX;
public class TextureLiquidsFX extends FMLTextureFX { public class TextureLiquidsFX extends FMLTextureFX {

2
buildcraft_client/buildcraft/energy/GuiCombustionEngine.java
View file

@ -13,7 +13,7 @@ import net.minecraft.src.Block;
import net.minecraft.src.InventoryPlayer; import net.minecraft.src.InventoryPlayer;
import net.minecraft.src.Item; import net.minecraft.src.Item;
import net.minecraft.src.forge.ITextureProvider; import net.minecraft.src.forge.ITextureProvider;
import net.minecraft.src.forge.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

2
buildcraft_client/buildcraft/energy/RenderEngine.java
View file

@ -13,7 +13,7 @@ import net.minecraft.src.ModelBase;
import net.minecraft.src.ModelRenderer; import net.minecraft.src.ModelRenderer;
import net.minecraft.src.TileEntity; import net.minecraft.src.TileEntity;
import net.minecraft.src.TileEntitySpecialRenderer; import net.minecraft.src.TileEntitySpecialRenderer;
import net.minecraft.src.forge.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

2
buildcraft_client/buildcraft/factory/RenderHopper.java
View file

@ -5,7 +5,7 @@ import net.minecraft.src.ModelRenderer;
import net.minecraft.src.Tessellator; import net.minecraft.src.Tessellator;
import net.minecraft.src.TileEntity; import net.minecraft.src.TileEntity;
import net.minecraft.src.TileEntitySpecialRenderer; import net.minecraft.src.TileEntitySpecialRenderer;
import net.minecraft.src.forge.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

2
buildcraft_client/buildcraft/factory/RenderRefinery.java
View file

@ -20,7 +20,7 @@ import net.minecraft.src.TileEntity;
import net.minecraft.src.TileEntitySpecialRenderer; import net.minecraft.src.TileEntitySpecialRenderer;
import net.minecraft.src.World; import net.minecraft.src.World;
import net.minecraft.src.forge.ITextureProvider; import net.minecraft.src.forge.ITextureProvider;
import net.minecraft.src.forge.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

2
buildcraft_client/buildcraft/factory/RenderTank.java
View file

@ -18,7 +18,7 @@ import net.minecraft.src.TileEntity;
import net.minecraft.src.TileEntitySpecialRenderer; import net.minecraft.src.TileEntitySpecialRenderer;
import net.minecraft.src.World; import net.minecraft.src.World;
import net.minecraft.src.forge.ITextureProvider; import net.minecraft.src.forge.ITextureProvider;
import net.minecraft.src.forge.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

2
buildcraft_client/buildcraft/mod_BuildCraftCore.java
View file

@ -20,7 +20,7 @@ import net.minecraft.src.ModLoader;
import net.minecraft.src.RenderBlocks; import net.minecraft.src.RenderBlocks;
import net.minecraft.src.RenderItem; import net.minecraft.src.RenderItem;
import net.minecraft.src.Tessellator; import net.minecraft.src.Tessellator;
import net.minecraft.src.forge.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraft.src.forge.NetworkMod; import net.minecraft.src.forge.NetworkMod;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

2
buildcraft_client/buildcraft/mod_BuildCraftTransport.java
View file

@ -22,7 +22,7 @@ import net.minecraft.src.IBlockAccess;
import net.minecraft.src.ModLoader; import net.minecraft.src.ModLoader;
import net.minecraft.src.RenderBlocks; import net.minecraft.src.RenderBlocks;
import net.minecraft.src.TileEntity; import net.minecraft.src.TileEntity;
import net.minecraft.src.forge.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraft.src.forge.NetworkMod; import net.minecraft.src.forge.NetworkMod;
public class mod_BuildCraftTransport extends NetworkMod { public class mod_BuildCraftTransport extends NetworkMod {

4
buildcraft_client/buildcraft/transport/FacadeItemRenderer.java
View file

@ -11,8 +11,8 @@ import net.minecraft.src.Block;
import net.minecraft.src.ItemStack; import net.minecraft.src.ItemStack;
import net.minecraft.src.RenderBlocks; import net.minecraft.src.RenderBlocks;
import net.minecraft.src.Tessellator; import net.minecraft.src.Tessellator;
import net.minecraft.src.forge.IItemRenderer; import net.minecraftforge.client.IItemRenderer;
import net.minecraft.src.forge.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;
public class FacadeItemRenderer implements IItemRenderer { public class FacadeItemRenderer implements IItemRenderer {

2
buildcraft_client/buildcraft/transport/PipeItemRenderer.java
View file

@ -11,7 +11,7 @@ import net.minecraft.src.Item;
import net.minecraft.src.ItemStack; import net.minecraft.src.ItemStack;
import net.minecraft.src.RenderBlocks; import net.minecraft.src.RenderBlocks;
import net.minecraft.src.Tessellator; import net.minecraft.src.Tessellator;
import net.minecraft.src.forge.IItemRenderer; import net.minecraftforge.client.IItemRenderer;
public class PipeItemRenderer implements IItemRenderer { public class PipeItemRenderer implements IItemRenderer {

2
buildcraft_client/buildcraft/transport/PipeWorldRenderer.java
View file

@ -20,7 +20,7 @@ import net.minecraft.src.Item;
import net.minecraft.src.ItemBlock; import net.minecraft.src.ItemBlock;
import net.minecraft.src.ItemStack; import net.minecraft.src.ItemStack;
import net.minecraft.src.RenderBlocks; import net.minecraft.src.RenderBlocks;
import net.minecraft.src.forge.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;
public class PipeWorldRenderer { public class PipeWorldRenderer {

6
buildcraft_client/buildcraft/transport/RenderPipe.java
View file

@ -25,10 +25,10 @@ import net.minecraft.src.TileEntity;
import net.minecraft.src.TileEntitySpecialRenderer; import net.minecraft.src.TileEntitySpecialRenderer;
import net.minecraft.src.World; import net.minecraft.src.World;
import net.minecraft.src.forge.ForgeHooksClient; import net.minecraft.src.forge.ForgeHooksClient;
import net.minecraft.src.forge.IItemRenderer; import net.minecraftforge.client.IItemRenderer;
import net.minecraft.src.forge.IItemRenderer.ItemRenderType; import net.minecraftforge.client.IItemRenderer.ItemRenderType;
import net.minecraft.src.forge.ITextureProvider; import net.minecraft.src.forge.ITextureProvider;
import net.minecraft.src.forge.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

6
common/buildcraft/BuildCraftBuilders.java
View file

@ -71,9 +71,9 @@ import net.minecraft.src.Block;
import net.minecraft.src.CraftingManager; import net.minecraft.src.CraftingManager;
import net.minecraft.src.Item; import net.minecraft.src.Item;
import net.minecraft.src.ItemStack; import net.minecraft.src.ItemStack;
import net.minecraft.src.forge.Configuration; import net.minecraftforge.common.Configuration;
import net.minecraft.src.forge.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraft.src.forge.Property; import net.minecraftforge.common.Property;
public class BuildCraftBuilders { public class BuildCraftBuilders {

6
common/buildcraft/BuildCraftCore.java
View file

@ -46,9 +46,9 @@ import net.minecraft.src.CraftingManager;
import net.minecraft.src.Item; import net.minecraft.src.Item;
import net.minecraft.src.ItemStack; import net.minecraft.src.ItemStack;
import net.minecraft.src.ModLoader; import net.minecraft.src.ModLoader;
import net.minecraft.src.forge.Configuration; import net.minecraftforge.common.Configuration;
import net.minecraft.src.forge.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraft.src.forge.Property; import net.minecraftforge.common.Property;
public class BuildCraftCore { public class BuildCraftCore {

6
common/buildcraft/BuildCraftEnergy.java
View file

@ -42,9 +42,9 @@ import net.minecraft.src.Item;
import net.minecraft.src.ItemStack; import net.minecraft.src.ItemStack;
import net.minecraft.src.Material; import net.minecraft.src.Material;
import net.minecraft.src.World; import net.minecraft.src.World;
import net.minecraft.src.forge.Configuration; import net.minecraftforge.common.Configuration;
import net.minecraft.src.forge.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraft.src.forge.Property; import net.minecraftforge.common.Property;
public class BuildCraftEnergy { public class BuildCraftEnergy {

6
common/buildcraft/BuildCraftFactory.java
View file

@ -40,9 +40,9 @@ import net.minecraft.src.Block;
import net.minecraft.src.CraftingManager; import net.minecraft.src.CraftingManager;
import net.minecraft.src.Item; import net.minecraft.src.Item;
import net.minecraft.src.ItemStack; import net.minecraft.src.ItemStack;
import net.minecraft.src.forge.Configuration; import net.minecraftforge.common.Configuration;
import net.minecraft.src.forge.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraft.src.forge.Property; import net.minecraftforge.common.Property;
public class BuildCraftFactory { public class BuildCraftFactory {

4
common/buildcraft/BuildCraftSilicon.java
View file

@ -26,8 +26,8 @@ import net.minecraft.src.CraftingManager;
import net.minecraft.src.Item; import net.minecraft.src.Item;
import net.minecraft.src.ItemStack; import net.minecraft.src.ItemStack;
import net.minecraft.src.ModLoader; import net.minecraft.src.ModLoader;
import net.minecraft.src.forge.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraft.src.forge.Property; import net.minecraftforge.common.Property;
public class BuildCraftSilicon { public class BuildCraftSilicon {

6
common/buildcraft/BuildCraftTransport.java
View file

@ -75,9 +75,9 @@ import net.minecraft.src.Item;
import net.minecraft.src.ItemStack; import net.minecraft.src.ItemStack;
import net.minecraft.src.ModLoader; import net.minecraft.src.ModLoader;
import net.minecraft.src.World; import net.minecraft.src.World;
import net.minecraft.src.forge.Configuration; import net.minecraftforge.common.Configuration;
import net.minecraft.src.forge.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraft.src.forge.Property; import net.minecraftforge.common.Property;
public class BuildCraftTransport { public class BuildCraftTransport {

4
common/buildcraft/builders/BlockMarker.java
View file

@ -25,7 +25,7 @@ import net.minecraft.src.ItemStack;
import net.minecraft.src.Material; import net.minecraft.src.Material;
import net.minecraft.src.MovingObjectPosition; import net.minecraft.src.MovingObjectPosition;
import net.minecraft.src.TileEntity; import net.minecraft.src.TileEntity;
import net.minecraft.src.Vec3D; import net.minecraft.src.Vec3;
import net.minecraft.src.World; import net.minecraft.src.World;
import net.minecraft.src.forge.ITextureProvider; import net.minecraft.src.forge.ITextureProvider;
@ -138,7 +138,7 @@ public class BlockMarker extends BlockContainer implements ITextureProvider {
} }
@Override @Override
public MovingObjectPosition collisionRayTrace(World world, int i, int j, int k, Vec3D vec3d, Vec3D vec3d1) { public MovingObjectPosition collisionRayTrace(World world, int i, int j, int k, Vec3 vec3d, Vec3 vec3d1) {
return Block.torchWood.collisionRayTrace(world, i, j, k, vec3d, vec3d1); return Block.torchWood.collisionRayTrace(world, i, j, k, vec3d, vec3d1);
} }

4
common/buildcraft/core/BuildCraftConfiguration.java
View file

@ -17,8 +17,8 @@ import java.util.Properties;
import buildcraft.mod_BuildCraftCore; import buildcraft.mod_BuildCraftCore;
import buildcraft.core.CoreProxy; import buildcraft.core.CoreProxy;
import net.minecraft.src.forge.Configuration; import net.minecraftforge.common.Configuration;
import net.minecraft.src.forge.Property; import net.minecraftforge.common.Property;
public class BuildCraftConfiguration extends Configuration { public class BuildCraftConfiguration extends Configuration {

2
common/buildcraft/core/StackUtil.java
View file

@ -19,7 +19,7 @@ import net.minecraft.src.IInventory;
import net.minecraft.src.ItemStack; import net.minecraft.src.ItemStack;
import net.minecraft.src.TileEntity; import net.minecraft.src.TileEntity;
import net.minecraft.src.World; import net.minecraft.src.World;
import net.minecraft.src.forge.ISidedInventory; import net.minecraftforge.common.ISidedInventory;
public class StackUtil { public class StackUtil {

2
common/buildcraft/core/utils/SidedInventoryAdapter.java
View file

@ -4,7 +4,7 @@ import buildcraft.api.core.Orientations;
import net.minecraft.src.EntityPlayer; import net.minecraft.src.EntityPlayer;
import net.minecraft.src.IInventory; import net.minecraft.src.IInventory;
import net.minecraft.src.ItemStack; import net.minecraft.src.ItemStack;
import net.minecraft.src.forge.ISidedInventory; import net.minecraftforge.common.ISidedInventory;
/** /**
* This class is responsible for abstracting an ISidedInventory as a normal * This class is responsible for abstracting an ISidedInventory as a normal

4
common/buildcraft/factory/BlockFrame.java
View file

@ -23,7 +23,7 @@ import net.minecraft.src.IBlockAccess;
import net.minecraft.src.ItemStack; import net.minecraft.src.ItemStack;
import net.minecraft.src.Material; import net.minecraft.src.Material;
import net.minecraft.src.MovingObjectPosition; import net.minecraft.src.MovingObjectPosition;
import net.minecraft.src.Vec3D; import net.minecraft.src.Vec3;
import net.minecraft.src.World; import net.minecraft.src.World;
import net.minecraft.src.forge.ITextureProvider; import net.minecraft.src.forge.ITextureProvider;
@ -146,7 +146,7 @@ public class BlockFrame extends Block implements IFramePipeConnection, ITextureP
} }
@Override @Override
public MovingObjectPosition collisionRayTrace(World world, int i, int j, int k, Vec3D vec3d, Vec3D vec3d1) { public MovingObjectPosition collisionRayTrace(World world, int i, int j, int k, Vec3 vec3d, Vec3 vec3d1) {
float xMin = Utils.pipeMinPos, xMax = Utils.pipeMaxPos, yMin = Utils.pipeMinPos, yMax = Utils.pipeMaxPos, zMin = Utils.pipeMinPos, zMax = Utils.pipeMaxPos; float xMin = Utils.pipeMinPos, xMax = Utils.pipeMaxPos, yMin = Utils.pipeMinPos, yMax = Utils.pipeMaxPos, zMin = Utils.pipeMinPos, zMax = Utils.pipeMaxPos;
if (Utils.checkLegacyPipesConnections(world, i, j, k, i - 1, j, k)) { if (Utils.checkLegacyPipesConnections(world, i, j, k, i - 1, j, k)) {

2
common/buildcraft/factory/ContainerAutoWorkbench.java
View file

@ -20,7 +20,7 @@ import net.minecraft.src.InventoryPlayer;
import net.minecraft.src.Item; import net.minecraft.src.Item;
import net.minecraft.src.ItemStack; import net.minecraft.src.ItemStack;
import net.minecraft.src.Slot; import net.minecraft.src.Slot;
import net.minecraft.src.forge.ForgeHooks; import net.minecraftforge.common.ForgeHooks;
public class ContainerAutoWorkbench extends BuildCraftContainer { public class ContainerAutoWorkbench extends BuildCraftContainer {

2
common/buildcraft/factory/TileHopper.java
View file

@ -12,7 +12,7 @@ import net.minecraft.src.IInventory;
import net.minecraft.src.ItemStack; import net.minecraft.src.ItemStack;
import net.minecraft.src.NBTTagCompound; import net.minecraft.src.NBTTagCompound;
import net.minecraft.src.TileEntity; import net.minecraft.src.TileEntity;
import net.minecraft.src.forge.ISidedInventory; import net.minecraftforge.common.ISidedInventory;
public class TileHopper extends TileBuildCraft implements IInventory { public class TileHopper extends TileBuildCraft implements IInventory {

4
common/buildcraft/transport/BlockGenericPipe.java
View file

@ -31,7 +31,7 @@ import net.minecraft.src.ItemStack;
import net.minecraft.src.Material; import net.minecraft.src.Material;
import net.minecraft.src.MovingObjectPosition; import net.minecraft.src.MovingObjectPosition;
import net.minecraft.src.TileEntity; import net.minecraft.src.TileEntity;
import net.minecraft.src.Vec3D; import net.minecraft.src.Vec3;
import net.minecraft.src.World; import net.minecraft.src.World;
import net.minecraft.src.forge.ITextureProvider; import net.minecraft.src.forge.ITextureProvider;
@ -139,7 +139,7 @@ public class BlockGenericPipe extends BlockContainer implements ITextureProvider
} }
@Override @Override
public MovingObjectPosition collisionRayTrace(World world, int i, int j, int k, Vec3D vec3d, Vec3D vec3d1) { public MovingObjectPosition collisionRayTrace(World world, int i, int j, int k, Vec3 vec3d, Vec3 vec3d1) {
float xMin = Utils.pipeMinPos, xMax = Utils.pipeMaxPos, yMin = Utils.pipeMinPos, yMax = Utils.pipeMaxPos, zMin = Utils.pipeMinPos, zMax = Utils.pipeMaxPos; float xMin = Utils.pipeMinPos, xMax = Utils.pipeMaxPos, yMin = Utils.pipeMinPos, yMax = Utils.pipeMaxPos, zMin = Utils.pipeMinPos, zMax = Utils.pipeMaxPos;
TileEntity tile1 = world.getBlockTileEntity(i, j, k); TileEntity tile1 = world.getBlockTileEntity(i, j, k);

2
common/buildcraft/transport/pipes/PipeItemsWood.java
View file

@ -29,7 +29,7 @@ import net.minecraft.src.IInventory;
import net.minecraft.src.ItemStack; import net.minecraft.src.ItemStack;
import net.minecraft.src.TileEntity; import net.minecraft.src.TileEntity;
import net.minecraft.src.World; import net.minecraft.src.World;
import net.minecraft.src.forge.ISidedInventory; import net.minecraftforge.common.ISidedInventory;
public class PipeItemsWood extends Pipe implements IPowerReceptor { public class PipeItemsWood extends Pipe implements IPowerReceptor {