Skip to content

Add configurable polling rate to ME Hatches #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Aedial wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add configurable polling rate to ME Hatches #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions src/main/java/github/kasuminova/mmce/client/gui/GuiMEBusPollingButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package github.kasuminova.mmce.client.gui;

import appeng.api.config.FullnessMode;
import appeng.api.config.Settings;
import appeng.client.gui.widgets.GuiImgButton;
import github.kasuminova.mmce.common.util.PollingRateUtils;
import hellfirepvp.modularmachinery.common.data.Config;
import net.minecraft.client.resources.I18n;

import java.util.function.IntSupplier;


public class GuiMEBusPollingButton extends GuiImgButton {

private final IntSupplier pollingRateSupplier;

public GuiMEBusPollingButton(final int x, final int y, final IntSupplier pollingRateSupplier) {
super(x, y, Settings.FULLNESS_MODE, FullnessMode.FULL);
this.pollingRateSupplier = pollingRateSupplier;
}

@Override
public String getMessage() {
int pollingRate = Math.max(0, this.pollingRateSupplier.getAsInt());
int maxAdaptive = Config.meHatchAdaptivePollingMin;
int minAdaptive = Config.meHatchAdaptivePollingMax;

String currentValue = pollingRate <= 0
? I18n.format("gui.mehatch.polling_rate.current_adaptive", maxAdaptive, minAdaptive)
: I18n.format("gui.mehatch.polling_rate.current", PollingRateUtils.format(pollingRate));

return I18n.format("gui.mehatch.polling_rate.name") + "\n\n"
+ currentValue + "\n"
+ I18n.format("gui.mehatch.polling_rate.tooltip");
}
}
128 changes: 128 additions & 0 deletions src/main/java/github/kasuminova/mmce/client/gui/GuiMEBusPollingRate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
package github.kasuminova.mmce.client.gui;

import appeng.client.gui.AEBaseGui;
import appeng.client.gui.widgets.GuiTabButton;
import github.kasuminova.mmce.common.container.ContainerMEBusPollingRate;
import github.kasuminova.mmce.common.network.PktOpenMEBusGui;
import github.kasuminova.mmce.common.network.PktSetMEBusPollingRate;
import github.kasuminova.mmce.common.tile.base.MEPollingMachineComponent;
import github.kasuminova.mmce.common.util.PollingRateUtils;
import hellfirepvp.modularmachinery.ModularMachinery;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.InventoryPlayer;
import org.jetbrains.annotations.NotNull;

import java.io.IOException;


public class GuiMEBusPollingRate extends AEBaseGui implements ContainerMEBusPollingRate.IPollingRateListener {

private GuiTabButton originalGuiBtn;

private GuiButton plusTick;
private GuiButton plusSecond;
private GuiButton plusMinute;
private GuiButton plusHour;
private GuiButton plusDay;
private GuiButton minusTick;
private GuiButton minusSecond;
private GuiButton minusMinute;
private GuiButton minusHour;
private GuiButton minusDay;

private final MEPollingMachineComponent host;
private int currentPollingRate = 0;

public GuiMEBusPollingRate(final InventoryPlayer inventoryPlayer, final MEPollingMachineComponent host) {
super(new ContainerMEBusPollingRate(inventoryPlayer, host));
this.host = host;
}

@Override
public void initGui() {
super.initGui();

((ContainerMEBusPollingRate) this.inventorySlots).setListener(this);

this.buttonList.add(this.plusTick = new GuiButton(0, this.guiLeft + 23, this.guiTop + 32, 24, 20, "+1t"));
this.buttonList.add(this.plusSecond = new GuiButton(1, this.guiLeft + 49, this.guiTop + 32, 24, 20, "+1s"));
this.buttonList.add(this.plusMinute = new GuiButton(2, this.guiLeft + 75, this.guiTop + 32, 24, 20, "+1m"));
this.buttonList.add(this.plusHour = new GuiButton(3, this.guiLeft + 101, this.guiTop + 32, 24, 20, "+1h"));
this.buttonList.add(this.plusDay = new GuiButton(4, this.guiLeft + 127, this.guiTop + 32, 24, 20, "+1d"));

this.buttonList.add(this.minusTick = new GuiButton(5, this.guiLeft + 23, this.guiTop + 69, 24, 20, "-1t"));
this.buttonList.add(this.minusSecond = new GuiButton(6, this.guiLeft + 49, this.guiTop + 69, 24, 20, "-1s"));
this.buttonList.add(this.minusMinute = new GuiButton(7, this.guiLeft + 75, this.guiTop + 69, 24, 20, "-1m"));
this.buttonList.add(this.minusHour = new GuiButton(8, this.guiLeft + 101, this.guiTop + 69, 24, 20, "-1h"));
this.buttonList.add(this.minusDay = new GuiButton(9, this.guiLeft + 127, this.guiTop + 69, 24, 20, "-1d"));

this.buttonList.add(this.originalGuiBtn = new GuiTabButton(
this.guiLeft + 154,
this.guiTop,
this.host.getVisualItemStack(),
this.host.getVisualItemStack().getDisplayName(),
this.itemRender
));
}

@Override
public void onPollingRateChanged(int pollingRate) {
this.currentPollingRate = pollingRate;
}

@Override
public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
this.fontRenderer.drawString(I18n.format("gui.mehatch.polling_rate.name"), 8, 6, 0x404040);

String display = PollingRateUtils.format(this.currentPollingRate);
int textWidth = this.fontRenderer.getStringWidth(display);
this.fontRenderer.drawString(display, (this.xSize - textWidth) / 2, 57, 0xFFFFFF);
}

@Override
public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
this.bindTexture("guis/priority.png");
this.drawTexturedModalRect(offsetX, offsetY, 0, 0, this.xSize, this.ySize);
}

@Override
protected void actionPerformed(@NotNull final GuiButton btn) throws IOException {
super.actionPerformed(btn);

if (btn == this.originalGuiBtn) {
ModularMachinery.NET_CHANNEL.sendToServer(
new PktOpenMEBusGui(this.host.getPos(), this.host.getMainGuiType())
);
return;
}

int delta = this.getButtonDelta(btn);
if (delta != 0) this.addPollingRate(delta);
}

private int getButtonDelta(final GuiButton btn) {
if (btn == this.plusTick) return PollingRateUtils.TICKS_PER_TICK;
if (btn == this.plusSecond) return PollingRateUtils.TICKS_PER_SECOND;
if (btn == this.plusMinute) return PollingRateUtils.TICKS_PER_MINUTE;
if (btn == this.plusHour) return PollingRateUtils.TICKS_PER_HOUR;
if (btn == this.plusDay) return PollingRateUtils.TICKS_PER_DAY;
if (btn == this.minusTick) return -PollingRateUtils.TICKS_PER_TICK;
if (btn == this.minusSecond) return -PollingRateUtils.TICKS_PER_SECOND;
if (btn == this.minusMinute) return -PollingRateUtils.TICKS_PER_MINUTE;
if (btn == this.minusHour) return -PollingRateUtils.TICKS_PER_HOUR;
if (btn == this.minusDay) return -PollingRateUtils.TICKS_PER_DAY;

return 0;
}

private void addPollingRate(final int delta) {
long result = (long) this.currentPollingRate + delta;
result = Math.max(0L, Math.min(Integer.MAX_VALUE, result));
this.currentPollingRate = (int) result;

ModularMachinery.NET_CHANNEL.sendToServer(
new PktSetMEBusPollingRate(this.currentPollingRate)
);
}
}
19 changes: 19 additions & 0 deletions src/main/java/github/kasuminova/mmce/client/gui/GuiMEFluidInputBus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,26 @@
import appeng.fluids.client.gui.widgets.GuiFluidTank;
import appeng.fluids.util.IAEFluidTank;
import github.kasuminova.mmce.common.container.ContainerMEFluidInputBus;
import github.kasuminova.mmce.common.network.PktOpenMEBusGui;
import github.kasuminova.mmce.common.tile.MEFluidInputBus;
import github.kasuminova.mmce.common.tile.base.MEFluidBus;
import hellfirepvp.modularmachinery.ModularMachinery;
import hellfirepvp.modularmachinery.common.CommonProxy.GuiType;
import hellfirepvp.modularmachinery.common.base.Mods;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;

import java.util.List;
import java.io.IOException;

public class GuiMEFluidInputBus extends GuiUpgradeable {
private static final ResourceLocation TEXTURES_INPUT_BUS = new ResourceLocation(ModularMachinery.MODID, "textures/gui/mefluidinputbus.png");

private final MEFluidInputBus bus;
private GuiMEBusPollingButton pollingRateBtn;

public GuiMEFluidInputBus(final MEFluidInputBus te, final EntityPlayer player) {
super(new ContainerMEFluidInputBus(te, player));
Expand Down Expand Up @@ -60,6 +65,20 @@ public void initGui() {

@Override
protected void addButtons() {
this.pollingRateBtn = new GuiMEBusPollingButton(
this.guiLeft - 18, this.guiTop + 8, this.bus::getPollingRate);
this.buttonList.add(this.pollingRateBtn);
}

@Override
protected void actionPerformed(final GuiButton btn) throws IOException {
super.actionPerformed(btn);

if (btn == this.pollingRateBtn) {
ModularMachinery.NET_CHANNEL.sendToServer(
new PktOpenMEBusGui(this.bus.getPos(), GuiType.ME_BUS_POLLING)
);
}
}

@Override
Expand Down
19 changes: 19 additions & 0 deletions src/main/java/github/kasuminova/mmce/client/gui/GuiMEFluidOutputBus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,25 @@
import appeng.fluids.client.gui.widgets.GuiFluidTank;
import appeng.fluids.util.IAEFluidTank;
import github.kasuminova.mmce.common.container.ContainerMEFluidOutputBus;
import github.kasuminova.mmce.common.network.PktOpenMEBusGui;
import github.kasuminova.mmce.common.tile.MEFluidOutputBus;
import hellfirepvp.modularmachinery.ModularMachinery;
import hellfirepvp.modularmachinery.common.CommonProxy.GuiType;
import hellfirepvp.modularmachinery.common.base.Mods;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;

import java.util.List;
import java.io.IOException;

public class GuiMEFluidOutputBus extends GuiUpgradeable {
private static final ResourceLocation TEXTURES_OUTPUT_BUS = new ResourceLocation(ModularMachinery.MODID, "textures/gui/mefluidoutputbus.png");

private final MEFluidOutputBus bus;
private GuiMEBusPollingButton pollingRateBtn;

public GuiMEFluidOutputBus(final MEFluidOutputBus te, final EntityPlayer player) {
super(new ContainerMEFluidOutputBus(te, player));
Expand Down Expand Up @@ -55,6 +60,20 @@ public void initGui() {

@Override
protected void addButtons() {
this.pollingRateBtn = new GuiMEBusPollingButton(
this.guiLeft - 18, this.guiTop + 8, this.bus::getPollingRate);
this.buttonList.add(this.pollingRateBtn);
}

@Override
protected void actionPerformed(final GuiButton btn) throws IOException {
super.actionPerformed(btn);

if (btn == this.pollingRateBtn) {
ModularMachinery.NET_CHANNEL.sendToServer(
new PktOpenMEBusGui(this.bus.getPos(), GuiType.ME_BUS_POLLING)
);
}
}

@Override
Expand Down
19 changes: 19 additions & 0 deletions src/main/java/github/kasuminova/mmce/client/gui/GuiMEGasInputBus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@
import com.mekeng.github.network.packet.CGasSlotSync;
import com.mekeng.github.util.Utils;
import github.kasuminova.mmce.common.container.ContainerMEGasInputBus;
import github.kasuminova.mmce.common.network.PktOpenMEBusGui;
import github.kasuminova.mmce.common.tile.MEGasInputBus;
import github.kasuminova.mmce.common.tile.base.MEFluidBus;
import hellfirepvp.modularmachinery.ModularMachinery;
import hellfirepvp.modularmachinery.common.CommonProxy.GuiType;
import net.minecraft.client.gui.GuiButton;
import mekanism.api.gas.GasStack;
import mezz.jei.api.gui.IGhostIngredientHandler;
import net.minecraft.client.resources.I18n;
Expand All @@ -24,6 +27,7 @@

import javax.annotation.Nonnull;
import java.awt.Rectangle;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
Expand All @@ -32,6 +36,7 @@ public class GuiMEGasInputBus extends GuiUpgradeable implements IJEIGhostIngredi
private static final ResourceLocation TEXTURES_INPUT_BUS = new ResourceLocation(ModularMachinery.MODID, "textures/gui/mefluidinputbus.png");

private final MEGasInputBus bus;
private GuiMEBusPollingButton pollingRateBtn;

public GuiMEGasInputBus(final MEGasInputBus te, final EntityPlayer player) {
super(new ContainerMEGasInputBus(te, player));
Expand All @@ -54,6 +59,20 @@ public void initGui() {

@Override
protected void addButtons() {
this.pollingRateBtn = new GuiMEBusPollingButton(
this.guiLeft - 18, this.guiTop + 8, this.bus::getPollingRate);
this.buttonList.add(this.pollingRateBtn);
}

@Override
protected void actionPerformed(final GuiButton btn) throws IOException {
super.actionPerformed(btn);

if (btn == this.pollingRateBtn) {
ModularMachinery.NET_CHANNEL.sendToServer(
new PktOpenMEBusGui(this.bus.getPos(), GuiType.ME_BUS_POLLING)
);
}
}

@Override
Expand Down
20 changes: 20 additions & 0 deletions src/main/java/github/kasuminova/mmce/client/gui/GuiMEGasOutputBus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,22 @@
import com.mekeng.github.client.slots.SlotGasTank;
import com.mekeng.github.common.me.inventory.impl.GasInventory;
import github.kasuminova.mmce.common.container.ContainerMEGasOutputBus;
import github.kasuminova.mmce.common.network.PktOpenMEBusGui;
import github.kasuminova.mmce.common.tile.MEGasOutputBus;
import hellfirepvp.modularmachinery.ModularMachinery;
import hellfirepvp.modularmachinery.common.CommonProxy.GuiType;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;

import java.io.IOException;

public class GuiMEGasOutputBus extends GuiUpgradeable {
private static final ResourceLocation TEXTURES_OUTPUT_BUS = new ResourceLocation(ModularMachinery.MODID, "textures/gui/mefluidoutputbus.png");

private final MEGasOutputBus bus;
private GuiMEBusPollingButton pollingRateBtn;

public GuiMEGasOutputBus(final MEGasOutputBus te, final EntityPlayer player) {
super(new ContainerMEGasOutputBus(te, player));
Expand All @@ -35,6 +41,20 @@ public void initGui() {

@Override
protected void addButtons() {
this.pollingRateBtn = new GuiMEBusPollingButton(
this.guiLeft - 18, this.guiTop + 8, this.bus::getPollingRate);
this.buttonList.add(this.pollingRateBtn);
}

@Override
protected void actionPerformed(final GuiButton btn) throws IOException {
super.actionPerformed(btn);

if (btn == this.pollingRateBtn) {
ModularMachinery.NET_CHANNEL.sendToServer(
new PktOpenMEBusGui(this.bus.getPos(), GuiType.ME_BUS_POLLING)
);
}
}

@Override
Expand Down
Loading