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/items/tools/quartz/ToolQuartzAxe.java
+2 -3
View File
@@ -21,17 +21,16 @@ package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.item.ItemAxe;
import net.minecraft.item.ItemStack;
import appeng.core.features.AEFeature;
import appeng.core.features.IAEFeature;
import appeng.core.features.IFeatureHandler;
import appeng.core.features.ItemFeatureHandler;
import appeng.util.Platform;
import com.google.common.base.Optional;
public class ToolQuartzAxe extends ItemAxe implements IAEFeature
{
src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java
+17 -14
View File
@@ -21,21 +21,22 @@ package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
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;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.implementations.guiobjects.IGuiItem;
import appeng.api.implementations.guiobjects.IGuiItemObject;
import appeng.api.util.AEPartLocation;
import appeng.core.features.AEFeature;
import appeng.core.sync.GuiBridge;
import appeng.items.AEBaseItem;
import appeng.items.contents.QuartzKnifeObj;
import appeng.util.Platform;
import com.google.common.base.Optional;
public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem
{
@@ -52,11 +53,19 @@ public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem
}
@Override
public boolean onItemUse( ItemStack is, EntityPlayer p, World w, int x, int y, int z, int s, float hitX, float hitY, float hitZ )
public boolean onItemUse(
ItemStack stack,
EntityPlayer p,
World worldIn,
BlockPos pos,
EnumFacing side,
float hitX,
float hitY,
float hitZ )
{
if( Platform.isServer() )
{
Platform.openGUI( p, null, ForgeDirection.UNKNOWN, GuiBridge.GUI_QUARTZ_KNIFE );
Platform.openGUI( p, null, AEPartLocation.INTERNAL, GuiBridge.GUI_QUARTZ_KNIFE );
}
return true;
}
@@ -66,18 +75,12 @@ public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem
{
if( Platform.isServer() )
{
Platform.openGUI( p, null, ForgeDirection.UNKNOWN, GuiBridge.GUI_QUARTZ_KNIFE );
Platform.openGUI( p, null, AEPartLocation.INTERNAL, GuiBridge.GUI_QUARTZ_KNIFE );
}
p.swingItem();
return it;
}
@Override
public boolean doesContainerItemLeaveCraftingGrid( ItemStack par1ItemStack )
{
return false;
}
@Override
public boolean getIsRepairable( ItemStack a, ItemStack b )
{
@@ -104,7 +107,7 @@ public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem
}
@Override
public IGuiItemObject getGuiObject( ItemStack is, World world, int x, int y, int z )
public IGuiItemObject getGuiObject( ItemStack is, World world, BlockPos pos )
{
return new QuartzKnifeObj( is );
}
src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java
+2 -3
View File
@@ -21,17 +21,16 @@ package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.item.ItemHoe;
import net.minecraft.item.ItemStack;
import appeng.core.features.AEFeature;
import appeng.core.features.IAEFeature;
import appeng.core.features.IFeatureHandler;
import appeng.core.features.ItemFeatureHandler;
import appeng.util.Platform;
import com.google.common.base.Optional;
public class ToolQuartzHoe extends ItemHoe implements IAEFeature
{
src/main/java/appeng/items/tools/quartz/ToolQuartzPickaxe.java
+2 -3
View File
@@ -21,17 +21,16 @@ package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.item.ItemPickaxe;
import net.minecraft.item.ItemStack;
import appeng.core.features.AEFeature;
import appeng.core.features.IAEFeature;
import appeng.core.features.IFeatureHandler;
import appeng.core.features.ItemFeatureHandler;
import appeng.util.Platform;
import com.google.common.base.Optional;
public class ToolQuartzPickaxe extends ItemPickaxe implements IAEFeature
{
src/main/java/appeng/items/tools/quartz/ToolQuartzSpade.java
+2 -3
View File
@@ -21,17 +21,16 @@ package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.item.ItemSpade;
import net.minecraft.item.ItemStack;
import appeng.core.features.AEFeature;
import appeng.core.features.IAEFeature;
import appeng.core.features.IFeatureHandler;
import appeng.core.features.ItemFeatureHandler;
import appeng.util.Platform;
import com.google.common.base.Optional;
public class ToolQuartzSpade extends ItemSpade implements IAEFeature
{
src/main/java/appeng/items/tools/quartz/ToolQuartzSword.java
+2 -3
View File
@@ -21,17 +21,16 @@ package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemSword;
import appeng.core.features.AEFeature;
import appeng.core.features.IAEFeature;
import appeng.core.features.IFeatureHandler;
import appeng.core.features.ItemFeatureHandler;
import appeng.util.Platform;
import com.google.common.base.Optional;
public class ToolQuartzSword extends ItemSword implements IAEFeature
{
src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java
+30 -18
View File
@@ -21,26 +21,23 @@ package appeng.items.tools.quartz;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.block.Block;
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;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.tools.IToolWrench;
import appeng.api.implementations.items.IAEWrench;
import appeng.api.util.DimensionalCoord;
import appeng.core.features.AEFeature;
import appeng.items.AEBaseItem;
import appeng.transformer.annotations.Integration.Interface;
import appeng.util.Platform;
import com.google.common.base.Optional;
@Interface( iface = "buildcraft.api.tools.IToolWrench", iname = "BC" )
public class ToolQuartzWrench extends AEBaseItem implements IAEWrench, IToolWrench
//@Interface( iface = "buildcraft.api.tools.IToolWrench", iname = "BC" ) IToolWrench
public class ToolQuartzWrench extends AEBaseItem implements IAEWrench
{
public ToolQuartzWrench( AEFeature type )
@@ -53,20 +50,27 @@ public class ToolQuartzWrench extends AEBaseItem implements IAEWrench, IToolWren
}
@Override
public boolean onItemUseFirst( ItemStack is, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ )
public boolean onItemUseFirst(
ItemStack stack,
EntityPlayer player,
World world,
BlockPos pos,
EnumFacing side,
float hitX,
float hitY,
float hitZ )
{
Block b = world.getBlock( x, y, z );
if( b != null && !player.isSneaking() && Platform.hasPermissions( new DimensionalCoord( world, x, y, z ), player ) )
Block b = world.getBlockState( pos ).getBlock();
if( b != null && !player.isSneaking() && Platform.hasPermissions( new DimensionalCoord( world, pos ), player ) )
{
if( Platform.isClient() )
{
return !world.isRemote;
}
ForgeDirection mySide = ForgeDirection.getOrientation( side );
if( b.rotateBlock( world, x, y, z, mySide ) )
if( b.rotateBlock( world, pos, side ) )
{
b.onNeighborBlockChange( world, x, y, z, Platform.AIR_BLOCK );
b.onNeighborBlockChange( world, pos, Platform.AIR_BLOCK.getDefaultState(), Platform.AIR_BLOCK );
player.swingItem();
return !world.isRemote;
}
@@ -75,18 +79,25 @@ public class ToolQuartzWrench extends AEBaseItem implements IAEWrench, IToolWren
}
@Override
// public boolean shouldPassSneakingClickToBlock(World w, int x, int y, int z)
public boolean doesSneakBypassUse( World world, int x, int y, int z, EntityPlayer player )
public boolean doesSneakBypassUse(
World world,
BlockPos pos,
EntityPlayer player )
{
return true;
}
@Override
public boolean canWrench( ItemStack is, EntityPlayer player, int x, int y, int z )
public boolean canWrench(
ItemStack wrench,
EntityPlayer player,
BlockPos pos )
{
return true;
}
// TODO: BC Wrench Integration
/*
@Override
public boolean canWrench( EntityPlayer player, int x, int y, int z )
{
@@ -98,4 +109,5 @@ public class ToolQuartzWrench extends AEBaseItem implements IAEWrench, IToolWren
{
player.swingItem();
}
*/
}