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

Basic reformat, hit once, hope never again

Browse Source
This commit is contained in:
thatsIch
2015-04-03 08:54:31 +02:00
parent 4ff1631f89
commit d34c988c88
886 changed files with 31400 additions and 30990 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/me/ClientDCInternalInv.java
+6 -4
View File
@@ -18,11 +18,13 @@
package appeng.client.me;
import net.minecraft.util.StatCollector;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.ItemSorters;
public class ClientDCInternalInv implements Comparable<ClientDCInternalInv>
{
@@ -31,7 +33,8 @@ public class ClientDCInternalInv implements Comparable<ClientDCInternalInv>
final public long id;
final public long sortBy;
public ClientDCInternalInv(int size, long id, long sortBy, String unlocalizedName) {
public ClientDCInternalInv( int size, long id, long sortBy, String unlocalizedName )
{
this.inv = new AppEngInternalInventory( null, size );
this.unlocalizedName = unlocalizedName;
this.id = id;
@@ -41,15 +44,14 @@ public class ClientDCInternalInv implements Comparable<ClientDCInternalInv>
public String getName()
{
String s = StatCollector.translateToLocal( this.unlocalizedName + ".name" );
if ( s.equals( this.unlocalizedName + ".name" ) )
if( s.equals( this.unlocalizedName + ".name" ) )
return StatCollector.translateToLocal( this.unlocalizedName );
return s;
}
@Override
public int compareTo(ClientDCInternalInv o)
public int compareTo( ClientDCInternalInv o )
{
return ItemSorters.compareLong( this.sortBy, o.sortBy );
}
}
src/main/java/appeng/client/me/InternalSlotME.java
+5 -3
View File
@@ -18,20 +18,22 @@
package appeng.client.me;
import net.minecraft.item.ItemStack;
import appeng.api.storage.data.IAEItemStack;
public class InternalSlotME
{
private final ItemRepo repo;
public final int offset;
public final int xPos;
public final int yPos;
private final ItemRepo repo;
public InternalSlotME(ItemRepo def, int offset, int displayX, int displayY) {
public InternalSlotME( ItemRepo def, int offset, int displayX, int displayY )
{
this.repo = def;
this.offset = offset;
this.xPos = displayX;
src/main/java/appeng/client/me/ItemRepo.java
+57 -59
View File
@@ -18,6 +18,7 @@
package appeng.client.me;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -44,6 +45,7 @@ import appeng.util.ItemSorters;
import appeng.util.Platform;
import appeng.util.prioitylist.IPartitionList;
public class ItemRepo
{
@@ -56,42 +58,45 @@ public class ItemRepo
public int rowSize = 9;
public String searchString = "";
IPartitionList<IAEItemStack> myPartitionList;
private String innerSearch = "";
private String NEIWord = null;
private boolean hasPower;
public ItemRepo(IScrollSource src, ISortSource sortSrc)
public ItemRepo( IScrollSource src, ISortSource sortSrc )
{
this.src = src;
this.sortSrc = sortSrc;
}
public IAEItemStack getReferenceItem(int idx)
public IAEItemStack getReferenceItem( int idx )
{
idx += this.src.getCurrentScroll() * this.rowSize;
if ( idx >= this.view.size() )
if( idx >= this.view.size() )
return null;
return this.view.get( idx );
}
public ItemStack getItem(int idx)
public ItemStack getItem( int idx )
{
idx += this.src.getCurrentScroll() * this.rowSize;
if ( idx >= this.dsp.size() )
if( idx >= this.dsp.size() )
return null;
return this.dsp.get( idx );
}
void setSearch(String search)
void setSearch( String search )
{
this.searchString = search == null ? "" : search;
}
public void postUpdate(IAEItemStack is)
public void postUpdate( IAEItemStack is )
{
IAEItemStack st = this.list.findPrecise( is );
if ( st != null )
if( st != null )
{
st.reset();
st.add( is );
@@ -100,40 +105,12 @@ public class ItemRepo
this.list.add( is );
}
IPartitionList<IAEItemStack> myPartitionList;
public void setViewCell(ItemStack[] list)
public void setViewCell( ItemStack[] list )
{
this.myPartitionList = ItemViewCell.createFilter( list );
this.updateView();
}
private String NEIWord = null;
private void updateNEI(String filter)
{
try
{
if ( this.NEIWord == null || !this.NEIWord.equals( filter ) )
{
Class c = ReflectionHelper.getClass( this.getClass().getClassLoader(), "codechicken.nei.LayoutManager" );
Field fldSearchField = c.getField( "searchField" );
Object searchField = fldSearchField.get( c );
Method a = searchField.getClass().getMethod( "setText", String.class );
Method b = searchField.getClass().getMethod( "onTextChange", String.class );
this.NEIWord = filter;
a.invoke( searchField, filter );
b.invoke( searchField, "" );
}
}
catch (Throwable ignore)
{
}
}
public void updateView()
{
this.view.clear();
@@ -144,7 +121,7 @@ public class ItemRepo
Enum viewMode = this.sortSrc.getSortDisplay();
Enum searchMode = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE );
if ( searchMode == SearchBoxMode.NEI_AUTOSEARCH || searchMode == SearchBoxMode.NEI_MANUAL_SEARCH )
if( searchMode == SearchBoxMode.NEI_AUTOSEARCH || searchMode == SearchBoxMode.NEI_MANUAL_SEARCH )
this.updateNEI( this.searchString );
this.innerSearch = this.searchString;
@@ -152,7 +129,7 @@ public class ItemRepo
// boolean terminalSearchMods = Configuration.INSTANCE.settings.getSetting( Settings.SEARCH_MODS ) != YesNo.NO;
boolean searchMod = false;
if ( this.innerSearch.startsWith( "@" ) )
if( this.innerSearch.startsWith( "@" ) )
{
searchMod = true;
this.innerSearch = this.innerSearch.substring( 1 );
@@ -163,52 +140,52 @@ public class ItemRepo
{
m = Pattern.compile( this.innerSearch.toLowerCase(), Pattern.CASE_INSENSITIVE );
}
catch (Throwable ignore)
catch( Throwable ignore )
{
try
{
m = Pattern.compile( Pattern.quote( this.innerSearch.toLowerCase() ), Pattern.CASE_INSENSITIVE );
}
catch (Throwable __)
catch( Throwable __ )
{
return;
}
}
boolean notDone = false;
for (IAEItemStack is : this.list)
for( IAEItemStack is : this.list )
{
if ( this.myPartitionList != null )
if( this.myPartitionList != null )
{
if ( !this.myPartitionList.isListed( is ) )
if( !this.myPartitionList.isListed( is ) )
continue;
}
if ( viewMode == ViewItems.CRAFTABLE && !is.isCraftable() )
if( viewMode == ViewItems.CRAFTABLE && !is.isCraftable() )
continue;
if ( viewMode == ViewItems.CRAFTABLE )
if( viewMode == ViewItems.CRAFTABLE )
{
is = is.copy();
is.setStackSize( 0 );
}
if ( viewMode == ViewItems.STORED && is.getStackSize() == 0 )
if( viewMode == ViewItems.STORED && is.getStackSize() == 0 )
continue;
String dspName = searchMod ? Platform.getModId( is ) : Platform.getItemDisplayName( is );
notDone = true;
if ( m.matcher( dspName.toLowerCase() ).find() )
if( m.matcher( dspName.toLowerCase() ).find() )
{
this.view.add( is );
notDone = false;
}
if ( terminalSearchToolTips && notDone )
if( terminalSearchToolTips && notDone )
{
for (Object lp : Platform.getTooltip( is ))
if ( lp instanceof String && m.matcher( (String) lp ).find() )
for( Object lp : Platform.getTooltip( is ) )
if( lp instanceof String && m.matcher( (String) lp ).find() )
{
this.view.add( is );
notDone = false;
@@ -228,19 +205,43 @@ public class ItemRepo
ItemSorters.Direction = (appeng.api.config.SortDir) SortDir;
ItemSorters.init();
if ( SortBy == SortOrder.MOD )
if( SortBy == SortOrder.MOD )
Collections.sort( this.view, ItemSorters.CONFIG_BASED_SORT_BY_MOD );
else if ( SortBy == SortOrder.AMOUNT )
else if( SortBy == SortOrder.AMOUNT )
Collections.sort( this.view, ItemSorters.CONFIG_BASED_SORT_BY_SIZE );
else if ( SortBy == SortOrder.INVTWEAKS )
else if( SortBy == SortOrder.INVTWEAKS )
Collections.sort( this.view, ItemSorters.CONFIG_BASED_SORT_BY_INV_TWEAKS );
else
Collections.sort( this.view, ItemSorters.CONFIG_BASED_SORT_BY_NAME );
for (IAEItemStack is : this.view)
for( IAEItemStack is : this.view )
this.dsp.add( is.getItemStack() );
}
private void updateNEI( String filter )
{
try
{
if( this.NEIWord == null || !this.NEIWord.equals( filter ) )
{
Class c = ReflectionHelper.getClass( this.getClass().getClassLoader(), "codechicken.nei.LayoutManager" );
Field fldSearchField = c.getField( "searchField" );
Object searchField = fldSearchField.get( c );
Method a = searchField.getClass().getMethod( "setText", String.class );
Method b = searchField.getClass().getMethod( "onTextChange", String.class );
this.NEIWord = filter;
a.invoke( searchField, filter );
b.invoke( searchField, "" );
}
}
catch( Throwable ignore )
{
}
}
public int size()
{
return this.view.size();
@@ -251,16 +252,13 @@ public class ItemRepo
this.list.resetStatus();
}
private boolean hasPower;
public boolean hasPower()
{
return this.hasPower;
}
public void setPower(boolean hasPower)
public void setPower( boolean hasPower )
{
this.hasPower = hasPower;
}
}
src/main/java/appeng/client/me/SlotDisconnected.java
+30 -28
View File
@@ -18,6 +18,7 @@
package appeng.client.me;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
@@ -26,27 +27,47 @@ import appeng.container.slot.AppEngSlot;
import appeng.items.misc.ItemEncodedPattern;
import appeng.util.Platform;
public class SlotDisconnected extends AppEngSlot
{
public final ClientDCInternalInv mySlot;
public SlotDisconnected(ClientDCInternalInv me, int which, int x, int y) {
public SlotDisconnected( ClientDCInternalInv me, int which, int x, int y )
{
super( me.inv, which, x, y );
this.mySlot = me;
}
@Override
public boolean isItemValid( ItemStack par1ItemStack )
{
return false;
}
@Override
public void putStack( ItemStack par1ItemStack )
{
}
@Override
public boolean canTakeStack( EntityPlayer par1EntityPlayer )
{
return false;
}
@Override
public ItemStack getDisplayStack()
{
if ( Platform.isClient() )
if( Platform.isClient() )
{
ItemStack is = super.getStack();
if ( is != null && is.getItem() instanceof ItemEncodedPattern )
if( is != null && is.getItem() instanceof ItemEncodedPattern )
{
ItemEncodedPattern iep = (ItemEncodedPattern) is.getItem();
ItemStack out = iep.getOutput( is );
if ( out != null )
if( out != null )
return out;
}
}
@@ -54,21 +75,8 @@ public class SlotDisconnected extends AppEngSlot
}
@Override
public boolean canTakeStack(EntityPlayer par1EntityPlayer)
public void onPickupFromSlot( EntityPlayer par1EntityPlayer, ItemStack par2ItemStack )
{
return false;
}
@Override
public ItemStack decrStackSize(int par1)
{
return null;
}
@Override
public void putStack(ItemStack par1ItemStack)
{
}
@Override
@@ -77,12 +85,6 @@ public class SlotDisconnected extends AppEngSlot
return this.getStack() != null;
}
@Override
public boolean isItemValid(ItemStack par1ItemStack)
{
return false;
}
@Override
public int getSlotStackLimit()
{
@@ -90,14 +92,14 @@ public class SlotDisconnected extends AppEngSlot
}
@Override
public boolean isSlotInInventory(IInventory par1iInventory, int par2)
public ItemStack decrStackSize( int par1 )
{
return false;
return null;
}
@Override
public void onPickupFromSlot(EntityPlayer par1EntityPlayer, ItemStack par2ItemStack)
public boolean isSlotInInventory( IInventory par1iInventory, int par2 )
{
return false;
}
}
src/main/java/appeng/client/me/SlotME.java
+26 -24
View File
@@ -18,6 +18,7 @@
package appeng.client.me;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
@@ -25,61 +26,56 @@ import net.minecraft.item.ItemStack;
import appeng.api.storage.data.IAEItemStack;
public class SlotME extends Slot
{
public final InternalSlotME mySlot;
public SlotME(InternalSlotME me) {
public SlotME( InternalSlotME me )
{
super( null, 0, me.xPos, me.yPos );
this.mySlot = me;
}
@Override
public ItemStack getStack()
{
if ( this.mySlot.hasPower() )
return this.mySlot.getStack();
return null;
}
public IAEItemStack getAEStack()
{
if ( this.mySlot.hasPower() )
if( this.mySlot.hasPower() )
return this.mySlot.getAEStack();
return null;
}
@Override
public boolean canTakeStack(EntityPlayer par1EntityPlayer)
public void onPickupFromSlot( EntityPlayer par1EntityPlayer, ItemStack par2ItemStack )
{
}
@Override
public boolean isItemValid( ItemStack par1ItemStack )
{
return false;
}
@Override
public ItemStack decrStackSize(int par1)
public ItemStack getStack()
{
if( this.mySlot.hasPower() )
return this.mySlot.getStack();
return null;
}
@Override
public void putStack(ItemStack par1ItemStack)
{
}
@Override
public boolean getHasStack()
{
if ( this.mySlot.hasPower() )
if( this.mySlot.hasPower() )
return this.getStack() != null;
return false;
}
@Override
public boolean isItemValid(ItemStack par1ItemStack)
public void putStack( ItemStack par1ItemStack )
{
return false;
}
@Override
@@ -89,14 +85,20 @@ public class SlotME extends Slot
}
@Override
public boolean isSlotInInventory(IInventory par1iInventory, int par2)
public ItemStack decrStackSize( int par1 )
{
return null;
}
@Override
public boolean isSlotInInventory( IInventory par1iInventory, int par2 )
{
return false;
}
@Override
public void onPickupFromSlot(EntityPlayer par1EntityPlayer, ItemStack par2ItemStack)
public boolean canTakeStack( EntityPlayer par1EntityPlayer )
{
return false;
}
}