diff --git a/src/main/java/com/raoulvdberge/refinedstorage/ClientSetup.java b/src/main/java/com/raoulvdberge/refinedstorage/ClientSetup.java index 278413502..09937b9ec 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/ClientSetup.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/ClientSetup.java @@ -1,11 +1,15 @@ package com.raoulvdberge.refinedstorage; +import com.raoulvdberge.refinedstorage.container.ControllerContainer; import com.raoulvdberge.refinedstorage.render.BakedModelOverrideRegistry; import com.raoulvdberge.refinedstorage.render.model.baked.FullbrightBakedModel; +import com.raoulvdberge.refinedstorage.screen.ControllerScreen; import com.raoulvdberge.refinedstorage.screen.FilterScreen; import net.minecraft.client.gui.ScreenManager; import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; @@ -38,6 +42,12 @@ public class ClientSetup { @SubscribeEvent public void onClientSetup(FMLClientSetupEvent e) { ScreenManager.registerFactory(RSContainers.FILTER, FilterScreen::new); + ScreenManager.registerFactory(RSContainers.CONTROLLER, new ScreenManager.IScreenFactory() { + @Override + public ControllerScreen create(ControllerContainer p_create_1_, PlayerInventory p_create_2_, ITextComponent p_create_3_) { + return new ControllerScreen(p_create_1_, p_create_2_, p_create_3_); + } + }); } @SubscribeEvent diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RS.java b/src/main/java/com/raoulvdberge/refinedstorage/RS.java index 93492ed4d..7203ac0e8 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/RS.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RS.java @@ -8,19 +8,23 @@ import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskFactoryIt import com.raoulvdberge.refinedstorage.block.ControllerBlock; import com.raoulvdberge.refinedstorage.block.MachineCasingBlock; import com.raoulvdberge.refinedstorage.block.QuartzEnrichedIronBlock; -import com.raoulvdberge.refinedstorage.container.ContainerFilter; +import com.raoulvdberge.refinedstorage.container.ControllerContainer; +import com.raoulvdberge.refinedstorage.container.FilterContainer; import com.raoulvdberge.refinedstorage.item.*; import com.raoulvdberge.refinedstorage.item.blockitem.ControllerBlockItem; import com.raoulvdberge.refinedstorage.item.group.MainItemGroup; import com.raoulvdberge.refinedstorage.network.NetworkHandler; import com.raoulvdberge.refinedstorage.recipe.UpgradeWithEnchantedBookRecipeSerializer; import com.raoulvdberge.refinedstorage.tile.ControllerTile; +import com.raoulvdberge.refinedstorage.tile.TileBase; +import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import com.raoulvdberge.refinedstorage.util.BlockUtils; import net.minecraft.block.Block; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.extensions.IForgeContainerType; @@ -76,13 +80,27 @@ public final class RS { @SubscribeEvent public void onRegisterTiles(RegistryEvent.Register> e) { - e.getRegistry().register(TileEntityType.Builder.create(() -> new ControllerTile(ControllerBlock.Type.NORMAL), RSBlocks.CONTROLLER).build(null).setRegistryName(RS.ID, "controller")); - e.getRegistry().register(TileEntityType.Builder.create(() -> new ControllerTile(ControllerBlock.Type.CREATIVE), RSBlocks.CREATIVE_CONTROLLER).build(null).setRegistryName(RS.ID, "creative_controller")); + e.getRegistry().register(registerTileDataParameters( + TileEntityType.Builder.create(() -> new ControllerTile(ControllerBlock.Type.NORMAL), RSBlocks.CONTROLLER).build(null).setRegistryName(RS.ID, "controller") + )); + + e.getRegistry().register(registerTileDataParameters( + TileEntityType.Builder.create(() -> new ControllerTile(ControllerBlock.Type.CREATIVE), RSBlocks.CREATIVE_CONTROLLER).build(null).setRegistryName(RS.ID, "creative_controller") + )); + } + + private TileEntityType registerTileDataParameters(TileEntityType t) { + TileBase tile = (TileBase) t.create(); + + tile.getDataManager().getParameters().forEach(TileDataManager::registerParameter); + + return t; } @SubscribeEvent public void onRegisterContainers(RegistryEvent.Register> e) { - e.getRegistry().register(IForgeContainerType.create((windowId, inv, data) -> new ContainerFilter(inv.player, inv.getCurrentItem(), windowId)).setRegistryName(RS.ID, "filter")); + e.getRegistry().register(IForgeContainerType.create((windowId, inv, data) -> new FilterContainer(inv.player, inv.getCurrentItem(), windowId)).setRegistryName(RS.ID, "filter")); + e.getRegistry().register(IForgeContainerType.create(((windowId, inv, data) -> new ControllerContainer(null, inv.player, windowId))).setRegistryName(RS.ID, "controller")); } @SubscribeEvent diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSContainers.java b/src/main/java/com/raoulvdberge/refinedstorage/RSContainers.java index e43077019..2a538e0ba 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/RSContainers.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RSContainers.java @@ -1,65 +1,60 @@ package com.raoulvdberge.refinedstorage; import com.raoulvdberge.refinedstorage.container.*; -import com.raoulvdberge.refinedstorage.container.factory.TileContainerFactory; import net.minecraft.inventory.container.ContainerType; -import net.minecraftforge.common.extensions.IForgeContainerType; -import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.registries.ObjectHolder; public final class RSContainers { //@ObjectHolder(RS.ID + ":constructor") - public static final ContainerType CONSTRUCTOR = null; - //@ObjectHolder(RS.ID + ":controller") - public static final ContainerType CONTROLLER = null; + public static final ContainerType CONSTRUCTOR = null; + + @ObjectHolder(RS.ID + ":controller") + public static final ContainerType CONTROLLER = null; + //@ObjectHolder(RS.ID + ":crafter") - public static final ContainerType CRAFTER = null; + public static final ContainerType CRAFTER = null; //@ObjectHolder(RS.ID + ":crafter_manager") - public static final ContainerType CRAFTER_MANAGER = null; + public static final ContainerType CRAFTER_MANAGER = null; //@ObjectHolder(RS.ID + ":crafting_monitor") - public static final ContainerType CRAFTING_MONITOR = null; + public static final ContainerType CRAFTING_MONITOR = null; //@ObjectHolder(RS.ID + ":destructor") - public static final ContainerType DESTRUCTOR = null; + public static final ContainerType DESTRUCTOR = null; //@ObjectHolder(RS.ID + ":detector") - public static final ContainerType DETECTOR = null; + public static final ContainerType DETECTOR = null; //@ObjectHolder(RS.ID + ":disk_drive") - public static final ContainerType DISK_DRIVE = null; + public static final ContainerType DISK_DRIVE = null; //@ObjectHolder(RS.ID + ":disk_manipulator") - public static final ContainerType DISK_MANIPULATOR = null; + public static final ContainerType DISK_MANIPULATOR = null; //@ObjectHolder(RS.ID + ":exporter") - public static final ContainerType EXPORTER = null; + public static final ContainerType EXPORTER = null; //@ObjectHolder(RS.ID + ":external_storage") - public static final ContainerType EXTERNAL_STORAGE = null; + public static final ContainerType EXTERNAL_STORAGE = null; @ObjectHolder(RS.ID + ":filter") - public static final ContainerType FILTER = null; + public static final ContainerType FILTER = null; //@ObjectHolder(RS.ID + ":fluid_interface") - public static final ContainerType FLUID_INTERFACE = null; + public static final ContainerType FLUID_INTERFACE = null; //@ObjectHolder(RS.ID + ":fluid_storage") - public static final ContainerType FLUID_STORAGE = null; + public static final ContainerType FLUID_STORAGE = null; //@ObjectHolder(RS.ID + ":grid") - public static final ContainerType GRID = null; + public static final ContainerType GRID = null; //@ObjectHolder(RS.ID + ":importer") - public static final ContainerType IMPORTER = null; + public static final ContainerType IMPORTER = null; //@ObjectHolder(RS.ID + ":interface") - public static final ContainerType INTERFACE = null; + public static final ContainerType INTERFACE = null; //@ObjectHolder(RS.ID + ":network_transmitter") - public static final ContainerType NETWORK_TRANSMITTER = null; + public static final ContainerType NETWORK_TRANSMITTER = null; //@ObjectHolder(RS.ID + ":reader_writer") - public static final ContainerType READER_WRITER = null; + public static final ContainerType READER_WRITER = null; //@ObjectHolder(RS.ID + ":relay") - public static final ContainerType RELAY = null; + public static final ContainerType RELAY = null; //@ObjectHolder(RS.ID + ":security_manager") - public static final ContainerType SECURITY_MANAGER = null; + public static final ContainerType SECURITY_MANAGER = null; //@ObjectHolder(RS.ID + ":storage") - public static final ContainerType STORAGE = null; + public static final ContainerType STORAGE = null; //@ObjectHolder(RS.ID + ":storage_monitor") - public static final ContainerType STORAGE_MONITOR = null; + public static final ContainerType STORAGE_MONITOR = null; //@ObjectHolder(RS.ID + ":wireless_transmitter") - public static final ContainerType WIRELESS_TRANSMITTER = null; - - public void registerContainers(final RegistryEvent.Register> event) { - event.getRegistry().register(IForgeContainerType.create(new TileContainerFactory<>((ContainerConstructor::new))).setRegistryName(RS.ID, "constructor")); - } + public static final ContainerType WIRELESS_TRANSMITTER = null; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java index 2f50a7185..94da4da0c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java @@ -5,7 +5,7 @@ import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.CoverManager; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; +import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerUpgrade; @@ -82,7 +82,7 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable, if (type == IType.ITEMS && !itemFilters.getStackInSlot(0).isEmpty()) { ItemStack item = itemFilters.getStackInSlot(0); - BlockState block = SlotFilter.getBlockState(world, pos.offset(getDirection()), item); + BlockState block = FilterSlot.getBlockState(world, pos.offset(getDirection()), item); if (block != null) { if (drop) { @@ -171,7 +171,7 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable, ItemStack took = network.extractItem(item, 1, compare, Action.SIMULATE); if (took != null) { - BlockState state = SlotFilter.getBlockState(world, front, took); + BlockState state = FilterSlot.getBlockState(world, front, took); // TODO if (state != null && world.isAirBlock(front) && state.getBlock().canPlaceBlockAt(world, front)) { if (false) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/ControllerBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/ControllerBlock.java index f4065b3a2..6a7492d3a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/ControllerBlock.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/ControllerBlock.java @@ -1,18 +1,27 @@ package com.raoulvdberge.refinedstorage.block; import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.container.ControllerContainer; import com.raoulvdberge.refinedstorage.tile.ControllerTile; import com.raoulvdberge.refinedstorage.util.BlockUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.container.INamedContainerProvider; import net.minecraft.item.ItemStack; import net.minecraft.state.EnumProperty; import net.minecraft.state.StateContainer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.Hand; import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.energy.CapabilityEnergy; @@ -102,19 +111,23 @@ public class ControllerBlock extends Block { } } - /* TODO Controller @Override - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, EnumHand hand, Direction side, float hitX, float hitY, float hitZ) { - return openNetworkGui(RSGui.CONTROLLER, player, world, pos, side); + public boolean onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult rayTraceResult) { + if (!world.isRemote) { + player.openContainer(new INamedContainerProvider() { + @Override + public ITextComponent getDisplayName() { + return new TranslationTextComponent("gui.refinedstorage." + (ControllerBlock.this.getType() == Type.CREATIVE ? "creative_" : "") + "controller"); + } + + @Nullable + @Override + public Container createMenu(int i, PlayerInventory playerInventory, PlayerEntity player) { + return new ControllerContainer((ControllerTile) world.getTileEntity(pos), player, i); + } + }); + } + + return true; } - - @Override - public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, BlockState state, int fortune) { - ItemStack stack = new ItemStack(this, 1, getMetaFromState(state)); - - stack.setTagCompound(new CompoundNBT()); - stack.getTagCompound().putInt(TileController.NBT_ENERGY, ((TileController) world.getTileEntity(pos)).getEnergy().getStored()); - - drops.add(stack); - }*/ } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerAmount.java b/src/main/java/com/raoulvdberge/refinedstorage/container/AmountContainer.java similarity index 64% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerAmount.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/AmountContainer.java index 7b6ddc485..80fba7c6a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerAmount.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/AmountContainer.java @@ -1,19 +1,19 @@ package com.raoulvdberge.refinedstorage.container; -import com.raoulvdberge.refinedstorage.container.slot.SlotDisabled; +import com.raoulvdberge.refinedstorage.container.slot.DisabledSlot; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.ItemStackHandler; -public class ContainerAmount extends ContainerBase { - public ContainerAmount(PlayerEntity player, ItemStack stack) { +public class AmountContainer extends BaseContainer { + public AmountContainer(PlayerEntity player, ItemStack stack) { super(null, null, player, 0); ItemStackHandler inventory = new ItemStackHandler(1); inventory.setStackInSlot(0, ItemHandlerHelper.copyStackWithSize(stack, 1)); - addSlot(new SlotDisabled(inventory, 0, 89, 48)); + addSlot(new DisabledSlot(inventory, 0, 89, 48)); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java b/src/main/java/com/raoulvdberge/refinedstorage/container/BaseContainer.java old mode 100755 new mode 100644 similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/BaseContainer.java index 389d86ce1..e9f57acf2 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/BaseContainer.java @@ -3,10 +3,10 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; -import com.raoulvdberge.refinedstorage.container.slot.legacy.SlotLegacyDisabled; -import com.raoulvdberge.refinedstorage.container.slot.legacy.SlotLegacyFilter; +import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; +import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.raoulvdberge.refinedstorage.container.slot.legacy.DisabledLegacySlot; +import com.raoulvdberge.refinedstorage.container.slot.legacy.FilterLegacySlot; import com.raoulvdberge.refinedstorage.container.transfer.TransferManager; import com.raoulvdberge.refinedstorage.network.MessageSlotFilterFluidUpdate; import com.raoulvdberge.refinedstorage.tile.TileBase; @@ -24,7 +24,7 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; -public abstract class ContainerBase extends Container { +public abstract class BaseContainer extends Container { @Nullable private TileBase tile; @Nullable @@ -33,10 +33,10 @@ public abstract class ContainerBase extends Container { protected TransferManager transferManager = new TransferManager(this); - private List fluidSlots = new ArrayList<>(); + private List fluidSlots = new ArrayList<>(); private List fluids = new ArrayList<>(); - public ContainerBase(@Nullable ContainerType type, @Nullable TileBase tile, PlayerEntity player, int windowId) { + public BaseContainer(@Nullable ContainerType type, @Nullable TileBase tile, PlayerEntity player, int windowId) { super(type, windowId); this.tile = tile; @@ -65,7 +65,7 @@ public abstract class ContainerBase extends Container { int y = yInventory + 4 + (3 * 18); if (isHeldItemDisabled() && i == player.inventory.currentItem) { - addSlot(new SlotLegacyDisabled(player.inventory, id, x, y)); + addSlot(new DisabledLegacySlot(player.inventory, id, x, y)); } else { addSlot(new Slot(player.inventory, id, x, y)); } @@ -82,7 +82,7 @@ public abstract class ContainerBase extends Container { } } - public List getFluidSlots() { + public List getFluidSlots() { return fluidSlots; } @@ -95,8 +95,8 @@ public abstract class ContainerBase extends Container { return ItemStack.EMPTY; } - if (slot instanceof SlotFilter) { - if (((SlotFilter) slot).isSizeAllowed()) { + if (slot instanceof FilterSlot) { + if (((FilterSlot) slot).isSizeAllowed()) { if (clickType == ClickType.QUICK_MOVE) { slot.putStack(ItemStack.EMPTY); } else if (!player.inventory.getItemStack().isEmpty()) { @@ -109,21 +109,21 @@ public abstract class ContainerBase extends Container { } return player.inventory.getItemStack(); - } else if (slot instanceof SlotFilterFluid) { - if (((SlotFilterFluid) slot).isSizeAllowed()) { + } else if (slot instanceof FluidFilterSlot) { + if (((FluidFilterSlot) slot).isSizeAllowed()) { if (clickType == ClickType.QUICK_MOVE) { - ((SlotFilterFluid) slot).onContainerClicked(ItemStack.EMPTY); + ((FluidFilterSlot) slot).onContainerClicked(ItemStack.EMPTY); } else if (!player.inventory.getItemStack().isEmpty()) { - ((SlotFilterFluid) slot).onContainerClicked(player.inventory.getItemStack()); + ((FluidFilterSlot) slot).onContainerClicked(player.inventory.getItemStack()); } } else if (player.inventory.getItemStack().isEmpty()) { - ((SlotFilterFluid) slot).onContainerClicked(ItemStack.EMPTY); + ((FluidFilterSlot) slot).onContainerClicked(ItemStack.EMPTY); } else { - ((SlotFilterFluid) slot).onContainerClicked(player.inventory.getItemStack()); + ((FluidFilterSlot) slot).onContainerClicked(player.inventory.getItemStack()); } return player.inventory.getItemStack(); - } else if (slot instanceof SlotLegacyFilter) { + } else if (slot instanceof FilterLegacySlot) { if (player.inventory.getItemStack().isEmpty()) { slot.putStack(ItemStack.EMPTY); } else if (slot.isItemValid(player.inventory.getItemStack())) { @@ -131,7 +131,7 @@ public abstract class ContainerBase extends Container { } return player.inventory.getItemStack(); - } else if (slot instanceof SlotLegacyDisabled) { + } else if (slot instanceof DisabledLegacySlot) { return ItemStack.EMPTY; } @@ -150,7 +150,7 @@ public abstract class ContainerBase extends Container { @Override public boolean canMergeSlot(ItemStack stack, Slot slot) { - if (slot instanceof SlotFilter || slot instanceof SlotFilterFluid || slot instanceof SlotLegacyFilter) { + if (slot instanceof FilterSlot || slot instanceof FluidFilterSlot || slot instanceof FilterLegacySlot) { return false; } @@ -163,9 +163,9 @@ public abstract class ContainerBase extends Container { @Override protected Slot addSlot(Slot slot) { - if (slot instanceof SlotFilterFluid) { + if (slot instanceof FluidFilterSlot) { fluids.add(null); - fluidSlots.add((SlotFilterFluid) slot); + fluidSlots.add((FluidFilterSlot) slot); } return super.addSlot(slot); @@ -181,7 +181,7 @@ public abstract class ContainerBase extends Container { if (this.getPlayer() instanceof ServerPlayerEntity) { for (int i = 0; i < this.fluidSlots.size(); ++i) { - SlotFilterFluid slot = this.fluidSlots.get(i); + FluidFilterSlot slot = this.fluidSlots.get(i); FluidStack cached = this.fluids.get(i); FluidStack actual = slot.getFluidInventory().getFluid(slot.getSlotIndex()); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ConstructorContainer.java old mode 100755 new mode 100644 similarity index 73% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerConstructor.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ConstructorContainer.java index 026b73926..b3ab9fe7a --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ConstructorContainer.java @@ -1,23 +1,23 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; +import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; +import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; import com.raoulvdberge.refinedstorage.tile.TileConstructor; import com.raoulvdberge.refinedstorage.tile.config.IType; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; -public class ContainerConstructor extends ContainerBase { - public ContainerConstructor(TileConstructor constructor, PlayerEntity player, int windowId) { +public class ConstructorContainer extends BaseContainer { + public ConstructorContainer(TileConstructor constructor, PlayerEntity player, int windowId) { super(RSContainers.CONSTRUCTOR, constructor, player, windowId); for (int i = 0; i < 4; ++i) { addSlot(new SlotItemHandler(constructor.getNode().getUpgrades(), i, 187, 6 + (i * 18))); } - addSlot(new SlotFilter(constructor.getNode().getItemFilters(), 0, 80, 20).setEnableHandler(() -> constructor.getNode().getType() == IType.ITEMS)); - addSlot(new SlotFilterFluid(constructor.getNode().getFluidFilters(), 0, 80, 20, 0).setEnableHandler(() -> constructor.getNode().getType() == IType.FLUIDS)); + addSlot(new FilterSlot(constructor.getNode().getItemFilters(), 0, 80, 20).setEnableHandler(() -> constructor.getNode().getType() == IType.ITEMS)); + addSlot(new FluidFilterSlot(constructor.getNode().getFluidFilters(), 0, 80, 20, 0).setEnableHandler(() -> constructor.getNode().getType() == IType.FLUIDS)); addPlayerInventory(8, 55); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerController.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ControllerContainer.java old mode 100755 new mode 100644 similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerController.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ControllerContainer.java index a247a33d7..6b47ed750 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ControllerContainer.java @@ -4,8 +4,8 @@ import com.raoulvdberge.refinedstorage.RSContainers; import com.raoulvdberge.refinedstorage.tile.ControllerTile; import net.minecraft.entity.player.PlayerEntity; -public class ContainerController extends ContainerBase { - public ContainerController(ControllerTile controller, PlayerEntity player, int windowId) { +public class ControllerContainer extends BaseContainer { + public ControllerContainer(ControllerTile controller, PlayerEntity player, int windowId) { super(RSContainers.CONTROLLER, controller, player, windowId); addPlayerInventory(8, 99); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/CrafterContainer.java old mode 100755 new mode 100644 similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafter.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/CrafterContainer.java index 4972d4d72..4897ce644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/CrafterContainer.java @@ -5,8 +5,8 @@ import com.raoulvdberge.refinedstorage.tile.TileCrafter; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; -public class ContainerCrafter extends ContainerBase { - public ContainerCrafter(TileCrafter crafter, PlayerEntity player, int windowId) { +public class CrafterContainer extends BaseContainer { + public CrafterContainer(TileCrafter crafter, PlayerEntity player, int windowId) { super(RSContainers.CRAFTER, crafter, player, windowId); for (int i = 0; i < 9; ++i) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafterManager.java b/src/main/java/com/raoulvdberge/refinedstorage/container/CrafterManagerContainer.java similarity index 96% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafterManager.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/CrafterManagerContainer.java index fc9e2f059..04e9c1adb 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafterManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/CrafterManagerContainer.java @@ -4,7 +4,7 @@ import com.raoulvdberge.refinedstorage.RSContainers; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPattern; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeCrafter; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeCrafterManager; -import com.raoulvdberge.refinedstorage.container.slot.SlotCrafterManager; +import com.raoulvdberge.refinedstorage.container.slot.CrafterManagerSlot; import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; import com.raoulvdberge.refinedstorage.screen.IResizableDisplay; import com.raoulvdberge.refinedstorage.screen.grid.filtering.GridFilterParser; @@ -25,7 +25,7 @@ import javax.annotation.Nullable; import java.util.*; import java.util.function.Predicate; -public class ContainerCrafterManager extends ContainerBase { +public class CrafterManagerContainer extends BaseContainer { public class CrafterManagerListener implements IContainerListener { private ServerPlayerEntity base; private boolean receivedContainerData; @@ -83,7 +83,7 @@ public class ContainerCrafterManager extends ContainerBase { return new ArrayList<>(); } - public ContainerCrafterManager(TileCrafterManager crafterManager, PlayerEntity player, IResizableDisplay display, int windowId) { + public CrafterManagerContainer(TileCrafterManager crafterManager, PlayerEntity player, IResizableDisplay display, int windowId) { super(RSContainers.CRAFTER_MANAGER, crafterManager, player, windowId); this.display = display; @@ -96,7 +96,7 @@ public class ContainerCrafterManager extends ContainerBase { for (Map.Entry> entry : crafterManager.getNode().getNetwork().getCraftingManager().getNamedContainers().entrySet()) { for (IItemHandlerModifiable handler : entry.getValue()) { for (int i = 0; i < handler.getSlots(); ++i) { - addSlot(new SlotCrafterManager(handler, i, 0, 0, true, display, this.crafterManager)); + addSlot(new CrafterManagerSlot(handler, i, 0, 0, true, display, this.crafterManager)); } } } @@ -184,7 +184,7 @@ public class ContainerCrafterManager extends ContainerBase { } } - addSlot(new SlotCrafterManager(dummy, slot, x, y, visible, display, crafterManager)); + addSlot(new CrafterManagerSlot(dummy, slot, x, y, visible, display, crafterManager)); if (visible) { foundItemsInCategory = true; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/container/CraftingMonitorContainer.java old mode 100755 new mode 100644 similarity index 95% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingMonitor.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/CraftingMonitorContainer.java index c3f24d481..c80c3a2b0 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/CraftingMonitorContainer.java @@ -12,11 +12,11 @@ import net.minecraft.item.ItemStack; import javax.annotation.Nullable; -public class ContainerCraftingMonitor extends ContainerBase implements ICraftingMonitorListener { +public class CraftingMonitorContainer extends BaseContainer implements ICraftingMonitorListener { private ICraftingMonitor craftingMonitor; private boolean addedListener; - public ContainerCraftingMonitor(ICraftingMonitor craftingMonitor, @Nullable TileCraftingMonitor craftingMonitorTile, PlayerEntity player, int windowId) { + public CraftingMonitorContainer(ICraftingMonitor craftingMonitor, @Nullable TileCraftingMonitor craftingMonitorTile, PlayerEntity player, int windowId) { super(RSContainers.CRAFTING_MONITOR, craftingMonitorTile, player, windowId); this.craftingMonitor = craftingMonitor; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingSettings.java b/src/main/java/com/raoulvdberge/refinedstorage/container/CraftingSettingsContainer.java old mode 100755 new mode 100644 similarity index 70% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingSettings.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/CraftingSettingsContainer.java index 43d50197b..60b00c18d --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingSettings.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/CraftingSettingsContainer.java @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.container; -import com.raoulvdberge.refinedstorage.container.slot.SlotDisabled; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluidDisabled; +import com.raoulvdberge.refinedstorage.container.slot.DisabledSlot; +import com.raoulvdberge.refinedstorage.container.slot.filter.DisabledFluidFilterSlot; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; import com.raoulvdberge.refinedstorage.screen.grid.stack.GridStackFluid; import com.raoulvdberge.refinedstorage.screen.grid.stack.GridStackItem; @@ -10,8 +10,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.ItemStackHandler; -public class ContainerCraftingSettings extends ContainerBase { - public ContainerCraftingSettings(PlayerEntity player, IGridStack stack) { +public class CraftingSettingsContainer extends BaseContainer { + public CraftingSettingsContainer(PlayerEntity player, IGridStack stack) { super(null, null, player, 0); if (stack instanceof GridStackFluid) { @@ -19,13 +19,13 @@ public class ContainerCraftingSettings extends ContainerBase { inventory.setFluid(0, ((GridStackFluid) stack).getStack()); - addSlot(new SlotFilterFluidDisabled(inventory, 0, 89, 48)); + addSlot(new DisabledFluidFilterSlot(inventory, 0, 89, 48)); } else if (stack instanceof GridStackItem) { ItemStackHandler handler = new ItemStackHandler(1); handler.setStackInSlot(0, ItemHandlerHelper.copyStackWithSize(((GridStackItem) stack).getStack(), 1)); - addSlot(new SlotDisabled(handler, 0, 89, 48)); + addSlot(new DisabledSlot(handler, 0, 89, 48)); } } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/container/DestructorContainer.java old mode 100755 new mode 100644 similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDestructor.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/DestructorContainer.java index 464178d7e..e4165785d --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/DestructorContainer.java @@ -1,15 +1,15 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; +import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; +import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; import com.raoulvdberge.refinedstorage.tile.TileDestructor; import com.raoulvdberge.refinedstorage.tile.config.IType; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; -public class ContainerDestructor extends ContainerBase { - public ContainerDestructor(TileDestructor destructor, PlayerEntity player, int windowId) { +public class DestructorContainer extends BaseContainer { + public DestructorContainer(TileDestructor destructor, PlayerEntity player, int windowId) { super(RSContainers.DESTRUCTOR, destructor, player, windowId); for (int i = 0; i < 4; ++i) { @@ -17,11 +17,11 @@ public class ContainerDestructor extends ContainerBase { } for (int i = 0; i < 9; ++i) { - addSlot(new SlotFilter(destructor.getNode().getItemFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> destructor.getNode().getType() == IType.ITEMS)); + addSlot(new FilterSlot(destructor.getNode().getItemFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> destructor.getNode().getType() == IType.ITEMS)); } for (int i = 0; i < 9; ++i) { - addSlot(new SlotFilterFluid(destructor.getNode().getFluidFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> destructor.getNode().getType() == IType.FLUIDS)); + addSlot(new FluidFilterSlot(destructor.getNode().getFluidFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> destructor.getNode().getType() == IType.FLUIDS)); } addPlayerInventory(8, 55); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/container/DetectorContainer.java old mode 100755 new mode 100644 similarity index 65% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDetector.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/DetectorContainer.java index 38e7d4873..55742a190 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDetector.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/DetectorContainer.java @@ -1,18 +1,18 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; +import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; +import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; import com.raoulvdberge.refinedstorage.tile.TileDetector; import com.raoulvdberge.refinedstorage.tile.config.IType; import net.minecraft.entity.player.PlayerEntity; -public class ContainerDetector extends ContainerBase { - public ContainerDetector(TileDetector detector, PlayerEntity player, int windowId) { +public class DetectorContainer extends BaseContainer { + public DetectorContainer(TileDetector detector, PlayerEntity player, int windowId) { super(RSContainers.DETECTOR, detector, player, windowId); - addSlot(new SlotFilter(detector.getNode().getItemFilters(), 0, 107, 20).setEnableHandler(() -> detector.getNode().getType() == IType.ITEMS)); - addSlot(new SlotFilterFluid(detector.getNode().getFluidFilters(), 0, 107, 20).setEnableHandler(() -> detector.getNode().getType() == IType.FLUIDS)); + addSlot(new FilterSlot(detector.getNode().getItemFilters(), 0, 107, 20).setEnableHandler(() -> detector.getNode().getType() == IType.ITEMS)); + addSlot(new FluidFilterSlot(detector.getNode().getFluidFilters(), 0, 107, 20).setEnableHandler(() -> detector.getNode().getType() == IType.FLUIDS)); addPlayerInventory(8, 55); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/container/DiskDriveContainer.java old mode 100755 new mode 100644 similarity index 75% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskDrive.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/DiskDriveContainer.java index 123cd93f4..3c8dd039b --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskDrive.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/DiskDriveContainer.java @@ -1,15 +1,15 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; +import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; +import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; import com.raoulvdberge.refinedstorage.tile.TileDiskDrive; import com.raoulvdberge.refinedstorage.tile.config.IType; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; -public class ContainerDiskDrive extends ContainerBase { - public ContainerDiskDrive(TileDiskDrive diskDrive, PlayerEntity player, int windowId) { +public class DiskDriveContainer extends BaseContainer { + public DiskDriveContainer(TileDiskDrive diskDrive, PlayerEntity player, int windowId) { super(RSContainers.DISK_DRIVE, diskDrive, player, windowId); int x = 80; @@ -20,11 +20,11 @@ public class ContainerDiskDrive extends ContainerBase { } for (int i = 0; i < 9; ++i) { - addSlot(new SlotFilter(diskDrive.getNode().getItemFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> diskDrive.getNode().getType() == IType.ITEMS)); + addSlot(new FilterSlot(diskDrive.getNode().getItemFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> diskDrive.getNode().getType() == IType.ITEMS)); } for (int i = 0; i < 9; ++i) { - addSlot(new SlotFilterFluid(diskDrive.getNode().getFluidFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> diskDrive.getNode().getType() == IType.FLUIDS)); + addSlot(new FluidFilterSlot(diskDrive.getNode().getFluidFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> diskDrive.getNode().getType() == IType.FLUIDS)); } addPlayerInventory(8, 141); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/container/DiskManipulatorContainer.java old mode 100755 new mode 100644 similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskManipulator.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/DiskManipulatorContainer.java index b58ad9cce..28c68a272 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/DiskManipulatorContainer.java @@ -1,15 +1,15 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; +import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; +import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; import com.raoulvdberge.refinedstorage.tile.TileDiskManipulator; import com.raoulvdberge.refinedstorage.tile.config.IType; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; -public class ContainerDiskManipulator extends ContainerBase { - public ContainerDiskManipulator(TileDiskManipulator diskManipulator, PlayerEntity player, int windowId) { +public class DiskManipulatorContainer extends BaseContainer { + public DiskManipulatorContainer(TileDiskManipulator diskManipulator, PlayerEntity player, int windowId) { super(RSContainers.DISK_MANIPULATOR, diskManipulator, player, windowId); for (int i = 0; i < 4; ++i) { @@ -25,11 +25,11 @@ public class ContainerDiskManipulator extends ContainerBase { } for (int i = 0; i < 9; ++i) { - addSlot(new SlotFilter(diskManipulator.getNode().getItemFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> diskManipulator.getNode().getType() == IType.ITEMS)); + addSlot(new FilterSlot(diskManipulator.getNode().getItemFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> diskManipulator.getNode().getType() == IType.ITEMS)); } for (int i = 0; i < 9; ++i) { - addSlot(new SlotFilterFluid(diskManipulator.getNode().getFluidFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> diskManipulator.getNode().getType() == IType.FLUIDS)); + addSlot(new FluidFilterSlot(diskManipulator.getNode().getFluidFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> diskManipulator.getNode().getType() == IType.FLUIDS)); } addPlayerInventory(8, 129); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ExporterContainer.java old mode 100755 new mode 100644 similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExporter.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ExporterContainer.java index f82aac733..f473866a2 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ExporterContainer.java @@ -1,15 +1,15 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; +import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; +import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; import com.raoulvdberge.refinedstorage.tile.TileExporter; import com.raoulvdberge.refinedstorage.tile.config.IType; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; -public class ContainerExporter extends ContainerBase { - public ContainerExporter(TileExporter exporter, PlayerEntity player, int windowId) { +public class ExporterContainer extends BaseContainer { + public ExporterContainer(TileExporter exporter, PlayerEntity player, int windowId) { super(RSContainers.EXPORTER, exporter, player, windowId); for (int i = 0; i < 4; ++i) { @@ -17,11 +17,11 @@ public class ContainerExporter extends ContainerBase { } for (int i = 0; i < 9; ++i) { - addSlot(new SlotFilter(exporter.getNode().getItemFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> exporter.getNode().getType() == IType.ITEMS)); + addSlot(new FilterSlot(exporter.getNode().getItemFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> exporter.getNode().getType() == IType.ITEMS)); } for (int i = 0; i < 9; ++i) { - addSlot(new SlotFilterFluid(exporter.getNode().getFluidFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> exporter.getNode().getType() == IType.FLUIDS)); + addSlot(new FluidFilterSlot(exporter.getNode().getFluidFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> exporter.getNode().getType() == IType.FLUIDS)); } addPlayerInventory(8, 55); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExternalStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ExternalStorageContainer.java old mode 100755 new mode 100644 similarity index 70% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExternalStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ExternalStorageContainer.java index 8da931738..8c8c13b78 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExternalStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ExternalStorageContainer.java @@ -1,22 +1,22 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; +import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; +import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; import com.raoulvdberge.refinedstorage.tile.TileExternalStorage; import com.raoulvdberge.refinedstorage.tile.config.IType; import net.minecraft.entity.player.PlayerEntity; -public class ContainerExternalStorage extends ContainerBase { - public ContainerExternalStorage(TileExternalStorage externalStorage, PlayerEntity player, int windowId) { +public class ExternalStorageContainer extends BaseContainer { + public ExternalStorageContainer(TileExternalStorage externalStorage, PlayerEntity player, int windowId) { super(RSContainers.EXTERNAL_STORAGE, externalStorage, player, windowId); for (int i = 0; i < 9; ++i) { - addSlot(new SlotFilter(externalStorage.getNode().getItemFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> externalStorage.getNode().getType() == IType.ITEMS)); + addSlot(new FilterSlot(externalStorage.getNode().getItemFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> externalStorage.getNode().getType() == IType.ITEMS)); } for (int i = 0; i < 9; ++i) { - addSlot(new SlotFilterFluid(externalStorage.getNode().getFluidFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> externalStorage.getNode().getType() == IType.FLUIDS)); + addSlot(new FluidFilterSlot(externalStorage.getNode().getFluidFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> externalStorage.getNode().getType() == IType.FLUIDS)); } addPlayerInventory(8, 141); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFilter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/FilterContainer.java similarity index 77% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFilter.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/FilterContainer.java index dbad44a36..65c7fb489 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFilter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/FilterContainer.java @@ -1,8 +1,8 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; +import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; +import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventoryFilter; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventoryFilterIcon; @@ -13,10 +13,10 @@ import com.raoulvdberge.refinedstorage.tile.config.IType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -public class ContainerFilter extends ContainerBase { +public class FilterContainer extends BaseContainer { private ItemStack stack; - public ContainerFilter(PlayerEntity player, ItemStack stack, int windowId) { + public FilterContainer(PlayerEntity player, ItemStack stack, int windowId) { super(RSContainers.FILTER, null, player, windowId); this.stack = stack; @@ -28,8 +28,8 @@ public class ContainerFilter extends ContainerBase { FluidInventory fluidFilter = new FluidInventoryFilter(stack); for (int i = 0; i < 27; ++i) { - addSlot(new SlotFilter(filter, i, x, y).setEnableHandler(() -> FilterItem.getType(stack) == IType.ITEMS)); - addSlot(new SlotFilterFluid(fluidFilter, i, x, y).setEnableHandler(() -> FilterItem.getType(stack) == IType.FLUIDS)); + addSlot(new FilterSlot(filter, i, x, y).setEnableHandler(() -> FilterItem.getType(stack) == IType.ITEMS)); + addSlot(new FluidFilterSlot(fluidFilter, i, x, y).setEnableHandler(() -> FilterItem.getType(stack) == IType.FLUIDS)); if ((i + 1) % 9 == 0) { x = 8; @@ -39,8 +39,8 @@ public class ContainerFilter extends ContainerBase { } } - addSlot(new SlotFilter(new ItemHandlerFilterIcon(stack), 0, 8, 117).setEnableHandler(() -> FilterItem.getType(stack) == IType.ITEMS)); - addSlot(new SlotFilterFluid(new FluidInventoryFilterIcon(stack), 0, 8, 117).setEnableHandler(() -> FilterItem.getType(stack) == IType.FLUIDS)); + addSlot(new FilterSlot(new ItemHandlerFilterIcon(stack), 0, 8, 117).setEnableHandler(() -> FilterItem.getType(stack) == IType.ITEMS)); + addSlot(new FluidFilterSlot(new FluidInventoryFilterIcon(stack), 0, 8, 117).setEnableHandler(() -> FilterItem.getType(stack) == IType.FLUIDS)); addPlayerInventory(8, 149); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidAmount.java b/src/main/java/com/raoulvdberge/refinedstorage/container/FluidAmountContainer.java similarity index 58% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidAmount.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/FluidAmountContainer.java index 3ed72b729..430a732f1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidAmount.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/FluidAmountContainer.java @@ -1,18 +1,18 @@ package com.raoulvdberge.refinedstorage.container; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluidDisabled; +import com.raoulvdberge.refinedstorage.container.slot.filter.DisabledFluidFilterSlot; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.fluids.FluidStack; -public class ContainerFluidAmount extends ContainerBase { - public ContainerFluidAmount(PlayerEntity player, FluidStack stack) { +public class FluidAmountContainer extends BaseContainer { + public FluidAmountContainer(PlayerEntity player, FluidStack stack) { super(null, null, player, 0); FluidInventory inventory = new FluidInventory(1); inventory.setFluid(0, stack); - addSlot(new SlotFilterFluidDisabled(inventory, 0, 89, 48, 0)); + addSlot(new DisabledFluidFilterSlot(inventory, 0, 89, 48, 0)); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/container/FluidInterfaceContainer.java old mode 100755 new mode 100644 similarity index 68% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidInterface.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/FluidInterfaceContainer.java index ef64c01ae..d969e2536 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/FluidInterfaceContainer.java @@ -1,14 +1,14 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; +import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; +import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; import com.raoulvdberge.refinedstorage.tile.TileFluidInterface; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; -public class ContainerFluidInterface extends ContainerBase { - public ContainerFluidInterface(TileFluidInterface fluidInterface, PlayerEntity player, int windowId) { +public class FluidInterfaceContainer extends BaseContainer { + public FluidInterfaceContainer(TileFluidInterface fluidInterface, PlayerEntity player, int windowId) { super(RSContainers.FLUID_INTERFACE, fluidInterface, player, windowId); for (int i = 0; i < 4; ++i) { @@ -16,7 +16,7 @@ public class ContainerFluidInterface extends ContainerBase { } addSlot(new SlotItemHandler(fluidInterface.getNode().getIn(), 0, 44, 32)); - addSlot(new SlotFilterFluid(fluidInterface.getNode().getOut(), 0, 116, 32, SlotFilter.FILTER_ALLOW_SIZE)); + addSlot(new FluidFilterSlot(fluidInterface.getNode().getOut(), 0, 116, 32, FilterSlot.FILTER_ALLOW_SIZE)); addPlayerInventory(8, 122); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/container/FluidStorageContainer.java old mode 100755 new mode 100644 similarity index 67% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/FluidStorageContainer.java index 6ff40ae45..2aa8802c5 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/FluidStorageContainer.java @@ -1,16 +1,16 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; +import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; import com.raoulvdberge.refinedstorage.tile.TileFluidStorage; import net.minecraft.entity.player.PlayerEntity; -public class ContainerFluidStorage extends ContainerBase { - public ContainerFluidStorage(TileFluidStorage fluidStorage, PlayerEntity player, int windowId) { +public class FluidStorageContainer extends BaseContainer { + public FluidStorageContainer(TileFluidStorage fluidStorage, PlayerEntity player, int windowId) { super(RSContainers.FLUID_STORAGE, fluidStorage, player, windowId); for (int i = 0; i < 9; ++i) { - addSlot(new SlotFilterFluid(fluidStorage.getNode().getFilters(), i, 8 + (18 * i), 20)); + addSlot(new FluidFilterSlot(fluidStorage.getNode().getFilters(), i, 8 + (18 * i), 20)); } addPlayerInventory(8, 141); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/container/GridContainer.java old mode 100755 new mode 100644 similarity index 86% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/GridContainer.java index 3ef13906d..46a940ae9 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/GridContainer.java @@ -9,13 +9,13 @@ import com.raoulvdberge.refinedstorage.api.network.grid.handler.IItemGridHandler import com.raoulvdberge.refinedstorage.api.storage.IStorageCache; import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; -import com.raoulvdberge.refinedstorage.container.slot.grid.SlotGridCrafting; -import com.raoulvdberge.refinedstorage.container.slot.grid.SlotGridCraftingResult; -import com.raoulvdberge.refinedstorage.container.slot.legacy.SlotLegacyBase; -import com.raoulvdberge.refinedstorage.container.slot.legacy.SlotLegacyDisabled; -import com.raoulvdberge.refinedstorage.container.slot.legacy.SlotLegacyFilter; +import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; +import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; +import com.raoulvdberge.refinedstorage.container.slot.grid.CraftingGridSlot; +import com.raoulvdberge.refinedstorage.container.slot.grid.ResultCraftingGridSlot; +import com.raoulvdberge.refinedstorage.container.slot.legacy.BaseLegacySlot; +import com.raoulvdberge.refinedstorage.container.slot.legacy.DisabledLegacySlot; +import com.raoulvdberge.refinedstorage.container.slot.legacy.FilterLegacySlot; import com.raoulvdberge.refinedstorage.screen.IResizableDisplay; import com.raoulvdberge.refinedstorage.tile.TileBase; import com.raoulvdberge.refinedstorage.tile.config.IType; @@ -33,16 +33,16 @@ import net.minecraftforge.items.SlotItemHandler; import javax.annotation.Nullable; import java.util.ArrayList; -public class ContainerGrid extends ContainerBase implements IGridCraftingListener { +public class GridContainer extends BaseContainer implements IGridCraftingListener { private IGrid grid; private IStorageCache cache; private IStorageCacheListener listener; private IResizableDisplay display; - private SlotGridCraftingResult craftingResultSlot; - private SlotLegacyBase patternResultSlot; + private ResultCraftingGridSlot craftingResultSlot; + private BaseLegacySlot patternResultSlot; - public ContainerGrid(IGrid grid, IResizableDisplay display, @Nullable TileBase gridTile, PlayerEntity player, int windowId) { + public GridContainer(IGrid grid, IResizableDisplay display, @Nullable TileBase gridTile, PlayerEntity player, int windowId) { super(RSContainers.GRID, gridTile, player, windowId); this.grid = grid; @@ -94,7 +94,7 @@ public class ContainerGrid extends ContainerBase implements IGridCraftingListene if (itemHandler != null) { slot.putStack(itemHandler.onShiftClick((ServerPlayerEntity) getPlayer(), stack)); - } else if (slot instanceof SlotGridCrafting && mergeItemStack(stack, 14, 14 + (9 * 4), false)) { + } else if (slot instanceof CraftingGridSlot && mergeItemStack(stack, 14, 14 + (9 * 4), false)) { slot.onSlotChanged(); // This is needed because when a grid is disconnected, @@ -142,7 +142,7 @@ public class ContainerGrid extends ContainerBase implements IGridCraftingListene int y = headerAndSlots + 4; for (int i = 0; i < 9; ++i) { - addSlot(new SlotGridCrafting(grid.getCraftingMatrix(), i, x, y)); + addSlot(new CraftingGridSlot(grid.getCraftingMatrix(), i, x, y)); x += 18; @@ -152,7 +152,7 @@ public class ContainerGrid extends ContainerBase implements IGridCraftingListene } } - addSlot(craftingResultSlot = new SlotGridCraftingResult(getPlayer(), grid, 0, 130 + 4, headerAndSlots + 22)); + addSlot(craftingResultSlot = new ResultCraftingGridSlot(getPlayer(), grid, 0, 130 + 4, headerAndSlots + 22)); } private void addPatternSlots() { @@ -169,8 +169,8 @@ public class ContainerGrid extends ContainerBase implements IGridCraftingListene int y = headerAndSlots + 4; for (int i = 0; i < 9 * 2; ++i) { - addSlot(new SlotFilter(((NetworkNodeGrid) grid).getProcessingMatrix(), i, x, y, SlotFilter.FILTER_ALLOW_SIZE).setEnableHandler(() -> ((NetworkNodeGrid) grid).isProcessingPattern() && ((NetworkNodeGrid) grid).getType() == IType.ITEMS)); - addSlot(new SlotFilterFluid(((NetworkNodeGrid) grid).getProcessingMatrixFluids(), i, x, y, SlotFilter.FILTER_ALLOW_SIZE).setEnableHandler(() -> ((NetworkNodeGrid) grid).isProcessingPattern() && ((NetworkNodeGrid) grid).getType() == IType.FLUIDS)); + addSlot(new FilterSlot(((NetworkNodeGrid) grid).getProcessingMatrix(), i, x, y, FilterSlot.FILTER_ALLOW_SIZE).setEnableHandler(() -> ((NetworkNodeGrid) grid).isProcessingPattern() && ((NetworkNodeGrid) grid).getType() == IType.ITEMS)); + addSlot(new FluidFilterSlot(((NetworkNodeGrid) grid).getProcessingMatrixFluids(), i, x, y, FilterSlot.FILTER_ALLOW_SIZE).setEnableHandler(() -> ((NetworkNodeGrid) grid).isProcessingPattern() && ((NetworkNodeGrid) grid).getType() == IType.FLUIDS)); x += 18; @@ -191,7 +191,7 @@ public class ContainerGrid extends ContainerBase implements IGridCraftingListene y = headerAndSlots + 4; for (int i = 0; i < 9; ++i) { - addSlot(new SlotLegacyFilter(grid.getCraftingMatrix(), i, x, y).setEnableHandler(() -> !((NetworkNodeGrid) grid).isProcessingPattern())); + addSlot(new FilterLegacySlot(grid.getCraftingMatrix(), i, x, y).setEnableHandler(() -> !((NetworkNodeGrid) grid).isProcessingPattern())); x += 18; @@ -201,7 +201,7 @@ public class ContainerGrid extends ContainerBase implements IGridCraftingListene } } - addSlot(patternResultSlot = (new SlotLegacyDisabled(grid.getCraftingResult(), 0, 134, headerAndSlots + 22).setEnableHandler(() -> !((NetworkNodeGrid) grid).isProcessingPattern()))); + addSlot(patternResultSlot = (new DisabledLegacySlot(grid.getCraftingResult(), 0, 134, headerAndSlots + 22).setEnableHandler(() -> !((NetworkNodeGrid) grid).isProcessingPattern()))); } public IGrid getGrid() { @@ -213,7 +213,7 @@ public class ContainerGrid extends ContainerBase implements IGridCraftingListene for (int i = 0; i < inventorySlots.size(); ++i) { Slot slot = inventorySlots.get(i); - if (slot instanceof SlotGridCrafting || slot == craftingResultSlot || slot == patternResultSlot) { + if (slot instanceof CraftingGridSlot || slot == craftingResultSlot || slot == patternResultSlot) { for (IContainerListener listener : new ArrayList()) { // TODO AT for listeners // @Volatile: We can't use IContainerListener#sendSlotContents since ServerPlayerEntity blocks SlotCrafting changes... if (listener instanceof ServerPlayerEntity) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ImporterContainer.java old mode 100755 new mode 100644 similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerImporter.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ImporterContainer.java index 1939ff70b..8352bb018 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerImporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ImporterContainer.java @@ -1,15 +1,15 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; +import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; +import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; import com.raoulvdberge.refinedstorage.tile.TileImporter; import com.raoulvdberge.refinedstorage.tile.config.IType; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; -public class ContainerImporter extends ContainerBase { - public ContainerImporter(TileImporter importer, PlayerEntity player, int windowId) { +public class ImporterContainer extends BaseContainer { + public ImporterContainer(TileImporter importer, PlayerEntity player, int windowId) { super(RSContainers.IMPORTER, importer, player, windowId); for (int i = 0; i < 4; ++i) { @@ -17,11 +17,11 @@ public class ContainerImporter extends ContainerBase { } for (int i = 0; i < 9; ++i) { - addSlot(new SlotFilter(importer.getNode().getItemFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> importer.getNode().getType() == IType.ITEMS)); + addSlot(new FilterSlot(importer.getNode().getItemFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> importer.getNode().getType() == IType.ITEMS)); } for (int i = 0; i < 9; ++i) { - addSlot(new SlotFilterFluid(importer.getNode().getFluidFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> importer.getNode().getType() == IType.FLUIDS)); + addSlot(new FluidFilterSlot(importer.getNode().getFluidFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> importer.getNode().getType() == IType.FLUIDS)); } addPlayerInventory(8, 55); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/container/InterfaceContainer.java old mode 100755 new mode 100644 similarity index 70% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerInterface.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/InterfaceContainer.java index 33ff2d52c..1e49bd972 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/InterfaceContainer.java @@ -1,14 +1,14 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.SlotOutput; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; +import com.raoulvdberge.refinedstorage.container.slot.OutputSlot; +import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; import com.raoulvdberge.refinedstorage.tile.TileInterface; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; -public class ContainerInterface extends ContainerBase { - public ContainerInterface(TileInterface tile, PlayerEntity player, int windowId) { +public class InterfaceContainer extends BaseContainer { + public InterfaceContainer(TileInterface tile, PlayerEntity player, int windowId) { super(RSContainers.INTERFACE, tile, player, windowId); for (int i = 0; i < 9; ++i) { @@ -16,11 +16,11 @@ public class ContainerInterface extends ContainerBase { } for (int i = 0; i < 9; ++i) { - addSlot(new SlotFilter(tile.getNode().getExportFilterItems(), i, 8 + (18 * i), 54, SlotFilter.FILTER_ALLOW_SIZE)); + addSlot(new FilterSlot(tile.getNode().getExportFilterItems(), i, 8 + (18 * i), 54, FilterSlot.FILTER_ALLOW_SIZE)); } for (int i = 0; i < 9; ++i) { - addSlot(new SlotOutput(tile.getNode().getExportItems(), i, 8 + (18 * i), 100)); + addSlot(new OutputSlot(tile.getNode().getExportItems(), i, 8 + (18 * i), 100)); } for (int i = 0; i < 4; ++i) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/NetworkTransmitterContainer.java old mode 100755 new mode 100644 similarity index 83% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerNetworkTransmitter.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/NetworkTransmitterContainer.java index 54bf6f6ec..7e7f3036a --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/NetworkTransmitterContainer.java @@ -5,8 +5,8 @@ import com.raoulvdberge.refinedstorage.tile.TileNetworkTransmitter; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; -public class ContainerNetworkTransmitter extends ContainerBase { - public ContainerNetworkTransmitter(TileNetworkTransmitter networkTransmitter, PlayerEntity player, int windowId) { +public class NetworkTransmitterContainer extends BaseContainer { + public NetworkTransmitterContainer(TileNetworkTransmitter networkTransmitter, PlayerEntity player, int windowId) { super(RSContainers.NETWORK_TRANSMITTER, networkTransmitter, player, windowId); addSlot(new SlotItemHandler(networkTransmitter.getNode().getNetworkCard(), 0, 8, 20)); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerReaderWriter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ReaderWriterContainer.java old mode 100755 new mode 100644 similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerReaderWriter.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/ReaderWriterContainer.java index 6b4747b85..d8e6ba2c6 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerReaderWriter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ReaderWriterContainer.java @@ -7,11 +7,11 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.node.IGuiReaderWriter; import com.raoulvdberge.refinedstorage.tile.TileBase; import net.minecraft.entity.player.PlayerEntity; -public class ContainerReaderWriter extends ContainerBase implements IReaderWriterListener { +public class ReaderWriterContainer extends BaseContainer implements IReaderWriterListener { private IGuiReaderWriter readerWriter; private boolean addedListener; - public ContainerReaderWriter(IGuiReaderWriter readerWriter, TileBase tile, PlayerEntity player, int windowId) { + public ReaderWriterContainer(IGuiReaderWriter readerWriter, TileBase tile, PlayerEntity player, int windowId) { super(RSContainers.READER_WRITER, tile, player, windowId); this.readerWriter = readerWriter; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerRelay.java b/src/main/java/com/raoulvdberge/refinedstorage/container/RelayContainer.java old mode 100755 new mode 100644 similarity index 73% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerRelay.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/RelayContainer.java index 847f8c559..b1ace0697 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerRelay.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/RelayContainer.java @@ -4,8 +4,8 @@ import com.raoulvdberge.refinedstorage.RSContainers; import com.raoulvdberge.refinedstorage.tile.TileRelay; import net.minecraft.entity.player.PlayerEntity; -public class ContainerRelay extends ContainerBase { - public ContainerRelay(TileRelay relay, PlayerEntity player, int windowId) { +public class RelayContainer extends BaseContainer { + public RelayContainer(TileRelay relay, PlayerEntity player, int windowId) { super(RSContainers.RELAY, relay, player, windowId); addPlayerInventory(8, 50); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerSecurityManager.java b/src/main/java/com/raoulvdberge/refinedstorage/container/SecurityManagerContainer.java old mode 100755 new mode 100644 similarity index 89% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerSecurityManager.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/SecurityManagerContainer.java index 3c82e4b78..dd6b36373 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerSecurityManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/SecurityManagerContainer.java @@ -5,8 +5,8 @@ import com.raoulvdberge.refinedstorage.tile.TileSecurityManager; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; -public class ContainerSecurityManager extends ContainerBase { - public ContainerSecurityManager(TileSecurityManager securityManager, PlayerEntity player, int windowId) { +public class SecurityManagerContainer extends BaseContainer { + public SecurityManagerContainer(TileSecurityManager securityManager, PlayerEntity player, int windowId) { super(RSContainers.SECURITY_MANAGER, securityManager, player, windowId); int x = 8; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/container/StorageContainer.java old mode 100755 new mode 100644 similarity index 66% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorage.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/StorageContainer.java index 64eaba9ac..a5d311250 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/StorageContainer.java @@ -1,16 +1,16 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; +import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; import com.raoulvdberge.refinedstorage.tile.TileStorage; import net.minecraft.entity.player.PlayerEntity; -public class ContainerStorage extends ContainerBase { - public ContainerStorage(TileStorage storage, PlayerEntity player, int windowId) { +public class StorageContainer extends BaseContainer { + public StorageContainer(TileStorage storage, PlayerEntity player, int windowId) { super(RSContainers.STORAGE, storage, player, windowId); for (int i = 0; i < 9; ++i) { - addSlot(new SlotFilter(storage.getNode().getFilters(), i, 8 + (18 * i), 20)); + addSlot(new FilterSlot(storage.getNode().getFilters(), i, 8 + (18 * i), 20)); } addPlayerInventory(8, 141); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorageMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/container/StorageMonitorContainer.java similarity index 66% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorageMonitor.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/StorageMonitorContainer.java index fb9bc4f9a..469c404c7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorageMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/StorageMonitorContainer.java @@ -1,15 +1,15 @@ package com.raoulvdberge.refinedstorage.container; import com.raoulvdberge.refinedstorage.RSContainers; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; +import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; import com.raoulvdberge.refinedstorage.tile.TileStorageMonitor; import net.minecraft.entity.player.PlayerEntity; -public class ContainerStorageMonitor extends ContainerBase { - public ContainerStorageMonitor(TileStorageMonitor storageMonitor, PlayerEntity player, int windowId) { +public class StorageMonitorContainer extends BaseContainer { + public StorageMonitorContainer(TileStorageMonitor storageMonitor, PlayerEntity player, int windowId) { super(RSContainers.STORAGE_MONITOR, storageMonitor, player, windowId); - addSlot(new SlotFilter(storageMonitor.getNode().getItemFilters(), 0, 80, 20)); + addSlot(new FilterSlot(storageMonitor.getNode().getItemFilters(), 0, 80, 20)); addPlayerInventory(8, 55); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/WirelessTransmitterContainer.java old mode 100755 new mode 100644 similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/container/ContainerWirelessTransmitter.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/WirelessTransmitterContainer.java index 6bbefc8ba..2a8633189 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/WirelessTransmitterContainer.java @@ -5,8 +5,8 @@ import com.raoulvdberge.refinedstorage.tile.TileWirelessTransmitter; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.items.SlotItemHandler; -public class ContainerWirelessTransmitter extends ContainerBase { - public ContainerWirelessTransmitter(TileWirelessTransmitter wirelessTransmitter, PlayerEntity player, int windowId) { +public class WirelessTransmitterContainer extends BaseContainer { + public WirelessTransmitterContainer(TileWirelessTransmitter wirelessTransmitter, PlayerEntity player, int windowId) { super(RSContainers.WIRELESS_TRANSMITTER, wirelessTransmitter, player, windowId); for (int i = 0; i < 4; ++i) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/factory/TileContainerFactory.java b/src/main/java/com/raoulvdberge/refinedstorage/container/factory/TileContainerFactory.java deleted file mode 100644 index cee84fc96..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/factory/TileContainerFactory.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.raoulvdberge.refinedstorage.container.factory; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.Container; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.network.IContainerFactory; - -public class TileContainerFactory implements IContainerFactory { - public interface Provider { - C create(T tile, PlayerEntity player, int windowId); - } - - private Provider provider; - - public TileContainerFactory(Provider provider) { - this.provider = provider; - } - - @Override - public C create(int windowId, PlayerInventory inv, PacketBuffer data) { - int x = data.readInt(); - int y = data.readInt(); - int z = data.readInt(); - - return this.provider.create((T) inv.player.world.getTileEntity(new BlockPos(x, y, z)), inv.player, windowId); - } -} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotBase.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/BaseSlot.java similarity index 73% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotBase.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/slot/BaseSlot.java index 455b19e57..f943f04a8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/BaseSlot.java @@ -5,14 +5,14 @@ import net.minecraftforge.items.SlotItemHandler; import java.util.function.Supplier; -public class SlotBase extends SlotItemHandler { +public class BaseSlot extends SlotItemHandler { private Supplier enableHandler = () -> true; - public SlotBase(IItemHandler itemHandler, int inventoryIndex, int x, int y) { + public BaseSlot(IItemHandler itemHandler, int inventoryIndex, int x, int y) { super(itemHandler, inventoryIndex, x, y); } - public SlotBase setEnableHandler(Supplier enableHandler) { + public BaseSlot setEnableHandler(Supplier enableHandler) { this.enableHandler = enableHandler; return this; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotCrafterManager.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/CrafterManagerSlot.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotCrafterManager.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/slot/CrafterManagerSlot.java index 45de5b17d..3562589c3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotCrafterManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/CrafterManagerSlot.java @@ -4,12 +4,12 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeCrafterMa import com.raoulvdberge.refinedstorage.screen.IResizableDisplay; import net.minecraftforge.items.IItemHandler; -public class SlotCrafterManager extends SlotBase { +public class CrafterManagerSlot extends BaseSlot { private boolean visible; private NetworkNodeCrafterManager crafterManager; private IResizableDisplay display; - public SlotCrafterManager(IItemHandler itemHandler, int inventoryIndex, int x, int y, boolean visible, IResizableDisplay display, NetworkNodeCrafterManager crafterManager) { + public CrafterManagerSlot(IItemHandler itemHandler, int inventoryIndex, int x, int y, boolean visible, IResizableDisplay display, NetworkNodeCrafterManager crafterManager) { super(itemHandler, inventoryIndex, x, y); this.visible = visible; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotDisabled.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/DisabledSlot.java old mode 100755 new mode 100644 similarity index 76% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotDisabled.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/slot/DisabledSlot.java index 8496d7018..c4e6d6289 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotDisabled.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/DisabledSlot.java @@ -5,8 +5,8 @@ import net.minecraftforge.items.IItemHandler; import javax.annotation.Nonnull; -public class SlotDisabled extends SlotBase { - public SlotDisabled(IItemHandler itemHandler, int inventoryIndex, int x, int y) { +public class DisabledSlot extends BaseSlot { + public DisabledSlot(IItemHandler itemHandler, int inventoryIndex, int x, int y) { super(itemHandler, inventoryIndex, x, y); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotOutput.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/OutputSlot.java old mode 100755 new mode 100644 similarity index 76% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotOutput.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/slot/OutputSlot.java index 2bca6c5b7..0024b1184 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotOutput.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/OutputSlot.java @@ -5,8 +5,8 @@ import net.minecraftforge.items.IItemHandler; import javax.annotation.Nonnull; -public class SlotOutput extends SlotBase { - public SlotOutput(IItemHandler inventory, int inventoryIndex, int x, int y) { +public class OutputSlot extends BaseSlot { + public OutputSlot(IItemHandler inventory, int inventoryIndex, int x, int y) { super(inventory, inventoryIndex, x, y); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/SlotFilterFluidDisabled.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/DisabledFluidFilterSlot.java similarity index 72% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/SlotFilterFluidDisabled.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/DisabledFluidFilterSlot.java index f8b4fc843..53143fea9 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/SlotFilterFluidDisabled.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/DisabledFluidFilterSlot.java @@ -5,12 +5,12 @@ import net.minecraft.item.ItemStack; import javax.annotation.Nonnull; -public class SlotFilterFluidDisabled extends SlotFilterFluid { - public SlotFilterFluidDisabled(FluidInventory inventory, int inventoryIndex, int x, int y, int flags) { +public class DisabledFluidFilterSlot extends FluidFilterSlot { + public DisabledFluidFilterSlot(FluidInventory inventory, int inventoryIndex, int x, int y, int flags) { super(inventory, inventoryIndex, x, y, flags); } - public SlotFilterFluidDisabled(FluidInventory inventory, int inventoryIndex, int x, int y) { + public DisabledFluidFilterSlot(FluidInventory inventory, int inventoryIndex, int x, int y) { super(inventory, inventoryIndex, x, y); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/SlotFilter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/FilterSlot.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/SlotFilter.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/FilterSlot.java index 8768a6ba2..c76079875 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/SlotFilter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/FilterSlot.java @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.container.slot.filter; -import com.raoulvdberge.refinedstorage.container.slot.SlotBase; +import com.raoulvdberge.refinedstorage.container.slot.BaseSlot; import net.minecraft.block.BlockState; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; @@ -14,19 +14,19 @@ import net.minecraftforge.items.IItemHandler; import javax.annotation.Nonnull; import javax.annotation.Nullable; -public class SlotFilter extends SlotBase { +public class FilterSlot extends BaseSlot { public static final int FILTER_ALLOW_SIZE = 1; public static final int FILTER_ALLOW_BLOCKS = 2; private int flags = 0; - public SlotFilter(IItemHandler handler, int inventoryIndex, int x, int y, int flags) { + public FilterSlot(IItemHandler handler, int inventoryIndex, int x, int y, int flags) { super(handler, inventoryIndex, x, y); this.flags = flags; } - public SlotFilter(IItemHandler handler, int inventoryIndex, int x, int y) { + public FilterSlot(IItemHandler handler, int inventoryIndex, int x, int y) { this(handler, inventoryIndex, x, y, 0); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/SlotFilterFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/FluidFilterSlot.java similarity index 82% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/SlotFilterFluid.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/FluidFilterSlot.java index 094bd5698..0e23641a8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/SlotFilterFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/filter/FluidFilterSlot.java @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.container.slot.filter; -import com.raoulvdberge.refinedstorage.container.slot.SlotBase; +import com.raoulvdberge.refinedstorage.container.slot.BaseSlot; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; @@ -8,20 +8,20 @@ import net.minecraftforge.items.ItemStackHandler; import javax.annotation.Nonnull; -public class SlotFilterFluid extends SlotBase { +public class FluidFilterSlot extends BaseSlot { public static final int FILTER_ALLOW_SIZE = 1; private int flags; private FluidInventory fluidInventory; - public SlotFilterFluid(FluidInventory inventory, int inventoryIndex, int x, int y, int flags) { + public FluidFilterSlot(FluidInventory inventory, int inventoryIndex, int x, int y, int flags) { super(new ItemStackHandler(inventory.getSlots()), inventoryIndex, x, y); this.flags = flags; this.fluidInventory = inventory; } - public SlotFilterFluid(FluidInventory inventory, int inventoryIndex, int x, int y) { + public FluidFilterSlot(FluidInventory inventory, int inventoryIndex, int x, int y) { this(inventory, inventoryIndex, x, y, 0); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/SlotGridCrafting.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/CraftingGridSlot.java similarity index 67% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/SlotGridCrafting.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/CraftingGridSlot.java index 9ef1be430..9079d835a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/SlotGridCrafting.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/CraftingGridSlot.java @@ -3,8 +3,8 @@ package com.raoulvdberge.refinedstorage.container.slot.grid; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.Slot; -public class SlotGridCrafting extends Slot { - public SlotGridCrafting(IInventory inventory, int inventoryIndex, int x, int y) { +public class CraftingGridSlot extends Slot { + public CraftingGridSlot(IInventory inventory, int inventoryIndex, int x, int y) { super(inventory, inventoryIndex, x, y); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/SlotGridCraftingResult.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/ResultCraftingGridSlot.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/SlotGridCraftingResult.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/ResultCraftingGridSlot.java index 13ae084b8..3d3a40083 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/SlotGridCraftingResult.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/grid/ResultCraftingGridSlot.java @@ -7,10 +7,10 @@ import net.minecraft.item.ItemStack; import javax.annotation.Nonnull; -public class SlotGridCraftingResult extends CraftingResultSlot { +public class ResultCraftingGridSlot extends CraftingResultSlot { private IGrid grid; - public SlotGridCraftingResult(PlayerEntity player, IGrid grid, int inventoryIndex, int x, int y) { + public ResultCraftingGridSlot(PlayerEntity player, IGrid grid, int inventoryIndex, int x, int y) { super(player, grid.getCraftingMatrix(), grid.getCraftingResult(), inventoryIndex, x, y); this.grid = grid; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/SlotLegacyBase.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/BaseLegacySlot.java similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/SlotLegacyBase.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/BaseLegacySlot.java index e2c8f90ed..41213cb5d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/SlotLegacyBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/BaseLegacySlot.java @@ -5,14 +5,14 @@ import net.minecraft.inventory.container.Slot; import java.util.function.Supplier; -public class SlotLegacyBase extends Slot { +public class BaseLegacySlot extends Slot { private Supplier enableHandler = () -> true; - public SlotLegacyBase(IInventory inventory, int inventoryIndex, int x, int y) { + public BaseLegacySlot(IInventory inventory, int inventoryIndex, int x, int y) { super(inventory, inventoryIndex, x, y); } - public SlotLegacyBase setEnableHandler(Supplier enableHandler) { + public BaseLegacySlot setEnableHandler(Supplier enableHandler) { this.enableHandler = enableHandler; return this; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/SlotLegacyDisabled.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/DisabledLegacySlot.java similarity index 74% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/SlotLegacyDisabled.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/DisabledLegacySlot.java index 9a6faf7df..8ea9b6591 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/SlotLegacyDisabled.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/DisabledLegacySlot.java @@ -5,8 +5,8 @@ import net.minecraft.item.ItemStack; import javax.annotation.Nonnull; -public class SlotLegacyDisabled extends SlotLegacyBase { - public SlotLegacyDisabled(IInventory inventory, int inventoryIndex, int x, int y) { +public class DisabledLegacySlot extends BaseLegacySlot { + public DisabledLegacySlot(IInventory inventory, int inventoryIndex, int x, int y) { super(inventory, inventoryIndex, x, y); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/SlotLegacyFilter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/FilterLegacySlot.java similarity index 85% rename from src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/SlotLegacyFilter.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/FilterLegacySlot.java index faf122e3d..b39ec8788 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/SlotLegacyFilter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/legacy/FilterLegacySlot.java @@ -7,8 +7,8 @@ import net.minecraft.item.ItemStack; import javax.annotation.Nonnull; -public class SlotLegacyFilter extends SlotLegacyBase { - public SlotLegacyFilter(IInventory inventory, int inventoryIndex, int x, int y) { +public class FilterLegacySlot extends BaseLegacySlot { + public FilterLegacySlot(IInventory inventory, int inventoryIndex, int x, int y) { super(inventory, inventoryIndex, x, y); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperFilter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/FilterInventoryWrapper.java similarity index 64% rename from src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperFilter.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/transfer/FilterInventoryWrapper.java index fc50aa6a0..790b8dc3c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperFilter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/FilterInventoryWrapper.java @@ -7,14 +7,14 @@ import net.minecraftforge.items.IItemHandlerModifiable; import java.util.function.Supplier; -class InventoryWrapperFilter implements IInventoryWrapper { - private InventoryWrapperFilterItem item; - private InventoryWrapperFilterFluid fluid; +class FilterInventoryWrapper implements IInventoryWrapper { + private ItemFilterInventoryWrapper item; + private FluidFilterInventoryWrapper fluid; private Supplier typeGetter; - InventoryWrapperFilter(IItemHandlerModifiable itemTo, FluidInventory fluidTo, Supplier typeGetter) { - this.item = new InventoryWrapperFilterItem(itemTo); - this.fluid = new InventoryWrapperFilterFluid(fluidTo); + FilterInventoryWrapper(IItemHandlerModifiable itemTo, FluidInventory fluidTo, Supplier typeGetter) { + this.item = new ItemFilterInventoryWrapper(itemTo); + this.fluid = new FluidFilterInventoryWrapper(fluidTo); this.typeGetter = typeGetter; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperFilterFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/FluidFilterInventoryWrapper.java similarity index 91% rename from src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperFilterFluid.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/transfer/FluidFilterInventoryWrapper.java index c5d565360..d7d057c9e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperFilterFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/FluidFilterInventoryWrapper.java @@ -8,10 +8,10 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; -class InventoryWrapperFilterFluid implements IInventoryWrapper { +class FluidFilterInventoryWrapper implements IInventoryWrapper { private FluidInventory filterInv; - InventoryWrapperFilterFluid(FluidInventory filterInv) { + FluidFilterInventoryWrapper(FluidInventory filterInv) { this.filterInv = filterInv; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperInventory.java b/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryInventoryWrapper.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperInventory.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryInventoryWrapper.java index 914f5c304..f9796d551 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperInventory.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryInventoryWrapper.java @@ -10,11 +10,11 @@ import net.minecraftforge.items.wrapper.RangedWrapper; import java.util.Objects; -class InventoryWrapperInventory implements IInventoryWrapper { +class InventoryInventoryWrapper implements IInventoryWrapper { private IInventory inventory; private IItemHandler wrapper; - InventoryWrapperInventory(IInventory inventory) { + InventoryInventoryWrapper(IInventory inventory) { this.inventory = inventory; if (inventory instanceof PlayerInventory) { @@ -40,7 +40,7 @@ class InventoryWrapperInventory implements IInventoryWrapper { return false; } - InventoryWrapperInventory that = (InventoryWrapperInventory) o; + InventoryInventoryWrapper that = (InventoryInventoryWrapper) o; return Objects.equals(inventory, that.inventory); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperFilterItem.java b/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/ItemFilterInventoryWrapper.java similarity index 88% rename from src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperFilterItem.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/transfer/ItemFilterInventoryWrapper.java index a4ff78937..94721f6f7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperFilterItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/ItemFilterInventoryWrapper.java @@ -5,10 +5,10 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemHandlerHelper; -class InventoryWrapperFilterItem implements IInventoryWrapper { +class ItemFilterInventoryWrapper implements IInventoryWrapper { private IItemHandlerModifiable filterInv; - InventoryWrapperFilterItem(IItemHandlerModifiable filterInv) { + ItemFilterInventoryWrapper(IItemHandlerModifiable filterInv) { this.filterInv = filterInv; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperItemHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/ItemHandlerInventoryWrapper.java similarity index 80% rename from src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperItemHandler.java rename to src/main/java/com/raoulvdberge/refinedstorage/container/transfer/ItemHandlerInventoryWrapper.java index 87f8f6d7b..38ff4cf0a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/InventoryWrapperItemHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/ItemHandlerInventoryWrapper.java @@ -6,10 +6,10 @@ import net.minecraftforge.items.ItemHandlerHelper; import java.util.Objects; -class InventoryWrapperItemHandler implements IInventoryWrapper { +class ItemHandlerInventoryWrapper implements IInventoryWrapper { private IItemHandler handler; - InventoryWrapperItemHandler(IItemHandler handler) { + ItemHandlerInventoryWrapper(IItemHandler handler) { this.handler = handler; } @@ -28,7 +28,7 @@ class InventoryWrapperItemHandler implements IInventoryWrapper { return false; } - InventoryWrapperItemHandler that = (InventoryWrapperItemHandler) o; + ItemHandlerInventoryWrapper that = (ItemHandlerInventoryWrapper) o; return Objects.equals(handler, that.handler); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/TransferManager.java b/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/TransferManager.java index 335a01ac6..669c5a857 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/TransferManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/transfer/TransferManager.java @@ -38,27 +38,27 @@ public class TransferManager { } public void addTransfer(IInventory from, IItemHandler to) { - addTransfer(new InventoryWrapperInventory(from), new InventoryWrapperItemHandler(to)); + addTransfer(new InventoryInventoryWrapper(from), new ItemHandlerInventoryWrapper(to)); } public void addTransfer(IInventory from, IInventory to) { - addTransfer(new InventoryWrapperInventory(from), new InventoryWrapperInventory(to)); + addTransfer(new InventoryInventoryWrapper(from), new InventoryInventoryWrapper(to)); } public void addFilterTransfer(IInventory from, IItemHandlerModifiable itemTo, FluidInventory fluidTo, Supplier typeGetter) { - addTransfer(new InventoryWrapperInventory(from), new InventoryWrapperFilter(itemTo, fluidTo, typeGetter)); + addTransfer(new InventoryInventoryWrapper(from), new FilterInventoryWrapper(itemTo, fluidTo, typeGetter)); } public void addItemFilterTransfer(IInventory from, IItemHandlerModifiable to) { - addTransfer(new InventoryWrapperInventory(from), new InventoryWrapperFilterItem(to)); + addTransfer(new InventoryInventoryWrapper(from), new ItemFilterInventoryWrapper(to)); } public void addFluidFilterTransfer(IInventory from, FluidInventory to) { - addTransfer(new InventoryWrapperInventory(from), new InventoryWrapperFilterFluid(to)); + addTransfer(new InventoryInventoryWrapper(from), new FluidFilterInventoryWrapper(to)); } public void addTransfer(IItemHandler from, IInventory to) { - addTransfer(new InventoryWrapperItemHandler(from), new InventoryWrapperInventory(to)); + addTransfer(new ItemHandlerInventoryWrapper(from), new InventoryInventoryWrapper(to)); } public void addBiTransfer(IInventory from, IItemHandler to) { @@ -77,9 +77,9 @@ public class TransferManager { IInventoryWrapper key; if (slot instanceof SlotItemHandler) { - key = new InventoryWrapperItemHandler(((SlotItemHandler) slot).getItemHandler()); + key = new ItemHandlerInventoryWrapper(((SlotItemHandler) slot).getItemHandler()); } else { - key = new InventoryWrapperInventory(slot.inventory); + key = new InventoryInventoryWrapper(slot.inventory); } List toList = fromToMap.get(key); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/FilterItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/FilterItem.java index 16032cc10..780927ddf 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/FilterItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/FilterItem.java @@ -4,7 +4,7 @@ import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSItems; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.api.util.IFilter; -import com.raoulvdberge.refinedstorage.container.ContainerFilter; +import com.raoulvdberge.refinedstorage.container.FilterContainer; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventoryFilter; import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilterItems; import com.raoulvdberge.refinedstorage.tile.config.IType; @@ -65,7 +65,7 @@ public class FilterItem extends Item { @Nullable @Override public Container createMenu(int windowId, PlayerInventory inventory, PlayerEntity player) { - return new ContainerFilter(player, inventory.getCurrentItem(), windowId); + return new FilterContainer(player, inventory.getCurrentItem(), windowId); } }); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCrafterManagerRequestSlotData.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCrafterManagerRequestSlotData.java.off index 5551ee1a0..bbd1834a0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCrafterManagerRequestSlotData.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCrafterManagerRequestSlotData.java.off @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.network; -import com.raoulvdberge.refinedstorage.container.ContainerCrafterManager; +import com.raoulvdberge.refinedstorage.container.CrafterManagerContainer; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.IContainerListener; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCrafterManagerSlotSizes.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCrafterManagerSlotSizes.java.off index 81ca4d277..1cb58c7f1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCrafterManagerSlotSizes.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCrafterManagerSlotSizes.java.off @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.network; import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.ContainerCrafterManager; +import com.raoulvdberge.refinedstorage.container.CrafterManagerContainer; import com.raoulvdberge.refinedstorage.gui.GuiBase; import com.raoulvdberge.refinedstorage.gui.GuiCrafterManager; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCraftingMonitorCancel.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCraftingMonitorCancel.java.off index 81dc03b9b..3dfc0ec97 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCraftingMonitorCancel.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageCraftingMonitorCancel.java.off @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.network; -import com.raoulvdberge.refinedstorage.container.ContainerCraftingMonitor; +import com.raoulvdberge.refinedstorage.container.CraftingMonitorContainer; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraftforge.fml.common.network.ByteBufUtils; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageFilterUpdate.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageFilterUpdate.java index 99d234faf..c057911bd 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageFilterUpdate.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageFilterUpdate.java @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.network; -import com.raoulvdberge.refinedstorage.container.ContainerFilter; +import com.raoulvdberge.refinedstorage.container.FilterContainer; import com.raoulvdberge.refinedstorage.item.FilterItem; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.PacketBuffer; @@ -45,12 +45,12 @@ public class MessageFilterUpdate { ctx.get().enqueueWork(() -> { PlayerEntity player = ctx.get().getSender(); - if (player != null && player.openContainer instanceof ContainerFilter) { - FilterItem.setCompare(((ContainerFilter) player.openContainer).getStack(), message.compare); - FilterItem.setMode(((ContainerFilter) player.openContainer).getStack(), message.mode); - FilterItem.setModFilter(((ContainerFilter) player.openContainer).getStack(), message.modFilter); - FilterItem.setName(((ContainerFilter) player.openContainer).getStack(), message.name); - FilterItem.setType(((ContainerFilter) player.openContainer).getStack(), message.type); + if (player != null && player.openContainer instanceof FilterContainer) { + FilterItem.setCompare(((FilterContainer) player.openContainer).getStack(), message.compare); + FilterItem.setMode(((FilterContainer) player.openContainer).getStack(), message.mode); + FilterItem.setModFilter(((FilterContainer) player.openContainer).getStack(), message.modFilter); + FilterItem.setName(((FilterContainer) player.openContainer).getStack(), message.name); + FilterItem.setType(((FilterContainer) player.openContainer).getStack(), message.type); } }); ctx.get().setPacketHandled(true); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridClear.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridClear.java.off index 05eccfd6b..11342b924 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridClear.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridClear.java.off @@ -5,7 +5,7 @@ import com.raoulvdberge.refinedstorage.api.network.grid.IGridNetworkAware; import com.raoulvdberge.refinedstorage.api.network.security.Permission; import com.raoulvdberge.refinedstorage.api.util.Action; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; -import com.raoulvdberge.refinedstorage.container.ContainerGrid; +import com.raoulvdberge.refinedstorage.container.GridContainer; import com.raoulvdberge.refinedstorage.util.StackUtils; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingPreview.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingPreview.java.off index 7d9b5d399..f7c7a26ef 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingPreview.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingPreview.java.off @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.network; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.container.ContainerGrid; +import com.raoulvdberge.refinedstorage.container.GridContainer; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingStart.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingStart.java.off index 55a22b38d..f5427998b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingStart.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingStart.java.off @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.network; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.container.ContainerGrid; +import com.raoulvdberge.refinedstorage.container.GridContainer; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidInsertHeld.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidInsertHeld.java.off index 39c17830f..f7fa64f0f 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidInsertHeld.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidInsertHeld.java.off @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.network; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.container.ContainerGrid; +import com.raoulvdberge.refinedstorage.container.GridContainer; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidPull.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidPull.java.off index b6e0010c3..f48c83874 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidPull.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridFluidPull.java.off @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.network; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.container.ContainerGrid; +import com.raoulvdberge.refinedstorage.container.GridContainer; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemInsertHeld.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemInsertHeld.java.off index 230ed1352..372458f8c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemInsertHeld.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemInsertHeld.java.off @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.network; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.container.ContainerGrid; +import com.raoulvdberge.refinedstorage.container.GridContainer; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemPull.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemPull.java.off index 5d4cd5e61..91c9fa6c6 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemPull.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridItemPull.java.off @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.network; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.container.ContainerGrid; +import com.raoulvdberge.refinedstorage.container.GridContainer; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridProcessingTransfer.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridProcessingTransfer.java.off index e5e63020a..012b72ec4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridProcessingTransfer.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridProcessingTransfer.java.off @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.network; import com.raoulvdberge.refinedstorage.api.network.grid.GridType; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; -import com.raoulvdberge.refinedstorage.container.ContainerGrid; +import com.raoulvdberge.refinedstorage.container.GridContainer; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; import com.raoulvdberge.refinedstorage.util.StackUtils; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridSettingsUpdate.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridSettingsUpdate.java.off index 92ba2aea1..ffcd7b70e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridSettingsUpdate.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridSettingsUpdate.java.off @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.network; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; -import com.raoulvdberge.refinedstorage.container.ContainerGrid; +import com.raoulvdberge.refinedstorage.container.GridContainer; import com.raoulvdberge.refinedstorage.tile.grid.WirelessGrid; import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGrid; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridTransfer.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridTransfer.java.off index 0958f0859..4f2a91e58 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridTransfer.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridTransfer.java.off @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.network; import com.raoulvdberge.refinedstorage.api.network.grid.GridType; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; -import com.raoulvdberge.refinedstorage.container.ContainerGrid; +import com.raoulvdberge.refinedstorage.container.GridContainer; import com.raoulvdberge.refinedstorage.util.StackUtils; import io.netty.buffer.ByteBuf; import mezz.jei.api.gui.IGuiIngredient; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageReaderWriterChannelAdd.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageReaderWriterChannelAdd.java.off index 03f4bd7eb..58dfd4f2b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageReaderWriterChannelAdd.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageReaderWriterChannelAdd.java.off @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.network; -import com.raoulvdberge.refinedstorage.container.ContainerReaderWriter; +import com.raoulvdberge.refinedstorage.container.ReaderWriterContainer; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraftforge.fml.common.network.ByteBufUtils; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageReaderWriterChannelRemove.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageReaderWriterChannelRemove.java.off index ec897dea2..0b00bff45 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageReaderWriterChannelRemove.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageReaderWriterChannelRemove.java.off @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.network; -import com.raoulvdberge.refinedstorage.container.ContainerReaderWriter; +import com.raoulvdberge.refinedstorage.container.ReaderWriterContainer; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraftforge.fml.common.network.ByteBufUtils; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterFluidSetAmount.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterFluidSetAmount.java.off index 30944220a..27ccc06c1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterFluidSetAmount.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterFluidSetAmount.java.off @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.network; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; +import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory; import com.raoulvdberge.refinedstorage.util.StackUtils; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterFluidUpdate.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterFluidUpdate.java index b9e006d06..aff95a0d4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterFluidUpdate.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterFluidUpdate.java @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.network; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; +import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; import com.raoulvdberge.refinedstorage.screen.BaseScreen; import net.minecraft.inventory.container.Slot; import net.minecraft.network.PacketBuffer; @@ -32,8 +32,8 @@ public class MessageSlotFilterFluidUpdate { if (message.containerSlot >= 0 && message.containerSlot < gui.getContainer().inventorySlots.size()) { Slot slot = gui.getContainer().getSlot(message.containerSlot); - if (slot instanceof SlotFilterFluid) { - ((SlotFilterFluid) slot).getFluidInventory().setFluid(slot.getSlotIndex(), message.stack); + if (slot instanceof FluidFilterSlot) { + ((FluidFilterSlot) slot).getFluidInventory().setFluid(slot.getSlotIndex(), message.stack); } } }); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterSet.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterSet.java.off index 33077202a..04437d5ec 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterSet.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterSet.java.off @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.network; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter; -import com.raoulvdberge.refinedstorage.container.slot.legacy.SlotLegacyFilter; +import com.raoulvdberge.refinedstorage.container.slot.filter.FilterSlot; +import com.raoulvdberge.refinedstorage.container.slot.legacy.FilterLegacySlot; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterSetFluid.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterSetFluid.java.off index f37f5dad5..845ecb479 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterSetFluid.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterSetFluid.java.off @@ -1,6 +1,6 @@ package com.raoulvdberge.refinedstorage.network; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; +import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; import com.raoulvdberge.refinedstorage.util.StackUtils; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageTileDataParameter.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageTileDataParameter.java similarity index 52% rename from src/main/java/com/raoulvdberge/refinedstorage/network/MessageTileDataParameter.java.off rename to src/main/java/com/raoulvdberge/refinedstorage/network/MessageTileDataParameter.java index 7ad8d48db..f4a9079d3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageTileDataParameter.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageTileDataParameter.java @@ -2,29 +2,24 @@ package com.raoulvdberge.refinedstorage.network; import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import io.netty.buffer.ByteBuf; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.fml.network.NetworkEvent; -public class MessageTileDataParameter implements IMessage, IMessageHandler { +import java.util.function.Supplier; + +public class MessageTileDataParameter { private TileEntity tile; private TileDataParameter parameter; private boolean initial; - public MessageTileDataParameter() { - } - public MessageTileDataParameter(TileEntity tile, TileDataParameter parameter, boolean initial) { this.tile = tile; this.parameter = parameter; this.initial = initial; } - @Override - public void fromBytes(ByteBuf buf) { + public static MessageTileDataParameter decode(PacketBuffer buf) { int id = buf.readInt(); boolean initial = buf.readBoolean(); @@ -32,23 +27,23 @@ public class MessageTileDataParameter implements IMessage, IMessageHandler ctx) { + ctx.get().setPacketHandled(true); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageTileDataParameterUpdate.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageTileDataParameterUpdate.java new file mode 100644 index 000000000..d8fda6fdb --- /dev/null +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageTileDataParameterUpdate.java @@ -0,0 +1,59 @@ +package com.raoulvdberge.refinedstorage.network; + +import com.raoulvdberge.refinedstorage.container.BaseContainer; +import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; +import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; +import net.minecraft.inventory.container.Container; +import net.minecraft.network.PacketBuffer; +import net.minecraftforge.fml.network.NetworkEvent; + +import java.util.function.BiConsumer; +import java.util.function.Supplier; + +public class MessageTileDataParameterUpdate { + private TileDataParameter parameter; + private Object value; + + public MessageTileDataParameterUpdate(TileDataParameter parameter, Object value) { + this.parameter = parameter; + this.value = value; + } + + public static MessageTileDataParameterUpdate decode(PacketBuffer buf) { + int id = buf.readInt(); + + TileDataParameter parameter = TileDataManager.getParameter(id); + Object value = null; + + if (parameter != null) { + try { + value = parameter.getSerializer().read(buf); + } catch (Exception e) { + // NO OP + } + } + + return new MessageTileDataParameterUpdate(parameter, value); + } + + public static void encode(MessageTileDataParameterUpdate message, PacketBuffer buf) { + buf.writeInt(message.parameter.getId()); + + message.parameter.getSerializer().write(buf, message.value); + } + + public static void handle(MessageTileDataParameterUpdate message, Supplier ctx) { + ctx.get().enqueueWork(() -> { + Container c = ctx.get().getSender().openContainer; + + if (c instanceof BaseContainer) { + BiConsumer consumer = message.parameter.getValueConsumer(); + + if (consumer != null) { + consumer.accept(((BaseContainer) c).getTile(), message.value); + } + } + }); + ctx.get().setPacketHandled(true); + } +} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageTileDataParameterUpdate.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageTileDataParameterUpdate.java.off deleted file mode 100644 index fcc6a4519..000000000 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageTileDataParameterUpdate.java.off +++ /dev/null @@ -1,60 +0,0 @@ -package com.raoulvdberge.refinedstorage.network; - -import com.raoulvdberge.refinedstorage.container.ContainerBase; -import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.inventory.Container; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; - -import java.util.function.BiConsumer; - -public class MessageTileDataParameterUpdate extends MessageHandlerPlayerToServer implements IMessage { - private TileDataParameter parameter; - private Object value; - - public MessageTileDataParameterUpdate() { - } - - public MessageTileDataParameterUpdate(TileDataParameter parameter, Object value) { - this.parameter = parameter; - this.value = value; - } - - @Override - public void fromBytes(ByteBuf buf) { - int id = buf.readInt(); - - parameter = TileDataManager.getParameter(id); - - if (parameter != null) { - try { - value = parameter.getSerializer().read(new PacketBuffer(buf)); - } catch (Exception e) { - // NO OP - } - } - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(parameter.getId()); - - parameter.getSerializer().write((PacketBuffer) buf, value); - } - - @Override - public void handle(MessageTileDataParameterUpdate message, ServerPlayerEntity player) { - Container c = player.openContainer; - - if (c instanceof ContainerBase) { - BiConsumer consumer = message.parameter.getValueConsumer(); - - if (consumer != null) { - consumer.accept(((ContainerBase) c).getTile(), message.value); - } - } - } -} diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageWirelessCraftingMonitorSettings.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageWirelessCraftingMonitorSettings.java.off index 474a69d77..91fc710db 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageWirelessCraftingMonitorSettings.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageWirelessCraftingMonitorSettings.java.off @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.network; import com.google.common.base.Optional; -import com.raoulvdberge.refinedstorage.container.ContainerCraftingMonitor; +import com.raoulvdberge.refinedstorage.container.CraftingMonitorContainer; import com.raoulvdberge.refinedstorage.item.ItemWirelessCraftingMonitor; import com.raoulvdberge.refinedstorage.tile.craftingmonitor.WirelessCraftingMonitor; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageWirelessFluidGridSettingsUpdate.java.off b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageWirelessFluidGridSettingsUpdate.java.off index 253952983..ebce518e8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageWirelessFluidGridSettingsUpdate.java.off +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageWirelessFluidGridSettingsUpdate.java.off @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.network; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; -import com.raoulvdberge.refinedstorage.container.ContainerGrid; +import com.raoulvdberge.refinedstorage.container.GridContainer; import com.raoulvdberge.refinedstorage.tile.grid.WirelessFluidGrid; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/NetworkHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/network/NetworkHandler.java index 9b936cff6..966b002d7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/NetworkHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/NetworkHandler.java @@ -24,6 +24,8 @@ public class NetworkHandler { handler.registerMessage(id++, MessageStorageDiskSizeResponse.class, MessageStorageDiskSizeResponse::encode, MessageStorageDiskSizeResponse::decode, MessageStorageDiskSizeResponse::handle); handler.registerMessage(id++, MessageFilterUpdate.class, MessageFilterUpdate::encode, MessageFilterUpdate::decode, MessageFilterUpdate::handle); handler.registerMessage(id++, MessageSlotFilterFluidUpdate.class, MessageSlotFilterFluidUpdate::encode, MessageSlotFilterFluidUpdate::decode, MessageSlotFilterFluidUpdate::handle); + handler.registerMessage(id++, MessageTileDataParameter.class, MessageTileDataParameter::encode, MessageTileDataParameter::decode, MessageTileDataParameter::handle); + handler.registerMessage(id++, MessageTileDataParameterUpdate.class, MessageTileDataParameterUpdate::encode, MessageTileDataParameterUpdate::decode, MessageTileDataParameterUpdate::handle); } public void sendToServer(Object message) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/BaseScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/BaseScreen.java index a8d1aaa38..6abf4ff86 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/BaseScreen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/BaseScreen.java @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.screen; import com.mojang.blaze3d.platform.GlStateManager; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.apiimpl.API; -import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid; +import com.raoulvdberge.refinedstorage.container.slot.filter.FluidFilterSlot; import com.raoulvdberge.refinedstorage.render.FluidRenderer; import com.raoulvdberge.refinedstorage.screen.widget.CheckBoxWidget; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButton; @@ -106,13 +106,13 @@ public abstract class BaseScreen extends ContainerScreen for (int i = 0; i < this.container.inventorySlots.size(); ++i) { Slot slot = container.inventorySlots.get(i); - if (slot.isEnabled() && slot instanceof SlotFilterFluid) { - FluidStack stack = ((SlotFilterFluid) slot).getFluidInventory().getFluid(slot.getSlotIndex()); + if (slot.isEnabled() && slot instanceof FluidFilterSlot) { + FluidStack stack = ((FluidFilterSlot) slot).getFluidInventory().getFluid(slot.getSlotIndex()); if (!stack.isEmpty()) { FluidRenderer.INSTANCE.render(guiLeft + slot.xPos, guiTop + slot.yPos, stack); - if (((SlotFilterFluid) slot).isSizeAllowed()) { + if (((FluidFilterSlot) slot).isSizeAllowed()) { renderQuantity(guiLeft + slot.xPos, guiTop + slot.yPos, API.instance().getQuantityFormatter().formatInBucketForm(stack.getAmount())); GL11.glDisable(GL11.GL_LIGHTING); @@ -142,8 +142,8 @@ public abstract class BaseScreen extends ContainerScreen for (int i = 0; i < this.container.inventorySlots.size(); ++i) { Slot slot = container.inventorySlots.get(i); - if (slot.isEnabled() && slot instanceof SlotFilterFluid) { - FluidStack stack = ((SlotFilterFluid) slot).getFluidInventory().getFluid(slot.getSlotIndex()); + if (slot.isEnabled() && slot instanceof FluidFilterSlot) { + FluidStack stack = ((FluidFilterSlot) slot).getFluidInventory().getFluid(slot.getSlotIndex()); if (!stack.isEmpty() && RenderUtils.inBounds(slot.xPos, slot.yPos, 17, 17, mouseX, mouseY)) { renderTooltip(mouseX, mouseY, stack.getDisplayName().getFormattedText()); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiController.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/ControllerScreen.java similarity index 60% rename from src/main/java/com/raoulvdberge/refinedstorage/screen/GuiController.java rename to src/main/java/com/raoulvdberge/refinedstorage/screen/ControllerScreen.java index ac3e4163d..dd4769477 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/ControllerScreen.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.screen; import com.mojang.blaze3d.platform.GlStateManager; import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.ContainerController; +import com.raoulvdberge.refinedstorage.container.ControllerContainer; import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.tile.ClientNode; @@ -11,27 +11,24 @@ import com.raoulvdberge.refinedstorage.util.RenderUtils; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.util.text.ITextComponent; import java.util.List; -public class GuiController extends BaseScreen { +public class ControllerScreen extends BaseScreen { private static final int VISIBLE_ROWS = 2; - private ControllerTile controller; - - private int barX = 8; - private int barY = 20; - private int barWidth = 16; - private int barHeight = 59; + private static final int ENERGY_BAR_X = 8; + private static final int ENERGY_BAR_Y = 20; + private static final int ENERGY_BAR_WIDTH = 16; + private static final int ENERGY_BAR_HEIGHT = 59; private ScrollbarWidget scrollbar; - public GuiController(ContainerController container, ControllerTile controller, PlayerInventory inventory) { - super(container, 176, 181, inventory, null); + public ControllerScreen(ControllerContainer container, PlayerInventory inventory, ITextComponent title) { + super(container, 176, 181, inventory, title); - this.controller = controller; - - this.scrollbar = new ScrollbarWidget(157, 20, 12, 59); + this.scrollbar = new ScrollbarWidget(this, 157, 20, 12, 59); } @Override @@ -41,10 +38,8 @@ public class GuiController extends BaseScreen { @Override public void tick(int x, int y) { - if (scrollbar != null) { - scrollbar.setEnabled(getRows() > VISIBLE_ROWS); - scrollbar.setMaxOffset(getRows() - VISIBLE_ROWS); - } + scrollbar.setEnabled(getRows() > VISIBLE_ROWS); + scrollbar.setMaxOffset(getRows() - VISIBLE_ROWS); } @Override @@ -53,26 +48,50 @@ public class GuiController extends BaseScreen { blit(x, y, 0, 0, xSize, ySize); - int barHeightNew = ControllerTile.getEnergyScaled(ControllerTile.ENERGY_STORED.getValue(), ControllerTile.ENERGY_CAPACITY.getValue(), barHeight); + int energyBarHeightNew = ControllerTile.getEnergyScaled(ControllerTile.ENERGY_STORED.getValue(), ControllerTile.ENERGY_CAPACITY.getValue(), ENERGY_BAR_HEIGHT); - blit(x + barX, y + barY + barHeight - barHeightNew, 178, barHeight - barHeightNew, barWidth, barHeightNew); + blit(x + ENERGY_BAR_X, y + ENERGY_BAR_Y + ENERGY_BAR_HEIGHT - energyBarHeightNew, 178, ENERGY_BAR_HEIGHT - energyBarHeightNew, ENERGY_BAR_WIDTH, energyBarHeightNew); + + scrollbar.render(); + } + + @Override + public void mouseMoved(double mx, double my) { + scrollbar.mouseMoved(mx, my); + + super.mouseMoved(mx, my); + } + + @Override + public boolean mouseClicked(double mx, double my, int button) { + return scrollbar.mouseClicked(mx, my, button) || super.mouseClicked(mx, my, button); + } + + @Override + public boolean mouseReleased(double mx, double my, int button) { + return scrollbar.mouseReleased(mx, my, button) || super.mouseReleased(mx, my, button); + } + + @Override + public boolean mouseScrolled(double x, double y, double delta) { + return this.scrollbar.mouseScrolled(x, y, delta) || super.mouseScrolled(x, y, delta); } @Override public void renderForeground(int mouseX, int mouseY) { - // TODO renderString(7, 7, I18n.format("gui.refinedstorage:controller." + controller.getControllerType().getId())); + renderString(7, 7, title.getFormattedText()); renderString(7, 87, I18n.format("container.inventory")); int x = 33; int y = 26; - int slot = scrollbar != null ? (scrollbar.getOffset() * 2) : 0; + int slot = scrollbar.getOffset() * 2; RenderHelper.enableGUIStandardItemLighting(); List nodes = ControllerTile.NODES.getValue(); - ClientNode nodeHovering = null; + ClientNode hoveringNode = null; for (int i = 0; i < 4; ++i) { if (slot < nodes.size()) { @@ -95,7 +114,7 @@ public class GuiController extends BaseScreen { GlStateManager.popMatrix(); if (RenderUtils.inBounds(x, y, 16, 16, mouseX, mouseY)) { - nodeHovering = node; + hoveringNode = node; } } @@ -109,11 +128,11 @@ public class GuiController extends BaseScreen { slot++; } - if (nodeHovering != null) { - renderTooltip(mouseX, mouseY, I18n.format("misc.refinedstorage.energy_usage_minimal", nodeHovering.getEnergyUsage())); + if (hoveringNode != null) { + renderTooltip(mouseX, mouseY, I18n.format("misc.refinedstorage.energy_usage_minimal", hoveringNode.getEnergyUsage())); } - if (RenderUtils.inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { + if (RenderUtils.inBounds(ENERGY_BAR_X, ENERGY_BAR_Y, ENERGY_BAR_WIDTH, ENERGY_BAR_HEIGHT, mouseX, mouseY)) { renderTooltip(mouseX, mouseY, I18n.format("misc.refinedstorage.energy_usage", ControllerTile.ENERGY_USAGE.getValue()) + "\n" + I18n.format("misc.refinedstorage.energy_stored", ControllerTile.ENERGY_STORED.getValue(), ControllerTile.ENERGY_CAPACITY.getValue())); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/FilterScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/FilterScreen.java index 02505ac06..fdeda59b2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/FilterScreen.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/FilterScreen.java @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.api.util.IFilter; -import com.raoulvdberge.refinedstorage.container.ContainerFilter; +import com.raoulvdberge.refinedstorage.container.FilterContainer; import com.raoulvdberge.refinedstorage.item.FilterItem; import com.raoulvdberge.refinedstorage.network.MessageFilterUpdate; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.FilterTypeSideButton; @@ -16,7 +16,7 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.config.GuiCheckBox; import org.lwjgl.glfw.GLFW; -public class FilterScreen extends BaseScreen { +public class FilterScreen extends BaseScreen { private ItemStack stack; private int compare; @@ -29,7 +29,7 @@ public class FilterScreen extends BaseScreen { private Button modeButton; private TextFieldWidget nameField; - public FilterScreen(ContainerFilter container, PlayerInventory inventory, ITextComponent title) { + public FilterScreen(FilterContainer container, PlayerInventory inventory, ITextComponent title) { super(container, 176, 231, inventory, title); this.stack = container.getStack(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiAmount.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiAmount.java index f3352594b..a6e24e60a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiAmount.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiAmount.java @@ -1,18 +1,18 @@ package com.raoulvdberge.refinedstorage.screen; import com.google.common.primitives.Ints; -import com.raoulvdberge.refinedstorage.container.ContainerAmount; +import com.raoulvdberge.refinedstorage.container.AmountContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -public class GuiAmount extends GuiAmountSpecifying { +public class GuiAmount extends GuiAmountSpecifying { private int containerSlot; private ItemStack stack; private int maxAmount; public GuiAmount(BaseScreen parent, PlayerEntity player, int containerSlot, ItemStack stack, int maxAmount) { - super(parent, new ContainerAmount(player, stack), 172, 99, player.inventory); + super(parent, new AmountContainer(player, stack), 172, 99, player.inventory); this.containerSlot = containerSlot; this.stack = stack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiConstructor.java index 50c9c9b68..68ee71127 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiConstructor.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.container.ContainerConstructor; +import com.raoulvdberge.refinedstorage.container.ConstructorContainer; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCompare; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonConstuctorDrop; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; @@ -11,8 +11,8 @@ import com.raoulvdberge.refinedstorage.tile.TileConstructor; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; -public class GuiConstructor extends BaseScreen { - public GuiConstructor(ContainerConstructor container, PlayerInventory inventory) { +public class GuiConstructor extends BaseScreen { + public GuiConstructor(ConstructorContainer container, PlayerInventory inventory) { super(container, 211, 137, inventory, null); // TODO TextComponent } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCrafter.java index 0692d3e5e..05fe7526c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCrafter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCrafter.java @@ -1,14 +1,14 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.ContainerCrafter; +import com.raoulvdberge.refinedstorage.container.CrafterContainer; import com.raoulvdberge.refinedstorage.tile.TileCrafter; import com.raoulvdberge.refinedstorage.util.RenderUtils; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; -public class GuiCrafter extends BaseScreen { - public GuiCrafter(ContainerCrafter container, PlayerInventory inventory) { +public class GuiCrafter extends BaseScreen { + public GuiCrafter(CrafterContainer container, PlayerInventory inventory) { super(container, 211, 137, inventory, null); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCrafterManager.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCrafterManager.java index 72078462e..616aff60d 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCrafterManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCrafterManager.java @@ -4,8 +4,8 @@ import com.mojang.blaze3d.platform.GlStateManager; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeCrafterManager; -import com.raoulvdberge.refinedstorage.container.ContainerCrafterManager; -import com.raoulvdberge.refinedstorage.container.slot.SlotCrafterManager; +import com.raoulvdberge.refinedstorage.container.CrafterManagerContainer; +import com.raoulvdberge.refinedstorage.container.slot.CrafterManagerSlot; import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget; import com.raoulvdberge.refinedstorage.screen.widget.SearchWidget; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCrafterManagerSearchBoxMode; @@ -21,8 +21,8 @@ import net.minecraft.inventory.container.Slot; import java.util.Map; // TODO @MouseTweaksDisableWheelTweak -public class GuiCrafterManager extends BaseScreen implements IResizableDisplay { - private ContainerCrafterManager container; +public class GuiCrafterManager extends BaseScreen implements IResizableDisplay { + private CrafterManagerContainer container; private NetworkNodeCrafterManager crafterManager; private ScrollbarWidget scrollbar; @@ -38,7 +38,7 @@ public class GuiCrafterManager extends BaseScreen imple return crafterManager; } - public void setContainer(ContainerCrafterManager container) { + public void setContainer(CrafterManagerContainer container) { this.container = container; } @@ -101,7 +101,7 @@ public class GuiCrafterManager extends BaseScreen imple addSideButton(new SideButtonCrafterManagerSearchBoxMode(this)); addSideButton(new SideButtonGridSize(this, () -> crafterManager.getSize(), size -> TileDataManager.setParameter(TileCrafterManager.SIZE, size))); - this.scrollbar = new ScrollbarWidget(174, getTopHeight(), 12, (getVisibleRows() * 18) - 2); + this.scrollbar = new ScrollbarWidget(this, 174, getTopHeight(), 12, (getVisibleRows() * 18) - 2); this.scrollbar.addListener((oldOffset, newOffset) -> { if (container != null) { container.initSlots(null); @@ -151,7 +151,7 @@ public class GuiCrafterManager extends BaseScreen imple if (container != null && crafterManager.isActive()) { for (Slot slot : container.inventorySlots) { - if (slot instanceof SlotCrafterManager && slot.isEnabled()) { + if (slot instanceof CrafterManagerSlot && slot.isEnabled()) { blit(x + slot.xPos - 1, y + slot.yPos - 1, 0, 193, 18, 18); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCraftingMonitor.java index 18b53f2b5..7e1a277dc 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCraftingMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCraftingMonitor.java @@ -12,7 +12,7 @@ import com.raoulvdberge.refinedstorage.api.util.IFilter; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.render.CraftingMonitorElementDrawers; import com.raoulvdberge.refinedstorage.apiimpl.render.ElementDrawers; -import com.raoulvdberge.refinedstorage.container.ContainerCraftingMonitor; +import com.raoulvdberge.refinedstorage.container.CraftingMonitorContainer; import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget; import com.raoulvdberge.refinedstorage.screen.widget.TabListWidget; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; @@ -32,7 +32,7 @@ import java.util.List; import java.util.Optional; import java.util.UUID; -public class GuiCraftingMonitor extends BaseScreen { +public class GuiCraftingMonitor extends BaseScreen { public static class CraftingMonitorTask implements IGridTab { private UUID id; private ICraftingRequestInfo requested; @@ -102,7 +102,7 @@ public class GuiCraftingMonitor extends BaseScreen { private IElementDrawers drawers = new CraftingMonitorElementDrawers(this, font, ITEM_WIDTH, ITEM_HEIGHT); - public GuiCraftingMonitor(ContainerCraftingMonitor container, ICraftingMonitor craftingMonitor, PlayerInventory inventory) { + public GuiCraftingMonitor(CraftingMonitorContainer container, ICraftingMonitor craftingMonitor, PlayerInventory inventory) { super(container, 254, 201, inventory, null); this.craftingMonitor = craftingMonitor; @@ -154,7 +154,7 @@ public class GuiCraftingMonitor extends BaseScreen { public void init(int x, int y) { this.tabs.init(xSize); - this.scrollbar = new ScrollbarWidget(235, 20, 12, 149); + this.scrollbar = new ScrollbarWidget(this, 235, 20, 12, 149); if (craftingMonitor.getRedstoneModeParameter() != null) { addSideButton(new SideButtonRedstoneMode(this, craftingMonitor.getRedstoneModeParameter())); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCraftingPreview.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCraftingPreview.java index b74ba60d4..c69891623 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCraftingPreview.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCraftingPreview.java @@ -63,7 +63,7 @@ public class GuiCraftingPreview extends BaseScreen { this.quantity = quantity; this.fluids = fluids; - this.scrollbar = new ScrollbarWidget(235, 20, 12, 149); + this.scrollbar = new ScrollbarWidget(this, 235, 20, 12, 149); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDestructor.java index fc7b94b87..b20ccb246 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDestructor.java @@ -2,14 +2,14 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.container.ContainerDestructor; +import com.raoulvdberge.refinedstorage.container.DestructorContainer; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.*; import com.raoulvdberge.refinedstorage.tile.TileDestructor; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; -public class GuiDestructor extends BaseScreen { - public GuiDestructor(ContainerDestructor container, PlayerInventory playerInventory) { +public class GuiDestructor extends BaseScreen { + public GuiDestructor(DestructorContainer container, PlayerInventory playerInventory) { super(container, 211, 137, playerInventory, null); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDetector.java index 34601ee50..65ccafcf6 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDetector.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDetector.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.container.ContainerDetector; +import com.raoulvdberge.refinedstorage.container.DetectorContainer; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCompare; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonDetectorMode; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonType; @@ -11,10 +11,10 @@ import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; -public class GuiDetector extends BaseScreen { +public class GuiDetector extends BaseScreen { private TextFieldWidget amount; - public GuiDetector(ContainerDetector container, PlayerInventory inventory) { + public GuiDetector(DetectorContainer container, PlayerInventory inventory) { super(container, 176, 137, inventory, null); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDiskManipulator.java index 7de6c4cac..7a2cfc901 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDiskManipulator.java @@ -2,14 +2,14 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.container.ContainerDiskManipulator; +import com.raoulvdberge.refinedstorage.container.DiskManipulatorContainer; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.*; import com.raoulvdberge.refinedstorage.tile.TileDiskManipulator; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; -public class GuiDiskManipulator extends BaseScreen { - public GuiDiskManipulator(ContainerDiskManipulator container, PlayerInventory playerInventory) { +public class GuiDiskManipulator extends BaseScreen { + public GuiDiskManipulator(DiskManipulatorContainer container, PlayerInventory playerInventory) { super(container, 211, 211, playerInventory, null); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiExporter.java index 1730a6569..8bb6319fd 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiExporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiExporter.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.container.ContainerExporter; +import com.raoulvdberge.refinedstorage.container.ExporterContainer; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCompare; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonType; @@ -10,8 +10,8 @@ import com.raoulvdberge.refinedstorage.tile.TileExporter; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; -public class GuiExporter extends BaseScreen { - public GuiExporter(ContainerExporter container, PlayerInventory playerInventory) { +public class GuiExporter extends BaseScreen { + public GuiExporter(ExporterContainer container, PlayerInventory playerInventory) { super(container, 211, 137, playerInventory, null); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiFluidAmount.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiFluidAmount.java index 3c6f350b7..28ca7d53c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiFluidAmount.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiFluidAmount.java @@ -1,18 +1,18 @@ package com.raoulvdberge.refinedstorage.screen; import com.google.common.primitives.Ints; -import com.raoulvdberge.refinedstorage.container.ContainerFluidAmount; +import com.raoulvdberge.refinedstorage.container.FluidAmountContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.fluids.FluidStack; -public class GuiFluidAmount extends GuiAmountSpecifying { +public class GuiFluidAmount extends GuiAmountSpecifying { private int containerSlot; private FluidStack stack; private int maxAmount; public GuiFluidAmount(BaseScreen parent, PlayerEntity player, int containerSlot, FluidStack stack, int maxAmount) { - super(parent, new ContainerFluidAmount(player, stack), 172, 99, player.inventory); + super(parent, new FluidAmountContainer(player, stack), 172, 99, player.inventory); this.containerSlot = containerSlot; this.stack = stack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiFluidInterface.java index 0e9c9bc2f..67edffbf3 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiFluidInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiFluidInterface.java @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeFluidInterface; -import com.raoulvdberge.refinedstorage.container.ContainerFluidInterface; +import com.raoulvdberge.refinedstorage.container.FluidInterfaceContainer; import com.raoulvdberge.refinedstorage.render.FluidRenderer; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.tile.TileFluidInterface; @@ -12,10 +12,10 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.TextFormatting; -public class GuiFluidInterface extends BaseScreen { +public class GuiFluidInterface extends BaseScreen { private static final FluidRenderer TANK_RENDERER = new FluidRenderer(NetworkNodeFluidInterface.TANK_CAPACITY, 12, 47); - public GuiFluidInterface(ContainerFluidInterface container, PlayerInventory inventory) { + public GuiFluidInterface(FluidInterfaceContainer container, PlayerInventory inventory) { super(container, 211, 204, inventory, null); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiImporter.java index 2669be5b4..b431a62d7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiImporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiImporter.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.container.ContainerImporter; +import com.raoulvdberge.refinedstorage.container.ImporterContainer; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCompare; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonMode; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; @@ -11,8 +11,8 @@ import com.raoulvdberge.refinedstorage.tile.TileImporter; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; -public class GuiImporter extends BaseScreen { - public GuiImporter(ContainerImporter container, PlayerInventory inventory) { +public class GuiImporter extends BaseScreen { + public GuiImporter(ImporterContainer container, PlayerInventory inventory) { super(container, 211, 137, inventory, null); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiInterface.java index ec7bf85d8..9763bb397 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiInterface.java @@ -2,15 +2,15 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.container.ContainerInterface; +import com.raoulvdberge.refinedstorage.container.InterfaceContainer; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCompare; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.tile.TileInterface; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; -public class GuiInterface extends BaseScreen { - public GuiInterface(ContainerInterface container, PlayerInventory inventory) { +public class GuiInterface extends BaseScreen { + public GuiInterface(InterfaceContainer container, PlayerInventory inventory) { super(container, 211, 217, inventory, null); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiNetworkTransmitter.java index 8203d3cbd..04d56f829 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiNetworkTransmitter.java @@ -1,16 +1,16 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.ContainerNetworkTransmitter; +import com.raoulvdberge.refinedstorage.container.NetworkTransmitterContainer; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.tile.TileNetworkTransmitter; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; -public class GuiNetworkTransmitter extends BaseScreen { +public class GuiNetworkTransmitter extends BaseScreen { private TileNetworkTransmitter networkTransmitter; - public GuiNetworkTransmitter(ContainerNetworkTransmitter container, TileNetworkTransmitter networkTransmitter, PlayerInventory inventory) { + public GuiNetworkTransmitter(NetworkTransmitterContainer container, TileNetworkTransmitter networkTransmitter, PlayerInventory inventory) { super(container, 176, 137, inventory, null); this.networkTransmitter = networkTransmitter; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiReaderWriter.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiReaderWriter.java index 4eca0ff8e..8c04b3c69 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiReaderWriter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiReaderWriter.java @@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.screen; import com.mojang.blaze3d.platform.GlStateManager; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.apiimpl.network.node.IGuiReaderWriter; -import com.raoulvdberge.refinedstorage.container.ContainerReaderWriter; +import com.raoulvdberge.refinedstorage.container.ReaderWriterContainer; import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; @@ -16,7 +16,7 @@ import net.minecraft.entity.player.PlayerInventory; import java.util.Collections; import java.util.List; -public class GuiReaderWriter extends BaseScreen { +public class GuiReaderWriter extends BaseScreen { private static final int VISIBLE_ROWS = 4; private static final int ITEM_WIDTH = 143; @@ -36,11 +36,11 @@ public class GuiReaderWriter extends BaseScreen { private int itemSelectedX = -1; private int itemSelectedY = -1; - public GuiReaderWriter(ContainerReaderWriter container, IGuiReaderWriter readerWriter, PlayerInventory inventory) { + public GuiReaderWriter(ReaderWriterContainer container, IGuiReaderWriter readerWriter, PlayerInventory inventory) { super(container, 176, 209, inventory, null); this.readerWriter = readerWriter; - this.scrollbar = new ScrollbarWidget(157, 39, 12, 71); + this.scrollbar = new ScrollbarWidget(this, 157, 39, 12, 71); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiRelay.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiRelay.java index 486dc3858..6fd3a69ad 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiRelay.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiRelay.java @@ -1,14 +1,14 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.ContainerRelay; +import com.raoulvdberge.refinedstorage.container.RelayContainer; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.tile.TileRelay; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; -public class GuiRelay extends BaseScreen { - public GuiRelay(ContainerRelay container, PlayerInventory inventory) { +public class GuiRelay extends BaseScreen { + public GuiRelay(RelayContainer container, PlayerInventory inventory) { super(container, 176, 131, inventory, null); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiSecurityManager.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiSecurityManager.java index b1e528e73..5caecfa25 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiSecurityManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiSecurityManager.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.network.security.Permission; -import com.raoulvdberge.refinedstorage.container.ContainerSecurityManager; +import com.raoulvdberge.refinedstorage.container.SecurityManagerContainer; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.tile.TileSecurityManager; import com.raoulvdberge.refinedstorage.util.RenderUtils; @@ -11,11 +11,11 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.client.config.GuiCheckBox; -public class GuiSecurityManager extends BaseScreen { +public class GuiSecurityManager extends BaseScreen { private TileSecurityManager securityManager; private GuiCheckBox[] permissions = new GuiCheckBox[Permission.values().length]; - public GuiSecurityManager(ContainerSecurityManager container, TileSecurityManager securityManager, PlayerInventory inventory) { + public GuiSecurityManager(SecurityManagerContainer container, TileSecurityManager securityManager, PlayerInventory inventory) { super(container, 176, 234, inventory, null); this.securityManager = securityManager; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiStorage.java index 1911419a3..f1d503d74 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiStorage.java @@ -4,7 +4,7 @@ import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.network.node.IGuiStorage; -import com.raoulvdberge.refinedstorage.container.ContainerBase; +import com.raoulvdberge.refinedstorage.container.BaseContainer; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.*; import com.raoulvdberge.refinedstorage.util.RenderUtils; import net.minecraft.client.gui.widget.button.Button; @@ -12,7 +12,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.TextFormatting; -public class GuiStorage extends BaseScreen { +public class GuiStorage extends BaseScreen { private IGuiStorage gui; private String texture; @@ -23,14 +23,14 @@ public class GuiStorage extends BaseScreen { private int barWidth = 16; private int barHeight = 70; - public GuiStorage(ContainerBase container, IGuiStorage gui, String texture, PlayerInventory inventory) { + public GuiStorage(BaseContainer container, IGuiStorage gui, String texture, PlayerInventory inventory) { super(container, 176, 223, inventory, null); this.gui = gui; this.texture = texture; } - public GuiStorage(ContainerBase container, IGuiStorage gui, PlayerInventory inventory) { + public GuiStorage(BaseContainer container, IGuiStorage gui, PlayerInventory inventory) { this(container, gui, "gui/storage.png", inventory); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiStorageMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiStorageMonitor.java index 2029b2c0f..974e6534a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiStorageMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiStorageMonitor.java @@ -2,14 +2,14 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.container.ContainerStorageMonitor; +import com.raoulvdberge.refinedstorage.container.StorageMonitorContainer; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCompare; import com.raoulvdberge.refinedstorage.tile.TileStorageMonitor; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; -public class GuiStorageMonitor extends BaseScreen { - public GuiStorageMonitor(ContainerStorageMonitor container, PlayerInventory inventory) { +public class GuiStorageMonitor extends BaseScreen { + public GuiStorageMonitor(StorageMonitorContainer container, PlayerInventory inventory) { super(container, 211, 137, inventory, null); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiWirelessTransmitter.java index 073c4d57b..3cbcc1d56 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/GuiWirelessTransmitter.java @@ -1,14 +1,14 @@ package com.raoulvdberge.refinedstorage.screen; import com.raoulvdberge.refinedstorage.RS; -import com.raoulvdberge.refinedstorage.container.ContainerWirelessTransmitter; +import com.raoulvdberge.refinedstorage.container.WirelessTransmitterContainer; import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode; import com.raoulvdberge.refinedstorage.tile.TileWirelessTransmitter; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; -public class GuiWirelessTransmitter extends BaseScreen { - public GuiWirelessTransmitter(ContainerWirelessTransmitter container, PlayerInventory inventory) { +public class GuiWirelessTransmitter extends BaseScreen { + public GuiWirelessTransmitter(WirelessTransmitterContainer container, PlayerInventory inventory) { super(container, 211, 137, inventory, null); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GuiGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GuiGrid.java index 9b4df5299..ea87bf808 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GuiGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GuiGrid.java @@ -7,7 +7,7 @@ import com.raoulvdberge.refinedstorage.api.network.grid.GridType; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; import com.raoulvdberge.refinedstorage.apiimpl.render.ElementDrawers; -import com.raoulvdberge.refinedstorage.container.ContainerGrid; +import com.raoulvdberge.refinedstorage.container.GridContainer; import com.raoulvdberge.refinedstorage.screen.BaseScreen; import com.raoulvdberge.refinedstorage.screen.IResizableDisplay; import com.raoulvdberge.refinedstorage.screen.grid.sorting.*; @@ -35,7 +35,7 @@ import net.minecraftforge.fml.client.config.GuiCheckBox; import java.util.LinkedList; import java.util.List; -public class GuiGrid extends BaseScreen implements IResizableDisplay { +public class GuiGrid extends BaseScreen implements IResizableDisplay { private IGridView view; private SearchWidget searchField; @@ -51,7 +51,7 @@ public class GuiGrid extends BaseScreen implements IResizableDisp private int slotNumber; - public GuiGrid(ContainerGrid container, IGrid grid, PlayerInventory inventory) { + public GuiGrid(GridContainer container, IGrid grid, PlayerInventory inventory) { super(container, 227, 0, inventory, null); this.grid = grid; @@ -84,7 +84,7 @@ public class GuiGrid extends BaseScreen implements IResizableDisp this.tabs.init(xSize - 32); - this.scrollbar = new ScrollbarWidget(174, getTopHeight(), 12, (getVisibleRows() * 18) - 2); + this.scrollbar = new ScrollbarWidget(this, 174, getTopHeight(), 12, (getVisibleRows() * 18) - 2); if (grid instanceof NetworkNodeGrid || grid instanceof TilePortableGrid) { addSideButton(new SideButtonRedstoneMode(this, grid instanceof NetworkNodeGrid ? TileGrid.REDSTONE_MODE : TilePortableGrid.REDSTONE_MODE)); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GuiGridCraftingSettings.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GuiGridCraftingSettings.java index 5e613983a..200b6a793 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GuiGridCraftingSettings.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GuiGridCraftingSettings.java @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.screen.grid; import com.google.common.primitives.Ints; -import com.raoulvdberge.refinedstorage.container.ContainerCraftingSettings; +import com.raoulvdberge.refinedstorage.container.CraftingSettingsContainer; import com.raoulvdberge.refinedstorage.screen.BaseScreen; import com.raoulvdberge.refinedstorage.screen.GuiAmountSpecifying; import com.raoulvdberge.refinedstorage.screen.grid.stack.GridStackFluid; @@ -10,11 +10,11 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerEntity; import net.minecraftforge.fluids.FluidAttributes; -public class GuiGridCraftingSettings extends GuiAmountSpecifying { +public class GuiGridCraftingSettings extends GuiAmountSpecifying { private IGridStack stack; public GuiGridCraftingSettings(BaseScreen parent, PlayerEntity player, IGridStack stack) { - super(parent, new ContainerCraftingSettings(player, stack), 172, 99, player.inventory); + super(parent, new CraftingSettingsContainer(player, stack), 172, 99, player.inventory); this.stack = stack; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidget.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidget.java index a1efd6a8c..8e9e67cae 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidget.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidget.java @@ -3,11 +3,12 @@ package com.raoulvdberge.refinedstorage.screen.widget; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.screen.BaseScreen; import com.raoulvdberge.refinedstorage.util.RenderUtils; +import net.minecraft.client.gui.IGuiEventListener; import java.util.LinkedList; import java.util.List; -public class ScrollbarWidget { +public class ScrollbarWidget implements IGuiEventListener { private static final int SCROLLER_HEIGHT = 15; private int x; @@ -19,12 +20,14 @@ public class ScrollbarWidget { private int offset; private int maxOffset; - private boolean wasClicking = false; - private boolean isScrolling = false; + private boolean clicked = false; private List listeners = new LinkedList<>(); - public ScrollbarWidget(int x, int y, int width, int height) { + private BaseScreen screen; + + public ScrollbarWidget(BaseScreen screen, int x, int y, int width, int height) { + this.screen = screen; this.x = x; this.y = y; this.width = width; @@ -51,39 +54,54 @@ public class ScrollbarWidget { return enabled; } - public void draw(BaseScreen gui) { - gui.bindTexture(RS.ID, "icons.png"); - gui.blit(gui.getGuiLeft() + x, gui.getGuiTop() + y + (int) Math.min(height - SCROLLER_HEIGHT, (float) offset / (float) maxOffset * (float) (height - SCROLLER_HEIGHT)), isEnabled() ? 232 : 244, 0, 12, 15); + public void render() { + screen.bindTexture(RS.ID, "icons.png"); + screen.blit(screen.getGuiLeft() + x, screen.getGuiTop() + y + (int) Math.min(height - SCROLLER_HEIGHT, (float) offset / (float) maxOffset * (float) (height - SCROLLER_HEIGHT)), isEnabled() ? 232 : 244, 0, 12, 15); } - public void update(BaseScreen gui, int mouseX, int mouseY) { - if (!isEnabled()) { - isScrolling = false; - wasClicking = false; - } else { - // TODO boolean down = Mouse.isButtonDown(0); - boolean down = false; + @Override + public boolean mouseClicked(double mx, double my, int button) { + mx -= screen.getGuiLeft(); + my -= screen.getGuiTop(); - if (!wasClicking && down && RenderUtils.inBounds(x, y, width, height, mouseX, mouseY)) { - isScrolling = true; - } + if (button == 0 && RenderUtils.inBounds(x, y, width, height, mx, my)) { + clicked = true; - if (!down) { - isScrolling = false; - } + return true; + } - wasClicking = down; + return false; + } - if (isScrolling) { - setOffset((int) Math.floor((float) (mouseY - y) / (float) (height - SCROLLER_HEIGHT) * (float) maxOffset)); - } + @Override + public void mouseMoved(double mx, double my) { + mx -= screen.getGuiLeft(); + my -= screen.getGuiTop(); + + if (clicked && RenderUtils.inBounds(x, y, width, height, mx, my)) { + setOffset((int) Math.floor((float) (my - y) / (float) (height - SCROLLER_HEIGHT) * (float) maxOffset)); } } - public void wheel(int delta) { + @Override + public boolean mouseReleased(double mx, double my, int button) { + if (clicked) { + clicked = false; + + return true; + } + + return false; + } + + @Override + public boolean mouseScrolled(double mouseX, double mouseY, double scrollDelta) { if (isEnabled()) { - setOffset(offset + Math.max(Math.min(-delta, 1), -1)); + setOffset(offset + Math.max(Math.min(-(int) Math.round(scrollDelta), 1), -1)); + return true; } + + return false; } public void setMaxOffset(int maxOffset) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/ControllerTile.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/ControllerTile.java index 540998e10..0ce2d43c8 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/ControllerTile.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/ControllerTile.java @@ -43,6 +43,7 @@ import com.raoulvdberge.refinedstorage.tile.data.RSSerializers; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -64,6 +65,7 @@ import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Comparator; import java.util.List; +import java.util.Random; import java.util.function.Predicate; import static com.raoulvdberge.refinedstorage.capability.CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY; @@ -85,6 +87,11 @@ public class ControllerTile extends TileBase implements ITickableTileEntity, INe public static final TileDataParameter, ControllerTile> NODES = new TileDataParameter<>(RSSerializers.CLIENT_NODE_SERIALIZER, new ArrayList<>(), t -> { List nodes = new ArrayList<>(); + Random r = new Random(); + for (int i = 0; i < 50; ++i) { + nodes.add(new ClientNode(new ItemStack(r.nextBoolean() ? Blocks.DIRT : (r.nextBoolean() ? Blocks.BOOKSHELF : (r.nextBoolean() ? Blocks.STONE : Blocks.GLASS))), 10, 10)); + } + for (INetworkNode node : t.nodeGraph.all()) { if (node.canUpdate()) { ItemStack stack = node.getItemStack(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataManager.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataManager.java index 34c60bb94..a6b8fba5b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataManager.java @@ -1,5 +1,7 @@ package com.raoulvdberge.refinedstorage.tile.data; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.network.MessageTileDataParameterUpdate; import net.minecraft.tileentity.TileEntity; import java.util.ArrayList; @@ -68,6 +70,6 @@ public class TileDataManager { } public static void setParameter(TileDataParameter parameter, Object value) { - // TODO RS.INSTANCE.network.sendToServer(new MessageTileDataParameterUpdate(parameter, value)); + RS.NETWORK_HANDLER.sendToServer(new MessageTileDataParameterUpdate(parameter, value)); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataWatcher.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataWatcher.java index e69a50807..63f9b19d0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataWatcher.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/TileDataWatcher.java @@ -1,5 +1,7 @@ package com.raoulvdberge.refinedstorage.tile.data; +import com.raoulvdberge.refinedstorage.RS; +import com.raoulvdberge.refinedstorage.network.MessageTileDataParameter; import net.minecraft.entity.player.ServerPlayerEntity; public class TileDataWatcher { @@ -52,6 +54,6 @@ public class TileDataWatcher { } public void sendParameter(boolean initial, TileDataParameter parameter) { - // TODO RS.INSTANCE.network.sendTo(new MessageTileDataParameter(manager.getTile(), parameter, initial), player); + RS.NETWORK_HANDLER.sendTo(player, new MessageTileDataParameter(manager.getTile(), parameter, initial)); } } diff --git a/src/main/resources/assets/refinedstorage/lang/en_us.json b/src/main/resources/assets/refinedstorage/lang/en_us.json index 6d463ad2d..ece040820 100644 --- a/src/main/resources/assets/refinedstorage/lang/en_us.json +++ b/src/main/resources/assets/refinedstorage/lang/en_us.json @@ -7,8 +7,8 @@ "key.refinedstorage.openWirelessFluidGrid": "Open Wireless Fluid Grid", "key.refinedstorage.openPortableGrid": "Open Portable Grid", "key.refinedstorage.openWirelessCraftingMonitor": "Open Wireless Crafting Monitor", - "gui.refinedstorage:controller.0": "Controller", - "gui.refinedstorage:controller.1": "Creative Controller", + "gui.refinedstorage.controller": "Controller", + "gui.refinedstorage.creative_controller": "Creative Controller", "gui.refinedstorage:grid": "Grid", "gui.refinedstorage:grid.craft": "Craft", "gui.refinedstorage:crafting_grid": "Crafting Grid",