Flattened frames

This commit is contained in:
drcrazy 2018-09-14 17:16:59 +03:00
parent 94b1e19abf
commit 1d4116a215
51 changed files with 465 additions and 570 deletions

View file

@ -119,7 +119,7 @@ public class TileChargeOMat extends TilePowerAcceptor
// ItemHandlerProvider
@Override
public Inventory getInventory() {
public Inventory<TileChargeOMat> getInventory() {
return inventory;
}

View file

@ -93,7 +93,7 @@ public class TileChunkLoader extends TilePowerAcceptor implements IToolDrop, Ite
}
@Override
public Inventory getInventory() {
public Inventory<TileChunkLoader> getInventory() {
return this.inventory;
}

View file

@ -113,7 +113,7 @@ public class TileQuantumTank extends TileLegacyMachineBase
// ItemHandlerProvider
@Override
public Inventory getInventory() {
public Inventory<TileQuantumTank> getInventory() {
return this.inventory;
}

View file

@ -364,7 +364,7 @@ public class TileFusionControlComputer extends TilePowerAcceptor
// ItemHandlerProvider
@Override
public Inventory getInventory() {
public Inventory<TileFusionControlComputer> getInventory() {
return inventory;
}

View file

@ -121,7 +121,7 @@ public class TileDragonEggSyphon extends TilePowerAcceptor
// ItemHandlerProvider
@Override
public Inventory getInventory() {
public Inventory<TileDragonEggSyphon> getInventory() {
return inventory;
}
}

View file

@ -151,7 +151,7 @@ public class TileSolidFuelGenerator extends TilePowerAcceptor implements IToolDr
}
@Override
public Inventory getInventory() {
public Inventory<TileSolidFuelGenerator> getInventory() {
return inventory;
}

View file

@ -25,10 +25,8 @@
package techreborn.tiles.multiblock;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import reborncore.common.recipes.RecipeCrafter;
import reborncore.common.registration.RebornRegistry;
import reborncore.common.registration.impl.ConfigRegistry;
@ -133,6 +131,13 @@ public class TileFluidReplicator extends TileGenericMachine implements IContaine
return true;
};
}
// TileLegacyMachineBase
@Nullable
@Override
public Tank getTank() {
return tank;
}
// IContainerProvider
@Override
@ -142,10 +147,4 @@ public class TileFluidReplicator extends TileGenericMachine implements IContaine
.outputSlot(2, 124, 55).energySlot(3, 8, 72).syncEnergyValue().syncCrafterValue().addInventory()
.create(this);
}
@Nullable
@Override
public Tank getTank() {
return tank;
}
}

View file

@ -28,7 +28,6 @@ import net.minecraft.block.BlockLiquid;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
@ -49,7 +48,6 @@ import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.TRIngredients;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileGenericMachine;
@ -92,6 +90,15 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai
return down && center && blade && up;
}
private static IInventoryAccess<TileIndustrialGrinder> getInventoryAccess(){
return (slotID, stack, face, direction, tile) -> {
if(slotID == 1){
return stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null);
}
return true;
};
}
// TilePowerAcceptor
@Override
public void update() {
@ -129,14 +136,12 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai
tank.writeToNBT(tagCompound);
return tagCompound;
}
private static IInventoryAccess<TileIndustrialGrinder> getInventoryAccess(){
return (slotID, stack, face, direction, tile) -> {
if(slotID == 1){
return stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null);
}
return true;
};
// TileLegacyMachineBase
@Nullable
@Override
public Tank getTank() {
return tank;
}
// IContainerProvider
@ -195,10 +200,4 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai
}
return false;
}
@Nullable
@Override
public Tank getTank() {
return tank;
}
}

View file

@ -28,10 +28,8 @@ import net.minecraft.block.BlockLiquid;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidBlock;
@ -52,8 +50,6 @@ import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileGenericMachine;
import techreborn.tiles.tier1.TileAutoCraftingTable;
import javax.annotation.Nullable;
@RebornRegistry(modID = ModInfo.MOD_ID)
@ -118,6 +114,7 @@ public class TileIndustrialSawmill extends TileGenericMachine implements IContai
tank.compareAndUpdate();
}
// TilePowerAcceptor
@Override
public void readFromNBT(final NBTTagCompound tagCompound) {
super.readFromNBT(tagCompound);
@ -130,6 +127,13 @@ public class TileIndustrialSawmill extends TileGenericMachine implements IContai
tank.writeToNBT(tagCompound);
return tagCompound;
}
// TileLegacyMachineBase
@Nullable
@Override
public Tank getTank() {
return tank;
}
private static IInventoryAccess<TileIndustrialSawmill> getInventoryAccess(){
return (slotID, stack, face, direction, tile) -> {
@ -195,10 +199,4 @@ public class TileIndustrialSawmill extends TileGenericMachine implements IContai
}
return false;
}
@Nullable
@Override
public Tank getTank() {
return tank;
}
}

View file

@ -44,7 +44,7 @@ import techreborn.blocks.storage.BlockEnergyStorage;
public class TileEnergyStorage extends TilePowerAcceptor
implements IToolDrop, ItemHandlerProvider {
public Inventory inventory;
public Inventory<TileEnergyStorage> inventory;
public String name;
public Block wrenchDrop;
public EnumPowerTier tier;
@ -141,7 +141,7 @@ public class TileEnergyStorage extends TilePowerAcceptor
// ItemHandlerProvider
@Override
public Inventory getInventory() {
public Inventory<TileEnergyStorage> getInventory() {
return inventory;
}
}

View file

@ -305,7 +305,7 @@ public class TileIronAlloyFurnace extends TileLegacyMachineBase
}
@Override
public Inventory getInventory() {
public Inventory<TileIronAlloyFurnace> getInventory() {
return this.inventory;
}

View file

@ -29,7 +29,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraft.tileentity.TileEntityFurnace;
import net.minecraft.util.EnumFacing;
import reborncore.api.tile.ItemHandlerProvider;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.tile.TileLegacyMachineBase;
@ -166,7 +165,7 @@ public class TileIronFurnace extends TileLegacyMachineBase
}
@Override
public Inventory getInventory() {
public Inventory<TileIronFurnace> getInventory() {
return this.inventory;
}

View file

@ -41,7 +41,6 @@ import reborncore.api.tile.ItemHandlerProvider;
import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.registration.RebornRegistry;
import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.tile.TileLegacyMachineBase;
import reborncore.common.util.IInventoryAccess;
import reborncore.common.util.Inventory;
import reborncore.common.util.ItemUtils;

View file

@ -209,7 +209,7 @@ public class TileElectricFurnace extends TilePowerAcceptor
// ItemHandlerProvider
@Override
public Inventory getInventory() {
public Inventory<TileElectricFurnace> getInventory() {
return inventory;
}

View file

@ -51,7 +51,7 @@ public class TileRecycler extends TilePowerAcceptor
@ConfigRegistry(config = "machines", category = "recycler", key = "RecyclerMaxEnergy", comment = "Recycler Max Energy (Value in EU)")
public static int maxEnergy = 1000;
private final Inventory inventory = new Inventory<>(3, "TileRecycler", 64, this).withConfiguredAccess();
private final Inventory<TileRecycler> inventory = new Inventory<>(3, "TileRecycler", 64, this).withConfiguredAccess();
private final int cost = 2;
private final int time = 15;
private final int chance = 6;
@ -193,7 +193,7 @@ public class TileRecycler extends TilePowerAcceptor
// ItemHandlerProvider
@Override
public Inventory getInventory() {
public Inventory<TileRecycler> getInventory() {
return this.inventory;
}

View file

@ -295,7 +295,7 @@ public class TileRollingMachine extends TilePowerAcceptor
}
@Override
public Inventory getInventory() {
public Inventory<TileRollingMachine> getInventory() {
return inventory;
}