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

Rename Configuration to AE Config

Browse Source
This commit is contained in:
AlgorithmX2
2014-02-08 23:08:27 -06:00
parent 0588374450
commit 5f8570abdc
35 changed files with 327 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/gui/AEBaseMEGui.java
+3 -3
View File
@@ -9,7 +9,7 @@ import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import appeng.api.storage.data.IAEItemStack;
import appeng.client.me.SlotME;
import appeng.core.Configuration;
import appeng.core.AEConfig;
public abstract class AEBaseMEGui extends AEBaseGui
{
@@ -26,7 +26,7 @@ public abstract class AEBaseMEGui extends AEBaseGui
Slot s = getSlot( mousex, mousey );
if ( s instanceof SlotME )
{
int BigNumber = Configuration.instance.useTerminalUseLargeFont() ? 999 : 9999;
int BigNumber = AEConfig.instance.useTerminalUseLargeFont() ? 999 : 9999;
IAEItemStack myStack = null;
@@ -62,7 +62,7 @@ public abstract class AEBaseMEGui extends AEBaseGui
Slot s = getSlot( x, y );
if ( s instanceof SlotME && stack != null )
{
int BigNumber = Configuration.instance.useTerminalUseLargeFont() ? 999 : 9999;
int BigNumber = AEConfig.instance.useTerminalUseLargeFont() ? 999 : 9999;
IAEItemStack myStack = null;
client/gui/implementations/GuiMEMonitorable.java
+6 -6
View File
@@ -18,7 +18,7 @@ import appeng.client.me.InternalSlotME;
import appeng.client.me.ItemRepo;
import appeng.container.implementations.ContainerMEMonitorable;
import appeng.container.slot.AppEngSlot;
import appeng.core.Configuration;
import appeng.core.AEConfig;
import appeng.core.localization.GuiText;
import appeng.helpers.WirelessTerminalGuiObject;
import appeng.parts.reporting.PartTerminal;
@@ -117,11 +117,11 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource
if ( customSortOrder )
{
buttonList.add( new GuiImgButton( this.guiLeft - 18, offset, Settings.SORT_BY, Configuration.instance.settings.getSetting( Settings.SORT_BY ) ) );
buttonList.add( new GuiImgButton( this.guiLeft - 18, offset, Settings.SORT_BY, AEConfig.instance.settings.getSetting( Settings.SORT_BY ) ) );
offset += 20;
}
buttonList.add( new GuiImgButton( this.guiLeft - 18, offset, Settings.SORT_DIRECTION, Configuration.instance.settings
buttonList.add( new GuiImgButton( this.guiLeft - 18, offset, Settings.SORT_DIRECTION, AEConfig.instance.settings
.getSetting( Settings.SORT_DIRECTION ) ) );
searchField = new GuiTextField( fontRendererObj, this.guiLeft + Math.max( 82, xoffset ), this.guiTop + 6, 89, fontRendererObj.FONT_HEIGHT );
@@ -152,7 +152,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource
Enum cv = iBtn.getCurrentValue();
Enum next = Platform.nextEnum( cv );
Configuration.instance.settings.putSetting( iBtn.getSetting(), next );
AEConfig.instance.settings.putSetting( iBtn.getSetting(), next );
iBtn.set( next );
repo.updateView();
}
@@ -208,13 +208,13 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource
@Override
public Enum getSortBy()
{
return Configuration.instance.settings.getSetting( Settings.SORT_BY );
return AEConfig.instance.settings.getSetting( Settings.SORT_BY );
}
@Override
public Enum getSortDir()
{
return Configuration.instance.settings.getSetting( Settings.SORT_DIRECTION );
return AEConfig.instance.settings.getSetting( Settings.SORT_DIRECTION );
}
}
client/me/ItemRepo.java
+2 -2
View File
@@ -12,7 +12,7 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.client.gui.widgets.IScrollSource;
import appeng.client.gui.widgets.ISortSource;
import appeng.core.Configuration;
import appeng.core.AEConfig;
import appeng.util.ItemSorters;
import appeng.util.Platform;
import appeng.util.item.ItemList;
@@ -79,7 +79,7 @@ public class ItemRepo
view.ensureCapacity( list.size() );
dsp.ensureCapacity( list.size() );
boolean terminalSearchToolTips = Configuration.instance.settings.getSetting( Settings.SEARCH_TOOLTIPS ) != YesNo.NO;
boolean terminalSearchToolTips = AEConfig.instance.settings.getSetting( Settings.SEARCH_TOOLTIPS ) != YesNo.NO;
// boolean terminalSearchMods = Configuration.instance.settings.getSetting( Settings.SEARCH_MODS ) != YesNo.NO;
Pattern m = null;
client/render/AppEngRenderItem.java
+5 -5
View File
@@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack;
import org.lwjgl.opengl.GL11;
import appeng.api.storage.data.IAEItemStack;
import appeng.core.Configuration;
import appeng.core.AEConfig;
public class AppEngRenderItem extends RenderItem
{
@@ -38,9 +38,9 @@ public class AppEngRenderItem extends RenderItem
{
if ( is != null )
{
float ScaleFactor = Configuration.instance.useTerminalUseLargeFont() ? 0.85f : 0.5f;
float ScaleFactor = AEConfig.instance.useTerminalUseLargeFont() ? 0.85f : 0.5f;
float RScaleFactor = 1.0f / ScaleFactor;
int offset = Configuration.instance.useTerminalUseLargeFont() ? 0 : -1;
int offset = AEConfig.instance.useTerminalUseLargeFont() ? 0 : -1;
if ( is.isItemDamaged() )
{
@@ -63,7 +63,7 @@ public class AppEngRenderItem extends RenderItem
if ( is.stackSize == 0 )
{
String var6 = Configuration.instance.useTerminalUseLargeFont() ? "+" : "Craft";
String var6 = AEConfig.instance.useTerminalUseLargeFont() ? "+" : "Craft";
GL11.glDisable( GL11.GL_LIGHTING );
GL11.glDisable( GL11.GL_DEPTH_TEST );
GL11.glPushMatrix();
@@ -84,7 +84,7 @@ public class AppEngRenderItem extends RenderItem
{
String var6 = "" + Math.abs( amount );
if ( Configuration.instance.useTerminalUseLargeFont() )
if ( AEConfig.instance.useTerminalUseLargeFont() )
{
if ( amount > 999999999 )
{