diff --git a/src/main/java/techreborn/blockentity/data/DataDrivenBEProvider.java b/src/main/java/techreborn/blockentity/data/DataDrivenBEProvider.java index 92aff7cd3..e518ef9ea 100644 --- a/src/main/java/techreborn/blockentity/data/DataDrivenBEProvider.java +++ b/src/main/java/techreborn/blockentity/data/DataDrivenBEProvider.java @@ -37,10 +37,10 @@ import net.minecraft.util.registry.Registry; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.text.WordUtils; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBlockEntityInventoryBuilder; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.BlockEntityScreenHandlerBuilder; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.crafting.RebornRecipeType; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.RebornInventory; @@ -93,8 +93,8 @@ public class DataDrivenBEProvider extends BlockEntityType dataDrivenSlot.add(builder)); @@ -110,7 +110,7 @@ public class DataDrivenBEProvider extends BlockEntityType { +public class DataDrivenGui extends GuiBase { private final DataDrivenBEProvider provider; private final DataDrivenBEProvider.DataDrivenBlockEntity blockEntity; public DataDrivenGui(int syncID, final PlayerEntity player, final DataDrivenBEProvider.DataDrivenBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; this.provider = blockEntity.getProvider(); } diff --git a/src/main/java/techreborn/blockentity/data/DataDrivenSlot.java b/src/main/java/techreborn/blockentity/data/DataDrivenSlot.java index 250d7c31a..1dee3be32 100644 --- a/src/main/java/techreborn/blockentity/data/DataDrivenSlot.java +++ b/src/main/java/techreborn/blockentity/data/DataDrivenSlot.java @@ -30,7 +30,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.util.JsonHelper; import org.apache.commons.lang3.Validate; -import reborncore.client.containerBuilder.builder.ContainerBlockEntityInventoryBuilder; +import reborncore.client.screen.builder.BlockEntityScreenHandlerBuilder; import reborncore.client.gui.builder.GuiBase; import reborncore.common.util.serialization.SerializationUtil; @@ -77,7 +77,7 @@ public class DataDrivenSlot { return type; } - public void add(ContainerBlockEntityInventoryBuilder inventoryBuilder){ + public void add(BlockEntityScreenHandlerBuilder inventoryBuilder){ type.getSlotBiConsumer().accept(inventoryBuilder, this); } diff --git a/src/main/java/techreborn/blockentity/data/SlotType.java b/src/main/java/techreborn/blockentity/data/SlotType.java index eb9813ab9..901bd141f 100644 --- a/src/main/java/techreborn/blockentity/data/SlotType.java +++ b/src/main/java/techreborn/blockentity/data/SlotType.java @@ -24,7 +24,7 @@ package techreborn.blockentity.data; -import reborncore.client.containerBuilder.builder.ContainerBlockEntityInventoryBuilder; +import reborncore.client.screen.builder.BlockEntityScreenHandlerBuilder; import java.util.Arrays; import java.util.function.BiConsumer; @@ -48,13 +48,13 @@ public enum SlotType { .orElse(null); } - private BiConsumer slotBiConsumer; + private BiConsumer slotBiConsumer; - SlotType(BiConsumer slotBiConsumer) { + SlotType(BiConsumer slotBiConsumer) { this.slotBiConsumer = slotBiConsumer; } - public BiConsumer getSlotBiConsumer() { + public BiConsumer getSlotBiConsumer() { return slotBiConsumer; } } diff --git a/src/main/java/techreborn/blockentity/generator/PlasmaGeneratorBlockEntity.java b/src/main/java/techreborn/blockentity/generator/PlasmaGeneratorBlockEntity.java index 8a1ec0c95..c87a61ae9 100644 --- a/src/main/java/techreborn/blockentity/generator/PlasmaGeneratorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/PlasmaGeneratorBlockEntity.java @@ -26,16 +26,16 @@ package techreborn.blockentity.generator; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.fluid.FluidValue; import techreborn.api.generator.EFluidGenerator; import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -public class PlasmaGeneratorBlockEntity extends BaseFluidGeneratorBlockEntity implements IContainerProvider { +public class PlasmaGeneratorBlockEntity extends BaseFluidGeneratorBlockEntity implements BuiltScreenHandlerProvider { public PlasmaGeneratorBlockEntity() { super(TRBlockEntities.PLASMA_GENERATOR, EFluidGenerator.PLASMA, "PlasmaGeneratorBlockEntity", FluidValue.BUCKET.multiply(10), TechRebornConfig.plasmaGeneratorEnergyPerTick); @@ -57,8 +57,8 @@ public class PlasmaGeneratorBlockEntity extends BaseFluidGeneratorBlockEntity im } @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("plasmagenerator").player(player.inventory).inventory().hotbar().addInventory() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("plasmagenerator").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).slot(0, 25, 35).outputSlot(1, 25, 55).syncEnergyValue() .sync(this::getTicksSinceLastChange, this::setTicksSinceLastChange) .sync(this::getTankAmount, this::setTankAmount) diff --git a/src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java b/src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java index 3ebdc3418..a153c9861 100644 --- a/src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java @@ -33,9 +33,9 @@ import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.powerSystem.PowerSystem; @@ -48,7 +48,7 @@ import techreborn.init.TRContent.SolarPanels; import java.util.List; -public class SolarPanelBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, IContainerProvider { +public class SolarPanelBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, BuiltScreenHandlerProvider { // State ZEROGEN: No exposure to sun @@ -251,8 +251,8 @@ public class SolarPanelBlockEntity extends PowerAcceptorBlockEntity implements I } @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("solar_panel").player(player.inventory).inventory().hotbar().addInventory() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("solar_panel").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).syncEnergyValue() .sync(this::getSunState, this::setSunState) .addInventory().create(this, syncID); diff --git a/src/main/java/techreborn/blockentity/generator/advanced/DieselGeneratorBlockEntity.java b/src/main/java/techreborn/blockentity/generator/advanced/DieselGeneratorBlockEntity.java index bb6f80ef8..047b426b2 100644 --- a/src/main/java/techreborn/blockentity/generator/advanced/DieselGeneratorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/advanced/DieselGeneratorBlockEntity.java @@ -26,9 +26,9 @@ package techreborn.blockentity.generator.advanced; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.fluid.FluidValue; import techreborn.api.generator.EFluidGenerator; import techreborn.blockentity.generator.BaseFluidGeneratorBlockEntity; @@ -36,7 +36,7 @@ import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -public class DieselGeneratorBlockEntity extends BaseFluidGeneratorBlockEntity implements IContainerProvider { +public class DieselGeneratorBlockEntity extends BaseFluidGeneratorBlockEntity implements BuiltScreenHandlerProvider { public DieselGeneratorBlockEntity() { super(TRBlockEntities.DIESEL_GENERATOR, EFluidGenerator.DIESEL, "DieselGeneratorBlockEntity", FluidValue.BUCKET.multiply(10), TechRebornConfig.dieselGeneratorEnergyPerTick); @@ -58,8 +58,8 @@ public class DieselGeneratorBlockEntity extends BaseFluidGeneratorBlockEntity im } @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("dieselgenerator").player(player.inventory).inventory().hotbar() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("dieselgenerator").player(player.inventory).inventory().hotbar() .addInventory().blockEntity(this).slot(0, 25, 35).outputSlot(1, 25, 55).syncEnergyValue() .sync(this::getTicksSinceLastChange, this::setTicksSinceLastChange) .sync(this::getTankAmount, this::setTankAmount) diff --git a/src/main/java/techreborn/blockentity/generator/advanced/GasTurbineBlockEntity.java b/src/main/java/techreborn/blockentity/generator/advanced/GasTurbineBlockEntity.java index f1654eb74..432e675a3 100644 --- a/src/main/java/techreborn/blockentity/generator/advanced/GasTurbineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/advanced/GasTurbineBlockEntity.java @@ -26,9 +26,9 @@ package techreborn.blockentity.generator.advanced; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.fluid.FluidValue; import techreborn.api.generator.EFluidGenerator; import techreborn.blockentity.generator.BaseFluidGeneratorBlockEntity; @@ -36,7 +36,7 @@ import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -public class GasTurbineBlockEntity extends BaseFluidGeneratorBlockEntity implements IContainerProvider { +public class GasTurbineBlockEntity extends BaseFluidGeneratorBlockEntity implements BuiltScreenHandlerProvider { public GasTurbineBlockEntity() { super(TRBlockEntities.GAS_TURBINE, EFluidGenerator.GAS, "GasTurbineBlockEntity", FluidValue.BUCKET.multiply(10), TechRebornConfig.gasTurbineEnergyPerTick); @@ -58,8 +58,8 @@ public class GasTurbineBlockEntity extends BaseFluidGeneratorBlockEntity impleme } @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("gasturbine").player(player.inventory).inventory().hotbar() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("gasturbine").player(player.inventory).inventory().hotbar() .addInventory().blockEntity(this).slot(0, 25, 35).outputSlot(1, 25, 55).syncEnergyValue() .sync(this::getTicksSinceLastChange, this::setTicksSinceLastChange) .sync(this::getTankAmount, this::setTankAmount) diff --git a/src/main/java/techreborn/blockentity/generator/advanced/SemiFluidGeneratorBlockEntity.java b/src/main/java/techreborn/blockentity/generator/advanced/SemiFluidGeneratorBlockEntity.java index d016a72ea..8904f75f6 100644 --- a/src/main/java/techreborn/blockentity/generator/advanced/SemiFluidGeneratorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/advanced/SemiFluidGeneratorBlockEntity.java @@ -26,9 +26,9 @@ package techreborn.blockentity.generator.advanced; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.fluid.FluidValue; import techreborn.api.generator.EFluidGenerator; import techreborn.blockentity.generator.BaseFluidGeneratorBlockEntity; @@ -36,7 +36,7 @@ import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -public class SemiFluidGeneratorBlockEntity extends BaseFluidGeneratorBlockEntity implements IContainerProvider { +public class SemiFluidGeneratorBlockEntity extends BaseFluidGeneratorBlockEntity implements BuiltScreenHandlerProvider { public SemiFluidGeneratorBlockEntity() { super(TRBlockEntities.SEMI_FLUID_GENERATOR, EFluidGenerator.SEMIFLUID, "SemiFluidGeneratorBlockEntity", FluidValue.BUCKET.multiply(10), TechRebornConfig.semiFluidGeneratorEnergyPerTick); @@ -58,8 +58,8 @@ public class SemiFluidGeneratorBlockEntity extends BaseFluidGeneratorBlockEntity } @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("semifluidgenerator").player(player.inventory).inventory().hotbar() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("semifluidgenerator").player(player.inventory).inventory().hotbar() .addInventory().blockEntity(this).slot(0, 25, 35).outputSlot(1, 25, 55).syncEnergyValue() .sync(this::getTicksSinceLastChange, this::setTicksSinceLastChange) .sync(this::getTankAmount, this::setTankAmount) diff --git a/src/main/java/techreborn/blockentity/generator/advanced/ThermalGeneratorBlockEntity.java b/src/main/java/techreborn/blockentity/generator/advanced/ThermalGeneratorBlockEntity.java index 9cf30b204..6abd4ccfb 100644 --- a/src/main/java/techreborn/blockentity/generator/advanced/ThermalGeneratorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/advanced/ThermalGeneratorBlockEntity.java @@ -26,9 +26,9 @@ package techreborn.blockentity.generator.advanced; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.fluid.FluidValue; import techreborn.api.generator.EFluidGenerator; import techreborn.blockentity.generator.BaseFluidGeneratorBlockEntity; @@ -36,7 +36,7 @@ import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -public class ThermalGeneratorBlockEntity extends BaseFluidGeneratorBlockEntity implements IContainerProvider { +public class ThermalGeneratorBlockEntity extends BaseFluidGeneratorBlockEntity implements BuiltScreenHandlerProvider { public ThermalGeneratorBlockEntity() { super(TRBlockEntities.THERMAL_GEN, EFluidGenerator.THERMAL, "ThermalGeneratorBlockEntity", FluidValue.BUCKET.multiply(10), TechRebornConfig.thermalGeneratorEnergyPerTick); @@ -58,8 +58,8 @@ public class ThermalGeneratorBlockEntity extends BaseFluidGeneratorBlockEntity i } @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("thermalgenerator").player(player.inventory).inventory().hotbar() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("thermalgenerator").player(player.inventory).inventory().hotbar() .addInventory().blockEntity(this).slot(0, 25, 35).outputSlot(1, 25, 55).syncEnergyValue() .sync(this::getTicksSinceLastChange, this::setTicksSinceLastChange) .sync(this::getTankAmount, this::setTankAmount) diff --git a/src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java b/src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java index b8b227d27..178821550 100644 --- a/src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java @@ -34,9 +34,9 @@ import net.minecraft.item.Items; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.util.RebornInventory; @@ -47,7 +47,7 @@ import techreborn.init.TRContent; import javax.annotation.Nonnull; import java.util.Map; -public class SolidFuelGeneratorBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider, IContainerProvider { +public class SolidFuelGeneratorBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider { public RebornInventory inventory = new RebornInventory<>(2, "SolidFuelGeneratorBlockEntity", 64, this); public int fuelSlot = 0; @@ -181,8 +181,8 @@ public class SolidFuelGeneratorBlockEntity extends PowerAcceptorBlockEntity impl } @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("generator").player(player.inventory).inventory().hotbar().addInventory() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("generator").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).fuelSlot(0, 80, 54).energySlot(1, 8, 72).syncEnergyValue() .sync(this::getBurnTime, this::setBurnTime) .sync(this::getTotalBurnTime, this::setTotalBurnTime).addInventory().create(this, syncID); diff --git a/src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java b/src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java index c3f8da706..838122b0a 100644 --- a/src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java @@ -26,9 +26,9 @@ package techreborn.blockentity.machine.iron; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.ingredient.RebornIngredient; import reborncore.common.util.RebornInventory; @@ -36,7 +36,7 @@ import techreborn.init.ModRecipes; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -public class IronAlloyFurnaceBlockEntity extends AbstractIronMachineBlockEntity implements IContainerProvider { +public class IronAlloyFurnaceBlockEntity extends AbstractIronMachineBlockEntity implements BuiltScreenHandlerProvider { int input1 = 0; int input2 = 1; @@ -125,8 +125,8 @@ public class IronAlloyFurnaceBlockEntity extends AbstractIronMachineBlockEntity } @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("alloyfurnace").player(player.inventory).inventory().hotbar() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("alloyfurnace").player(player.inventory).inventory().hotbar() .addInventory().blockEntity(this) .slot(0, 47, 17) .slot(1, 65, 17) diff --git a/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java b/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java index 4cc0a1592..05ae1d449 100644 --- a/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java @@ -31,9 +31,9 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.recipe.RecipeType; import net.minecraft.recipe.SmeltingRecipe; import net.minecraft.server.network.ServerPlayerEntity; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; @@ -41,7 +41,7 @@ import techreborn.utils.RecipeUtils; import java.util.Optional; -public class IronFurnaceBlockEntity extends AbstractIronMachineBlockEntity implements IContainerProvider { +public class IronFurnaceBlockEntity extends AbstractIronMachineBlockEntity implements BuiltScreenHandlerProvider { int inputSlot = 0; int outputSlot = 1; @@ -152,8 +152,8 @@ public class IronFurnaceBlockEntity extends AbstractIronMachineBlockEntity imple } @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("ironfurnace").player(player.inventory).inventory().hotbar() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("ironfurnace").player(player.inventory).inventory().hotbar() .addInventory().blockEntity(this) .fuelSlot(2, 56, 53).slot(0, 56, 17).outputSlot(1, 116, 35) .sync(this::getBurnTime, this::setBurnTime) diff --git a/src/main/java/techreborn/blockentity/machine/misc/ChargeOMatBlockEntity.java b/src/main/java/techreborn/blockentity/machine/misc/ChargeOMatBlockEntity.java index 4a716d51f..f11d13d5d 100644 --- a/src/main/java/techreborn/blockentity/machine/misc/ChargeOMatBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/misc/ChargeOMatBlockEntity.java @@ -29,9 +29,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.util.RebornInventory; import team.reborn.energy.Energy; @@ -40,7 +40,7 @@ import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; public class ChargeOMatBlockEntity extends PowerAcceptorBlockEntity - implements IToolDrop, InventoryProvider, IContainerProvider { + implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider { public RebornInventory inventory = new RebornInventory<>(6, "ChargeOMatBlockEntity", 64, this); @@ -115,8 +115,8 @@ public class ChargeOMatBlockEntity extends PowerAcceptorBlockEntity // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("chargebench").player(player.inventory).inventory().hotbar().addInventory() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("chargebench").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).energySlot(0, 62, 25).energySlot(1, 98, 25).energySlot(2, 62, 45).energySlot(3, 98, 45) .energySlot(4, 62, 65).energySlot(5, 98, 65).syncEnergyValue().addInventory().create(this, syncID); } diff --git a/src/main/java/techreborn/blockentity/machine/misc/DrainBlockEntity.java b/src/main/java/techreborn/blockentity/machine/misc/DrainBlockEntity.java index 1934ba8cc..42f6ce1be 100644 --- a/src/main/java/techreborn/blockentity/machine/misc/DrainBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/misc/DrainBlockEntity.java @@ -5,12 +5,12 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.Inventory; import reborncore.api.IListInfoProvider; import reborncore.api.blockentity.InventoryProvider; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.common.blockentity.MachineBaseBlockEntity; import techreborn.init.TRBlockEntities; -public class DrainBlockEntity extends MachineBaseBlockEntity implements InventoryProvider, IListInfoProvider, IContainerProvider { +public class DrainBlockEntity extends MachineBaseBlockEntity implements InventoryProvider, IListInfoProvider, BuiltScreenHandlerProvider { public DrainBlockEntity(){ this(TRBlockEntities.DRAIN); @@ -26,7 +26,7 @@ public class DrainBlockEntity extends MachineBaseBlockEntity implements Inventor } @Override - public BuiltContainer createContainer(int syncID, PlayerEntity player) { + public BuiltScreenHandler createScreenHandler(int syncID, PlayerEntity player) { return null; } } diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/DistillationTowerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/DistillationTowerBlockEntity.java index 6d01844c4..d794af763 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/DistillationTowerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/DistillationTowerBlockEntity.java @@ -27,9 +27,9 @@ package techreborn.blockentity.machine.multiblock; import net.minecraft.block.Material; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.crafting.RebornRecipe; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.RebornInventory; @@ -39,7 +39,7 @@ import techreborn.init.ModRecipes; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -public class DistillationTowerBlockEntity extends GenericMachineBlockEntity implements IContainerProvider { +public class DistillationTowerBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public MultiblockChecker multiblockChecker; @@ -79,8 +79,8 @@ public class DistillationTowerBlockEntity extends GenericMachineBlockEntity impl // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("Distillationtower").player(player.inventory).inventory().hotbar().addInventory() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("Distillationtower").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).slot(0, 35, 27).slot(1, 35, 47).outputSlot(2, 79, 37).outputSlot(3, 99, 37) .outputSlot(4, 119, 37).outputSlot(5, 139, 37).energySlot(6, 8, 72).syncEnergyValue().syncCrafterValue() .addInventory().create(this, syncID); diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java index e9cd3be27..2605c4adb 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java @@ -27,9 +27,9 @@ package techreborn.blockentity.machine.multiblock; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.BlockPos; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.fluid.FluidValue; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.IInventoryAccess; @@ -48,7 +48,7 @@ import javax.annotation.Nullable; * @author drcrazy * */ -public class FluidReplicatorBlockEntity extends GenericMachineBlockEntity implements IContainerProvider { +public class FluidReplicatorBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public MultiblockChecker multiblockChecker; public static final FluidValue TANK_CAPACITY = FluidValue.BUCKET.multiply(16); @@ -129,8 +129,8 @@ public class FluidReplicatorBlockEntity extends GenericMachineBlockEntity implem // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, PlayerEntity player) { - return new ContainerBuilder("fluidreplicator").player(player.inventory).inventory().hotbar().addInventory() + public BuiltScreenHandler createScreenHandler(int syncID, PlayerEntity player) { + return new ScreenHandlerBuilder("fluidreplicator").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).fluidSlot(1, 124, 35).filterSlot(0, 55, 45, stack -> stack.isItemEqualIgnoreDamage(TRContent.Parts.UU_MATTER.getStack())) .outputSlot(2, 124, 55).energySlot(3, 8, 72).sync(tank).syncEnergyValue().syncCrafterValue().addInventory() .create(this, syncID); diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java index aa88bd6af..d9980e512 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java @@ -32,9 +32,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.ingredient.RebornIngredient; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; @@ -50,7 +50,7 @@ import techreborn.init.TRContent; import java.util.List; public class FusionControlComputerBlockEntity extends PowerAcceptorBlockEntity - implements IToolDrop, InventoryProvider, IContainerProvider { + implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider { public RebornInventory inventory; @@ -397,8 +397,8 @@ public class FusionControlComputerBlockEntity extends PowerAcceptorBlockEntity // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("fusionreactor").player(player.inventory).inventory().hotbar() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("fusionreactor").player(player.inventory).inventory().hotbar() .addInventory().blockEntity(this).slot(0, 34, 47).slot(1, 126, 47).outputSlot(2, 80, 47).syncEnergyValue() .sync(this::getCoilStatus, this::setCoilStatus) .sync(this::getCrafingTickTime, this::setCrafingTickTime) diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/ImplosionCompressorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/ImplosionCompressorBlockEntity.java index a80022c84..acee313b1 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/ImplosionCompressorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/ImplosionCompressorBlockEntity.java @@ -26,9 +26,9 @@ package techreborn.blockentity.machine.multiblock; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.crafting.RebornRecipe; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.RebornInventory; @@ -38,7 +38,7 @@ import techreborn.init.ModRecipes; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -public class ImplosionCompressorBlockEntity extends GenericMachineBlockEntity implements IContainerProvider { +public class ImplosionCompressorBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public MultiblockChecker multiblockChecker; @@ -72,8 +72,8 @@ public class ImplosionCompressorBlockEntity extends GenericMachineBlockEntity im // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("implosioncompressor").player(player.inventory).inventory().hotbar().addInventory() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("implosioncompressor").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).slot(0, 50, 27).slot(1, 50, 47).outputSlot(2, 92, 36).outputSlot(3, 110, 36) .energySlot(4, 8, 72).syncEnergyValue().syncCrafterValue().addInventory().create(this, syncID); } diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialBlastFurnaceBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialBlastFurnaceBlockEntity.java index fd4f42077..ddf82c8e5 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialBlastFurnaceBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialBlastFurnaceBlockEntity.java @@ -29,9 +29,9 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.multiblock.IMultiblockPart; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.RebornInventory; @@ -44,7 +44,7 @@ import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; import techreborn.multiblocks.MultiBlockCasing; -public class IndustrialBlastFurnaceBlockEntity extends GenericMachineBlockEntity implements IContainerProvider { +public class IndustrialBlastFurnaceBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public MultiblockChecker multiblockChecker; private int cachedHeat; @@ -129,8 +129,8 @@ public class IndustrialBlastFurnaceBlockEntity extends GenericMachineBlockEntity // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("blastfurnace").player(player.inventory).inventory().hotbar().addInventory() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("blastfurnace").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).slot(0, 50, 27).slot(1, 50, 47).outputSlot(2, 93, 37).outputSlot(3, 113, 37) .energySlot(4, 8, 72).syncEnergyValue().syncCrafterValue() .sync(this::getHeat, this::setHeat).addInventory().create(this, syncID); diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java index dcc6699bd..a4eb800d7 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java @@ -31,9 +31,9 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.fluid.FluidValue; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.RebornInventory; @@ -47,7 +47,7 @@ import techreborn.utils.FluidUtils; import javax.annotation.Nullable; -public class IndustrialGrinderBlockEntity extends GenericMachineBlockEntity implements IContainerProvider{ +public class IndustrialGrinderBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public static final FluidValue TANK_CAPACITY = FluidValue.BUCKET.multiply(16); public Tank tank; @@ -121,9 +121,9 @@ public class IndustrialGrinderBlockEntity extends GenericMachineBlockEntity impl // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { // fluidSlot first to support automation and shift-click - return new ContainerBuilder("industrialgrinder").player(player.inventory).inventory().hotbar().addInventory() + return new ScreenHandlerBuilder("industrialgrinder").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).fluidSlot(1, 34, 35).slot(0, 84, 43).outputSlot(2, 126, 18).outputSlot(3, 126, 36) .outputSlot(4, 126, 54).outputSlot(5, 126, 72).outputSlot(6, 34, 55).energySlot(7, 8, 72) .sync(tank).syncEnergyValue().syncCrafterValue().addInventory().create(this, syncID); diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java index 0cf66b047..07ebc2047 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java @@ -31,9 +31,9 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.fluid.FluidValue; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.RebornInventory; @@ -47,7 +47,7 @@ import techreborn.utils.FluidUtils; import javax.annotation.Nullable; -public class IndustrialSawmillBlockEntity extends GenericMachineBlockEntity implements IContainerProvider { +public class IndustrialSawmillBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public static final FluidValue TANK_CAPACITY = FluidValue.BUCKET.multiply(16); public Tank tank; @@ -123,8 +123,8 @@ public class IndustrialSawmillBlockEntity extends GenericMachineBlockEntity impl // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("industrialsawmill").player(player.inventory).inventory().hotbar().addInventory() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("industrialsawmill").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).fluidSlot(1, 34, 35).slot(0, 84, 43).outputSlot(2, 126, 25).outputSlot(3, 126, 43) .outputSlot(4, 126, 61).outputSlot(5, 34, 55).energySlot(6, 8, 72).sync(tank).syncEnergyValue().syncCrafterValue() .addInventory().create(this, syncID); diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/VacuumFreezerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/VacuumFreezerBlockEntity.java index 593a3f149..b9d195a45 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/VacuumFreezerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/VacuumFreezerBlockEntity.java @@ -27,9 +27,9 @@ package techreborn.blockentity.machine.multiblock; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.GenericMachineBlockEntity; @@ -38,7 +38,7 @@ import techreborn.init.ModRecipes; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -public class VacuumFreezerBlockEntity extends GenericMachineBlockEntity implements IContainerProvider { +public class VacuumFreezerBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public MultiblockChecker multiblockChecker; @@ -69,8 +69,8 @@ public class VacuumFreezerBlockEntity extends GenericMachineBlockEntity implemen // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("vacuumfreezer").player(player.inventory).inventory().hotbar().addInventory() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("vacuumfreezer").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).slot(0, 55, 45).outputSlot(1, 101, 45).energySlot(2, 8, 72).syncEnergyValue() .syncCrafterValue().addInventory().create(this, syncID); } diff --git a/src/main/java/techreborn/blockentity/machine/tier1/AlloySmelterBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/AlloySmelterBlockEntity.java index ea9fedcc6..4bab3a582 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/AlloySmelterBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/AlloySmelterBlockEntity.java @@ -25,9 +25,9 @@ package techreborn.blockentity.machine.tier1; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.GenericMachineBlockEntity; @@ -36,7 +36,7 @@ import techreborn.init.ModRecipes; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -public class AlloySmelterBlockEntity extends GenericMachineBlockEntity implements IContainerProvider { +public class AlloySmelterBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public AlloySmelterBlockEntity() { super(TRBlockEntities.ALLOY_SMELTER, "AlloySmelter", TechRebornConfig.alloySmelterMaxInput, TechRebornConfig.alloySmelterMaxEnergy, TRContent.Machine.ALLOY_SMELTER.block, 3); @@ -48,8 +48,8 @@ public class AlloySmelterBlockEntity extends GenericMachineBlockEntity implement // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("alloysmelter").player(player.inventory).inventory().hotbar() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("alloysmelter").player(player.inventory).inventory().hotbar() .addInventory().blockEntity(this) .slot(0, 34, 47) .slot(1, 126, 47) diff --git a/src/main/java/techreborn/blockentity/machine/tier1/AssemblingMachineBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/AssemblingMachineBlockEntity.java index 2394e8351..7befeeb6f 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/AssemblingMachineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/AssemblingMachineBlockEntity.java @@ -25,9 +25,9 @@ package techreborn.blockentity.machine.tier1; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.GenericMachineBlockEntity; @@ -36,7 +36,7 @@ import techreborn.init.ModRecipes; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -public class AssemblingMachineBlockEntity extends GenericMachineBlockEntity implements IContainerProvider { +public class AssemblingMachineBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public AssemblingMachineBlockEntity() { super(TRBlockEntities.ASSEMBLY_MACHINE, "AssemblingMachine", TechRebornConfig.assemblingMachineMaxInput, TechRebornConfig.assemblingMachineMaxEnergy, TRContent.Machine.ASSEMBLY_MACHINE.block, 3); @@ -48,8 +48,8 @@ public class AssemblingMachineBlockEntity extends GenericMachineBlockEntity impl // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("assemblingmachine").player(player.inventory).inventory().hotbar() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("assemblingmachine").player(player.inventory).inventory().hotbar() .addInventory().blockEntity(this).slot(0, 55, 35).slot(1, 55, 55).outputSlot(2, 101, 45).energySlot(3, 8, 72) .syncEnergyValue().syncCrafterValue().addInventory().create(this, syncID); } diff --git a/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java index dabef1695..3856346d2 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java @@ -30,7 +30,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.recipe.CraftingRecipe; import net.minecraft.recipe.Ingredient; -import net.minecraft.recipe.Recipe; import net.minecraft.recipe.RecipeType; import net.minecraft.screen.ScreenHandler; import net.minecraft.sound.SoundCategory; @@ -39,12 +38,11 @@ import net.minecraft.util.math.Direction; import org.apache.commons.lang3.tuple.Pair; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.recipes.ExtendedRecipeRemainder; -import reborncore.common.util.IInventoryAccess; import reborncore.common.util.ItemUtils; import reborncore.common.util.RebornInventory; import techreborn.config.TechRebornConfig; @@ -63,7 +61,7 @@ import java.util.stream.Collectors; * Created by modmuss50 on 20/06/2017. */ public class AutoCraftingTableBlockEntity extends PowerAcceptorBlockEntity - implements IToolDrop, InventoryProvider, IContainerProvider { + implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider { public RebornInventory inventory = new RebornInventory<>(11, "AutoCraftingTableBlockEntity", 64, this); public int progress; @@ -466,8 +464,8 @@ public class AutoCraftingTableBlockEntity extends PowerAcceptorBlockEntity // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, PlayerEntity player) { - return new ContainerBuilder("autocraftingtable").player(player.inventory).inventory().hotbar().addInventory() + public BuiltScreenHandler createScreenHandler(int syncID, PlayerEntity player) { + return new ScreenHandlerBuilder("autocraftingtable").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).slot(0, 28, 25).slot(1, 46, 25).slot(2, 64, 25).slot(3, 28, 43).slot(4, 46, 43) .slot(5, 64, 43).slot(6, 28, 61).slot(7, 46, 61).slot(8, 64, 61).outputSlot(9, 145, 42) .outputSlot(10, 145, 70).syncEnergyValue().sync(this::getProgress, this::setProgress) diff --git a/src/main/java/techreborn/blockentity/machine/tier1/ChemicalReactorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/ChemicalReactorBlockEntity.java index 8e5082dc9..edfd9b816 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/ChemicalReactorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/ChemicalReactorBlockEntity.java @@ -25,9 +25,9 @@ package techreborn.blockentity.machine.tier1; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.RebornInventory; import techreborn.config.TechRebornConfig; @@ -36,7 +36,7 @@ import techreborn.init.TRContent; import techreborn.init.TRBlockEntities; import techreborn.blockentity.machine.GenericMachineBlockEntity; -public class ChemicalReactorBlockEntity extends GenericMachineBlockEntity implements IContainerProvider { +public class ChemicalReactorBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public ChemicalReactorBlockEntity() { super(TRBlockEntities.CHEMICAL_REACTOR, "ChemicalReactor", TechRebornConfig.chemicalReactorMaxInput, TechRebornConfig.chemicalReactorMaxEnergy, TRContent.Machine.CHEMICAL_REACTOR.block, 3); @@ -48,8 +48,8 @@ public class ChemicalReactorBlockEntity extends GenericMachineBlockEntity implem // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("chemicalreactor").player(player.inventory).inventory().hotbar() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("chemicalreactor").player(player.inventory).inventory().hotbar() .addInventory().blockEntity(this).slot(0, 34, 47).slot(1, 126, 47).outputSlot(2, 80, 47).energySlot(3, 8, 72) .syncEnergyValue().syncCrafterValue().addInventory().create(this, syncID); } diff --git a/src/main/java/techreborn/blockentity/machine/tier1/CompressorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/CompressorBlockEntity.java index 4f3e50c67..cf5de4b33 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/CompressorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/CompressorBlockEntity.java @@ -25,9 +25,9 @@ package techreborn.blockentity.machine.tier1; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.GenericMachineBlockEntity; @@ -36,7 +36,7 @@ import techreborn.init.ModRecipes; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -public class CompressorBlockEntity extends GenericMachineBlockEntity implements IContainerProvider { +public class CompressorBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public CompressorBlockEntity() { super(TRBlockEntities.COMPRESSOR, "Compressor", TechRebornConfig.compressorMaxInput, TechRebornConfig.compressorMaxEnergy, TRContent.Machine.COMPRESSOR.block, 2); @@ -48,8 +48,8 @@ public class CompressorBlockEntity extends GenericMachineBlockEntity implements // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("compressor").player(player.inventory).inventory().hotbar().addInventory() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("compressor").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).slot(0, 55, 45).outputSlot(1, 101, 45).energySlot(2, 8, 72).syncEnergyValue() .syncCrafterValue().addInventory().create(this, syncID); } diff --git a/src/main/java/techreborn/blockentity/machine/tier1/ElectricFurnaceBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/ElectricFurnaceBlockEntity.java index b4f420586..f1028a453 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/ElectricFurnaceBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/ElectricFurnaceBlockEntity.java @@ -32,9 +32,9 @@ import net.minecraft.recipe.SmeltingRecipe; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.recipes.RecipeCrafter; @@ -47,7 +47,7 @@ import techreborn.init.TRContent; import java.util.Optional; public class ElectricFurnaceBlockEntity extends PowerAcceptorBlockEntity - implements IToolDrop, InventoryProvider, IContainerProvider { + implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider { public RebornInventory inventory = new RebornInventory<>(3, "ElectricFurnaceBlockEntity", 64, this); int inputSlot = 0; @@ -269,8 +269,8 @@ public class ElectricFurnaceBlockEntity extends PowerAcceptorBlockEntity // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("electricfurnace").player(player.inventory).inventory().hotbar().addInventory() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("electricfurnace").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).slot(0, 55, 45).outputSlot(1, 101, 45).energySlot(2, 8, 72).syncEnergyValue() .sync(this::getCookTime, this::setCookTime).sync(this::getCookTimeTotal, this::setCookTimeTotal).addInventory().create(this, syncID); } diff --git a/src/main/java/techreborn/blockentity/machine/tier1/ExtractorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/ExtractorBlockEntity.java index 654288ab0..7aeb75572 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/ExtractorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/ExtractorBlockEntity.java @@ -25,9 +25,9 @@ package techreborn.blockentity.machine.tier1; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.GenericMachineBlockEntity; @@ -36,7 +36,7 @@ import techreborn.init.ModRecipes; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -public class ExtractorBlockEntity extends GenericMachineBlockEntity implements IContainerProvider { +public class ExtractorBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public ExtractorBlockEntity() { super(TRBlockEntities.EXTRACTOR, "Extractor", TechRebornConfig.extractorMaxInput, TechRebornConfig.extractorMaxEnergy, TRContent.Machine.EXTRACTOR.block, 2); @@ -48,8 +48,8 @@ public class ExtractorBlockEntity extends GenericMachineBlockEntity implements I // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("extractor").player(player.inventory).inventory().hotbar().addInventory().blockEntity(this) + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("extractor").player(player.inventory).inventory().hotbar().addInventory().blockEntity(this) .slot(0, 55, 45).outputSlot(1, 101, 45).energySlot(2, 8, 72).syncEnergyValue().syncCrafterValue() .addInventory().create(this, syncID); } diff --git a/src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java index 1c55551ef..9db021178 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java @@ -33,9 +33,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.util.ItemUtils; import reborncore.common.util.RebornInventory; @@ -49,7 +49,7 @@ import java.util.Collections; import java.util.List; public class GreenhouseControllerBlockEntity extends PowerAcceptorBlockEntity - implements IToolDrop, InventoryProvider, IContainerProvider { + implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider { private final RebornInventory inventory = new RebornInventory<>(7, "GreenhouseControllerBlockEntity", 64, this); private BlockPos multiblockCenter; @@ -252,8 +252,8 @@ public class GreenhouseControllerBlockEntity extends PowerAcceptorBlockEntity } @Override - public BuiltContainer createContainer(int syncID, PlayerEntity player) { - return new ContainerBuilder("greenhousecontroller").player(player.inventory).inventory().hotbar().addInventory() + public BuiltScreenHandler createScreenHandler(int syncID, PlayerEntity player) { + return new ScreenHandlerBuilder("greenhousecontroller").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this) .outputSlot(0, 30, 22).outputSlot(1, 48, 22) .outputSlot(2, 30, 40).outputSlot(3, 48, 40) diff --git a/src/main/java/techreborn/blockentity/machine/tier1/IndustrialElectrolyzerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/IndustrialElectrolyzerBlockEntity.java index 911e748a7..fbde892d6 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/IndustrialElectrolyzerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/IndustrialElectrolyzerBlockEntity.java @@ -25,9 +25,9 @@ package techreborn.blockentity.machine.tier1; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.RebornInventory; import reborncore.common.util.ItemUtils; @@ -38,7 +38,7 @@ import techreborn.init.TRBlockEntities; import techreborn.items.DynamicCellItem; import techreborn.blockentity.machine.GenericMachineBlockEntity; -public class IndustrialElectrolyzerBlockEntity extends GenericMachineBlockEntity implements IContainerProvider { +public class IndustrialElectrolyzerBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public IndustrialElectrolyzerBlockEntity() { super(TRBlockEntities.INDUSTRIAL_ELECTROLYZER, "IndustrialElectrolyzer", TechRebornConfig.industrialElectrolyzerMaxInput, TechRebornConfig.industrialElectrolyzerMaxEnergy, TRContent.Machine.INDUSTRIAL_ELECTROLYZER.block, 6); @@ -50,8 +50,8 @@ public class IndustrialElectrolyzerBlockEntity extends GenericMachineBlockEntity // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("industrialelectrolyzer").player(player.inventory).inventory().hotbar() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("industrialelectrolyzer").player(player.inventory).inventory().hotbar() .addInventory().blockEntity(this) .filterSlot(1, 47, 72, stack -> ItemUtils.isItemEqual(stack, DynamicCellItem.getEmptyCell(1), true, true)) .filterSlot(0, 81, 72, stack -> !ItemUtils.isItemEqual(stack, DynamicCellItem.getEmptyCell(1), true, true)) diff --git a/src/main/java/techreborn/blockentity/machine/tier1/RecyclerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/RecyclerBlockEntity.java index feefd2d60..1e877e817 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/RecyclerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/RecyclerBlockEntity.java @@ -33,9 +33,9 @@ import net.minecraft.util.registry.Registry; import reborncore.api.IToolDrop; import reborncore.api.blockentity.IUpgrade; import reborncore.api.blockentity.InventoryProvider; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.SlotConfiguration; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; @@ -45,7 +45,7 @@ import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; public class RecyclerBlockEntity extends PowerAcceptorBlockEntity - implements IToolDrop, InventoryProvider, IContainerProvider, SlotConfiguration.SlotFilter { + implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider, SlotConfiguration.SlotFilter { private final RebornInventory inventory = new RebornInventory<>(3, "RecyclerBlockEntity", 64, this); private final int cost = 2; @@ -216,8 +216,8 @@ public class RecyclerBlockEntity extends PowerAcceptorBlockEntity // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, PlayerEntity player) { - return new ContainerBuilder("recycler").player(player.inventory).inventory().hotbar().addInventory() + public BuiltScreenHandler createScreenHandler(int syncID, PlayerEntity player) { + return new ScreenHandlerBuilder("recycler").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).slot(0, 55, 45, RecyclerBlockEntity::canRecycle) .outputSlot(1, 101, 45).energySlot(2, 8, 72).syncEnergyValue() .sync(this::getProgress, this::setProgress).addInventory().create(this, syncID); diff --git a/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java index e6ae751cd..87f847cd2 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java @@ -35,9 +35,9 @@ import net.minecraft.world.World; import org.apache.commons.lang3.tuple.Pair; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.util.ItemUtils; @@ -58,7 +58,7 @@ import java.util.stream.Collectors; //TODO add tick and power bars. public class RollingMachineBlockEntity extends PowerAcceptorBlockEntity - implements IToolDrop, InventoryProvider, IContainerProvider { + implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider { public int[] craftingSlots = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 }; private CraftingInventory craftCache; @@ -385,8 +385,8 @@ public class RollingMachineBlockEntity extends PowerAcceptorBlockEntity } @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("rollingmachine").player(player.inventory) + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("rollingmachine").player(player.inventory) .inventory().hotbar() .addInventory().blockEntity(this) .slot(0, 30, 22).slot(1, 48, 22).slot(2, 66, 22) diff --git a/src/main/java/techreborn/blockentity/machine/tier1/ScrapboxinatorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/ScrapboxinatorBlockEntity.java index 1647463b5..06bd4e2cf 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/ScrapboxinatorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/ScrapboxinatorBlockEntity.java @@ -25,9 +25,9 @@ package techreborn.blockentity.machine.tier1; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.api.recipe.ScrapboxRecipeCrafter; import techreborn.config.TechRebornConfig; @@ -35,7 +35,7 @@ import techreborn.init.TRContent; import techreborn.init.TRBlockEntities; import techreborn.blockentity.machine.GenericMachineBlockEntity; -public class ScrapboxinatorBlockEntity extends GenericMachineBlockEntity implements IContainerProvider { +public class ScrapboxinatorBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public ScrapboxinatorBlockEntity() { super(TRBlockEntities.SCRAPBOXINATOR, "Scrapboxinator", TechRebornConfig.scrapboxinatorMaxInput, TechRebornConfig.scrapboxinatorMaxEnergy, TRContent.Machine.SCRAPBOXINATOR.block, 2); @@ -53,8 +53,8 @@ public class ScrapboxinatorBlockEntity extends GenericMachineBlockEntity impleme // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("scrapboxinator").player(player.inventory).inventory().hotbar().addInventory() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("scrapboxinator").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).filterSlot(0, 55, 45, stack -> stack.getItem() == TRContent.SCRAP_BOX).outputSlot(1, 101, 45) .energySlot(2, 8, 72).syncEnergyValue().syncCrafterValue().addInventory().create(this, syncID); } diff --git a/src/main/java/techreborn/blockentity/machine/tier1/SoildCanningMachineBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/SoildCanningMachineBlockEntity.java index ba9abc1b2..8077ca012 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/SoildCanningMachineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/SoildCanningMachineBlockEntity.java @@ -25,9 +25,9 @@ package techreborn.blockentity.machine.tier1; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.GenericMachineBlockEntity; @@ -36,7 +36,7 @@ import techreborn.init.ModRecipes; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -public class SoildCanningMachineBlockEntity extends GenericMachineBlockEntity implements IContainerProvider { +public class SoildCanningMachineBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public SoildCanningMachineBlockEntity() { super(TRBlockEntities.SOLID_CANNING_MACHINE, "SolidCanningMachine", TechRebornConfig.solidCanningMachineMaxInput, TechRebornConfig.solidFuelGeneratorMaxEnergy, TRContent.Machine.SOLID_CANNING_MACHINE.block, 3); @@ -48,8 +48,8 @@ public class SoildCanningMachineBlockEntity extends GenericMachineBlockEntity im // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("solidcanningmachine").player(player.inventory).inventory().hotbar() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("solidcanningmachine").player(player.inventory).inventory().hotbar() .addInventory().blockEntity(this) .slot(0, 34, 47) .slot(1, 126, 47) diff --git a/src/main/java/techreborn/blockentity/machine/tier1/WireMillBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/WireMillBlockEntity.java index 43d25c22e..11999082d 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/WireMillBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/WireMillBlockEntity.java @@ -25,9 +25,9 @@ package techreborn.blockentity.machine.tier1; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.GenericMachineBlockEntity; @@ -35,7 +35,7 @@ import techreborn.init.ModRecipes; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -public class WireMillBlockEntity extends GenericMachineBlockEntity implements IContainerProvider { +public class WireMillBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { public WireMillBlockEntity() { super(TRBlockEntities.WIRE_MILL, "WireMill", 32, 1000, TRContent.Machine.WIRE_MILL.block, 2); @@ -47,8 +47,8 @@ public class WireMillBlockEntity extends GenericMachineBlockEntity implements IC // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("wiremill").player(player.inventory).inventory().hotbar() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("wiremill").player(player.inventory).inventory().hotbar() .addInventory().blockEntity(this) .slot(0, 55, 45) .outputSlot(1, 101, 45) diff --git a/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java index 2c7d14e43..bd989adcc 100644 --- a/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java @@ -36,9 +36,9 @@ import net.minecraft.world.World; import org.apache.commons.lang3.StringUtils; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.chunkloading.ChunkLoaderManager; import reborncore.common.util.RebornInventory; @@ -48,7 +48,7 @@ import techreborn.init.TRContent; import javax.annotation.Nullable; -public class ChunkLoaderBlockEntity extends MachineBaseBlockEntity implements IToolDrop, InventoryProvider, IContainerProvider { +public class ChunkLoaderBlockEntity extends MachineBaseBlockEntity implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider { public RebornInventory inventory = new RebornInventory<>(0, "ChunkLoaderBlockEntity", 64, this); private int radius; @@ -164,8 +164,8 @@ public class ChunkLoaderBlockEntity extends MachineBaseBlockEntity implements IT } @Override - public BuiltContainer createContainer(int syncID, PlayerEntity player) { - return new ContainerBuilder("chunkloader").player(player.inventory).inventory().hotbar().addInventory() + public BuiltScreenHandler createScreenHandler(int syncID, PlayerEntity player) { + return new ScreenHandlerBuilder("chunkloader").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).sync(this::getRadius, this::setRadius).addInventory().create(this, syncID); } diff --git a/src/main/java/techreborn/blockentity/machine/tier3/IndustrialCentrifugeBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier3/IndustrialCentrifugeBlockEntity.java index 37b947c9e..7b4ae6895 100644 --- a/src/main/java/techreborn/blockentity/machine/tier3/IndustrialCentrifugeBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier3/IndustrialCentrifugeBlockEntity.java @@ -29,9 +29,9 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; import reborncore.api.IListInfoProvider; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.util.RebornInventory; import reborncore.common.util.ItemUtils; @@ -44,7 +44,7 @@ import techreborn.items.DynamicCellItem; import java.util.List; -public class IndustrialCentrifugeBlockEntity extends GenericMachineBlockEntity implements IContainerProvider, IListInfoProvider { +public class IndustrialCentrifugeBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider, IListInfoProvider { public IndustrialCentrifugeBlockEntity() { super(TRBlockEntities.INDUSTRIAL_CENTRIFUGE, "IndustrialCentrifuge", TechRebornConfig.industrialCentrifugeMaxInput, TechRebornConfig.industrialCentrifugeMaxEnergy, TRContent.Machine.INDUSTRIAL_CENTRIFUGE.block, 6); @@ -56,8 +56,8 @@ public class IndustrialCentrifugeBlockEntity extends GenericMachineBlockEntity i // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("centrifuge").player(player.inventory).inventory().hotbar() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("centrifuge").player(player.inventory).inventory().hotbar() .addInventory().blockEntity(this) .filterSlot(1, 40, 54, stack -> ItemUtils.isItemEqual(stack, DynamicCellItem.getEmptyCell(1), true, true)) .filterSlot(0, 40, 34, stack -> !ItemUtils.isItemEqual(stack, DynamicCellItem.getEmptyCell(1), true, true)) diff --git a/src/main/java/techreborn/blockentity/machine/tier3/MatterFabricatorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier3/MatterFabricatorBlockEntity.java index 9b3a181a9..3b4541a1a 100644 --- a/src/main/java/techreborn/blockentity/machine/tier3/MatterFabricatorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier3/MatterFabricatorBlockEntity.java @@ -29,9 +29,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.util.ItemUtils; import reborncore.common.util.RebornInventory; @@ -40,7 +40,7 @@ import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; public class MatterFabricatorBlockEntity extends PowerAcceptorBlockEntity - implements IToolDrop, InventoryProvider, IContainerProvider { + implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider { public RebornInventory inventory = new RebornInventory<>(12, "MatterFabricatorBlockEntity", 64, this); private int amplifier = 0; @@ -196,8 +196,8 @@ public class MatterFabricatorBlockEntity extends PowerAcceptorBlockEntity // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, PlayerEntity player) { - return new ContainerBuilder("matterfabricator").player(player.inventory).inventory().hotbar().addInventory() + public BuiltScreenHandler createScreenHandler(int syncID, PlayerEntity player) { + return new ScreenHandlerBuilder("matterfabricator").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).slot(0, 30, 20).slot(1, 50, 20).slot(2, 70, 20).slot(3, 90, 20).slot(4, 110, 20) .slot(5, 130, 20).outputSlot(6, 40, 66).outputSlot(7, 60, 66).outputSlot(8, 80, 66) .outputSlot(9, 100, 66).outputSlot(10, 120, 66).energySlot(11, 8, 72).syncEnergyValue() diff --git a/src/main/java/techreborn/blockentity/storage/energy/AdjustableSUBlockEntity.java b/src/main/java/techreborn/blockentity/storage/energy/AdjustableSUBlockEntity.java index 7ba2d3759..45b29e81a 100644 --- a/src/main/java/techreborn/blockentity/storage/energy/AdjustableSUBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/energy/AdjustableSUBlockEntity.java @@ -28,9 +28,9 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import reborncore.api.blockentity.IUpgrade; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import team.reborn.energy.EnergySide; import team.reborn.energy.EnergyTier; @@ -38,7 +38,7 @@ import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -public class AdjustableSUBlockEntity extends EnergyStorageBlockEntity implements IContainerProvider { +public class AdjustableSUBlockEntity extends EnergyStorageBlockEntity implements BuiltScreenHandlerProvider { public RebornInventory inventory = new RebornInventory<>(4, "AdjustableSUBlockEntity", 64, this); private int OUTPUT = 64; // The current output @@ -156,8 +156,8 @@ public class AdjustableSUBlockEntity extends EnergyStorageBlockEntity implements // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, PlayerEntity player) { - return new ContainerBuilder("aesu").player(player.inventory).inventory().hotbar().armor() + public BuiltScreenHandler createScreenHandler(int syncID, PlayerEntity player) { + return new ScreenHandlerBuilder("aesu").player(player.inventory).inventory().hotbar().armor() .complete(8, 18).addArmor().addInventory().blockEntity(this).energySlot(0, 62, 45).energySlot(1, 98, 45) .syncEnergyValue().sync(this::getCurrentOutput, this::setCurentOutput).addInventory().create(this, syncID); } diff --git a/src/main/java/techreborn/blockentity/storage/energy/HighVoltageSUBlockEntity.java b/src/main/java/techreborn/blockentity/storage/energy/HighVoltageSUBlockEntity.java index 417efab78..c583bdedc 100644 --- a/src/main/java/techreborn/blockentity/storage/energy/HighVoltageSUBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/energy/HighVoltageSUBlockEntity.java @@ -25,9 +25,9 @@ package techreborn.blockentity.storage.energy; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import team.reborn.energy.EnergyTier; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; @@ -36,7 +36,7 @@ import techreborn.init.TRContent; * Created by modmuss50 on 14/03/2016. * */ -public class HighVoltageSUBlockEntity extends EnergyStorageBlockEntity implements IContainerProvider { +public class HighVoltageSUBlockEntity extends EnergyStorageBlockEntity implements BuiltScreenHandlerProvider { /** * MFSU should store 4M Energy with 512 E/t I/O @@ -46,8 +46,8 @@ public class HighVoltageSUBlockEntity extends EnergyStorageBlockEntity implement } @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("mfsu").player(player.inventory).inventory().hotbar().armor() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("mfsu").player(player.inventory).inventory().hotbar().armor() .complete(8, 18).addArmor().addInventory().blockEntity(this).energySlot(0, 62, 45).energySlot(1, 98, 45) .syncEnergyValue().addInventory().create(this, syncID); } diff --git a/src/main/java/techreborn/blockentity/storage/energy/LowVoltageSUBlockEntity.java b/src/main/java/techreborn/blockentity/storage/energy/LowVoltageSUBlockEntity.java index 4ef3747d4..3784765c2 100644 --- a/src/main/java/techreborn/blockentity/storage/energy/LowVoltageSUBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/energy/LowVoltageSUBlockEntity.java @@ -25,9 +25,9 @@ package techreborn.blockentity.storage.energy; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import team.reborn.energy.EnergyTier; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; @@ -35,15 +35,15 @@ import techreborn.init.TRContent; /** * Created by modmuss50 on 14/03/2016. */ -public class LowVoltageSUBlockEntity extends EnergyStorageBlockEntity implements IContainerProvider { +public class LowVoltageSUBlockEntity extends EnergyStorageBlockEntity implements BuiltScreenHandlerProvider { public LowVoltageSUBlockEntity() { super(TRBlockEntities.LOW_VOLTAGE_SU, "BatBox", 2, TRContent.Machine.LOW_VOLTAGE_SU.block, EnergyTier.LOW, 40_000); } @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("batbox").player(player.inventory).inventory().hotbar().addInventory() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("batbox").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).energySlot(0, 62, 45).energySlot(1, 98, 45).syncEnergyValue().addInventory().create(this, syncID); } } diff --git a/src/main/java/techreborn/blockentity/storage/energy/MediumVoltageSUBlockEntity.java b/src/main/java/techreborn/blockentity/storage/energy/MediumVoltageSUBlockEntity.java index 484b9440a..bbc7e3d59 100644 --- a/src/main/java/techreborn/blockentity/storage/energy/MediumVoltageSUBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/energy/MediumVoltageSUBlockEntity.java @@ -25,9 +25,9 @@ package techreborn.blockentity.storage.energy; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import team.reborn.energy.EnergyTier; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; @@ -36,7 +36,7 @@ import techreborn.init.TRContent; * Created by modmuss50 on 14/03/2016. * */ -public class MediumVoltageSUBlockEntity extends EnergyStorageBlockEntity implements IContainerProvider { +public class MediumVoltageSUBlockEntity extends EnergyStorageBlockEntity implements BuiltScreenHandlerProvider { /** * MFE should store 300k energy with 128 E/t I/O @@ -46,8 +46,8 @@ public class MediumVoltageSUBlockEntity extends EnergyStorageBlockEntity impleme } @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("mfe").player(player.inventory).inventory().hotbar().armor() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("mfe").player(player.inventory).inventory().hotbar().armor() .complete(8, 18).addArmor().addInventory().blockEntity(this).energySlot(0, 62, 45).energySlot(1, 98, 45) .syncEnergyValue().addInventory().create(this, syncID); } diff --git a/src/main/java/techreborn/blockentity/storage/energy/idsu/InterdimensionalSUBlockEntity.java b/src/main/java/techreborn/blockentity/storage/energy/idsu/InterdimensionalSUBlockEntity.java index ae0badf55..27b72af70 100644 --- a/src/main/java/techreborn/blockentity/storage/energy/idsu/InterdimensionalSUBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/energy/idsu/InterdimensionalSUBlockEntity.java @@ -27,9 +27,9 @@ package techreborn.blockentity.storage.energy.idsu; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.CompoundTag; import org.apache.commons.lang3.StringUtils; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import team.reborn.energy.EnergySide; import team.reborn.energy.EnergyTier; import techreborn.blockentity.storage.energy.EnergyStorageBlockEntity; @@ -37,7 +37,7 @@ import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -public class InterdimensionalSUBlockEntity extends EnergyStorageBlockEntity implements IContainerProvider { +public class InterdimensionalSUBlockEntity extends EnergyStorageBlockEntity implements BuiltScreenHandlerProvider { public String ownerUdid; @@ -117,8 +117,8 @@ public class InterdimensionalSUBlockEntity extends EnergyStorageBlockEntity impl } @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("idsu").player(player.inventory).inventory().hotbar().armor() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("idsu").player(player.inventory).inventory().hotbar().armor() .complete(8, 18).addArmor().addInventory().blockEntity(this).energySlot(0, 62, 45).energySlot(1, 98, 45) .syncEnergyValue().addInventory().create(this, syncID); } diff --git a/src/main/java/techreborn/blockentity/storage/energy/lesu/LapotronicSUBlockEntity.java b/src/main/java/techreborn/blockentity/storage/energy/lesu/LapotronicSUBlockEntity.java index e9f0bc677..233c40d22 100644 --- a/src/main/java/techreborn/blockentity/storage/energy/lesu/LapotronicSUBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/energy/lesu/LapotronicSUBlockEntity.java @@ -27,11 +27,10 @@ package techreborn.blockentity.storage.energy.lesu; import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import team.reborn.energy.EnergyTier; import techreborn.blockentity.storage.energy.EnergyStorageBlockEntity; import techreborn.blocks.storage.energy.LapotronicSUBlock; @@ -41,7 +40,7 @@ import techreborn.init.TRContent; import java.util.ArrayList; -public class LapotronicSUBlockEntity extends EnergyStorageBlockEntity implements IContainerProvider{ +public class LapotronicSUBlockEntity extends EnergyStorageBlockEntity implements BuiltScreenHandlerProvider { private int connectedBlocks = 0; private ArrayList countedNetworks = new ArrayList<>(); @@ -127,8 +126,8 @@ public class LapotronicSUBlockEntity extends EnergyStorageBlockEntity implements // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("lesu").player(player.inventory).inventory().hotbar().armor().complete(8, 18) + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("lesu").player(player.inventory).inventory().hotbar().armor().complete(8, 18) .addArmor().addInventory().blockEntity(this).energySlot(0, 62, 45).energySlot(1, 98, 45).syncEnergyValue() .sync(this::getConnectedBlocksNum, this::setConnectedBlocksNum).addInventory().create(this, syncID); } diff --git a/src/main/java/techreborn/blockentity/storage/fluid/TankUnitBaseBlockEntity.java b/src/main/java/techreborn/blockentity/storage/fluid/TankUnitBaseBlockEntity.java index 28ab5dadc..8b28b1ce8 100644 --- a/src/main/java/techreborn/blockentity/storage/fluid/TankUnitBaseBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/fluid/TankUnitBaseBlockEntity.java @@ -36,9 +36,9 @@ import org.apache.commons.lang3.text.WordUtils; import reborncore.api.IListInfoProvider; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.fluid.FluidUtil; import reborncore.common.fluid.FluidValue; @@ -52,7 +52,7 @@ import techreborn.utils.FluidUtils; import javax.annotation.Nonnull; import java.util.List; -public class TankUnitBaseBlockEntity extends MachineBaseBlockEntity implements InventoryProvider, IToolDrop, IListInfoProvider, IContainerProvider { +public class TankUnitBaseBlockEntity extends MachineBaseBlockEntity implements InventoryProvider, IToolDrop, IListInfoProvider, BuiltScreenHandlerProvider { protected Tank tank; protected RebornInventory inventory = new RebornInventory<>(2, "TankInventory", 64, this); @@ -164,8 +164,8 @@ public class TankUnitBaseBlockEntity extends MachineBaseBlockEntity implements I // IContainerProvider @Override - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("tank").player(player.inventory).inventory().hotbar() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("tank").player(player.inventory).inventory().hotbar() .addInventory().blockEntity(this).fluidSlot(0, 100, 53).outputSlot(1, 140, 53) .sync(tank).addInventory().create(this, syncID); } diff --git a/src/main/java/techreborn/blockentity/storage/item/StorageUnitBaseBlockEntity.java b/src/main/java/techreborn/blockentity/storage/item/StorageUnitBaseBlockEntity.java index b2bfeac48..f365188e9 100644 --- a/src/main/java/techreborn/blockentity/storage/item/StorageUnitBaseBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/item/StorageUnitBaseBlockEntity.java @@ -38,9 +38,9 @@ import net.minecraft.world.World; import reborncore.api.IListInfoProvider; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.client.screen.BuiltScreenHandlerProvider; +import reborncore.client.screen.builder.BuiltScreenHandler; +import reborncore.client.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.util.ItemUtils; import reborncore.common.util.RebornInventory; @@ -52,7 +52,7 @@ import techreborn.init.TRContent; import java.util.List; public class StorageUnitBaseBlockEntity extends MachineBaseBlockEntity - implements InventoryProvider, IToolDrop, IListInfoProvider, IContainerProvider { + implements InventoryProvider, IToolDrop, IListInfoProvider, BuiltScreenHandlerProvider { // Inventory constants @@ -377,8 +377,8 @@ public class StorageUnitBaseBlockEntity extends MachineBaseBlockEntity // Inventory gets dropped automatically } - public BuiltContainer createContainer(int syncID, final PlayerEntity player) { - return new ContainerBuilder("chest").player(player.inventory).inventory().hotbar().addInventory() + public BuiltScreenHandler createScreenHandler(int syncID, final PlayerEntity player) { + return new ScreenHandlerBuilder("chest").player(player.inventory).inventory().hotbar().addInventory() .blockEntity(this).slot(0, 100, 53).outputSlot(1, 140, 53).addInventory().create(this, syncID); } diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index 2cf219428..97cc05ee2 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -33,7 +33,7 @@ import net.minecraft.client.gui.screen.ingame.ScreenWithHandler; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import reborncore.RebornCore; -import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.screen.BuiltScreenHandlerProvider; import techreborn.blockentity.data.DataDrivenBEProvider; import techreborn.blockentity.data.DataDrivenGui; import techreborn.blockentity.generator.PlasmaGeneratorBlockEntity; @@ -67,7 +67,7 @@ public class GuiHandler { EGui.stream().forEach(gui -> ContainerProviderRegistry.INSTANCE.registerFactory(gui.getID(), (syncID, identifier, playerEntity, packetByteBuf) -> { final BlockEntity blockEntity = playerEntity.world.getBlockEntity(packetByteBuf.readBlockPos()); - return ((IContainerProvider) blockEntity).createContainer(syncID, playerEntity); + return ((BuiltScreenHandlerProvider) blockEntity).createScreenHandler(syncID, playerEntity); })); RebornCore.clientOnly(() -> () -> EGui.stream().forEach(gui -> ScreenProviderRegistry.INSTANCE.registerFactory(gui.getID(), (syncID, identifier, playerEntity, packetByteBuf) -> getClientGuiElement(EGui.byID(identifier), playerEntity, packetByteBuf.readBlockPos(), syncID)))); diff --git a/src/main/java/techreborn/client/gui/GuiAESU.java b/src/main/java/techreborn/client/gui/GuiAESU.java index fb63f56db..56c845372 100644 --- a/src/main/java/techreborn/client/gui/GuiAESU.java +++ b/src/main/java/techreborn/client/gui/GuiAESU.java @@ -27,7 +27,7 @@ package techreborn.client.gui; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.screen.Screen; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonUpDown; import reborncore.client.gui.builder.widget.GuiButtonUpDown.UpDownButtonType; @@ -36,12 +36,12 @@ import reborncore.common.powerSystem.PowerSystem; import techreborn.blockentity.storage.energy.AdjustableSUBlockEntity; import techreborn.packets.ServerboundPackets; -public class GuiAESU extends GuiBase { +public class GuiAESU extends GuiBase { AdjustableSUBlockEntity blockEntity; public GuiAESU(int syncID, final PlayerEntity player, final AdjustableSUBlockEntity aesu) { - super(player, aesu, aesu.createContainer(syncID, player)); + super(player, aesu, aesu.createScreenHandler(syncID, player)); this.blockEntity = aesu; } diff --git a/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java b/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java index 6be2bd1dc..415838209 100644 --- a/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java @@ -25,17 +25,17 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.iron.IronAlloyFurnaceBlockEntity; -public class GuiAlloyFurnace extends GuiBase { +public class GuiAlloyFurnace extends GuiBase { IronAlloyFurnaceBlockEntity blockEntity; public GuiAlloyFurnace(int syncID, PlayerEntity player, IronAlloyFurnaceBlockEntity alloyFurnace) { - super(player, alloyFurnace, alloyFurnace.createContainer(syncID, player)); + super(player, alloyFurnace, alloyFurnace.createScreenHandler(syncID, player)); this.blockEntity = alloyFurnace; } diff --git a/src/main/java/techreborn/client/gui/GuiAlloySmelter.java b/src/main/java/techreborn/client/gui/GuiAlloySmelter.java index 289116fce..99bd781b0 100644 --- a/src/main/java/techreborn/client/gui/GuiAlloySmelter.java +++ b/src/main/java/techreborn/client/gui/GuiAlloySmelter.java @@ -25,17 +25,17 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.AlloySmelterBlockEntity; -public class GuiAlloySmelter extends GuiBase { +public class GuiAlloySmelter extends GuiBase { AlloySmelterBlockEntity blockEntity; public GuiAlloySmelter(int syncID, final PlayerEntity player, final AlloySmelterBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java b/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java index cfae93744..7fb6e0b43 100644 --- a/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java +++ b/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java @@ -25,17 +25,17 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.AssemblingMachineBlockEntity; -public class GuiAssemblingMachine extends GuiBase { +public class GuiAssemblingMachine extends GuiBase { AssemblingMachineBlockEntity blockEntity; public GuiAssemblingMachine(int syncID, final PlayerEntity player, final AssemblingMachineBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiAutoCrafting.java b/src/main/java/techreborn/client/gui/GuiAutoCrafting.java index b19ff9388..665009a17 100644 --- a/src/main/java/techreborn/client/gui/GuiAutoCrafting.java +++ b/src/main/java/techreborn/client/gui/GuiAutoCrafting.java @@ -29,7 +29,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.recipe.CraftingRecipe; import net.minecraft.util.Identifier; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.common.network.NetworkManager; @@ -39,14 +39,14 @@ import techreborn.blockentity.machine.tier1.AutoCraftingTableBlockEntity; /** * Created by modmuss50 on 20/06/2017. */ -public class GuiAutoCrafting extends GuiBase { +public class GuiAutoCrafting extends GuiBase { static final Identifier RECIPE_BOOK_TEXTURE = new Identifier("textures/gui/recipe_book.png"); boolean showGui = true; AutoCraftingTableBlockEntity blockEntityAutoCraftingTable; public GuiAutoCrafting(int syncID, PlayerEntity player, AutoCraftingTableBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntityAutoCraftingTable = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiBatbox.java b/src/main/java/techreborn/client/gui/GuiBatbox.java index b87faf1a1..672f05e52 100644 --- a/src/main/java/techreborn/client/gui/GuiBatbox.java +++ b/src/main/java/techreborn/client/gui/GuiBatbox.java @@ -26,17 +26,17 @@ package techreborn.client.gui; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.common.powerSystem.PowerSystem; import techreborn.blockentity.storage.energy.LowVoltageSUBlockEntity; -public class GuiBatbox extends GuiBase { +public class GuiBatbox extends GuiBase { LowVoltageSUBlockEntity blockEntity; public GuiBatbox(int syncID, final PlayerEntity player, final LowVoltageSUBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java index 4529b6edf..f94ebc28b 100644 --- a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java @@ -29,7 +29,7 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.guibuilder.GuiBuilder; @@ -37,13 +37,13 @@ import reborncore.client.multiblock.Multiblock; import techreborn.blockentity.machine.multiblock.IndustrialBlastFurnaceBlockEntity; import techreborn.init.TRContent; -public class GuiBlastFurnace extends GuiBase { +public class GuiBlastFurnace extends GuiBase { public IndustrialBlastFurnaceBlockEntity blockEntity; boolean hasMultiBlock; public GuiBlastFurnace(int syncID, final PlayerEntity player, final IndustrialBlastFurnaceBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiCentrifuge.java b/src/main/java/techreborn/client/gui/GuiCentrifuge.java index 1be316872..e7df370ba 100644 --- a/src/main/java/techreborn/client/gui/GuiCentrifuge.java +++ b/src/main/java/techreborn/client/gui/GuiCentrifuge.java @@ -25,17 +25,17 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier3.IndustrialCentrifugeBlockEntity; -public class GuiCentrifuge extends GuiBase { +public class GuiCentrifuge extends GuiBase { IndustrialCentrifugeBlockEntity blockEntity; public GuiCentrifuge(int syncID, final PlayerEntity player, final IndustrialCentrifugeBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiChargeBench.java b/src/main/java/techreborn/client/gui/GuiChargeBench.java index c644dccf2..b07b46953 100644 --- a/src/main/java/techreborn/client/gui/GuiChargeBench.java +++ b/src/main/java/techreborn/client/gui/GuiChargeBench.java @@ -25,16 +25,16 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import techreborn.blockentity.machine.misc.ChargeOMatBlockEntity; -public class GuiChargeBench extends GuiBase { +public class GuiChargeBench extends GuiBase { ChargeOMatBlockEntity blockEntity; public GuiChargeBench(int syncID, final PlayerEntity player, final ChargeOMatBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiChemicalReactor.java b/src/main/java/techreborn/client/gui/GuiChemicalReactor.java index 4d3bb09c8..70cdee88f 100644 --- a/src/main/java/techreborn/client/gui/GuiChemicalReactor.java +++ b/src/main/java/techreborn/client/gui/GuiChemicalReactor.java @@ -25,17 +25,17 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.ChemicalReactorBlockEntity; -public class GuiChemicalReactor extends GuiBase { +public class GuiChemicalReactor extends GuiBase { ChemicalReactorBlockEntity blockEntity; public GuiChemicalReactor(int syncID, final PlayerEntity player, final ChemicalReactorBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiChunkLoader.java b/src/main/java/techreborn/client/gui/GuiChunkLoader.java index f05779b66..022a47bec 100644 --- a/src/main/java/techreborn/client/gui/GuiChunkLoader.java +++ b/src/main/java/techreborn/client/gui/GuiChunkLoader.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; import reborncore.client.ClientChunkManager; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonSimple; import reborncore.client.gui.builder.widget.GuiButtonUpDown; @@ -35,12 +35,12 @@ import reborncore.common.network.NetworkManager; import techreborn.blockentity.machine.tier3.ChunkLoaderBlockEntity; import techreborn.packets.ServerboundPackets; -public class GuiChunkLoader extends GuiBase { +public class GuiChunkLoader extends GuiBase { ChunkLoaderBlockEntity blockEntity; public GuiChunkLoader(int syncID, PlayerEntity player, ChunkLoaderBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiCompressor.java b/src/main/java/techreborn/client/gui/GuiCompressor.java index 0ff55a331..40d8257a4 100644 --- a/src/main/java/techreborn/client/gui/GuiCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiCompressor.java @@ -25,17 +25,17 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.CompressorBlockEntity; -public class GuiCompressor extends GuiBase { +public class GuiCompressor extends GuiBase { CompressorBlockEntity blockEntity; public GuiCompressor(int syncID, final PlayerEntity player, final CompressorBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiDieselGenerator.java b/src/main/java/techreborn/client/gui/GuiDieselGenerator.java index 3a48690ab..b8b398d58 100644 --- a/src/main/java/techreborn/client/gui/GuiDieselGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiDieselGenerator.java @@ -27,18 +27,18 @@ package techreborn.client.gui; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.generator.advanced.DieselGeneratorBlockEntity; @Environment(EnvType.CLIENT) -public class GuiDieselGenerator extends GuiBase { +public class GuiDieselGenerator extends GuiBase { DieselGeneratorBlockEntity blockEntity; public GuiDieselGenerator(int syncID, final PlayerEntity player, final DieselGeneratorBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiDistillationTower.java b/src/main/java/techreborn/client/gui/GuiDistillationTower.java index 8ea820821..25d94b6b7 100644 --- a/src/main/java/techreborn/client/gui/GuiDistillationTower.java +++ b/src/main/java/techreborn/client/gui/GuiDistillationTower.java @@ -29,7 +29,7 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.guibuilder.GuiBuilder; @@ -37,12 +37,12 @@ import reborncore.client.multiblock.Multiblock; import techreborn.blockentity.machine.multiblock.DistillationTowerBlockEntity; import techreborn.init.TRContent; -public class GuiDistillationTower extends GuiBase { +public class GuiDistillationTower extends GuiBase { public DistillationTowerBlockEntity blockEntity; public GuiDistillationTower(int syncID, final PlayerEntity player, final DistillationTowerBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiElectricFurnace.java b/src/main/java/techreborn/client/gui/GuiElectricFurnace.java index 278536cdc..47980ff4a 100644 --- a/src/main/java/techreborn/client/gui/GuiElectricFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiElectricFurnace.java @@ -25,17 +25,17 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.ElectricFurnaceBlockEntity; -public class GuiElectricFurnace extends GuiBase { +public class GuiElectricFurnace extends GuiBase { ElectricFurnaceBlockEntity blockEntity; public GuiElectricFurnace(int syncID, final PlayerEntity player, final ElectricFurnaceBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiExtractor.java b/src/main/java/techreborn/client/gui/GuiExtractor.java index 4268663d7..602162527 100644 --- a/src/main/java/techreborn/client/gui/GuiExtractor.java +++ b/src/main/java/techreborn/client/gui/GuiExtractor.java @@ -25,17 +25,17 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.ExtractorBlockEntity; -public class GuiExtractor extends GuiBase { +public class GuiExtractor extends GuiBase { ExtractorBlockEntity blockEntity; public GuiExtractor(int syncID, final PlayerEntity player, final ExtractorBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java index d94542e19..17855c5b8 100644 --- a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java +++ b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java @@ -28,7 +28,7 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.guibuilder.GuiBuilder; @@ -40,12 +40,12 @@ import techreborn.init.TRContent; * @author drcrazy * */ -public class GuiFluidReplicator extends GuiBase { +public class GuiFluidReplicator extends GuiBase { FluidReplicatorBlockEntity blockEntity; public GuiFluidReplicator(int syncID, final PlayerEntity player, final FluidReplicatorBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiFusionReactor.java b/src/main/java/techreborn/client/gui/GuiFusionReactor.java index 17db6dda7..21990e84e 100644 --- a/src/main/java/techreborn/client/gui/GuiFusionReactor.java +++ b/src/main/java/techreborn/client/gui/GuiFusionReactor.java @@ -29,7 +29,7 @@ import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import org.apache.commons.lang3.tuple.Pair; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.builder.widget.GuiButtonUpDown; @@ -47,11 +47,11 @@ import techreborn.packets.ServerboundPackets; import java.util.List; import java.util.Optional; -public class GuiFusionReactor extends GuiBase { +public class GuiFusionReactor extends GuiBase { FusionControlComputerBlockEntity blockEntity; public GuiFusionReactor(int syncID, final PlayerEntity player, final FusionControlComputerBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiGasTurbine.java b/src/main/java/techreborn/client/gui/GuiGasTurbine.java index e93f10f6c..8089c012c 100644 --- a/src/main/java/techreborn/client/gui/GuiGasTurbine.java +++ b/src/main/java/techreborn/client/gui/GuiGasTurbine.java @@ -25,17 +25,17 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.generator.advanced.GasTurbineBlockEntity; -public class GuiGasTurbine extends GuiBase { +public class GuiGasTurbine extends GuiBase { GasTurbineBlockEntity blockEntity; public GuiGasTurbine(int syncID, final PlayerEntity player, final GasTurbineBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiGenerator.java b/src/main/java/techreborn/client/gui/GuiGenerator.java index c8992eb4f..0f451dc23 100644 --- a/src/main/java/techreborn/client/gui/GuiGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiGenerator.java @@ -25,16 +25,16 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import techreborn.blockentity.generator.basic.SolidFuelGeneratorBlockEntity; -public class GuiGenerator extends GuiBase { +public class GuiGenerator extends GuiBase { SolidFuelGeneratorBlockEntity blockEntity; public GuiGenerator(int syncID, final PlayerEntity player, final SolidFuelGeneratorBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiGreenhouseController.java b/src/main/java/techreborn/client/gui/GuiGreenhouseController.java index 49ac5d1c8..2655f8cc9 100644 --- a/src/main/java/techreborn/client/gui/GuiGreenhouseController.java +++ b/src/main/java/techreborn/client/gui/GuiGreenhouseController.java @@ -32,7 +32,7 @@ import net.minecraft.state.property.Properties; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.multiblock.Multiblock; @@ -43,12 +43,12 @@ import techreborn.init.TRContent; import java.util.Arrays; import java.util.List; -public class GuiGreenhouseController extends GuiBase { +public class GuiGreenhouseController extends GuiBase { GreenhouseControllerBlockEntity blockEntity; public GuiGreenhouseController(int syncID, final PlayerEntity player, final GreenhouseControllerBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiIDSU.java b/src/main/java/techreborn/client/gui/GuiIDSU.java index a386076fc..2177ffbdb 100644 --- a/src/main/java/techreborn/client/gui/GuiIDSU.java +++ b/src/main/java/techreborn/client/gui/GuiIDSU.java @@ -26,17 +26,17 @@ package techreborn.client.gui; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.common.powerSystem.PowerSystem; import techreborn.blockentity.storage.energy.idsu.InterdimensionalSUBlockEntity; -public class GuiIDSU extends GuiBase { +public class GuiIDSU extends GuiBase { InterdimensionalSUBlockEntity idsu; public GuiIDSU(int syncID, PlayerEntity player, InterdimensionalSUBlockEntity blockEntityIDSU) { - super(player, blockEntityIDSU, blockEntityIDSU.createContainer(syncID, player)); + super(player, blockEntityIDSU, blockEntityIDSU.createScreenHandler(syncID, player)); idsu = blockEntityIDSU; } diff --git a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java index 486e96378..e8b6a0545 100644 --- a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java @@ -28,7 +28,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.guibuilder.GuiBuilder; @@ -36,12 +36,12 @@ import reborncore.client.multiblock.Multiblock; import techreborn.blockentity.machine.multiblock.ImplosionCompressorBlockEntity; import techreborn.init.TRContent; -public class GuiImplosionCompressor extends GuiBase { +public class GuiImplosionCompressor extends GuiBase { ImplosionCompressorBlockEntity blockEntity; public GuiImplosionCompressor(int syncID, final PlayerEntity player, final ImplosionCompressorBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java b/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java index b492cb3ed..4b6ad19e2 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java @@ -25,17 +25,17 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.IndustrialElectrolyzerBlockEntity; -public class GuiIndustrialElectrolyzer extends GuiBase { +public class GuiIndustrialElectrolyzer extends GuiBase { IndustrialElectrolyzerBlockEntity blockEntity; public GuiIndustrialElectrolyzer(int syncID, final PlayerEntity player, final IndustrialElectrolyzerBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java index 55db604ff..f448e1bcf 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java @@ -29,7 +29,7 @@ import net.minecraft.block.Blocks; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.guibuilder.GuiBuilder; @@ -37,12 +37,12 @@ import reborncore.client.multiblock.Multiblock; import techreborn.blockentity.machine.multiblock.IndustrialGrinderBlockEntity; import techreborn.init.TRContent; -public class GuiIndustrialGrinder extends GuiBase { +public class GuiIndustrialGrinder extends GuiBase { IndustrialGrinderBlockEntity blockEntity; public GuiIndustrialGrinder(int syncID, final PlayerEntity player, final IndustrialGrinderBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java index 8896a2676..129063985 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java @@ -29,7 +29,7 @@ import net.minecraft.block.Blocks; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.guibuilder.GuiBuilder; @@ -37,12 +37,12 @@ import reborncore.client.multiblock.Multiblock; import techreborn.blockentity.machine.multiblock.IndustrialSawmillBlockEntity; import techreborn.init.TRContent; -public class GuiIndustrialSawmill extends GuiBase { +public class GuiIndustrialSawmill extends GuiBase { IndustrialSawmillBlockEntity blockEntity; public GuiIndustrialSawmill(int syncID, final PlayerEntity player, final IndustrialSawmillBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiIronFurnace.java b/src/main/java/techreborn/client/gui/GuiIronFurnace.java index 4aaf7b789..adb7fcee1 100644 --- a/src/main/java/techreborn/client/gui/GuiIronFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiIronFurnace.java @@ -33,7 +33,7 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonSimple; import reborncore.client.gui.guibuilder.GuiBuilder; @@ -42,12 +42,12 @@ import techreborn.blockentity.machine.iron.IronFurnaceBlockEntity; import techreborn.packets.ServerboundPackets; import techreborn.utils.PlayerUtils; -public class GuiIronFurnace extends GuiBase { +public class GuiIronFurnace extends GuiBase { IronFurnaceBlockEntity blockEntity; public GuiIronFurnace(int syncID, PlayerEntity player, IronFurnaceBlockEntity furnace) { - super(player, furnace, furnace.createContainer(syncID, player)); + super(player, furnace, furnace.createScreenHandler(syncID, player)); this.blockEntity = furnace; } diff --git a/src/main/java/techreborn/client/gui/GuiLESU.java b/src/main/java/techreborn/client/gui/GuiLESU.java index 4df936e03..3458890ac 100644 --- a/src/main/java/techreborn/client/gui/GuiLESU.java +++ b/src/main/java/techreborn/client/gui/GuiLESU.java @@ -26,17 +26,17 @@ package techreborn.client.gui; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.common.powerSystem.PowerSystem; import techreborn.blockentity.storage.energy.lesu.LapotronicSUBlockEntity; -public class GuiLESU extends GuiBase { +public class GuiLESU extends GuiBase { LapotronicSUBlockEntity blockEntity; public GuiLESU(int syncID, final PlayerEntity player, final LapotronicSUBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiMFE.java b/src/main/java/techreborn/client/gui/GuiMFE.java index 1b8824c18..083b01648 100644 --- a/src/main/java/techreborn/client/gui/GuiMFE.java +++ b/src/main/java/techreborn/client/gui/GuiMFE.java @@ -26,17 +26,17 @@ package techreborn.client.gui; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.common.powerSystem.PowerSystem; import techreborn.blockentity.storage.energy.MediumVoltageSUBlockEntity; -public class GuiMFE extends GuiBase { +public class GuiMFE extends GuiBase { MediumVoltageSUBlockEntity mfe; public GuiMFE(int syncID, final PlayerEntity player, final MediumVoltageSUBlockEntity mfe) { - super(player, mfe, mfe.createContainer(syncID, player)); + super(player, mfe, mfe.createScreenHandler(syncID, player)); this.mfe = mfe; } diff --git a/src/main/java/techreborn/client/gui/GuiMFSU.java b/src/main/java/techreborn/client/gui/GuiMFSU.java index 6df35833a..99b9b617c 100644 --- a/src/main/java/techreborn/client/gui/GuiMFSU.java +++ b/src/main/java/techreborn/client/gui/GuiMFSU.java @@ -26,17 +26,17 @@ package techreborn.client.gui; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.common.powerSystem.PowerSystem; import techreborn.blockentity.storage.energy.HighVoltageSUBlockEntity; -public class GuiMFSU extends GuiBase { +public class GuiMFSU extends GuiBase { HighVoltageSUBlockEntity mfsu; public GuiMFSU(int syncID, final PlayerEntity player, final HighVoltageSUBlockEntity mfsu) { - super(player, mfsu, mfsu.createContainer(syncID, player)); + super(player, mfsu, mfsu.createScreenHandler(syncID, player)); this.mfsu = mfsu; } diff --git a/src/main/java/techreborn/client/gui/GuiMatterFabricator.java b/src/main/java/techreborn/client/gui/GuiMatterFabricator.java index 91e0d4187..60389f8f8 100644 --- a/src/main/java/techreborn/client/gui/GuiMatterFabricator.java +++ b/src/main/java/techreborn/client/gui/GuiMatterFabricator.java @@ -25,17 +25,17 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier3.MatterFabricatorBlockEntity; -public class GuiMatterFabricator extends GuiBase { +public class GuiMatterFabricator extends GuiBase { MatterFabricatorBlockEntity blockEntity; public GuiMatterFabricator(int syncID, final PlayerEntity player, final MatterFabricatorBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiPlasmaGenerator.java b/src/main/java/techreborn/client/gui/GuiPlasmaGenerator.java index b6630a1b4..7b0b0f2ef 100644 --- a/src/main/java/techreborn/client/gui/GuiPlasmaGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiPlasmaGenerator.java @@ -27,7 +27,7 @@ package techreborn.client.gui; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.generator.PlasmaGeneratorBlockEntity; @@ -37,7 +37,7 @@ import techreborn.blockentity.generator.PlasmaGeneratorBlockEntity; * */ @Environment(EnvType.CLIENT) -public class GuiPlasmaGenerator extends GuiBase { +public class GuiPlasmaGenerator extends GuiBase { /** * @param player @@ -47,7 +47,7 @@ public class GuiPlasmaGenerator extends GuiBase { PlasmaGeneratorBlockEntity blockEntity; public GuiPlasmaGenerator(int syncID, final PlayerEntity player, final PlasmaGeneratorBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiRecycler.java b/src/main/java/techreborn/client/gui/GuiRecycler.java index 00d032073..904166bed 100644 --- a/src/main/java/techreborn/client/gui/GuiRecycler.java +++ b/src/main/java/techreborn/client/gui/GuiRecycler.java @@ -25,17 +25,17 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.RecyclerBlockEntity; -public class GuiRecycler extends GuiBase { +public class GuiRecycler extends GuiBase { RecyclerBlockEntity blockEntity; public GuiRecycler(int syncID, final PlayerEntity player, final RecyclerBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiRollingMachine.java b/src/main/java/techreborn/client/gui/GuiRollingMachine.java index 3812abf5f..eafebe98b 100644 --- a/src/main/java/techreborn/client/gui/GuiRollingMachine.java +++ b/src/main/java/techreborn/client/gui/GuiRollingMachine.java @@ -25,19 +25,19 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.common.network.NetworkManager; import techreborn.packets.ServerboundPackets; import techreborn.blockentity.machine.tier1.RollingMachineBlockEntity; -public class GuiRollingMachine extends GuiBase { +public class GuiRollingMachine extends GuiBase { RollingMachineBlockEntity rollingMachine; public GuiRollingMachine(int syncID, final PlayerEntity player, final RollingMachineBlockEntity blockEntityRollingmachine) { - super(player, blockEntityRollingmachine, blockEntityRollingmachine.createContainer(syncID, player)); + super(player, blockEntityRollingmachine, blockEntityRollingmachine.createScreenHandler(syncID, player)); this.rollingMachine = blockEntityRollingmachine; } diff --git a/src/main/java/techreborn/client/gui/GuiScrapboxinator.java b/src/main/java/techreborn/client/gui/GuiScrapboxinator.java index e83cac2a2..b5c16d5be 100644 --- a/src/main/java/techreborn/client/gui/GuiScrapboxinator.java +++ b/src/main/java/techreborn/client/gui/GuiScrapboxinator.java @@ -25,17 +25,17 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.ScrapboxinatorBlockEntity; -public class GuiScrapboxinator extends GuiBase { +public class GuiScrapboxinator extends GuiBase { ScrapboxinatorBlockEntity blockEntity; public GuiScrapboxinator(int syncID, final PlayerEntity player, final ScrapboxinatorBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java b/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java index bff92e552..028c14b77 100644 --- a/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java @@ -25,17 +25,17 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.generator.advanced.SemiFluidGeneratorBlockEntity; -public class GuiSemifluidGenerator extends GuiBase { +public class GuiSemifluidGenerator extends GuiBase { SemiFluidGeneratorBlockEntity blockEntity; public GuiSemifluidGenerator(int syncID, final PlayerEntity player, final SemiFluidGeneratorBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiSolar.java b/src/main/java/techreborn/client/gui/GuiSolar.java index a64621391..e9ce50cfd 100644 --- a/src/main/java/techreborn/client/gui/GuiSolar.java +++ b/src/main/java/techreborn/client/gui/GuiSolar.java @@ -25,17 +25,17 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.common.util.StringUtils; import techreborn.blockentity.generator.SolarPanelBlockEntity; -public class GuiSolar extends GuiBase { +public class GuiSolar extends GuiBase { SolarPanelBlockEntity blockEntity; public GuiSolar(int syncID, PlayerEntity player, SolarPanelBlockEntity panel) { - super(player, panel, panel.createContainer(syncID, player)); + super(player, panel, panel.createScreenHandler(syncID, player)); this.blockEntity = panel; } diff --git a/src/main/java/techreborn/client/gui/GuiSolidCanningMachine.java b/src/main/java/techreborn/client/gui/GuiSolidCanningMachine.java index 2f4c899a6..e67b83318 100644 --- a/src/main/java/techreborn/client/gui/GuiSolidCanningMachine.java +++ b/src/main/java/techreborn/client/gui/GuiSolidCanningMachine.java @@ -25,17 +25,17 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.SoildCanningMachineBlockEntity; -public class GuiSolidCanningMachine extends GuiBase { +public class GuiSolidCanningMachine extends GuiBase { SoildCanningMachineBlockEntity blockEntity; public GuiSolidCanningMachine(int syncID, final PlayerEntity player, final SoildCanningMachineBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiStorageUnit.java b/src/main/java/techreborn/client/gui/GuiStorageUnit.java index 479c82b3e..cd30a499a 100644 --- a/src/main/java/techreborn/client/gui/GuiStorageUnit.java +++ b/src/main/java/techreborn/client/gui/GuiStorageUnit.java @@ -25,17 +25,17 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.common.util.StringUtils; import techreborn.blockentity.storage.item.StorageUnitBaseBlockEntity; -public class GuiStorageUnit extends GuiBase { +public class GuiStorageUnit extends GuiBase { StorageUnitBaseBlockEntity storageEntity; public GuiStorageUnit(int syncID, final PlayerEntity player, final StorageUnitBaseBlockEntity storageEntity) { - super(player, storageEntity, storageEntity.createContainer(syncID, player)); + super(player, storageEntity, storageEntity.createScreenHandler(syncID, player)); this.storageEntity = storageEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiTankUnit.java b/src/main/java/techreborn/client/gui/GuiTankUnit.java index 236d97f46..c6aee0c3c 100644 --- a/src/main/java/techreborn/client/gui/GuiTankUnit.java +++ b/src/main/java/techreborn/client/gui/GuiTankUnit.java @@ -25,19 +25,19 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.common.fluid.FluidUtil; import reborncore.common.fluid.container.FluidInstance; import reborncore.common.util.StringUtils; import techreborn.blockentity.storage.fluid.TankUnitBaseBlockEntity; -public class GuiTankUnit extends GuiBase { +public class GuiTankUnit extends GuiBase { TankUnitBaseBlockEntity tankEntity; public GuiTankUnit(int syncID, final PlayerEntity player, final TankUnitBaseBlockEntity tankEntity) { - super(player, tankEntity, tankEntity.createContainer(syncID, player)); + super(player, tankEntity, tankEntity.createScreenHandler(syncID, player)); this.tankEntity = tankEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiThermalGenerator.java b/src/main/java/techreborn/client/gui/GuiThermalGenerator.java index 8325fb63a..581450a2e 100644 --- a/src/main/java/techreborn/client/gui/GuiThermalGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiThermalGenerator.java @@ -25,17 +25,17 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.generator.advanced.ThermalGeneratorBlockEntity; -public class GuiThermalGenerator extends GuiBase { +public class GuiThermalGenerator extends GuiBase { ThermalGeneratorBlockEntity blockEntity; public GuiThermalGenerator(int syncID, final PlayerEntity player, final ThermalGeneratorBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java index e98151d9a..58ddffca8 100644 --- a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java +++ b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java @@ -27,7 +27,7 @@ package techreborn.client.gui; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.guibuilder.GuiBuilder; @@ -35,12 +35,12 @@ import reborncore.client.multiblock.Multiblock; import techreborn.blockentity.machine.multiblock.VacuumFreezerBlockEntity; import techreborn.init.TRContent; -public class GuiVacuumFreezer extends GuiBase { +public class GuiVacuumFreezer extends GuiBase { VacuumFreezerBlockEntity blockEntity; public GuiVacuumFreezer(int syncID, final PlayerEntity player, final VacuumFreezerBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/gui/GuiWireMill.java b/src/main/java/techreborn/client/gui/GuiWireMill.java index 86eeddcc9..340229d89 100644 --- a/src/main/java/techreborn/client/gui/GuiWireMill.java +++ b/src/main/java/techreborn/client/gui/GuiWireMill.java @@ -25,17 +25,17 @@ package techreborn.client.gui; import net.minecraft.entity.player.PlayerEntity; -import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.screen.builder.BuiltScreenHandler; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.blockentity.machine.tier1.WireMillBlockEntity; -public class GuiWireMill extends GuiBase { +public class GuiWireMill extends GuiBase { WireMillBlockEntity blockEntity; public GuiWireMill(int syncID, final PlayerEntity player, final WireMillBlockEntity blockEntity) { - super(player, blockEntity, blockEntity.createContainer(syncID, player)); + super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; } diff --git a/src/main/java/techreborn/client/container/ContainerDestructoPack.java b/src/main/java/techreborn/client/screen/DestructoPackScreenHandler.java similarity index 92% rename from src/main/java/techreborn/client/container/ContainerDestructoPack.java rename to src/main/java/techreborn/client/screen/DestructoPackScreenHandler.java index 2d9f4a30b..e97b603c3 100644 --- a/src/main/java/techreborn/client/container/ContainerDestructoPack.java +++ b/src/main/java/techreborn/client/screen/DestructoPackScreenHandler.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.client.container; +package techreborn.client.screen; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -32,12 +32,12 @@ import reborncore.client.gui.slots.SlotFilteredVoid; import reborncore.common.util.RebornInventory; import techreborn.init.TRContent; -public class ContainerDestructoPack extends ScreenHandler { +public class DestructoPackScreenHandler extends ScreenHandler { private PlayerEntity player; private RebornInventory inv; - public ContainerDestructoPack(int syncID, PlayerEntity player) { + public DestructoPackScreenHandler(int syncID, PlayerEntity player) { super(null, syncID); this.player = player; inv = new RebornInventory<>(1, "destructopack", 64, null); diff --git a/src/main/java/techreborn/client/container/builder/slot/FurnaceFuelSlot.java b/src/main/java/techreborn/client/screen/builder/slot/FurnaceFuelSlot.java similarity index 97% rename from src/main/java/techreborn/client/container/builder/slot/FurnaceFuelSlot.java rename to src/main/java/techreborn/client/screen/builder/slot/FurnaceFuelSlot.java index 43184fd9c..bf1b6d598 100644 --- a/src/main/java/techreborn/client/container/builder/slot/FurnaceFuelSlot.java +++ b/src/main/java/techreborn/client/screen/builder/slot/FurnaceFuelSlot.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.client.container.builder.slot; +package techreborn.client.screen.builder.slot; import net.minecraft.block.entity.AbstractFurnaceBlockEntity; import net.minecraft.inventory.Inventory;