Start on tile rewrite

This commit is contained in:
modmuss50 2016-04-11 17:23:57 +01:00
parent 169c8e5ceb
commit ef133ab25b
27 changed files with 39 additions and 891 deletions

View file

@ -18,8 +18,8 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
import reborncore.common.tile.TileMachineBase;
import reborncore.common.util.Inventory;
import reborncore.common.util.ItemUtils;
import techreborn.api.recipe.IBaseRecipeType;
import techreborn.api.recipe.RecipeHandler;
import reborncore.api.recipe.IBaseRecipeType;
import reborncore.api.recipe.RecipeHandler;
import techreborn.init.ModBlocks;
import techreborn.api.Reference;
import ic2.api.tile.IWrenchable;

View file

@ -10,7 +10,7 @@ import net.minecraft.util.text.ITextComponent;
import reborncore.api.power.EnumPowerTier;
import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.util.Inventory;
import techreborn.utils.RecipeCrafter;
import reborncore.common.recipes.RecipeCrafter;
import techreborn.utils.upgrade.UpgradeHandler;
import techreborn.init.ModBlocks;
import techreborn.api.Reference;

View file

@ -1,21 +1,21 @@
package techreborn.tiles;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.text.ITextComponent;
import reborncore.api.power.EnumPowerTier;
import reborncore.api.recipe.IRecipeCrafterProvider;
import reborncore.api.tile.IInventoryProvider;
import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.util.Inventory;
import techreborn.utils.RecipeCrafter;
import reborncore.common.recipes.RecipeCrafter;
import techreborn.init.ModBlocks;
import techreborn.api.Reference;
import ic2.api.tile.IWrenchable;
public class TileAssemblingMachine extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory
public class TileAssemblingMachine extends TilePowerAcceptor implements IWrenchable, ISidedInventory, IInventoryProvider, IRecipeCrafterProvider
{
public int tickTime;
@ -38,7 +38,6 @@ public class TileAssemblingMachine extends TilePowerAcceptor implements IWrencha
public void updateEntity()
{
super.updateEntity();
crafter.updateEntity();
charge(3);
}
@ -77,69 +76,6 @@ public class TileAssemblingMachine extends TilePowerAcceptor implements IWrencha
return false;
}
@Override
public void readFromNBT(NBTTagCompound tagCompound)
{
super.readFromNBT(tagCompound);
inventory.readFromNBT(tagCompound);
crafter.readFromNBT(tagCompound);
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
inventory.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
}
@Override
public int getSizeInventory()
{
return inventory.getSizeInventory();
}
@Override
public ItemStack getStackInSlot(int slot)
{
return inventory.getStackInSlot(slot);
}
@Override
public ItemStack decrStackSize(int slot, int amount)
{
return inventory.decrStackSize(slot, amount);
}
@Override
public ItemStack removeStackFromSlot(int slot)
{
return inventory.removeStackFromSlot(slot);
}
@Override
public void setInventorySlotContents(int slot, ItemStack stack)
{
inventory.setInventorySlotContents(slot, stack);
}
@Override
public int getInventoryStackLimit()
{
return inventory.getInventoryStackLimit();
}
@Override
public boolean isUseableByPlayer(EntityPlayer player)
{
return inventory.isUseableByPlayer(player);
}
@Override
public boolean isItemValidForSlot(int slot, ItemStack stack)
{
return inventory.isItemValidForSlot(slot, stack);
}
// ISidedInventory
@Override
@ -218,56 +154,12 @@ public class TileAssemblingMachine extends TilePowerAcceptor implements IWrencha
}
@Override
public void openInventory(EntityPlayer player)
{
inventory.openInventory(player);
public Inventory getInventory() {
return inventory;
}
@Override
public void closeInventory(EntityPlayer player)
{
inventory.closeInventory(player);
}
@Override
public int getField(int id)
{
return inventory.getField(id);
}
@Override
public void setField(int id, int value)
{
inventory.setField(id, value);
}
@Override
public int getFieldCount()
{
return inventory.getFieldCount();
}
@Override
public void clear()
{
inventory.clear();
}
@Override
public String getName()
{
return inventory.getName();
}
@Override
public boolean hasCustomName()
{
return inventory.hasCustomName();
}
@Override
public ITextComponent getDisplayName()
{
return inventory.getDisplayName();
public RecipeCrafter getRecipeCrafter() {
return crafter;
}
}

View file

@ -19,7 +19,7 @@ import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.util.Inventory;
import techreborn.api.recipe.ITileRecipeHandler;
import techreborn.api.recipe.machines.BlastFurnaceRecipe;
import techreborn.utils.RecipeCrafter;
import reborncore.common.recipes.RecipeCrafter;
import techreborn.blocks.BlockMachineCasing;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModBlocks;

View file

@ -13,7 +13,7 @@ import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PoweredItem;
import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.util.Inventory;
import techreborn.utils.RecipeCrafter;
import reborncore.common.recipes.RecipeCrafter;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModBlocks;
import techreborn.api.Reference;

View file

@ -10,7 +10,7 @@ import net.minecraft.util.text.ITextComponent;
import reborncore.api.power.EnumPowerTier;
import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.util.Inventory;
import techreborn.utils.RecipeCrafter;
import reborncore.common.recipes.RecipeCrafter;
import techreborn.init.ModBlocks;
import techreborn.api.Reference;
import ic2.api.tile.IWrenchable;

View file

@ -13,7 +13,7 @@ import reborncore.api.power.EnumPowerTier;
import reborncore.common.misc.Location;
import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.util.Inventory;
import techreborn.utils.RecipeCrafter;
import reborncore.common.recipes.RecipeCrafter;
import techreborn.blocks.BlockMachineCasing;
import techreborn.init.ModBlocks;
import techreborn.api.Reference;

View file

@ -10,7 +10,7 @@ import net.minecraft.util.text.ITextComponent;
import reborncore.api.power.EnumPowerTier;
import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.util.Inventory;
import techreborn.utils.RecipeCrafter;
import reborncore.common.recipes.RecipeCrafter;
import techreborn.init.ModBlocks;
import techreborn.api.Reference;
import ic2.api.tile.IWrenchable;

View file

@ -21,7 +21,7 @@ import reborncore.common.util.Inventory;
import reborncore.common.util.Tank;
import techreborn.api.recipe.ITileRecipeHandler;
import techreborn.api.recipe.machines.IndustrialGrinderRecipe;
import techreborn.utils.RecipeCrafter;
import reborncore.common.recipes.RecipeCrafter;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModBlocks;
import techreborn.init.ModFluids;

View file

@ -23,7 +23,7 @@ import reborncore.common.util.Inventory;
import reborncore.common.util.Tank;
import techreborn.api.recipe.ITileRecipeHandler;
import techreborn.api.recipe.machines.IndustrialSawmillRecipe;
import techreborn.utils.RecipeCrafter;
import reborncore.common.recipes.RecipeCrafter;
import techreborn.blocks.BlockMachineCasing;
import techreborn.init.ModBlocks;
import techreborn.init.ModFluids;

View file

@ -14,7 +14,7 @@ import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.util.Inventory;
import techreborn.api.recipe.ITileRecipeHandler;
import techreborn.api.recipe.machines.VacuumFreezerRecipe;
import techreborn.utils.RecipeCrafter;
import reborncore.common.recipes.RecipeCrafter;
import techreborn.blocks.BlockMachineCasing;
import techreborn.init.ModBlocks;
import techreborn.api.Reference;

View file

@ -8,14 +8,16 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.text.ITextComponent;
import reborncore.api.power.EnumPowerTier;
import reborncore.api.recipe.IRecipeCrafterProvider;
import reborncore.api.tile.IInventoryProvider;
import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.util.Inventory;
import techreborn.utils.RecipeCrafter;
import reborncore.common.recipes.RecipeCrafter;
import techreborn.init.ModBlocks;
import techreborn.api.Reference;
import ic2.api.tile.IWrenchable;
public class TileCompressor extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory
public class TileCompressor extends TilePowerAcceptor implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, ISidedInventory
{
public Inventory inventory = new Inventory(6, "TileCompressor", 64, this);
@ -36,7 +38,6 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II
public void updateEntity()
{
super.updateEntity();
crafter.updateEntity();
// upgrades.tick();
charge(3);
}
@ -76,70 +77,6 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II
return false;
}
@Override
public void readFromNBT(NBTTagCompound tagCompound)
{
super.readFromNBT(tagCompound);
inventory.readFromNBT(tagCompound);
crafter.readFromNBT(tagCompound);
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
inventory.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
}
@Override
public int getSizeInventory()
{
return inventory.getSizeInventory();
}
@Override
public ItemStack getStackInSlot(int slot)
{
return inventory.getStackInSlot(slot);
}
@Override
public ItemStack decrStackSize(int slot, int amount)
{
return inventory.decrStackSize(slot, amount);
}
@Override
public ItemStack removeStackFromSlot(int slot)
{
return inventory.removeStackFromSlot(slot);
}
@Override
public void setInventorySlotContents(int slot, ItemStack stack)
{
inventory.setInventorySlotContents(slot, stack);
}
@Override
public int getInventoryStackLimit()
{
return inventory.getInventoryStackLimit();
}
@Override
public boolean isUseableByPlayer(EntityPlayer player)
{
return inventory.isUseableByPlayer(player);
}
@Override
public boolean isItemValidForSlot(int slot, ItemStack stack)
{
return inventory.isItemValidForSlot(slot, stack);
}
// ISidedInventory
@Override
public int[] getSlotsForFace(EnumFacing side)
@ -207,56 +144,12 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II
}
@Override
public void openInventory(EntityPlayer player)
{
inventory.openInventory(player);
public Inventory getInventory() {
return inventory;
}
@Override
public void closeInventory(EntityPlayer player)
{
inventory.closeInventory(player);
}
@Override
public int getField(int id)
{
return inventory.getField(id);
}
@Override
public void setField(int id, int value)
{
inventory.setField(id, value);
}
@Override
public int getFieldCount()
{
return inventory.getFieldCount();
}
@Override
public void clear()
{
inventory.clear();
}
@Override
public String getName()
{
return inventory.getName();
}
@Override
public boolean hasCustomName()
{
return inventory.hasCustomName();
}
@Override
public ITextComponent getDisplayName()
{
return inventory.getDisplayName();
public RecipeCrafter getRecipeCrafter() {
return crafter;
}
}

View file

@ -10,7 +10,7 @@ import net.minecraft.util.text.ITextComponent;
import reborncore.api.power.EnumPowerTier;
import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.util.Inventory;
import techreborn.utils.RecipeCrafter;
import reborncore.common.recipes.RecipeCrafter;
import techreborn.init.ModBlocks;
import techreborn.api.Reference;
import ic2.api.tile.IWrenchable;

View file

@ -11,7 +11,7 @@ import reborncore.api.IListInfoProvider;
import reborncore.api.power.EnumPowerTier;
import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.util.Inventory;
import techreborn.utils.RecipeCrafter;
import reborncore.common.recipes.RecipeCrafter;
import techreborn.init.ModBlocks;
import techreborn.api.Reference;
import ic2.api.tile.IWrenchable;