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

Most of the 1.8 Port.

Browse Source
This commit is contained in:
AlgorithmX2
2015-06-15 19:44:59 -05:00
parent 17465e68e8
commit 38afde724b
824 changed files with 12120 additions and 9158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/hooks/AETrading.java
+5 -18
View File
@@ -18,27 +18,12 @@
package appeng.hooks;
// TODO Villager Trading!??!?!
import java.util.Random;
import com.google.common.base.Optional;
import net.minecraft.entity.passive.EntityVillager;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.village.MerchantRecipe;
import net.minecraft.village.MerchantRecipeList;
import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;
import appeng.api.AEApi;
import appeng.api.definitions.IItemDefinition;
import appeng.api.definitions.IMaterials;
public class AETrading implements IVillageTradeHandler
public class AETrading
{
/*
@Override
public void manipulateTradesForVillager( EntityVillager villager, MerchantRecipeList recipeList, Random random )
{
@@ -124,4 +109,6 @@ public class AETrading implements IVillageTradeHandler
l.add( new MerchantRecipe( a, b ) );
}
*/
}
src/main/java/appeng/hooks/DispenserBehaviorTinyTNT.java
+4 -5
View File
@@ -25,7 +25,6 @@ import net.minecraft.dispenser.IBlockSource;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import appeng.entity.EntityTinyTNTPrimed;
@@ -35,11 +34,11 @@ public final class DispenserBehaviorTinyTNT extends BehaviorDefaultDispenseItem
@Override
protected ItemStack dispenseStack( IBlockSource dispenser, ItemStack dispensedItem )
{
EnumFacing enumfacing = BlockDispenser.func_149937_b( dispenser.getBlockMetadata() );
EnumFacing enumfacing = BlockDispenser.getFacing( dispenser.getBlockMetadata() );
World world = dispenser.getWorld();
int i = dispenser.getXInt() + enumfacing.getFrontOffsetX();
int j = dispenser.getYInt() + enumfacing.getFrontOffsetY();
int k = dispenser.getZInt() + enumfacing.getFrontOffsetZ();
int i = dispenser.getBlockPos().getX() + enumfacing.getFrontOffsetX();
int j = dispenser.getBlockPos().getY() + enumfacing.getFrontOffsetY();
int k = dispenser.getBlockPos().getZ() + enumfacing.getFrontOffsetZ();
EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed( world, i + 0.5F, j + 0.5F, k + 0.5F, null );
world.spawnEntityInWorld( primedTinyTNTEntity );
--dispensedItem.stackSize;
src/main/java/appeng/hooks/DispenserBlockTool.java
+2 -7
View File
@@ -27,7 +27,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import appeng.util.Platform;
@@ -40,17 +39,13 @@ public final class DispenserBlockTool extends BehaviorDefaultDispenseItem
Item i = dispensedItem.getItem();
if( i instanceof IBlockTool )
{
EnumFacing enumfacing = BlockDispenser.func_149937_b( dispenser.getBlockMetadata() );
EnumFacing enumfacing = BlockDispenser.getFacing( dispenser.getBlockMetadata() );
IBlockTool tm = (IBlockTool) i;
World w = dispenser.getWorld();
if( w instanceof WorldServer )
{
int x = dispenser.getXInt() + enumfacing.getFrontOffsetX();
int y = dispenser.getYInt() + enumfacing.getFrontOffsetY();
int z = dispenser.getZInt() + enumfacing.getFrontOffsetZ();
tm.onItemUse( dispensedItem, Platform.getPlayer( (WorldServer) w ), w, x, y, z, enumfacing.ordinal(), 0.5f, 0.5f, 0.5f );
tm.onItemUse( dispensedItem, Platform.getPlayer( (WorldServer) w ), w, dispenser.getBlockPos().offset( enumfacing ), enumfacing, 0.5f, 0.5f, 0.5f );
}
}
return dispensedItem;
src/main/java/appeng/hooks/DispenserMatterCannon.java
+8 -9
View File
@@ -28,8 +28,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.util.AEPartLocation;
import appeng.items.tools.powered.ToolMassCannon;
import appeng.util.Platform;
@@ -43,11 +42,11 @@ public final class DispenserMatterCannon extends BehaviorDefaultDispenseItem
Item i = dispensedItem.getItem();
if( i instanceof ToolMassCannon )
{
EnumFacing enumfacing = BlockDispenser.func_149937_b( dispenser.getBlockMetadata() );
ForgeDirection dir = ForgeDirection.UNKNOWN;
for( ForgeDirection d : ForgeDirection.VALID_DIRECTIONS )
EnumFacing enumfacing = BlockDispenser.getFacing( dispenser.getBlockMetadata() );
AEPartLocation dir = AEPartLocation.INTERNAL;
for( AEPartLocation d : AEPartLocation.SIDE_LOCATIONS )
{
if( enumfacing.getFrontOffsetX() == d.offsetX && enumfacing.getFrontOffsetY() == d.offsetY && enumfacing.getFrontOffsetZ() == d.offsetZ )
if( enumfacing.getFrontOffsetX() == d.xOffset && enumfacing.getFrontOffsetY() == d.yOffset && enumfacing.getFrontOffsetZ() == d.zOffset )
{
dir = d;
}
@@ -61,9 +60,9 @@ public final class DispenserMatterCannon extends BehaviorDefaultDispenseItem
EntityPlayer p = Platform.getPlayer( (WorldServer) w );
Platform.configurePlayer( p, dir, dispenser.getBlockTileEntity() );
p.posX += dir.offsetX;
p.posY += dir.offsetY;
p.posZ += dir.offsetZ;
p.posX += dir.xOffset;
p.posY += dir.yOffset;
p.posZ += dir.zOffset;
dispensedItem = tm.onItemRightClick( dispensedItem, w, p );
}
src/main/java/appeng/hooks/IBlockTool.java
+12 -1
View File
@@ -21,11 +21,22 @@ package appeng.hooks;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
public interface IBlockTool
{
boolean onItemUse( ItemStack dispensedItem, EntityPlayer player, World w, int x, int y, int z, int ordinal, float hitX, float hitY, float hitZ );
public boolean onItemUse(
ItemStack item,
EntityPlayer p,
World w,
BlockPos pos,
EnumFacing side,
float hitX,
float hitY,
float hitZ );
}
src/main/java/appeng/hooks/TickHandler.java
+10 -14
View File
@@ -28,20 +28,14 @@ import java.util.WeakHashMap;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
import com.google.common.base.Stopwatch;
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.Multimap;
import net.minecraft.world.World;
import net.minecraftforge.event.world.ChunkEvent;
import net.minecraftforge.event.world.WorldEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
import cpw.mods.fml.common.gameevent.TickEvent.Type;
import cpw.mods.fml.common.gameevent.TickEvent.WorldTickEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent.Phase;
import net.minecraftforge.fml.common.gameevent.TickEvent.Type;
import net.minecraftforge.fml.common.gameevent.TickEvent.WorldTickEvent;
import appeng.api.AEApi;
import appeng.api.networking.IGridNode;
import appeng.api.parts.CableRenderMode;
@@ -51,12 +45,15 @@ import appeng.core.AELog;
import appeng.core.CommonHelper;
import appeng.core.sync.packets.PacketPaintedEntity;
import appeng.crafting.CraftingJob;
import appeng.entity.EntityFloatingItem;
import appeng.me.Grid;
import appeng.me.NetworkList;
import appeng.tile.AEBaseTile;
import appeng.util.Platform;
import com.google.common.base.Stopwatch;
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.Multimap;
public class TickHandler
{
@@ -170,7 +167,7 @@ public class TickHandler
@SubscribeEvent
public void onChunkLoad( ChunkEvent.Load load )
{
for( Object te : load.getChunk().chunkTileEntityMap.values() )
for( Object te : load.getChunk().getTileEntityMap().values() )
{
if( te instanceof AEBaseTile )
{
@@ -186,7 +183,6 @@ public class TickHandler
if( ev.type == Type.CLIENT && ev.phase == Phase.START )
{
this.tickColors( this.cliPlayerColors );
EntityFloatingItem.ageStatic = ( EntityFloatingItem.ageStatic + 1 ) % 60000;
CableRenderMode currentMode = AEApi.instance().partHelper().getCableRenderMode();
if( currentMode != this.crm )
{