Improve genetic filter implementation

This commit is contained in:
Nedelosk committed 2018-01-15 19:03:52 +01:00
1 parent 1278c09064
commit 8ab94e6741
10 files changed
+123 -37

No files matched your search

@@ -68,6 +68,9 @@ public enum PacketIdClient implements IPacketId {
UPDATE_CLIMATE,
CAMOUFLAGE_SELECTION,
// Sorting
GUI_UPDATE_FILTER,
// JEI
RECIPE_TRANSFER_UPDATE;
@@ -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<TileGeneticFilter> {
public class ContainerGeneticFilter extends ContainerTile<TileEntity> {
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<TileGeneticFilter> {
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<TileGeneticFilter> {
public void detectAndSendChanges() {
super.detectAndSendChanges();
if (guiNeedsUpdate) {
PacketGuiUpdate packet = new PacketGuiUpdate(tile);
PacketGuiFilterUpdate packet = new PacketGuiFilterUpdate(container);
sendPacketToListeners(packet);
guiNeedsUpdate = false;
}
@@ -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<ContainerGeneticFilter> {
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<ContainerGeneticFilter>
addHintLedger("filter");
}
public TileGeneticFilter getTile() {
public IFilterContainer getContainer() {
return tile;
}
public IFilterLogic getLogic(){
return tile.getLogic();
}
}
@@ -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<IFilterRuleType> {
private static final ImmutableSet<IFilterRuleType> ENTRIES = createEntries();
@@ -38,7 +37,7 @@ public class RuleWidget extends Widget implements ISelectableProvider<IFilterRul
public void draw(int startX, int startY) {
int x = xPos + startX;
int y = yPos + startY;
IFilterLogic logic = gui.getTile().getLogic();
IFilterLogic logic = gui.getLogic();
IFilterRuleType rule = logic.getRule(facing);
draw(manager.gui, rule, x, y);
TextureManager textureManager = Minecraft.getMinecraft().getTextureManager();
@@ -69,8 +68,7 @@ public class RuleWidget extends Widget implements ISelectableProvider<IFilterRul
@Override
public void onSelect(IFilterRuleType selectable) {
TileGeneticFilter filter = gui.getTile();
IFilterLogic logic = filter.getLogic();
IFilterLogic logic = gui.getLogic();
if (logic.setRule(facing, selectable)) {
logic.sendToServer(facing, selectable);
}
@@ -92,7 +90,7 @@ public class RuleWidget extends Widget implements ISelectableProvider<IFilterRul
@Override
public ToolTip getToolTip(int mouseX, int mouseY) {
IFilterLogic logic = gui.getTile().getLogic();
IFilterLogic logic = gui.getLogic();
IFilterRuleType rule = logic.getRule(facing);
ToolTip tooltip = new ToolTip();
tooltip.add(getName(rule));
@@ -24,10 +24,8 @@ import forestry.core.gui.tooltips.ToolTip;
import forestry.core.gui.widgets.Widget;
import forestry.core.gui.widgets.WidgetManager;
import forestry.core.utils.SoundUtil;
import forestry.sorting.AlleleFilter;
import forestry.sorting.gui.GuiGeneticFilter;
import forestry.sorting.gui.ISelectableProvider;
import forestry.sorting.tiles.TileGeneticFilter;
public class SpeciesWidget extends Widget implements ISelectableProvider<IAlleleSpecies> {
private final static ImmutableMap<IAlleleSpecies, ItemStack> ITEMS = createEntries();
@@ -62,9 +60,9 @@ public class SpeciesWidget extends Widget implements ISelectableProvider<IAllele
public void draw(int startX, int startY) {
int x = xPos + startX;
int y = yPos + startY;
AlleleFilter filter = gui.getTile().getGenomeFilter(facing, index);
if (filter != null) {
IAlleleSpecies allele = (IAlleleSpecies) (active ? filter.activeAllele : filter.inactiveAllele);
IFilterLogic logic = gui.getLogic();
IAlleleSpecies allele = (IAlleleSpecies) logic.getGenomeFilter(facing, index, active);
if (allele != null) {
GuiUtil.drawItemStack(manager.gui, ITEMS.getOrDefault(allele, ItemStack.EMPTY), x, y);
}
TextureManager textureManager = Minecraft.getMinecraft().getTextureManager();
@@ -81,8 +79,7 @@ public class SpeciesWidget extends Widget implements ISelectableProvider<IAllele
@Override
public void onSelect(@Nullable IAlleleSpecies selectable) {
TileGeneticFilter filter = gui.getTile();
IFilterLogic logic = filter.getLogic();
IFilterLogic logic = gui.getLogic();
if (logic.setGenomeFilter(facing, index, active, selectable)) {
logic.sendToServer(facing, (short) index, active, selectable);
}
@@ -105,11 +102,8 @@ public class SpeciesWidget extends Widget implements ISelectableProvider<IAllele
@Nullable
@Override
public ToolTip getToolTip(int mouseX, int mouseY) {
AlleleFilter filter = gui.getTile().getGenomeFilter(facing, index);
if (filter == null) {
return null;
}
IAlleleSpecies allele = (IAlleleSpecies) (active ? filter.activeAllele : filter.inactiveAllele);
IFilterLogic logic = gui.getLogic();
IAlleleSpecies allele = (IAlleleSpecies) logic.getGenomeFilter(facing, index, active);
if (allele == null) {
return null;
}
@@ -4,9 +4,11 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.core.network.IPacketRegistry;
import forestry.core.network.PacketIdClient;
import forestry.core.network.PacketIdServer;
import forestry.sorting.network.packets.PacketFilterChangeGenome;
import forestry.sorting.network.packets.PacketFilterChangeRule;
import forestry.sorting.network.packets.PacketGuiFilterUpdate;
public class PacketRegistrySorting implements IPacketRegistry {
@Override
@@ -18,6 +20,6 @@ public class PacketRegistrySorting implements IPacketRegistry {
@SideOnly(Side.CLIENT)
@Override
public void registerPacketsClient() {
PacketIdClient.GUI_UPDATE_FILTER.setPacketHandler(new PacketGuiFilterUpdate.Handler());
}
}
@@ -0,0 +1,53 @@
package forestry.sorting.network.packets;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.genetics.GeneticCapabilities;
import forestry.api.genetics.IFilterLogic;
import forestry.core.network.ForestryPacket;
import forestry.core.network.IForestryPacketClient;
import forestry.core.network.IForestryPacketHandlerClient;
import forestry.core.network.PacketBufferForestry;
import forestry.core.network.PacketIdClient;
import forestry.core.tiles.TileUtil;
import forestry.sorting.tiles.IFilterContainer;
public class PacketGuiFilterUpdate extends ForestryPacket implements IForestryPacketClient {
private final BlockPos pos;
private final IFilterLogic logic;
public PacketGuiFilterUpdate(IFilterContainer container) {
this.pos = container.getCoordinates();
this.logic = container.getLogic();
}
@Override
protected void writeData(PacketBufferForestry data) throws IOException {
data.writeBlockPos(pos);
logic.writeGuiData(data);
}
@Override
public PacketIdClient getPacketId() {
return PacketIdClient.GUI_UPDATE;
}
@SideOnly(Side.CLIENT)
public static class Handler implements IForestryPacketHandlerClient {
@Override
public void onPacketData(PacketBufferForestry data, EntityPlayer player) throws IOException {
BlockPos pos = data.readBlockPos();
IFilterLogic logic = TileUtil.getInterface(player.world, pos, GeneticCapabilities.FILTER_LOGIC, null);
if (logic != null) {
logic.readGuiData(data);
}
}
}
}
@@ -0,0 +1,20 @@
package forestry.sorting.tiles;
import javax.annotation.Nullable;
import net.minecraft.inventory.IInventory;
import net.minecraft.tileentity.TileEntity;
import forestry.api.core.ILocatable;
import forestry.api.genetics.IFilterLogic;
import forestry.core.tiles.ITitled;
public interface IFilterContainer extends ILocatable, ITitled {
@Nullable
IInventory getBuffer();
TileEntity getTileEntity();
IFilterLogic getLogic();
}
@@ -9,6 +9,7 @@ import java.util.List;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -36,7 +37,6 @@ import forestry.core.network.PacketBufferForestry;
import forestry.core.tiles.TileForestry;
import forestry.core.tiles.TileUtil;
import forestry.core.utils.ItemStackUtil;
import forestry.sorting.AlleleFilter;
import forestry.sorting.FilterData;
import forestry.sorting.FilterLogic;
import forestry.sorting.gui.ContainerGeneticFilter;
@@ -44,7 +44,7 @@ import forestry.sorting.gui.GuiGeneticFilter;
import forestry.sorting.inventory.InventoryFilter;
import forestry.sorting.inventory.ItemHandlerFilter;
public class TileGeneticFilter extends TileForestry implements IStreamableGui {
public class TileGeneticFilter extends TileForestry implements IStreamableGui, IFilterContainer {
private static final int TRANSFER_DELAY = 5;
private final FilterLogic logic;
@@ -168,9 +168,14 @@ public class TileGeneticFilter extends TileForestry implements IStreamableGui {
return logic;
}
@Nullable
public AlleleFilter getGenomeFilter(EnumFacing facing, int index) {
return logic.getGenomeFilter(facing, index);
@Override
public IInventory getBuffer() {
return this;
}
@Override
public TileEntity getTileEntity() {
return this;
}
@SideOnly(Side.CLIENT)