tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Build Script Update.

Browse source 
FMP Fixes
Optional Interfaces for BC
Optional Interfaces for IC2
Removed UE Api on Items
Proxied Effect for C-CQuartz
This commit is contained in:
AlgorithmX2 2014-01-28 11:29:17 -06:00
parent 0f75db5e80
commit 9a64980443
16 changed files with 125 additions and 158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
block/misc/BlockCharger.java
View file

@ -24,6 +24,8 @@ import appeng.helpers.ICustomCollision;
import appeng.tile.AEBaseTile;
import appeng.tile.misc.TileCharger;
import appeng.util.Platform;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockCharger extends AEBaseBlock implements ICustomCollision
{
@ -62,6 +64,7 @@ public class BlockCharger extends AEBaseBlock implements ICustomCollision
}
@Override
@SideOnly(Side.CLIENT)
public void randomDisplayTick(World w, int x, int y, int z, Random r)
{
if ( !Configuration.instance.enableEffects )

9
client/ClientHelper.java
View file

@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import net.minecraft.client.Minecraft;
import net.minecraft.client.particle.EntityFX;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
@ -14,6 +15,7 @@ import appeng.block.AEBaseBlock;
import appeng.client.render.BaseBlockRender;
import appeng.client.render.TESRWrapper;
import appeng.client.render.WorldRender;
import appeng.client.render.effects.LightningEffect;
import appeng.client.render.entity.RenderTinyTNTPrimed;
import appeng.client.texture.CableBusTextures;
import appeng.client.texture.ExtraTextures;
@ -78,4 +80,11 @@ public class ClientHelper extends ServerHelper
return super.getPlayers();
}
@Override
public void spawnLightning(World worldObj, double posX, double posY, double posZ)
{
LightningEffect fx = new LightningEffect( worldObj, posX, posY + 0.3f, posZ, 0.0f, 0.0f, 0.0f );
Minecraft.getMinecraft().effectRenderer.addEffect( (EntityFX) fx );
}
}

4
client/render/effects/LightningEffect.java
View file

@ -3,9 +3,9 @@ package appeng.client.render.effects;
import java.util.Random;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.client.particle.EntityFX;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
@ -81,7 +81,7 @@ public class LightningEffect extends EntityFX
double oy = 0;
double oz = 0;
EntityClientPlayerMP p = Minecraft.getMinecraft().thePlayer;
EntityPlayer p = Minecraft.getMinecraft().thePlayer;
double offX = -rZ;
double offY = MathHelper.cos( (float) (Math.PI / 2.0f + p.rotationPitch * 0.017453292F) );
double offZ = rX;

2
core/CommonHelper.java
View file

@ -24,4 +24,6 @@ public abstract class CommonHelper
public abstract void sendToAllNearExcept(EntityPlayer p, double x, double y, double z, double dist, World w, Packet packet);
public abstract void spawnLightning(World worldObj, double posX, double posY, double posZ);
}

4
core/Configuration.java
View file

@ -27,8 +27,8 @@ public class Configuration extends net.minecraftforge.common.Configuration imple
public String latestVersion = VERSION;
public long latestTimeStamp = 0;
public static final String VERSION = "${version}";
public static final String CHANNEL = "${channel}";
public static final String VERSION = "@version@";
public static final String CHANNEL = "@aechannel@";
public final static String PACKET_CHANNEL = "AE";

7
entity/EntityChargedQuartz.java
View file

@ -4,8 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft;
import net.minecraft.client.particle.EntityFX;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.Item;
@ -14,7 +12,7 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import appeng.api.AEApi;
import appeng.client.render.effects.LightningEffect;
import appeng.core.CommonHelper;
import appeng.core.Configuration;
import appeng.util.Platform;
@ -39,9 +37,8 @@ final public class EntityChargedQuartz extends EntityItem
if ( Platform.isClient() && delay++ > 30 && Configuration.instance.enableEffects )
{
CommonHelper.proxy.spawnLightning( worldObj, posX, posY, posZ );
delay = 0;
LightningEffect fx = new LightningEffect( worldObj, posX, posY + 0.3f, posZ, 0.0f, 0.0f, 0.0f );
Minecraft.getMinecraft().effectRenderer.addEffect( (EntityFX) fx );
}
int j = MathHelper.floor_double( this.posX );

58
fmp/CableBusPart.java
View file

@ -6,6 +6,7 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.LinkedList;
import java.util.List;
@ -17,13 +18,16 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import powercrystals.minefactoryreloaded.api.rednet.RedNetConnectionType;
import appeng.api.networking.IGridNode;
import appeng.api.parts.IFacadeContainer;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollsionHelper;
import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartItem;
import appeng.api.parts.PartItemStack;
import appeng.api.parts.SelectedPart;
import appeng.api.util.AECableType;
import appeng.api.util.AEColor;
@ -181,7 +185,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds
if ( sp != null )
{
if ( sp.part != null )
return sp.part.getItemStack( false );
return sp.part.getItemStack( PartItemStack.Break );
if ( sp.facade != null )
return sp.facade.getItemStack();
}
@ -218,7 +222,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds
@Override
public boolean canConnectRedstone(int side)
{
return cb.canConnectRedstone( ForgeDirection.getOrientation( side ) );
return cb.canConnectRedstone( EnumSet.of( ForgeDirection.getOrientation( side ) ) );
}
@Override
@ -299,9 +303,9 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds
}
@Override
public ForgeDirection addPart(ItemStack is, ForgeDirection side)
public ForgeDirection addPart(ItemStack is, ForgeDirection side, EntityPlayer owner)
{
return cb.addPart( is, side );
return cb.addPart( is, side, owner );
}
@Override
@ -311,9 +315,9 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds
}
@Override
public void removePart(ForgeDirection side)
public void removePart(ForgeDirection side, boolean supressUpdate)
{
cb.removePart( side );
cb.removePart( side, supressUpdate );
}
boolean canUpdate = false;
@ -433,4 +437,46 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds
return cb.hasRedstone( side );
}
@Override
public void securityBreak()
{
cb.securityBreak();
}
@Override
public RedNetConnectionType getConnectionType(World world, int x, int y, int z, ForgeDirection side)
{
return cb.getConnectionType( world, x, y, z, side );
}
@Override
public int[] getOutputValues(World world, int x, int y, int z, ForgeDirection side)
{
return cb.getOutputValues( world, x, y, z, side );
}
@Override
public int getOutputValue(World world, int x, int y, int z, ForgeDirection side, int subnet)
{
return cb.getOutputValue( world, x, y, z, side, subnet );
}
@Override
public void onInputsChanged(World world, int x, int y, int z, ForgeDirection side, int[] inputValues)
{
cb.onInputsChanged( world, x, y, z, side, inputValues );
}
@Override
public void onInputChanged(World world, int x, int y, int z, ForgeDirection side, int inputValue)
{
cb.onInputChanged( world, x, y, z, side, inputValue );
}
@Override
public boolean isEmpty()
{
return cb.isEmpty();
}
}

84
integration/modules/helpers/NEICraftingTerminalOverlayHandler.java
View file

@ -1,84 +0,0 @@
package appeng.integration.modules.helpers;
import java.util.LinkedList;
import java.util.List;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.inventory.Slot;
import net.minecraft.nbt.NBTTagCompound;
import appeng.container.slot.SlotCraftingMatrix;
import codechicken.nei.PositionedStack;
import codechicken.nei.api.IOverlayHandler;
import codechicken.nei.recipe.IRecipeHandler;
import cpw.mods.fml.common.network.PacketDispatcher;
public class NEICraftingTerminalOverlayHandler implements IOverlayHandler
{
public NEICraftingTerminalOverlayHandler(int x, int y) {
offsetx = x;
offsety = y;
}
int offsetx;
int offsety;
// @override
public void overlayRecipe(GuiContainer gui, IRecipeHandler recipe, int recipeIndex, boolean shift)
{
try
{
List ingredients = recipe.getIngredientStacks( recipeIndex );
overlayRecipe( gui, ingredients, shift );
}
catch (Exception err)
{
}
catch (Error err)
{
}
}
// @override
public void overlayRecipe(GuiContainer gui, List<PositionedStack> ingredients, boolean shift)
{
try
{
NBTTagCompound recipe = new NBTTagCompound();
if ( gui instanceof GuiTerminal )
{
for (int i = 0; i < ingredients.size(); i++)// identify slots
{
LinkedList<Slot> recipeSlots = new LinkedList<Slot>();
PositionedStack pstack = ingredients.get( i );
if ( pstack.item != null )
{
for (Slot slot : (List<Slot>) gui.inventorySlots.inventorySlots)
{
if ( slot.xDisplayPosition == pstack.relx + offsetx && slot.yDisplayPosition == pstack.rely + offsety )
{
if ( slot instanceof SlotCraftingMatrix )
{
NBTTagCompound inbt = new NBTTagCompound();
pstack.item.writeToNBT( inbt );
recipe.setCompoundTag( "#" + ((SlotCraftingMatrix) slot).matrixID, inbt );
break;
}
}
}
}
}
PacketDispatcher.sendPacketToServer( (new PacketNEIRecipe( recipe )).getPacket() );
}
}
catch (Exception err)
{
}
catch (Error err)
{
}
}
}

2
items/tools/powered/powersink/AEBasePoweredItem.java
View file

@ -1,6 +1,6 @@
package appeng.items.tools.powered.powersink;
public class AEBasePoweredItem extends UniversalElectricity
public class AEBasePoweredItem extends ThermalExpansion
{
public AEBasePoweredItem(Class c, String subname) {

2
items/tools/powered/powersink/IC2.java
View file

@ -4,7 +4,9 @@ import ic2.api.item.IElectricItemManager;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import appeng.api.config.PowerUnits;
import cpw.mods.fml.common.Optional.Interface;
@Interface(iface = "ic2.api.item.IElectricItemManager", modid = "IC2")
public class IC2 extends AERootPoweredItem implements IElectricItemManager
{

2
items/tools/powered/powersink/ThermalExpansion.java
View file

@ -3,7 +3,9 @@ package appeng.items.tools.powered.powersink;
import net.minecraft.item.ItemStack;
import appeng.api.config.PowerUnits;
import cofh.api.energy.IEnergyContainerItem;
import cpw.mods.fml.common.Optional.Interface;
@Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "ThermalExpansion")
public class ThermalExpansion extends IC2 implements IEnergyContainerItem
{

90
items/tools/powered/powersink/UniversalElectricity.java
View file

@ -1,61 +1,37 @@
package appeng.items.tools.powered.powersink;
import net.minecraft.item.ItemStack;
import universalelectricity.core.item.IItemElectric;
import appeng.api.config.PowerUnits;
/*
@Interface(iface = "universalelectricity.core.item.IItemElectric", modid = "IC2")
public class UniversalElectricity extends ThermalExpansion implements IItemElectric
{
*
* public UniversalElectricity(Class c, String subname) { super( c, subname ); }
*
* @Override public float recharge(ItemStack is, float energy, boolean
* doRecharge) { return (float) (energy - injectExternalPower( PowerUnits.KJ,
* is, energy, !doRecharge )); }
*
* @Override public float discharge(ItemStack is, float energy, boolean
* doDischarge) { return 0; }
*
* @Override public float getElectricityStored(ItemStack is) { return (int)
* PowerUnits.AE.convertTo( PowerUnits.KJ, getAECurrentPower( is ) ); }
*
* @Override public float getMaxElectricityStored(ItemStack is) { return (int)
* PowerUnits.AE.convertTo( PowerUnits.KJ, getAEMaxPower( is ) ); }
*
* @Override public void setElectricity(ItemStack is, float joules) { double
* currentPower = getAECurrentPower( is ); double targetPower =
* PowerUnits.KJ.convertTo( PowerUnits.AE, joules ); if ( targetPower >
* currentPower ) injectAEPower( is, targetPower - currentPower ); else
* extractAEPower( is, currentPower - targetPower ); }
*
* @Override public float getTransfer(ItemStack is) { return (float)
* PowerUnits.AE.convertTo( PowerUnits.KJ, getAEMaxPower( is ) -
* getAECurrentPower( is ) ); }
*
* @Override public float getVoltage(ItemStack itemStack) { return 120; }
public class UniversalElectricity extends ThermalExpansion implements IItemElectric
{
}
*/
public UniversalElectricity(Class c, String subname) {
super( c, subname );
}
@Override
public float recharge(ItemStack is, float energy, boolean doRecharge)
{
return (float) (energy - injectExternalPower( PowerUnits.KJ, is, energy, !doRecharge ));
}
@Override
public float discharge(ItemStack is, float energy, boolean doDischarge)
{
return 0;
}
@Override
public float getElectricityStored(ItemStack is)
{
return (int) PowerUnits.AE.convertTo( PowerUnits.KJ, getAECurrentPower( is ) );
}
@Override
public float getMaxElectricityStored(ItemStack is)
{
return (int) PowerUnits.AE.convertTo( PowerUnits.KJ, getAEMaxPower( is ) );
}
@Override
public void setElectricity(ItemStack is, float joules)
{
double currentPower = getAECurrentPower( is );
double targetPower = PowerUnits.KJ.convertTo( PowerUnits.AE, joules );
if ( targetPower > currentPower )
injectAEPower( is, targetPower - currentPower );
else
extractAEPower( is, currentPower - targetPower );
}
@Override
public float getTransfer(ItemStack is)
{
return (float) PowerUnits.AE.convertTo( PowerUnits.KJ, getAEMaxPower( is ) - getAECurrentPower( is ) );
}
@Override
public float getVoltage(ItemStack itemStack)
{
return 120;
}
}

5
parts/p2p/PartP2PBCPower.java
View file

@ -20,9 +20,11 @@ import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerHandler;
import buildcraft.api.power.PowerHandler.PowerReceiver;
import buildcraft.api.power.PowerHandler.Type;
import cpw.mods.fml.common.Optional.Interface;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@Interface(iface = "buildcraft.api.power.IPowerReceptor", modid = "BuildCraftAPI|core")
public class PartP2PBCPower extends PartP2PTunnel<PartP2PBCPower> implements IPowerReceptor, IGridTickable
{
@ -98,7 +100,8 @@ public class PartP2PBCPower extends PartP2PTunnel<PartP2PBCPower> implements IPo
PowerReceiver tp = target.getPowerReceiver( side.getOpposite() );
if ( tp != null )
{
float howmuch = tp.powerRequest(); // orientation.getOpposite() );
float howmuch = tp.powerRequest(); // orientation.getOpposite()
// );
if ( howmuch > tp.getMaxEnergyReceived() )
howmuch = tp.getMaxEnergyReceived();

3
parts/p2p/PartP2PIC2Power.java
View file

@ -12,9 +12,12 @@ import appeng.api.config.TunnelType;
import appeng.me.GridAccessException;
import appeng.me.cache.helpers.TunnelCollection;
import appeng.util.Platform;
import cpw.mods.fml.common.Optional.Interface;
import cpw.mods.fml.common.Optional.InterfaceList;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@InterfaceList(value = { @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), @Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = "IC2") })
public class PartP2PIC2Power extends PartP2PTunnel<PartP2PIC2Power> implements ic2.api.energy.tile.IEnergySink, ic2.api.energy.tile.IEnergySource
{

2
parts/p2p/PartP2PItems.java
View file

@ -26,9 +26,11 @@ import appeng.util.inv.WrapperMCISidedInventory;
import appeng.util.inv.WrapperTEPipe;
import buildcraft.api.transport.IPipeConnection;
import buildcraft.api.transport.IPipeTile.PipeType;
import cpw.mods.fml.common.Optional.Interface;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@Interface(iface = "buildcraft.api.transport.IPipeConnection", modid = "BuildCraftAPI|transport")
public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IPipeConnection, IInventory, ISidedInventory
{

6
server/ServerHelper.java
View file

@ -72,4 +72,10 @@ public class ServerHelper extends CommonHelper
throw new RuntimeException( "This is a server..." );
}
@Override
public void spawnLightning(World worldObj, double posX, double posY, double posZ)
{
// :P
}
}