From cf9ab8a13b298188ca96f084e5f37bd6398eadf9 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Tue, 2 Jun 2020 19:15:23 +0200 Subject: [PATCH] ActionResultType in onActivated --- build.gradle | 3 ++ .../block/crafting/BlockCraftingUnit.java | 2 +- .../crafting/BlockMolecularAssembler.java | 2 +- .../appeng/block/grindstone/BlockCrank.java | 15 +++---- .../appeng/block/grindstone/BlockGrinder.java | 28 +++++-------- .../block/grindstone/CrankRendering.java | 40 ------------------- .../appeng/block/misc/BlockCellWorkbench.java | 8 ++-- .../java/appeng/block/misc/BlockCharger.java | 6 +-- .../appeng/block/misc/BlockCondenser.java | 10 ++--- .../appeng/block/misc/BlockInscriber.java | 8 ++-- .../appeng/block/misc/BlockInterface.java | 8 ++-- .../block/misc/BlockSecurityStation.java | 10 ++--- .../java/appeng/block/misc/BlockTinyTNT.java | 2 +- .../block/misc/BlockVibrationChamber.java | 8 ++-- .../block/networking/BlockWireless.java | 2 +- .../block/qnb/BlockQuantumLinkChamber.java | 8 ++-- .../block/spatial/BlockSpatialIOPort.java | 8 ++-- .../java/appeng/block/storage/BlockChest.java | 8 ++-- .../java/appeng/block/storage/BlockDrive.java | 8 ++-- .../appeng/block/storage/BlockIOPort.java | 8 ++-- .../bootstrap/BlockDefinitionBuilder.java | 17 -------- .../java/appeng/bootstrap/IBlockBuilder.java | 6 --- .../appeng/client/render/tesr/CrankTESR.java | 5 +++ .../implementations/ContainerSkyChest.java | 2 +- .../core/api/definitions/ApiBlocks.java | 32 ++++++++++----- .../java/appeng/debug/TileCubeGenerator.java | 2 +- src/main/java/appeng/debug/ToolDebugCard.java | 2 +- .../java/appeng/debug/ToolReplicatorCard.java | 2 +- .../fluids/block/BlockFluidInterface.java | 8 ++-- .../appeng/items/materials/ItemMaterial.java | 2 +- .../appeng/items/misc/ItemEncodedPattern.java | 2 +- .../items/storage/AbstractStorageCell.java | 2 +- .../appeng/items/tools/ToolBiometricCard.java | 4 +- .../appeng/items/tools/ToolMemoryCard.java | 4 +- .../appeng/items/tools/ToolNetworkTool.java | 6 +-- .../tools/powered/ToolColorApplicator.java | 2 +- .../tools/powered/ToolEntropyManipulator.java | 2 +- src/main/java/appeng/parts/AEBasePart.java | 2 +- .../java/appeng/parts/CableBusContainer.java | 4 +- src/main/java/appeng/parts/PartPlacement.java | 8 ++-- .../appeng/tile/grindstone/TileCrank.java | 5 +++ .../appeng/tile/grindstone/TileGrinder.java | 5 +++ 42 files changed, 135 insertions(+), 181 deletions(-) delete mode 100644 src/main/java/appeng/block/grindstone/CrankRendering.java diff --git a/build.gradle b/build.gradle index 44ce2d286..7e451508e 100644 --- a/build.gradle +++ b/build.gradle @@ -220,6 +220,9 @@ sourceSets { include 'appeng/container/implementations/ContainerSkyChest.java' include 'appeng/container/slot/SlotNormal.java' include 'appeng/client/gui/implementations/GuiSkyChest.java' + include 'appeng/block/grindstone/**' + include 'appeng/tile/grindstone/**' + include 'appeng/container/implementations/ContainerGrinder.java' } compileClasspath += sourceSets.api.output runtimeClasspath += sourceSets.api.output diff --git a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java index e5fc88934..8f02b476d 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java @@ -146,7 +146,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock { final TileCraftingTile tg = this.getTileEntity( w, pos ); - if( tg != null && !p.isShiftKeyDown() && tg.isFormed() && tg.isActive() ) + if( tg != null && !p.isCrouching() && tg.isFormed() && tg.isActive() ) { if( Platform.isClient() ) { diff --git a/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java b/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java index c509bdf78..d0fdb93f4 100644 --- a/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java +++ b/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java @@ -100,7 +100,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock public boolean onBlockActivated( final World w, final BlockPos pos, final BlockState state, final PlayerEntity p, final Hand hand, final Direction side, final float hitX, final float hitY, final float hitZ ) { final TileMolecularAssembler tg = this.getTileEntity( w, pos ); - if( tg != null && !p.isShiftKeyDown() ) + if( tg != null && !p.isCrouching() ) { Platform.openGUI( p, tg, AEPartLocation.fromFacing( side ), GuiBridge.GUI_MAC ); return true; diff --git a/src/main/java/appeng/block/grindstone/BlockCrank.java b/src/main/java/appeng/block/grindstone/BlockCrank.java index f29ea9d68..2e605366f 100644 --- a/src/main/java/appeng/block/grindstone/BlockCrank.java +++ b/src/main/java/appeng/block/grindstone/BlockCrank.java @@ -47,16 +47,11 @@ import appeng.tile.AEBaseTile; import appeng.tile.grindstone.TileCrank; -public class BlockCrank extends AEBaseTileBlock +public class BlockCrank extends AEBaseTileBlock { - public BlockCrank() - { - super( Material.WOOD ); - - this.setLightOpacity( 0 ); - this.setHarvestLevel( "axe", 0 ); - this.setFullSize( this.setOpaque( false ) ); + public BlockCrank(Properties props) { + super(props); } @Override @@ -65,7 +60,7 @@ public class BlockCrank extends AEBaseTileBlock if( player instanceof FakePlayer || player == null ) { this.dropCrank( w, pos ); - return true; + return ActionResultType.SUCCESS; } final AEBaseTile tile = this.getTileEntity( w, pos ); @@ -77,7 +72,7 @@ public class BlockCrank extends AEBaseTileBlock } } - return true; + return ActionResultType.SUCCESS; } private void dropCrank( final World world, final BlockPos pos ) diff --git a/src/main/java/appeng/block/grindstone/BlockGrinder.java b/src/main/java/appeng/block/grindstone/BlockGrinder.java index 614bd676d..8c0ff313a 100644 --- a/src/main/java/appeng/block/grindstone/BlockGrinder.java +++ b/src/main/java/appeng/block/grindstone/BlockGrinder.java @@ -19,9 +19,8 @@ package appeng.block.grindstone; -import javax.annotation.Nullable; - -import net.minecraft.block.material.Material; +import appeng.block.AEBaseTileBlock; +import appeng.tile.grindstone.TileGrinder; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResultType; @@ -30,32 +29,25 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.world.World; -import appeng.api.util.AEPartLocation; -import appeng.block.AEBaseTileBlock; -import appeng.core.sync.GuiBridge; -import appeng.tile.grindstone.TileGrinder; -import appeng.util.Platform; +import javax.annotation.Nullable; -public class BlockGrinder extends AEBaseTileBlock +public class BlockGrinder extends AEBaseTileBlock { - public BlockGrinder() - { - super( Material.ROCK ); - - this.setHardness( 3.2F ); + public BlockGrinder(Properties props) { + super(props); } @Override public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { final TileGrinder tg = this.getTileEntity( w, pos ); - if( tg != null && !p.isShiftKeyDown() ) + if( tg != null && !p.isCrouching() ) { - Platform.openGUI( p, tg, AEPartLocation.fromFacing(hit), GuiBridge.GUI_GRINDER ); - return true; + // FIXME Platform.openGUI( p, tg, AEPartLocation.fromFacing(hit.getFace()), GuiBridge.GUI_GRINDER ); + return ActionResultType.SUCCESS; } - return false; + return ActionResultType.PASS; } } diff --git a/src/main/java/appeng/block/grindstone/CrankRendering.java b/src/main/java/appeng/block/grindstone/CrankRendering.java deleted file mode 100644 index 8d29e1bd6..000000000 --- a/src/main/java/appeng/block/grindstone/CrankRendering.java +++ /dev/null @@ -1,40 +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 . - */ - -package appeng.block.grindstone; - - -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -import appeng.bootstrap.BlockRenderingCustomizer; -import appeng.bootstrap.IBlockRendering; -import appeng.bootstrap.IItemRendering; -import appeng.client.render.tesr.CrankTESR; - - -public class CrankRendering extends BlockRenderingCustomizer -{ - - @Override - @OnlyIn( Dist.CLIENT ) - public void customize( IBlockRendering rendering, IItemRendering itemRendering ) - { - rendering.tileEntityRenderer( new CrankTESR() ); - } -} diff --git a/src/main/java/appeng/block/misc/BlockCellWorkbench.java b/src/main/java/appeng/block/misc/BlockCellWorkbench.java index 71b86346c..9fa4d3a9f 100644 --- a/src/main/java/appeng/block/misc/BlockCellWorkbench.java +++ b/src/main/java/appeng/block/misc/BlockCellWorkbench.java @@ -48,9 +48,9 @@ public class BlockCellWorkbench extends AEBaseTileBlock @Override public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { - if( p.isShiftKeyDown() ) + if( p.isCrouching() ) { - return false; + return ActionResultType.PASS; } final TileCellWorkbench tg = this.getTileEntity( w, pos ); @@ -60,8 +60,8 @@ public class BlockCellWorkbench extends AEBaseTileBlock { Platform.openGUI( p, tg, AEPartLocation.fromFacing(hit), GuiBridge.GUI_CELL_WORKBENCH ); } - return true; + return ActionResultType.SUCCESS; } - return false; + return ActionResultType.PASS; } } diff --git a/src/main/java/appeng/block/misc/BlockCharger.java b/src/main/java/appeng/block/misc/BlockCharger.java index 3b21974a5..579d45795 100644 --- a/src/main/java/appeng/block/misc/BlockCharger.java +++ b/src/main/java/appeng/block/misc/BlockCharger.java @@ -75,9 +75,9 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision @Override public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { - if( player.isShiftKeyDown() ) + if( player.isCrouching() ) { - return false; + return ActionResultType.PASS; } if( Platform.isServer() ) @@ -89,7 +89,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision } } - return true; + return ActionResultType.SUCCESS; } @Override diff --git a/src/main/java/appeng/block/misc/BlockCondenser.java b/src/main/java/appeng/block/misc/BlockCondenser.java index 9a3c0d145..67f5a8d9a 100644 --- a/src/main/java/appeng/block/misc/BlockCondenser.java +++ b/src/main/java/appeng/block/misc/BlockCondenser.java @@ -48,21 +48,21 @@ public class BlockCondenser extends AEBaseTileBlock @Override public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { - if( player.isShiftKeyDown() ) + if( player.isCrouching() ) { - return false; + return ActionResultType.PASS; } if( Platform.isServer() ) { final TileCondenser tc = this.getTileEntity( w, pos ); - if( tc != null && !player.isShiftKeyDown() ) + if( tc != null && !player.isCrouching() ) { Platform.openGUI( player, tc, AEPartLocation.fromFacing(hit), GuiBridge.GUI_CONDENSER ); - return true; + return ActionResultType.SUCCESS; } } - return true; + return ActionResultType.SUCCESS; } } diff --git a/src/main/java/appeng/block/misc/BlockInscriber.java b/src/main/java/appeng/block/misc/BlockInscriber.java index d445ca2c5..847da862b 100644 --- a/src/main/java/appeng/block/misc/BlockInscriber.java +++ b/src/main/java/appeng/block/misc/BlockInscriber.java @@ -53,9 +53,9 @@ public class BlockInscriber extends AEBaseTileBlock @Override public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { - if( p.isShiftKeyDown() ) + if( p.isCrouching() ) { - return false; + return ActionResultType.PASS; } final TileInscriber tg = this.getTileEntity( w, pos ); @@ -65,9 +65,9 @@ public class BlockInscriber extends AEBaseTileBlock { Platform.openGUI( p, tg, AEPartLocation.fromFacing(hit), GuiBridge.GUI_INSCRIBER ); } - return true; + return ActionResultType.SUCCESS; } - return false; + return ActionResultType.PASS; } @Override diff --git a/src/main/java/appeng/block/misc/BlockInterface.java b/src/main/java/appeng/block/misc/BlockInterface.java index d0d2843e8..9d892a799 100644 --- a/src/main/java/appeng/block/misc/BlockInterface.java +++ b/src/main/java/appeng/block/misc/BlockInterface.java @@ -77,9 +77,9 @@ public class BlockInterface extends AEBaseTileBlock @Override public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { - if( p.isShiftKeyDown() ) + if( p.isCrouching() ) { - return false; + return ActionResultType.PASS; } final TileInterface tg = this.getTileEntity( w, pos ); @@ -89,9 +89,9 @@ public class BlockInterface extends AEBaseTileBlock { Platform.openGUI( p, tg, AEPartLocation.fromFacing(hit), GuiBridge.GUI_INTERFACE ); } - return true; + return ActionResultType.SUCCESS; } - return false; + return ActionResultType.PASS; } @Override diff --git a/src/main/java/appeng/block/misc/BlockSecurityStation.java b/src/main/java/appeng/block/misc/BlockSecurityStation.java index 698ba1e11..cf422da30 100644 --- a/src/main/java/appeng/block/misc/BlockSecurityStation.java +++ b/src/main/java/appeng/block/misc/BlockSecurityStation.java @@ -83,9 +83,9 @@ public class BlockSecurityStation extends AEBaseTileBlock @Override public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { - if( p.isShiftKeyDown() ) + if( p.isCrouching() ) { - return false; + return ActionResultType.PASS; } final TileSecurityStation tg = this.getTileEntity( w, pos ); @@ -93,12 +93,12 @@ public class BlockSecurityStation extends AEBaseTileBlock { if( Platform.isClient() ) { - return true; + return ActionResultType.SUCCESS; } Platform.openGUI( p, tg, AEPartLocation.fromFacing(hit), GuiBridge.GUI_SECURITY ); - return true; + return ActionResultType.SUCCESS; } - return false; + return ActionResultType.PASS; } } diff --git a/src/main/java/appeng/block/misc/BlockTinyTNT.java b/src/main/java/appeng/block/misc/BlockTinyTNT.java index 62863bce1..1a23cf2b2 100644 --- a/src/main/java/appeng/block/misc/BlockTinyTNT.java +++ b/src/main/java/appeng/block/misc/BlockTinyTNT.java @@ -81,7 +81,7 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision this.startFuse( w, pos, player ); w.removeBlock(pos, false); heldItem.damageItem( 1, player ); - return true; + return ActionResultType.SUCCESS; } else { diff --git a/src/main/java/appeng/block/misc/BlockVibrationChamber.java b/src/main/java/appeng/block/misc/BlockVibrationChamber.java index 2b1931408..3c59c2a4c 100644 --- a/src/main/java/appeng/block/misc/BlockVibrationChamber.java +++ b/src/main/java/appeng/block/misc/BlockVibrationChamber.java @@ -79,7 +79,7 @@ public final class BlockVibrationChamber extends AEBaseTileBlock @Override public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { - if( player.isShiftKeyDown() ) + if( player.isCrouching() ) { return false; } @@ -87,14 +87,14 @@ public final class BlockVibrationChamber extends AEBaseTileBlock if( Platform.isServer() ) { final TileVibrationChamber tc = this.getTileEntity( w, pos ); - if( tc != null && !player.isShiftKeyDown() ) + if( tc != null && !player.isCrouching() ) { Platform.openGUI( player, tc, AEPartLocation.fromFacing(hit), GuiBridge.GUI_VIBRATION_CHAMBER ); - return true; + return ActionResultType.SUCCESS; } } - return true; + return ActionResultType.SUCCESS; } @Override diff --git a/src/main/java/appeng/block/networking/BlockWireless.java b/src/main/java/appeng/block/networking/BlockWireless.java index 33cf2112d..fc45186ed 100644 --- a/src/main/java/appeng/block/networking/BlockWireless.java +++ b/src/main/java/appeng/block/networking/BlockWireless.java @@ -111,7 +111,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision { final TileWireless tg = this.getTileEntity( w, pos ); - if( tg != null && !player.isShiftKeyDown() ) + if( tg != null && !player.isCrouching() ) { if( Platform.isServer() ) { diff --git a/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java b/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java index dd5b3bb56..4113e91b5 100644 --- a/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java +++ b/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java @@ -72,9 +72,9 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase @Override public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { - if( p.isShiftKeyDown() ) + if( p.isCrouching() ) { - return false; + return ActionResultType.PASS; } final TileQuantumBridge tg = this.getTileEntity( w, pos ); @@ -84,9 +84,9 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase { Platform.openGUI( p, tg, AEPartLocation.fromFacing(hit), GuiBridge.GUI_QNB ); } - return true; + return ActionResultType.SUCCESS; } - return false; + return ActionResultType.PASS; } @Override diff --git a/src/main/java/appeng/block/spatial/BlockSpatialIOPort.java b/src/main/java/appeng/block/spatial/BlockSpatialIOPort.java index 78f4b47d3..39681fd03 100644 --- a/src/main/java/appeng/block/spatial/BlockSpatialIOPort.java +++ b/src/main/java/appeng/block/spatial/BlockSpatialIOPort.java @@ -60,9 +60,9 @@ public class BlockSpatialIOPort extends AEBaseTileBlock @Override public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { - if( p.isShiftKeyDown() ) + if( p.isCrouching() ) { - return false; + return ActionResultType.PASS; } final TileSpatialIOPort tg = this.getTileEntity( w, pos ); @@ -72,8 +72,8 @@ public class BlockSpatialIOPort extends AEBaseTileBlock { Platform.openGUI( p, tg, AEPartLocation.fromFacing(hit), GuiBridge.GUI_SPATIAL_IO_PORT ); } - return true; + return ActionResultType.SUCCESS; } - return false; + return ActionResultType.PASS; } } diff --git a/src/main/java/appeng/block/storage/BlockChest.java b/src/main/java/appeng/block/storage/BlockChest.java index 5fda20cb4..204154c1e 100644 --- a/src/main/java/appeng/block/storage/BlockChest.java +++ b/src/main/java/appeng/block/storage/BlockChest.java @@ -94,11 +94,11 @@ public class BlockChest extends AEBaseTileBlock public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { final TileChest tg = this.getTileEntity( w, pos ); - if( tg != null && !p.isShiftKeyDown() ) + if( tg != null && !p.isCrouching() ) { if( Platform.isClient() ) { - return true; + return ActionResultType.SUCCESS; } if( hit != tg.getUp() ) @@ -113,9 +113,9 @@ public class BlockChest extends AEBaseTileBlock } } - return true; + return ActionResultType.SUCCESS; } - return false; + return ActionResultType.PASS; } } diff --git a/src/main/java/appeng/block/storage/BlockDrive.java b/src/main/java/appeng/block/storage/BlockDrive.java index e5a305791..fbb82007b 100644 --- a/src/main/java/appeng/block/storage/BlockDrive.java +++ b/src/main/java/appeng/block/storage/BlockDrive.java @@ -82,9 +82,9 @@ public class BlockDrive extends AEBaseTileBlock @Override public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { - if( p.isShiftKeyDown() ) + if( p.isCrouching() ) { - return false; + return ActionResultType.PASS; } final TileDrive tg = this.getTileEntity( w, pos ); @@ -94,8 +94,8 @@ public class BlockDrive extends AEBaseTileBlock { Platform.openGUI( p, tg, AEPartLocation.fromFacing(hit), GuiBridge.GUI_DRIVE ); } - return true; + return ActionResultType.SUCCESS; } - return false; + return ActionResultType.PASS; } } diff --git a/src/main/java/appeng/block/storage/BlockIOPort.java b/src/main/java/appeng/block/storage/BlockIOPort.java index 3f81ed31e..d643161a8 100644 --- a/src/main/java/appeng/block/storage/BlockIOPort.java +++ b/src/main/java/appeng/block/storage/BlockIOPort.java @@ -60,9 +60,9 @@ public class BlockIOPort extends AEBaseTileBlock @Override public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { - if( p.isShiftKeyDown() ) + if( p.isCrouching() ) { - return false; + return ActionResultType.PASS; } final TileIOPort tg = this.getTileEntity( w, pos ); @@ -72,8 +72,8 @@ public class BlockIOPort extends AEBaseTileBlock { Platform.openGUI( p, tg, AEPartLocation.fromFacing(hit), GuiBridge.GUI_IOPORT ); } - return true; + return ActionResultType.SUCCESS; } - return false; + return ActionResultType.PASS; } } diff --git a/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java b/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java index b582815bf..c8803f62d 100644 --- a/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java +++ b/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java @@ -138,23 +138,6 @@ class BlockDefinitionBuilder implements IBlockBuilder return this; } - @Override - public IBlockBuilder useCustomItemModel() - { - this.rendering( new BlockRenderingCustomizer() - { - @Override - @OnlyIn( Dist.CLIENT ) - public void customize( IBlockRendering rendering, IItemRendering itemRendering ) - { - ModelResourceLocation model = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, BlockDefinitionBuilder.this.registryName ), "inventory" ); - itemRendering.model( model ).variants( model ); - } - } ); - - return this; - } - @Override public IBlockBuilder item( BiFunction factory ) { diff --git a/src/main/java/appeng/bootstrap/IBlockBuilder.java b/src/main/java/appeng/bootstrap/IBlockBuilder.java index b83aafafa..f366c2ad7 100644 --- a/src/main/java/appeng/bootstrap/IBlockBuilder.java +++ b/src/main/java/appeng/bootstrap/IBlockBuilder.java @@ -49,12 +49,6 @@ public interface IBlockBuilder */ IBlockBuilder disableItem(); - /** - * Forces this block's item to uses a custom model, instead of using the default block state as the item model. - * The model has the same name as the registry name. - */ - IBlockBuilder useCustomItemModel(); - IBlockBuilder item( BiFunction factory ); T build(); diff --git a/src/main/java/appeng/client/render/tesr/CrankTESR.java b/src/main/java/appeng/client/render/tesr/CrankTESR.java index a5b4afed7..4bd4f7d9f 100644 --- a/src/main/java/appeng/client/render/tesr/CrankTESR.java +++ b/src/main/java/appeng/client/render/tesr/CrankTESR.java @@ -19,6 +19,7 @@ package appeng.client.render.tesr; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import org.lwjgl.opengl.GL11; import net.minecraft.block.BlockState; @@ -47,6 +48,10 @@ import appeng.tile.grindstone.TileCrank; public class CrankTESR extends TileEntityRenderer { + public CrankTESR(TileEntityRendererDispatcher rendererDispatcherIn) { + super(rendererDispatcherIn); + } + @Override public void render( TileCrank te, double x, double y, double z, float partialTicks, int destroyStage, float p_render_10_ ) { diff --git a/src/main/java/appeng/container/implementations/ContainerSkyChest.java b/src/main/java/appeng/container/implementations/ContainerSkyChest.java index 20ee10f53..7bf228a53 100644 --- a/src/main/java/appeng/container/implementations/ContainerSkyChest.java +++ b/src/main/java/appeng/container/implementations/ContainerSkyChest.java @@ -64,7 +64,7 @@ public class ContainerSkyChest extends AEBaseContainer public static ContainerSkyChest fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { BlockPos pos = buf.readBlockPos(); - TileEntity te = Minecraft.getInstance().player.world.getTileEntity(pos); + TileEntity te = inv.player.world.getTileEntity(pos); if (te instanceof TileSkyChest) { return new ContainerSkyChest(windowId, inv, (TileSkyChest) te); } diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 15478c056..dc8ad6b97 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -22,22 +22,28 @@ package appeng.core.api.definitions; import appeng.api.definitions.IBlockDefinition; import appeng.api.definitions.IBlocks; import appeng.api.definitions.ITileDefinition; +import appeng.block.grindstone.BlockCrank; +import appeng.block.grindstone.BlockGrinder; import appeng.block.misc.BlockQuartzFixture; import appeng.block.spatial.BlockMatrixFrame; import appeng.block.storage.BlockSkyChest; import appeng.bootstrap.*; import appeng.bootstrap.definitions.TileEntityDefinition; +import appeng.client.render.tesr.CrankTESR; import appeng.client.render.tesr.SkyChestTESR; import appeng.core.features.AEFeature; import appeng.core.features.registries.PartModels; import appeng.decorative.AEDecorativeBlock; import appeng.decorative.solid.*; +import appeng.tile.grindstone.TileCrank; +import appeng.tile.grindstone.TileGrinder; import appeng.tile.storage.TileSkyChest; import net.minecraft.block.*; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.RenderType; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.ToolType; import static appeng.decorative.solid.BlockSkyStone.SkystoneType; @@ -225,16 +231,22 @@ public final class ApiBlocks implements IBlocks // .tileEntity( new TileEntityDefinition( TileSkyCompass.class ) ) // .rendering( new SkyCompassRendering() ) // .build(); -// this.grindstone = registry.block( "grindstone", BlockGrinder::new ) -// .features( AEFeature.GRIND_STONE ) -// .tileEntity( new TileEntityDefinition( TileGrinder.class ) ) -// .build(); -// this.crank = registry.block( "crank", BlockCrank::new ) -// .features( AEFeature.GRIND_STONE ) -// .tileEntity( new TileEntityDefinition( TileCrank.class ) ) -// .rendering( new CrankRendering() ) -// .useCustomItemModel() -// .build(); + this.grindstone = registry.block( "grindstone", () -> new BlockGrinder(Block.Properties.create(Material.ROCK).hardnessAndResistance(3.2f)) ) + .features( AEFeature.GRIND_STONE ) + .tileEntity( registry.tileEntity("grindstone", TileGrinder.class, TileGrinder::new ).build() ) + .build(); + this.crank = registry.block( "crank", () -> new BlockCrank(Block.Properties.create(Material.WOOD).harvestTool(ToolType.AXE).harvestLevel(0).notSolid()) ) + .features( AEFeature.GRIND_STONE ) + .tileEntity( registry.tileEntity("crank", TileCrank.class, TileCrank::new ) + .rendering(new TileEntityRenderingCustomizer() { + @Override + @OnlyIn(Dist.CLIENT) + public void customize(TileEntityRendering rendering) { + rendering.tileEntityRenderer(CrankTESR::new); + } + }) + .build() ) + .build(); // this.inscriber = registry.block( "inscriber", BlockInscriber::new ) // .features( AEFeature.INSCRIBER ) // .tileEntity( new TileEntityDefinition( TileInscriber.class ) ) diff --git a/src/main/java/appeng/debug/TileCubeGenerator.java b/src/main/java/appeng/debug/TileCubeGenerator.java index b239ae0b6..b9a66face 100644 --- a/src/main/java/appeng/debug/TileCubeGenerator.java +++ b/src/main/java/appeng/debug/TileCubeGenerator.java @@ -96,7 +96,7 @@ public class TileCubeGenerator extends AEBaseTile implements ITickableTileEntity { this.is = ItemStack.EMPTY; - if( player.isShiftKeyDown() ) + if( player.isCrouching() ) { this.size--; } diff --git a/src/main/java/appeng/debug/ToolDebugCard.java b/src/main/java/appeng/debug/ToolDebugCard.java index 92f95dd06..8828697de 100644 --- a/src/main/java/appeng/debug/ToolDebugCard.java +++ b/src/main/java/appeng/debug/ToolDebugCard.java @@ -63,7 +63,7 @@ public class ToolDebugCard extends AEBaseItem return EnumActionResult.PASS; } - if( player.isShiftKeyDown() ) + if( player.isCrouching() ) { int grids = 0; int totalNodes = 0; diff --git a/src/main/java/appeng/debug/ToolReplicatorCard.java b/src/main/java/appeng/debug/ToolReplicatorCard.java index 6f9fc290c..1d4ebe344 100644 --- a/src/main/java/appeng/debug/ToolReplicatorCard.java +++ b/src/main/java/appeng/debug/ToolReplicatorCard.java @@ -57,7 +57,7 @@ public class ToolReplicatorCard extends AEBaseItem int y = pos.getY(); int z = pos.getZ(); - if( player.isShiftKeyDown() ) + if( player.isCrouching() ) { if( world.getTileEntity( pos ) instanceof IGridHost ) { diff --git a/src/main/java/appeng/fluids/block/BlockFluidInterface.java b/src/main/java/appeng/fluids/block/BlockFluidInterface.java index 43246a206..a19d50bd6 100644 --- a/src/main/java/appeng/fluids/block/BlockFluidInterface.java +++ b/src/main/java/appeng/fluids/block/BlockFluidInterface.java @@ -48,9 +48,9 @@ public class BlockFluidInterface extends AEBaseTileBlock @Override public ActionResultType onActivated(final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final BlockRayTraceResult hit) { - if( p.isShiftKeyDown() ) + if( p.isCrouching() ) { - return false; + return ActionResultType.PASS; } final TileEntity tg = this.getTileEntity( w, pos ); @@ -60,8 +60,8 @@ public class BlockFluidInterface extends AEBaseTileBlock { Platform.openGUI( p, tg, AEPartLocation.fromFacing(hit), GuiBridge.GUI_FLUID_INTERFACE ); } - return true; + return ActionResultType.SUCCESS; } - return false; + return ActionResultType.PASS; } } diff --git a/src/main/java/appeng/items/materials/ItemMaterial.java b/src/main/java/appeng/items/materials/ItemMaterial.java index 8f5a5d29d..2a9f003e1 100644 --- a/src/main/java/appeng/items/materials/ItemMaterial.java +++ b/src/main/java/appeng/items/materials/ItemMaterial.java @@ -225,7 +225,7 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent, { PlayerEntity player = context.getPlayer(); Hand hand = context.getHand(); - if( player.isShiftKeyDown() ) + if( player.isCrouching() ) { final TileEntity te = context.getWorld().getTileEntity( context.getPos() ); IItemHandler upgrades = null; diff --git a/src/main/java/appeng/items/misc/ItemEncodedPattern.java b/src/main/java/appeng/items/misc/ItemEncodedPattern.java index b550b40a0..ee113a6dd 100644 --- a/src/main/java/appeng/items/misc/ItemEncodedPattern.java +++ b/src/main/java/appeng/items/misc/ItemEncodedPattern.java @@ -76,7 +76,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt private boolean clearPattern( final ItemStack stack, final PlayerEntity player ) { - if( player.isShiftKeyDown() ) + if( player.isCrouching() ) { if( Platform.isClient() ) { diff --git a/src/main/java/appeng/items/storage/AbstractStorageCell.java b/src/main/java/appeng/items/storage/AbstractStorageCell.java index d800600f2..34fae218a 100644 --- a/src/main/java/appeng/items/storage/AbstractStorageCell.java +++ b/src/main/java/appeng/items/storage/AbstractStorageCell.java @@ -170,7 +170,7 @@ public abstract class AbstractStorageCell> extends AEBaseI private boolean disassembleDrive( final ItemStack stack, final World world, final PlayerEntity player ) { - if( player.isShiftKeyDown() ) + if( player.isCrouching() ) { if( Platform.isClient() ) { diff --git a/src/main/java/appeng/items/tools/ToolBiometricCard.java b/src/main/java/appeng/items/tools/ToolBiometricCard.java index 2edbbffc0..d99f13c89 100644 --- a/src/main/java/appeng/items/tools/ToolBiometricCard.java +++ b/src/main/java/appeng/items/tools/ToolBiometricCard.java @@ -57,7 +57,7 @@ public class ToolBiometricCard extends AEBaseItem implements IBiometricCard @Override public ActionResult onItemRightClick( final World w, final PlayerEntity p, final Hand hand ) { - if( p.isShiftKeyDown() ) + if( p.isCrouching() ) { this.encode( p.getHeldItem( hand ), p ); p.swingArm( hand ); @@ -70,7 +70,7 @@ public class ToolBiometricCard extends AEBaseItem implements IBiometricCard @Override public boolean itemInteractionForEntity( ItemStack is, final PlayerEntity player, final LivingEntity target, final Hand hand ) { - if( target instanceof PlayerEntity && !player.isShiftKeyDown() ) + if( target instanceof PlayerEntity && !player.isCrouching() ) { if( player.isCreative() ) { diff --git a/src/main/java/appeng/items/tools/ToolMemoryCard.java b/src/main/java/appeng/items/tools/ToolMemoryCard.java index 3385c6153..c77e54c03 100644 --- a/src/main/java/appeng/items/tools/ToolMemoryCard.java +++ b/src/main/java/appeng/items/tools/ToolMemoryCard.java @@ -198,7 +198,7 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard @Override public ActionResultType onItemUse( ItemUseContext context ) { - if( context.getPlayer().isShiftKeyDown() ) + if( context.getPlayer().isCrouching() ) { if( !context.getPlayer().world.isRemote ) { @@ -215,7 +215,7 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard @Override public ActionResult onItemRightClick( World w, PlayerEntity player, Hand hand ) { - if( player.isShiftKeyDown() ) + if( player.isCrouching() ) { if( !w.isRemote ) { diff --git a/src/main/java/appeng/items/tools/ToolNetworkTool.java b/src/main/java/appeng/items/tools/ToolNetworkTool.java index b5cfca6a2..5d8ecd412 100644 --- a/src/main/java/appeng/items/tools/ToolNetworkTool.java +++ b/src/main/java/appeng/items/tools/ToolNetworkTool.java @@ -103,7 +103,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench { return ActionResultType.FAIL; } - else if( context.getPlayer().isShiftKeyDown() ) + else if( context.getPlayer().isCrouching() ) { return ActionResultType.PASS; } @@ -138,7 +138,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench } final Block b = w.getBlockState( pos ).getBlock(); - if( !p.isShiftKeyDown() ) + if( !p.isCrouching() ) { final TileEntity te = w.getTileEntity( pos ); if( !( te instanceof IGridHost ) ) @@ -152,7 +152,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench } } - if( !p.isShiftKeyDown() ) + if( !p.isCrouching() ) { if( p.openContainer instanceof AEBaseContainer ) { diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index d69af3778..7a835f619 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -188,7 +188,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe } } - if( p.isShiftKeyDown() ) + if( p.isCrouching() ) { this.cycleColors( is, paintBall, 1 ); } diff --git a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java index 9f101848b..78b2ff4cf 100644 --- a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java +++ b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java @@ -256,7 +256,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT final BlockState state = w.getBlockState( pos ); final Block blockID = state.getBlock(); - if( p.isShiftKeyDown() ) + if( p.isCrouching() ) { if( this.canCool( state ) ) { diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index ab792fefc..27236d10d 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -444,7 +444,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, final String name = is.getTranslationKey(); - if( player.isShiftKeyDown() ) + if( player.isCrouching() ) { final CompoundNBT data = this.downloadSettings( SettingsFrom.MEMORY_CARD ); if( data != null ) diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 09edda3e0..5ff5be58f 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -818,7 +818,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I { // forge sends activate even when sneaking in some cases (eg emtpy hand) // if sneaking try shift activate first. - if( player.isShiftKeyDown() && p.part.onShiftActivate( player, hand, pos ) ) + if( player.isCrouching() && p.part.onShiftActivate( player, hand, pos ) ) { return true; } @@ -833,7 +833,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I final SelectedPart p = this.selectPart( hitVec ); if( p != null && p.part != null ) { - if( player.isShiftKeyDown() ) + if( player.isCrouching() ) { return p.part.onShiftClicked( player, hand, hitVec ); } diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index 2aabb4e4c..b6b85a100 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -79,7 +79,7 @@ public class PartPlacement return ActionResultType.FAIL; } - if( !held.isEmpty() && Platform.isWrench( player, held, pos ) && player.isShiftKeyDown() ) + if( !held.isEmpty() && Platform.isWrench( player, held, pos ) && player.isCrouching() ) { if( !Platform.hasPermissions( new DimensionalCoord( world, pos ), player ) ) { @@ -200,7 +200,7 @@ public class PartPlacement if( held.isEmpty() ) { final Block block = world.getBlockState( pos ).getBlock(); - if( host != null && player.isShiftKeyDown() && block != null ) + if( host != null && player.isCrouching() && block != null ) { final LookDirection dir = Platform.getPlayerRay( player, getEyeOffset( player ) ); final RayTraceResult mop = block.getRayTraceResult( world.getBlockState( pos ), world, pos, dir.getA(), dir.getB(), mop ); @@ -325,7 +325,7 @@ public class PartPlacement if( sp.part != null ) { - if( !player.isShiftKeyDown() && sp.part.onActivate( player, hand, mop.hitVec ) ) + if( !player.isCrouching() && sp.part.onActivate( player, hand, mop.hitVec ) ) { return ActionResult.resultFail( null ); } @@ -437,7 +437,7 @@ public class PartPlacement boolean supportedItem = items.memoryCard().isSameAs( held ); supportedItem |= items.colorApplicator().isSameAs( held ); - if( event.getPlayer().isShiftKeyDown() && !held.isEmpty() && supportedItem ) + if( event.getPlayer().isCrouching() && !held.isEmpty() && supportedItem ) { NetworkHandler.instance().sendToServer( new PacketClick( event.getPos(), event.getFace(), 0, 0, 0, event.getHand() ) ); } diff --git a/src/main/java/appeng/tile/grindstone/TileCrank.java b/src/main/java/appeng/tile/grindstone/TileCrank.java index ea2ed8a60..b0fd4973d 100644 --- a/src/main/java/appeng/tile/grindstone/TileCrank.java +++ b/src/main/java/appeng/tile/grindstone/TileCrank.java @@ -28,6 +28,7 @@ import net.minecraft.entity.Entity; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -51,6 +52,10 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, ITickable private int hits = 0; private int rotation = 0; + public TileCrank(TileEntityType tileEntityTypeIn) { + super(tileEntityTypeIn); + } + @Override public void tick() { diff --git a/src/main/java/appeng/tile/grindstone/TileGrinder.java b/src/main/java/appeng/tile/grindstone/TileGrinder.java index 5d1321793..a1328271a 100644 --- a/src/main/java/appeng/tile/grindstone/TileGrinder.java +++ b/src/main/java/appeng/tile/grindstone/TileGrinder.java @@ -24,6 +24,7 @@ import java.util.List; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.RangedWrapper; @@ -47,6 +48,10 @@ public class TileGrinder extends AEBaseInvTile implements ICrankable private final IItemHandler invExt = new WrapperFilteredItemHandler( this.inv, new GrinderFilter() ); private int points; + public TileGrinder(TileEntityType tileEntityTypeIn) { + super(tileEntityTypeIn); + } + @Override public void setOrientation( final Direction inForward, final Direction inUp ) {