Puts everywhere brackets

This commit is contained in:
thatsIch
2015-04-29 02:30:53 +02:00
parent 23aa8fd72d
commit 64ed05a1b4
465 changed files with 6726 additions and 14 deletions
@@ -134,7 +134,9 @@ public final class BC extends BaseModule implements IBC
public boolean isFacade( ItemStack is )
{
if( is == null )
{
return false;
}
return is.getItem() instanceof IFacadeItem;
}
@@ -155,7 +157,9 @@ public final class BC extends BaseModule implements IBC
public void addFacade( ItemStack item )
{
if( item != null )
{
FMLInterModComms.sendMessage( "BuildCraft|Transport", "add-facade", item );
}
}
@Override
@@ -42,7 +42,9 @@ public class BCPipeHandler implements IExternalStorageHandler
public IMEInventory getInventory( TileEntity te, ForgeDirection d, StorageChannel chan, BaseActionSource src )
{
if( chan == StorageChannel.ITEMS )
{
return new BCPipeInventory( te, d );
}
return null;
}
}
@@ -49,12 +49,16 @@ public class BCPipeInventory implements IMEInventory<IAEItemStack>
if( mode == Actionable.SIMULATE )
{
if( BC.instance.canAddItemsToPipe( this.te, input.getItemStack(), this.dir ) )
{
return null;
}
return input;
}
if( BC.instance.addItemsToPipe( this.te, input.getItemStack(), this.dir ) )
{
return null;
}
return input;
}
@@ -213,7 +213,9 @@ public class CraftGuide extends CraftGuideAPIObject implements IIntegrationModul
output[i] = items.get( i );
if( output[i] instanceof ItemStack[] )
{
output[i] = Arrays.asList( (ItemStack[]) output[i] );
}
if( output[i] instanceof IIngredient )
{
@@ -248,7 +250,9 @@ public class CraftGuide extends CraftGuideAPIObject implements IIntegrationModul
output[i] = items[y * width + x];
if( output[i] instanceof ItemStack[] )
{
output[i] = Arrays.asList( (ItemStack[]) output[i] );
}
if( output[i] instanceof IIngredient )
{
@@ -284,7 +288,9 @@ public class CraftGuide extends CraftGuideAPIObject implements IIntegrationModul
output[i] = items[y * width + x];
if( output[i] instanceof ItemStack[] )
{
output[i] = Arrays.asList( (ItemStack[]) output[i] );
}
if( output[i] instanceof IIngredient )
{
@@ -316,7 +322,9 @@ public class CraftGuide extends CraftGuideAPIObject implements IIntegrationModul
{
list.set( x, list.get( x ).copy() );
if( list.get( x ).stackSize == 0 )
{
list.get( x ).stackSize = 1;
}
}
return list;
@@ -66,7 +66,9 @@ public class FMP implements IIntegrationModule, IPartFactory, IPartConverter, IF
for( PartRegistry pr : PartRegistry.values() )
{
if( pr.getName().equals( name ) )
{
return pr.construct( 0 );
}
}
return null;
@@ -125,7 +127,9 @@ public class FMP implements IIntegrationModule, IPartFactory, IPartConverter, IF
String[] data = new String[reg.length];
for( int x = 0; x < data.length; x++ )
{
data[x] = reg[x].getName();
}
MultiPartRegistry.registerConverter( this );
MultiPartRegistry.registerParts( this, data );
@@ -162,7 +166,9 @@ public class FMP implements IIntegrationModule, IPartFactory, IPartConverter, IF
{
TMultiPart p = i.next();
if( p instanceof CableBusPart )
{
return (IPartHost) p;
}
}
return new FMPPlacementHelper( mp );
@@ -186,7 +192,9 @@ public class FMP implements IIntegrationModule, IPartFactory, IPartConverter, IF
{
TMultiPart p = i.next();
if( p instanceof CableBusPart )
{
return ( (CableBusPart) p ).cb;
}
}
}
return null;
@@ -57,10 +57,14 @@ public class FZ implements IFZ, IIntegrationModule
ItemStack i = null;
if( day_BarrelClass.isInstance( te ) )
{
i = (ItemStack) day_item.get( te );
}
if( i != null )
{
i = Platform.cloneItemStack( i );
}
return i;
}
@@ -79,7 +83,9 @@ public class FZ implements IFZ, IIntegrationModule
try
{
if( day_BarrelClass.isInstance( te ) )
{
return (Integer) day_getMaxSize.invoke( te );
}
}
catch( IllegalAccessException ignored )
{
@@ -99,7 +105,9 @@ public class FZ implements IFZ, IIntegrationModule
try
{
if( day_BarrelClass.isInstance( te ) )
{
return (Integer) day_getItemCount.invoke( te );
}
}
catch( IllegalAccessException ignored )
{
@@ -119,7 +127,9 @@ public class FZ implements IFZ, IIntegrationModule
try
{
if( day_BarrelClass.isInstance( te ) )
{
day_item.set( te, input == null ? null : input.copy() );
}
}
catch( IllegalArgumentException ignored )
{
@@ -135,7 +145,9 @@ public class FZ implements IFZ, IIntegrationModule
try
{
if( day_BarrelClass.isInstance( te ) )
{
day_setItemCount.invoke( te, max );
}
te.markDirty();
}
@@ -115,7 +115,9 @@ public class ImmibisMicroblocks extends BaseModule implements IImmibisMicroblock
final TileEntity tx = w.getTileEntity( x, y, z );
if( tx instanceof IPartHost )
{
return (IPartHost) tx;
}
return null;
}
@@ -46,7 +46,9 @@ public class InvTweaks extends BaseModule implements IInvTweaks
public void postInit()
{
if( api == null )
{
throw new IllegalStateException( "InvTweaks API Instance Failed." );
}
}
@Override
@@ -84,7 +84,9 @@ public class NEI extends BaseModule implements INEI, IContainerTooltipHandler
this.registerRecipeHandler( new NEIGrinderRecipeHandler() );
if( AEConfig.instance.isFeatureEnabled( AEFeature.Facades ) && AEConfig.instance.isFeatureEnabled( AEFeature.enableFacadeCrafting ) )
{
this.registerRecipeHandler( new NEIFacadeRecipeHandler() );
}
// large stack tooltips
GuiContainerManager.addTooltipHandler( this );
@@ -119,12 +121,16 @@ public class NEI extends BaseModule implements INEI, IContainerTooltipHandler
public void drawSlot( Slot s )
{
if( s == null )
{
return;
}
ItemStack stack = s.getStack();
if( stack == null )
{
return;
}
Minecraft mc = Minecraft.getMinecraft();
FontRenderer fontRenderer = mc.fontRenderer;
@@ -166,7 +172,9 @@ public class NEI extends BaseModule implements INEI, IContainerTooltipHandler
public List<String> handleItemTooltip( GuiContainer guiScreen, ItemStack stack, int mouseX, int mouseY, List<String> currentToolTip )
{
if( guiScreen instanceof AEBaseMEGui )
{
return ( (AEBaseMEGui) guiScreen ).handleItemTooltip( stack, mouseX, mouseY, currentToolTip );
}
return currentToolTip;
}
@@ -152,11 +152,15 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler
{
IRecipeOverlayRenderer renderer = super.getOverlayRenderer( gui, recipe );
if( renderer != null )
{
return renderer;
}
IStackPositioner positioner = RecipeInfo.getStackPositioner( gui, "crafting2x2" );
if( positioner == null )
{
return null;
}
return new DefaultOverlayRenderer( this.getIngredientStacks( recipe ), positioner );
}
@@ -166,7 +170,9 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler
{
IOverlayHandler handler = super.getOverlayHandler( gui, recipe );
if( handler != null )
{
return handler;
}
return RecipeInfo.getOverlayHandler( gui, "crafting2x2" );
}
@@ -176,7 +182,9 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler
for( PositionedStack stack : this.getIngredientStacks( recipe ) )
{
if( ( stack.relx > 43 ) || ( stack.rely > 24 ) )
{
return false;
}
}
return true;
}
@@ -152,11 +152,15 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler
{
IRecipeOverlayRenderer renderer = super.getOverlayRenderer( gui, recipe );
if( renderer != null )
{
return renderer;
}
IStackPositioner positioner = RecipeInfo.getStackPositioner( gui, "crafting2x2" );
if( positioner == null )
{
return null;
}
return new DefaultOverlayRenderer( this.getIngredientStacks( recipe ), positioner );
}
@@ -166,7 +170,9 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler
{
IOverlayHandler handler = super.getOverlayHandler( gui, recipe );
if( handler != null )
{
return handler;
}
return RecipeInfo.getOverlayHandler( gui, "crafting2x2" );
}
@@ -176,7 +182,9 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler
for( PositionedStack stack : this.getIngredientStacks( recipe ) )
{
if( ( stack.relx > 43 ) || ( stack.rely > 24 ) )
{
return false;
}
}
return true;
}
@@ -246,7 +254,9 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler
public void computeVisuals()
{
for( PositionedStack p : this.ingredients )
{
p.generatePermutations();
}
this.result.generatePermutations();
}
@@ -151,11 +151,15 @@ public class NEIFacadeRecipeHandler extends TemplateRecipeHandler
{
IRecipeOverlayRenderer renderer = super.getOverlayRenderer( gui, recipe );
if( renderer != null )
{
return renderer;
}
IStackPositioner positioner = RecipeInfo.getStackPositioner( gui, "crafting2x2" );
if( positioner == null )
{
return null;
}
return new DefaultOverlayRenderer( this.getIngredientStacks( recipe ), positioner );
}
@@ -165,7 +169,9 @@ public class NEIFacadeRecipeHandler extends TemplateRecipeHandler
{
IOverlayHandler handler = super.getOverlayHandler( gui, recipe );
if( handler != null )
{
return handler;
}
return RecipeInfo.getOverlayHandler( gui, "crafting2x2" );
}
@@ -175,7 +181,9 @@ public class NEIFacadeRecipeHandler extends TemplateRecipeHandler
for( PositionedStack stack : this.getIngredientStacks( recipe ) )
{
if( ( stack.relx > 43 ) || ( stack.rely > 24 ) )
{
return false;
}
}
return true;
}
@@ -206,7 +206,9 @@ public class NEIGrinderRecipeHandler extends TemplateRecipeHandler
}
if( recipe.getInput() != null )
{
this.ingredients.add( new PositionedStack( recipe.getInput(), 45, 24 ) );
}
}
@Override
@@ -34,11 +34,13 @@ public class TerminalCraftingSlotFinder implements IStackPositioner
public ArrayList<PositionedStack> positionStacks( ArrayList<PositionedStack> a )
{
for( PositionedStack ps : a )
{
if( ps != null )
{
ps.relx += GuiMEMonitorable.CraftingGridOffsetX;
ps.rely += GuiMEMonitorable.CraftingGridOffsetY;
}
}
return a;
}
}
@@ -49,7 +49,9 @@ public class RB extends BaseModule implements IRB
public appeng.api.util.IOrientable getOrientable( TileEntity te )
{
if( te instanceof IOrientable )
{
return new RBWrapper( (IOrientable) te );
}
return null;
}
@@ -47,11 +47,15 @@ public class BSCrate implements IMEInventory<IAEItemStack>
public IAEItemStack injectItems( IAEItemStack input, Actionable mode, BaseActionSource src )
{
if( mode == Actionable.SIMULATE )
{
return null;
}
ItemStack failed = this.crateStorage.insertItems( input.getItemStack() );
if( failed == null )
{
return null;
}
input.setStackSize( failed.stackSize );
return input;
}
@@ -42,7 +42,9 @@ public class BSCrateHandler implements IExternalStorageHandler
public IMEInventory getInventory( TileEntity te, ForgeDirection d, StorageChannel channel, BaseActionSource src )
{
if( channel == StorageChannel.ITEMS )
{
return new BSCrate( te, ForgeDirection.UNKNOWN );
}
return null;
}
}
@@ -99,9 +99,13 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
{
int cnt = this.cs.getItemCount( target );
if( cnt == 0 )
{
return null;
}
if( cnt > amount )
{
cnt = amount;
}
ItemStack c = target.copy();
c.stackSize = cnt;
return c;
@@ -164,9 +168,13 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
{
int cnt = this.cs.getItemCount( target );
if( cnt == 0 )
{
return null;
}
if( cnt > amount )
{
cnt = amount;
}
ItemStack c = target.copy();
c.stackSize = cnt;
return c;
@@ -187,7 +195,9 @@ public class BSCrateStorageAdaptor extends InventoryAdaptor
int items = this.cs.getSpaceForItem( toBeSimulated );
ItemStack B = Platform.cloneItemStack( toBeSimulated );
if( toBeSimulated.stackSize <= items )
{
return null;
}
B.stackSize -= items;
return B;
}
@@ -53,18 +53,26 @@ public class FactorizationBarrel implements IMEInventory<IAEItemStack>
public IAEItemStack injectItems( IAEItemStack input, Actionable mode, BaseActionSource src )
{
if( input == null )
{
return null;
}
if( input.getStackSize() == 0 )
{
return null;
}
ItemStack shared = input.getItemStack();
if( shared.isItemDamaged() )
{
return input;
}
if( this.remainingItemTypes() > 0 )
{
if( mode == Actionable.MODULATE )
{
this.fProxy.setItemType( this.te, input.getItemStack() );
}
}
if( this.containsItemType( input, mode == Actionable.SIMULATE ) )
@@ -74,7 +82,9 @@ public class FactorizationBarrel implements IMEInventory<IAEItemStack>
if( newTotal > max )
{
if( mode == Actionable.MODULATE )
{
this.fProxy.barrelSetCount( this.te, max );
}
IAEItemStack result = input.copy();
result.setStackSize( newTotal - max );
return result;
@@ -82,7 +92,9 @@ public class FactorizationBarrel implements IMEInventory<IAEItemStack>
else
{
if( mode == Actionable.MODULATE )
{
this.fProxy.barrelSetCount( this.te, newTotal );
}
return null;
}
}
@@ -101,7 +113,9 @@ public class FactorizationBarrel implements IMEInventory<IAEItemStack>
// empty barrels want your love too!
if( acceptEmpty && currentItem == null )
{
return true;
}
return i.equals( currentItem );
}
@@ -132,7 +146,9 @@ public class FactorizationBarrel implements IMEInventory<IAEItemStack>
else
{
if( mode == Actionable.MODULATE )
{
this.fProxy.barrelSetCount( this.te, (int) ( howMany - request.getStackSize() ) );
}
return request.copy();
}
}
@@ -44,7 +44,9 @@ public class FactorizationHandler implements IExternalStorageHandler
public IMEInventory getInventory( TileEntity te, ForgeDirection d, StorageChannel chan, BaseActionSource src )
{
if( chan == StorageChannel.ITEMS )
{
return new MEMonitorIInventory( new IMEAdaptor( FZ.instance.getFactorizationBarrel( te ), src ) );
}
return null;
}
}
@@ -44,7 +44,9 @@ public class MFRDSUHandler implements IExternalStorageHandler
public IMEInventory getInventory( TileEntity te, ForgeDirection d, StorageChannel chan, BaseActionSource src )
{
if( chan == StorageChannel.ITEMS )
{
return new MEMonitorIInventory( new IMEAdaptor( DSU.instance.getDSU( te ), src ) );
}
return null;
}
@@ -56,7 +56,9 @@ public class MinefactoryReloadedDeepStorageUnit implements IMEInventory<IAEItemS
long max = this.dsu.getMaxStoredCount();
long storedItems = is.stackSize;
if( max == storedItems )
{
return input;
}
storedItems += input.getStackSize();
if( storedItems > max )
@@ -64,13 +66,17 @@ public class MinefactoryReloadedDeepStorageUnit implements IMEInventory<IAEItemS
IAEItemStack overflow = AEItemStack.create( is );
overflow.setStackSize( (int) ( storedItems - max ) );
if( mode == Actionable.MODULATE )
{
this.dsu.setStoredItemCount( (int) max );
}
return overflow;
}
else
{
if( mode == Actionable.MODULATE )
{
this.dsu.setStoredItemCount( is.stackSize + (int) input.getStackSize() );
}
return null;
}
}
@@ -78,9 +84,13 @@ public class MinefactoryReloadedDeepStorageUnit implements IMEInventory<IAEItemS
else
{
if( input.getTagCompound() != null )
{
return input;
}
if( mode == Actionable.MODULATE )
{
this.dsu.setStoredItemType( input.getItemStack(), (int) input.getStackSize() );
}
return null;
}
return input;
@@ -96,13 +106,17 @@ public class MinefactoryReloadedDeepStorageUnit implements IMEInventory<IAEItemS
{
is = is.copy();
if( mode == Actionable.MODULATE )
{
this.dsu.setStoredItemCount( 0 );
}
return AEItemStack.create( is );
}
else
{
if( mode == Actionable.MODULATE )
{
this.dsu.setStoredItemCount( is.stackSize - (int) request.getStackSize() );
}
return request.copy();
}
}
@@ -79,7 +79,9 @@ public final class Tracer
{
v.yCoord += player.getEyeHeight();
if( player instanceof EntityPlayerMP && player.isSneaking() )
{
v.yCoord -= 0.08;
}
}
return v;
}