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

Merge branch 'rv1' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv2

Browse Source
This commit is contained in:
AlgorithmX2
2014-08-30 20:12:25 -05:00
parent 16ab9142f0 59a0c3f11a
commit e0ef2f4e3d
31 changed files with 179 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/ClientHelper.java
+4 -1
View File
@@ -90,6 +90,9 @@ public class ClientHelper extends ServerHelper
public void triggerUpdates()
{
Minecraft mc = Minecraft.getMinecraft();
if ( mc == null || mc.thePlayer == null || mc.theWorld == null )
return;
EntityPlayer player = mc.thePlayer;
if ( player == null )
@@ -137,7 +140,7 @@ public class ClientHelper extends ServerHelper
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
// GL11.glDisable( GL11.GL_CULL_FACE );
if ( itemstack.isItemEnchanted() )
if ( itemstack.isItemEnchanted() || itemstack.getItem().requiresMultipleRenderPasses() )
{
GL11.glTranslatef( 0.0f, -0.05f, -0.25f );
GL11.glScalef( 1.0f / 1.5f, 1.0f / 1.5f, 1.0f / 1.5f );
client/gui/AEBaseGui.java
+3 -2
View File
@@ -73,10 +73,10 @@ public abstract class AEBaseGui extends GuiContainer
{
try
{
DecimalFormat df = new DecimalFormat("+#;-#");
DecimalFormat df = new DecimalFormat( "+#;-#" );
return df.parse( btn.displayString ).intValue();
}
catch(ParseException e )
catch (ParseException e)
{
return 0;
}
@@ -597,6 +597,7 @@ public abstract class AEBaseGui extends GuiContainer
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
GL11.glEnable( GL11.GL_LIGHTING );
GL11.glEnable( GL12.GL_RESCALE_NORMAL );
GL11.glEnable( GL11.GL_DEPTH_TEST );
RenderHelper.enableGUIStandardItemLighting();
itemRender.renderItemAndEffectIntoGUI( this.fontRendererObj, this.mc.renderEngine, is, x, y );
GL11.glPopAttrib();
client/me/ItemRepo.java
+7 -5
View File
@@ -44,6 +44,7 @@ public class ItemRepo
public int rowSize = 9;
public String searchString = "";
private String innerSearch = "";
public ItemRepo(IScrollSource src, ISortSource sortSrc) {
this.src = src;
@@ -172,7 +173,7 @@ public class ItemRepo
Method b = searchField.getClass().getMethod( "onTextChange", String.class );
NEIWord = filter;
a.invoke( searchField, filter );
a.invoke( searchField, new String( filter ) );
b.invoke( searchField, "" );
}
}
@@ -195,26 +196,27 @@ public class ItemRepo
if ( mode == SearchBoxMode.NEI_AUTOSEARCH || mode == SearchBoxMode.NEI_MANUAL_SEARCH )
updateNEI( searchString );
innerSearch = searchString;
boolean terminalSearchToolTips = AEConfig.instance.settings.getSetting( Settings.SEARCH_TOOLTIPS ) != YesNo.NO;
// boolean terminalSearchMods = Configuration.instance.settings.getSetting( Settings.SEARCH_MODS ) != YesNo.NO;
boolean searchMod = false;
if ( searchString.startsWith( "@" ) )
if ( innerSearch.startsWith( "@" ) )
{
searchMod = true;
searchString = searchString.substring( 1 );
innerSearch = innerSearch.substring( 1 );
}
Pattern m = null;
try
{
m = Pattern.compile( searchString.toLowerCase(), Pattern.CASE_INSENSITIVE );
m = Pattern.compile( innerSearch.toLowerCase(), Pattern.CASE_INSENSITIVE );
}
catch (Throwable _)
{
try
{
m = Pattern.compile( Pattern.quote( searchString.toLowerCase() ), Pattern.CASE_INSENSITIVE );
m = Pattern.compile( Pattern.quote( innerSearch.toLowerCase() ), Pattern.CASE_INSENSITIVE );
}
catch (Throwable __)
{