From d37638f4ee743ffecf18fe1d862ef7fb0296c994 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 27 Sep 2014 23:54:17 +0200 Subject: [PATCH] Use collections methods to add stuff Remove redundant new String initialization --- src/main/java/appeng/block/AEBaseBlock.java | 6 +++--- src/main/java/appeng/client/me/ItemRepo.java | 2 +- src/main/java/appeng/me/helpers/AENetworkProxy.java | 4 ++-- src/main/java/appeng/recipes/handlers/Inscribe.java | 10 ++++------ src/main/java/appeng/recipes/handlers/Shaped.java | 2 +- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index 0b4360cc5..98aa90e2d 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -1,10 +1,12 @@ package appeng.block; import java.util.ArrayList; +import java.util.Collections; import java.util.EnumSet; import java.util.List; import appeng.client.texture.FlippableIcon; +import com.google.common.collect.Lists; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -677,9 +679,7 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature if ( id.removedByPlayer( w, player, x, y, z, false ) ) { - List l = new ArrayList(); - for (ItemStack iss : drops) - l.add( iss ); + List l = Lists.newArrayList(drops); Platform.spawnDrops( w, x, y, z, l ); w.setBlockToAir( x, y, z ); } diff --git a/src/main/java/appeng/client/me/ItemRepo.java b/src/main/java/appeng/client/me/ItemRepo.java index 38fe8a61a..725cd89dc 100644 --- a/src/main/java/appeng/client/me/ItemRepo.java +++ b/src/main/java/appeng/client/me/ItemRepo.java @@ -104,7 +104,7 @@ public class ItemRepo Method b = searchField.getClass().getMethod( "onTextChange", String.class ); NEIWord = filter; - a.invoke( searchField, new String( filter ) ); + a.invoke( searchField, filter ); b.invoke( searchField, "" ); } } diff --git a/src/main/java/appeng/me/helpers/AENetworkProxy.java b/src/main/java/appeng/me/helpers/AENetworkProxy.java index fa0bd5684..ddcbc73b4 100644 --- a/src/main/java/appeng/me/helpers/AENetworkProxy.java +++ b/src/main/java/appeng/me/helpers/AENetworkProxy.java @@ -1,5 +1,6 @@ package appeng.me.helpers; +import java.util.Collections; import java.util.EnumSet; import net.minecraft.entity.player.EntityPlayer; @@ -307,8 +308,7 @@ public class AENetworkProxy implements IGridBlock { EnumSet flags = EnumSet.noneOf( GridFlags.class ); - for (GridFlags gf : requireChannel) - flags.add( gf ); + Collections.addAll( flags, requireChannel ); this.flags = flags; } diff --git a/src/main/java/appeng/recipes/handlers/Inscribe.java b/src/main/java/appeng/recipes/handlers/Inscribe.java index 341a63e27..baad6ca44 100644 --- a/src/main/java/appeng/recipes/handlers/Inscribe.java +++ b/src/main/java/appeng/recipes/handlers/Inscribe.java @@ -1,5 +1,6 @@ package appeng.recipes.handlers; +import java.util.Collections; import java.util.HashSet; import java.util.LinkedList; import java.util.List; @@ -76,16 +77,13 @@ public class Inscribe implements ICraftHandler, IWebsiteSerializer public void register() throws RegistrationError, MissingIngredientError { if ( imprintable != null ) - for (ItemStack s : imprintable.getItemStackSet()) - inputs.add( s ); + Collections.addAll( inputs, imprintable.getItemStackSet() ); if ( plateA != null ) - for (ItemStack s : plateA.getItemStackSet()) - plates.add( s ); + Collections.addAll( plates, plateA.getItemStackSet() ); if ( plateB != null ) - for (ItemStack s : plateB.getItemStackSet()) - plates.add( s ); + Collections.addAll( plates, plateB.getItemStackSet() ); InscriberRecipe ir = new InscriberRecipe( imprintable.getItemStackSet(), plateA == null ? null : plateA.getItemStack(), plateB == null ? null : plateB.getItemStack(), output.getItemStack(), usePlates ); diff --git a/src/main/java/appeng/recipes/handlers/Shaped.java b/src/main/java/appeng/recipes/handlers/Shaped.java index 4f929eb85..c4c2dd3be 100644 --- a/src/main/java/appeng/recipes/handlers/Shaped.java +++ b/src/main/java/appeng/recipes/handlers/Shaped.java @@ -74,7 +74,7 @@ public class Shaped implements ICraftHandler, IWebsiteSerializer first++; } } - args.add( y, new String( row ) ); + args.add( y, row ); } ItemStack outIS = output.getItemStack();