diff --git a/src/main/java/techreborn/items/tools/ItemWrench.java b/src/main/java/techreborn/items/tools/ItemWrench.java index af5cc8ca3..15704e3c0 100644 --- a/src/main/java/techreborn/items/tools/ItemWrench.java +++ b/src/main/java/techreborn/items/tools/ItemWrench.java @@ -24,38 +24,28 @@ package techreborn.items.tools; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.server.permission.PermissionAPI; import net.minecraftforge.server.permission.context.BlockPosContext; -import reborncore.common.IWrenchable; +import reborncore.api.IToolHandler; import reborncore.common.util.RebornPermissions; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.compat.CompatManager; -import techreborn.init.ModSounds; import techreborn.items.ItemTR; import techreborn.utils.IC2WrenchHelper; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - /** * Created by modmuss50 on 26/02/2016. */ -public class ItemWrench extends ItemTR { +public class ItemWrench extends ItemTR implements IToolHandler { public ItemWrench() { setCreativeTab(TechRebornCreativeTabMisc.instance); @@ -75,67 +65,19 @@ public class ItemWrench extends ItemTR { return result; } } - if (world.isAirBlock(pos)) { - return EnumActionResult.PASS; - } - TileEntity tile = world.getTileEntity(pos); - if (tile == null) { - return EnumActionResult.PASS; - } - if (!world.isRemote) { - if (player.isSneaking()) { - List items = new ArrayList<>(); - if (tile instanceof IWrenchable) { - if (((IWrenchable) tile).wrenchCanRemove(player)) { - ItemStack itemStack = ((IWrenchable) tile).getWrenchDrop(player); - if (itemStack == null) { - return EnumActionResult.FAIL; - } - items.add(itemStack); - } - if (!items.isEmpty()) { - for (ItemStack itemStack : items) { - - Random rand = new Random(); - - float dX = rand.nextFloat() * 0.8F + 0.1F; - float dY = rand.nextFloat() * 0.8F + 0.1F; - float dZ = rand.nextFloat() * 0.8F + 0.1F; - - EntityItem entityItem = new EntityItem(world, pos.getX() + dX, pos.getY() + dY, - pos.getZ() + dZ, itemStack.copy()); - - if (itemStack.hasTagCompound()) { - entityItem.getItem() - .setTagCompound(itemStack.getTagCompound().copy()); - } - - float factor = 0.05F; - entityItem.motionX = rand.nextGaussian() * factor; - entityItem.motionY = rand.nextGaussian() * factor + 0.2F; - entityItem.motionZ = rand.nextGaussian() * factor; - if (!world.isRemote) { - world.spawnEntity(entityItem); - } - } - } - world.playSound(null, player.posX, player.posY, - player.posZ, ModSounds.BLOCK_DISMANTLE, - SoundCategory.BLOCKS, 0.6F, 1F); - if (!world.isRemote) { - world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); - } - return EnumActionResult.SUCCESS; - } - } - return EnumActionResult.PASS; - } else { - return EnumActionResult.PASS; - } + return EnumActionResult.PASS; } @SideOnly(Side.CLIENT) public boolean isFull3D() { return true; } + + @Override + public boolean handleTool(ItemStack stack, BlockPos pos, World world, EntityPlayer player, EnumFacing side, boolean damage) { + if(damage){ + stack.damageItem(1, player); + } + return true; + } } diff --git a/src/main/java/techreborn/tiles/TileAdjustableSU.java b/src/main/java/techreborn/tiles/TileAdjustableSU.java index b47911f92..835a815b2 100644 --- a/src/main/java/techreborn/tiles/TileAdjustableSU.java +++ b/src/main/java/techreborn/tiles/TileAdjustableSU.java @@ -28,7 +28,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; @@ -37,7 +37,7 @@ import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; @RebornRegistry(modID = ModInfo.MOD_ID) -public class TileAdjustableSU extends TilePowerAcceptor implements IWrenchable { +public class TileAdjustableSU extends TilePowerAcceptor implements IToolDrop { @ConfigRegistry(config = "machines", category = "aesu", key = "AesuMaxInput", comment = "AESU Max Input (Value in EU)") public static int maxInput = 8192; @@ -75,27 +75,7 @@ public class TileAdjustableSU extends TilePowerAcceptor implements IWrenchable { } @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) { - return true; - } - - @Override - public EnumFacing getFacing() { - return getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + public ItemStack getToolDrop(EntityPlayer entityPlayer) { return getDropWithNBT(); } diff --git a/src/main/java/techreborn/tiles/TileAlloySmelter.java b/src/main/java/techreborn/tiles/TileAlloySmelter.java index a5f043355..c8c503b43 100644 --- a/src/main/java/techreborn/tiles/TileAlloySmelter.java +++ b/src/main/java/techreborn/tiles/TileAlloySmelter.java @@ -32,7 +32,7 @@ import net.minecraft.util.EnumFacing; import reborncore.api.recipe.IRecipeCrafterProvider; import reborncore.api.recipe.RecipeHandler; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegistry; @@ -49,7 +49,7 @@ import techreborn.lib.ModInfo; @RebornRegistry(modID = ModInfo.MOD_ID) public class TileAlloySmelter extends TilePowerAcceptor - implements IWrenchable, IInventoryProvider, ISidedInventory, IRecipeCrafterProvider, IContainerProvider { + implements IToolDrop, IInventoryProvider, ISidedInventory, IRecipeCrafterProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "alloy_smelter", key = "AlloySmelterMaxInput", comment = "Alloy Smelter Max Input (Value in EU)") public static int maxInput = 32; @@ -81,27 +81,7 @@ public class TileAlloySmelter extends TilePowerAcceptor } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.ALLOY_SMELTER, 1); } diff --git a/src/main/java/techreborn/tiles/TileAssemblingMachine.java b/src/main/java/techreborn/tiles/TileAssemblingMachine.java index 42080134b..0d934a7ac 100644 --- a/src/main/java/techreborn/tiles/TileAssemblingMachine.java +++ b/src/main/java/techreborn/tiles/TileAssemblingMachine.java @@ -30,7 +30,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import reborncore.api.recipe.IRecipeCrafterProvider; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegistry; @@ -45,7 +45,7 @@ import techreborn.lib.ModInfo; @RebornRegistry(modID = ModInfo.MOD_ID) public class TileAssemblingMachine extends TilePowerAcceptor - implements IWrenchable, ISidedInventory, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { + implements IToolDrop, ISidedInventory, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "assembling_machine", key = "AssemblingMachineMaxInput", comment = "Assembling Machine Max Input (Value in EU)") public static int maxInput = 128; @@ -76,27 +76,7 @@ public class TileAssemblingMachine extends TilePowerAcceptor } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return wrenchDropRate; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.ASSEMBLY_MACHINE, 1); } diff --git a/src/main/java/techreborn/tiles/TileChargeOMat.java b/src/main/java/techreborn/tiles/TileChargeOMat.java index b05205f00..ac38af402 100644 --- a/src/main/java/techreborn/tiles/TileChargeOMat.java +++ b/src/main/java/techreborn/tiles/TileChargeOMat.java @@ -30,7 +30,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import reborncore.api.power.IEnergyInterfaceItem; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; @@ -43,7 +43,7 @@ import techreborn.lib.ModInfo; @RebornRegistry(modID = ModInfo.MOD_ID) public class TileChargeOMat extends TilePowerAcceptor - implements IWrenchable, IInventoryProvider, ISidedInventory, IContainerProvider { + implements IToolDrop, IInventoryProvider, ISidedInventory, IContainerProvider { @ConfigRegistry(config = "machines", category = "charge_bench", key = "ChargeBenchMaxInput", comment = "Charge Bench Max Input (Value in EU)") public static int maxInput = 512; @@ -79,27 +79,7 @@ public class TileChargeOMat extends TilePowerAcceptor } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.CHARGE_O_MAT, 1); } diff --git a/src/main/java/techreborn/tiles/TileChemicalReactor.java b/src/main/java/techreborn/tiles/TileChemicalReactor.java index 77a885d64..affc3052f 100644 --- a/src/main/java/techreborn/tiles/TileChemicalReactor.java +++ b/src/main/java/techreborn/tiles/TileChemicalReactor.java @@ -31,7 +31,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import reborncore.api.recipe.IRecipeCrafterProvider; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.impl.ConfigRegistry; @@ -43,7 +43,7 @@ import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; public class TileChemicalReactor extends TilePowerAcceptor - implements IWrenchable, IInventoryProvider, ISidedInventory, IRecipeCrafterProvider, IContainerProvider { + implements IToolDrop, IInventoryProvider, ISidedInventory, IRecipeCrafterProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "chemical_reactor", key = "ChemicalReactorMaxInput", comment = "Chemical Reactor Max Input (Value in EU)") public static int maxInput = 128; @@ -75,27 +75,7 @@ public class TileChemicalReactor extends TilePowerAcceptor } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return wrenchDropRate; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.CHEMICAL_REACTOR, 1); } diff --git a/src/main/java/techreborn/tiles/TileChunkLoader.java b/src/main/java/techreborn/tiles/TileChunkLoader.java index c7efe427c..30d8c35f5 100644 --- a/src/main/java/techreborn/tiles/TileChunkLoader.java +++ b/src/main/java/techreborn/tiles/TileChunkLoader.java @@ -28,7 +28,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; @@ -40,7 +40,7 @@ import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; @RebornRegistry(modID = ModInfo.MOD_ID) -public class TileChunkLoader extends TilePowerAcceptor implements IWrenchable, IInventoryProvider, IContainerProvider { +public class TileChunkLoader extends TilePowerAcceptor implements IToolDrop, IInventoryProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "chunk_loader", key = "ChunkLoaderMaxInput", comment = "Chunk Loader Max Input (Value in EU)") public static int maxInput = 32; @@ -59,27 +59,7 @@ public class TileChunkLoader extends TilePowerAcceptor implements IWrenchable, I } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return wrenchDropRate; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.CHUNK_LOADER, 1); } diff --git a/src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java b/src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java index d99aaa702..af539efbd 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java +++ b/src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java @@ -32,7 +32,7 @@ import reborncore.api.IListInfoProvider; import reborncore.api.power.IEnergyItemInfo; import reborncore.api.recipe.IRecipeCrafterProvider; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.PoweredItem; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.recipes.RecipeCrafter; @@ -51,7 +51,7 @@ import java.util.List; @RebornRegistry(modID = ModInfo.MOD_ID) public class TileIndustrialCentrifuge extends TilePowerAcceptor - implements IWrenchable, IInventoryProvider, IListInfoProvider, IRecipeCrafterProvider, IContainerProvider { + implements IToolDrop, IInventoryProvider, IListInfoProvider, IRecipeCrafterProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "centrifuge", key = "CentrifugeMaxInput", comment = "Centrifuge Max Input (Value in EU)") public static int maxInput = 32; @@ -97,27 +97,7 @@ public class TileIndustrialCentrifuge extends TilePowerAcceptor } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return wrenchDropRate; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.INDUSTRIAL_CENTRIFUGE, 1); } diff --git a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java index b6c89bd4d..651f2d491 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java @@ -31,7 +31,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import reborncore.api.recipe.IRecipeCrafterProvider; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegistry; @@ -48,7 +48,7 @@ import techreborn.lib.ModInfo; @RebornRegistry(modID = ModInfo.MOD_ID) public class TileIndustrialElectrolyzer extends TilePowerAcceptor - implements IWrenchable, IInventoryProvider, ISidedInventory, IRecipeCrafterProvider, IContainerProvider { + implements IToolDrop, IInventoryProvider, ISidedInventory, IRecipeCrafterProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "industrial_electrolyzer", key = "IndustrialElectrolyzerMaxInput", comment = "Industrial Electrolyzer Max Input (Value in EU)") public static int maxInput = 128; @@ -83,27 +83,7 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return wrenchDropRate; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.INDUSTRIAL_ELECTROLYZER, 1); } diff --git a/src/main/java/techreborn/tiles/TileIronAlloyFurnace.java b/src/main/java/techreborn/tiles/TileIronAlloyFurnace.java index 29a930a25..4fac26395 100644 --- a/src/main/java/techreborn/tiles/TileIronAlloyFurnace.java +++ b/src/main/java/techreborn/tiles/TileIronAlloyFurnace.java @@ -35,7 +35,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import reborncore.api.recipe.IBaseRecipeType; import reborncore.api.recipe.RecipeHandler; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.recipes.RecipeTranslator; import reborncore.common.registration.RebornRegistry; import reborncore.common.tile.TileLegacyMachineBase; @@ -51,7 +51,7 @@ import techreborn.lib.ModInfo; @RebornRegistry(modID = ModInfo.MOD_ID) public class TileIronAlloyFurnace extends TileLegacyMachineBase - implements IWrenchable, IInventoryProvider, IContainerProvider { + implements IToolDrop, IInventoryProvider, IContainerProvider { // @ConfigRegistry(config = "machines", category = "alloy_furnace", key = "AlloyFurnaceWrenchDropRate", comment = "Alloy Furnace Wrench Drop Rate") public static float wrenchDropRate = 1.0F; @@ -279,10 +279,6 @@ public class TileIronAlloyFurnace extends TileLegacyMachineBase return this.cookTime * scale / 200; } - @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } @Override public EnumFacing getFacing() { @@ -290,17 +286,7 @@ public class TileIronAlloyFurnace extends TileLegacyMachineBase } @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return wrenchDropRate; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.IRON_ALLOY_FURNACE, 1); } diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index 6839d3b2c..2b0336017 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -28,7 +28,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; @@ -45,7 +45,7 @@ import techreborn.lib.ModInfo; @RebornRegistry(modID = ModInfo.MOD_ID) public class TileMatterFabricator extends TilePowerAcceptor - implements IWrenchable, IInventoryProvider, IContainerProvider { + implements IToolDrop, IInventoryProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "matter_fabricator", key = "MatterFabricatorMaxInput", comment = "Matter Fabricator Max Input (Value in EU)") public static int maxInput = 8192; @@ -67,27 +67,7 @@ public class TileMatterFabricator extends TilePowerAcceptor } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return wrenchDropRate; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.MATTER_FABRICATOR, 1); } diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/TileQuantumTank.java index ac556ea1a..8e4dbc8c0 100644 --- a/src/main/java/techreborn/tiles/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/TileQuantumTank.java @@ -34,7 +34,7 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import reborncore.api.IListInfoProvider; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.tile.TileLegacyMachineBase; @@ -51,7 +51,7 @@ import java.util.List; @RebornRegistry(modID = ModInfo.MOD_ID) public class TileQuantumTank extends TileLegacyMachineBase - implements IInventoryProvider, IWrenchable, IListInfoProvider, IContainerProvider { + implements IInventoryProvider, IToolDrop, IListInfoProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "quantum_tank", key = "QuantumTankMaxStorage", comment = "Maximum amount of millibuckets a Quantum Tank can store") public static int maxStorage = Integer.MAX_VALUE; @@ -123,27 +123,7 @@ public class TileQuantumTank extends TileLegacyMachineBase } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return wrenchDropRate; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return this.getDropWithNBT(); } diff --git a/src/main/java/techreborn/tiles/TileRollingMachine.java b/src/main/java/techreborn/tiles/TileRollingMachine.java index fd008e3fc..dd91a3329 100644 --- a/src/main/java/techreborn/tiles/TileRollingMachine.java +++ b/src/main/java/techreborn/tiles/TileRollingMachine.java @@ -31,7 +31,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; @@ -50,7 +50,7 @@ import javax.annotation.Nonnull; @RebornRegistry(modID = ModInfo.MOD_ID) public class TileRollingMachine extends TilePowerAcceptor - implements IWrenchable, IInventoryProvider, IContainerProvider { + implements IToolDrop, IInventoryProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "rolling_machine", key = "RollingMachineMaxInput", comment = "Rolling Machine Max Input (Value in EU)") public static int maxInput = 32; @@ -159,27 +159,7 @@ public class TileRollingMachine extends TilePowerAcceptor } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return wrenchDropRate; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.ROLLING_MACHINE, 1); } diff --git a/src/main/java/techreborn/tiles/TileScrapboxinator.java b/src/main/java/techreborn/tiles/TileScrapboxinator.java index 0782c61c6..e97fff8c2 100644 --- a/src/main/java/techreborn/tiles/TileScrapboxinator.java +++ b/src/main/java/techreborn/tiles/TileScrapboxinator.java @@ -30,7 +30,7 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegistry; @@ -48,7 +48,7 @@ import java.util.Random; @RebornRegistry(modID = ModInfo.MOD_ID) public class TileScrapboxinator extends TilePowerAcceptor - implements IWrenchable, IInventoryProvider, ISidedInventory, IContainerProvider { + implements IToolDrop, IInventoryProvider, ISidedInventory, IContainerProvider { @ConfigRegistry(config = "machines", category = "scrapboxinator", key = "ScrapboxinatorMaxInput", comment = "Scrapboxinator Max Input (Value in EU)") public static int maxInput = 32; @@ -142,27 +142,7 @@ public class TileScrapboxinator extends TilePowerAcceptor } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return wrenchDropRate; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.SCRAPBOXINATOR, 1); } diff --git a/src/main/java/techreborn/tiles/TileTechStorageBase.java b/src/main/java/techreborn/tiles/TileTechStorageBase.java index 02b6dd3f2..4f9c3a5cf 100644 --- a/src/main/java/techreborn/tiles/TileTechStorageBase.java +++ b/src/main/java/techreborn/tiles/TileTechStorageBase.java @@ -36,7 +36,7 @@ import net.minecraftforge.items.wrapper.InvWrapper; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; import reborncore.api.IListInfoProvider; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; @@ -45,7 +45,7 @@ import java.util.ArrayList; import java.util.List; public class TileTechStorageBase extends TileLegacyMachineBase - implements IInventoryProvider, IWrenchable, IListInfoProvider, IDeepStorageUnit { + implements IInventoryProvider, IToolDrop, IListInfoProvider, IDeepStorageUnit { public final int maxCapacity; public final Inventory inventory; @@ -151,27 +151,7 @@ public class TileTechStorageBase extends TileLegacyMachineBase } @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1F; - } - - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + public ItemStack getToolDrop(EntityPlayer entityPlayer) { return getDropWithNBT(); } diff --git a/src/main/java/techreborn/tiles/generator/TileBaseFluidGenerator.java b/src/main/java/techreborn/tiles/generator/TileBaseFluidGenerator.java index 573dbd1d4..4ff4ab0c7 100644 --- a/src/main/java/techreborn/tiles/generator/TileBaseFluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileBaseFluidGenerator.java @@ -33,7 +33,7 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; @@ -44,7 +44,7 @@ import techreborn.api.generator.FluidGeneratorRecipe; import techreborn.api.generator.FluidGeneratorRecipeList; import techreborn.api.generator.GeneratorRecipeHelper; -public abstract class TileBaseFluidGenerator extends TilePowerAcceptor implements IWrenchable, IInventoryProvider { +public abstract class TileBaseFluidGenerator extends TilePowerAcceptor implements IToolDrop, IInventoryProvider { private final FluidGeneratorRecipeList recipes; @@ -200,26 +200,6 @@ public abstract class TileBaseFluidGenerator extends TilePowerAcceptor implement readFromNBT(packet.getNbtCompound()); } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - @Override public boolean canBeUpgraded() { return false; diff --git a/src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java b/src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java index 13f971b7f..fd0c64ec4 100644 --- a/src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java +++ b/src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java @@ -29,7 +29,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.Optional; import reborncore.api.power.EnumPowerTier; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import techreborn.init.ModBlocks; @@ -38,7 +38,7 @@ import java.util.List; /** * Created by modmuss50 on 25/02/2016. */ -public class TileCreativeSolarPanel extends TilePowerAcceptor implements IWrenchable { +public class TileCreativeSolarPanel extends TilePowerAcceptor implements IToolDrop { boolean shouldMakePower = false; boolean lastTickSate = false; @@ -87,27 +87,7 @@ public class TileCreativeSolarPanel extends TilePowerAcceptor implements IWrench } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer p0) { + public ItemStack getToolDrop(final EntityPlayer p0) { return new ItemStack(ModBlocks.SOLAR_PANEL); } diff --git a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java index e0d322357..6cb2e6d58 100644 --- a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java @@ -52,7 +52,7 @@ public class TileDieselGenerator extends TileBaseFluidGenerator implements ICont } @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.DIESEL_GENERATOR, 1); } diff --git a/src/main/java/techreborn/tiles/generator/TileDragonEggSyphon.java b/src/main/java/techreborn/tiles/generator/TileDragonEggSyphon.java index 20a77f911..c3268dc60 100644 --- a/src/main/java/techreborn/tiles/generator/TileDragonEggSyphon.java +++ b/src/main/java/techreborn/tiles/generator/TileDragonEggSyphon.java @@ -30,7 +30,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegistry; @@ -40,7 +40,7 @@ import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; @RebornRegistry(modID = ModInfo.MOD_ID) -public class TileDragonEggSyphon extends TilePowerAcceptor implements IWrenchable, IInventoryProvider { +public class TileDragonEggSyphon extends TilePowerAcceptor implements IToolDrop, IInventoryProvider { @ConfigRegistry(config = "machines", category = "dragon_egg_siphoner", key = "DragonEggSiphonerMaxOutput", comment = "Dragon Egg Siphoner Max Output (Value in EU)") public static int maxOutput = 128; @@ -88,27 +88,7 @@ public class TileDragonEggSyphon extends TilePowerAcceptor implements IWrenchabl } @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + public ItemStack getToolDrop(EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.DRAGON_EGG_SYPHON, 1); } diff --git a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java index 7e69f7b1c..e84942c88 100644 --- a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java +++ b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java @@ -52,7 +52,7 @@ public class TileGasTurbine extends TileBaseFluidGenerator implements IContainer } @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.GAS_TURBINE, 1); } diff --git a/src/main/java/techreborn/tiles/generator/TileLightningRod.java b/src/main/java/techreborn/tiles/generator/TileLightningRod.java index 6b5f05e9b..e14398df7 100644 --- a/src/main/java/techreborn/tiles/generator/TileLightningRod.java +++ b/src/main/java/techreborn/tiles/generator/TileLightningRod.java @@ -31,7 +31,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraftforge.oredict.OreDictionary; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegistry; @@ -40,7 +40,7 @@ import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; @RebornRegistry(modID = ModInfo.MOD_ID) -public class TileLightningRod extends TilePowerAcceptor implements IWrenchable { +public class TileLightningRod extends TilePowerAcceptor implements IToolDrop { @ConfigRegistry(config = "machines", category = "lightning_rod", key = "LightningRodMaxOutput", comment = "Lightning Rod Max Output (Value in EU)") public static int maxOutput = 2048; @@ -144,27 +144,7 @@ public class TileLightningRod extends TilePowerAcceptor implements IWrenchable { } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer p0) { + public ItemStack getToolDrop(final EntityPlayer p0) { return new ItemStack(ModBlocks.LIGHTNING_ROD); } } diff --git a/src/main/java/techreborn/tiles/generator/TileSemiFluidGenerator.java b/src/main/java/techreborn/tiles/generator/TileSemiFluidGenerator.java index c0bbee763..c37978ad5 100644 --- a/src/main/java/techreborn/tiles/generator/TileSemiFluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileSemiFluidGenerator.java @@ -52,7 +52,7 @@ public class TileSemiFluidGenerator extends TileBaseFluidGenerator implements IC } @Override - public ItemStack getWrenchDrop(final EntityPlayer arg0) { + public ItemStack getToolDrop(final EntityPlayer arg0) { return new ItemStack(ModBlocks.SEMI_FLUID_GENERATOR, 1); } diff --git a/src/main/java/techreborn/tiles/generator/TileSolarPanel.java b/src/main/java/techreborn/tiles/generator/TileSolarPanel.java index 666a40953..6a1ae1866 100644 --- a/src/main/java/techreborn/tiles/generator/TileSolarPanel.java +++ b/src/main/java/techreborn/tiles/generator/TileSolarPanel.java @@ -27,7 +27,7 @@ package techreborn.tiles.generator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; @@ -42,7 +42,7 @@ import java.util.List; */ @RebornRegistry(modID = ModInfo.MOD_ID) -public class TileSolarPanel extends TilePowerAcceptor implements IWrenchable { +public class TileSolarPanel extends TilePowerAcceptor implements IToolDrop { @ConfigRegistry(config = "machines", category = "solar_panel", key = "SolarPanelMaxOutput", comment = "Solar Panel Max Output (Value in EU)") public static int maxOutput = 32; @@ -122,27 +122,7 @@ public class TileSolarPanel extends TilePowerAcceptor implements IWrenchable { } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer p0) { + public ItemStack getToolDrop(final EntityPlayer p0) { return new ItemStack(ModBlocks.SOLAR_PANEL); } } diff --git a/src/main/java/techreborn/tiles/generator/TileSolidFuelGenerator.java b/src/main/java/techreborn/tiles/generator/TileSolidFuelGenerator.java index 91c301a5d..de3a9d67d 100644 --- a/src/main/java/techreborn/tiles/generator/TileSolidFuelGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileSolidFuelGenerator.java @@ -32,7 +32,7 @@ import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.ForgeModContainer; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegistry; @@ -45,7 +45,7 @@ import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; @RebornRegistry(modID = ModInfo.MOD_ID) -public class TileSolidFuelGenerator extends TilePowerAcceptor implements IWrenchable, IInventoryProvider, IContainerProvider { +public class TileSolidFuelGenerator extends TilePowerAcceptor implements IToolDrop, IInventoryProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "generator", key = "GeneratorMaxOutput", comment = "Solid Fuel Generator Max Output (Value in EU)") public static int maxOutput = 32; @@ -119,26 +119,6 @@ public class TileSolidFuelGenerator extends TilePowerAcceptor implements IWrench } } - @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - @Override public double getBaseMaxPower() { return maxEnergy; @@ -165,7 +145,7 @@ public class TileSolidFuelGenerator extends TilePowerAcceptor implements IWrench } @Override - public ItemStack getWrenchDrop(final EntityPlayer p0) { + public ItemStack getToolDrop(final EntityPlayer p0) { return new ItemStack(ModBlocks.SOLID_FUEL_GENEREATOR); } diff --git a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java index 5d26b9a0e..993625455 100644 --- a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java @@ -57,7 +57,7 @@ public class TileThermalGenerator extends TileBaseFluidGenerator implements ICon } @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.THERMAL_GENERATOR, 1); } diff --git a/src/main/java/techreborn/tiles/generator/TileWaterMill.java b/src/main/java/techreborn/tiles/generator/TileWaterMill.java index d6c15dd5a..e80c8d517 100644 --- a/src/main/java/techreborn/tiles/generator/TileWaterMill.java +++ b/src/main/java/techreborn/tiles/generator/TileWaterMill.java @@ -28,7 +28,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; @@ -40,7 +40,7 @@ import techreborn.lib.ModInfo; */ @RebornRegistry(modID = ModInfo.MOD_ID) -public class TileWaterMill extends TilePowerAcceptor implements IWrenchable { +public class TileWaterMill extends TilePowerAcceptor implements IToolDrop { @ConfigRegistry(config = "machines", category = "water_mill", key = "WaterMillMaxOutput", comment = "Water Mill Max Output (Value in EU)") public static int maxOutput = 32; @@ -101,27 +101,7 @@ public class TileWaterMill extends TilePowerAcceptor implements IWrenchable { } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer p0) { + public ItemStack getToolDrop(final EntityPlayer p0) { return new ItemStack(ModBlocks.WATER_MILL); } } diff --git a/src/main/java/techreborn/tiles/generator/TileWindMill.java b/src/main/java/techreborn/tiles/generator/TileWindMill.java index 77d99b8fb..1e8c7066b 100644 --- a/src/main/java/techreborn/tiles/generator/TileWindMill.java +++ b/src/main/java/techreborn/tiles/generator/TileWindMill.java @@ -27,7 +27,7 @@ package techreborn.tiles.generator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; @@ -39,7 +39,7 @@ import techreborn.lib.ModInfo; */ @RebornRegistry(modID = ModInfo.MOD_ID) -public class TileWindMill extends TilePowerAcceptor implements IWrenchable { +public class TileWindMill extends TilePowerAcceptor implements IToolDrop { @ConfigRegistry(config = "machines", category = "wind_mill", key = "WindMillMaxOutput", comment = "Wind Mill Max Output (Value in EU)") public static int maxOutput = 128; @@ -96,27 +96,7 @@ public class TileWindMill extends TilePowerAcceptor implements IWrenchable { } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer p0) { + public ItemStack getToolDrop(final EntityPlayer p0) { return new ItemStack(ModBlocks.WIND_MILL); } } diff --git a/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java b/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java index 717c0844e..1b56656e9 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java +++ b/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java @@ -31,7 +31,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import reborncore.api.recipe.IRecipeCrafterProvider; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.Inventory; @@ -42,7 +42,7 @@ import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; public class TileImplosionCompressor extends TilePowerAcceptor - implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { + implements IToolDrop, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { public Inventory inventory = new Inventory(4, "TileImplosionCompressor", 64, this); public MultiblockChecker multiblockChecker; @@ -62,27 +62,7 @@ public class TileImplosionCompressor extends TilePowerAcceptor } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.IMPLOSION_COMPRESSOR, 1); } diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialBlastFurnace.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialBlastFurnace.java index 0123b0bfd..906a8fc82 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialBlastFurnace.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialBlastFurnace.java @@ -34,7 +34,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import reborncore.api.recipe.IRecipeCrafterProvider; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.misc.Location; import reborncore.common.multiblock.IMultiblockPart; import reborncore.common.powerSystem.TilePowerAcceptor; @@ -51,7 +51,7 @@ import techreborn.init.ModBlocks; import techreborn.multiblocks.MultiBlockCasing; import techreborn.tiles.TileMachineCasing; -public class TileIndustrialBlastFurnace extends TilePowerAcceptor implements IWrenchable, IInventoryProvider, +public class TileIndustrialBlastFurnace extends TilePowerAcceptor implements IToolDrop, IInventoryProvider, ITileRecipeHandler, IRecipeCrafterProvider, IContainerProvider { public static int euTick = 5; @@ -81,27 +81,7 @@ public class TileIndustrialBlastFurnace extends TilePowerAcceptor implements IWr } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.INDUSTRIAL_BLAST_FURNACE, 1); } diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java index 6f0c73330..a073afeda 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java @@ -33,12 +33,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.FluidEvent; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import reborncore.api.recipe.IRecipeCrafterProvider; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.FluidUtils; @@ -52,7 +51,7 @@ import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; -public class TileIndustrialGrinder extends TilePowerAcceptor implements IWrenchable, IInventoryProvider, +public class TileIndustrialGrinder extends TilePowerAcceptor implements IToolDrop, IInventoryProvider, ITileRecipeHandler, IRecipeCrafterProvider, IContainerProvider { public static final int TANK_CAPACITY = 16000; @@ -82,27 +81,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IWrencha } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.INDUSTRIAL_GRINDER, 1); } diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java index 2ea5f1bf0..b1e9aaf2c 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java @@ -37,7 +37,7 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import reborncore.api.recipe.IBaseRecipeType; import reborncore.api.recipe.RecipeHandler; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; @@ -55,7 +55,7 @@ import techreborn.items.ItemDusts; import java.util.Random; public class TileIndustrialSawmill extends TilePowerAcceptor - implements IWrenchable, IInventoryProvider, IContainerProvider { + implements IToolDrop, IInventoryProvider, IContainerProvider { public static final int TANK_CAPACITY = 16000; public Inventory inventory = new Inventory(5, "Sawmill", 64, this); @@ -168,27 +168,7 @@ public class TileIndustrialSawmill extends TilePowerAcceptor } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.INDUSTRIAL_SAWMILL, 1); } diff --git a/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java b/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java index 0c655ab9e..c23e79364 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java +++ b/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java @@ -30,7 +30,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import reborncore.api.recipe.IRecipeCrafterProvider; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.Inventory; @@ -41,7 +41,7 @@ import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; public class TileVacuumFreezer extends TilePowerAcceptor - implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { + implements IToolDrop, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { public Inventory inventory = new Inventory(3, "TileVacuumFreezer", 64, this); public MultiblockChecker multiblockChecker; @@ -97,27 +97,7 @@ public class TileVacuumFreezer extends TilePowerAcceptor } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.VACUUM_FREEZER, 1); } diff --git a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java index 3be1d8a94..66560e7f8 100644 --- a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java +++ b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java @@ -32,7 +32,7 @@ import net.minecraft.util.ITickable; import reborncore.api.power.EnumPowerTier; import reborncore.api.power.IEnergyItemInfo; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.PoweredItem; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; @@ -41,7 +41,7 @@ import techreborn.blocks.storage.BlockEnergyStorage; /** * Created by Rushmead */ -public class TileEnergyStorage extends TilePowerAcceptor implements IWrenchable, ITickable, IInventoryProvider { +public class TileEnergyStorage extends TilePowerAcceptor implements IToolDrop, ITickable, IInventoryProvider { public Inventory inventory; public String name; @@ -62,21 +62,6 @@ public class TileEnergyStorage extends TilePowerAcceptor implements IWrenchable, this.maxStorage = maxStorage; } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) { - return true; - } - - @Override - public EnumFacing getFacing() { - return getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - @Override public void updateEntity() { super.updateEntity(); @@ -113,13 +98,9 @@ public class TileEnergyStorage extends TilePowerAcceptor implements IWrenchable, world.setBlockState(pos, world.getBlockState(pos).withProperty(BlockEnergyStorage.FACING, enumFacing)); } - @Override - public float getWrenchDropRate() { - return 1.0F; - } @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + public ItemStack getToolDrop(EntityPlayer entityPlayer) { return new ItemStack(wrenchDrop); } diff --git a/src/main/java/techreborn/tiles/teir1/TileCompressor.java b/src/main/java/techreborn/tiles/teir1/TileCompressor.java index da18ae843..96915ca95 100644 --- a/src/main/java/techreborn/tiles/teir1/TileCompressor.java +++ b/src/main/java/techreborn/tiles/teir1/TileCompressor.java @@ -29,7 +29,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import reborncore.api.recipe.IRecipeCrafterProvider; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.Inventory; @@ -39,7 +39,7 @@ import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; -public class TileCompressor extends TilePowerAcceptor implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { +public class TileCompressor extends TilePowerAcceptor implements IToolDrop, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { public Inventory inventory = new Inventory(6, "TileCompressor", 64, this); @@ -65,27 +65,7 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.COMPRESSOR, 1); } diff --git a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java index 496f6fc6d..9b5f5955d 100644 --- a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java +++ b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java @@ -31,7 +31,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.util.EnumFacing; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.tile.IMachineSlotProvider; @@ -42,7 +42,7 @@ import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; public class TileElectricFurnace extends TilePowerAcceptor - implements IWrenchable, IInventoryProvider, IContainerProvider, IMachineSlotProvider { + implements IToolDrop, IInventoryProvider, IContainerProvider, IMachineSlotProvider { public Inventory inventory = new Inventory(6, "TileElectricFurnace", 64, this); public int capacity = 1000; @@ -144,28 +144,13 @@ public class TileElectricFurnace extends TilePowerAcceptor } } - @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - @Override public EnumFacing getFacing() { return this.getFacingEnum(); } @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.ELECTRIC_FURNACE, 1); } diff --git a/src/main/java/techreborn/tiles/teir1/TileExtractor.java b/src/main/java/techreborn/tiles/teir1/TileExtractor.java index c1d3cc103..a2e88d4d0 100644 --- a/src/main/java/techreborn/tiles/teir1/TileExtractor.java +++ b/src/main/java/techreborn/tiles/teir1/TileExtractor.java @@ -30,7 +30,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import reborncore.api.recipe.IRecipeCrafterProvider; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.Inventory; @@ -41,7 +41,7 @@ import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; public class TileExtractor extends TilePowerAcceptor - implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { + implements IToolDrop, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { public Inventory inventory = new Inventory(6, "TileExtractor", 64, this); @@ -68,27 +68,7 @@ public class TileExtractor extends TilePowerAcceptor } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.EXTRACTOR, 1); } diff --git a/src/main/java/techreborn/tiles/teir1/TileGrinder.java b/src/main/java/techreborn/tiles/teir1/TileGrinder.java index a17131a44..48b9e52e4 100644 --- a/src/main/java/techreborn/tiles/teir1/TileGrinder.java +++ b/src/main/java/techreborn/tiles/teir1/TileGrinder.java @@ -30,7 +30,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import reborncore.api.recipe.IRecipeCrafterProvider; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.Inventory; @@ -41,7 +41,7 @@ import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; public class TileGrinder extends TilePowerAcceptor - implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { + implements IToolDrop, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { public Inventory inventory = new Inventory(6, "TileGrinder", 64, this); @@ -68,27 +68,7 @@ public class TileGrinder extends TilePowerAcceptor } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.GRINDER, 1); } diff --git a/src/main/java/techreborn/tiles/teir1/TileRecycler.java b/src/main/java/techreborn/tiles/teir1/TileRecycler.java index 0524bdd15..fa746617f 100644 --- a/src/main/java/techreborn/tiles/teir1/TileRecycler.java +++ b/src/main/java/techreborn/tiles/teir1/TileRecycler.java @@ -29,7 +29,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import reborncore.api.tile.IInventoryProvider; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; @@ -39,7 +39,7 @@ import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; import techreborn.items.ItemParts; -public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInventoryProvider, IContainerProvider { +public class TileRecycler extends TilePowerAcceptor implements IToolDrop, IInventoryProvider, IContainerProvider { private final Inventory inventory = new Inventory(6, "TileRecycler", 64, this); private final int capacity = 1000; @@ -128,27 +128,7 @@ public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInv } @Override - public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { - return false; - } - - @Override - public EnumFacing getFacing() { - return this.getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { + public ItemStack getToolDrop(final EntityPlayer entityPlayer) { return new ItemStack(ModBlocks.RECYCLER, 1); } diff --git a/src/main/java/techreborn/tiles/transformers/TileTransformer.java b/src/main/java/techreborn/tiles/transformers/TileTransformer.java index b756a4f96..69095cdf0 100644 --- a/src/main/java/techreborn/tiles/transformers/TileTransformer.java +++ b/src/main/java/techreborn/tiles/transformers/TileTransformer.java @@ -32,7 +32,7 @@ import net.minecraft.util.ITickable; import net.minecraft.util.text.TextFormatting; import reborncore.api.IListInfoProvider; import reborncore.api.power.EnumPowerTier; -import reborncore.common.IWrenchable; +import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.StringUtils; import techreborn.blocks.transformers.BlockTransformer; @@ -42,7 +42,7 @@ import java.util.List; /** * Created by Rushmead */ -public class TileTransformer extends TilePowerAcceptor implements IWrenchable, ITickable, IListInfoProvider { +public class TileTransformer extends TilePowerAcceptor implements IToolDrop, ITickable, IListInfoProvider { public String name; public Block wrenchDrop; @@ -68,27 +68,7 @@ public class TileTransformer extends TilePowerAcceptor implements IWrenchable, I } @Override - public boolean wrenchCanSetFacing(EntityPlayer p0, EnumFacing p1) { - return true; - } - - @Override - public EnumFacing getFacing() { - return getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(EntityPlayer p0) { + public ItemStack getToolDrop(EntityPlayer p0) { return new ItemStack(wrenchDrop); }