diff --git a/src/main/java/techreborn/tiles/TileChargeOMat.java b/src/main/java/techreborn/tiles/TileChargeOMat.java index 01278680b..6b30f5433 100644 --- a/src/main/java/techreborn/tiles/TileChargeOMat.java +++ b/src/main/java/techreborn/tiles/TileChargeOMat.java @@ -28,7 +28,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; -import reborncore.api.tile.ItemHandlerProvider; +import reborncore.api.tile.InventoryProvider; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; @@ -43,7 +43,7 @@ import techreborn.init.TRTileEntities; @RebornRegister(TechReborn.MOD_ID) public class TileChargeOMat extends TilePowerAcceptor - implements IToolDrop, ItemHandlerProvider, IContainerProvider { + implements IToolDrop, InventoryProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "charge_bench", key = "ChargeBenchMaxOutput", comment = "Charge Bench Max Output (Value in EU)") public static int maxOutput = 512; diff --git a/src/main/java/techreborn/tiles/TileGenericMachine.java b/src/main/java/techreborn/tiles/TileGenericMachine.java index e68484ae0..38b323680 100644 --- a/src/main/java/techreborn/tiles/TileGenericMachine.java +++ b/src/main/java/techreborn/tiles/TileGenericMachine.java @@ -31,7 +31,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; import reborncore.api.recipe.IRecipeCrafterProvider; -import reborncore.api.tile.ItemHandlerProvider; +import reborncore.api.tile.InventoryProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.RebornInventory; @@ -41,7 +41,7 @@ import reborncore.common.util.RebornInventory; * */ public abstract class TileGenericMachine extends TilePowerAcceptor - implements IToolDrop, ItemHandlerProvider, IRecipeCrafterProvider{ + implements IToolDrop, InventoryProvider, IRecipeCrafterProvider{ public String name; public int maxInput; diff --git a/src/main/java/techreborn/tiles/TileTechStorageBase.java b/src/main/java/techreborn/tiles/TileTechStorageBase.java index 6433aea6b..7c5fa4645 100644 --- a/src/main/java/techreborn/tiles/TileTechStorageBase.java +++ b/src/main/java/techreborn/tiles/TileTechStorageBase.java @@ -32,7 +32,7 @@ import net.minecraft.text.LiteralText; import net.minecraft.text.Text; import reborncore.api.IListInfoProvider; import reborncore.api.IToolDrop; -import reborncore.api.tile.ItemHandlerProvider; +import reborncore.api.tile.InventoryProvider; import reborncore.common.tile.TileMachineBase; import reborncore.common.util.RebornInventory; import reborncore.common.util.ItemUtils; @@ -41,7 +41,7 @@ import java.util.ArrayList; import java.util.List; public class TileTechStorageBase extends TileMachineBase - implements ItemHandlerProvider, IToolDrop, IListInfoProvider { + implements InventoryProvider, IToolDrop, IListInfoProvider { public final int maxCapacity; public final RebornInventory inventory; diff --git a/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java b/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java index 812e3c243..1b553218c 100644 --- a/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java +++ b/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java @@ -30,7 +30,7 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; -import reborncore.api.tile.ItemHandlerProvider; +import reborncore.api.tile.InventoryProvider; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; @@ -51,7 +51,7 @@ import java.util.List; @RebornRegister(TechReborn.MOD_ID) public class TileFusionControlComputer extends TilePowerAcceptor - implements IToolDrop, ItemHandlerProvider, IContainerProvider { + implements IToolDrop, InventoryProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "fusion_reactor", key = "FusionReactorMaxInput", comment = "Fusion Reactor Max Input (Value in EU)") public static int maxInput = 8192; diff --git a/src/main/java/techreborn/tiles/generator/TileBaseFluidGenerator.java b/src/main/java/techreborn/tiles/generator/TileBaseFluidGenerator.java index 84463b799..c982217ce 100644 --- a/src/main/java/techreborn/tiles/generator/TileBaseFluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileBaseFluidGenerator.java @@ -28,7 +28,7 @@ import net.minecraft.block.entity.BlockEntityType; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; -import reborncore.api.tile.ItemHandlerProvider; +import reborncore.api.tile.InventoryProvider; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.RebornInventory; @@ -42,7 +42,7 @@ import techreborn.utils.FluidUtils; import javax.annotation.Nullable; -public abstract class TileBaseFluidGenerator extends TilePowerAcceptor implements IToolDrop, ItemHandlerProvider { +public abstract class TileBaseFluidGenerator extends TilePowerAcceptor implements IToolDrop, InventoryProvider { private final FluidGeneratorRecipeList recipes; private final int euTick; diff --git a/src/main/java/techreborn/tiles/generator/advanced/TileDragonEggSyphon.java b/src/main/java/techreborn/tiles/generator/advanced/TileDragonEggSyphon.java index 7703c8caa..f56c7eea1 100644 --- a/src/main/java/techreborn/tiles/generator/advanced/TileDragonEggSyphon.java +++ b/src/main/java/techreborn/tiles/generator/advanced/TileDragonEggSyphon.java @@ -30,7 +30,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; -import reborncore.api.tile.ItemHandlerProvider; +import reborncore.api.tile.InventoryProvider; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; @@ -42,7 +42,7 @@ import techreborn.init.TRTileEntities; @RebornRegister(TechReborn.MOD_ID) public class TileDragonEggSyphon extends TilePowerAcceptor - implements IToolDrop, ItemHandlerProvider { + implements IToolDrop, InventoryProvider { @ConfigRegistry(config = "generators", category = "dragon_egg_siphoner", key = "DragonEggSiphonerMaxOutput", comment = "Dragon Egg Siphoner Max Output (Value in EU)") public static int maxOutput = 128; diff --git a/src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java b/src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java index e3ff1dabf..51999420c 100644 --- a/src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java +++ b/src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java @@ -32,7 +32,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; -import reborncore.api.tile.ItemHandlerProvider; +import reborncore.api.tile.InventoryProvider; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; @@ -46,7 +46,7 @@ import techreborn.init.TRContent; import techreborn.init.TRTileEntities; @RebornRegister(TechReborn.MOD_ID) -public class TileSolidFuelGenerator extends TilePowerAcceptor implements IToolDrop, ItemHandlerProvider, IContainerProvider { +public class TileSolidFuelGenerator extends TilePowerAcceptor implements IToolDrop, InventoryProvider, IContainerProvider { @ConfigRegistry(config = "generators", category = "generator", key = "GeneratorMaxOutput", comment = "Solid Fuel Generator Max Output (Value in EU)") public static int maxOutput = 32; diff --git a/src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java b/src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java index 541561726..54e321e95 100644 --- a/src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java +++ b/src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java @@ -29,7 +29,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; -import reborncore.api.tile.ItemHandlerProvider; +import reborncore.api.tile.InventoryProvider; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; @@ -45,7 +45,7 @@ import techreborn.init.TRTileEntities; @RebornRegister(TechReborn.MOD_ID) public class TileIronAlloyFurnace extends TileMachineBase - implements IToolDrop, ItemHandlerProvider, IContainerProvider { + implements IToolDrop, InventoryProvider, IContainerProvider { public int tickTime; public RebornInventory inventory = new RebornInventory<>(4, "TileIronAlloyFurnace", 64, this).withConfiguredAccess(); diff --git a/src/main/java/techreborn/tiles/machine/iron/TileIronFurnace.java b/src/main/java/techreborn/tiles/machine/iron/TileIronFurnace.java index 31711e7c7..eee54efca 100644 --- a/src/main/java/techreborn/tiles/machine/iron/TileIronFurnace.java +++ b/src/main/java/techreborn/tiles/machine/iron/TileIronFurnace.java @@ -29,7 +29,7 @@ import net.minecraft.block.entity.FurnaceBlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.recipe.RecipeType; -import reborncore.api.tile.ItemHandlerProvider; +import reborncore.api.tile.InventoryProvider; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; @@ -42,7 +42,7 @@ import techreborn.events.TRRecipeHandler; import techreborn.init.TRTileEntities; public class TileIronFurnace extends TileMachineBase - implements ItemHandlerProvider, IContainerProvider { + implements InventoryProvider, IContainerProvider { public int tickTime; public RebornInventory inventory = new RebornInventory<>(3, "TileIronFurnace", 64, this, getInvetoryAccess()); diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java b/src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java index 0dabff59a..7e6658c5a 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java @@ -37,7 +37,7 @@ import net.minecraft.util.DefaultedList; import net.minecraft.util.math.Direction; import org.apache.commons.lang3.tuple.Pair; import reborncore.api.IToolDrop; -import reborncore.api.tile.ItemHandlerProvider; +import reborncore.api.tile.InventoryProvider; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; @@ -62,7 +62,7 @@ import java.util.List; */ @RebornRegister(TechReborn.MOD_ID) public class TileAutoCraftingTable extends TilePowerAcceptor - implements IToolDrop, ItemHandlerProvider, IContainerProvider { + implements IToolDrop, InventoryProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "autocrafter", key = "AutoCrafterInput", comment = "AutoCrafting Table Max Input (Value in EU)") public static int maxInput = 32; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java b/src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java index 3dffac291..c30adb98e 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java @@ -30,7 +30,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.recipe.RecipeType; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; -import reborncore.api.tile.ItemHandlerProvider; +import reborncore.api.tile.InventoryProvider; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; @@ -46,7 +46,7 @@ import techreborn.init.TRTileEntities; @RebornRegister(TechReborn.MOD_ID) public class TileElectricFurnace extends TilePowerAcceptor - implements IToolDrop, ItemHandlerProvider, IContainerProvider { + implements IToolDrop, InventoryProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "electric_furnace", key = "ElectricFurnaceInput", comment = "Electric Furnace Max Input (Value in EU)") public static int maxInput = 32; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java b/src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java index 4d5c5cebe..c0f22d58a 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java @@ -52,7 +52,7 @@ public class TileGrinder extends TileGenericMachine implements IContainerProvide final int[] outputs = new int[] { 1 }; this.inventory = new RebornInventory<>(3, "TileGrinder", 64, this).withConfiguredAccess(); this.crafter = new RecipeCrafter(ModRecipes.GRINDER, this, 2, 1, this.inventory, inputs, outputs); - } +} // IContainerProvider @Override diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java b/src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java index 07671bc5b..fc095c00f 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java @@ -30,7 +30,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; import reborncore.api.tile.IUpgrade; -import reborncore.api.tile.ItemHandlerProvider; +import reborncore.api.tile.InventoryProvider; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; @@ -45,7 +45,7 @@ import techreborn.init.TRTileEntities; @RebornRegister(TechReborn.MOD_ID) public class TileRecycler extends TilePowerAcceptor - implements IToolDrop, ItemHandlerProvider, IContainerProvider { + implements IToolDrop, InventoryProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "recycler", key = "RecyclerInput", comment = "Recycler Max Input (Value in EU)") public static int maxInput = 32; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java b/src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java index b62c9bdb3..bf839b41c 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java @@ -34,7 +34,7 @@ import net.minecraft.recipe.Recipe; import net.minecraft.util.math.Direction; import org.apache.commons.lang3.tuple.Pair; import reborncore.api.IToolDrop; -import reborncore.api.tile.ItemHandlerProvider; +import reborncore.api.tile.InventoryProvider; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; @@ -60,7 +60,7 @@ import java.util.stream.Collectors; @RebornRegister(TechReborn.MOD_ID) public class TileRollingMachine extends TilePowerAcceptor - implements IToolDrop, ItemHandlerProvider, IContainerProvider { + implements IToolDrop, InventoryProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "rolling_machine", key = "RollingMachineMaxInput", comment = "Rolling Machine Max Input (Value in EU)") public static int maxInput = 32; diff --git a/src/main/java/techreborn/tiles/machine/tier3/TileChunkLoader.java b/src/main/java/techreborn/tiles/machine/tier3/TileChunkLoader.java index c49d46507..6b01fa699 100644 --- a/src/main/java/techreborn/tiles/machine/tier3/TileChunkLoader.java +++ b/src/main/java/techreborn/tiles/machine/tier3/TileChunkLoader.java @@ -28,7 +28,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; -import reborncore.api.tile.ItemHandlerProvider; +import reborncore.api.tile.InventoryProvider; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; @@ -41,7 +41,7 @@ import techreborn.init.TRContent; import techreborn.init.TRTileEntities; @RebornRegister(TechReborn.MOD_ID) -public class TileChunkLoader extends TilePowerAcceptor implements IToolDrop, ItemHandlerProvider, IContainerProvider { +public class TileChunkLoader extends TilePowerAcceptor implements IToolDrop, InventoryProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "chunk_loader", key = "ChunkLoaderMaxInput", comment = "Chunk Loader Max Input (Value in EU)") public static int maxInput = 32; diff --git a/src/main/java/techreborn/tiles/machine/tier3/TileMatterFabricator.java b/src/main/java/techreborn/tiles/machine/tier3/TileMatterFabricator.java index 48713b376..fac9c0535 100644 --- a/src/main/java/techreborn/tiles/machine/tier3/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/machine/tier3/TileMatterFabricator.java @@ -28,7 +28,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; -import reborncore.api.tile.ItemHandlerProvider; +import reborncore.api.tile.InventoryProvider; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; @@ -43,7 +43,7 @@ import techreborn.init.TRTileEntities; @RebornRegister(TechReborn.MOD_ID) public class TileMatterFabricator extends TilePowerAcceptor - implements IToolDrop, ItemHandlerProvider, IContainerProvider { + implements IToolDrop, InventoryProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "matter_fabricator", key = "MatterFabricatorMaxInput", comment = "Matter Fabricator Max Input (Value in EU)") public static int maxInput = 8192; diff --git a/src/main/java/techreborn/tiles/machine/tier3/TileQuantumTank.java b/src/main/java/techreborn/tiles/machine/tier3/TileQuantumTank.java index 609da1cc2..741506710 100644 --- a/src/main/java/techreborn/tiles/machine/tier3/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/machine/tier3/TileQuantumTank.java @@ -32,7 +32,7 @@ import net.minecraft.text.LiteralText; import net.minecraft.text.Text; import reborncore.api.IListInfoProvider; import reborncore.api.IToolDrop; -import reborncore.api.tile.ItemHandlerProvider; +import reborncore.api.tile.InventoryProvider; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; @@ -50,7 +50,7 @@ import java.util.List; @RebornRegister(TechReborn.MOD_ID) public class TileQuantumTank extends TileMachineBase - implements ItemHandlerProvider, IToolDrop, IListInfoProvider, IContainerProvider { + implements InventoryProvider, 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; diff --git a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java index 21586f79e..b41e8c0d9 100644 --- a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java +++ b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java @@ -31,7 +31,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; import reborncore.api.power.EnumPowerTier; -import reborncore.api.tile.ItemHandlerProvider; +import reborncore.api.tile.InventoryProvider; import reborncore.common.powerSystem.ExternalPowerSystems; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.RebornInventory; @@ -41,7 +41,7 @@ import techreborn.blocks.storage.BlockEnergyStorage; * Created by Rushmead */ public class TileEnergyStorage extends TilePowerAcceptor - implements IToolDrop, ItemHandlerProvider { + implements IToolDrop, InventoryProvider { public RebornInventory inventory; public String name;