Update UE
This commit is contained in:
parent
85a2c981df
commit
7555fbee7c
2 changed files with 65 additions and 118 deletions
|
@ -1,64 +0,0 @@
|
||||||
package universalelectricity.prefab;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collection;
|
|
||||||
|
|
||||||
import net.minecraft.tileentity.TileEntity;
|
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
|
||||||
import net.minecraftforge.event.ForgeSubscribe;
|
|
||||||
import net.minecraftforge.event.world.ChunkEvent;
|
|
||||||
import universalelectricity.core.block.INetworkConnection;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A helper class to register chunk loading for your wires if you need them to be refreshed upon
|
|
||||||
* chunk load. This prevents the need for your wire to be refreshed.
|
|
||||||
*
|
|
||||||
* @author Calclavia, Aidancbrady
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class ConductorChunkInitiate
|
|
||||||
{
|
|
||||||
private static boolean onChunkLoadRegistered = false;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Registers and initiates Universal Electricity's network loader.
|
|
||||||
*/
|
|
||||||
public static void register()
|
|
||||||
{
|
|
||||||
if (!onChunkLoadRegistered)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
MinecraftForge.EVENT_BUS.register(new ConductorChunkInitiate());
|
|
||||||
onChunkLoadRegistered = true;
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ForgeSubscribe
|
|
||||||
public void onChunkLoad(ChunkEvent.Load event)
|
|
||||||
{
|
|
||||||
if (event.getChunk() != null)
|
|
||||||
{
|
|
||||||
Collection<?> collection = new ArrayList();
|
|
||||||
collection.addAll(event.getChunk().chunkTileEntityMap.values());
|
|
||||||
|
|
||||||
for (Object obj : collection)
|
|
||||||
{
|
|
||||||
if (obj instanceof TileEntity)
|
|
||||||
{
|
|
||||||
TileEntity tileEntity = (TileEntity) obj;
|
|
||||||
|
|
||||||
if (tileEntity instanceof INetworkConnection)
|
|
||||||
{
|
|
||||||
((INetworkConnection) tileEntity).refresh();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -8,11 +8,15 @@ import net.minecraft.util.MathHelper;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
import net.minecraftforge.common.ForgeDirection;
|
||||||
|
|
||||||
/** A block that can rotate based on placed position and wrenching.
|
/**
|
||||||
|
* A block that can rotate based on placed position and wrenching.
|
||||||
*
|
*
|
||||||
* @author Calclavia */
|
* @author Calclavia
|
||||||
|
*/
|
||||||
public abstract class BlockRotatable extends BlockTile implements IRotatableBlock
|
public abstract class BlockRotatable extends BlockTile implements IRotatableBlock
|
||||||
{
|
{
|
||||||
|
protected byte rotationMask = 60;
|
||||||
|
|
||||||
public BlockRotatable(int id, Material material)
|
public BlockRotatable(int id, Material material)
|
||||||
{
|
{
|
||||||
super(id, material);
|
super(id, material);
|
||||||
|
@ -49,18 +53,25 @@ public abstract class BlockRotatable extends BlockTile implements IRotatableBloc
|
||||||
@Override
|
@Override
|
||||||
public boolean onUseWrench(World world, int x, int y, int z, EntityPlayer par5EntityPlayer, int side, float hitX, float hitY, float hitZ)
|
public boolean onUseWrench(World world, int x, int y, int z, EntityPlayer par5EntityPlayer, int side, float hitX, float hitY, float hitZ)
|
||||||
{
|
{
|
||||||
this.rotateBlock(world, x, y, z, ForgeDirection.getOrientation(side));
|
return this.rotateBlock(world, x, y, z, ForgeDirection.getOrientation(side));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean rotateBlock(World worldObj, int x, int y, int z, ForgeDirection axis)
|
||||||
|
{
|
||||||
|
int currentRotMeta = worldObj.getBlockMetadata(x, y, z);
|
||||||
|
ForgeDirection orientation = ForgeDirection.getOrientation(currentRotMeta);
|
||||||
|
ForgeDirection rotated = orientation.getRotation(axis);
|
||||||
|
int rmeta = rotated.ordinal();
|
||||||
|
int rmetaBit = 1 << rmeta;
|
||||||
|
System.out.println(rmetaBit + ": " + (rmetaBit & this.rotationMask));
|
||||||
|
if ((rmetaBit & this.rotationMask) == rmetaBit)
|
||||||
|
{
|
||||||
|
worldObj.setBlockMetadataWithNotify(x, y, z, rmeta, 3);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean rotateBlock(World worldObj, int x, int y, int z, ForgeDirection axis, int mask)
|
return false;
|
||||||
{
|
|
||||||
int rotMeta = worldObj.getBlockMetadata(x, y, z);
|
|
||||||
int masked = rotMeta & ~mask;
|
|
||||||
ForgeDirection orientation = ForgeDirection.getOrientation(rotMeta & mask);
|
|
||||||
ForgeDirection rotated = orientation.getRotation(axis);
|
|
||||||
worldObj.setBlockMetadataWithNotify(x, y, z, rotated.ordinal() & mask | masked, 3);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in a new issue