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

More stuff ingame and showing up.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-01 01:01:32 +02:00
parent 6a88728544
commit 077ff17078
864 changed files with 11515 additions and 11761 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/debug/BlockCubeGenerator.java
+3 -2
View File
@@ -24,9 +24,10 @@ import javax.annotation.Nullable;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Direction;
import net.minecraft.util.ActionResultType;
import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.world.World;
import appeng.block.AEBaseTileBlock;
@@ -41,7 +42,7 @@ public class BlockCubeGenerator extends AEBaseTileBlock
}
@Override
public boolean onActivated( final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final Direction side, final float hitX, final float hitY, final float hitZ )
public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit)
{
final TileCubeGenerator tcg = this.getTileEntity( w, pos );
if( tcg != null )
src/main/java/appeng/debug/BlockPhantomNode.java
+3 -2
View File
@@ -24,9 +24,10 @@ import javax.annotation.Nullable;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Direction;
import net.minecraft.util.ActionResultType;
import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.world.World;
import appeng.block.AEBaseTileBlock;
@@ -41,7 +42,7 @@ public class BlockPhantomNode extends AEBaseTileBlock
}
@Override
public boolean onActivated( final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final Direction side, final float hitX, final float hitY, final float hitZ )
public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit)
{
final TilePhantomNode tpn = this.getTileEntity( w, pos );
tpn.triggerCrashMode();
src/main/java/appeng/debug/TileCubeGenerator.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class TileCubeGenerator extends AEBaseTile implements ITickable
private void spawn()
{
this.world.setBlockToAir( this.pos );
this.world.removeBlock(this.pos, false);
final Item i = this.is.getItem();
final Direction side = Direction.UP;
src/main/java/appeng/debug/ToolEraser.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class ToolEraser extends AEBaseItem
if( state == c_state )
{
blocks++;
world.setBlockToAir( wc );
world.removeBlock(wc, false);
next.add( wc.add( 1, 0, 0 ) );
next.add( wc.add( -1, 0, 0 ) );
src/main/java/appeng/debug/ToolReplicatorCard.java
+1 -1
View File
@@ -76,7 +76,7 @@ public class ToolReplicatorCard extends AEBaseItem
}
else
{
final CompoundNBT ish = player.getHeldItem( hand ).getTagCompound();
final CompoundNBT ish = player.getHeldItem( hand ).getTag();
if( ish != null )
{
final int src_x = ish.getInteger( "x" );