Skip to content

remove overclock button #2794

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

Merged
TechLord22 merged 1 commit into from
May 17, 2025
Merged

remove overclock button #2794

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
47 changes: 2 additions & 45 deletions src/main/java/gregtech/api/capability/impl/AbstractRecipeLogic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,22 +937,6 @@ protected int getOverclockForTier(long voltage) {
return GTUtility.getOCTierByVoltage(voltage);
}

/**
* Creates an array of Voltage Names that the machine/multiblock can overclock to.
* Since this is for use with the customizable overclock button, all tiers up to
* {@link AbstractRecipeLogic#getMaxVoltage()}
* are allowed, since the button is initialized to this value.
*
* @return a String array of the voltage names allowed to be used for overclocking
*/
public String[] getAvailableOverclockingTiers() {
final int maxTier = getOverclockForTier(getMaxVoltage());
final String[] result = new String[maxTier + 1];
result[0] = "gregtech.gui.overclock.off";
if (maxTier >= 0) System.arraycopy(GTValues.VNF, 1, result, 1, maxTier);
return result;
}

/**
* sets up the recipe to be run
*
Expand Down Expand Up @@ -1131,9 +1115,8 @@ public boolean isAllowOverclocking() {
*/
public void setMaximumOverclockVoltage(final long overclockVoltage) {
this.overclockVoltage = overclockVoltage;
// Overclocking is not allowed if the passed voltage is ULV
this.allowOverclocking = (overclockVoltage != GTValues.V[GTValues.ULV]);
metaTileEntity.markDirty();
// Overclocking is not allowed if the passed voltage is <= LV
this.allowOverclocking = (overclockVoltage <= GTValues.V[GTValues.LV]);
}

/**
Expand All @@ -1143,32 +1126,6 @@ public long getMaximumOverclockVoltage() {
return overclockVoltage;
}

/**
* This is needed as CycleButtonWidget requires an IntSupplier, without making an Enum of tiers.
*
* @return The current Tier for the voltage the machine is allowed to overclock to
*/
public int getOverclockTier() {
// If we do not allow overclocking, return ULV tier
if (!isAllowOverclocking()) {
return GTValues.ULV;
}

// This will automatically handle ULV, and return 0
return getOverclockForTier(this.overclockVoltage);
}

/**
* Sets the maximum Tier that the machine/multiblock is allowed to overclock to.
* This is used for the Overclock button in Machine GUIs.
* This is needed as CycleButtonWidget requires an Int Supplier, without making an Enum of tiers.
*
* @param tier The maximum tier the multiblock/machine can overclock to
*/
public void setOverclockTier(final int tier) {
setMaximumOverclockVoltage(GTValues.V[tier]);
}

/**
* Used to reset cached values in the Recipe Logic on events such as multiblock structure deformation
*/
Expand Down
7 changes: 0 additions & 7 deletions src/main/java/gregtech/api/metatileentity/SimpleMachineMetaTileEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import gregtech.api.gui.GuiTextures;
import gregtech.api.gui.ModularUI;
import gregtech.api.gui.resources.TextureArea;
import gregtech.api.gui.widgets.CycleButtonWidget;
import gregtech.api.gui.widgets.GhostCircuitSlotWidget;
import gregtech.api.gui.widgets.ImageWidget;
import gregtech.api.gui.widgets.LabelWidget;
Expand Down Expand Up @@ -513,14 +512,8 @@ protected ModularUI.Builder createGuiTemplate(EntityPlayer player) {
GuiTextures.BUTTON_FLUID_OUTPUT, this::isAutoOutputFluids, this::setAutoOutputFluids)
.setTooltipText("gregtech.gui.fluid_auto_output.tooltip")
.shouldUseBaseBackground());
leftButtonStartX += 18;
}

builder.widget(new CycleButtonWidget(leftButtonStartX, 62 + yOffset, 18, 18,
workable.getAvailableOverclockingTiers(), workable::getOverclockTier, workable::setOverclockTier)
.setTooltipHoverString("gregtech.gui.overclock.description")
.setButtonTexture(GuiTextures.BUTTON_OVERCLOCK));

if (exportItems.getSlots() + exportFluids.getTanks() <= 9) {
ImageWidget logo = new ImageWidget(152, 63 + yOffset, 17, 17,
GTValues.XMAS.get() ? getXmasLogo() : getLogo()).setIgnoreColor(true);
Expand Down
Loading