lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed server sided issue with Attractor Array

Browse source 
Added Movement Array, and helped generalize the Arrays a bit more
This commit is contained in:
WayofTime 2016-06-29 07:43:04 -04:00
parent 22c1f0db55
commit 1836fc742d
11 changed files with 130 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java
View file

@ -1,19 +1,28 @@
package WayofTime.bloodmagic.tile;
import lombok.Getter;
import lombok.Setter;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.SPacketUpdateTileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ITickable;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect;
import WayofTime.bloodmagic.api.iface.IAlchemyArray;
import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry;
public class TileAlchemyArray extends TileInventory implements ITickable
public class TileAlchemyArray extends TileInventory implements ITickable, IAlchemyArray
{
public boolean isActive = false;
public int activeCounter = 0;
@Getter
@Setter
public EnumFacing rotation = EnumFacing.HORIZONTALS[0];;
private String key = "empty";
private AlchemyArrayEffect arrayEffect;
@ -26,7 +35,7 @@ public class TileAlchemyArray extends TileInventory implements ITickable
{
if (arrayEffect != null)
{
arrayEffect.onEntityCollidedWithBlock(worldObj, pos, state, entity);
arrayEffect.onEntityCollidedWithBlock(this, worldObj, pos, state, entity);
}
}
@ -37,6 +46,7 @@ public class TileAlchemyArray extends TileInventory implements ITickable
this.isActive = tagCompound.getBoolean("isActive");
this.activeCounter = tagCompound.getInteger("activeCounter");
this.key = tagCompound.getString("key");
this.rotation = EnumFacing.HORIZONTALS[tagCompound.getInteger(Constants.NBT.DIRECTION)];
NBTTagCompound arrayTag = tagCompound.getCompoundTag("arrayTag");
arrayEffect = AlchemyArrayRecipeRegistry.getAlchemyArrayEffect(key);
@ -53,6 +63,7 @@ public class TileAlchemyArray extends TileInventory implements ITickable
tagCompound.setBoolean("isActive", isActive);
tagCompound.setInteger("activeCounter", activeCounter);
tagCompound.setString("key", "".equals(key) ? "empty" : key);
tagCompound.setInteger(Constants.NBT.DIRECTION, rotation.getHorizontalIndex());
NBTTagCompound arrayTag = new NBTTagCompound();
if (arrayEffect != null)