diff --git a/src/main/java/techreborn/blocks/iron_machines/BlockIronAlloyFurnace.java b/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java similarity index 96% rename from src/main/java/techreborn/blocks/iron_machines/BlockIronAlloyFurnace.java rename to src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java index 48b64f637..e983172ac 100644 --- a/src/main/java/techreborn/blocks/iron_machines/BlockIronAlloyFurnace.java +++ b/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks.iron_machines; +package techreborn.blocks.tier0; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; @@ -37,7 +37,7 @@ import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; -import techreborn.tiles.TileIronAlloyFurnace; +import techreborn.tiles.tier0.TileIronAlloyFurnace; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java b/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java similarity index 97% rename from src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java rename to src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java index adc0272c9..ac80bb0c0 100644 --- a/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java +++ b/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.blocks.iron_machines; +package techreborn.blocks.tier0; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; @@ -41,7 +41,7 @@ import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; -import techreborn.tiles.TileIronFurnace; +import techreborn.tiles.tier0.TileIronFurnace; import java.util.ArrayList; import java.util.List; @@ -55,23 +55,6 @@ public class BlockIronFurnace extends BlockMachineBase { ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier0_machines")); } - @Override - public TileEntity createNewTileEntity(final World world, final int p_149915_2_) { - return new TileIronFurnace(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.IRON_FURNACE; - } - - @Override - public List getDrops(final IBlockAccess world, final BlockPos pos, final IBlockState state, final int fortune) { - final List items = new ArrayList<>(); - items.add(new ItemStack(this)); - return items; - } - @SideOnly(Side.CLIENT) @SuppressWarnings("incomplete-switch") public void randomDisplayTick(final World worldIn, final BlockPos pos, final IBlockState state, final Random rand) { @@ -106,4 +89,22 @@ public class BlockIronFurnace extends BlockMachineBase { } } } + + // BlockMachineBase + @Override + public TileEntity createNewTileEntity(final World world, final int p_149915_2_) { + return new TileIronFurnace(); + } + + @Override + public IMachineGuiHandler getGui() { + return EGui.IRON_FURNACE; + } + + @Override + public List getDrops(final IBlockAccess world, final BlockPos pos, final IBlockState state, final int fortune) { + final List items = new ArrayList<>(); + items.add(new ItemStack(this)); + return items; + } } diff --git a/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java b/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java index 29f42028c..e812fd881 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java +++ b/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java @@ -33,7 +33,7 @@ import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; -import techreborn.tiles.teir1.TileAlloySmelter; +import techreborn.tiles.tier1.TileAlloySmelter; public class BlockAlloySmelter extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/tier1/BlockCompressor.java b/src/main/java/techreborn/blocks/tier1/BlockCompressor.java index ff5c9bb67..c3f722b46 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockCompressor.java +++ b/src/main/java/techreborn/blocks/tier1/BlockCompressor.java @@ -33,7 +33,7 @@ import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; -import techreborn.tiles.teir1.TileCompressor; +import techreborn.tiles.tier1.TileCompressor; public class BlockCompressor extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java b/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java index 01a491b96..7dbb0956f 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java +++ b/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java @@ -33,7 +33,7 @@ import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; -import techreborn.tiles.teir1.TileElectricFurnace; +import techreborn.tiles.tier1.TileElectricFurnace; public class BlockElectricFurnace extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/tier1/BlockExtractor.java b/src/main/java/techreborn/blocks/tier1/BlockExtractor.java index aeff5338b..9a06dc130 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockExtractor.java +++ b/src/main/java/techreborn/blocks/tier1/BlockExtractor.java @@ -33,7 +33,7 @@ import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; -import techreborn.tiles.teir1.TileExtractor; +import techreborn.tiles.tier1.TileExtractor; public class BlockExtractor extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/tier1/BlockGrinder.java b/src/main/java/techreborn/blocks/tier1/BlockGrinder.java index 73a52d4ca..f3706dca8 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockGrinder.java +++ b/src/main/java/techreborn/blocks/tier1/BlockGrinder.java @@ -33,7 +33,7 @@ import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; -import techreborn.tiles.teir1.TileGrinder; +import techreborn.tiles.tier1.TileGrinder; public class BlockGrinder extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/tier1/BlockRecycler.java b/src/main/java/techreborn/blocks/tier1/BlockRecycler.java index 685c8aed9..dfe6df284 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockRecycler.java +++ b/src/main/java/techreborn/blocks/tier1/BlockRecycler.java @@ -33,7 +33,7 @@ import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; -import techreborn.tiles.teir1.TileRecycler; +import techreborn.tiles.tier1.TileRecycler; public class BlockRecycler extends BlockMachineBase { diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index 8320c7aff..132367f90 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -43,7 +43,8 @@ import techreborn.tiles.storage.TileAdjustableSU; import techreborn.tiles.storage.TileHighVoltageSU; import techreborn.tiles.storage.TileLowVoltageSU; import techreborn.tiles.storage.TileMediumVoltageSU; -import techreborn.tiles.teir1.*; +import techreborn.tiles.tier0.*; +import techreborn.tiles.tier1.*; public class GuiHandler implements IGuiHandler { diff --git a/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java b/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java index e47162b10..5a855be40 100644 --- a/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java @@ -29,7 +29,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; -import techreborn.tiles.TileIronAlloyFurnace; +import techreborn.tiles.tier0.TileIronAlloyFurnace; public class GuiAlloyFurnace extends GuiContainer { diff --git a/src/main/java/techreborn/client/gui/GuiAlloySmelter.java b/src/main/java/techreborn/client/gui/GuiAlloySmelter.java index 65985ab4e..92ba0053b 100644 --- a/src/main/java/techreborn/client/gui/GuiAlloySmelter.java +++ b/src/main/java/techreborn/client/gui/GuiAlloySmelter.java @@ -25,7 +25,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; -import techreborn.tiles.teir1.TileAlloySmelter; +import techreborn.tiles.tier1.TileAlloySmelter; public class GuiAlloySmelter extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiCompressor.java b/src/main/java/techreborn/client/gui/GuiCompressor.java index 850b87735..8a6e74048 100644 --- a/src/main/java/techreborn/client/gui/GuiCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiCompressor.java @@ -25,7 +25,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; -import techreborn.tiles.teir1.TileCompressor; +import techreborn.tiles.tier1.TileCompressor; public class GuiCompressor extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiElectricFurnace.java b/src/main/java/techreborn/client/gui/GuiElectricFurnace.java index 34e6fe1d2..9863a9400 100644 --- a/src/main/java/techreborn/client/gui/GuiElectricFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiElectricFurnace.java @@ -25,7 +25,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; -import techreborn.tiles.teir1.TileElectricFurnace; +import techreborn.tiles.tier1.TileElectricFurnace; public class GuiElectricFurnace extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiExtractor.java b/src/main/java/techreborn/client/gui/GuiExtractor.java index 8eb11caca..2607b8cbc 100644 --- a/src/main/java/techreborn/client/gui/GuiExtractor.java +++ b/src/main/java/techreborn/client/gui/GuiExtractor.java @@ -25,7 +25,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; -import techreborn.tiles.teir1.TileExtractor; +import techreborn.tiles.tier1.TileExtractor; public class GuiExtractor extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiGrinder.java b/src/main/java/techreborn/client/gui/GuiGrinder.java index 5f6638987..be183cb1c 100644 --- a/src/main/java/techreborn/client/gui/GuiGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiGrinder.java @@ -25,7 +25,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; -import techreborn.tiles.teir1.TileGrinder; +import techreborn.tiles.tier1.TileGrinder; public class GuiGrinder extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiIronFurnace.java b/src/main/java/techreborn/client/gui/GuiIronFurnace.java index 066175be1..297f3a636 100644 --- a/src/main/java/techreborn/client/gui/GuiIronFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiIronFurnace.java @@ -29,7 +29,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; -import techreborn.tiles.TileIronFurnace; +import techreborn.tiles.tier0.TileIronFurnace; public class GuiIronFurnace extends GuiContainer { diff --git a/src/main/java/techreborn/client/gui/GuiRecycler.java b/src/main/java/techreborn/client/gui/GuiRecycler.java index 9bfcde85f..e7680563c 100644 --- a/src/main/java/techreborn/client/gui/GuiRecycler.java +++ b/src/main/java/techreborn/client/gui/GuiRecycler.java @@ -25,7 +25,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; -import techreborn.tiles.teir1.TileRecycler; +import techreborn.tiles.tier1.TileRecycler; public class GuiRecycler extends GuiBase { diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index e6a5f8790..fb1856ae3 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -41,11 +41,10 @@ import techreborn.blocks.advanced_machine.*; import techreborn.blocks.cable.BlockCable; import techreborn.blocks.generator.*; import techreborn.blocks.generator.solarpanel.BlockSolarPanel; -import techreborn.blocks.iron_machines.BlockIronAlloyFurnace; -import techreborn.blocks.iron_machines.BlockIronFurnace; import techreborn.blocks.lighting.BlockLamp; import techreborn.blocks.machine.*; import techreborn.blocks.storage.*; +import techreborn.blocks.tier0.*; import techreborn.blocks.tier1.*; import techreborn.blocks.transformers.BlockHVTransformer; import techreborn.blocks.transformers.BlockLVTransformer; @@ -65,7 +64,8 @@ import techreborn.tiles.storage.TileAdjustableSU; import techreborn.tiles.storage.TileHighVoltageSU; import techreborn.tiles.storage.TileLowVoltageSU; import techreborn.tiles.storage.TileMediumVoltageSU; -import techreborn.tiles.teir1.*; +import techreborn.tiles.tier0.*; +import techreborn.tiles.tier1.*; import techreborn.tiles.transformers.TileHVTransformer; import techreborn.tiles.transformers.TileLVTransformer; import techreborn.tiles.transformers.TileMVTransformer; diff --git a/src/main/java/techreborn/tiles/TileGenericMachine.java b/src/main/java/techreborn/tiles/TileGenericMachine.java new file mode 100644 index 000000000..1a361bd9e --- /dev/null +++ b/src/main/java/techreborn/tiles/TileGenericMachine.java @@ -0,0 +1,123 @@ +/* + * This file is part of TechReborn, licensed under the MIT License (MIT). + * + * Copyright (c) 2018 TechReborn + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package techreborn.tiles; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import reborncore.api.IToolDrop; +import reborncore.api.recipe.IRecipeCrafterProvider; +import reborncore.api.tile.IInventoryProvider; +import reborncore.common.powerSystem.TilePowerAcceptor; +import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.util.Inventory; + +/** + * @author drcrazy + * + */ +public abstract class TileGenericMachine extends TilePowerAcceptor + implements IToolDrop, IInventoryProvider, IRecipeCrafterProvider{ + + public String name; + public int maxInput; + public int maxEnergy; + public Block toolDrop; + public int energySlot; + public Inventory inventory; + public RecipeCrafter crafter; + + public TileGenericMachine(String name, int maxInput, int maxEnergy, Block toolDrop, int energySlot) { + this.name = "Tile" + name; + this.maxInput = maxInput; + this.maxEnergy = maxEnergy; + this.toolDrop = toolDrop; + this.energySlot = energySlot; + } + + public int getProgressScaled(final int scale) { + if (this.crafter != null && this.crafter.currentTickTime != 0) { + return this.crafter.currentTickTime * scale / this.crafter.currentNeededTicks; + } + return 0; + } + + // TilePowerAcceptor + @Override + public void update() { + if (!this.world.isRemote) { + super.update(); + this.charge(energySlot); + } + } + + @Override + public double getBaseMaxPower() { + return maxEnergy; + } + + @Override + public boolean canAcceptEnergy(final EnumFacing direction) { + return true; + } + + @Override + public boolean canProvideEnergy(final EnumFacing direction) { + return false; + } + + @Override + public double getBaseMaxOutput() { + return 0; + } + + @Override + public double getBaseMaxInput() { + return maxInput; + } + + // IToolDrop + @Override + public ItemStack getToolDrop(EntityPlayer p0) { + return new ItemStack(toolDrop, 1); + } + + // IInventoryProvider + @Override + public Inventory getInventory() { + return inventory; + } + + // IRecipeCrafterProvider + @Override + public RecipeCrafter getRecipeCrafter() { + return crafter; + } + + + + +} diff --git a/src/main/java/techreborn/tiles/TileIronAlloyFurnace.java b/src/main/java/techreborn/tiles/tier0/TileIronAlloyFurnace.java similarity index 99% rename from src/main/java/techreborn/tiles/TileIronAlloyFurnace.java rename to src/main/java/techreborn/tiles/tier0/TileIronAlloyFurnace.java index 1970a38cc..15bac969a 100644 --- a/src/main/java/techreborn/tiles/TileIronAlloyFurnace.java +++ b/src/main/java/techreborn/tiles/tier0/TileIronAlloyFurnace.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.tiles; +package techreborn.tiles.tier0; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/techreborn/tiles/TileIronFurnace.java b/src/main/java/techreborn/tiles/tier0/TileIronFurnace.java similarity index 99% rename from src/main/java/techreborn/tiles/TileIronFurnace.java rename to src/main/java/techreborn/tiles/tier0/TileIronFurnace.java index bae1d089b..a6bb1971d 100644 --- a/src/main/java/techreborn/tiles/TileIronFurnace.java +++ b/src/main/java/techreborn/tiles/tier0/TileIronFurnace.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.tiles; +package techreborn.tiles.tier0; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/techreborn/tiles/teir1/TileAlloySmelter.java b/src/main/java/techreborn/tiles/tier1/TileAlloySmelter.java similarity index 99% rename from src/main/java/techreborn/tiles/teir1/TileAlloySmelter.java rename to src/main/java/techreborn/tiles/tier1/TileAlloySmelter.java index 48d51ea11..58a1fe2b6 100644 --- a/src/main/java/techreborn/tiles/teir1/TileAlloySmelter.java +++ b/src/main/java/techreborn/tiles/tier1/TileAlloySmelter.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.tiles.teir1; +package techreborn.tiles.tier1; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/techreborn/tiles/teir1/TileCompressor.java b/src/main/java/techreborn/tiles/tier1/TileCompressor.java similarity index 61% rename from src/main/java/techreborn/tiles/teir1/TileCompressor.java rename to src/main/java/techreborn/tiles/tier1/TileCompressor.java index ff53d7db2..01ec5ac36 100644 --- a/src/main/java/techreborn/tiles/teir1/TileCompressor.java +++ b/src/main/java/techreborn/tiles/tier1/TileCompressor.java @@ -22,15 +22,9 @@ * SOFTWARE. */ -package techreborn.tiles.teir1; +package techreborn.tiles.tier1; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import reborncore.api.IToolDrop; -import reborncore.api.recipe.IRecipeCrafterProvider; -import reborncore.api.tile.IInventoryProvider; -import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.util.Inventory; @@ -39,78 +33,23 @@ import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; +import techreborn.tiles.TileGenericMachine; -public class TileCompressor extends TilePowerAcceptor - implements IToolDrop, IInventoryProvider, IContainerProvider, IRecipeCrafterProvider { +public class TileCompressor extends TileGenericMachine implements IContainerProvider { @ConfigRegistry(config = "machines", category = "compressor", key = "CompressorInput", comment = "Compressor Max Input (Value in EU)") public static int maxInput = 32; @ConfigRegistry(config = "machines", category = "compressor", key = "CompressorMaxEnergy", comment = "Compressor Max Energy (Value in EU)") public static int maxEnergy = 1000; - public Inventory inventory = new Inventory(3, "TileCompressor", 64, this); - public RecipeCrafter crafter; - public TileCompressor() { - super(); + super("Compressor", maxInput, maxEnergy, ModBlocks.COMPRESSOR, 2); final int[] inputs = new int[] { 0 }; final int[] outputs = new int[] { 1 }; + this.inventory = new Inventory(3, "TileCompressor", 64, this); this.crafter = new RecipeCrafter(Reference.COMPRESSOR_RECIPE, this, 2, 1, this.inventory, inputs, outputs); } - public int getProgressScaled(final int scale) { - if (this.crafter.currentTickTime != 0) { - return this.crafter.currentTickTime * scale / this.crafter.currentNeededTicks; - } - return 0; - } - - // TilePowerAcceptor - @Override - public void update() { - if (!this.world.isRemote) { - super.update(); - this.charge(2); - } - } - - @Override - public double getBaseMaxPower() { - return maxEnergy; - } - - @Override - public boolean canAcceptEnergy(final EnumFacing direction) { - return true; - } - - @Override - public boolean canProvideEnergy(final EnumFacing direction) { - return false; - } - - @Override - public double getBaseMaxOutput() { - return 0; - } - - @Override - public double getBaseMaxInput() { - return maxInput; - } - - // IToolDrop - @Override - public ItemStack getToolDrop(final EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.COMPRESSOR, 1); - } - - // IInventoryProvider - @Override - public Inventory getInventory() { - return this.inventory; - } - // IContainerProvider @Override public BuiltContainer createContainer(final EntityPlayer player) { @@ -118,10 +57,4 @@ public class TileCompressor extends TilePowerAcceptor .tile(this).slot(0, 55, 45).outputSlot(1, 101, 45).energySlot(2, 8, 72).syncEnergyValue() .syncCrafterValue().addInventory().create(this); } - - // IRecipeCrafterProvider - @Override - public RecipeCrafter getRecipeCrafter() { - return this.crafter; - } -} +} \ No newline at end of file diff --git a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java b/src/main/java/techreborn/tiles/tier1/TileElectricFurnace.java similarity index 99% rename from src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java rename to src/main/java/techreborn/tiles/tier1/TileElectricFurnace.java index 49782937d..cedccf6c3 100644 --- a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java +++ b/src/main/java/techreborn/tiles/tier1/TileElectricFurnace.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.tiles.teir1; +package techreborn.tiles.tier1; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/techreborn/tiles/teir1/TileExtractor.java b/src/main/java/techreborn/tiles/tier1/TileExtractor.java similarity index 99% rename from src/main/java/techreborn/tiles/teir1/TileExtractor.java rename to src/main/java/techreborn/tiles/tier1/TileExtractor.java index f2a1ac131..2802014ed 100644 --- a/src/main/java/techreborn/tiles/teir1/TileExtractor.java +++ b/src/main/java/techreborn/tiles/tier1/TileExtractor.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.tiles.teir1; +package techreborn.tiles.tier1; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/techreborn/tiles/teir1/TileGrinder.java b/src/main/java/techreborn/tiles/tier1/TileGrinder.java similarity index 99% rename from src/main/java/techreborn/tiles/teir1/TileGrinder.java rename to src/main/java/techreborn/tiles/tier1/TileGrinder.java index 6b69be787..ccdd14d72 100644 --- a/src/main/java/techreborn/tiles/teir1/TileGrinder.java +++ b/src/main/java/techreborn/tiles/tier1/TileGrinder.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.tiles.teir1; +package techreborn.tiles.tier1; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/techreborn/tiles/teir1/TileRecycler.java b/src/main/java/techreborn/tiles/tier1/TileRecycler.java similarity index 99% rename from src/main/java/techreborn/tiles/teir1/TileRecycler.java rename to src/main/java/techreborn/tiles/tier1/TileRecycler.java index 86c7447ae..f9b6e468f 100644 --- a/src/main/java/techreborn/tiles/teir1/TileRecycler.java +++ b/src/main/java/techreborn/tiles/tier1/TileRecycler.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.tiles.teir1; +package techreborn.tiles.tier1; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer;