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

Replaced all instances of Guava's Optional type with Java 8's Optional type, as discussed in #81. (#90)

Browse Source
This commit is contained in:
shartte
2016-08-24 19:06:10 +02:00
committed by Sebastian Hartte
parent c2a239a12f
commit e276aa682f
65 changed files with 306 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/AEBasePart.java
+4 -2
View File
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
import java.util.Optional;
import java.util.Random;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -479,9 +480,10 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
final IDefinitions definitions = AEApi.instance().definitions();
if( definitions.parts().iface().isSameAs( is ) )
{
for( final ItemStack iface : definitions.blocks().iface().maybeStack( 1 ).asSet() )
Optional<ItemStack> iface = definitions.blocks().iface().maybeStack( 1 );
if( iface.isPresent() )
{
is = iface;
is = iface.get();
}
}
src/main/java/appeng/parts/PartPlacement.java
+3 -4
View File
@@ -22,7 +22,7 @@ package appeng.parts;
import java.util.LinkedList;
import java.util.List;
import com.google.common.base.Optional;
import java.util.Optional;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
@@ -379,12 +379,11 @@ public class PartPlacement
final AEPartLocation mySide = host.addPart( held, AEPartLocation.fromFacing( side ), player, hand );
if( mySide != null )
{
for( final Block multiPartBlock : multiPart.maybeBlock().asSet() )
{
multiPart.maybeBlock().ifPresent( multiPartBlock -> {
final SoundType ss = multiPartBlock.getSoundType();
world.playSound( player, 0.5 + pos.getX(), 0.5 + pos.getY(), 0.5 + pos.getZ(), ss.getPlaceSound(), SoundCategory.BLOCKS, ( ss.getVolume() + 1.0F ) / 2.0F, ss.getPitch() * 0.8F );
}
});
if( !player.capabilities.isCreativeMode )
{
src/main/java/appeng/parts/p2p/PartP2PTunnel.java
+8 -26
View File
@@ -21,17 +21,13 @@ package appeng.parts.p2p;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Optional;
import com.google.common.base.Optional;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.Vec3d;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
@@ -216,17 +212,14 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
}
else if( tt != null ) // attunement
{
ItemStack newType = null;
final ItemStack newType;
final IParts parts = AEApi.instance().definitions().parts();
switch( tt )
{
case LIGHT:
for( final ItemStack stack : parts.p2PTunnelLight().maybeStack( 1 ).asSet() )
{
newType = stack;
}
newType = parts.p2PTunnelLight().maybeStack( 1 ).orElse( null );
break;
/*
@@ -239,10 +232,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
*/
case FLUID:
for( final ItemStack stack : parts.p2PTunnelLiquids().maybeStack( 1 ).asSet() )
{
newType = stack;
}
newType = parts.p2PTunnelLiquids().maybeStack( 1 ).orElse( null );
break;
/*
@@ -255,24 +245,15 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
*/
case ITEM:
for( final ItemStack stack : parts.p2PTunnelItems().maybeStack( 1 ).asSet() )
{
newType = stack;
}
newType = parts.p2PTunnelItems().maybeStack( 1 ).orElse( null );
break;
case ME:
for( final ItemStack stack : parts.p2PTunnelME().maybeStack( 1 ).asSet() )
{
newType = stack;
}
newType = parts.p2PTunnelME().maybeStack( 1 ).orElse( null );
break;
case REDSTONE:
for( final ItemStack stack : parts.p2PTunnelRedstone().maybeStack( 1 ).asSet() )
{
newType = stack;
}
newType = parts.p2PTunnelRedstone().maybeStack( 1 ).orElse( null );
break;
/*
@@ -291,6 +272,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
*/
default:
newType = null;
break;
}