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

Fixes #743 crash with plugs, fixes #942 builder integration, closes #319 BC 6 prep

Browse Source
This commit is contained in:
thatsIch
2014-12-21 19:08:05 +01:00
parent cdf949a557
commit e300bf93fd
31 changed files with 261 additions and 1692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/integration/abstraction/IBC.java
+13 -13
View File
@@ -18,6 +18,7 @@
package appeng.integration.abstraction;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -28,24 +29,24 @@ import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.parts.IFacadePart;
public interface IBC
{
boolean isWrench( Item eq );
boolean isWrench(Item eq);
boolean canWrench( Item i, EntityPlayer p, int x, int y, int z );
boolean canWrench(Item i, EntityPlayer p, int x, int y, int z);
void wrenchUsed( Item i, EntityPlayer p, int x, int y, int z );
void wrenchUsed(Item i, EntityPlayer p, int x, int y, int z);
boolean canAddItemsToPipe( TileEntity te, ItemStack is, ForgeDirection dir );
boolean canAddItemsToPipe(TileEntity te, ItemStack is, ForgeDirection dir);
boolean addItemsToPipe( TileEntity te, ItemStack is, ForgeDirection dir );
boolean addItemsToPipe(TileEntity te, ItemStack is, ForgeDirection dir);
boolean isFacade( ItemStack is );
boolean isFacade(ItemStack is);
boolean isPipe( TileEntity te, ForgeDirection dir );
boolean isPipe(TileEntity te, ForgeDirection dir);
void addFacade(ItemStack item);
void addFacade( ItemStack item );
void registerPowerP2P();
@@ -53,12 +54,11 @@ public interface IBC
void registerLiquidsP2P();
IFacadePart createFacadePart(Block blk, int meta, ForgeDirection side);
IFacadePart createFacadePart( Block blk, int meta, ForgeDirection side );
IFacadePart createFacadePart(ItemStack held, ForgeDirection side);
IFacadePart createFacadePart( ItemStack held, ForgeDirection side );
ItemStack getTextureForFacade(ItemStack facade);
ItemStack getTextureForFacade( ItemStack facade );
IIcon getFacadeTexture();
}
src/main/java/appeng/integration/abstraction/IMJ5.java
-27
View File
@@ -1,27 +0,0 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2014, 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.abstraction;
public interface IMJ5
{
Object createPerdition(Object buildCraft);
}
src/main/java/appeng/integration/abstraction/IMJ6.java
-31
View File
@@ -1,31 +0,0 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2014, 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.abstraction;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.mj.IBatteryObject;
public interface IMJ6
{
IBatteryObject provider(TileEntity te, ForgeDirection side);
}
src/main/java/appeng/integration/abstraction/helpers/BaseMJPerdition.java
-43
View File
@@ -1,43 +0,0 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2014, 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.abstraction.helpers;
import net.minecraft.nbt.NBTTagCompound;
import buildcraft.api.power.PowerHandler.PowerReceiver;
import appeng.transformer.annotations.integration.Method;
public abstract class BaseMJPerdition
{
@Method(iname = "MJ5")
public abstract PowerReceiver getPowerReceiver();
public abstract double useEnergy(double f, double required, boolean b);
public abstract void addEnergy(float failed);
public abstract void configure(int i, int j, float f, int k);
public abstract void writeToNBT(NBTTagCompound tag);
public abstract void readFromNBT(NBTTagCompound tag);
public abstract void Tick();
}