mirror of
https://github.com/Ellpeck/NaturesAura.git
synced 2024-11-23 04:08:34 +01:00
make the ender crate use aura
This commit is contained in:
parent
00b1141a08
commit
1502348da8
3 changed files with 62 additions and 5 deletions
|
@ -6,7 +6,6 @@ import de.ellpeck.naturesaura.blocks.tiles.render.RenderEnderCrate;
|
||||||
import de.ellpeck.naturesaura.reg.ITESRProvider;
|
import de.ellpeck.naturesaura.reg.ITESRProvider;
|
||||||
import net.minecraft.block.SoundType;
|
import net.minecraft.block.SoundType;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.block.state.BlockFaceShape;
|
|
||||||
import net.minecraft.block.state.IBlockState;
|
import net.minecraft.block.state.IBlockState;
|
||||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
@ -16,7 +15,6 @@ import net.minecraft.util.EnumHand;
|
||||||
import net.minecraft.util.EnumParticleTypes;
|
import net.minecraft.util.EnumParticleTypes;
|
||||||
import net.minecraft.util.Tuple;
|
import net.minecraft.util.Tuple;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.world.IBlockAccess;
|
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
@ -37,8 +35,10 @@ public class BlockEnderCrate extends BlockContainerImpl implements ITESRProvider
|
||||||
TileEntity tile = worldIn.getTileEntity(pos);
|
TileEntity tile = worldIn.getTileEntity(pos);
|
||||||
if (tile instanceof TileEntityEnderCrate) {
|
if (tile instanceof TileEntityEnderCrate) {
|
||||||
TileEntityEnderCrate crate = (TileEntityEnderCrate) tile;
|
TileEntityEnderCrate crate = (TileEntityEnderCrate) tile;
|
||||||
if (crate.canOpen())
|
if (crate.canOpen()) {
|
||||||
|
crate.drainAura(5000);
|
||||||
playerIn.openGui(NaturesAura.MOD_ID, 0, worldIn, pos.getX(), pos.getY(), pos.getZ());
|
playerIn.openGui(NaturesAura.MOD_ID, 0, worldIn, pos.getX(), pos.getY(), pos.getZ());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -1,20 +1,68 @@
|
||||||
package de.ellpeck.naturesaura.blocks.tiles;
|
package de.ellpeck.naturesaura.blocks.tiles;
|
||||||
|
|
||||||
|
import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk;
|
||||||
import de.ellpeck.naturesaura.api.misc.IWorldData;
|
import de.ellpeck.naturesaura.api.misc.IWorldData;
|
||||||
import net.minecraft.block.state.IBlockState;
|
import net.minecraft.block.state.IBlockState;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.util.EnumFacing;
|
import net.minecraft.util.EnumFacing;
|
||||||
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraftforge.items.IItemHandlerModifiable;
|
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public class TileEntityEnderCrate extends TileEntityImpl {
|
public class TileEntityEnderCrate extends TileEntityImpl {
|
||||||
|
|
||||||
|
private final IItemHandlerModifiable wrappedEnderStorage = new IItemHandlerModifiable() {
|
||||||
|
@Override
|
||||||
|
public void setStackInSlot(int slot, @Nonnull ItemStack stack) {
|
||||||
|
this.getStorage().setStackInSlot(slot, stack);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getSlots() {
|
||||||
|
return this.getStorage().getSlots();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nonnull
|
||||||
|
@Override
|
||||||
|
public ItemStack getStackInSlot(int slot) {
|
||||||
|
return this.getStorage().getStackInSlot(slot);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nonnull
|
||||||
|
@Override
|
||||||
|
public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) {
|
||||||
|
ItemStack remain = this.getStorage().insertItem(slot, stack, simulate);
|
||||||
|
if (!simulate)
|
||||||
|
TileEntityEnderCrate.this.drainAura((stack.getCount() - remain.getCount()) * 200);
|
||||||
|
return remain;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nonnull
|
||||||
|
@Override
|
||||||
|
public ItemStack extractItem(int slot, int amount, boolean simulate) {
|
||||||
|
ItemStack extracted = this.getStorage().extractItem(slot, amount, simulate);
|
||||||
|
if (!simulate)
|
||||||
|
TileEntityEnderCrate.this.drainAura(extracted.getCount() * 200);
|
||||||
|
return extracted;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getSlotLimit(int slot) {
|
||||||
|
return this.getStorage().getSlotLimit(slot);
|
||||||
|
}
|
||||||
|
|
||||||
|
private IItemHandlerModifiable getStorage() {
|
||||||
|
return IWorldData.getOverworldData(TileEntityEnderCrate.this.world).getEnderStorage(TileEntityEnderCrate.this.name);
|
||||||
|
}
|
||||||
|
};
|
||||||
public String name;
|
public String name;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IItemHandlerModifiable getItemHandler(EnumFacing facing) {
|
public IItemHandlerModifiable getItemHandler(EnumFacing facing) {
|
||||||
if (this.canOpen())
|
if (this.canOpen())
|
||||||
return IWorldData.getOverworldData(this.world).getEnderStorage(this.name);
|
return this.wrappedEnderStorage;
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -58,4 +106,11 @@ public class TileEntityEnderCrate extends TileEntityImpl {
|
||||||
this.name = compound.getString("name");
|
this.name = compound.getString("name");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void drainAura(int amount) {
|
||||||
|
if (amount > 0) {
|
||||||
|
BlockPos spot = IAuraChunk.getHighestSpot(this.world, this.pos, 35, this.pos);
|
||||||
|
IAuraChunk.getAuraChunk(this.world, spot).drainAura(spot, amount);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package de.ellpeck.naturesaura.items;
|
package de.ellpeck.naturesaura.items;
|
||||||
|
|
||||||
import de.ellpeck.naturesaura.NaturesAura;
|
import de.ellpeck.naturesaura.NaturesAura;
|
||||||
|
import de.ellpeck.naturesaura.api.NaturesAuraAPI;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.ActionResult;
|
import net.minecraft.util.ActionResult;
|
||||||
|
@ -19,8 +20,9 @@ public class ItemEnderAccess extends ItemImpl {
|
||||||
return new ActionResult<>(EnumActionResult.PASS, playerIn.getHeldItem(handIn));
|
return new ActionResult<>(EnumActionResult.PASS, playerIn.getHeldItem(handIn));
|
||||||
ItemStack stack = playerIn.getHeldItemMainhand();
|
ItemStack stack = playerIn.getHeldItemMainhand();
|
||||||
if (stack.hasDisplayName()) {
|
if (stack.hasDisplayName()) {
|
||||||
if (!worldIn.isRemote)
|
if (!worldIn.isRemote && NaturesAuraAPI.instance().extractAuraFromPlayer(playerIn, 5000, false)) {
|
||||||
playerIn.openGui(NaturesAura.MOD_ID, 1, worldIn, (int) playerIn.posX, (int) playerIn.posY, (int) playerIn.posZ);
|
playerIn.openGui(NaturesAura.MOD_ID, 1, worldIn, (int) playerIn.posX, (int) playerIn.posY, (int) playerIn.posZ);
|
||||||
|
}
|
||||||
return new ActionResult<>(EnumActionResult.SUCCESS, stack);
|
return new ActionResult<>(EnumActionResult.SUCCESS, stack);
|
||||||
}
|
}
|
||||||
return new ActionResult<>(EnumActionResult.FAIL, stack);
|
return new ActionResult<>(EnumActionResult.FAIL, stack);
|
||||||
|
|
Loading…
Reference in a new issue