Fixes #1536: Checking for all required BC classes

Changed version from PartStack provider to rv2 (rv3)

gradle.properties

@@ -1,5 +1,5 @@
 aeversion=rv2
-aechannel=beta
+aechannel=stable
 aebuild=0
 aegroup=appeng
 aebasename=appliedenergistics2
@@ -39,7 +39,7 @@ bc_version=6.4.6
 # Self Compiled APIs                                    #
 #########################################################
 mekansim_version=8.0.1.198
-rotarycraft_version=V5c
+rotarycraft_version=V6e
 
 
 #########################################################

src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java

@@ -22,6 +22,7 @@ package appeng.client.gui.implementations;
 import java.io.IOException;
 import java.util.List;
 
+import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 
 import net.minecraft.client.gui.GuiButton;
@@ -218,6 +219,8 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
 	@Override
 	public void initGui()
 	{
+		Keyboard.enableRepeatEvents( true );
+
 		this.maxRows = this.getMaxRows();
 		this.perRow = AEConfig.instance.getConfigManager().getSetting( Settings.TERMINAL_STYLE ) != TerminalStyle.FULL ? 9 : 9 + ( ( this.width - this.standardSize ) / 18 );
 
@@ -383,6 +386,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
 	public void onGuiClosed()
 	{
 		super.onGuiClosed();
+		Keyboard.enableRepeatEvents( false );
 		memoryText = this.searchField.getText();
 	}
 

src/main/java/appeng/core/features/WrappedDamageItemDefinition.java

@@ -85,7 +85,10 @@ public final class WrappedDamageItemDefinition implements ITileDefinition
 			return false;
 		}
 
-		return this.definition.isSameAs( comparableStack ) && comparableStack.getItemDamage() == this.damage;
+		final boolean sameItem = this.definition.isSameAs( new ItemStack( comparableStack.getItem() ) );
+		final boolean sameDamage = comparableStack.getItemDamage() == this.damage;
+
+		return sameItem && sameDamage;
 	}
 
 	@Override

src/main/java/appeng/integration/modules/BC.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
  *
  * Applied Energistics 2 is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -34,7 +34,10 @@ import cpw.mods.fml.common.event.FMLInterModComms;
 import buildcraft.BuildCraftEnergy;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.blueprints.BuilderAPI;
+import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.ISchematicRegistry;
+import buildcraft.api.blueprints.SchematicBlock;
+import buildcraft.api.blueprints.SchematicTile;
 import buildcraft.api.facades.IFacadeItem;
 import buildcraft.api.tools.IToolWrench;
 import buildcraft.api.transport.IInjectable;
@@ -68,9 +71,21 @@ public final class BC extends BaseModule implements IBC
 
 	public BC()
 	{
-		this.testClassExistence( IPipeConnection.class );
-		this.testClassExistence( ItemFacade.class );
+		this.testClassExistence( BuildCraftEnergy.class );
+		this.testClassExistence( BuildCraftTransport.class );
+		this.testClassExistence( BuilderAPI.class );
+		this.testClassExistence( IBuilderContext.class );
+		this.testClassExistence( ISchematicRegistry.class );
+		this.testClassExistence( IFacadeItem.class );
 		this.testClassExistence( IToolWrench.class );
+		this.testClassExistence( IInjectable.class );
+		this.testClassExistence( IPipeConnection.class );
+		this.testClassExistence( IPipeTile.class );
+		this.testClassExistence( ItemFacade.class );
+		this.testClassExistence( PipeIconProvider.class );
+		this.testClassExistence( SchematicTile.class );
+		this.testClassExistence( SchematicBlock.class );
+		this.testClassExistence( IPipeTile.PipeType.class );
 	}
 
 	@Override

src/main/java/appeng/integration/modules/RotaryCraft.java

@@ -28,7 +28,8 @@ public class RotaryCraft extends BaseModule
 
 	public RotaryCraft()
 	{
-		this.testClassExistence( Reika.RotaryCraft.API.Power.ShaftPowerReceiver.class );
+		this.testClassExistence( Reika.RotaryCraft.API.Power.AdvancedShaftPowerReceiver.class );
+		this.testClassExistence( Reika.RotaryCraft.API.Interfaces.Transducerable.class );
 	}
 
 	@Override

src/main/java/appeng/integration/modules/Waila.java

@@ -38,6 +38,7 @@ public class Waila extends BaseModule
 	{
 		final IWailaDataProvider partHost = new PartWailaDataProvider();
 
+		registrar.registerStackProvider( partHost, AEBaseTile.class );
 		registrar.registerBodyProvider( partHost, AEBaseTile.class );
 		registrar.registerNBTProvider( partHost, AEBaseTile.class );
 

src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java

@@ -38,6 +38,7 @@ import appeng.api.parts.IPart;
 import appeng.integration.modules.waila.part.ChannelWailaDataProvider;
 import appeng.integration.modules.waila.part.IPartWailaDataProvider;
 import appeng.integration.modules.waila.part.PartAccessor;
+import appeng.integration.modules.waila.part.PartStackWailaDataProvider;
 import appeng.integration.modules.waila.part.PowerStateWailaDataProvider;
 import appeng.integration.modules.waila.part.StorageMonitorWailaDataProvider;
 import appeng.integration.modules.waila.part.Tracer;
@@ -75,13 +76,32 @@ public final class PartWailaDataProvider implements IWailaDataProvider
 		final IPartWailaDataProvider channel = new ChannelWailaDataProvider();
 		final IPartWailaDataProvider storageMonitor = new StorageMonitorWailaDataProvider();
 		final IPartWailaDataProvider powerState = new PowerStateWailaDataProvider();
+		final IPartWailaDataProvider partStack = new PartStackWailaDataProvider();
 
-		this.providers = Lists.newArrayList( channel, storageMonitor, powerState );
+		this.providers = Lists.newArrayList( channel, storageMonitor, powerState, partStack );
 	}
 
 	@Override
 	public ItemStack getWailaStack( IWailaDataAccessor accessor, IWailaConfigHandler config )
 	{
+		final TileEntity te = accessor.getTileEntity();
+		final MovingObjectPosition mop = accessor.getPosition();
+
+		final Optional<IPart> maybePart = this.accessor.getMaybePart( te, mop );
+
+		if( maybePart.isPresent() )
+		{
+			final IPart part = maybePart.get();
+
+			ItemStack wailaStack = null;
+
+			for( IPartWailaDataProvider provider : this.providers )
+			{
+				wailaStack = provider.getWailaStack( part, config, wailaStack );
+			}
+			return wailaStack;
+		}
+
 		return null;
 	}
 

src/main/java/appeng/integration/modules/waila/part/BasePartWailaDataProvider.java

@@ -22,6 +22,7 @@ package appeng.integration.modules.waila.part;
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
@@ -41,6 +42,12 @@ import appeng.api.parts.IPart;
  */
 public abstract class BasePartWailaDataProvider implements IPartWailaDataProvider
 {
+	@Override
+	public ItemStack getWailaStack( IPart part, IWailaConfigHandler config, ItemStack partStack )
+	{
+		return null;
+	}
+
 	@Override
 	public List<String> getWailaHead( IPart part, List<String> currentToolTip, IWailaDataAccessor accessor, IWailaConfigHandler config )
 	{

src/main/java/appeng/integration/modules/waila/part/IPartWailaDataProvider.java

@@ -22,6 +22,7 @@ package appeng.integration.modules.waila.part;
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
@@ -41,6 +42,8 @@ import appeng.api.parts.IPart;
  */
 public interface IPartWailaDataProvider
 {
+	ItemStack getWailaStack( IPart part, IWailaConfigHandler config, ItemStack partStack );
+
 	List<String> getWailaHead( IPart part, List<String> currentToolTip, IWailaDataAccessor accessor, IWailaConfigHandler config );
 
 	List<String> getWailaBody( IPart part, List<String> currentToolTip, IWailaDataAccessor accessor, IWailaConfigHandler config );

src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java

@@ -0,0 +1,42 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.integration.modules.waila.part;
+
+import appeng.api.parts.IPart;
+import appeng.api.parts.PartItemStack;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import net.minecraft.item.ItemStack;
+
+/**
+ *  Part ItemStack provider for WAILA
+ *
+ * @author TheJulianJES
+ * @version rv2
+ * @since rv2
+ */
+public class PartStackWailaDataProvider extends BasePartWailaDataProvider {
+
+	@Override
+	public ItemStack getWailaStack( IPart part, IWailaConfigHandler config, ItemStack partStack )
+	{
+		partStack = part.getItemStack( PartItemStack.Pick );
+		return partStack;
+	}
+
+}

src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java

@@ -29,6 +29,7 @@ import net.minecraft.world.World;
 
 import gnu.trove.map.TObjectLongMap;
 import gnu.trove.map.hash.TObjectLongHashMap;
+import mcp.mobius.waila.api.ITaggedList;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
@@ -76,6 +77,9 @@ public final class PowerStorageWailaDataProvider extends BaseWailaDataProvider
 	@Override
 	public List<String> getWailaBody( ItemStack itemStack, List<String> currentToolTip, IWailaDataAccessor accessor, IWailaConfigHandler config )
 	{
+		//Removes RF tooltip on WAILA 1.5.9+
+		((ITaggedList<String, String>) currentToolTip).removeEntries("RFEnergyStorage");
+
 		final TileEntity te = accessor.getTileEntity();
 		if( te instanceof IAEPowerStorage )
 		{

src/main/java/appeng/recipes/game/DisassembleRecipe.java

@@ -92,7 +92,7 @@ public final class DisassembleRecipe implements IRecipe
 			{
 				// needs a single input in the recipe
 				itemCount++;
-				if ( itemCount > 1 )
+				if( itemCount > 1 )
 				{
 					return MISMATCHED_STACK;
 				}

src/main/java/appeng/tile/powersink/RotaryCraft.java

@@ -19,20 +19,25 @@
 package appeng.tile.powersink;
 
 
+import appeng.transformer.annotations.Integration;
+import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import Reika.RotaryCraft.API.Power.ShaftPowerReceiver;
+import Reika.RotaryCraft.API.Interfaces.Transducerable;
+import Reika.RotaryCraft.API.Power.AdvancedShaftPowerReceiver;
 
 import appeng.api.config.PowerUnits;
 import appeng.tile.TileEvent;
 import appeng.tile.events.TileEventType;
 import appeng.transformer.annotations.Integration.Interface;
+import appeng.transformer.annotations.Integration.InterfaceList;
 import appeng.transformer.annotations.Integration.Method;
 import appeng.util.Platform;
 
+import java.util.ArrayList;
 
-@Interface( iname = "RotaryCraft", iface = "Reika.RotaryCraft.API.Power.ShaftPowerReceiver" )
-public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver
+@InterfaceList( value = { @Interface( iname = "RotaryCraft", iface = "Reika.RotaryCraft.API.Power.AdvancedShaftPowerReceiver" ), @Interface( iname = "RotaryCraft", iface = "Reika.RotaryCraft.API.Interfaces.Transducerable") } )
+public abstract class RotaryCraft extends IC2 implements AdvancedShaftPowerReceiver, Transducerable
 {
 
 	private int omega = 0;
@@ -40,16 +45,32 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver
 	private long power = 0;
 	private int alpha = 0;
 
+	private long currentPower = 0;
+
 	@TileEvent( TileEventType.TICK )
 	@Method( iname = "RotaryCraft" )
 	public void Tick_RotaryCraft()
 	{
-		if( this.worldObj != null && !this.worldObj.isRemote && this.power > 0 )
+		if( this.worldObj != null && !this.worldObj.isRemote && this.currentPower > 0 )
 		{
-			this.injectExternalPower( PowerUnits.WA, this.power );
+			this.injectExternalPower( PowerUnits.WA, this.currentPower );
+			this.currentPower = 0;
 		}
 	}
 
+	@Override
+	public final boolean addPower( int torque, int omega, long power, ForgeDirection side )
+	{
+		this.omega = omega;
+		this.torque = torque;
+		this.power = power;
+
+		this.currentPower += power;
+
+		return true;
+
+	}
+
 	@Override
 	public final int getOmega()
 	{
@@ -86,37 +107,6 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver
 		this.alpha = io;
 	}
 
-	@Override
-	public final void setPower( long p )
-	{
-		if( Platform.isClient() )
-		{
-			return;
-		}
-
-		this.power = p;
-	}
-
-	@Override
-	public final void noInputMachine()
-	{
-		this.power = 0;
-		this.torque = 0;
-		this.omega = 0;
-	}
-
-	@Override
-	public final void setTorque( int t )
-	{
-		this.torque = t;
-	}
-
-	@Override
-	public final void setOmega( int o )
-	{
-		this.omega = o;
-	}
-
 	public final boolean canReadFromBlock( int x, int y, int z )
 	{
 		ForgeDirection side = ForgeDirection.UNKNOWN;
@@ -164,6 +154,33 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver
 	@Override
 	public final int getMinTorque( int available )
 	{
-		return 0;
+		return 1;
+	}
+
+	@Override
+	public final ArrayList<String> getMessages( World world, int x, int y, int z, int side )
+	{
+		String out;
+		if( power >= 1000000000 )
+		{
+			out = String.format( "Receiving %.3f GW @ %d rad/s.", power / 1000000000.0D, omega );
+		}
+		else if( power >= 1000000 )
+		{
+			out = String.format( "Receiving %.3f MW @ %d rad/s.", power / 1000000.0D, omega );
+		}
+		else if( power >= 1000 )
+		{
+			out = String.format( "Receiving %.3f kW @ %d rad/s.", power / 1000.0D, omega );
+		}
+		else
+		{
+			out = String.format( "Receiving %d W @ %d rad/s.", power, omega );
+		}
+
+
+		ArrayList<String> messages = new ArrayList<String>( 1 );
+		messages.add( out );
+		return messages;
 	}
 }

src/main/java/appeng/util/Platform.java

@@ -1863,15 +1863,15 @@ public class Platform
 		return null;
 	}
 
-	public static boolean isSameItemType( ItemStack ol, ItemStack op )
+	public static boolean isSameItemType( ItemStack that, ItemStack other )
 	{
-		if( ol != null && op != null && ol.getItem() == op.getItem() )
+		if( that != null && other != null && that.getItem() == other.getItem() )
 		{
-			if( ol.isItemStackDamageable() )
+			if( that.isItemStackDamageable() )
 			{
 				return true;
 			}
-			return ol.getItemDamage() == ol.getItemDamage();
+			return that.getItemDamage() == other.getItemDamage();
 		}
 		return false;
 	}