fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed ConfigHost facade around AEConfig with explicit config options

Browse Source 
Removed unused config options
This commit is contained in:
Sebastian Hartte
2020-06-21 18:31:35 +02:00
parent dd371c2c7f
commit ee086366ed
9 changed files with 112 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/AEBaseMEGui.java
+1 -1
View File
@@ -45,7 +45,7 @@ public abstract class AEBaseMEGui<T extends AEBaseContainer> extends AEBaseGui<T
final Slot s = this.getSlot(x, y);
if (s instanceof SlotME && !stack.isEmpty()) {
final int bigNumber = AEConfig.instance().useTerminalUseLargeFont() ? 999 : 9999;
final int bigNumber = AEConfig.instance().isUseLargeFonts() ? 999 : 9999;
IAEItemStack myStack = null;
final List<String> currentToolTip = this.getTooltipFromItem(stack);
src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java
+17 -22
View File
@@ -28,12 +28,7 @@ import net.minecraft.inventory.container.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.ITextComponent;
import appeng.api.config.SearchBoxMode;
import appeng.api.config.Settings;
import appeng.api.config.SortDir;
import appeng.api.config.SortOrder;
import appeng.api.config.TerminalStyle;
import appeng.api.config.ViewItems;
import appeng.api.config.*;
import appeng.api.implementations.guiobjects.IPortableCell;
import appeng.api.implementations.tiles.IMEChest;
import appeng.api.implementations.tiles.IViewCellStorage;
@@ -42,11 +37,7 @@ import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigurableObject;
import appeng.client.ActionKey;
import appeng.client.gui.AEBaseMEGui;
import appeng.client.gui.widgets.GuiScrollbar;
import appeng.client.gui.widgets.GuiSettingToggleButton;
import appeng.client.gui.widgets.GuiTabButton;
import appeng.client.gui.widgets.ISortSource;
import appeng.client.gui.widgets.MEGuiTextField;
import appeng.client.gui.widgets.*;
import appeng.client.me.InternalSlotME;
import appeng.client.me.ItemRepo;
import appeng.container.implementations.ContainerCraftingStatus;
@@ -158,8 +149,7 @@ public class GuiMEMonitorable<T extends ContainerMEMonitorable> extends AEBaseME
getMinecraft().keyboardListener.enableRepeatEvents(true);
this.maxRows = this.getMaxRows();
TerminalStyle terminalStyle = (TerminalStyle) AEConfig.instance().getConfigManager()
.getSetting(Settings.TERMINAL_STYLE);
TerminalStyle terminalStyle = AEConfig.instance().getTerminalStyle();
if (terminalStyle != TerminalStyle.FULL) {
this.perRow = 9;
@@ -214,16 +204,15 @@ public class GuiMEMonitorable<T extends ContainerMEMonitorable> extends AEBaseME
Settings.SORT_DIRECTION, getSortDir(), this::toggleServerSetting));
offset += 20;
SearchBoxMode searchMode = (SearchBoxMode) AEConfig.instance().getConfigManager()
.getSetting(Settings.SEARCH_MODE);
SearchBoxMode searchMode = AEConfig.instance().getTerminalSearchMode();
this.addButton(new GuiSettingToggleButton<>(this.guiLeft - 18, offset, Settings.SEARCH_MODE, searchMode,
Platform::isSearchModeAvailable, this::toggleClientSetting));
Platform::isSearchModeAvailable, this::toggleTerminalSearchMode));
offset += 20;
if (!(this instanceof GuiMEPortableCell) || this instanceof GuiWirelessTerm) {
this.addButton(new GuiSettingToggleButton<>(this.guiLeft - 18, offset, Settings.TERMINAL_STYLE,
terminalStyle, this::toggleClientSetting));
terminalStyle, this::toggleTerminalStyle));
}
this.searchField = new MEGuiTextField(this.font, this.guiLeft + Math.max(80, this.offsetX), this.guiTop + 4, 90,
@@ -364,8 +353,7 @@ public class GuiMEMonitorable<T extends ContainerMEMonitorable> extends AEBaseME
}
int getMaxRows() {
return AEConfig.instance().getConfigManager().getSetting(Settings.TERMINAL_STYLE) == TerminalStyle.SMALL ? 6
: Integer.MAX_VALUE;
return AEConfig.instance().getTerminalStyle() == TerminalStyle.SMALL ? 6 : Integer.MAX_VALUE;
}
protected void repositionSlot(final AppEngSlot s) {
@@ -494,9 +482,16 @@ public class GuiMEMonitorable<T extends ContainerMEMonitorable> extends AEBaseME
this.standardSize = standardSize;
}
private <S extends Enum<S>> void toggleClientSetting(GuiSettingToggleButton<S> btn, boolean backwards) {
S next = btn.getNextValue(backwards);
AEConfig.instance().getConfigManager().putSetting(btn.getSetting(), next);
private void toggleTerminalSearchMode(GuiSettingToggleButton<SearchBoxMode> btn, boolean backwards) {
SearchBoxMode next = btn.getNextValue(backwards);
AEConfig.instance().setTerminalSearchMode(next);
btn.set(next);
this.reinitalize();
}
private void toggleTerminalStyle(GuiSettingToggleButton<TerminalStyle> btn, boolean backwards) {
TerminalStyle next = btn.getNextValue(backwards);
AEConfig.instance().setTerminalStyle(next);
btn.set(next);
this.reinitalize();
}
src/main/java/appeng/client/gui/widgets/CommonButtons.java
+2 -2
View File
@@ -10,13 +10,13 @@ public final class CommonButtons {
}
public static GuiSettingToggleButton<PowerUnits> togglePowerUnit(int x, int y) {
return new GuiSettingToggleButton<>(x, y, Settings.POWER_UNITS, AEConfig.instance().selectedPowerUnit(),
return new GuiSettingToggleButton<>(x, y, Settings.POWER_UNITS, AEConfig.instance().getSelectedPowerUnit(),
CommonButtons::togglePowerUnit);
}
private static void togglePowerUnit(GuiSettingToggleButton<PowerUnits> button, boolean backwards) {
AEConfig.instance().nextPowerUnit(backwards);
button.set(AEConfig.instance().selectedPowerUnit());
button.set(AEConfig.instance().getSelectedPowerUnit());
}
}
src/main/java/appeng/client/me/FluidRepo.java
+1 -2
View File
@@ -91,8 +91,7 @@ public class FluidRepo {
final Enum viewMode = this.sortSrc.getSortDisplay();
final boolean needsZeroCopy = viewMode == ViewItems.CRAFTABLE;
final boolean terminalSearchToolTips = AEConfig.instance().getConfigManager()
.getSetting(Settings.SEARCH_TOOLTIPS) != YesNo.NO;
final boolean terminalSearchToolTips = AEConfig.instance().getSearchTooltips() != YesNo.NO;
boolean notDone = false;
for (IAEFluidStack fs : this.list) {
src/main/java/appeng/client/me/ItemRepo.java
+3 -4
View File
@@ -100,8 +100,8 @@ public class ItemRepo {
this.view.ensureCapacity(this.list.size());
final Enum viewMode = this.sortSrc.getSortDisplay();
final Enum searchMode = AEConfig.instance().getConfigManager().getSetting(Settings.SEARCH_MODE);
ViewItems viewMode = this.sortSrc.getSortDisplay();
SearchBoxMode searchMode = AEConfig.instance().getTerminalSearchMode();
final boolean needsZeroCopy = viewMode == ViewItems.CRAFTABLE;
if (searchMode == SearchBoxMode.JEI_AUTOSEARCH || searchMode == SearchBoxMode.JEI_MANUAL_SEARCH
@@ -111,8 +111,7 @@ public class ItemRepo {
}
this.innerSearch = this.searchString;
final boolean terminalSearchToolTips = AEConfig.instance().getConfigManager()
.getSetting(Settings.SEARCH_TOOLTIPS) != YesNo.NO;
final boolean terminalSearchToolTips = AEConfig.instance().getSearchTooltips() != YesNo.NO;
boolean searchMod = false;
if (this.innerSearch.startsWith("@")) {
src/main/java/appeng/client/render/StackSizeRenderer.java
+4 -5
View File
@@ -46,8 +46,7 @@ public class StackSizeRenderer {
public void renderStackSize(FontRenderer fontRenderer, IAEItemStack aeStack, int xPos, int yPos) {
if (aeStack != null) {
if (aeStack.getStackSize() == 0 && aeStack.isCraftable()) {
final String craftLabelText = AEConfig.instance().useTerminalUseLargeFont()
? GuiText.LargeFontCraft.getLocal()
final String craftLabelText = AEConfig.instance().isUseLargeFonts() ? GuiText.LargeFontCraft.getLocal()
: GuiText.SmallFontCraft.getLocal();
renderSizeLabel(fontRenderer, xPos, yPos, craftLabelText);
@@ -64,9 +63,9 @@ public class StackSizeRenderer {
public static void renderSizeLabel(FontRenderer fontRenderer, float xPos, float yPos, String text) {
final float scaleFactor = AEConfig.instance().useTerminalUseLargeFont() ? 0.85f : 0.5f;
final float scaleFactor = AEConfig.instance().isUseLargeFonts() ? 0.85f : 0.5f;
final float inverseScaleFactor = 1.0f / scaleFactor;
final int offset = AEConfig.instance().useTerminalUseLargeFont() ? 0 : -1;
final int offset = AEConfig.instance().isUseLargeFonts() ? 0 : -1;
TransformationMatrix tm = new TransformationMatrix(new Vector3f(0, 0, 300), // Taken from
// ItemRenderer.renderItemOverlayIntoGUI
@@ -83,7 +82,7 @@ public class StackSizeRenderer {
}
private String getToBeRenderedStackSize(final long originalSize) {
if (AEConfig.instance().useTerminalUseLargeFont()) {
if (AEConfig.instance().isUseLargeFonts()) {
return SLIM_CONVERTER.toSlimReadableForm(originalSize);
} else {
return WIDE_CONVERTER.toWideReadableForm(originalSize);