From 8ab94e67416ee778ebed41f8cb3f6e8268992d19 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sun, 14 Jan 2018 19:39:19 +0100 Subject: [PATCH] Improve genetic filter implementation --- lang | 2 +- .../forestry/core/network/PacketIdClient.java | 3 ++ .../sorting/gui/ContainerGeneticFilter.java | 23 +++++--- .../sorting/gui/GuiGeneticFilter.java | 14 +++-- .../sorting/gui/widgets/RuleWidget.java | 8 ++- .../sorting/gui/widgets/SpeciesWidget.java | 18 +++---- .../network/PacketRegistrySorting.java | 4 +- .../packets/PacketGuiFilterUpdate.java | 53 +++++++++++++++++++ .../sorting/tiles/IFilterContainer.java | 20 +++++++ .../sorting/tiles/TileGeneticFilter.java | 15 ++++-- 10 files changed, 123 insertions(+), 37 deletions(-) create mode 100644 src/main/java/forestry/sorting/network/packets/PacketGuiFilterUpdate.java create mode 100644 src/main/java/forestry/sorting/tiles/IFilterContainer.java diff --git a/lang b/lang index cf9f2c21f..7b6f08376 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit cf9f2c21f53e6ad4ce180bdccf258ff7e717ce94 +Subproject commit 7b6f08376464eaade21f3a438981e519e046fa57 diff --git a/src/main/java/forestry/core/network/PacketIdClient.java b/src/main/java/forestry/core/network/PacketIdClient.java index 4c6aff15c..4160ffd6e 100644 --- a/src/main/java/forestry/core/network/PacketIdClient.java +++ b/src/main/java/forestry/core/network/PacketIdClient.java @@ -68,6 +68,9 @@ public enum PacketIdClient implements IPacketId { UPDATE_CLIMATE, CAMOUFLAGE_SELECTION, + // Sorting + GUI_UPDATE_FILTER, + // JEI RECIPE_TRANSFER_UPDATE; diff --git a/src/main/java/forestry/sorting/gui/ContainerGeneticFilter.java b/src/main/java/forestry/sorting/gui/ContainerGeneticFilter.java index 9847746c6..623454d0e 100644 --- a/src/main/java/forestry/sorting/gui/ContainerGeneticFilter.java +++ b/src/main/java/forestry/sorting/gui/ContainerGeneticFilter.java @@ -1,16 +1,20 @@ package forestry.sorting.gui; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.tileentity.TileEntity; import forestry.core.gui.ContainerTile; -import forestry.core.network.packets.PacketGuiUpdate; -import forestry.sorting.tiles.TileGeneticFilter; +import forestry.sorting.network.packets.PacketGuiFilterUpdate; +import forestry.sorting.tiles.IFilterContainer; -public class ContainerGeneticFilter extends ContainerTile { +public class ContainerGeneticFilter extends ContainerTile { + private final IFilterContainer container; private boolean guiNeedsUpdate = true; - public ContainerGeneticFilter(TileGeneticFilter tileForestry, InventoryPlayer playerInventory) { - super(tileForestry); + public ContainerGeneticFilter(IFilterContainer container, InventoryPlayer playerInventory) { + super(container.getTileEntity()); + this.container = container; addInventory(playerInventory, 26, 140); } @@ -26,8 +30,11 @@ public class ContainerGeneticFilter extends ContainerTile { addSlotToContainer(new SlotGeneticFilter(playerInventory, column, xInv + column * 18, yInv + 58)); } - for (int x = 0; x < 6; x++) { - addSlotToContainer(new SlotFilterFacing(tile, x, 8, 18 + x * 18)); + IInventory buffer = container.getBuffer(); + if(buffer != null) { + for (int x = 0; x < 6; x++) { + addSlotToContainer(new SlotFilterFacing(buffer, x, 8, 18 + x * 18)); + } } } @@ -39,7 +46,7 @@ public class ContainerGeneticFilter extends ContainerTile { public void detectAndSendChanges() { super.detectAndSendChanges(); if (guiNeedsUpdate) { - PacketGuiUpdate packet = new PacketGuiUpdate(tile); + PacketGuiFilterUpdate packet = new PacketGuiFilterUpdate(container); sendPacketToListeners(packet); guiNeedsUpdate = false; } diff --git a/src/main/java/forestry/sorting/gui/GuiGeneticFilter.java b/src/main/java/forestry/sorting/gui/GuiGeneticFilter.java index 2c6b64414..fdf1b648f 100644 --- a/src/main/java/forestry/sorting/gui/GuiGeneticFilter.java +++ b/src/main/java/forestry/sorting/gui/GuiGeneticFilter.java @@ -10,6 +10,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import forestry.api.genetics.IFilterLogic; import forestry.core.config.Constants; import forestry.core.gui.Drawable; import forestry.core.gui.GuiForestryTitled; @@ -18,17 +19,17 @@ import forestry.core.gui.widgets.WidgetScrollBar; import forestry.sorting.gui.widgets.RuleWidget; import forestry.sorting.gui.widgets.SelectionWidget; import forestry.sorting.gui.widgets.SpeciesWidget; -import forestry.sorting.tiles.TileGeneticFilter; +import forestry.sorting.tiles.IFilterContainer; public class GuiGeneticFilter extends GuiForestryTitled { - private final TileGeneticFilter tile; + private final IFilterContainer tile; private final WidgetScrollBar scrollBar; public final SelectionWidget selection; @Nullable private GuiTextField searchField; - public GuiGeneticFilter(TileGeneticFilter tile, InventoryPlayer inventory) { + public GuiGeneticFilter(IFilterContainer tile, InventoryPlayer inventory) { super(Constants.TEXTURE_PATH_GUI + "/filter.png", new ContainerGeneticFilter(tile, inventory), tile); ySize = 222; xSize = 212; @@ -153,8 +154,11 @@ public class GuiGeneticFilter extends GuiForestryTitled addHintLedger("filter"); } - - public TileGeneticFilter getTile() { + public IFilterContainer getContainer() { return tile; } + + public IFilterLogic getLogic(){ + return tile.getLogic(); + } } diff --git a/src/main/java/forestry/sorting/gui/widgets/RuleWidget.java b/src/main/java/forestry/sorting/gui/widgets/RuleWidget.java index 86d5c3184..2f302f3aa 100644 --- a/src/main/java/forestry/sorting/gui/widgets/RuleWidget.java +++ b/src/main/java/forestry/sorting/gui/widgets/RuleWidget.java @@ -20,7 +20,6 @@ import forestry.core.utils.SoundUtil; import forestry.core.utils.Translator; import forestry.sorting.gui.GuiGeneticFilter; import forestry.sorting.gui.ISelectableProvider; -import forestry.sorting.tiles.TileGeneticFilter; public class RuleWidget extends Widget implements ISelectableProvider { private static final ImmutableSet ENTRIES = createEntries(); @@ -38,7 +37,7 @@ public class RuleWidget extends Widget implements ISelectableProvider { private final static ImmutableMap ITEMS = createEntries(); @@ -62,9 +60,9 @@ public class SpeciesWidget extends Widget implements ISelectableProvider