dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gui->Screen (only screens which have been ported)

Browse Source
This commit is contained in:
raoulvdberge
2019-09-16 22:12:45 +02:00
parent 6931da8724
commit 5381793af9
98 changed files with 314 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/raoulvdberge/refinedstorage/RS.java
View File

@@ -6,11 +6,11 @@ import com.raoulvdberge.refinedstorage.apiimpl.storage.ItemStorageType;
import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskFactoryFluid;
import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskFactoryItem;
import com.raoulvdberge.refinedstorage.container.ContainerFilter;
import com.raoulvdberge.refinedstorage.gui.GuiFilter;
import com.raoulvdberge.refinedstorage.item.*;
import com.raoulvdberge.refinedstorage.item.group.MainItemGroup;
import com.raoulvdberge.refinedstorage.network.NetworkHandler;
import com.raoulvdberge.refinedstorage.recipe.UpgradeWithEnchantedBookRecipeSerializer;
import com.raoulvdberge.refinedstorage.screen.FilterScreen;
import net.minecraft.block.Block;
import net.minecraft.client.gui.ScreenManager;
import net.minecraft.inventory.container.ContainerType;
@@ -53,7 +53,7 @@ public final class RS {
@SubscribeEvent
public void onClientSetup(FMLClientSetupEvent e) {
ScreenManager.registerFactory(RSContainers.FILTER, GuiFilter::new);
ScreenManager.registerFactory(RSContainers.FILTER, FilterScreen::new);
}
@SubscribeEvent

4
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java
View File

@@ -3,7 +3,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.render;
import com.mojang.blaze3d.platform.GlStateManager;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.api.render.IElementDrawer;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import net.minecraft.client.gui.AbstractGui;
import net.minecraft.client.gui.FontRenderer;
@@ -26,7 +26,7 @@ public class CraftingMonitorElementDrawers extends ElementDrawers {
gui.blit(x + itemWidth - 12 - 2, y + itemHeight - 12 - 2, 0, 244, 12, 12);
};
public CraftingMonitorElementDrawers(GuiBase gui, FontRenderer fontRenderer, int itemWidth, int itemHeight) {
public CraftingMonitorElementDrawers(BaseScreen gui, FontRenderer fontRenderer, int itemWidth, int itemHeight) {
super(gui, fontRenderer);
this.itemWidth = itemWidth;

2
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java
View File

@@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.render;
import com.mojang.blaze3d.platform.GlStateManager;
import com.raoulvdberge.refinedstorage.api.render.IElementDrawer;
import com.raoulvdberge.refinedstorage.gui.GuiCraftingPreview;
import com.raoulvdberge.refinedstorage.screen.GuiCraftingPreview;
import net.minecraft.client.gui.FontRenderer;
public class CraftingPreviewElementDrawers extends ElementDrawers {

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/render/ElementDrawers.java
View File

@@ -2,17 +2,17 @@ package com.raoulvdberge.refinedstorage.apiimpl.render;
import com.raoulvdberge.refinedstorage.api.render.IElementDrawer;
import com.raoulvdberge.refinedstorage.api.render.IElementDrawers;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.render.FluidRenderer;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
public class ElementDrawers implements IElementDrawers {
protected GuiBase gui;
protected BaseScreen gui;
private FontRenderer fontRenderer;
public ElementDrawers(GuiBase gui, FontRenderer fontRenderer) {
public ElementDrawers(BaseScreen gui, FontRenderer fontRenderer) {
this.gui = gui;
this.fontRenderer = fontRenderer;
}

8
src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafterManager.java
View File

@@ -5,11 +5,11 @@ 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.gui.IResizableDisplay;
import com.raoulvdberge.refinedstorage.gui.grid.filtering.GridFilterParser;
import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackItem;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.screen.IResizableDisplay;
import com.raoulvdberge.refinedstorage.screen.grid.filtering.GridFilterParser;
import com.raoulvdberge.refinedstorage.screen.grid.stack.GridStackItem;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.tile.TileCrafterManager;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity;

6
src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCraftingSettings.java
View File

@@ -2,10 +2,10 @@ package com.raoulvdberge.refinedstorage.container;
import com.raoulvdberge.refinedstorage.container.slot.SlotDisabled;
import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluidDisabled;
import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackFluid;
import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackItem;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory;
import com.raoulvdberge.refinedstorage.screen.grid.stack.GridStackFluid;
import com.raoulvdberge.refinedstorage.screen.grid.stack.GridStackItem;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraftforge.items.ItemHandlerHelper;
import net.minecraftforge.items.ItemStackHandler;

2
src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java
View File

@@ -16,7 +16,7 @@ import com.raoulvdberge.refinedstorage.container.slot.grid.SlotGridCraftingResul
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.gui.IResizableDisplay;
import com.raoulvdberge.refinedstorage.screen.IResizableDisplay;
import com.raoulvdberge.refinedstorage.tile.TileBase;
import com.raoulvdberge.refinedstorage.tile.config.IType;
import com.raoulvdberge.refinedstorage.tile.grid.WirelessGrid;

2
src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotCrafterManager.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.container.slot;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeCrafterManager;
import com.raoulvdberge.refinedstorage.gui.IResizableDisplay;
import com.raoulvdberge.refinedstorage.screen.IResizableDisplay;
import net.minecraftforge.items.IItemHandler;
public class SlotCrafterManager extends SlotBase {

6
src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilter.java
View File

@@ -5,11 +5,11 @@ import com.raoulvdberge.refinedstorage.api.network.grid.IGridTab;
import com.raoulvdberge.refinedstorage.api.util.IFilter;
import com.raoulvdberge.refinedstorage.apiimpl.network.grid.GridTab;
import com.raoulvdberge.refinedstorage.apiimpl.util.FilterFluid;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventoryFilter;
import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidatorBasic;
import com.raoulvdberge.refinedstorage.item.FilterItem;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.screen.grid.GuiGrid;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.LogicalSide;
@@ -47,7 +47,7 @@ public class ItemHandlerFilter extends ItemHandlerBase {
}
if (EffectiveSide.get() == LogicalSide.CLIENT) { // TODO check
GuiBase.executeLater(GuiGrid.class, grid -> grid.getView().sort());
BaseScreen.executeLater(GuiGrid.class, grid -> grid.getView().sort());
}
}

4
src/main/java/com/raoulvdberge/refinedstorage/network/MessageSlotFilterFluidUpdate.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.network;
import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import net.minecraft.inventory.container.Slot;
import net.minecraft.network.PacketBuffer;
import net.minecraftforge.fluids.FluidStack;
@@ -28,7 +28,7 @@ public class MessageSlotFilterFluidUpdate {
}
public static void handle(MessageSlotFilterFluidUpdate message, Supplier<NetworkEvent.Context> ctx) {
GuiBase.executeLater(gui -> {
BaseScreen.executeLater(gui -> {
if (message.containerSlot >= 0 && message.containerSlot < gui.getContainer().inventorySlots.size()) {
Slot slot = gui.getContainer().getSlot(message.containerSlot);

10
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java → src/main/java/com/raoulvdberge/refinedstorage/screen/BaseScreen.java Executable file → Normal file
View File

@@ -1,12 +1,12 @@
package com.raoulvdberge.refinedstorage.gui;
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.gui.widget.CheckBoxWidget;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButton;
import com.raoulvdberge.refinedstorage.render.FluidRenderer;
import com.raoulvdberge.refinedstorage.screen.widget.CheckBoxWidget;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButton;
import com.raoulvdberge.refinedstorage.util.RenderUtils;
import net.minecraft.client.gui.screen.inventory.ContainerScreen;
import net.minecraft.client.gui.widget.Widget;
@@ -27,13 +27,13 @@ import javax.annotation.Nullable;
import java.util.*;
import java.util.function.Consumer;
public abstract class GuiBase<T extends Container> extends ContainerScreen<T> {
public abstract class BaseScreen<T extends Container> extends ContainerScreen<T> {
private static final Map<String, ResourceLocation> TEXTURE_CACHE = new HashMap<>();
private static final Map<Class, Queue<Consumer>> ACTIONS = new HashMap<>();
private int sideButtonY;
public GuiBase(T container, int xSize, int ySize, PlayerInventory inventory, ITextComponent title) {
public BaseScreen(T container, int xSize, int ySize, PlayerInventory inventory, ITextComponent title) {
super(container, inventory, title);
this.xSize = xSize;

8
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiFilter.java → src/main/java/com/raoulvdberge/refinedstorage/screen/FilterScreen.java
View File

@@ -1,12 +1,12 @@
package com.raoulvdberge.refinedstorage.gui;
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.gui.widget.sidebutton.SideButtonFilterType;
import com.raoulvdberge.refinedstorage.item.FilterItem;
import com.raoulvdberge.refinedstorage.network.MessageFilterUpdate;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonFilterType;
import net.minecraft.client.gui.widget.TextFieldWidget;
import net.minecraft.client.gui.widget.button.Button;
import net.minecraft.client.resources.I18n;
@@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.text.ITextComponent;
import net.minecraftforge.fml.client.config.GuiCheckBox;
public class GuiFilter extends GuiBase<ContainerFilter> {
public class FilterScreen extends BaseScreen<ContainerFilter> {
private ItemStack stack;
private int compare;
@@ -28,7 +28,7 @@ public class GuiFilter extends GuiBase<ContainerFilter> {
private Button toggleMode;
private TextFieldWidget nameField;
public GuiFilter(ContainerFilter container, PlayerInventory inventory, ITextComponent title) {
public FilterScreen(ContainerFilter container, PlayerInventory inventory, ITextComponent title) {
super(container, 176, 231, inventory, title);
this.stack = container.getStack();

4
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiAmount.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiAmount.java
View File

@@ -1,4 +1,4 @@
package com.raoulvdberge.refinedstorage.gui;
package com.raoulvdberge.refinedstorage.screen;
import com.google.common.primitives.Ints;
import com.raoulvdberge.refinedstorage.container.ContainerAmount;
@@ -11,7 +11,7 @@ public class GuiAmount extends GuiAmountSpecifying<ContainerAmount> {
private ItemStack stack;
private int maxAmount;
public GuiAmount(GuiBase parent, PlayerEntity player, int containerSlot, ItemStack stack, int maxAmount) {
public GuiAmount(BaseScreen parent, PlayerEntity player, int containerSlot, ItemStack stack, int maxAmount) {
super(parent, new ContainerAmount(player, stack), 172, 99, player.inventory);
this.containerSlot = containerSlot;

10
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiAmountSpecifying.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiAmountSpecifying.java
View File

@@ -1,4 +1,4 @@
package com.raoulvdberge.refinedstorage.gui;
package com.raoulvdberge.refinedstorage.screen;
import com.raoulvdberge.refinedstorage.RS;
import net.minecraft.client.gui.widget.TextFieldWidget;
@@ -8,17 +8,17 @@ import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.inventory.container.Container;
import org.apache.commons.lang3.tuple.Pair;
public abstract class GuiAmountSpecifying<T extends Container> extends GuiBase<T> {
public abstract class GuiAmountSpecifying<T extends Container> extends BaseScreen<T> {
protected TextFieldWidget amountField;
private GuiBase parent;
private BaseScreen parent;
protected Button okButton;
private Button cancelButton;
private Button[] incrementButtons = new Button[6];
public GuiAmountSpecifying(GuiBase parent, T container, int width, int height, PlayerInventory playerInventory) {
public GuiAmountSpecifying(BaseScreen parent, T container, int width, int height, PlayerInventory playerInventory) {
super(container, width, height, playerInventory, null);
this.parent = parent;
@@ -185,7 +185,7 @@ public abstract class GuiAmountSpecifying<T extends Container> extends GuiBase<T
// TODO FMLClientHandler.instance().showGuiScreen(parent);
}
public GuiBase getParent() {
public BaseScreen getParent() {
return parent;
}
}

12
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiConstructor.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiConstructor.java Executable file → Normal file
View File

@@ -1,17 +1,17 @@
package com.raoulvdberge.refinedstorage.gui;
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.gui.widget.sidebutton.SideButtonCompare;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonConstuctorDrop;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonRedstoneMode;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonType;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCompare;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonConstuctorDrop;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonType;
import com.raoulvdberge.refinedstorage.tile.TileConstructor;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.PlayerInventory;
public class GuiConstructor extends GuiBase<ContainerConstructor> {
public class GuiConstructor extends BaseScreen<ContainerConstructor> {
public GuiConstructor(ContainerConstructor container, PlayerInventory inventory) {
super(container, 211, 137, inventory, null); // TODO TextComponent
}

8
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiController.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiController.java Executable file → Normal file
View File

@@ -1,10 +1,10 @@
package com.raoulvdberge.refinedstorage.gui;
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.gui.widget.ScrollbarWidget;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonRedstoneMode;
import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode;
import com.raoulvdberge.refinedstorage.tile.ClientNode;
import com.raoulvdberge.refinedstorage.tile.TileController;
import com.raoulvdberge.refinedstorage.util.RenderUtils;
@@ -14,7 +14,7 @@ import net.minecraft.entity.player.PlayerInventory;
import java.util.List;
public class GuiController extends GuiBase<ContainerController> {
public class GuiController extends BaseScreen<ContainerController> {
private static final int VISIBLE_ROWS = 2;
private TileController controller;

4
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCrafter.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCrafter.java Executable file → Normal file
View File

@@ -1,4 +1,4 @@
package com.raoulvdberge.refinedstorage.gui;
package com.raoulvdberge.refinedstorage.screen;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.container.ContainerCrafter;
@@ -7,7 +7,7 @@ import com.raoulvdberge.refinedstorage.util.RenderUtils;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.PlayerInventory;
public class GuiCrafter extends GuiBase<ContainerCrafter> {
public class GuiCrafter extends BaseScreen<ContainerCrafter> {
public GuiCrafter(ContainerCrafter container, PlayerInventory inventory) {
super(container, 211, 137, inventory, null);
}

14
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCrafterManager.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCrafterManager.java
View File

@@ -1,4 +1,4 @@
package com.raoulvdberge.refinedstorage.gui;
package com.raoulvdberge.refinedstorage.screen;
import com.mojang.blaze3d.platform.GlStateManager;
import com.raoulvdberge.refinedstorage.RS;
@@ -6,11 +6,11 @@ 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.gui.widget.ScrollbarWidget;
import com.raoulvdberge.refinedstorage.gui.widget.SearchWidget;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonCrafterManagerSearchBoxMode;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonGridSize;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonRedstoneMode;
import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget;
import com.raoulvdberge.refinedstorage.screen.widget.SearchWidget;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCrafterManagerSearchBoxMode;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonGridSize;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode;
import com.raoulvdberge.refinedstorage.tile.TileCrafterManager;
import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
import com.raoulvdberge.refinedstorage.util.RenderUtils;
@@ -21,7 +21,7 @@ import net.minecraft.inventory.container.Slot;
import java.util.Map;
// TODO @MouseTweaksDisableWheelTweak
public class GuiCrafterManager extends GuiBase<ContainerCrafterManager> implements IResizableDisplay {
public class GuiCrafterManager extends BaseScreen<ContainerCrafterManager> implements IResizableDisplay {
private ContainerCrafterManager container;
private NetworkNodeCrafterManager crafterManager;

10
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCraftingMonitor.java Executable file → Normal file
View File

@@ -1,4 +1,4 @@
package com.raoulvdberge.refinedstorage.gui;
package com.raoulvdberge.refinedstorage.screen;
import com.google.common.collect.Lists;
import com.mojang.blaze3d.platform.GlStateManager;
@@ -13,9 +13,9 @@ 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.gui.widget.ScrollbarWidget;
import com.raoulvdberge.refinedstorage.gui.widget.TabListWidget;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonRedstoneMode;
import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget;
import com.raoulvdberge.refinedstorage.screen.widget.TabListWidget;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode;
import com.raoulvdberge.refinedstorage.tile.craftingmonitor.ICraftingMonitor;
import com.raoulvdberge.refinedstorage.util.RenderUtils;
import net.minecraft.client.gui.FontRenderer;
@@ -32,7 +32,7 @@ import java.util.List;
import java.util.Optional;
import java.util.UUID;
public class GuiCraftingMonitor extends GuiBase<ContainerCraftingMonitor> {
public class GuiCraftingMonitor extends BaseScreen<ContainerCraftingMonitor> {
public static class CraftingMonitorTask implements IGridTab {
private UUID id;
private ICraftingRequestInfo requested;

6
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiCraftingPreview.java Executable file → Normal file
View File

@@ -1,4 +1,4 @@
package com.raoulvdberge.refinedstorage.gui;
package com.raoulvdberge.refinedstorage.screen;
import com.mojang.blaze3d.platform.GlStateManager;
import com.raoulvdberge.refinedstorage.RS;
@@ -10,7 +10,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPrev
import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementFluidStack;
import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementItemStack;
import com.raoulvdberge.refinedstorage.apiimpl.render.CraftingPreviewElementDrawers;
import com.raoulvdberge.refinedstorage.gui.widget.ScrollbarWidget;
import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget;
import com.raoulvdberge.refinedstorage.util.RenderUtils;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screen.Screen;
@@ -27,7 +27,7 @@ import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
public class GuiCraftingPreview extends GuiBase {
public class GuiCraftingPreview extends BaseScreen {
private static final int VISIBLE_ROWS = 5;
private List<ICraftingPreviewElement> stacks;

6
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDestructor.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDestructor.java Executable file → Normal file
View File

@@ -1,14 +1,14 @@
package com.raoulvdberge.refinedstorage.gui;
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.gui.widget.sidebutton.*;
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 GuiBase<ContainerDestructor> {
public class GuiDestructor extends BaseScreen<ContainerDestructor> {
public GuiDestructor(ContainerDestructor container, PlayerInventory playerInventory) {
super(container, 211, 137, playerInventory, null);
}

10
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDetector.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDetector.java Executable file → Normal file
View File

@@ -1,17 +1,17 @@
package com.raoulvdberge.refinedstorage.gui;
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.gui.widget.sidebutton.SideButtonCompare;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonDetectorMode;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonType;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCompare;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonDetectorMode;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonType;
import com.raoulvdberge.refinedstorage.tile.TileDetector;
import net.minecraft.client.gui.widget.TextFieldWidget;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.PlayerInventory;
public class GuiDetector extends GuiBase<ContainerDetector> {
public class GuiDetector extends BaseScreen<ContainerDetector> {
private TextFieldWidget amount;
public GuiDetector(ContainerDetector container, PlayerInventory inventory) {

6
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDiskManipulator.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiDiskManipulator.java Executable file → Normal file
View File

@@ -1,14 +1,14 @@
package com.raoulvdberge.refinedstorage.gui;
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.gui.widget.sidebutton.*;
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 GuiBase<ContainerDiskManipulator> {
public class GuiDiskManipulator extends BaseScreen<ContainerDiskManipulator> {
public GuiDiskManipulator(ContainerDiskManipulator container, PlayerInventory playerInventory) {
super(container, 211, 211, playerInventory, null);
}

10
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiExporter.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiExporter.java Executable file → Normal file
View File

@@ -1,16 +1,16 @@
package com.raoulvdberge.refinedstorage.gui;
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.gui.widget.sidebutton.SideButtonCompare;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonRedstoneMode;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonType;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCompare;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonType;
import com.raoulvdberge.refinedstorage.tile.TileExporter;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.PlayerInventory;
public class GuiExporter extends GuiBase<ContainerExporter> {
public class GuiExporter extends BaseScreen<ContainerExporter> {
public GuiExporter(ContainerExporter container, PlayerInventory playerInventory) {
super(container, 211, 137, playerInventory, null);
}

4
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiFluidAmount.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiFluidAmount.java
View File

@@ -1,4 +1,4 @@
package com.raoulvdberge.refinedstorage.gui;
package com.raoulvdberge.refinedstorage.screen;
import com.google.common.primitives.Ints;
import com.raoulvdberge.refinedstorage.container.ContainerFluidAmount;
@@ -11,7 +11,7 @@ public class GuiFluidAmount extends GuiAmountSpecifying<ContainerFluidAmount> {
private FluidStack stack;
private int maxAmount;
public GuiFluidAmount(GuiBase parent, PlayerEntity player, int containerSlot, FluidStack stack, int maxAmount) {
public GuiFluidAmount(BaseScreen parent, PlayerEntity player, int containerSlot, FluidStack stack, int maxAmount) {
super(parent, new ContainerFluidAmount(player, stack), 172, 99, player.inventory);
this.containerSlot = containerSlot;

6
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiFluidInterface.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiFluidInterface.java Executable file → Normal file
View File

@@ -1,18 +1,18 @@
package com.raoulvdberge.refinedstorage.gui;
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.gui.widget.sidebutton.SideButtonRedstoneMode;
import com.raoulvdberge.refinedstorage.render.FluidRenderer;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode;
import com.raoulvdberge.refinedstorage.tile.TileFluidInterface;
import com.raoulvdberge.refinedstorage.util.RenderUtils;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.util.text.TextFormatting;
public class GuiFluidInterface extends GuiBase<ContainerFluidInterface> {
public class GuiFluidInterface extends BaseScreen<ContainerFluidInterface> {
private static final FluidRenderer TANK_RENDERER = new FluidRenderer(NetworkNodeFluidInterface.TANK_CAPACITY, 12, 47);
public GuiFluidInterface(ContainerFluidInterface container, PlayerInventory inventory) {

2
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiHandler.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiHandler.java Executable file → Normal file
View File

@@ -1,4 +1,4 @@
package com.raoulvdberge.refinedstorage.gui;
package com.raoulvdberge.refinedstorage.screen;
public class GuiHandler {
/*

12
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiImporter.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiImporter.java Executable file → Normal file
View File

@@ -1,17 +1,17 @@
package com.raoulvdberge.refinedstorage.gui;
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.gui.widget.sidebutton.SideButtonCompare;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonMode;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonRedstoneMode;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonType;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCompare;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonMode;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonType;
import com.raoulvdberge.refinedstorage.tile.TileImporter;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.PlayerInventory;
public class GuiImporter extends GuiBase<ContainerImporter> {
public class GuiImporter extends BaseScreen<ContainerImporter> {
public GuiImporter(ContainerImporter container, PlayerInventory inventory) {
super(container, 211, 137, inventory, null);
}

8
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiInterface.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiInterface.java Executable file → Normal file
View File

@@ -1,15 +1,15 @@
package com.raoulvdberge.refinedstorage.gui;
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.gui.widget.sidebutton.SideButtonCompare;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonRedstoneMode;
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 GuiBase<ContainerInterface> {
public class GuiInterface extends BaseScreen<ContainerInterface> {
public GuiInterface(ContainerInterface container, PlayerInventory inventory) {
super(container, 211, 217, inventory, null);
}

6
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiNetworkTransmitter.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiNetworkTransmitter.java Executable file → Normal file
View File

@@ -1,13 +1,13 @@
package com.raoulvdberge.refinedstorage.gui;
package com.raoulvdberge.refinedstorage.screen;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.container.ContainerNetworkTransmitter;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonRedstoneMode;
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 GuiBase<ContainerNetworkTransmitter> {
public class GuiNetworkTransmitter extends BaseScreen<ContainerNetworkTransmitter> {
private TileNetworkTransmitter networkTransmitter;
public GuiNetworkTransmitter(ContainerNetworkTransmitter container, TileNetworkTransmitter networkTransmitter, PlayerInventory inventory) {

4
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiPriority.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiPriority.java Executable file → Normal file
View File

@@ -1,4 +1,4 @@
package com.raoulvdberge.refinedstorage.gui;
package com.raoulvdberge.refinedstorage.screen;
import com.google.common.primitives.Ints;
import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
@@ -12,7 +12,7 @@ import org.apache.commons.lang3.tuple.Pair;
public class GuiPriority extends GuiAmountSpecifying<Container> {
private TileDataParameter<Integer, ?> priority;
public GuiPriority(GuiBase parent, TileDataParameter<Integer, ?> priority, PlayerInventory inventory) {
public GuiPriority(BaseScreen parent, TileDataParameter<Integer, ?> priority, PlayerInventory inventory) {
super(parent, new Container(null, 0) { // TODO ctor
@Override
public boolean canInteractWith(PlayerEntity player) {

8
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiReaderWriter.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiReaderWriter.java Executable file → Normal file
View File

@@ -1,11 +1,11 @@
package com.raoulvdberge.refinedstorage.gui;
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.gui.widget.ScrollbarWidget;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonRedstoneMode;
import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode;
import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
import com.raoulvdberge.refinedstorage.util.RenderUtils;
import net.minecraft.client.gui.widget.TextFieldWidget;
@@ -16,7 +16,7 @@ import net.minecraft.entity.player.PlayerInventory;
import java.util.Collections;
import java.util.List;
public class GuiReaderWriter extends GuiBase<ContainerReaderWriter> {
public class GuiReaderWriter extends BaseScreen<ContainerReaderWriter> {
private static final int VISIBLE_ROWS = 4;
private static final int ITEM_WIDTH = 143;

6
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiRelay.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiRelay.java Executable file → Normal file
View File

@@ -1,13 +1,13 @@
package com.raoulvdberge.refinedstorage.gui;
package com.raoulvdberge.refinedstorage.screen;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.container.ContainerRelay;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonRedstoneMode;
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 GuiBase<ContainerRelay> {
public class GuiRelay extends BaseScreen<ContainerRelay> {
public GuiRelay(ContainerRelay container, PlayerInventory inventory) {
super(container, 176, 131, inventory, null);
}

6
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiSecurityManager.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiSecurityManager.java Executable file → Normal file
View File

@@ -1,9 +1,9 @@
package com.raoulvdberge.refinedstorage.gui;
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.gui.widget.sidebutton.SideButtonRedstoneMode;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonRedstoneMode;
import com.raoulvdberge.refinedstorage.tile.TileSecurityManager;
import com.raoulvdberge.refinedstorage.util.RenderUtils;
import net.minecraft.client.resources.I18n;
@@ -11,7 +11,7 @@ import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.client.config.GuiCheckBox;
public class GuiSecurityManager extends GuiBase<ContainerSecurityManager> {
public class GuiSecurityManager extends BaseScreen<ContainerSecurityManager> {
private TileSecurityManager securityManager;
private GuiCheckBox[] permissions = new GuiCheckBox[Permission.values().length];

6
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorage.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiStorage.java Executable file → Normal file
View File

@@ -1,18 +1,18 @@
package com.raoulvdberge.refinedstorage.gui;
package com.raoulvdberge.refinedstorage.screen;
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.gui.widget.sidebutton.*;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.*;
import com.raoulvdberge.refinedstorage.util.RenderUtils;
import net.minecraft.client.gui.widget.button.Button;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.util.text.TextFormatting;
public class GuiStorage extends GuiBase<ContainerBase> {
public class GuiStorage extends BaseScreen<ContainerBase> {
private IGuiStorage gui;
private String texture;

6
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiStorageMonitor.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiStorageMonitor.java
View File

@@ -1,14 +1,14 @@
package com.raoulvdberge.refinedstorage.gui;
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.gui.widget.sidebutton.SideButtonCompare;
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 GuiBase<ContainerStorageMonitor> {
public class GuiStorageMonitor extends BaseScreen<ContainerStorageMonitor> {
public GuiStorageMonitor(ContainerStorageMonitor container, PlayerInventory inventory) {
super(container, 211, 137, inventory, null);
}

6
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiWirelessTransmitter.java → src/main/java/com/raoulvdberge/refinedstorage/screen/GuiWirelessTransmitter.java Executable file → Normal file
View File

@@ -1,13 +1,13 @@
package com.raoulvdberge.refinedstorage.gui;
package com.raoulvdberge.refinedstorage.screen;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.container.ContainerWirelessTransmitter;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonRedstoneMode;
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 GuiBase<ContainerWirelessTransmitter> {
public class GuiWirelessTransmitter extends BaseScreen<ContainerWirelessTransmitter> {
public GuiWirelessTransmitter(ContainerWirelessTransmitter container, PlayerInventory inventory) {
super(container, 211, 137, inventory, null);
}

2
src/main/java/com/raoulvdberge/refinedstorage/gui/IResizableDisplay.java → src/main/java/com/raoulvdberge/refinedstorage/screen/IResizableDisplay.java
View File

@@ -1,4 +1,4 @@
package com.raoulvdberge.refinedstorage.gui;
package com.raoulvdberge.refinedstorage.screen;
public interface IResizableDisplay {
int getVisibleRows();

2
src/main/java/com/raoulvdberge/refinedstorage/gui/KeyInputListener.java → src/main/java/com/raoulvdberge/refinedstorage/screen/KeyInputListener.java
View File

@@ -1,4 +1,4 @@
package com.raoulvdberge.refinedstorage.gui;
package com.raoulvdberge.refinedstorage.screen;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.PlayerInventory;

2
src/main/java/com/raoulvdberge/refinedstorage/gui/ResizableDisplayDummy.java → src/main/java/com/raoulvdberge/refinedstorage/screen/ResizableDisplayDummy.java
View File

@@ -1,4 +1,4 @@
package com.raoulvdberge.refinedstorage.gui;
package com.raoulvdberge.refinedstorage.screen;
public class ResizableDisplayDummy implements IResizableDisplay {
@Override

6
src/main/java/com/raoulvdberge/refinedstorage/gui/TileDataParameterClientListenerCrafter.java → src/main/java/com/raoulvdberge/refinedstorage/screen/TileDataParameterClientListenerCrafter.java
View File

@@ -1,13 +1,13 @@
package com.raoulvdberge.refinedstorage.gui;
package com.raoulvdberge.refinedstorage.screen;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.SideButtonCrafterMode;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.SideButtonCrafterMode;
import com.raoulvdberge.refinedstorage.tile.data.TileDataParameterClientListener;
public class TileDataParameterClientListenerCrafter implements TileDataParameterClientListener<Boolean> {
@Override
public void onChanged(boolean initial, Boolean hasRoot) {
if (!hasRoot) {
GuiBase.executeLater(GuiCrafter.class, gui -> {
BaseScreen.executeLater(GuiCrafter.class, gui -> {
gui.addSideButton(new SideButtonCrafterMode(gui));
});
}

28
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GuiGrid.java Executable file → Normal file
View File

@@ -1,4 +1,4 @@
package com.raoulvdberge.refinedstorage.gui.grid;
package com.raoulvdberge.refinedstorage.screen.grid;
import com.google.common.collect.Lists;
import com.mojang.blaze3d.platform.GlStateManager;
@@ -8,18 +8,18 @@ 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.gui.GuiBase;
import com.raoulvdberge.refinedstorage.gui.IResizableDisplay;
import com.raoulvdberge.refinedstorage.gui.grid.sorting.*;
import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackItem;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.gui.grid.view.GridViewFluid;
import com.raoulvdberge.refinedstorage.gui.grid.view.GridViewItem;
import com.raoulvdberge.refinedstorage.gui.grid.view.IGridView;
import com.raoulvdberge.refinedstorage.gui.widget.ScrollbarWidget;
import com.raoulvdberge.refinedstorage.gui.widget.SearchWidget;
import com.raoulvdberge.refinedstorage.gui.widget.TabListWidget;
import com.raoulvdberge.refinedstorage.gui.widget.sidebutton.*;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.screen.IResizableDisplay;
import com.raoulvdberge.refinedstorage.screen.grid.sorting.*;
import com.raoulvdberge.refinedstorage.screen.grid.stack.GridStackItem;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.screen.grid.view.GridViewFluid;
import com.raoulvdberge.refinedstorage.screen.grid.view.GridViewItem;
import com.raoulvdberge.refinedstorage.screen.grid.view.IGridView;
import com.raoulvdberge.refinedstorage.screen.widget.ScrollbarWidget;
import com.raoulvdberge.refinedstorage.screen.widget.SearchWidget;
import com.raoulvdberge.refinedstorage.screen.widget.TabListWidget;
import com.raoulvdberge.refinedstorage.screen.widget.sidebutton.*;
import com.raoulvdberge.refinedstorage.tile.config.IType;
import com.raoulvdberge.refinedstorage.tile.grid.TileGrid;
import com.raoulvdberge.refinedstorage.tile.grid.portable.IPortableGrid;
@@ -35,7 +35,7 @@ import net.minecraftforge.fml.client.config.GuiCheckBox;
import java.util.LinkedList;
import java.util.List;
public class GuiGrid extends GuiBase<ContainerGrid> implements IResizableDisplay {
public class GuiGrid extends BaseScreen<ContainerGrid> implements IResizableDisplay {
private IGridView view;
private SearchWidget searchField;

12
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGridCraftingSettings.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GuiGridCraftingSettings.java
View File

@@ -1,11 +1,11 @@
package com.raoulvdberge.refinedstorage.gui.grid;
package com.raoulvdberge.refinedstorage.screen.grid;
import com.google.common.primitives.Ints;
import com.raoulvdberge.refinedstorage.container.ContainerCraftingSettings;
import com.raoulvdberge.refinedstorage.gui.GuiAmountSpecifying;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackFluid;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.screen.GuiAmountSpecifying;
import com.raoulvdberge.refinedstorage.screen.grid.stack.GridStackFluid;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraftforge.fluids.FluidAttributes;
@@ -13,7 +13,7 @@ import net.minecraftforge.fluids.FluidAttributes;
public class GuiGridCraftingSettings extends GuiAmountSpecifying<ContainerCraftingSettings> {
private IGridStack stack;
public GuiGridCraftingSettings(GuiBase parent, PlayerEntity player, IGridStack stack) {
public GuiGridCraftingSettings(BaseScreen parent, PlayerEntity player, IGridStack stack) {
super(parent, new ContainerCraftingSettings(player, stack), 172, 99, player.inventory);
this.stack = stack;

6
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/filtering/GridFilterCraftable.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/GridFilterCraftable.java Executable file → Normal file
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.gui.grid.filtering;
package com.raoulvdberge.refinedstorage.screen.grid.filtering;
import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackItem;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.screen.grid.stack.GridStackItem;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
import java.util.function.Predicate;

8
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/filtering/GridFilterFilter.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/GridFilterFilter.java
View File

@@ -1,10 +1,10 @@
package com.raoulvdberge.refinedstorage.gui.grid.filtering;
package com.raoulvdberge.refinedstorage.screen.grid.filtering;
import com.raoulvdberge.refinedstorage.api.util.IFilter;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackFluid;
import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackItem;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.screen.grid.stack.GridStackFluid;
import com.raoulvdberge.refinedstorage.screen.grid.stack.GridStackItem;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;

4
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/filtering/GridFilterMod.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/GridFilterMod.java Executable file → Normal file
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.gui.grid.filtering;
package com.raoulvdberge.refinedstorage.screen.grid.filtering;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
import java.util.function.Predicate;

4
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/filtering/GridFilterName.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/GridFilterName.java Executable file → Normal file
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.gui.grid.filtering;
package com.raoulvdberge.refinedstorage.screen.grid.filtering;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
import java.util.function.Predicate;

4
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/filtering/GridFilterOr.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/GridFilterOr.java
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.gui.grid.filtering;
package com.raoulvdberge.refinedstorage.screen.grid.filtering;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
import java.util.List;
import java.util.function.Predicate;

4
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/filtering/GridFilterOreDict.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/GridFilterOreDict.java
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.gui.grid.filtering;
package com.raoulvdberge.refinedstorage.screen.grid.filtering;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
import java.util.Arrays;
import java.util.function.Predicate;

4
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/filtering/GridFilterParser.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/GridFilterParser.java Executable file → Normal file
View File

@@ -1,8 +1,8 @@
package com.raoulvdberge.refinedstorage.gui.grid.filtering;
package com.raoulvdberge.refinedstorage.screen.grid.filtering;
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import com.raoulvdberge.refinedstorage.api.util.IFilter;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
import javax.annotation.Nullable;
import java.util.LinkedList;

4
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/filtering/GridFilterTooltip.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/filtering/GridFilterTooltip.java Executable file → Normal file
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.gui.grid.filtering;
package com.raoulvdberge.refinedstorage.screen.grid.filtering;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
import java.util.function.Predicate;

2
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSorterDirection.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/GridSorterDirection.java
View File

@@ -1,4 +1,4 @@
package com.raoulvdberge.refinedstorage.gui.grid.sorting;
package com.raoulvdberge.refinedstorage.screen.grid.sorting;
public enum GridSorterDirection {
ASCENDING,

4
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSorterID.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/GridSorterID.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.gui.grid.sorting;
package com.raoulvdberge.refinedstorage.screen.grid.sorting;
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

4
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSorterInventoryTweaks.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/GridSorterInventoryTweaks.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.gui.grid.sorting;
package com.raoulvdberge.refinedstorage.screen.grid.sorting;
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
// TODO
public class GridSorterInventoryTweaks implements IGridSorter {

4
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSorterLastModified.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/GridSorterLastModified.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.gui.grid.sorting;
package com.raoulvdberge.refinedstorage.screen.grid.sorting;
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
public class GridSorterLastModified implements IGridSorter {
@Override

4
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSorterName.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/GridSorterName.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.gui.grid.sorting;
package com.raoulvdberge.refinedstorage.screen.grid.sorting;
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
public class GridSorterName implements IGridSorter {
@Override

4
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSorterQuantity.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/GridSorterQuantity.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.gui.grid.sorting;
package com.raoulvdberge.refinedstorage.screen.grid.sorting;
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
public class GridSorterQuantity implements IGridSorter {
@Override

4
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/IGridSorter.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/IGridSorter.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.gui.grid.sorting;
package com.raoulvdberge.refinedstorage.screen.grid.sorting;
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
public interface IGridSorter {
boolean isApplicable(IGrid grid);

6
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackFluid.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/GridStackFluid.java Executable file → Normal file
View File

@@ -1,9 +1,9 @@
package com.raoulvdberge.refinedstorage.gui.grid.stack;
package com.raoulvdberge.refinedstorage.screen.grid.stack;
import com.raoulvdberge.refinedstorage.api.storage.IStorageTracker;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.render.FluidRenderer;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import net.minecraft.client.resources.I18n;
import net.minecraftforge.fluids.FluidStack;
@@ -105,7 +105,7 @@ public class GridStackFluid implements IGridStack {
}
@Override
public void draw(GuiBase gui, int x, int y) {
public void draw(BaseScreen gui, int x, int y) {
FluidRenderer.INSTANCE.render(x, y, stack);
String text;

6
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackItem.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/GridStackItem.java Executable file → Normal file
View File

@@ -1,8 +1,8 @@
package com.raoulvdberge.refinedstorage.gui.grid.stack;
package com.raoulvdberge.refinedstorage.screen.grid.stack;
import com.raoulvdberge.refinedstorage.api.storage.IStorageTracker;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
@@ -150,7 +150,7 @@ public class GridStackItem implements IGridStack {
}
@Override
public void draw(GuiBase gui, int x, int y) {
public void draw(BaseScreen gui, int x, int y) {
String text = null;
if (displayCraftText) {

6
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/IGridStack.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/stack/IGridStack.java Executable file → Normal file
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.gui.grid.stack;
package com.raoulvdberge.refinedstorage.screen.grid.stack;
import com.raoulvdberge.refinedstorage.api.storage.IStorageTracker;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import javax.annotation.Nullable;
@@ -22,7 +22,7 @@ public interface IGridStack {
String getFormattedFullQuantity();
void draw(GuiBase gui, int x, int y);
void draw(BaseScreen gui, int x, int y);
Object getIngredient();

12
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/view/GridViewBase.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/view/GridViewBase.java
View File

@@ -1,11 +1,11 @@
package com.raoulvdberge.refinedstorage.gui.grid.view;
package com.raoulvdberge.refinedstorage.screen.grid.view;
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.gui.grid.filtering.GridFilterParser;
import com.raoulvdberge.refinedstorage.gui.grid.sorting.GridSorterDirection;
import com.raoulvdberge.refinedstorage.gui.grid.sorting.IGridSorter;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.screen.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.screen.grid.filtering.GridFilterParser;
import com.raoulvdberge.refinedstorage.screen.grid.sorting.GridSorterDirection;
import com.raoulvdberge.refinedstorage.screen.grid.sorting.IGridSorter;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
import java.util.*;
import java.util.function.Predicate;

10
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/view/GridViewFluid.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/view/GridViewFluid.java
View File

@@ -1,9 +1,9 @@
package com.raoulvdberge.refinedstorage.gui.grid.view;
package com.raoulvdberge.refinedstorage.screen.grid.view;
import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.gui.grid.sorting.IGridSorter;
import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackFluid;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.screen.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.screen.grid.sorting.IGridSorter;
import com.raoulvdberge.refinedstorage.screen.grid.stack.GridStackFluid;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
import java.util.List;

10
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/view/GridViewItem.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/view/GridViewItem.java
View File

@@ -1,9 +1,9 @@
package com.raoulvdberge.refinedstorage.gui.grid.view;
package com.raoulvdberge.refinedstorage.screen.grid.view;
import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.gui.grid.sorting.IGridSorter;
import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackItem;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.screen.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.screen.grid.sorting.IGridSorter;
import com.raoulvdberge.refinedstorage.screen.grid.stack.GridStackItem;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
import java.util.List;

4
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/view/IGridView.java → src/main/java/com/raoulvdberge/refinedstorage/screen/grid/view/IGridView.java
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.gui.grid.view;
package com.raoulvdberge.refinedstorage.screen.grid.view;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
import java.util.List;

2
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/CheckBoxWidget.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/CheckBoxWidget.java
View File

@@ -1,4 +1,4 @@
package com.raoulvdberge.refinedstorage.gui.widget;
package com.raoulvdberge.refinedstorage.screen.widget;
import net.minecraft.client.Minecraft;
import net.minecraftforge.fml.client.config.GuiCheckBox;

8
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/ScrollbarWidget.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidget.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.gui.widget;
package com.raoulvdberge.refinedstorage.screen.widget;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.util.RenderUtils;
import java.util.LinkedList;
@@ -51,12 +51,12 @@ public class ScrollbarWidget {
return enabled;
}
public void draw(GuiBase gui) {
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 update(GuiBase gui, int mouseX, int mouseY) {
public void update(BaseScreen gui, int mouseX, int mouseY) {
if (!isEnabled()) {
isScrolling = false;
wasClicking = false;

2
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/ScrollbarWidgetListener.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/ScrollbarWidgetListener.java
View File

@@ -1,4 +1,4 @@
package com.raoulvdberge.refinedstorage.gui.widget;
package com.raoulvdberge.refinedstorage.screen.widget;
public interface ScrollbarWidgetListener {
void onOffsetChanged(int oldOffset, int newOffset);

2
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/SearchWidget.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/SearchWidget.java
View File

@@ -1,4 +1,4 @@
package com.raoulvdberge.refinedstorage.gui.widget;
package com.raoulvdberge.refinedstorage.screen.widget;
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import net.minecraft.client.gui.FontRenderer;

8
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/TabListWidget.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/TabListWidget.java
View File

@@ -1,10 +1,10 @@
package com.raoulvdberge.refinedstorage.gui.widget;
package com.raoulvdberge.refinedstorage.screen.widget;
import com.mojang.blaze3d.platform.GlStateManager;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.api.network.grid.IGridTab;
import com.raoulvdberge.refinedstorage.apiimpl.render.ElementDrawers;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.util.RenderUtils;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.widget.button.Button;
@@ -20,7 +20,7 @@ public class TabListWidget {
void onPageChanged(int page);
}
private GuiBase gui;
private BaseScreen gui;
private ElementDrawers drawers;
private Supplier<List<IGridTab>> tabs;
@@ -38,7 +38,7 @@ public class TabListWidget {
private int width;
public TabListWidget(GuiBase gui, ElementDrawers drawers, Supplier<List<IGridTab>> tabs, Supplier<Integer> pages, Supplier<Integer> page, Supplier<Integer> selected, int tabsPerPage) {
public TabListWidget(BaseScreen gui, ElementDrawers drawers, Supplier<List<IGridTab>> tabs, Supplier<Integer> pages, Supplier<Integer> page, Supplier<Integer> selected, int tabsPerPage) {
this.gui = gui;
this.drawers = drawers;
this.tabs = tabs;

8
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/sidebutton/SideButton.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButton.java
View File

@@ -1,8 +1,8 @@
package com.raoulvdberge.refinedstorage.gui.widget.sidebutton;
package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
import com.mojang.blaze3d.platform.GlStateManager;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.util.RenderUtils;
import net.minecraft.client.gui.widget.button.Button;
import org.lwjgl.opengl.GL11;
@@ -11,9 +11,9 @@ public abstract class SideButton extends Button {
public static final int WIDTH = 18;
public static final int HEIGHT = 18;
protected GuiBase gui;
protected BaseScreen gui;
public SideButton(GuiBase gui) {
public SideButton(BaseScreen gui) {
super(-1, -1, 18, 18, "", btn -> {
});

6
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/sidebutton/SideButtonAccessType.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonAccessType.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.gui.widget.sidebutton;
package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
import com.raoulvdberge.refinedstorage.api.storage.AccessType;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
import com.raoulvdberge.refinedstorage.util.AccessTypeUtils;
@@ -11,7 +11,7 @@ import net.minecraft.util.text.TextFormatting;
public class SideButtonAccessType extends SideButton {
private TileDataParameter<AccessType, ?> parameter;
public SideButtonAccessType(GuiBase gui, TileDataParameter<AccessType, ?> parameter) {
public SideButtonAccessType(BaseScreen gui, TileDataParameter<AccessType, ?> parameter) {
super(gui);
this.parameter = parameter;

6
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/sidebutton/SideButtonCompare.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonCompare.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.gui.widget.sidebutton;
package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
import com.raoulvdberge.refinedstorage.api.util.IComparer;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
import net.minecraft.client.resources.I18n;
@@ -11,7 +11,7 @@ public class SideButtonCompare extends SideButton {
private TileDataParameter<Integer, ?> parameter;
private int mask;
public SideButtonCompare(GuiBase gui, TileDataParameter<Integer, ?> parameter, int mask) {
public SideButtonCompare(BaseScreen gui, TileDataParameter<Integer, ?> parameter, int mask) {
super(gui);
this.parameter = parameter;

6
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/sidebutton/SideButtonConstuctorDrop.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonConstuctorDrop.java
View File

@@ -1,13 +1,13 @@
package com.raoulvdberge.refinedstorage.gui.widget.sidebutton;
package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.tile.TileConstructor;
import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.text.TextFormatting;
public class SideButtonConstuctorDrop extends SideButton {
public SideButtonConstuctorDrop(GuiBase gui) {
public SideButtonConstuctorDrop(BaseScreen gui) {
super(gui);
}

4
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/sidebutton/SideButtonCrafterManagerSearchBoxMode.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonCrafterManagerSearchBoxMode.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.gui.widget.sidebutton;
package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import com.raoulvdberge.refinedstorage.gui.GuiCrafterManager;
import com.raoulvdberge.refinedstorage.screen.GuiCrafterManager;
import com.raoulvdberge.refinedstorage.tile.TileCrafterManager;
import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
import net.minecraft.client.resources.I18n;

6
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/sidebutton/SideButtonCrafterMode.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonCrafterMode.java
View File

@@ -1,13 +1,13 @@
package com.raoulvdberge.refinedstorage.gui.widget.sidebutton;
package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.tile.TileCrafter;
import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.text.TextFormatting;
public class SideButtonCrafterMode extends SideButton {
public SideButtonCrafterMode(GuiBase gui) {
public SideButtonCrafterMode(BaseScreen gui) {
super(gui);
}

6
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/sidebutton/SideButtonDestructorPickup.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonDestructorPickup.java
View File

@@ -1,13 +1,13 @@
package com.raoulvdberge.refinedstorage.gui.widget.sidebutton;
package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.tile.TileDestructor;
import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.text.TextFormatting;
public class SideButtonDestructorPickup extends SideButton {
public SideButtonDestructorPickup(GuiBase gui) {
public SideButtonDestructorPickup(BaseScreen gui) {
super(gui);
}

6
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/sidebutton/SideButtonDetectorMode.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonDetectorMode.java
View File

@@ -1,14 +1,14 @@
package com.raoulvdberge.refinedstorage.gui.widget.sidebutton;
package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeDetector;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.tile.TileDetector;
import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.text.TextFormatting;
public class SideButtonDetectorMode extends SideButton {
public SideButtonDetectorMode(GuiBase gui) {
public SideButtonDetectorMode(BaseScreen gui) {
super(gui);
}

8
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/sidebutton/SideButtonFilterType.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonFilterType.java
View File

@@ -1,14 +1,14 @@
package com.raoulvdberge.refinedstorage.gui.widget.sidebutton;
package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
import com.raoulvdberge.refinedstorage.gui.GuiFilter;
import com.raoulvdberge.refinedstorage.screen.FilterScreen;
import com.raoulvdberge.refinedstorage.tile.config.IType;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.text.TextFormatting;
public class SideButtonFilterType extends SideButton {
private GuiFilter gui;
private FilterScreen gui;
public SideButtonFilterType(GuiFilter gui) {
public SideButtonFilterType(FilterScreen gui) {
super(gui);
this.gui = gui;

4
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/sidebutton/SideButtonGridSearchBoxMode.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridSearchBoxMode.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.gui.widget.sidebutton;
package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.screen.grid.GuiGrid;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.text.TextFormatting;

6
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/sidebutton/SideButtonGridSize.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridSize.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.gui.widget.sidebutton;
package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.text.TextFormatting;
@@ -12,7 +12,7 @@ public class SideButtonGridSize extends SideButton {
private Supplier<Integer> size;
private Consumer<Integer> handler;
public SideButtonGridSize(GuiBase gui, Supplier<Integer> size, Consumer<Integer> handler) {
public SideButtonGridSize(BaseScreen gui, Supplier<Integer> size, Consumer<Integer> handler) {
super(gui);
this.size = size;
this.handler = handler;

6
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/sidebutton/SideButtonGridSortingDirection.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridSortingDirection.java
View File

@@ -1,14 +1,14 @@
package com.raoulvdberge.refinedstorage.gui.widget.sidebutton;
package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.text.TextFormatting;
public class SideButtonGridSortingDirection extends SideButton {
private IGrid grid;
public SideButtonGridSortingDirection(GuiBase gui, IGrid grid) {
public SideButtonGridSortingDirection(BaseScreen gui, IGrid grid) {
super(gui);
this.grid = grid;

6
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/sidebutton/SideButtonGridSortingType.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridSortingType.java
View File

@@ -1,16 +1,16 @@
package com.raoulvdberge.refinedstorage.gui.widget.sidebutton;
package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
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.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.text.TextFormatting;
public class SideButtonGridSortingType extends SideButton {
private IGrid grid;
public SideButtonGridSortingType(GuiBase gui, IGrid grid) {
public SideButtonGridSortingType(BaseScreen gui, IGrid grid) {
super(gui);
this.grid = grid;

6
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/sidebutton/SideButtonGridViewType.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonGridViewType.java
View File

@@ -1,14 +1,14 @@
package com.raoulvdberge.refinedstorage.gui.widget.sidebutton;
package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.text.TextFormatting;
public class SideButtonGridViewType extends SideButton {
private IGrid grid;
public SideButtonGridViewType(GuiBase gui, IGrid grid) {
public SideButtonGridViewType(BaseScreen gui, IGrid grid) {
super(gui);
this.grid = grid;

6
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/sidebutton/SideButtonIOMode.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonIOMode.java
View File

@@ -1,14 +1,14 @@
package com.raoulvdberge.refinedstorage.gui.widget.sidebutton;
package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.diskmanipulator.NetworkNodeDiskManipulator;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.tile.TileDiskManipulator;
import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.text.TextFormatting;
public class SideButtonIOMode extends SideButton {
public SideButtonIOMode(GuiBase gui) {
public SideButtonIOMode(BaseScreen gui) {
super(gui);
}

6
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/sidebutton/SideButtonMode.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonMode.java
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.gui.widget.sidebutton;
package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.tile.config.IFilterable;
import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
@@ -10,7 +10,7 @@ import net.minecraft.util.text.TextFormatting;
public class SideButtonMode extends SideButton {
private TileDataParameter<Integer, ?> parameter;
public SideButtonMode(GuiBase gui, TileDataParameter<Integer, ?> parameter) {
public SideButtonMode(BaseScreen gui, TileDataParameter<Integer, ?> parameter) {
super(gui);
this.parameter = parameter;

6
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/sidebutton/SideButtonRedstoneMode.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonRedstoneMode.java
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.gui.widget.sidebutton;
package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
import net.minecraft.client.resources.I18n;
@@ -9,7 +9,7 @@ import net.minecraft.util.text.TextFormatting;
public class SideButtonRedstoneMode extends SideButton {
private TileDataParameter<Integer, ?> parameter;
public SideButtonRedstoneMode(GuiBase gui, TileDataParameter<Integer, ?> parameter) {
public SideButtonRedstoneMode(BaseScreen gui, TileDataParameter<Integer, ?> parameter) {
super(gui);
this.parameter = parameter;

6
src/main/java/com/raoulvdberge/refinedstorage/gui/widget/sidebutton/SideButtonType.java → src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/SideButtonType.java
View File

@@ -1,6 +1,6 @@
package com.raoulvdberge.refinedstorage.gui.widget.sidebutton;
package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.tile.config.IType;
import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
@@ -10,7 +10,7 @@ import net.minecraft.util.text.TextFormatting;
public class SideButtonType extends SideButton {
private TileDataParameter<Integer, ?> type;
public SideButtonType(GuiBase gui, TileDataParameter<Integer, ?> type) {
public SideButtonType(BaseScreen gui, TileDataParameter<Integer, ?> type) {
super(gui);
this.type = type;

2
src/main/java/com/raoulvdberge/refinedstorage/tile/TileCrafter.java
View File

@@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.tile;
import com.raoulvdberge.refinedstorage.RSTiles;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeCrafter;
import com.raoulvdberge.refinedstorage.gui.TileDataParameterClientListenerCrafter;
import com.raoulvdberge.refinedstorage.screen.TileDataParameterClientListenerCrafter;
import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
import net.minecraft.network.datasync.DataSerializers;
import net.minecraft.util.math.BlockPos;

8
src/main/java/com/raoulvdberge/refinedstorage/tile/TileCrafterManager.java
View File

@@ -3,8 +3,8 @@ package com.raoulvdberge.refinedstorage.tile;
import com.raoulvdberge.refinedstorage.RSTiles;
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeCrafterManager;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.gui.GuiCrafterManager;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.screen.GuiCrafterManager;
import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
import net.minecraft.network.datasync.DataSerializers;
import net.minecraft.util.math.BlockPos;
@@ -16,13 +16,13 @@ public class TileCrafterManager extends TileNode<NetworkNodeCrafterManager> {
t.getNode().setSize(v);
t.getNode().markDirty();
}
}, (initial, p) -> GuiBase.executeLater(GuiCrafterManager.class, GuiBase::init));
}, (initial, p) -> BaseScreen.executeLater(GuiCrafterManager.class, BaseScreen::init));
public static final TileDataParameter<Integer, TileCrafterManager> SEARCH_BOX_MODE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getSearchBoxMode(), (t, v) -> {
if (IGrid.isValidSearchBoxMode(v)) {
t.getNode().setSearchBoxMode(v);
t.getNode().markDirty();
}
}, (initial, p) -> GuiBase.executeLater(GuiCrafterManager.class, crafterManager -> crafterManager.getSearchField().setMode(p)));
}, (initial, p) -> BaseScreen.executeLater(GuiCrafterManager.class, crafterManager -> crafterManager.getSearchField().setMode(p)));
public TileCrafterManager() {
super(RSTiles.CRAFTER_MANAGER);

6
src/main/java/com/raoulvdberge/refinedstorage/tile/TileDetector.java
View File

@@ -2,8 +2,8 @@ package com.raoulvdberge.refinedstorage.tile;
import com.raoulvdberge.refinedstorage.RSTiles;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeDetector;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.gui.GuiDetector;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.screen.GuiDetector;
import com.raoulvdberge.refinedstorage.tile.config.IComparable;
import com.raoulvdberge.refinedstorage.tile.config.IType;
import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
@@ -28,7 +28,7 @@ public class TileDetector extends TileNode<NetworkNodeDetector> {
public static final TileDataParameter<Integer, TileDetector> AMOUNT = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getAmount(), (t, v) -> {
t.getNode().setAmount(v);
t.getNode().markDirty();
}, (initial, p) -> GuiBase.executeLater(GuiDetector.class, detector -> detector.getAmount().setText(String.valueOf(p))));
}, (initial, p) -> BaseScreen.executeLater(GuiDetector.class, detector -> detector.getAmount().setText(String.valueOf(p))));
public TileDetector() {
super(RSTiles.DETECTOR);

6
src/main/java/com/raoulvdberge/refinedstorage/tile/TileReader.java
View File

@@ -3,8 +3,8 @@ package com.raoulvdberge.refinedstorage.tile;
import com.raoulvdberge.refinedstorage.RSTiles;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.IGuiReaderWriter;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeReader;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.gui.GuiReaderWriter;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.screen.GuiReaderWriter;
import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
import net.minecraft.network.datasync.DataSerializers;
import net.minecraft.util.math.BlockPos;
@@ -18,7 +18,7 @@ public class TileReader extends TileNode<NetworkNodeReader> {
((IGuiReaderWriter) t.getNode()).setChannel(v);
t.getNode().markDirty();
}, (initial, p) -> GuiBase.executeLater(GuiReaderWriter.class, readerWriter -> readerWriter.setCurrentChannel(p)));
}, (initial, p) -> BaseScreen.executeLater(GuiReaderWriter.class, readerWriter -> readerWriter.setCurrentChannel(p)));
}
public static final TileDataParameter<String, TileReader> CHANNEL = createChannelParameter();

18
src/main/java/com/raoulvdberge/refinedstorage/tile/grid/TileGrid.java
View File

@@ -3,8 +3,8 @@ package com.raoulvdberge.refinedstorage.tile.grid;
import com.raoulvdberge.refinedstorage.RSTiles;
import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.screen.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.tile.TileNode;
import com.raoulvdberge.refinedstorage.tile.config.IType;
import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
@@ -38,17 +38,17 @@ public class TileGrid extends TileNode<NetworkNodeGrid> {
t.getNode().setSearchBoxMode(v);
t.getNode().markDirty();
}
}, (initial, p) -> GuiBase.executeLater(GuiGrid.class, grid -> grid.getSearchField().setMode(p)));
}, (initial, p) -> BaseScreen.executeLater(GuiGrid.class, grid -> grid.getSearchField().setMode(p)));
public static final TileDataParameter<Integer, TileGrid> SIZE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getSize(), (t, v) -> {
if (IGrid.isValidSize(v)) {
t.getNode().setSize(v);
t.getNode().markDirty();
}
}, (initial, p) -> GuiBase.executeLater(GuiGrid.class, GuiBase::init));
}, (initial, p) -> BaseScreen.executeLater(GuiGrid.class, BaseScreen::init));
public static final TileDataParameter<Integer, TileGrid> TAB_SELECTED = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getTabSelected(), (t, v) -> {
t.getNode().setTabSelected(v == t.getNode().getTabSelected() ? -1 : v);
t.getNode().markDirty();
}, (initial, p) -> GuiBase.executeLater(GuiGrid.class, grid -> grid.getView().sort()));
}, (initial, p) -> BaseScreen.executeLater(GuiGrid.class, grid -> grid.getView().sort()));
public static final TileDataParameter<Integer, TileGrid> TAB_PAGE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getTabPage(), (t, v) -> {
if (v >= 0 && v <= t.getNode().getTotalTabPages()) {
t.getNode().setTabPage(v);
@@ -58,17 +58,17 @@ public class TileGrid extends TileNode<NetworkNodeGrid> {
public static final TileDataParameter<Boolean, TileGrid> OREDICT_PATTERN = new TileDataParameter<>(DataSerializers.BOOLEAN, false, t -> t.getNode().isOredictPattern(), (t, v) -> {
t.getNode().setOredictPattern(v);
t.getNode().markDirty();
}, (initial, p) -> GuiBase.executeLater(GuiGrid.class, grid -> grid.updateOredictPattern(p)));
}, (initial, p) -> BaseScreen.executeLater(GuiGrid.class, grid -> grid.updateOredictPattern(p)));
public static final TileDataParameter<Boolean, TileGrid> PROCESSING_PATTERN = new TileDataParameter<>(DataSerializers.BOOLEAN, false, t -> t.getNode().isProcessingPattern(), (t, v) -> {
t.getNode().setProcessingPattern(v);
t.getNode().clearMatrix();
t.getNode().markDirty();
}, (initial, p) -> GuiBase.executeLater(GuiGrid.class, GuiBase::init));
public static final TileDataParameter<Integer, TileGrid> PROCESSING_TYPE = IType.createParameter((initial, p) -> GuiBase.executeLater(GuiGrid.class, GuiBase::init));
}, (initial, p) -> BaseScreen.executeLater(GuiGrid.class, BaseScreen::init));
public static final TileDataParameter<Integer, TileGrid> PROCESSING_TYPE = IType.createParameter((initial, p) -> BaseScreen.executeLater(GuiGrid.class, BaseScreen::init));
public static void trySortGrid(boolean initial) {
if (!initial) {
GuiBase.executeLater(GuiGrid.class, grid -> grid.getView().sort());
BaseScreen.executeLater(GuiGrid.class, grid -> grid.getView().sort());
}
}

10
src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java
View File

@@ -8,9 +8,9 @@ import com.raoulvdberge.refinedstorage.api.storage.IStorageCache;
import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener;
import com.raoulvdberge.refinedstorage.api.util.IFilter;
import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheListenerGridFluid;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilter;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.screen.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.util.StackUtils;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.PlayerEntity;
@@ -193,7 +193,7 @@ public class WirelessFluidGrid implements IGridNetworkAware {
this.sortingType = type;
GuiBase.executeLater(GuiGrid.class, grid -> grid.getView().sort());
BaseScreen.executeLater(GuiGrid.class, grid -> grid.getView().sort());
}
@Override
@@ -202,7 +202,7 @@ public class WirelessFluidGrid implements IGridNetworkAware {
this.sortingDirection = direction;
GuiBase.executeLater(GuiGrid.class, grid -> grid.getView().sort());
BaseScreen.executeLater(GuiGrid.class, grid -> grid.getView().sort());
}
@Override
@@ -229,7 +229,7 @@ public class WirelessFluidGrid implements IGridNetworkAware {
// TODO RS.INSTANCE.network.sendToServer(new MessageWirelessFluidGridSettingsUpdate(getSortingDirection(), getSortingType(), getSearchBoxMode(), getSize(), tabSelected, getTabPage()));
GuiBase.executeLater(GuiGrid.class, grid -> grid.getView().sort());
BaseScreen.executeLater(GuiGrid.class, grid -> grid.getView().sort());
}
@Override

12
src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java
View File

@@ -8,9 +8,9 @@ import com.raoulvdberge.refinedstorage.api.storage.IStorageCache;
import com.raoulvdberge.refinedstorage.api.storage.IStorageCacheListener;
import com.raoulvdberge.refinedstorage.api.util.IFilter;
import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheListenerGridItem;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilter;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.screen.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.util.StackUtils;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity;
@@ -189,7 +189,7 @@ public class WirelessGrid implements IGridNetworkAware {
this.viewType = type;
GuiBase.executeLater(GuiGrid.class, grid -> grid.getView().sort());
BaseScreen.executeLater(GuiGrid.class, grid -> grid.getView().sort());
}
@Override
@@ -198,7 +198,7 @@ public class WirelessGrid implements IGridNetworkAware {
this.sortingType = type;
GuiBase.executeLater(GuiGrid.class, grid -> grid.getView().sort());
BaseScreen.executeLater(GuiGrid.class, grid -> grid.getView().sort());
}
@Override
@@ -207,7 +207,7 @@ public class WirelessGrid implements IGridNetworkAware {
this.sortingDirection = direction;
GuiBase.executeLater(GuiGrid.class, grid -> grid.getView().sort());
BaseScreen.executeLater(GuiGrid.class, grid -> grid.getView().sort());
}
@Override
@@ -234,7 +234,7 @@ public class WirelessGrid implements IGridNetworkAware {
// TODO RS.INSTANCE.network.sendToServer(new MessageGridSettingsUpdate(getViewType(), getSortingDirection(), getSortingType(), getSearchBoxMode(), getSize(), tabSelected, getTabPage()));
GuiBase.executeLater(GuiGrid.class, grid -> grid.getView().sort());
BaseScreen.executeLater(GuiGrid.class, grid -> grid.getView().sort());
}
@Override

10
src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java
View File

@@ -22,10 +22,10 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.node.diskdrive.NetworkNod
import com.raoulvdberge.refinedstorage.apiimpl.storage.*;
import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskFluidPortable;
import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskItemPortable;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilter;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.screen.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.util.StackUtils;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity;
@@ -298,7 +298,7 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer
this.sortingType = type;
GuiBase.executeLater(GuiGrid.class, grid -> grid.getView().sort());
BaseScreen.executeLater(GuiGrid.class, grid -> grid.getView().sort());
}
@Override
@@ -307,7 +307,7 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer
this.sortingDirection = direction;
GuiBase.executeLater(GuiGrid.class, grid -> grid.getView().sort());
BaseScreen.executeLater(GuiGrid.class, grid -> grid.getView().sort());
}
@Override
@@ -334,7 +334,7 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer
// TODO RS.INSTANCE.network.sendToServer(new MessageGridSettingsUpdate(getViewType(), getSortingDirection(), getSortingType(), getSearchBoxMode(), getSize(), tabSelected, getTabPage()));
GuiBase.executeLater(GuiGrid.class, grid -> grid.getView().sort());
BaseScreen.executeLater(GuiGrid.class, grid -> grid.getView().sort());
}
@Override

10
src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java
View File

@@ -25,12 +25,12 @@ import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskItemPorta
import com.raoulvdberge.refinedstorage.block.BlockPortableGrid;
import com.raoulvdberge.refinedstorage.block.enums.PortableGridDiskState;
import com.raoulvdberge.refinedstorage.block.enums.PortableGridType;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilter;
import com.raoulvdberge.refinedstorage.inventory.listener.ListenerTile;
import com.raoulvdberge.refinedstorage.render.constants.ConstantsDisk;
import com.raoulvdberge.refinedstorage.screen.BaseScreen;
import com.raoulvdberge.refinedstorage.screen.grid.GuiGrid;
import com.raoulvdberge.refinedstorage.tile.TileBase;
import com.raoulvdberge.refinedstorage.tile.config.IRedstoneConfigurable;
import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode;
@@ -85,17 +85,17 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid,
t.setSearchBoxMode(v);
t.markDirty();
}
}, (initial, p) -> GuiBase.executeLater(GuiGrid.class, grid -> grid.getSearchField().setMode(p)));
}, (initial, p) -> BaseScreen.executeLater(GuiGrid.class, grid -> grid.getSearchField().setMode(p)));
private static final TileDataParameter<Integer, TilePortableGrid> SIZE = new TileDataParameter<>(DataSerializers.VARINT, 0, TilePortableGrid::getSize, (t, v) -> {
if (IGrid.isValidSize(v)) {
t.setSize(v);
t.markDirty();
}
}, (initial, p) -> GuiBase.executeLater(GuiGrid.class, GuiBase::init));
}, (initial, p) -> BaseScreen.executeLater(GuiGrid.class, BaseScreen::init));
private static final TileDataParameter<Integer, TilePortableGrid> TAB_SELECTED = new TileDataParameter<>(DataSerializers.VARINT, 0, TilePortableGrid::getTabSelected, (t, v) -> {
t.setTabSelected(v == t.getTabSelected() ? -1 : v);
t.markDirty();
}, (initial, p) -> GuiBase.executeLater(GuiGrid.class, grid -> grid.getView().sort()));
}, (initial, p) -> BaseScreen.executeLater(GuiGrid.class, grid -> grid.getView().sort()));
private static final TileDataParameter<Integer, TilePortableGrid> TAB_PAGE = new TileDataParameter<>(DataSerializers.VARINT, 0, TilePortableGrid::getTabPage, (t, v) -> {
if (v >= 0 && v <= t.getTotalTabPages()) {
t.setTabPage(v);

4
src/main/java/com/raoulvdberge/refinedstorage/util/StackUtils.java
View File

@@ -6,8 +6,8 @@ import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk;
import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageTrackerEntry;
import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackFluid;
import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackItem;
import com.raoulvdberge.refinedstorage.screen.grid.stack.GridStackFluid;
import com.raoulvdberge.refinedstorage.screen.grid.stack.GridStackItem;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;