1.7.10 ready

Electrical-Age · Jul 18, 2014 · badc964 · badc964
1 parent 1f399ca
commit badc964
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 21 deletions.
diff --git a/mods/eln/node/six/SixNodeBlock.java b/mods/eln/node/six/SixNodeBlock.java
@@ -418,7 +418,7 @@ public MovingObjectPosition collisionRayTrace(World world, int x, int y, int z,
 
 		// double distanceMax = (double)Minecraft.getMinecraft().playerController.getBlockReachDistance();
 		double distanceMax = 5.0;
-		Vec3 start = Vec3.fakePool.getVecFromPool(entityLiving.posX, entityLiving.posY, entityLiving.posZ);
+		Vec3 start = Vec3.createVectorHelper(entityLiving.posX, entityLiving.posY, entityLiving.posZ);
 
 		if (!world.isRemote) start.yCoord += 1.62;
 		Vec3 var5 = entityLiving.getLook(0.5f);

diff --git a/mods/eln/node/transparent/TransparentNodeBlock.java b/mods/eln/node/transparent/TransparentNodeBlock.java
@@ -1,31 +1,20 @@
 package mods.eln.node.transparent;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
 import mods.eln.Eln;
-import mods.eln.misc.Direction;
 import mods.eln.node.INodeInfo;
 import mods.eln.node.NodeBase;
 import mods.eln.node.NodeBlock;
 import mods.eln.node.NodeBlockEntity;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.Minecraft;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.util.Vec3;
-import net.minecraft.util.Vec3Pool;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 

diff --git a/mods/eln/sixnode/lampsocket/LampSocketProcess.java b/mods/eln/sixnode/lampsocket/LampSocketProcess.java
@@ -5,7 +5,6 @@
 import java.io.IOException;
 import java.util.ArrayList;
 
-import cpw.mods.fml.relauncher.Side;
 import mods.eln.Eln;
 import mods.eln.generic.GenericItemUsingDamage;
 import mods.eln.generic.GenericItemUsingDamageDescriptor;
@@ -14,25 +13,17 @@
 import mods.eln.misc.Coordonate;
 import mods.eln.misc.INBTTReady;
 import mods.eln.misc.Utils;
-import mods.eln.node.NodeServer;
-import mods.eln.node.six.SixNode;
 import mods.eln.server.SaveConfig;
-import mods.eln.sim.ElectricalConnection;
 import mods.eln.sim.IProcess;
-import mods.eln.sim.Simulator;
-import mods.eln.sixnode.lampsocket.LightBlockEntity.LightBlockObserver;
 import mods.eln.sixnode.lampsupply.LampSupplyElement;
 import mods.eln.sound.SoundCommand;
 import mods.eln.sound.SoundLooper;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockCrops;
-import net.minecraft.block.BlockFarmland;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.Vec3;
-import net.minecraft.util.Vec3Pool;
 
 public class LampSocketProcess implements IProcess, INBTTReady/*
 * ,LightBlockObserver