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

Added the ability to set the array to no longer drop its ingredients.

Browse source 
- I need to just change all of the files to my format, so Nut doesn't cry each push.
This commit is contained in:
WayofTime 2018-03-04 09:36:03 -05:00
parent e2f7772e82
commit 986852e265
1 changed files with 81 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,61 +1,78 @@
package WayofTime.bloodmagic.tile; package WayofTime.bloodmagic.tile;
import WayofTime.bloodmagic.api.impl.BloodMagicAPI;
import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray;
import WayofTime.bloodmagic.util.Constants;
import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect;
import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectCraftingNew;
import WayofTime.bloodmagic.iface.IAlchemyArray;
import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.ITickable; import net.minecraft.util.ITickable;
import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffect;
import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectCraftingNew;
import WayofTime.bloodmagic.api.impl.BloodMagicAPI;
import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyArray;
import WayofTime.bloodmagic.core.registry.AlchemyArrayRecipeRegistry;
import WayofTime.bloodmagic.iface.IAlchemyArray;
import WayofTime.bloodmagic.util.Constants;
public class TileAlchemyArray extends TileInventory implements ITickable, IAlchemyArray { public class TileAlchemyArray extends TileInventory implements ITickable, IAlchemyArray
{
public boolean isActive = false; public boolean isActive = false;
public int activeCounter = 0; public int activeCounter = 0;
public EnumFacing rotation = EnumFacing.HORIZONTALS[0]; public EnumFacing rotation = EnumFacing.HORIZONTALS[0];
private String key = "empty"; private String key = "empty";
private AlchemyArrayEffect arrayEffect; private AlchemyArrayEffect arrayEffect;
private boolean doDropIngredients = true;
public TileAlchemyArray() { public TileAlchemyArray()
{
super(2, "alchemyArray"); super(2, "alchemyArray");
} }
public void onEntityCollidedWithBlock(IBlockState state, Entity entity) { public void onEntityCollidedWithBlock(IBlockState state, Entity entity)
if (arrayEffect != null) { {
if (arrayEffect != null)
{
arrayEffect.onEntityCollidedWithBlock(this, getWorld(), pos, state, entity); arrayEffect.onEntityCollidedWithBlock(this, getWorld(), pos, state, entity);
} }
} }
@Override @Override
public void deserialize(NBTTagCompound tagCompound) { public void deserialize(NBTTagCompound tagCompound)
{
super.deserialize(tagCompound); super.deserialize(tagCompound);
this.isActive = tagCompound.getBoolean("isActive"); this.isActive = tagCompound.getBoolean("isActive");
this.activeCounter = tagCompound.getInteger("activeCounter"); this.activeCounter = tagCompound.getInteger("activeCounter");
this.key = tagCompound.getString("key"); this.key = tagCompound.getString("key");
if (!tagCompound.hasKey("doDropIngredients")) //Check if the array is old
{
this.doDropIngredients = true;
} else
{
this.doDropIngredients = tagCompound.getBoolean("doDropIngredients");
}
this.rotation = EnumFacing.HORIZONTALS[tagCompound.getInteger(Constants.NBT.DIRECTION)]; this.rotation = EnumFacing.HORIZONTALS[tagCompound.getInteger(Constants.NBT.DIRECTION)];
NBTTagCompound arrayTag = tagCompound.getCompoundTag("arrayTag"); NBTTagCompound arrayTag = tagCompound.getCompoundTag("arrayTag");
arrayEffect = AlchemyArrayRecipeRegistry.getAlchemyArrayEffect(key); arrayEffect = AlchemyArrayRecipeRegistry.getAlchemyArrayEffect(key);
if (arrayEffect != null) { if (arrayEffect != null)
{
arrayEffect.readFromNBT(arrayTag); arrayEffect.readFromNBT(arrayTag);
} }
} }
@Override @Override
public NBTTagCompound serialize(NBTTagCompound tagCompound) { public NBTTagCompound serialize(NBTTagCompound tagCompound)
{
super.serialize(tagCompound); super.serialize(tagCompound);
tagCompound.setBoolean("isActive", isActive); tagCompound.setBoolean("isActive", isActive);
tagCompound.setInteger("activeCounter", activeCounter); tagCompound.setInteger("activeCounter", activeCounter);
tagCompound.setString("key", "".equals(key) ? "empty" : key); tagCompound.setString("key", "".equals(key) ? "empty" : key);
tagCompound.setBoolean("doDropIngredients", doDropIngredients);
tagCompound.setInteger(Constants.NBT.DIRECTION, rotation.getHorizontalIndex()); tagCompound.setInteger(Constants.NBT.DIRECTION, rotation.getHorizontalIndex());
NBTTagCompound arrayTag = new NBTTagCompound(); NBTTagCompound arrayTag = new NBTTagCompound();
if (arrayEffect != null) { if (arrayEffect != null)
{
arrayEffect.writeToNBT(arrayTag); arrayEffect.writeToNBT(arrayTag);
} }
tagCompound.setTag("arrayTag", arrayTag); tagCompound.setTag("arrayTag", arrayTag);
@ -64,16 +81,27 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche
} }
@Override @Override
public int getInventoryStackLimit() { public int getInventoryStackLimit()
{
return 1; return 1;
} }
//Use this to prevent the Array from dropping items - useful for arrays that need to "consume" ingredients well before the effect.
public void setItemDrop(boolean dropItems)
{
this.doDropIngredients = dropItems;
}
@Override @Override
public void update() { public void update()
if (isActive && attemptCraft()) { {
if (isActive && attemptCraft())
{
activeCounter++; activeCounter++;
} else { } else
{
isActive = false; isActive = false;
doDropIngredients = true;
activeCounter = 0; activeCounter = 0;
arrayEffect = null; arrayEffect = null;
key = "empty"; key = "empty";
@ -84,49 +112,65 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche
* This occurs when the block is destroyed. * This occurs when the block is destroyed.
*/ */
@Override @Override
public void dropItems() { public void dropItems()
super.dropItems(); {
if (arrayEffect != null) { if (!doDropIngredients)
{
super.dropItems();
}
if (arrayEffect != null)
{
} }
} }
public boolean attemptCraft() { public boolean attemptCraft()
{
AlchemyArrayEffect effect = AlchemyArrayRecipeRegistry.getAlchemyArrayEffect(this.getStackInSlot(0), this.getStackInSlot(1)); AlchemyArrayEffect effect = AlchemyArrayRecipeRegistry.getAlchemyArrayEffect(this.getStackInSlot(0), this.getStackInSlot(1));
if (effect != null) { if (effect != null)
if (arrayEffect == null) { {
if (arrayEffect == null)
{
arrayEffect = effect; arrayEffect = effect;
key = effect.getKey(); key = effect.getKey();
} else { } else
{
String effectKey = effect.getKey(); String effectKey = effect.getKey();
if (effectKey.equals(key)) { if (effectKey.equals(key))
{
//Good! Moving on. //Good! Moving on.
} else { } else
{
//Something has changed, therefore we have to move our stuffs. //Something has changed, therefore we have to move our stuffs.
//TODO: Add an AlchemyArrayEffect.onBreak(); ? //TODO: Add an AlchemyArrayEffect.onBreak(); ?
arrayEffect = effect; arrayEffect = effect;
key = effect.getKey(); key = effect.getKey();
} }
} }
} else { } else
{
RecipeAlchemyArray recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyArray(getStackInSlot(0), getStackInSlot(1)); RecipeAlchemyArray recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyArray(getStackInSlot(0), getStackInSlot(1));
if (recipe == null) if (recipe == null)
return false; return false;
AlchemyArrayEffect newEffect = new AlchemyArrayEffectCraftingNew(recipe); AlchemyArrayEffect newEffect = new AlchemyArrayEffectCraftingNew(recipe);
if (arrayEffect == null) { if (arrayEffect == null)
{
arrayEffect = newEffect; arrayEffect = newEffect;
key = newEffect.key; key = newEffect.key;
} else if (!newEffect.key.equals(key)) { } else if (!newEffect.key.equals(key))
{
arrayEffect = newEffect; arrayEffect = newEffect;
key = newEffect.key; key = newEffect.key;
} }
} }
if (arrayEffect != null) { if (arrayEffect != null)
{
isActive = true; isActive = true;
if (arrayEffect.update(this, this.activeCounter)) { if (arrayEffect.update(this, this.activeCounter))
{
this.decrStackSize(0, 1); this.decrStackSize(0, 1);
this.decrStackSize(1, 1); this.decrStackSize(1, 1);
this.getWorld().setBlockToAir(getPos()); this.getWorld().setBlockToAir(getPos());
@ -139,11 +183,13 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche
} }
@Override @Override
public EnumFacing getRotation() { public EnumFacing getRotation()
{
return rotation; return rotation;
} }
public void setRotation(EnumFacing rotation) { public void setRotation(EnumFacing rotation)
{
this.rotation = rotation; this.rotation = rotation;
} }
} }