From 5498eb6d7c5d373e8955b19de4dfaf4fa2f6dad3 Mon Sep 17 00:00:00 2001 From: elix-x Date: Sun, 19 Jun 2016 14:43:27 +0200 Subject: [PATCH] First update pass (1/3) - ~1400 -> 82 errors This is first update pass, which is mainly import reorganization, name fixes, etc... Although some parts of second were done where changes aren't important. Errors: ~1400 -> 82. --- src/main/java/appeng/block/AEBaseBlock.java | 71 ++++++------ .../java/appeng/block/AEBaseItemBlock.java | 4 +- .../java/appeng/block/AEBaseTileBlock.java | 32 +++--- .../java/appeng/block/UnlistedBlockPos.java | 2 +- .../block/crafting/BlockCraftingUnit.java | 17 +-- .../crafting/BlockMolecularAssembler.java | 16 ++- .../appeng/block/grindstone/BlockCrank.java | 12 +- .../appeng/block/grindstone/BlockGrinder.java | 18 ++- .../appeng/block/misc/BlockCellWorkbench.java | 10 +- .../java/appeng/block/misc/BlockCharger.java | 20 ++-- .../appeng/block/misc/BlockCondenser.java | 10 +- .../appeng/block/misc/BlockInscriber.java | 9 +- .../appeng/block/misc/BlockInterface.java | 10 +- .../appeng/block/misc/BlockLightDetector.java | 21 ++-- .../java/appeng/block/misc/BlockPaint.java | 24 ++-- .../misc/BlockQuartzGrowthAccelerator.java | 12 +- .../appeng/block/misc/BlockQuartzTorch.java | 13 ++- .../java/appeng/block/misc/BlockSecurity.java | 16 ++- .../appeng/block/misc/BlockSkyCompass.java | 13 ++- .../java/appeng/block/misc/BlockTinyTNT.java | 35 +++--- .../block/misc/BlockVibrationChamber.java | 14 ++- .../block/networking/BlockCableBus.java | 64 +++++------ .../block/networking/BlockController.java | 12 +- .../block/networking/BlockEnergyAcceptor.java | 2 +- .../block/networking/BlockWireless.java | 24 ++-- .../appeng/block/qnb/BlockQuantumBase.java | 11 +- .../block/qnb/BlockQuantumLinkChamber.java | 16 ++- .../appeng/block/qnb/BlockQuantumRing.java | 10 +- .../block/spatial/BlockMatrixFrame.java | 11 +- .../block/spatial/BlockSpatialIOPort.java | 12 +- .../block/spatial/BlockSpatialPylon.java | 10 +- .../java/appeng/block/storage/BlockChest.java | 15 ++- .../java/appeng/block/storage/BlockDrive.java | 16 ++- .../appeng/block/storage/BlockIOPort.java | 12 +- .../appeng/block/storage/BlockSkyChest.java | 16 ++- src/main/java/appeng/client/ClientHelper.java | 68 ++++++------ src/main/java/appeng/client/SmartModel.java | 61 +++++------ .../java/appeng/client/gui/AEBaseGui.java | 38 ++++--- .../gui/implementations/GuiCraftingCPU.java | 6 +- .../implementations/GuiCraftingStatus.java | 4 +- .../gui/implementations/GuiCraftingTerm.java | 4 +- .../gui/implementations/GuiPatternTerm.java | 4 +- .../client/gui/widgets/GuiImgButton.java | 6 +- .../client/gui/widgets/GuiTabButton.java | 2 +- .../client/gui/widgets/GuiToggleButton.java | 6 +- .../appeng/client/me/ClientDCInternalInv.java | 6 +- .../client/render/AppEngRenderItem.java | 15 +-- .../client/render/BakingModelGenerator.java | 24 ++-- .../appeng/client/render/BaseBlockRender.java | 13 ++- .../appeng/client/render/BusRenderHelper.java | 3 +- .../client/render/CableRenderHelper.java | 6 +- .../render/ISimpleBlockRenderingHandler.java | 2 +- .../client/render/SpatialSkyRender.java | 20 ++-- .../appeng/client/render/TESRWrapper.java | 2 +- .../appeng/client/render/WorldRender.java | 2 +- .../render/blocks/RenderBlockAssembler.java | 2 +- .../render/blocks/RenderBlockCharger.java | 6 +- .../render/blocks/RenderBlockController.java | 2 +- .../render/blocks/RenderBlockCraftingCPU.java | 6 +- .../blocks/RenderBlockCraftingCPUMonitor.java | 6 +- .../render/blocks/RenderBlockCrank.java | 12 +- .../render/blocks/RenderBlockEnergyCube.java | 2 +- .../render/blocks/RenderBlockInscriber.java | 10 +- .../render/blocks/RenderBlockInterface.java | 2 +- .../render/blocks/RenderBlockPaint.java | 4 +- .../blocks/RenderBlockQuartzAccelerator.java | 2 +- .../render/blocks/RenderBlockSkyChest.java | 6 +- .../render/blocks/RenderBlockSkyCompass.java | 6 +- .../render/blocks/RenderBlockWireless.java | 2 +- .../client/render/blocks/RenderDrive.java | 2 +- .../client/render/blocks/RenderMEChest.java | 2 +- .../client/render/blocks/RenderNull.java | 2 +- .../client/render/blocks/RenderQNB.java | 2 +- .../render/blocks/RenderQuartzGlass.java | 2 +- .../client/render/blocks/RenderQuartzOre.java | 2 +- .../render/blocks/RenderQuartzTorch.java | 6 +- .../render/blocks/RenderSpatialPylon.java | 2 +- .../client/render/blocks/RenderTinyTNT.java | 6 +- .../render/blocks/RendererCableBus.java | 6 +- .../render/blocks/RendererSecurity.java | 2 +- .../client/render/effects/AssemblerFX.java | 11 +- .../client/render/effects/ChargedOreFX.java | 4 +- .../client/render/effects/CraftingFx.java | 26 ++++- .../client/render/effects/EnergyFx.java | 26 ++++- .../client/render/effects/LightningArcFX.java | 1 + .../client/render/effects/LightningFX.java | 13 ++- .../client/render/effects/MatterCannonFX.java | 9 +- .../client/render/effects/VibrantFX.java | 11 +- .../client/texture/CableBusTextures.java | 2 +- .../client/texture/ExtraBlockTextures.java | 2 +- .../appeng/client/texture/MissingIcon.java | 2 +- .../appeng/container/AEBaseContainer.java | 8 +- .../container/ContainerOpenContext.java | 2 +- .../appeng/container/guisync/SyncData.java | 6 +- .../ContainerCellWorkbench.java | 14 +-- .../ContainerCraftConfirm.java | 11 +- .../implementations/ContainerCraftingCPU.java | 11 +- .../ContainerMEMonitorable.java | 27 ++--- .../ContainerNetworkStatus.java | 2 +- .../implementations/ContainerPatternTerm.java | 12 +- .../implementations/ContainerQuartzKnife.java | 7 +- .../implementations/ContainerSecurity.java | 14 +-- .../implementations/ContainerUpgradeable.java | 2 +- .../container/slot/AppEngCraftingSlot.java | 36 +++--- .../container/slot/SlotCraftingTerm.java | 2 +- .../container/slot/SlotRestrictedInput.java | 2 +- src/main/java/appeng/core/AEConfig.java | 10 +- src/main/java/appeng/core/AELog.java | 2 +- src/main/java/appeng/core/AppEng.java | 2 +- src/main/java/appeng/core/CommonHelper.java | 4 +- src/main/java/appeng/core/CreativeTab.java | 2 +- .../java/appeng/core/CreativeTabFacade.java | 2 +- src/main/java/appeng/core/FacadeConfig.java | 2 +- src/main/java/appeng/core/Registration.java | 31 ++++-- src/main/java/appeng/core/api/ApiPart.java | 2 +- .../appeng/core/features/BlockDefinition.java | 2 +- .../registries/GrinderRecipeManager.java | 24 ++-- .../registries/MatterCannonAmmoRegistry.java | 2 +- .../registries/P2PTunnelRegistry.java | 40 +++---- .../features/registries/WorldGenRegistry.java | 4 +- .../core/localization/ButtonToolTips.java | 6 +- .../appeng/core/localization/GuiText.java | 4 +- .../core/localization/PlayerMessages.java | 8 +- .../appeng/core/localization/WailaText.java | 6 +- src/main/java/appeng/core/stats/Stats.java | 4 +- src/main/java/appeng/core/sync/GuiBridge.java | 2 +- .../network/AppEngServerPacketHandler.java | 2 +- .../core/sync/network/NetworkHandler.java | 8 +- .../packets/PacketAssemblerAnimation.java | 2 +- .../appeng/core/sync/packets/PacketClick.java | 2 +- .../sync/packets/PacketMEInventoryUpdate.java | 6 +- .../core/sync/packets/PacketMatterCannon.java | 2 +- .../packets/PacketNewStorageDimension.java | 4 +- .../sync/packets/PacketPartPlacement.java | 3 +- .../sync/packets/PacketTransitionEffect.java | 14 +-- .../core/sync/packets/PacketValueConfig.java | 7 +- .../appeng/core/worlddata/DimensionData.java | 6 +- .../java/appeng/debug/BlockChunkloader.java | 2 +- .../java/appeng/debug/BlockCubeGenerator.java | 10 +- src/main/java/appeng/debug/BlockItemGen.java | 2 +- .../java/appeng/debug/BlockPhantomNode.java | 10 +- .../java/appeng/debug/TileChunkLoader.java | 10 +- .../java/appeng/debug/TileCubeGenerator.java | 11 +- src/main/java/appeng/debug/TileItemGen.java | 6 +- src/main/java/appeng/debug/ToolDebugCard.java | 14 ++- src/main/java/appeng/debug/ToolEraser.java | 10 +- .../appeng/debug/ToolMeteoritePlacer.java | 14 ++- .../java/appeng/debug/ToolReplicatorCard.java | 23 ++-- .../solid/ChargedQuartzOreBlock.java | 4 +- .../decorative/solid/ChiseledQuartzBlock.java | 2 +- .../appeng/decorative/solid/FluixBlock.java | 2 +- .../appeng/decorative/solid/QuartzBlock.java | 2 +- .../decorative/solid/QuartzGlassBlock.java | 21 ++-- .../decorative/solid/QuartzLampBlock.java | 4 +- .../decorative/solid/QuartzOreBlock.java | 16 +-- .../decorative/solid/QuartzPillarBlock.java | 4 +- .../decorative/solid/SkyStoneBlock.java | 15 +-- .../stair/StairBlockDefinition.java | 2 +- .../java/appeng/entity/AEBaseEntityItem.java | 2 +- .../appeng/entity/EntityChargedQuartz.java | 16 +-- .../appeng/entity/EntityGrowingCrystal.java | 12 +- .../java/appeng/entity/EntitySingularity.java | 4 +- .../appeng/entity/EntityTinyTNTPrimed.java | 24 ++-- .../appeng/entity/RenderTinyTNTPrimed.java | 14 +-- src/main/java/appeng/facade/FacadePart.java | 16 +-- .../java/appeng/helpers/AEGlassMaterial.java | 2 +- .../java/appeng/helpers/DualityInterface.java | 20 ++-- .../java/appeng/helpers/ICustomCollision.java | 4 +- .../java/appeng/helpers/MetaRotation.java | 2 +- src/main/java/appeng/helpers/Splotch.java | 4 +- src/main/java/appeng/hooks/IBlockTool.java | 2 +- src/main/java/appeng/hooks/TickHandler.java | 2 +- .../abstraction/IBuildCraftCore.java | 2 +- .../appeng/integration/abstraction/INEI.java | 2 +- .../items/contents/NetworkToolViewer.java | 4 +- .../appeng/items/materials/MultiItem.java | 16 +-- .../appeng/items/misc/ItemCrystalSeed.java | 2 +- .../appeng/items/misc/ItemEncodedPattern.java | 19 ++-- .../java/appeng/items/misc/ItemPaintBall.java | 3 +- .../java/appeng/items/parts/ItemFacade.java | 22 ++-- .../appeng/items/parts/ItemMultiPart.java | 11 +- .../items/storage/ItemBasicStorageCell.java | 19 ++-- .../appeng/items/tools/ToolBiometricCard.java | 23 ++-- .../appeng/items/tools/ToolMemoryCard.java | 21 ++-- .../appeng/items/tools/ToolNetworkTool.java | 42 ++++--- .../items/tools/powered/ToolChargedStaff.java | 2 +- .../tools/powered/ToolColorApplicator.java | 20 ++-- .../tools/powered/ToolEntropyManipulator.java | 56 +++++----- .../items/tools/powered/ToolMassCannon.java | 103 +++++++++--------- .../items/tools/powered/ToolPortableCell.java | 9 +- .../tools/powered/ToolWirelessTerminal.java | 11 +- .../tools/quartz/ToolQuartzCuttingKnife.java | 15 ++- .../items/tools/quartz/ToolQuartzWrench.java | 19 ++-- src/main/java/appeng/me/GridNode.java | 2 +- .../java/appeng/me/cluster/MBCalculator.java | 2 +- .../CraftingCPUCalculator.java | 2 +- .../implementations/QuantumCalculator.java | 2 +- .../implementations/QuantumCluster.java | 4 +- .../SpatialPylonCalculator.java | 2 +- .../me/pathfinding/ControllerValidator.java | 2 +- src/main/java/appeng/parts/AEBasePart.java | 12 +- .../java/appeng/parts/BusCollisionHelper.java | 4 +- .../java/appeng/parts/CableBusContainer.java | 10 +- .../java/appeng/parts/ICableBusContainer.java | 8 +- .../appeng/parts/NullCableBusContainer.java | 8 +- .../java/appeng/parts/PartBasicState.java | 2 +- src/main/java/appeng/parts/PartPlacement.java | 60 +++++----- .../automation/PartAnnihilationPlane.java | 22 ++-- .../parts/automation/PartExportBus.java | 6 +- .../parts/automation/PartFormationPlane.java | 27 +++-- .../PartIdentityAnnihilationPlane.java | 2 +- .../parts/automation/PartImportBus.java | 6 +- .../parts/automation/PartLevelEmitter.java | 7 +- .../parts/automation/PartSharedItemBus.java | 6 +- .../parts/layers/LayerISidedInventory.java | 4 +- .../appeng/parts/misc/PartCableAnchor.java | 8 +- .../java/appeng/parts/misc/PartInterface.java | 10 +- .../appeng/parts/misc/PartStorageBus.java | 6 +- .../java/appeng/parts/misc/PartToggleBus.java | 2 +- .../appeng/parts/networking/PartCable.java | 2 +- .../parts/networking/PartCableCovered.java | 2 +- .../parts/networking/PartCableSmart.java | 2 +- .../parts/networking/PartDenseCable.java | 2 +- .../parts/networking/PartQuartzFiber.java | 2 +- .../java/appeng/parts/p2p/PartP2PItems.java | 4 +- .../appeng/parts/p2p/PartP2PRedstone.java | 6 +- .../java/appeng/parts/p2p/PartP2PTunnel.java | 10 +- .../parts/reporting/AbstractPartDisplay.java | 2 +- .../parts/reporting/AbstractPartMonitor.java | 20 ++-- .../parts/reporting/AbstractPartPanel.java | 2 +- .../reporting/AbstractPartReporting.java | 6 +- .../parts/reporting/AbstractPartTerminal.java | 4 +- .../reporting/PartConversionMonitor.java | 10 +- .../reporting/PartInterfaceTerminal.java | 4 +- .../java/appeng/recipes/RecipeHandler.java | 2 +- .../recipes/ores/OreDictionaryHandler.java | 6 +- src/main/java/appeng/server/AECommand.java | 2 +- src/main/java/appeng/server/ServerHelper.java | 6 +- .../server/subcommands/ChunkLogger.java | 10 +- .../appeng/server/subcommands/Supporters.java | 4 +- .../java/appeng/services/CompassService.java | 8 +- .../export/MinecraftItemCSVExporter.java | 10 +- .../java/appeng/spatial/BiomeGenStorage.java | 14 +-- src/main/java/appeng/spatial/CachedPlane.java | 7 +- .../appeng/spatial/DefaultSpatialHandler.java | 3 +- .../java/appeng/spatial/ISpatialVisitor.java | 2 +- .../appeng/spatial/StorageChunkProvider.java | 15 +-- .../java/appeng/spatial/StorageHelper.java | 27 +++-- .../appeng/spatial/StorageWorldProvider.java | 44 +++----- src/main/java/appeng/tile/AEBaseInvTile.java | 12 +- src/main/java/appeng/tile/AEBaseTile.java | 18 +-- .../tile/crafting/TileMolecularAssembler.java | 4 +- .../appeng/tile/grindstone/TileCrank.java | 10 +- .../appeng/tile/grindstone/TileGrinder.java | 2 +- .../inventory/AppEngInternalAEInventory.java | 4 +- .../inventory/AppEngInternalInventory.java | 4 +- .../tile/inventory/AppEngNullInventory.java | 4 +- .../appeng/tile/misc/TileCellWorkbench.java | 2 +- .../java/appeng/tile/misc/TileInscriber.java | 2 +- .../java/appeng/tile/misc/TileInterface.java | 2 +- src/main/java/appeng/tile/misc/TilePaint.java | 12 +- .../java/appeng/tile/misc/TileSecurity.java | 2 +- .../tile/misc/TileVibrationChamber.java | 2 +- .../appeng/tile/networking/TileCableBus.java | 10 +- .../tile/networking/TileController.java | 4 +- .../appeng/tile/spatial/TileSpatialPylon.java | 4 +- .../java/appeng/tile/storage/TileIOPort.java | 2 +- .../appeng/tile/storage/TileSkyChest.java | 6 +- src/main/java/appeng/util/BlockUpdate.java | 2 +- src/main/java/appeng/util/LookDirection.java | 14 +-- src/main/java/appeng/util/Platform.java | 90 ++++++++------- .../util/inv/AdaptorPlayerInventory.java | 4 +- .../java/appeng/util/inv/WrapperBCPipe.java | 4 +- .../util/inv/WrapperChainedInventory.java | 4 +- .../java/appeng/util/inv/WrapperInvSlot.java | 4 +- .../util/inv/WrapperInventoryRange.java | 4 +- src/main/java/appeng/util/item/AEItemDef.java | 4 +- .../java/appeng/util/item/AEItemStack.java | 8 +- .../appeng/util/item/SharedSearchObject.java | 2 +- .../java/appeng/worldgen/MeteoritePlacer.java | 86 +++++++-------- .../appeng/worldgen/MeteoriteWorldGen.java | 11 +- .../java/appeng/worldgen/QuartzWorldGen.java | 5 +- .../appeng/worldgen/meteorite/ChunkOnly.java | 4 +- .../appeng/worldgen/meteorite/Fallout.java | 16 +-- .../worldgen/meteorite/FalloutSand.java | 2 +- .../worldgen/meteorite/FalloutSnow.java | 4 +- .../meteorite/MeteoriteBlockPutter.java | 4 +- .../worldgen/meteorite/StandardWorld.java | 4 +- 288 files changed, 1637 insertions(+), 1420 deletions(-) diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index 1be938929..2a54e4dc9 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -23,13 +23,16 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.List; +import javax.annotation.Nullable; + import com.google.common.base.Optional; import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; @@ -39,12 +42,13 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; @@ -72,7 +76,7 @@ import appeng.helpers.ICustomCollision; import appeng.util.LookDirection; import appeng.util.Platform; - +//TODO 1.9.4 - setBlockBounds => ? public abstract class AEBaseBlock extends Block implements IAEFeature { public static final PropertyEnum AXIS_ORIENTATION = PropertyEnum.create( "axis", EnumFacing.Axis.class ); @@ -107,21 +111,21 @@ public abstract class AEBaseBlock extends Block implements IAEFeature { super( mat ); - if( mat == AEGlassMaterial.INSTANCE || mat == Material.glass ) + if( mat == AEGlassMaterial.INSTANCE || mat == Material.GLASS ) { - this.setStepSound( Block.soundTypeGlass ); + this.setSoundType( SoundType.GLASS ); } - else if( mat == Material.rock ) + else if( mat == Material.ROCK ) { - this.setStepSound( Block.soundTypeStone ); + this.setSoundType( SoundType.STONE ); } - else if( mat == Material.wood ) + else if( mat == Material.WOOD ) { - this.setStepSound( Block.soundTypeWood ); + this.setSoundType( SoundType.WOOD ); } else { - this.setStepSound( Block.soundTypeMetal ); + this.setSoundType( SoundType.METAL ); } this.featureFullName = new FeatureNameExtractor( this.getClass(), subName ).get(); @@ -138,7 +142,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature public static final UnlistedBlockAccess AE_BLOCK_ACCESS = new UnlistedBlockAccess(); @Override - protected final BlockState createBlockState() + protected final BlockStateContainer createBlockState() { return new ExtendedBlockState( this, this.getAEStates(), new IUnlistedProperty[] { AE_BLOCK_POS, AE_BLOCK_ACCESS } ); } @@ -184,6 +188,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature } } + //TODO 1.9.4 - Move to IBlockColor @Override public int colorMultiplier( final IBlockAccess worldIn, final BlockPos pos, final int colorTint ) { @@ -225,7 +230,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature } @Override - public boolean isNormalCube() + public boolean isNormalCube(IBlockState state) { return this.isFullSize() && this.isOpaque(); } @@ -260,7 +265,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature } @Override - public void addCollisionBoxesToList( final World w, final BlockPos pos, final IBlockState state, final AxisAlignedBB bb, final List out, final Entity e ) + public void addCollisionBoxToList( final IBlockState state, final World w, final BlockPos pos, final AxisAlignedBB bb, final List out, final Entity e ) { final ICustomCollision collisionHandler = this.getCustomCollision( w, pos ); @@ -279,13 +284,13 @@ public abstract class AEBaseBlock extends Block implements IAEFeature } else { - super.addCollisionBoxesToList( w, pos, state, bb, out, e ); + super.addCollisionBoxToList( state, w, pos, bb, out, e ); } } - + @Override @SideOnly( Side.CLIENT ) - public AxisAlignedBB getSelectedBoundingBox( final World w, final BlockPos pos ) + public AxisAlignedBB getSelectedBoundingBox( IBlockState state, final World w, final BlockPos pos ) { final ICustomCollision collisionHandler = this.getCustomCollision( w, pos ); @@ -305,7 +310,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature { this.setBlockBounds( (float) bb.minX, (float) bb.minY, (float) bb.minZ, (float) bb.maxX, (float) bb.maxY, (float) bb.maxZ ); - final MovingObjectPosition r = super.collisionRayTrace( w, pos, ld.getA(), ld.getB() ); + final RayTraceResult r = super.collisionRayTrace( state, w, pos, ld.getA(), ld.getB() ); this.setBlockBounds( 0, 0, 0, 1, 1, 1 ); @@ -327,7 +332,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature if( br != null ) { - br = AxisAlignedBB.fromBounds( br.minX + pos.getX(), br.minY + pos.getY(), br.minZ + pos.getZ(), br.maxX + pos.getX(), br.maxY + pos.getY(), br.maxZ + pos.getZ() ); + br = new AxisAlignedBB( br.minX + pos.getX(), br.minY + pos.getY(), br.minZ + pos.getZ(), br.maxX + pos.getX(), br.maxY + pos.getY(), br.maxZ + pos.getZ() ); return br; } } @@ -349,7 +354,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature final double maxY = Math.max( b.maxY, bx.maxY ); final double maxZ = Math.max( b.maxZ, bx.maxZ ); - b = AxisAlignedBB.fromBounds( minX, minY, minZ, maxX, maxY, maxZ ); + b = new AxisAlignedBB( minX, minY, minZ, maxX, maxY, maxZ ); } if( b == null ) @@ -358,30 +363,30 @@ public abstract class AEBaseBlock extends Block implements IAEFeature } else { - b = AxisAlignedBB.fromBounds( b.minX + pos.getX(), b.minY + pos.getY(), b.minZ + pos.getZ(), b.maxX + pos.getX(), b.maxY + pos.getY(), b.maxZ + pos.getZ() ); + b = new AxisAlignedBB( b.minX + pos.getX(), b.minY + pos.getY(), b.minZ + pos.getZ(), b.maxX + pos.getX(), b.maxY + pos.getY(), b.maxZ + pos.getZ() ); } return b; } - return super.getSelectedBoundingBox( w, pos ); + return super.getSelectedBoundingBox( state, w, pos ); } @Override - public final boolean isOpaqueCube() + public final boolean isOpaqueCube(IBlockState state) { return this.isOpaque(); } @Override - public MovingObjectPosition collisionRayTrace( final World w, final BlockPos pos, final Vec3 a, final Vec3 b ) + public RayTraceResult collisionRayTrace( final IBlockState state, final World w, final BlockPos pos, final Vec3d a, final Vec3d b ) { final ICustomCollision collisionHandler = this.getCustomCollision( w, pos ); if( collisionHandler != null ) { final Iterable bbs = collisionHandler.getSelectedBoundingBoxesFromPool( w, pos, null, true ); - MovingObjectPosition br = null; + RayTraceResult br = null; double lastDist = 0; @@ -389,7 +394,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature { this.setBlockBounds( (float) bb.minX, (float) bb.minY, (float) bb.minZ, (float) bb.maxX, (float) bb.maxY, (float) bb.maxZ ); - final MovingObjectPosition r = super.collisionRayTrace( w, pos, a, b ); + final RayTraceResult r = super.collisionRayTrace( state, w, pos, a, b ); this.setBlockBounds( 0, 0, 0, 1, 1, 1 ); @@ -417,10 +422,10 @@ public abstract class AEBaseBlock extends Block implements IAEFeature } this.setBlockBounds( 0, 0, 0, 1, 1, 1 ); - return super.collisionRayTrace( w, pos, a, b ); + return super.collisionRayTrace( state, w, pos, a, b ); } - public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { return false; } @@ -434,19 +439,19 @@ public abstract class AEBaseBlock extends Block implements IAEFeature } @Override - public boolean hasComparatorInputOverride() + public boolean hasComparatorInputOverride(IBlockState state) { return this.isInventory(); } @Override - public int getComparatorInputOverride( final World worldIn, final BlockPos pos ) + public int getComparatorInputOverride( IBlockState state, final World worldIn, final BlockPos pos ) { return 0; } @Override - public boolean isNormalCube( final IBlockAccess world, final BlockPos pos ) + public boolean isNormalCube( IBlockState state, final IBlockAccess world, final BlockPos pos ) { return this.isFullSize(); } diff --git a/src/main/java/appeng/block/AEBaseItemBlock.java b/src/main/java/appeng/block/AEBaseItemBlock.java index e01039e85..5bc7c9a82 100644 --- a/src/main/java/appeng/block/AEBaseItemBlock.java +++ b/src/main/java/appeng/block/AEBaseItemBlock.java @@ -26,9 +26,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java index 7b31a7ebf..753fbe9be 100644 --- a/src/main/java/appeng/block/AEBaseTileBlock.java +++ b/src/main/java/appeng/block/AEBaseTileBlock.java @@ -41,8 +41,9 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.ReflectionHelper; @@ -214,7 +215,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, } @Override - public int getComparatorInputOverride( final World w, final BlockPos pos ) + public int getComparatorInputOverride( IBlockState state, final World w, final BlockPos pos ) { final TileEntity te = this.getTileEntity( w, pos ); if( te instanceof IInventory ) @@ -224,8 +225,9 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, return 0; } + //TODO 1.9.4 - Move to IBlockState @Override - public boolean onBlockEventReceived( final World worldIn, final BlockPos pos, final IBlockState state, final int eventID, final int eventParam ) + public boolean onBlockAdded( final World worldIn, final BlockPos pos, final IBlockState state, final int eventID, final int eventParam ) { super.onBlockEventReceived( worldIn, pos, state, eventID, eventParam ); final TileEntity tileentity = worldIn.getTileEntity( pos ); @@ -246,16 +248,16 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, } @Override - public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( player != null ) { - final ItemStack is = player.inventory.getCurrentItem(); - if( is != null ) + if( heldItem != null ) { - if( Platform.isWrench( player, is, pos ) && player.isSneaking() ) + if( Platform.isWrench( player, heldItem, pos ) && player.isSneaking() ) { - final Block id = w.getBlockState( pos ).getBlock(); + final IBlockState ids = w.getBlockState( pos ); + final Block id = ids.getBlock(); if( id != null ) { final AEBaseTile tile = this.getTileEntity( w, pos ); @@ -284,7 +286,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, } } - if( id.removedByPlayer( w, pos, player, false ) ) + if( id.removedByPlayer( ids, w, pos, player, false ) ) { final List l = Lists.newArrayList( drops ); Platform.spawnDrops( w, pos, l ); @@ -294,9 +296,9 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, return false; } - if( is.getItem() instanceof IMemoryCard && !( this instanceof BlockCableBus ) ) + if( heldItem.getItem() instanceof IMemoryCard && !( this instanceof BlockCableBus ) ) { - final IMemoryCard memoryCard = (IMemoryCard) is.getItem(); + final IMemoryCard memoryCard = (IMemoryCard) heldItem.getItem(); if( player.isSneaking() ) { final AEBaseTile t = this.getTileEntity( w, pos ); @@ -306,7 +308,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, final NBTTagCompound data = t.downloadSettings( SettingsFrom.MEMORY_CARD ); if( data != null ) { - memoryCard.setMemoryCardContents( is, name, data ); + memoryCard.setMemoryCardContents( heldItem, name, data ); memoryCard.notifyUser( player, MemoryCardMessages.SETTINGS_SAVED ); return true; } @@ -314,8 +316,8 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, } else { - final String name = memoryCard.getSettingsName( is ); - final NBTTagCompound data = memoryCard.getData( is ); + final String name = memoryCard.getSettingsName( heldItem ); + final NBTTagCompound data = memoryCard.getData( heldItem ); if( this.getUnlocalizedName().equals( name ) ) { final AEBaseTile t = this.getTileEntity( w, pos ); @@ -332,7 +334,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, } } - return this.onActivated( w, pos, player, side, hitX, hitY, hitZ ); + return this.onActivated( w, pos, player, hand, heldItem, side, hitX, hitY, hitZ ); } @Override diff --git a/src/main/java/appeng/block/UnlistedBlockPos.java b/src/main/java/appeng/block/UnlistedBlockPos.java index 33291c539..0ee6e56b1 100644 --- a/src/main/java/appeng/block/UnlistedBlockPos.java +++ b/src/main/java/appeng/block/UnlistedBlockPos.java @@ -2,7 +2,7 @@ package appeng.block; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.property.IUnlistedProperty; diff --git a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java index 8e37a7ff4..198b9a3ce 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java @@ -22,6 +22,8 @@ package appeng.block.crafting; import java.util.EnumSet; import java.util.List; +import javax.annotation.Nullable; + import com.google.common.base.Optional; import net.minecraft.block.Block; @@ -33,9 +35,10 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -64,7 +67,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock public BlockCraftingUnit( final CraftingUnitType type ) { - super( Material.iron, Optional.of( type.name() ) ); + super( Material.IRON, Optional.of( type.name() ) ); this.type = type; this.setTileEntity( TileCraftingTile.class ); @@ -86,7 +89,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock } @Override - public void onNeighborBlockChange( final World worldIn, final BlockPos pos, final IBlockState state, final Block neighborBlock ) + public void neighborChanged( final IBlockState state, final World worldIn, final BlockPos pos, final Block neighborBlock ) { final TileCraftingTile cp = this.getTileEntity( worldIn, pos ); if( cp != null ) @@ -96,9 +99,9 @@ public class BlockCraftingUnit extends AEBaseTileBlock } @Override - public EnumWorldBlockLayer getBlockLayer() + public BlockRenderLayer getBlockLayer() { - return EnumWorldBlockLayer.CUTOUT; + return BlockRenderLayer.CUTOUT; } @Override @@ -114,7 +117,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock } @Override - public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { final TileCraftingTile tg = this.getTileEntity( w, pos ); if( tg != null && !p.isSneaking() && tg.isFormed() && tg.isActive() ) diff --git a/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java b/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java index 8d5fc5312..0b22d70af 100644 --- a/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java +++ b/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java @@ -21,12 +21,16 @@ package appeng.block.crafting; import java.util.EnumSet; +import javax.annotation.Nullable; + import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -46,7 +50,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock public BlockMolecularAssembler() { - super( Material.iron ); + super( Material.IRON ); this.setTileEntity( TileMolecularAssembler.class ); this.setOpaque( false ); @@ -55,9 +59,9 @@ public class BlockMolecularAssembler extends AEBaseTileBlock } @Override - public boolean canRenderInLayer( final net.minecraft.util.EnumWorldBlockLayer layer ) + public boolean canRenderInLayer( final IBlockState state, final BlockRenderLayer layer ) { - return layer == EnumWorldBlockLayer.CUTOUT_MIPPED; + return layer == BlockRenderLayer.CUTOUT_MIPPED; } @Override @@ -68,7 +72,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock } @Override - public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { final TileMolecularAssembler tg = this.getTileEntity( w, pos ); if( tg != null && !p.isSneaking() ) diff --git a/src/main/java/appeng/block/grindstone/BlockCrank.java b/src/main/java/appeng/block/grindstone/BlockCrank.java index fec8e952a..c91c53814 100644 --- a/src/main/java/appeng/block/grindstone/BlockCrank.java +++ b/src/main/java/appeng/block/grindstone/BlockCrank.java @@ -21,6 +21,8 @@ package appeng.block.grindstone; import java.util.EnumSet; +import javax.annotation.Nullable; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -28,8 +30,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; @@ -48,7 +51,7 @@ public class BlockCrank extends AEBaseTileBlock public BlockCrank() { - super( Material.wood ); + super( Material.WOOD ); this.setTileEntity( TileCrank.class ); this.setLightOpacity( 0 ); @@ -64,7 +67,7 @@ public class BlockCrank extends AEBaseTileBlock } @Override - public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( player instanceof FakePlayer || player == null ) { @@ -87,6 +90,7 @@ public class BlockCrank extends AEBaseTileBlock private void dropCrank( final World world, final BlockPos pos ) { world.destroyBlock( pos, true ); // w.destroyBlock( x, y, z, true ); + //TODO 1.9.4 - markBlockForUpdate => ? world.markBlockForUpdate( pos ); } @@ -138,7 +142,7 @@ public class BlockCrank extends AEBaseTileBlock } @Override - public void onNeighborBlockChange( final World world, final BlockPos pos, final IBlockState state, final Block neighborBlock ) + public void neighborChanged( final IBlockState state, final World world, final BlockPos pos, final Block neighborBlock ) { final AEBaseTile tile = this.getTileEntity( world, pos ); diff --git a/src/main/java/appeng/block/grindstone/BlockGrinder.java b/src/main/java/appeng/block/grindstone/BlockGrinder.java index f13478c51..f3ad20eb5 100644 --- a/src/main/java/appeng/block/grindstone/BlockGrinder.java +++ b/src/main/java/appeng/block/grindstone/BlockGrinder.java @@ -21,11 +21,14 @@ package appeng.block.grindstone; import java.util.EnumSet; +import javax.annotation.Nullable; + import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.util.AEPartLocation; @@ -41,7 +44,7 @@ public class BlockGrinder extends AEBaseTileBlock public BlockGrinder() { - super( Material.rock ); + super( Material.ROCK ); this.setTileEntity( TileGrinder.class ); this.setHardness( 3.2F ); @@ -49,14 +52,7 @@ public class BlockGrinder extends AEBaseTileBlock } @Override - public boolean onBlockActivated( final World worldIn, final BlockPos pos, final IBlockState state, final EntityPlayer playerIn, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) - { - // TODO Auto-generated method stub - return super.onBlockActivated( worldIn, pos, state, playerIn, side, hitX, hitY, hitZ ); - } - - @Override - public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { final TileGrinder tg = this.getTileEntity( w, pos ); if( tg != null && !p.isSneaking() ) diff --git a/src/main/java/appeng/block/misc/BlockCellWorkbench.java b/src/main/java/appeng/block/misc/BlockCellWorkbench.java index 2ef3d7d8b..0b8ca7821 100644 --- a/src/main/java/appeng/block/misc/BlockCellWorkbench.java +++ b/src/main/java/appeng/block/misc/BlockCellWorkbench.java @@ -21,10 +21,14 @@ package appeng.block.misc; import java.util.EnumSet; +import javax.annotation.Nullable; + import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.util.AEPartLocation; @@ -40,14 +44,14 @@ public class BlockCellWorkbench extends AEBaseTileBlock public BlockCellWorkbench() { - super( Material.iron ); + super( Material.IRON ); this.setTileEntity( TileCellWorkbench.class ); this.setFeature( EnumSet.of( AEFeature.StorageCells ) ); } @Override - public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( p.isSneaking() ) { diff --git a/src/main/java/appeng/block/misc/BlockCharger.java b/src/main/java/appeng/block/misc/BlockCharger.java index a927afb04..ac2118f22 100644 --- a/src/main/java/appeng/block/misc/BlockCharger.java +++ b/src/main/java/appeng/block/misc/BlockCharger.java @@ -24,14 +24,18 @@ import java.util.EnumSet; import java.util.List; import java.util.Random; +import javax.annotation.Nullable; + import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -56,7 +60,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision public BlockCharger() { - super( Material.iron ); + super( Material.IRON ); this.setTileEntity( TileCharger.class ); this.setLightOpacity( 2 ); @@ -71,7 +75,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision } @Override - public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( player.isSneaking() ) { @@ -92,7 +96,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision @Override @SideOnly( Side.CLIENT ) - public void randomDisplayTick( final World w, final BlockPos pos, final IBlockState state, final Random r ) + public void randomDisplayTick( final IBlockState state, final World w, final BlockPos pos, final Random r ) { if( !AEConfig.instance.enableEffects ) { @@ -136,7 +140,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision final double twoPixels = 2.0 / 16.0; final EnumFacing up = tile.getUp(); final EnumFacing forward = tile.getForward(); - final AEAxisAlignedBB bb = AEAxisAlignedBB.fromBounds( twoPixels, twoPixels, twoPixels, 1.0 - twoPixels, 1.0 - twoPixels, 1.0 - twoPixels ); + final AEAxisAlignedBB bb = new AEAxisAlignedBB( twoPixels, twoPixels, twoPixels, 1.0 - twoPixels, 1.0 - twoPixels, 1.0 - twoPixels ); if( up.getFrontOffsetX() != 0 ) { @@ -180,12 +184,12 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision return Collections.singletonList( bb.getBoundingBox() ); } - return Collections.singletonList( AxisAlignedBB.fromBounds( 0.0, 0, 0.0, 1.0, 1.0, 1.0 ) ); + return Collections.singletonList( new AxisAlignedBB( 0.0, 0, 0.0, 1.0, 1.0, 1.0 ) ); } @Override public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List out, final Entity e ) { - out.add( AxisAlignedBB.fromBounds( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) ); + out.add( new AxisAlignedBB( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) ); } } diff --git a/src/main/java/appeng/block/misc/BlockCondenser.java b/src/main/java/appeng/block/misc/BlockCondenser.java index 20523dae2..fac2e557f 100644 --- a/src/main/java/appeng/block/misc/BlockCondenser.java +++ b/src/main/java/appeng/block/misc/BlockCondenser.java @@ -21,10 +21,14 @@ package appeng.block.misc; import java.util.EnumSet; +import javax.annotation.Nullable; + import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.util.AEPartLocation; @@ -40,14 +44,14 @@ public class BlockCondenser extends AEBaseTileBlock public BlockCondenser() { - super( Material.iron ); + super( Material.IRON ); this.setTileEntity( TileCondenser.class ); this.setFeature( EnumSet.of( AEFeature.Core ) ); } @Override - public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( player.isSneaking() ) { diff --git a/src/main/java/appeng/block/misc/BlockInscriber.java b/src/main/java/appeng/block/misc/BlockInscriber.java index d8e166386..523cbd6df 100644 --- a/src/main/java/appeng/block/misc/BlockInscriber.java +++ b/src/main/java/appeng/block/misc/BlockInscriber.java @@ -21,11 +21,14 @@ package appeng.block.misc; import java.util.EnumSet; +import javax.annotation.Nullable; + import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.util.AEPartLocation; @@ -43,7 +46,7 @@ public class BlockInscriber extends AEBaseTileBlock public BlockInscriber() { - super( Material.iron ); + super( Material.IRON ); this.setTileEntity( TileInscriber.class ); this.setLightOpacity( 2 ); @@ -58,7 +61,7 @@ public class BlockInscriber extends AEBaseTileBlock } @Override - public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( p.isSneaking() ) { diff --git a/src/main/java/appeng/block/misc/BlockInterface.java b/src/main/java/appeng/block/misc/BlockInterface.java index 027f6a7ec..0a0b1a364 100644 --- a/src/main/java/appeng/block/misc/BlockInterface.java +++ b/src/main/java/appeng/block/misc/BlockInterface.java @@ -21,10 +21,14 @@ package appeng.block.misc; import java.util.EnumSet; +import javax.annotation.Nullable; + import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.util.AEPartLocation; @@ -43,7 +47,7 @@ public class BlockInterface extends AEBaseTileBlock public BlockInterface() { - super( Material.iron ); + super( Material.IRON ); this.setTileEntity( TileInterface.class ); this.setFeature( EnumSet.of( AEFeature.Core ) ); @@ -56,7 +60,7 @@ public class BlockInterface extends AEBaseTileBlock } @Override - public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( p.isSneaking() ) { diff --git a/src/main/java/appeng/block/misc/BlockLightDetector.java b/src/main/java/appeng/block/misc/BlockLightDetector.java index ec789fc83..d3f6f342f 100644 --- a/src/main/java/appeng/block/misc/BlockLightDetector.java +++ b/src/main/java/appeng/block/misc/BlockLightDetector.java @@ -30,9 +30,9 @@ import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -51,7 +51,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl public BlockLightDetector() { - super( Material.circuits ); + super( Material.CIRCUITS ); this.setLightOpacity( 0 ); this.setFullSize( false ); @@ -80,7 +80,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl } @Override - public int getWeakPower( final IBlockAccess w, final BlockPos pos, final IBlockState state, final EnumFacing side ) + public int getWeakPower( final IBlockState state, final IBlockAccess w, final BlockPos pos, final EnumFacing side ) { if( w instanceof World && ( (TileLightDetector) this.getTileEntity( w, pos ) ).isReady() ) { @@ -103,7 +103,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl } @Override - public void randomDisplayTick( final World worldIn, final BlockPos pos, final IBlockState state, final Random rand ) + public void randomDisplayTick( final IBlockState state, final World worldIn, final BlockPos pos, final Random rand ) { // cancel out lightning } @@ -132,7 +132,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl final double xOff = -0.3 * up.getFrontOffsetX(); final double yOff = -0.3 * up.getFrontOffsetY(); final double zOff = -0.3 * up.getFrontOffsetZ(); - return Collections.singletonList( AxisAlignedBB.fromBounds( xOff + 0.3, yOff + 0.3, zOff + 0.3, xOff + 0.7, yOff + 0.7, zOff + 0.7 ) ); + return Collections.singletonList( new AxisAlignedBB( xOff + 0.3, yOff + 0.3, zOff + 0.3, xOff + 0.7, yOff + 0.7, zOff + 0.7 ) ); } @Override @@ -145,20 +145,21 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl * + 0.85, yOff + (double) y + 0.85, zOff + (double) z + 0.85 ) ); */ } - + @Override - public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) + public void neighborChanged( IBlockState state, World w, BlockPos pos, Block blockIn ) { final EnumFacing up = this.getOrientable( w, pos ).getUp(); - if( !this.canPlaceAt( w, pos, up.getOpposite() ) ) + if( !this.canPlaceAt( (World) w, pos, up.getOpposite() ) ) { - this.dropTorch( w, pos ); + this.dropTorch( (World) w, pos ); } } private void dropTorch( final World w, final BlockPos pos ) { w.destroyBlock( pos, true ); + //TODO 1.9.4 - markBlockForUpdate => ? w.markBlockForUpdate( pos ); } diff --git a/src/main/java/appeng/block/misc/BlockPaint.java b/src/main/java/appeng/block/misc/BlockPaint.java index ff43ce3d6..7c7fb6401 100644 --- a/src/main/java/appeng/block/misc/BlockPaint.java +++ b/src/main/java/appeng/block/misc/BlockPaint.java @@ -30,9 +30,9 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -51,7 +51,7 @@ public class BlockPaint extends AEBaseTileBlock public BlockPaint() { - super( new MaterialLiquid( MapColor.airColor ) ); + super( new MaterialLiquid( MapColor.AIR ) ); this.setTileEntity( TilePaint.class ); this.setLightOpacity( 0 ); @@ -61,9 +61,9 @@ public class BlockPaint extends AEBaseTileBlock } @Override - public EnumWorldBlockLayer getBlockLayer() + public BlockRenderLayer getBlockLayer() { - return EnumWorldBlockLayer.CUTOUT; + return BlockRenderLayer.CUTOUT; } @Override @@ -80,7 +80,7 @@ public class BlockPaint extends AEBaseTileBlock } @Override - public AxisAlignedBB getCollisionBoundingBox( final World worldIn, final BlockPos pos, final IBlockState state ) + public AxisAlignedBB getCollisionBoundingBox( final IBlockState state, final World worldIn, final BlockPos pos ) { return null; } @@ -92,13 +92,13 @@ public class BlockPaint extends AEBaseTileBlock } @Override - public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) + public void neighborChanged( final IBlockState state, final World w, final BlockPos pos, final Block neighborBlock ) { final TilePaint tp = this.getTileEntity( w, pos ); if( tp != null ) { - tp.onNeighborBlockChange(); + tp.neighborChanged(); } } @@ -124,7 +124,7 @@ public class BlockPaint extends AEBaseTileBlock } @Override - public int getLightValue( final IBlockAccess w, final BlockPos pos ) + public int getLightValue( final IBlockState state, final IBlockAccess w, final BlockPos pos ) { final TilePaint tp = this.getTileEntity( w, pos ); @@ -137,13 +137,13 @@ public class BlockPaint extends AEBaseTileBlock } @Override - public boolean isAir( final IBlockAccess world, final BlockPos pos ) + public boolean isAir( final IBlockState state, final IBlockAccess world, final BlockPos pos ) { return true; } @Override - public boolean isReplaceable( final World worldIn, final BlockPos pos ) + public boolean isReplaceable( final IBlockAccess worldIn, final BlockPos pos ) { return true; } diff --git a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java b/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java index c6baed1a5..ce983a4c3 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java +++ b/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java @@ -22,12 +22,12 @@ package appeng.block.misc; import java.util.EnumSet; import java.util.Random; -import net.minecraft.block.Block; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; @@ -45,8 +45,8 @@ public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock { public BlockQuartzGrowthAccelerator() { - super( Material.rock ); - this.setStepSound( Block.soundTypeMetal ); + super( Material.ROCK ); + this.setSoundType( SoundType.METAL ); this.setTileEntity( TileQuartzGrowthAccelerator.class ); this.setFeature( EnumSet.of( AEFeature.Core ) ); } @@ -58,7 +58,7 @@ public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock } @Override - public void randomDisplayTick( final World w, final BlockPos pos, final IBlockState state, final Random r ) + public void randomDisplayTick( final IBlockState state, final World w, final BlockPos pos, final Random r ) { if( !AEConfig.instance.enableEffects ) { @@ -120,7 +120,7 @@ public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock break; } - if( !w.getBlockState( pt ).getBlock().isAir( w, pt ) ) + if( !w.getBlockState( pt ).getBlock().isAir( w.getBlockState( pt ), w, pt ) ) { return; } diff --git a/src/main/java/appeng/block/misc/BlockQuartzTorch.java b/src/main/java/appeng/block/misc/BlockQuartzTorch.java index 7562ec3e8..86323f37c 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzTorch.java +++ b/src/main/java/appeng/block/misc/BlockQuartzTorch.java @@ -31,9 +31,9 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -56,7 +56,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I { public BlockQuartzTorch() { - super( Material.circuits ); + super( Material.CIRCUITS ); this.setFeature( EnumSet.of( AEFeature.DecorativeLights ) ); this.setLightLevel( 0.9375F ); @@ -108,7 +108,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I final double xOff = -0.3 * up.getFrontOffsetX(); final double yOff = -0.3 * up.getFrontOffsetY(); final double zOff = -0.3 * up.getFrontOffsetZ(); - return Collections.singletonList( AxisAlignedBB.fromBounds( xOff + 0.3, yOff + 0.3, zOff + 0.3, xOff + 0.7, yOff + 0.7, zOff + 0.7 ) ); + return Collections.singletonList( new AxisAlignedBB( xOff + 0.3, yOff + 0.3, zOff + 0.3, xOff + 0.7, yOff + 0.7, zOff + 0.7 ) ); } @Override @@ -122,7 +122,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I @Override @SideOnly( Side.CLIENT ) - public void randomDisplayTick( final World w, final BlockPos pos, final IBlockState state, final Random r ) + public void randomDisplayTick( final IBlockState state, final World w, final BlockPos pos, final Random r ) { if( !AEConfig.instance.enableEffects ) { @@ -150,7 +150,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I } @Override - public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) + public void neighborChanged( final IBlockState state, final World w, final BlockPos pos,final Block neighborBlock ) { final EnumFacing up = this.getOrientable( w, pos ).getUp(); if( !this.canPlaceAt( w, pos, up.getOpposite() ) ) @@ -162,6 +162,7 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I private void dropTorch( final World w, final BlockPos pos ) { w.destroyBlock( pos, true ); + //TODO 1.9.4 - markBlockForUpdate => ? w.markBlockForUpdate( pos ); } diff --git a/src/main/java/appeng/block/misc/BlockSecurity.java b/src/main/java/appeng/block/misc/BlockSecurity.java index 42a6d6467..f3e0c6d94 100644 --- a/src/main/java/appeng/block/misc/BlockSecurity.java +++ b/src/main/java/appeng/block/misc/BlockSecurity.java @@ -21,11 +21,15 @@ package appeng.block.misc; import java.util.EnumSet; +import javax.annotation.Nullable; + import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.util.AEPartLocation; @@ -43,16 +47,16 @@ public class BlockSecurity extends AEBaseTileBlock public BlockSecurity() { - super( Material.iron ); + super( Material.IRON ); this.setTileEntity( TileSecurity.class ); this.setFeature( EnumSet.of( AEFeature.Security ) ); } @Override - public EnumWorldBlockLayer getBlockLayer() + public BlockRenderLayer getBlockLayer() { - return EnumWorldBlockLayer.CUTOUT; + return BlockRenderLayer.CUTOUT; } @Override @@ -62,7 +66,7 @@ public class BlockSecurity extends AEBaseTileBlock } @Override - public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( p.isSneaking() ) { diff --git a/src/main/java/appeng/block/misc/BlockSkyCompass.java b/src/main/java/appeng/block/misc/BlockSkyCompass.java index 3295cdd04..94eb40b24 100644 --- a/src/main/java/appeng/block/misc/BlockSkyCompass.java +++ b/src/main/java/appeng/block/misc/BlockSkyCompass.java @@ -27,9 +27,9 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; @@ -45,7 +45,7 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision public BlockSkyCompass() { - super( Material.iron ); + super( Material.IRON ); this.setTileEntity( TileSkyCompass.class ); this.setOpaque( this.setFullSize( false ) ); this.lightOpacity = 0; @@ -75,7 +75,7 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision } @Override - public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) + public void neighborChanged( final IBlockState state, final World w, final BlockPos pos, final Block neighborBlock ) { final TileSkyCompass sc = this.getTileEntity( w, pos ); final EnumFacing up = sc.getForward(); @@ -88,6 +88,7 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision private void dropTorch( final World w, final BlockPos pos ) { w.destroyBlock( pos, true ); + //TODO 1.9.4 - markBlockForUpdate => ? w.markBlockForUpdate( pos ); } @@ -161,9 +162,9 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision break; } - return Collections.singletonList( AxisAlignedBB.fromBounds( minX, minY, minZ, maxX, maxY, maxZ ) ); + return Collections.singletonList( new AxisAlignedBB( minX, minY, minZ, maxX, maxY, maxZ ) ); } - return Collections.singletonList( AxisAlignedBB.fromBounds( 0.0, 0, 0.0, 1.0, 1.0, 1.0 ) ); + return Collections.singletonList( new AxisAlignedBB( 0.0, 0, 0.0, 1.0, 1.0, 1.0 ) ); } @Override diff --git a/src/main/java/appeng/block/misc/BlockTinyTNT.java b/src/main/java/appeng/block/misc/BlockTinyTNT.java index 1852a45b4..4aebee1c8 100644 --- a/src/main/java/appeng/block/misc/BlockTinyTNT.java +++ b/src/main/java/appeng/block/misc/BlockTinyTNT.java @@ -23,8 +23,11 @@ import java.util.Collections; import java.util.EnumSet; import java.util.List; +import javax.annotation.Nullable; + import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -33,9 +36,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.EntityRegistry; @@ -55,11 +60,12 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision public BlockTinyTNT() { - super( Material.tnt ); + super( Material.TNT ); this.setLightOpacity( 1 ); + //TODO 1.9.4 - setBlockBounds => ? this.setBlockBounds( 0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f ); this.setFullSize( this.setOpaque( false ) ); - this.setStepSound( soundTypeGrass ); + this.setSoundType( SoundType.GROUND ); this.setHardness( 0F ); this.setFeature( EnumSet.of( AEFeature.TinyTNT ) ); @@ -76,22 +82,22 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision public void postInit() { super.postInit(); - BlockDispenser.dispenseBehaviorRegistry.putObject( Item.getItemFromBlock( this ), new DispenserBehaviorTinyTNT() ); + BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject( Item.getItemFromBlock( this ), new DispenserBehaviorTinyTNT() ); } @Override - public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { - if( player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.flint_and_steel ) + if( heldItem != null && heldItem.getItem() == Items.FLINT_AND_STEEL ) { this.startFuse( w, pos, player ); w.setBlockToAir( pos ); - player.getCurrentEquippedItem().damageItem( 1, player ); + heldItem.damageItem( 1, player ); return true; } else { - return super.onActivated( w, pos, player, side, hitX, hitY, hitZ ); + return super.onActivated( w, pos, player, hand, heldItem, side, hitX, hitY, hitZ ); } } @@ -101,12 +107,13 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision { final EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed( w, pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, igniter ); w.spawnEntityInWorld( primedTinyTNTEntity ); + //TODO 1.9.4 - playSoundAtEntity => ? w.playSoundAtEntity( primedTinyTNTEntity, "game.tnt.primed", 1.0F, 1.0F ); } } @Override - public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) + public void neighborChanged( final IBlockState state, final World w, final BlockPos pos, final Block neighborBlock ) { if( w.isBlockIndirectlyGettingPowered( pos ) > 0 ) { @@ -128,7 +135,7 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision } @Override - public void onEntityCollidedWithBlock( final World w, final BlockPos pos, final Entity entity ) + public void onEntityWalk( final World w, final BlockPos pos, final Entity entity ) { if( entity instanceof EntityArrow && !w.isRemote ) { @@ -154,7 +161,7 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision if( !w.isRemote ) { final EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed( w, pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, exp.getExplosivePlacedBy() ); - primedTinyTNTEntity.fuse = w.rand.nextInt( primedTinyTNTEntity.fuse / 4 ) + primedTinyTNTEntity.fuse / 8; + primedTinyTNTEntity.setFuse( w.rand.nextInt( primedTinyTNTEntity.getFuse() / 4 ) + primedTinyTNTEntity.getFuse() / 8 ); w.spawnEntityInWorld( primedTinyTNTEntity ); } } @@ -162,12 +169,12 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision @Override public Iterable getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b ) { - return Collections.singletonList( AxisAlignedBB.fromBounds( 0.25, 0, 0.25, 0.75, 0.5, 0.75 ) ); + return Collections.singletonList( new AxisAlignedBB( 0.25, 0, 0.25, 0.75, 0.5, 0.75 ) ); } @Override public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List out, final Entity e ) { - out.add( AxisAlignedBB.fromBounds( 0.25, 0, 0.25, 0.75, 0.5, 0.75 ) ); + out.add( new AxisAlignedBB( 0.25, 0, 0.25, 0.75, 0.5, 0.75 ) ); } } diff --git a/src/main/java/appeng/block/misc/BlockVibrationChamber.java b/src/main/java/appeng/block/misc/BlockVibrationChamber.java index 97c1ba672..dd6ca55b5 100644 --- a/src/main/java/appeng/block/misc/BlockVibrationChamber.java +++ b/src/main/java/appeng/block/misc/BlockVibrationChamber.java @@ -22,12 +22,16 @@ package appeng.block.misc; import java.util.EnumSet; import java.util.Random; +import javax.annotation.Nullable; + import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -48,7 +52,7 @@ public final class BlockVibrationChamber extends AEBaseTileBlock public BlockVibrationChamber() { - super( Material.iron ); + super( Material.IRON ); this.setTileEntity( TileVibrationChamber.class ); this.setHardness( 4.2F ); this.setFeature( EnumSet.of( AEFeature.PowerGen ) ); @@ -69,7 +73,7 @@ public final class BlockVibrationChamber extends AEBaseTileBlock } @Override - public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( player.isSneaking() ) { @@ -88,9 +92,9 @@ public final class BlockVibrationChamber extends AEBaseTileBlock return true; } - + @Override - public void randomDisplayTick( final World w, final BlockPos pos, final IBlockState state, final Random r ) + public void randomDisplayTick( final IBlockState state, final World w, final BlockPos pos, final Random r ) { if( !AEConfig.instance.enableEffects ) { diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index a74f7b740..351227f5a 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -23,9 +23,11 @@ import java.util.EnumSet; import java.util.List; import java.util.Random; +import javax.annotation.Nullable; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.particle.EffectRenderer; +import net.minecraft.client.particle.ParticleManager; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -34,11 +36,12 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -104,7 +107,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements } @Override - public void randomDisplayTick( final World worldIn, final BlockPos pos, final IBlockState state, final Random rand ) + public void randomDisplayTick( final IBlockState state, final World worldIn, final BlockPos pos, final Random rand ) { this.cb( worldIn, pos ).randomDisplayTick( worldIn, pos, rand ); } @@ -122,7 +125,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements } @Override - public int getWeakPower( final IBlockAccess w, final BlockPos pos, final IBlockState state, final EnumFacing side ) + public int getWeakPower( final IBlockState state, final IBlockAccess w, final BlockPos pos, final EnumFacing side ) { return this.cb( w, pos ).isProvidingWeakPower( side.getOpposite() ); // TODO: // IS @@ -130,7 +133,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements } @Override - public boolean canProvidePower() + public boolean canProvidePower( final IBlockState state ) { return true; } @@ -142,7 +145,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements } @Override - public int getStrongPower( final IBlockAccess w, final BlockPos pos, final IBlockState state, final EnumFacing side ) + public int getStrongPower( final IBlockState state, final IBlockAccess w, final BlockPos pos, final EnumFacing side ) { return this.cb( w, pos ).isProvidingStrongPower( side.getOpposite() ); // TODO: // IS @@ -150,14 +153,13 @@ public class BlockCableBus extends AEBaseTileBlock // implements } @Override - public int getLightValue( final IBlockAccess world, final BlockPos pos ) + public int getLightValue( final IBlockState state, final IBlockAccess world, final BlockPos pos ) { - final IBlockState block = world.getBlockState( pos ); - if( block != null && block.getBlock() != this ) + if( state != null && state.getBlock() != this ) { - return block.getBlock().getLightValue( world, pos ); + return state.getBlock().getLightValue( state, world, pos ); } - if( block == null ) + if( state == null ) { return 0; } @@ -165,25 +167,25 @@ public class BlockCableBus extends AEBaseTileBlock // implements } @Override - public boolean isLadder( final IBlockAccess world, final BlockPos pos, final EntityLivingBase entity ) + public boolean isLadder( final IBlockState state, final IBlockAccess world, final BlockPos pos, final EntityLivingBase entity ) { return this.cb( world, pos ).isLadder( entity ); } @Override - public boolean isSideSolid( final IBlockAccess w, final BlockPos pos, final EnumFacing side ) + public boolean isSideSolid( final IBlockState state, final IBlockAccess w, final BlockPos pos, final EnumFacing side ) { return this.cb( w, pos ).isSolidOnSide( side ); } @Override - public boolean isReplaceable( final World w, final BlockPos pos ) + public boolean isReplaceable( final IBlockAccess w, final BlockPos pos ) { return this.cb( w, pos ).isEmpty(); } @Override - public boolean removedByPlayer( final World world, final BlockPos pos, final EntityPlayer player, final boolean willHarvest ) + public boolean removedByPlayer( final IBlockState state, final World world, final BlockPos pos, final EntityPlayer player, final boolean willHarvest ) { if( player.capabilities.isCreativeMode ) { @@ -194,11 +196,11 @@ public class BlockCableBus extends AEBaseTileBlock // implements } // maybe ray trace? } - return super.removedByPlayer( world, pos, player, willHarvest ); + return super.removedByPlayer( state, world, pos, player, willHarvest ); } @Override - public boolean canConnectRedstone( final IBlockAccess w, final BlockPos pos, EnumFacing side ) + public boolean canConnectRedstone( final IBlockState state, final IBlockAccess w, final BlockPos pos, EnumFacing side ) { if( side == null ) { @@ -209,20 +211,20 @@ public class BlockCableBus extends AEBaseTileBlock // implements } @Override - public boolean canRenderInLayer( final EnumWorldBlockLayer layer ) + public boolean canRenderInLayer( final BlockRenderLayer layer ) { if( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) ) { - return layer == EnumWorldBlockLayer.CUTOUT || layer == EnumWorldBlockLayer.TRANSLUCENT; + return layer == BlockRenderLayer.CUTOUT || layer == BlockRenderLayer.TRANSLUCENT; } - return layer == EnumWorldBlockLayer.CUTOUT; + return layer == BlockRenderLayer.CUTOUT; } @Override - public ItemStack getPickBlock( final MovingObjectPosition target, final World world, final BlockPos pos ) + public ItemStack getPickBlock( final IBlockState state, final RayTraceResult target, final World world, final BlockPos pos, final EntityPlayer player ) { - final Vec3 v3 = target.hitVec.subtract( pos.getX(), pos.getY(), pos.getZ() ); + final Vec3d v3 = target.hitVec.subtract( pos.getX(), pos.getY(), pos.getZ() ); final SelectedPart sp = this.cb( world, pos ).selectPart( v3 ); if( sp.part != null ) @@ -236,10 +238,10 @@ public class BlockCableBus extends AEBaseTileBlock // implements return null; } - + @Override @SideOnly( Side.CLIENT ) - public boolean addHitEffects( final World world, final MovingObjectPosition target, final EffectRenderer effectRenderer ) + public boolean addHitEffects( final IBlockState state, final World world, final RayTraceResult target, final ParticleManager effectRenderer ) { final Object object = this.cb( world, target.getBlockPos() ); if( object instanceof IPartHost ) @@ -270,7 +272,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements } @Override - public boolean addDestroyEffects( final World world, final BlockPos pos, final EffectRenderer effectRenderer ) + public boolean addDestroyEffects( final World world, final BlockPos pos, final ParticleManager effectRenderer ) { final Object object = this.cb( world, pos ); if( object instanceof IPartHost ) @@ -296,7 +298,7 @@ public class BlockCableBus extends AEBaseTileBlock // implements } @Override - public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) + public void neighborChanged( final IBlockState state, final World w, final BlockPos pos, final Block neighborBlock ) { if( Platform.isServer() ) { @@ -328,9 +330,9 @@ public class BlockCableBus extends AEBaseTileBlock // implements } @Override - public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { - return this.cb( w, pos ).activate( player, new Vec3( hitX, hitY, hitZ ) ); + return this.cb( w, pos ).activate( player, new Vec3d( hitX, hitY, hitZ ) ); } @Override diff --git a/src/main/java/appeng/block/networking/BlockController.java b/src/main/java/appeng/block/networking/BlockController.java index 760459ddf..3c5e96db6 100644 --- a/src/main/java/appeng/block/networking/BlockController.java +++ b/src/main/java/appeng/block/networking/BlockController.java @@ -26,9 +26,9 @@ import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; @@ -74,21 +74,21 @@ public class BlockController extends AEBaseTileBlock } @Override - public EnumWorldBlockLayer getBlockLayer() + public BlockRenderLayer getBlockLayer() { - return EnumWorldBlockLayer.CUTOUT; + return BlockRenderLayer.CUTOUT; } public BlockController() { - super( Material.iron ); + super( Material.IRON ); this.setTileEntity( TileController.class ); this.setHardness( 6 ); this.setFeature( EnumSet.of( AEFeature.Channels ) ); } @Override - public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) + public void neighborChanged( final IBlockState state, final World w, final BlockPos pos, final Block neighborBlock ) { final TileController tc = this.getTileEntity( w, pos ); if( tc != null ) diff --git a/src/main/java/appeng/block/networking/BlockEnergyAcceptor.java b/src/main/java/appeng/block/networking/BlockEnergyAcceptor.java index f5e9aec3f..2aebd20e9 100644 --- a/src/main/java/appeng/block/networking/BlockEnergyAcceptor.java +++ b/src/main/java/appeng/block/networking/BlockEnergyAcceptor.java @@ -33,7 +33,7 @@ public class BlockEnergyAcceptor extends AEBaseTileBlock public BlockEnergyAcceptor() { - super( Material.iron ); + super( Material.IRON ); this.setTileEntity( TileEnergyAcceptor.class ); this.setFeature( EnumSet.of( AEFeature.Core ) ); } diff --git a/src/main/java/appeng/block/networking/BlockWireless.java b/src/main/java/appeng/block/networking/BlockWireless.java index 7c609aa25..0a75416a3 100644 --- a/src/main/java/appeng/block/networking/BlockWireless.java +++ b/src/main/java/appeng/block/networking/BlockWireless.java @@ -23,13 +23,17 @@ import java.util.Collections; import java.util.EnumSet; import java.util.List; +import javax.annotation.Nullable; + import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.util.AEPartLocation; @@ -64,13 +68,13 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision } @Override - public EnumWorldBlockLayer getBlockLayer() + public BlockRenderLayer getBlockLayer() { - return EnumWorldBlockLayer.CUTOUT; + return BlockRenderLayer.CUTOUT; } @Override - public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( player.isSneaking() ) { @@ -146,9 +150,9 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision break; } - return Collections.singletonList( AxisAlignedBB.fromBounds( minX, minY, minZ, maxX, maxY, maxZ ) ); + return Collections.singletonList( new AxisAlignedBB( minX, minY, minZ, maxX, maxY, maxZ ) ); } - return Collections.singletonList( AxisAlignedBB.fromBounds( 0.0, 0, 0.0, 1.0, 1.0, 1.0 ) ); + return Collections.singletonList( new AxisAlignedBB( 0.0, 0, 0.0, 1.0, 1.0, 1.0 ) ); } @Override @@ -208,11 +212,11 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision break; } - out.add( AxisAlignedBB.fromBounds( minX, minY, minZ, maxX, maxY, maxZ ) ); + out.add( new AxisAlignedBB( minX, minY, minZ, maxX, maxY, maxZ ) ); } else { - out.add( AxisAlignedBB.fromBounds( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) ); + out.add( new AxisAlignedBB( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) ); } } } diff --git a/src/main/java/appeng/block/qnb/BlockQuantumBase.java b/src/main/java/appeng/block/qnb/BlockQuantumBase.java index ae72254ab..7f3c29416 100644 --- a/src/main/java/appeng/block/qnb/BlockQuantumBase.java +++ b/src/main/java/appeng/block/qnb/BlockQuantumBase.java @@ -24,8 +24,8 @@ import java.util.EnumSet; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; @@ -43,6 +43,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto super( mat ); this.setTileEntity( TileQuantumBridge.class ); final float shave = 2.0f / 16.0f; + //TODO 1.9.4 - setBlockBounds => ? this.setBlockBounds( shave, shave, shave, 1.0f - shave, 1.0f - shave, 1.0f - shave ); this.setLightOpacity( 0 ); this.setFullSize( this.setOpaque( false ) ); @@ -50,13 +51,13 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto } @Override - public EnumWorldBlockLayer getBlockLayer() + public BlockRenderLayer getBlockLayer() { - return EnumWorldBlockLayer.CUTOUT; + return BlockRenderLayer.CUTOUT; } @Override - public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) + public void neighborChanged( final IBlockState state, final World w, final BlockPos pos, final Block neighborBlock ) { final TileQuantumBridge bridge = this.getTileEntity( w, pos ); if( bridge != null ) diff --git a/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java b/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java index 505dd86da..76a0c347d 100644 --- a/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java +++ b/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java @@ -23,12 +23,16 @@ import java.util.Collections; import java.util.List; import java.util.Random; +import javax.annotation.Nullable; + import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.util.AEPartLocation; @@ -49,7 +53,7 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase } @Override - public void randomDisplayTick( final World w, final BlockPos pos, final IBlockState state, final Random rand ) + public void randomDisplayTick( final IBlockState state, final World w, final BlockPos pos, final Random rand ) { final TileQuantumBridge bridge = this.getTileEntity( w, pos ); if( bridge != null ) @@ -65,7 +69,7 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase } @Override - public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( p.isSneaking() ) { @@ -88,13 +92,13 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase public Iterable getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b ) { final double onePixel = 2.0 / 16.0; - return Collections.singletonList( AxisAlignedBB.fromBounds( onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel ) ); + return Collections.singletonList( new AxisAlignedBB( onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel ) ); } @Override public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List out, final Entity e ) { final double onePixel = 2.0 / 16.0; - out.add( AxisAlignedBB.fromBounds( onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel ) ); + out.add( new AxisAlignedBB( onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel ) ); } } diff --git a/src/main/java/appeng/block/qnb/BlockQuantumRing.java b/src/main/java/appeng/block/qnb/BlockQuantumRing.java index 564573936..636a41b91 100644 --- a/src/main/java/appeng/block/qnb/BlockQuantumRing.java +++ b/src/main/java/appeng/block/qnb/BlockQuantumRing.java @@ -24,8 +24,8 @@ import java.util.List; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.tile.qnb.TileQuantumBridge; @@ -36,7 +36,7 @@ public class BlockQuantumRing extends BlockQuantumBase public BlockQuantumRing() { - super( Material.iron ); + super( Material.IRON ); } @Override @@ -52,7 +52,7 @@ public class BlockQuantumRing extends BlockQuantumBase { onePixel = 1.0 / 16.0; } - return Collections.singletonList( AxisAlignedBB.fromBounds( onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel ) ); + return Collections.singletonList( new AxisAlignedBB( onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel ) ); } @Override @@ -68,6 +68,6 @@ public class BlockQuantumRing extends BlockQuantumBase { onePixel = 1.0 / 16.0; } - out.add( AxisAlignedBB.fromBounds( onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel ) ); + out.add( new AxisAlignedBB( onePixel, onePixel, onePixel, 1.0 - onePixel, 1.0 - onePixel, 1.0 - onePixel ) ); } } diff --git a/src/main/java/appeng/block/spatial/BlockMatrixFrame.java b/src/main/java/appeng/block/spatial/BlockMatrixFrame.java index 80a69e170..b0387d928 100644 --- a/src/main/java/appeng/block/spatial/BlockMatrixFrame.java +++ b/src/main/java/appeng/block/spatial/BlockMatrixFrame.java @@ -24,12 +24,13 @@ import java.util.EnumSet; import java.util.List; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -48,7 +49,7 @@ public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision public BlockMatrixFrame() { - super( Material.anvil ); + super( Material.ANVIL ); this.setResistance( 6000000.0F ); this.setBlockUnbreakable(); this.setLightOpacity( 0 ); @@ -79,7 +80,7 @@ public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision @Override public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List out, final Entity e ) { - out.add( AxisAlignedBB.fromBounds( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) ); + out.add( new AxisAlignedBB( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) ); } @Override @@ -95,7 +96,7 @@ public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision } @Override - public boolean canEntityDestroy( final IBlockAccess world, final BlockPos pos, final Entity entity ) + public boolean canEntityDestroy( final IBlockState state, final IBlockAccess world, final BlockPos pos, final Entity entity ) { return false; } diff --git a/src/main/java/appeng/block/spatial/BlockSpatialIOPort.java b/src/main/java/appeng/block/spatial/BlockSpatialIOPort.java index 1f7f42fa4..49e75791d 100644 --- a/src/main/java/appeng/block/spatial/BlockSpatialIOPort.java +++ b/src/main/java/appeng/block/spatial/BlockSpatialIOPort.java @@ -21,12 +21,16 @@ package appeng.block.spatial; import java.util.EnumSet; +import javax.annotation.Nullable; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.util.AEPartLocation; @@ -42,13 +46,13 @@ public class BlockSpatialIOPort extends AEBaseTileBlock public BlockSpatialIOPort() { - super( Material.iron ); + super( Material.IRON ); this.setTileEntity( TileSpatialIOPort.class ); this.setFeature( EnumSet.of( AEFeature.SpatialIO ) ); } @Override - public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) + public void neighborChanged( final IBlockState state, final World w, final BlockPos pos, final Block neighborBlock ) { final TileSpatialIOPort te = this.getTileEntity( w, pos ); if( te != null ) @@ -58,7 +62,7 @@ public class BlockSpatialIOPort extends AEBaseTileBlock } @Override - public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( p.isSneaking() ) { diff --git a/src/main/java/appeng/block/spatial/BlockSpatialPylon.java b/src/main/java/appeng/block/spatial/BlockSpatialPylon.java index 76904f7e1..16f1eb6b1 100644 --- a/src/main/java/appeng/block/spatial/BlockSpatialPylon.java +++ b/src/main/java/appeng/block/spatial/BlockSpatialPylon.java @@ -23,7 +23,7 @@ import java.util.EnumSet; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -46,24 +46,24 @@ public class BlockSpatialPylon extends AEBaseTileBlock } @Override - public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) + public void neighborChanged( final IBlockState state, final World w, final BlockPos pos, final Block neighborBlock ) { final TileSpatialPylon tsp = this.getTileEntity( w, pos ); if( tsp != null ) { - tsp.onNeighborBlockChange(); + tsp.neighborChanged(); } } @Override - public int getLightValue( final IBlockAccess w, final BlockPos pos ) + public int getLightValue( final IBlockState state, final IBlockAccess w, final BlockPos pos ) { final TileSpatialPylon tsp = this.getTileEntity( w, pos ); if( tsp != null ) { return tsp.getLightValue(); } - return super.getLightValue( w, pos ); + return super.getLightValue( state, w, pos ); } @Override diff --git a/src/main/java/appeng/block/storage/BlockChest.java b/src/main/java/appeng/block/storage/BlockChest.java index c4436b5c4..3518e0703 100644 --- a/src/main/java/appeng/block/storage/BlockChest.java +++ b/src/main/java/appeng/block/storage/BlockChest.java @@ -21,12 +21,15 @@ package appeng.block.storage; import java.util.EnumSet; +import javax.annotation.Nullable; + import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.AEApi; @@ -47,15 +50,15 @@ public class BlockChest extends AEBaseTileBlock public BlockChest() { - super( Material.iron ); + super( Material.IRON ); this.setTileEntity( TileChest.class ); this.setFeature( EnumSet.of( AEFeature.StorageCells, AEFeature.MEChest ) ); } @Override - public EnumWorldBlockLayer getBlockLayer() + public BlockRenderLayer getBlockLayer() { - return EnumWorldBlockLayer.CUTOUT; + return BlockRenderLayer.CUTOUT; } @Override @@ -65,7 +68,7 @@ public class BlockChest extends AEBaseTileBlock } @Override - public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { final TileChest tg = this.getTileEntity( w, pos ); if( tg != null && !p.isSneaking() ) diff --git a/src/main/java/appeng/block/storage/BlockDrive.java b/src/main/java/appeng/block/storage/BlockDrive.java index 716543ac5..b0eaa1d98 100644 --- a/src/main/java/appeng/block/storage/BlockDrive.java +++ b/src/main/java/appeng/block/storage/BlockDrive.java @@ -21,11 +21,15 @@ package appeng.block.storage; import java.util.EnumSet; +import javax.annotation.Nullable; + import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.util.AEPartLocation; @@ -43,15 +47,15 @@ public class BlockDrive extends AEBaseTileBlock public BlockDrive() { - super( Material.iron ); + super( Material.IRON ); this.setTileEntity( TileDrive.class ); this.setFeature( EnumSet.of( AEFeature.StorageCells, AEFeature.MEDrive ) ); } @Override - public EnumWorldBlockLayer getBlockLayer() + public BlockRenderLayer getBlockLayer() { - return EnumWorldBlockLayer.CUTOUT; + return BlockRenderLayer.CUTOUT; } @Override @@ -61,7 +65,7 @@ public class BlockDrive extends AEBaseTileBlock } @Override - public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( p.isSneaking() ) { diff --git a/src/main/java/appeng/block/storage/BlockIOPort.java b/src/main/java/appeng/block/storage/BlockIOPort.java index 171990bd8..671d4db00 100644 --- a/src/main/java/appeng/block/storage/BlockIOPort.java +++ b/src/main/java/appeng/block/storage/BlockIOPort.java @@ -21,12 +21,16 @@ package appeng.block.storage; import java.util.EnumSet; +import javax.annotation.Nullable; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.util.AEPartLocation; @@ -42,13 +46,13 @@ public class BlockIOPort extends AEBaseTileBlock public BlockIOPort() { - super( Material.iron ); + super( Material.IRON ); this.setTileEntity( TileIOPort.class ); this.setFeature( EnumSet.of( AEFeature.StorageCells, AEFeature.IOPort ) ); } @Override - public void onNeighborBlockChange( final World w, final BlockPos pos, final IBlockState state, final Block neighborBlock ) + public void neighborChanged( final IBlockState state, final World w, final BlockPos pos, final Block neighborBlock ) { final TileIOPort te = this.getTileEntity( w, pos ); if( te != null ) @@ -58,7 +62,7 @@ public class BlockIOPort extends AEBaseTileBlock } @Override - public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( p.isSneaking() ) { diff --git a/src/main/java/appeng/block/storage/BlockSkyChest.java b/src/main/java/appeng/block/storage/BlockSkyChest.java index efbc0bdc7..99ef4fd03 100644 --- a/src/main/java/appeng/block/storage/BlockSkyChest.java +++ b/src/main/java/appeng/block/storage/BlockSkyChest.java @@ -23,14 +23,18 @@ import java.util.Collections; import java.util.EnumSet; import java.util.List; +import javax.annotation.Nullable; + import com.google.common.base.Optional; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.util.AEPartLocation; @@ -56,7 +60,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision public BlockSkyChest( final SkyChestType type ) { - super( Material.rock, Optional.of( type.name() ) ); + super( Material.ROCK, Optional.of( type.name() ) ); this.setTileEntity( TileSkyChest.class ); this.setOpaque( this.setFullSize( false ) ); this.lightOpacity = 0; @@ -74,7 +78,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision } @Override - public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( Platform.isServer() ) { @@ -100,12 +104,12 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision final double offsetZ = o.getFrontOffsetZ() == 0 ? 0.06 : 0.0; final double sc = 0.06; - return Collections.singletonList( AxisAlignedBB.fromBounds( Math.max( 0.0, offsetX - o.getFrontOffsetX() * sc ), Math.max( 0.0, offsetY - o.getFrontOffsetY() * sc ), Math.max( 0.0, offsetZ - o.getFrontOffsetZ() * sc ), Math.min( 1.0, ( 1.0 - offsetX ) - o.getFrontOffsetX() * sc ), Math.min( 1.0, ( 1.0 - offsetY ) - o.getFrontOffsetY() * sc ), Math.min( 1.0, ( 1.0 - offsetZ ) - o.getFrontOffsetZ() * sc ) ) ); + return Collections.singletonList( new AxisAlignedBB( Math.max( 0.0, offsetX - o.getFrontOffsetX() * sc ), Math.max( 0.0, offsetY - o.getFrontOffsetY() * sc ), Math.max( 0.0, offsetZ - o.getFrontOffsetZ() * sc ), Math.min( 1.0, ( 1.0 - offsetX ) - o.getFrontOffsetX() * sc ), Math.min( 1.0, ( 1.0 - offsetY ) - o.getFrontOffsetY() * sc ), Math.min( 1.0, ( 1.0 - offsetZ ) - o.getFrontOffsetZ() * sc ) ) ); } @Override public void addCollidingBlockToList( final World w, final BlockPos pos, final AxisAlignedBB bb, final List out, final Entity e ) { - out.add( AxisAlignedBB.fromBounds( 0.05, 0.05, 0.05, 0.95, 0.95, 0.95 ) ); + out.add( new AxisAlignedBB( 0.05, 0.05, 0.05, 0.95, 0.95, 0.95 ) ); } } diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index db2837a17..11741c2bd 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -33,19 +33,20 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.ItemModelMesher; +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.resources.model.ModelBakery; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.MouseEvent; @@ -55,7 +56,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.common.registry.GameRegistry.UniqueIdentifier; import appeng.api.parts.CableRenderMode; import appeng.api.parts.IPartItem; @@ -200,7 +200,7 @@ public class ClientHelper extends ServerHelper this.spawnLightning( worldObj, posX, posY, posZ ); return; case LightningArc: - this.spawnLightningArc( worldObj, posX, posY, posZ, (Vec3) o ); + this.spawnLightningArc( worldObj, posX, posY, posZ, (Vec3d) o ); return; default: } @@ -223,7 +223,7 @@ public class ClientHelper extends ServerHelper } @Override - public MovingObjectPosition getMOP() + public RayTraceResult getRTR() { return Minecraft.getMinecraft().objectMouseOver; } @@ -311,7 +311,7 @@ public class ClientHelper extends ServerHelper final String MODID = AppEng.MOD_ID + ":"; for( final List reg : this.iconRegistrations.values() ) { - final String[] names = new String[reg.size()]; + final ResourceLocation[] names = new ResourceLocation[reg.size()]; Item it = null; @@ -325,10 +325,10 @@ public class ClientHelper extends ServerHelper mesher.register( (Item) r.item, r.meta, r.loc ); } - names[offset++] = MODID + r.name; + names[offset++] = new ResourceLocation( MODID, r.name ); } - ModelBakery.addVariantName( it, names ); + ModelBakery.registerItemVariants( it, names ); } } @@ -409,7 +409,7 @@ public class ClientHelper extends ServerHelper @SubscribeEvent public void postPlayerRender( final RenderLivingEvent.Pre p ) { - final PlayerColor player = TickHandler.INSTANCE.getPlayerColors().get( p.entity.getEntityId() ); + final PlayerColor player = TickHandler.INSTANCE.getPlayerColors().get( p.getEntity().getEntityId() ); if( player != null ) { final AEColor col = player.myColor; @@ -448,11 +448,11 @@ public class ClientHelper extends ServerHelper final float y = (float) ( ( ( Platform.getRandomInt() % 100 ) * 0.01 ) - 0.5 ) * 0.7f; final float z = (float) ( ( ( Platform.getRandomInt() % 100 ) * 0.01 ) - 0.5 ) * 0.7f; - final CraftingFx fx = new CraftingFx( w, posX + x, posY + y, posZ + z, Items.diamond ); + final CraftingFx fx = new CraftingFx( w, posX + x, posY + y, posZ + z, Items.DIAMOND ); - fx.motionX = -x * 0.2; - fx.motionY = -y * 0.2; - fx.motionZ = -z * 0.2; + fx.setMotionX( -x * 0.2f ); + fx.setMotionY( -y * 0.2f ); + fx.setMotionZ( -z * 0.2f ); Minecraft.getMinecraft().effectRenderer.addEffect( fx ); } @@ -463,11 +463,11 @@ public class ClientHelper extends ServerHelper final float y = (float) ( ( ( Platform.getRandomInt() % 100 ) * 0.01 ) - 0.5 ) * 0.7f; final float z = (float) ( ( ( Platform.getRandomInt() % 100 ) * 0.01 ) - 0.5 ) * 0.7f; - final EnergyFx fx = new EnergyFx( w, posX + x, posY + y, posZ + z, Items.diamond ); + final EnergyFx fx = new EnergyFx( w, posX + x, posY + y, posZ + z, Items.DIAMOND ); - fx.motionX = -x * 0.1; - fx.motionY = -y * 0.1; - fx.motionZ = -z * 0.1; + fx.setMotionX( -x * 0.1f ); + fx.setMotionY( -y * 0.1f ); + fx.setMotionZ( -z * 0.1f ); Minecraft.getMinecraft().effectRenderer.addEffect( fx ); } @@ -478,7 +478,7 @@ public class ClientHelper extends ServerHelper Minecraft.getMinecraft().effectRenderer.addEffect( fx ); } - private void spawnLightningArc( final World worldObj, final double posX, final double posY, final double posZ, final Vec3 second ) + private void spawnLightningArc( final World worldObj, final double posX, final double posY, final double posZ, final Vec3d second ) { final LightningFX fx = new LightningArcFX( worldObj, posX, posY, posZ, second.xCoord, second.yCoord, second.zCoord, 0.0f, 0.0f, 0.0f ); Minecraft.getMinecraft().effectRenderer.addEffect( fx ); @@ -489,14 +489,15 @@ public class ClientHelper extends ServerHelper { // inventory renderer final SmartModel buses = new SmartModel( new BlockRenderInfo( ( new RendererCableBus() ) ) ); - event.modelRegistry.putObject( this.partRenderer, buses ); + event.getModelRegistry().putObject( this.partRenderer, buses ); for( final IconReg reg : this.iconTmp ) { if( reg.item instanceof IPartItem || reg.item instanceof IFacadeItem ) { + //TODO 1.9.4 - UniqueIdentifier => ? final UniqueIdentifier i = GameRegistry.findUniqueIdentifierFor( (Item) reg.item ); - event.modelRegistry.putObject( new ModelResourceLocation( new ResourceLocation( i.modId, i.name ), "inventory" ), buses ); + event.getModelRegistry().putObject( new ModelResourceLocation( new ResourceLocation( i.modId, i.name ), "inventory" ), buses ); } if( reg.item instanceof AEBaseBlock ) @@ -508,13 +509,13 @@ public class ClientHelper extends ServerHelper } final SmartModel sm = new SmartModel( renderer ); - event.modelRegistry.putObject( renderer.getRendererInstance().getResourcePath(), sm ); + event.getModelRegistry().putObject( renderer.getRendererInstance().getResourcePath(), sm ); final Map data = new DefaultStateMapper().putStateModelLocations( (Block) reg.item ); for( final Object Loc : data.values() ) { final ModelResourceLocation res = (ModelResourceLocation) Loc; - event.modelRegistry.putObject( res, sm ); + event.getModelRegistry().putObject( res, sm ); } } } @@ -523,20 +524,21 @@ public class ClientHelper extends ServerHelper @SubscribeEvent public void wheelEvent( final MouseEvent me ) { - if( me.isCanceled() || me.dwheel == 0 ) + if( me.isCanceled() || me.getDwheel() == 0 ) { return; } final Minecraft mc = Minecraft.getMinecraft(); final EntityPlayer player = mc.thePlayer; - final ItemStack is = player.getHeldItem(); + //TODO 1.9.4 - 2 hands. Just do something! + final ItemStack is = player.getItemStackFromSlot( EntityEquipmentSlot.MAINHAND ); if( is != null && is.getItem() instanceof IMouseWheelItem && player.isSneaking() ) { try { - NetworkHandler.instance.sendToServer( new PacketValueConfig( "Item", me.dwheel > 0 ? "WheelUp" : "WheelDown" ) ); + NetworkHandler.instance.sendToServer( new PacketValueConfig( "Item", me.getDwheel() > 0 ? "WheelUp" : "WheelDown" ) ); me.setCanceled( true ); } catch( final IOException e ) @@ -553,7 +555,7 @@ public class ClientHelper extends ServerHelper { if( reg.item instanceof AEBaseItem ) { - ( (AEBaseItem) reg.item ).registerCustomIcon( ev.map ); + ( (AEBaseItem) reg.item ).registerCustomIcon( ev.getMap() ); } else if( reg.item instanceof AEBaseBlock ) { @@ -563,17 +565,17 @@ public class ClientHelper extends ServerHelper continue; } - ( (AEBaseBlock) reg.item ).registerBlockIcons( ev.map, reg.name ); + ( (AEBaseBlock) reg.item ).registerBlockIcons( ev.getMap(), reg.name ); } } - this.extraIcons.forEach( ev.map::registerSprite ); + this.extraIcons.forEach( ev.getMap()::registerSprite ); // if( ev.map.getTextureType() == ITEM_RENDERER ) { for( final ExtraItemTextures et : ExtraItemTextures.values() ) { - et.registerIcon( ev.map ); + et.registerIcon( ev.getMap() ); } } @@ -581,12 +583,12 @@ public class ClientHelper extends ServerHelper { for( final ExtraBlockTextures et : ExtraBlockTextures.values() ) { - et.registerIcon( ev.map ); + et.registerIcon( ev.getMap() ); } for( final CableBusTextures cb : CableBusTextures.values() ) { - cb.registerIcon( ev.map ); + cb.registerIcon( ev.getMap() ); } } } diff --git a/src/main/java/appeng/client/SmartModel.java b/src/main/java/appeng/client/SmartModel.java index 66359834e..16058913d 100644 --- a/src/main/java/appeng/client/SmartModel.java +++ b/src/main/java/appeng/client/SmartModel.java @@ -2,20 +2,23 @@ package appeng.client; -import java.util.Collections; import java.util.List; +import com.google.common.collect.Lists; + import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.client.model.ISmartBlockModel; -import net.minecraftforge.client.model.ISmartItemModel; +import net.minecraft.world.World; import net.minecraftforge.common.property.IExtendedBlockState; import appeng.api.util.AEPartLocation; @@ -27,7 +30,7 @@ import appeng.client.texture.MissingIcon; // net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer -public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemModel +public class SmartModel implements IBakedModel { private final BlockRenderInfo aeRenderer; @@ -37,18 +40,6 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode this.aeRenderer = rendererInstance; } - @Override - public List getFaceQuads( final EnumFacing p_177551_1_ ) - { - return Collections.emptyList(); - } - - @Override - public List getGeneralQuads() - { - return Collections.emptyList(); - } - @Override public boolean isAmbientOcclusion() { @@ -80,18 +71,7 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode } @Override - public IBakedModel handleItemState( final ItemStack stack ) - { - final ModelGenerator helper = new BakingModelGenerator(); - final Block blk = Block.getBlockFromItem( stack.getItem() ); - helper.setRenderBoundsFromBlock( blk ); - this.aeRenderer.getRendererInstance().renderInventory( blk instanceof AEBaseBlock ? (AEBaseBlock) blk : null, stack, helper, ItemRenderType.INVENTORY, null ); - helper.finalizeModel( true ); - return helper.getOutput(); - } - - @Override - public IBakedModel handleBlockState( final IBlockState state ) + public List getQuads( IBlockState state, EnumFacing side, long rand ) { final ModelGenerator helper = new BakingModelGenerator(); final Block blk = state.getBlock(); @@ -102,7 +82,26 @@ public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemMode helper.setBlockAccess( world ); this.aeRenderer.getRendererInstance().renderInWorld( blk instanceof AEBaseBlock ? (AEBaseBlock) blk : null, world, pos, helper ); helper.finalizeModel( false ); - return helper.getOutput(); + return helper.getOutput().getQuads( state, side, rand ); + } + + @Override + public ItemOverrideList getOverrides() + { + return new ItemOverrideList( Lists.newArrayList() ){ + + @Override + public IBakedModel handleItemState( IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity ) + { + final ModelGenerator helper = new BakingModelGenerator(); + final Block blk = Block.getBlockFromItem( stack.getItem() ); + helper.setRenderBoundsFromBlock( blk ); + aeRenderer.getRendererInstance().renderInventory( blk instanceof AEBaseBlock ? (AEBaseBlock) blk : null, stack, helper, ItemRenderType.INVENTORY, null ); + helper.finalizeModel( true ); + return helper.getOutput(); + } + + }; } } diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java index 028c12c88..caa619a94 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseGui.java @@ -42,11 +42,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; -import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ClickType; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -380,14 +381,15 @@ public abstract class AEBaseGui extends GuiContainer } } + //TODO 1.9.4 - Whole ClickType thing and 1.8.9 conversion, to be checked @Override - protected void handleMouseClick( final Slot slot, final int slotIdx, final int ctrlDown, final int key ) + protected void handleMouseClick( final Slot slot, final int slotIdx, final int key, final ClickType clickType ) { final EntityPlayer player = Minecraft.getMinecraft().thePlayer; if( slot instanceof SlotFake ) { - final InventoryAction action = ctrlDown == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN; + final InventoryAction action = isCtrlKeyDown() ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN; if( this.drag_click.size() > 1 ) { @@ -430,7 +432,7 @@ public abstract class AEBaseGui extends GuiContainer } else { - action = ctrlDown == 1 ? InventoryAction.CRAFT_STACK : InventoryAction.CRAFT_ITEM; + action = isCtrlKeyDown() ? InventoryAction.CRAFT_STACK : InventoryAction.CRAFT_ITEM; } final PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 ); @@ -470,10 +472,10 @@ public abstract class AEBaseGui extends GuiContainer switch( key ) { case 0: // pickup / set-down. - action = ctrlDown == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN; + action = isCtrlKeyDown() ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN; break; case 1: - action = ctrlDown == 1 ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK; + action = isCtrlKeyDown() ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK; break; case 3: // creative dupe: @@ -507,7 +509,7 @@ public abstract class AEBaseGui extends GuiContainer switch( key ) { case 0: // pickup / set-down. - action = ctrlDown == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN; + action = isCtrlKeyDown() ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN; stack = ( (SlotME) slot ).getAEStack(); if( stack != null && action == InventoryAction.PICKUP_OR_SET_DOWN && stack.getStackSize() == 0 && player.inventory.getItemStack() == null ) @@ -517,7 +519,7 @@ public abstract class AEBaseGui extends GuiContainer break; case 1: - action = ctrlDown == 1 ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK; + action = isCtrlKeyDown() ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK; stack = ( (SlotME) slot ).getAEStack(); break; @@ -580,7 +582,7 @@ public abstract class AEBaseGui extends GuiContainer { if( inventorySlot != null && inventorySlot.canTakeStack( this.mc.thePlayer ) && inventorySlot.getHasStack() && inventorySlot.inventory == slot.inventory && Container.canAddItemToSlot( inventorySlot, this.dbl_whichItem, true ) ) { - this.handleMouseClick( inventorySlot, inventorySlot.slotNumber, ctrlDown, 1 ); + this.handleMouseClick( inventorySlot, inventorySlot.slotNumber, 1, clickType ); } } } @@ -588,7 +590,7 @@ public abstract class AEBaseGui extends GuiContainer this.disableShiftClick = false; } - super.handleMouseClick( slot, slotIdx, ctrlDown, key ); + super.handleMouseClick( slot, slotIdx, key, clickType ); } @Override @@ -625,7 +627,7 @@ public abstract class AEBaseGui extends GuiContainer if( theSlot.getSlotStackLimit() == 64 ) { - this.handleMouseClick( theSlot, theSlot.slotNumber, j, 2 ); + this.handleMouseClick( theSlot, theSlot.slotNumber, j, ClickType.SWAP ); return true; } else @@ -816,18 +818,18 @@ public abstract class AEBaseGui extends GuiContainer final float par4 = uv_y * 16; final Tessellator tessellator = Tessellator.getInstance(); - final WorldRenderer worldrenderer = tessellator.getWorldRenderer(); + final VertexBuffer VertexBuffer = tessellator.getBuffer(); - worldrenderer.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM ); + VertexBuffer.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM ); ; final float f1 = 0.00390625F; final float f = 0.00390625F; final float par6 = 16; - worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + 0, par2 + par6, this.zLevel ).tex( ( par3 + 0 ) * f, ( par4 + par6 ) * f1 ).endVertex(); + VertexBuffer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + 0, par2 + par6, this.zLevel ).tex( ( par3 + 0 ) * f, ( par4 + par6 ) * f1 ).endVertex(); final float par5 = 16; - worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + par5, par2 + par6, this.zLevel ).tex( ( par3 + par5 ) * f, ( par4 + par6 ) * f1 ).endVertex(); - worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + par5, par2 + 0, this.zLevel ).tex( ( par3 + par5 ) * f, ( par4 + 0 ) * f1 ).endVertex(); - worldrenderer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + 0, par2 + 0, this.zLevel ).tex( ( par3 + 0 ) * f, ( par4 + 0 ) * f1 ).endVertex(); + VertexBuffer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + par5, par2 + par6, this.zLevel ).tex( ( par3 + par5 ) * f, ( par4 + par6 ) * f1 ).endVertex(); + VertexBuffer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + par5, par2 + 0, this.zLevel ).tex( ( par3 + par5 ) * f, ( par4 + 0 ) * f1 ).endVertex(); + VertexBuffer.color( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() ).pos( par1 + 0, par2 + 0, this.zLevel ).tex( ( par3 + 0 ) * f, ( par4 + 0 ) * f1 ).endVertex(); tessellator.draw(); } catch( final Exception err ) diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java index a297eb523..38093db54 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java @@ -55,7 +55,7 @@ import appeng.util.Platform; import appeng.util.ReadableNumberConverter; -public class GuiCraftingCPU extends AEBaseGui implements ISortSource +public class GuICraftingCPU extends AEBaseGui implements ISortSource { private static final int GUI_HEIGHT = 184; private static final int GUI_WIDTH = 238; @@ -92,12 +92,12 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource private GuiButton cancel; private int tooltip = -1; - public GuiCraftingCPU( final InventoryPlayer inventoryPlayer, final Object te ) + public GuICraftingCPU( final InventoryPlayer inventoryPlayer, final Object te ) { this( new ContainerCraftingCPU( inventoryPlayer, te ) ); } - protected GuiCraftingCPU( final ContainerCraftingCPU container ) + protected GuICraftingCPU( final ContainerCraftingCPU container ) { super( container ); this.craftingCpu = container; diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java index 58916bf43..4cd2475e9 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java @@ -49,7 +49,7 @@ import appeng.parts.reporting.PartPatternTerminal; import appeng.parts.reporting.PartTerminal; -public class GuiCraftingStatus extends GuiCraftingCPU +public class GuIContainerListenerStatus extends GuICraftingCPU { private final ContainerCraftingStatus status; @@ -59,7 +59,7 @@ public class GuiCraftingStatus extends GuiCraftingCPU private GuiBridge originalGui; private ItemStack myIcon = null; - public GuiCraftingStatus( final InventoryPlayer inventoryPlayer, final ITerminalHost te ) + public GuIContainerListenerStatus( final InventoryPlayer inventoryPlayer, final ITerminalHost te ) { super( new ContainerCraftingStatus( inventoryPlayer, te ) ); diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java index 36a52eb07..f489c4e14 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java @@ -36,12 +36,12 @@ import appeng.core.sync.packets.PacketInventoryAction; import appeng.helpers.InventoryAction; -public class GuiCraftingTerm extends GuiMEMonitorable +public class GuIContainerListenerTerm extends GuiMEMonitorable { private GuiImgButton clearBtn; - public GuiCraftingTerm( final InventoryPlayer inventoryPlayer, final ITerminalHost te ) + public GuIContainerListenerTerm( final InventoryPlayer inventoryPlayer, final ITerminalHost te ) { super( inventoryPlayer, te, new ContainerCraftingTerm( inventoryPlayer, te ) ); this.setReservedSpace( 73 ); diff --git a/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java b/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java index 50ade9111..11bd8263c 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java @@ -104,10 +104,10 @@ public class GuiPatternTerm extends GuiMEMonitorable { super.initGui(); - this.tabCraftButton = new GuiTabButton( this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack( Blocks.crafting_table ), GuiText.CraftingPattern.getLocal(), this.itemRender ); + this.tabCraftButton = new GuiTabButton( this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack( Blocks.CRAFTING_TABLE ), GuiText.CraftingPattern.getLocal(), this.itemRender ); this.buttonList.add( this.tabCraftButton ); - this.tabProcessButton = new GuiTabButton( this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack( Blocks.furnace ), GuiText.ProcessingPattern.getLocal(), this.itemRender ); + this.tabProcessButton = new GuiTabButton( this.guiLeft + 173, this.guiTop + this.ySize - 177, new ItemStack( Blocks.FURNACE ), GuiText.ProcessingPattern.getLocal(), this.itemRender ); this.buttonList.add( this.tabProcessButton ); this.substitutionsEnabledBtn = new GuiImgButton( this.guiLeft + 84, this.guiTop + this.ySize - 163, Settings.ACTIONS, ItemSubstitution.ENABLED ); diff --git a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java index fc58b4b8c..f2ca74101 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java @@ -27,7 +27,7 @@ import org.lwjgl.opengl.GL11; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import appeng.api.config.AccessRestriction; import appeng.api.config.ActionItems; @@ -289,8 +289,8 @@ public class GuiImgButton extends GuiButton implements ITooltip if( displayName != null ) { - String name = StatCollector.translateToLocal( displayName ); - String value = StatCollector.translateToLocal( displayValue ); + String name = I18n.translateToLocal( displayName ); + String value = I18n.translateToLocal( displayValue ); if( name == null || name.isEmpty() ) { diff --git a/src/main/java/appeng/client/gui/widgets/GuiTabButton.java b/src/main/java/appeng/client/gui/widgets/GuiTabButton.java index 4e13cff34..9743274b3 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiTabButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiTabButton.java @@ -25,7 +25,7 @@ import org.lwjgl.opengl.GL12; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.RenderItem; import net.minecraft.item.ItemStack; import appeng.client.texture.ExtraBlockTextures; diff --git a/src/main/java/appeng/client/gui/widgets/GuiToggleButton.java b/src/main/java/appeng/client/gui/widgets/GuiToggleButton.java index 7f1eeff39..0879a58e1 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiToggleButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiToggleButton.java @@ -25,7 +25,7 @@ import org.lwjgl.opengl.GL11; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import appeng.client.texture.ExtraBlockTextures; @@ -89,8 +89,8 @@ public class GuiToggleButton extends GuiButton implements ITooltip { if( this.displayName != null ) { - String name = StatCollector.translateToLocal( this.displayName ); - String value = StatCollector.translateToLocal( this.displayHint ); + String name = I18n.translateToLocal( this.displayName ); + String value = I18n.translateToLocal( this.displayHint ); if( name == null || name.isEmpty() ) { diff --git a/src/main/java/appeng/client/me/ClientDCInternalInv.java b/src/main/java/appeng/client/me/ClientDCInternalInv.java index 11e2ddbf4..0dc4f249c 100644 --- a/src/main/java/appeng/client/me/ClientDCInternalInv.java +++ b/src/main/java/appeng/client/me/ClientDCInternalInv.java @@ -21,7 +21,7 @@ package appeng.client.me; import javax.annotation.Nonnull; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.ItemSorters; @@ -46,10 +46,10 @@ public class ClientDCInternalInv implements Comparable public String getName() { - final String s = StatCollector.translateToLocal( this.unlocalizedName + ".name" ); + final String s = I18n.translateToLocal( this.unlocalizedName + ".name" ); if( s.equals( this.unlocalizedName + ".name" ) ) { - return StatCollector.translateToLocal( this.unlocalizedName ); + return I18n.translateToLocal( this.unlocalizedName ); } return s; } diff --git a/src/main/java/appeng/client/render/AppEngRenderItem.java b/src/main/java/appeng/client/render/AppEngRenderItem.java index 083d2a3c8..434b4cfab 100644 --- a/src/main/java/appeng/client/render/AppEngRenderItem.java +++ b/src/main/java/appeng/client/render/AppEngRenderItem.java @@ -24,12 +24,13 @@ import javax.annotation.Nonnull; import org.lwjgl.opengl.GL11; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; -import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.block.model.ModelManager; +import net.minecraft.client.renderer.color.ItemColors; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.resources.model.ModelManager; import net.minecraft.item.ItemStack; import appeng.api.storage.data.IAEItemStack; @@ -48,9 +49,9 @@ import appeng.util.ReadableNumberConverter; */ public class AppEngRenderItem extends RenderItem { - public AppEngRenderItem( final TextureManager textureManager, final ModelManager modelManager ) + public AppEngRenderItem( final TextureManager textureManager, final ModelManager modelManager, final ItemColors itemColors ) { - super( textureManager, modelManager ); + super( textureManager, modelManager, itemColors ); } private static final ISlimReadableNumberConverter SLIM_CONVERTER = ReadableNumberConverter.INSTANCE; @@ -81,7 +82,7 @@ public class AppEngRenderItem extends RenderItem GL11.glDisable( GL11.GL_ALPHA_TEST ); GL11.glDisable( GL11.GL_BLEND ); final Tessellator tessellator = Tessellator.getInstance(); - final WorldRenderer wr = tessellator.getWorldRenderer(); + final VertexBuffer wr = tessellator.getBuffer(); final int l = 255 - k << 16 | k << 8; final int i1 = ( 255 - k ) / 4 << 16 | 16128; this.renderQuad( tessellator, xPos + 2, yPos + 13, 13, 2, 0 ); @@ -132,7 +133,7 @@ public class AppEngRenderItem extends RenderItem private void renderQuad( final Tessellator par1Tessellator, final int par2, final int par3, final int par4, final int par5, final int par6 ) { - final WorldRenderer wr = par1Tessellator.getWorldRenderer(); + final VertexBuffer wr = par1Tessellator.getBuffer(); wr.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM ); diff --git a/src/main/java/appeng/client/render/BakingModelGenerator.java b/src/main/java/appeng/client/render/BakingModelGenerator.java index 966044d8b..4999ba250 100644 --- a/src/main/java/appeng/client/render/BakingModelGenerator.java +++ b/src/main/java/appeng/client/render/BakingModelGenerator.java @@ -14,18 +14,18 @@ import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.BlockFaceUV; import net.minecraft.client.renderer.block.model.BlockPartFace; import net.minecraft.client.renderer.block.model.FaceBakery; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemOverrideList; +import net.minecraft.client.renderer.block.model.ModelRotation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.client.resources.model.ModelRotation; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.client.model.IColoredBakedQuad; import appeng.api.util.IAESprite; import appeng.api.util.ModelGenerator; @@ -35,17 +35,15 @@ import appeng.client.texture.MissingIcon; import appeng.items.AEBaseItem; import appeng.items.parts.ItemMultiPart; - +//TODO 1.9.4 - Just all public class BakingModelGenerator implements ModelGenerator { private static final class CachedModel implements IBakedModel { private final List[] faces = new List[6]; - private final List general; public CachedModel() { - this.general = new ArrayList(); for( final EnumFacing f : EnumFacing.VALUES ) { this.faces[f.ordinal()] = new ArrayList(); @@ -83,15 +81,15 @@ public class BakingModelGenerator implements ModelGenerator } @Override - public List getGeneralQuads() + public List getQuads( IBlockState state, EnumFacing side, long rand ) { - return this.general; + return this.faces[side.ordinal()]; } @Override - public List getFaceQuads( final EnumFacing p_177551_1_ ) + public ItemOverrideList getOverrides() { - return this.faces[p_177551_1_.ordinal()]; + return null; } } @@ -364,7 +362,7 @@ public class BakingModelGenerator implements ModelGenerator public boolean isAlphaPass() { - return MinecraftForgeClient.getRenderLayer() == EnumWorldBlockLayer.TRANSLUCENT; + return MinecraftForgeClient.getRenderLayer() == BlockRenderLayer.TRANSLUCENT; } private float[] getFaceUvs( final EnumFacing face, final Vector3f to_16, final Vector3f from_16 ) diff --git a/src/main/java/appeng/client/render/BaseBlockRender.java b/src/main/java/appeng/client/render/BaseBlockRender.java index 57cccf02e..6b8701be1 100644 --- a/src/main/java/appeng/client/render/BaseBlockRender.java +++ b/src/main/java/appeng/client/render/BaseBlockRender.java @@ -21,6 +21,7 @@ package appeng.client.render; import java.nio.FloatBuffer; import java.util.EnumSet; + import javax.annotation.Nullable; import org.lwjgl.BufferUtils; @@ -28,15 +29,15 @@ import org.lwjgl.opengl.GL11; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -666,7 +667,7 @@ public class BaseBlockRender return ( 16.0 - uv ) / 16.0; } - public void renderTile( final B block, final T tile, final WorldRenderer tess, final double x, final double y, final double z, final float f, final ModelGenerator renderer ) + public void renderTile( final B block, final T tile, final VertexBuffer tess, final double x, final double y, final double z, final float f, final ModelGenerator renderer ) { renderer.setUvRotateBottom( renderer.setUvRotateTop( renderer.setUvRotateEast( renderer.setUvRotateWest( renderer.setUvRotateNorth( renderer.setUvRotateSouth( 0 ) ) ) ) ) ); @@ -675,7 +676,7 @@ public class BaseBlockRender final AEPartLocation forward = AEPartLocation.SOUTH; this.applyTESRRotation( x, y, z, forward.getFacing(), up.getFacing() ); - Minecraft.getMinecraft().getTextureManager().bindTexture( TextureMap.locationBlocksTexture ); + Minecraft.getMinecraft().getTextureManager().bindTexture( TextureMap.LOCATION_BLOCKS_TEXTURE ); RenderHelper.disableStandardItemLighting(); if( Minecraft.isAmbientOcclusionEnabled() ) @@ -753,7 +754,7 @@ public class BaseBlockRender GL11.glTranslatef( 0, -0.14F, 0 ); // RenderItem.renderInFrame = true; - Minecraft.getMinecraft().getRenderManager().renderEntityWithPosYaw( entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F ); + Minecraft.getMinecraft().getRenderManager().doRenderEntity( entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F, true ); // RenderItem.renderInFrame = false; GL11.glPopMatrix(); diff --git a/src/main/java/appeng/client/render/BusRenderHelper.java b/src/main/java/appeng/client/render/BusRenderHelper.java index 27a216a57..e8cabceba 100644 --- a/src/main/java/appeng/client/render/BusRenderHelper.java +++ b/src/main/java/appeng/client/render/BusRenderHelper.java @@ -20,14 +20,15 @@ package appeng.client.render; import java.util.EnumSet; + import javax.annotation.Nullable; import com.google.common.base.Function; import com.google.common.base.Optional; import net.minecraft.block.Block; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/client/render/CableRenderHelper.java b/src/main/java/appeng/client/render/CableRenderHelper.java index 2ab32c621..e166bd1e0 100644 --- a/src/main/java/appeng/client/render/CableRenderHelper.java +++ b/src/main/java/appeng/client/render/CableRenderHelper.java @@ -24,9 +24,9 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.client.MinecraftForgeClient; import appeng.api.parts.IFacadeContainer; @@ -60,7 +60,7 @@ public class CableRenderHelper } else { - BusRenderHelper.INSTANCE.setPass( MinecraftForgeClient.getRenderLayer() == EnumWorldBlockLayer.TRANSLUCENT ? 1 : 0 ); + BusRenderHelper.INSTANCE.setPass( MinecraftForgeClient.getRenderLayer() == BlockRenderLayer.TRANSLUCENT ? 1 : 0 ); } if( renderer.getBlockAccess() == null ) diff --git a/src/main/java/appeng/client/render/ISimpleBlockRenderingHandler.java b/src/main/java/appeng/client/render/ISimpleBlockRenderingHandler.java index 4cca71d52..fcb750dfe 100644 --- a/src/main/java/appeng/client/render/ISimpleBlockRenderingHandler.java +++ b/src/main/java/appeng/client/render/ISimpleBlockRenderingHandler.java @@ -3,7 +3,7 @@ package appeng.client.render; import net.minecraft.block.Block; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import appeng.api.util.ModelGenerator; diff --git a/src/main/java/appeng/client/render/SpatialSkyRender.java b/src/main/java/appeng/client/render/SpatialSkyRender.java index f556bd726..6ac247868 100644 --- a/src/main/java/appeng/client/render/SpatialSkyRender.java +++ b/src/main/java/appeng/client/render/SpatialSkyRender.java @@ -29,7 +29,7 @@ import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraftforge.client.IRenderHandler; @@ -77,7 +77,7 @@ public class SpatialSkyRender extends IRenderHandler GL11.glDepthMask( false ); GL11.glColor4f( 0.0f, 0.0f, 0.0f, 1.0f ); final Tessellator tessellator = Tessellator.getInstance(); - final WorldRenderer worldrenderer = tessellator.getWorldRenderer(); + final VertexBuffer VertexBuffer = tessellator.getBuffer(); for( int i = 0; i < 6; ++i ) { @@ -108,11 +108,11 @@ public class SpatialSkyRender extends IRenderHandler GL11.glRotatef( -90.0F, 0.0F, 0.0F, 1.0F ); } - worldrenderer.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM ); - worldrenderer.color( 0f, 0f, 0f, 1f ).pos( -100.0D, -100.0D, -100.0D ).tex( 0.0D, 0.0D ).endVertex(); - worldrenderer.color( 0f, 0f, 0f, 1f ).pos( -100.0D, -100.0D, 100.0D ).tex( 0.0D, 16.0D ).endVertex(); - worldrenderer.color( 0f, 0f, 0f, 1f ).pos( 100.0D, -100.0D, 100.0D ).tex( 16.0D, 16.0D ).endVertex(); - worldrenderer.color( 0f, 0f, 0f, 1f ).pos( 100.0D, -100.0D, -100.0D ).tex( 16.0D, 0.0D ).endVertex(); + VertexBuffer.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM ); + VertexBuffer.color( 0f, 0f, 0f, 1f ).pos( -100.0D, -100.0D, -100.0D ).tex( 0.0D, 0.0D ).endVertex(); + VertexBuffer.color( 0f, 0f, 0f, 1f ).pos( -100.0D, -100.0D, 100.0D ).tex( 0.0D, 16.0D ).endVertex(); + VertexBuffer.color( 0f, 0f, 0f, 1f ).pos( 100.0D, -100.0D, 100.0D ).tex( 16.0D, 16.0D ).endVertex(); + VertexBuffer.color( 0f, 0f, 0f, 1f ).pos( 100.0D, -100.0D, -100.0D ).tex( 16.0D, 0.0D ).endVertex(); tessellator.draw(); GL11.glPopMatrix(); } @@ -145,8 +145,8 @@ public class SpatialSkyRender extends IRenderHandler private void renderTwinkles() { final Tessellator tessellator = Tessellator.getInstance(); - final WorldRenderer worldrenderer = tessellator.getWorldRenderer(); - worldrenderer.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM ); + final VertexBuffer VertexBuffer = tessellator.getBuffer(); + VertexBuffer.begin( GL11.GL_QUADS, DefaultVertexFormats.ITEM ); for( int i = 0; i < 50; ++i ) { @@ -186,7 +186,7 @@ public class SpatialSkyRender extends IRenderHandler final double d23 = d17 * d12 - d20 * d13; final double d24 = d23 * d9 - d21 * d10; final double d25 = d21 * d9 + d23 * d10; - worldrenderer.pos( x + d24, y + d22, z + d25 ).endVertex(); + VertexBuffer.pos( x + d24, y + d22, z + d25 ).endVertex(); } } } diff --git a/src/main/java/appeng/client/render/TESRWrapper.java b/src/main/java/appeng/client/render/TESRWrapper.java index 61961363e..3a6a6e2c9 100644 --- a/src/main/java/appeng/client/render/TESRWrapper.java +++ b/src/main/java/appeng/client/render/TESRWrapper.java @@ -69,7 +69,7 @@ public class TESRWrapper extends TileEntitySpecialRenderer GL11.glPushMatrix(); this.renderBlocksInstance.setBlockAccess( te.getWorld() ); - this.blkRender.renderTile( (AEBaseBlock) b, (AEBaseTile) te, tess.getWorldRenderer(), x, y, z, f, this.renderBlocksInstance ); + this.blkRender.renderTile( (AEBaseBlock) b, (AEBaseTile) te, tess.getBuffer(), x, y, z, f, this.renderBlocksInstance ); GL11.glPopMatrix(); } diff --git a/src/main/java/appeng/client/render/WorldRender.java b/src/main/java/appeng/client/render/WorldRender.java index d04b54c8b..e857e1327 100644 --- a/src/main/java/appeng/client/render/WorldRender.java +++ b/src/main/java/appeng/client/render/WorldRender.java @@ -23,7 +23,7 @@ import java.util.HashMap; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java b/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java index 9fb533606..9074159b3 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java @@ -23,8 +23,8 @@ import java.util.EnumSet; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import appeng.api.networking.IGridHost; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java b/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java index 7f9f61f25..6c32ccdd5 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java @@ -26,10 +26,10 @@ import org.lwjgl.opengl.GL12; import net.minecraft.block.Block; import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import appeng.api.util.AEPartLocation; @@ -122,7 +122,7 @@ public class RenderBlockCharger extends BaseBlockRender } @Override - public void renderTile( final BlockCrank blk, final TileCrank tile, final WorldRenderer tess, final double x, final double y, final double z, final float f, final ModelGenerator renderBlocks ) + public void renderTile( final BlockCrank blk, final TileCrank tile, final VertexBuffer tess, final double x, final double y, final double z, final float f, final ModelGenerator renderBlocks ) { if( tile.getUp() == null ) { return; } - Minecraft.getMinecraft().getTextureManager().bindTexture( TextureMap.locationBlocksTexture ); + Minecraft.getMinecraft().getTextureManager().bindTexture( TextureMap.LOCATION_BLOCKS_TEXTURE ); RenderHelper.disableStandardItemLighting(); if( Minecraft.isAmbientOcclusionEnabled() ) diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockEnergyCube.java b/src/main/java/appeng/client/render/blocks/RenderBlockEnergyCube.java index 0ffdd3e7f..62c91d196 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockEnergyCube.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockEnergyCube.java @@ -20,7 +20,7 @@ package appeng.client.render.blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import appeng.api.implementations.items.IAEItemPowerStorage; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java b/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java index d2b581926..6c0505ae1 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java @@ -28,12 +28,12 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import appeng.api.features.IInscriberRecipe; @@ -149,7 +149,7 @@ public class RenderBlockInscriber extends BaseBlockRender final IAESprite[] icoSet = { imb.getIcon( EnumFacing.UP, imb.getDefaultState() ), ExtraBlockTextures.BlockPaint2.getIcon(), ExtraBlockTextures.BlockPaint3.getIcon() }; - final int brightness = imb.getMixedBrightnessForBlock( world, pos ); + final int brightness = imb.getLightValue( world.getBlockState( pos ), world, pos ); final EnumSet validSides = EnumSet.noneOf( EnumFacing.class ); diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java b/src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java index f34e73b3e..2aa69fb34 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java @@ -20,7 +20,7 @@ package appeng.client.render.blocks; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import appeng.api.util.IAESprite; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java b/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java index 550e3ccb8..230e820d8 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java @@ -25,10 +25,10 @@ import org.lwjgl.opengl.GL12; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelChest; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import appeng.api.util.ModelGenerator; @@ -84,7 +84,7 @@ public class RenderBlockSkyChest extends BaseBlockRender this.renderInvBlock( EnumSet.allOf( AEPartLocation.class ), blk, is, 0xffffff, renderer ); - blk.getRendererInstance().setTemporaryRenderIcon( renderer.getIcon( Blocks.hopper.getDefaultState() )[0] ); + blk.getRendererInstance().setTemporaryRenderIcon( renderer.getIcon( Blocks.HOPPER.getDefaultState() )[0] ); renderer.setRenderAllFaces( true ); final float top = 8.0f / 16.0f; @@ -135,7 +135,7 @@ public class RenderQuartzTorch extends BaseBlockRender super.renderInWorld( block, world, pos, renderer ); } - block.getRendererInstance().setTemporaryRenderIcon( renderer.getIcon( Blocks.hopper.getDefaultState() )[0] ); + block.getRendererInstance().setTemporaryRenderIcon( renderer.getIcon( Blocks.HOPPER.getDefaultState() )[0] ); final float top = 8.0f / 16.0f; final float bottom = 7.0f / 16.0f; diff --git a/src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java b/src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java index 18af8d890..936e77b22 100644 --- a/src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java +++ b/src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java @@ -20,8 +20,8 @@ package appeng.client.render.blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import appeng.api.util.AEPartLocation; diff --git a/src/main/java/appeng/client/render/blocks/RenderTinyTNT.java b/src/main/java/appeng/client/render/blocks/RenderTinyTNT.java index 86cf19403..e067bda65 100644 --- a/src/main/java/appeng/client/render/blocks/RenderTinyTNT.java +++ b/src/main/java/appeng/client/render/blocks/RenderTinyTNT.java @@ -22,7 +22,7 @@ package appeng.client.render.blocks; import net.minecraft.client.Minecraft; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import appeng.api.util.ModelGenerator; @@ -44,7 +44,7 @@ public class RenderTinyTNT extends BaseBlockRender @Override public void renderInventory( final BlockTinyTNT block, final ItemStack is, final ModelGenerator renderer, final ItemRenderType type, final Object[] obj ) { - renderer.setOverrideBlockTexture( new FullIcon( Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getTexture( Blocks.tnt.getDefaultState() ) ) ); + renderer.setOverrideBlockTexture( new FullIcon( Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getTexture( Blocks.TNT.getDefaultState() ) ) ); renderer.setRenderBounds( 0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f ); super.renderInventory( block, is, renderer, type, obj ); } @@ -52,7 +52,7 @@ public class RenderTinyTNT extends BaseBlockRender @Override public boolean renderInWorld( final BlockTinyTNT imb, final IBlockAccess world, final BlockPos pos, final ModelGenerator renderer ) { - renderer.setOverrideBlockTexture( new FullIcon( Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getTexture( Blocks.tnt.getDefaultState() ) ) ); + renderer.setOverrideBlockTexture( new FullIcon( Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getTexture( Blocks.TNT.getDefaultState() ) ) ); renderer.setRenderAllFaces( true ); renderer.setRenderBounds( 0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f ); final boolean out = super.renderInWorld( imb, world, pos, renderer ); diff --git a/src/main/java/appeng/client/render/blocks/RendererCableBus.java b/src/main/java/appeng/client/render/blocks/RendererCableBus.java index b3fb43402..b5d8616b1 100644 --- a/src/main/java/appeng/client/render/blocks/RendererCableBus.java +++ b/src/main/java/appeng/client/render/blocks/RendererCableBus.java @@ -22,11 +22,11 @@ package appeng.client.render.blocks; import java.util.HashMap; import java.util.Map; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import appeng.api.parts.IFacadePart; @@ -137,7 +137,7 @@ public class RendererCableBus extends BaseBlockRender ? this.noClip = true; } @@ -62,7 +63,7 @@ public class AssemblerFX extends EntityFX { super.onUpdate(); - if( this.isDead ) + if( this.isExpired ) { this.fi.setDead(); } @@ -74,7 +75,7 @@ public class AssemblerFX extends EntityFX } @Override - public void renderParticle( final WorldRenderer par1Tessellator, final Entity p_180434_2_, final float l, final float rX, final float rY, final float rZ, final float rYZ, final float rXY ) + public void renderParticle( final VertexBuffer par1Tessellator, final Entity p_180434_2_, final float l, final float rX, final float rY, final float rZ, final float rYZ, final float rXY ) { this.time += l; if( this.time > 4.0 ) diff --git a/src/main/java/appeng/client/render/effects/ChargedOreFX.java b/src/main/java/appeng/client/render/effects/ChargedOreFX.java index 11344aec9..c83f7177f 100644 --- a/src/main/java/appeng/client/render/effects/ChargedOreFX.java +++ b/src/main/java/appeng/client/render/effects/ChargedOreFX.java @@ -19,11 +19,11 @@ package appeng.client.render.effects; -import net.minecraft.client.particle.EntityReddustFX; +import net.minecraft.client.particle.ParticleRedstone; import net.minecraft.world.World; -public class ChargedOreFX extends EntityReddustFX +public class ChargedOreFX extends ParticleRedstone { public ChargedOreFX( final World w, final double x, final double y, final double z, final float r, final float g, final float b ) diff --git a/src/main/java/appeng/client/render/effects/CraftingFx.java b/src/main/java/appeng/client/render/effects/CraftingFx.java index c37196d85..0ac19c8f0 100644 --- a/src/main/java/appeng/client/render/effects/CraftingFx.java +++ b/src/main/java/appeng/client/render/effects/CraftingFx.java @@ -19,12 +19,12 @@ package appeng.client.render.effects; -import net.minecraft.client.particle.EntityBreakingFX; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.particle.ParticleBreaking; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.Entity; import net.minecraft.item.Item; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -34,7 +34,7 @@ import appeng.client.texture.ExtraBlockTextures; @SideOnly( Side.CLIENT ) -public class CraftingFx extends EntityBreakingFX +public class CraftingFx extends ParticleBreaking { private final TextureAtlasSprite particleTextureIndex; @@ -59,6 +59,7 @@ public class CraftingFx extends EntityBreakingFX this.startBlkY = MathHelper.floor_double( this.posY ); this.startBlkZ = MathHelper.floor_double( this.posZ ); + //TODO 1.9.4 - noClip => ? this.noClip = true; } @@ -69,7 +70,7 @@ public class CraftingFx extends EntityBreakingFX } @Override - public void renderParticle( final WorldRenderer par1Tessellator, final Entity p_180434_2_, final float partialTick, final float x, final float y, final float z, final float rx, final float rz ) + public void renderParticle( final VertexBuffer par1Tessellator, final Entity p_180434_2_, final float partialTick, final float x, final float y, final float z, final float rx, final float rz ) { if( partialTick < 0 || partialTick > 1 ) { @@ -119,4 +120,19 @@ public class CraftingFx extends EntityBreakingFX this.particleScale *= 0.51f; this.particleAlpha *= 0.51f; } + + public void setMotionX( float motionX ) + { + this.motionX = motionX; + } + + public void setMotionY( float motionY ) + { + this.motionY = motionY; + } + + public void setMotionZ( float motionZ ) + { + this.motionZ = motionZ; + } } diff --git a/src/main/java/appeng/client/render/effects/EnergyFx.java b/src/main/java/appeng/client/render/effects/EnergyFx.java index ec564e030..6a49f8d1b 100644 --- a/src/main/java/appeng/client/render/effects/EnergyFx.java +++ b/src/main/java/appeng/client/render/effects/EnergyFx.java @@ -19,12 +19,12 @@ package appeng.client.render.effects; -import net.minecraft.client.particle.EntityBreakingFX; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.particle.ParticleBreaking; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.Entity; import net.minecraft.item.Item; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -34,7 +34,7 @@ import appeng.client.texture.ExtraBlockTextures; @SideOnly( Side.CLIENT ) -public class EnergyFx extends EntityBreakingFX +public class EnergyFx extends ParticleBreaking { private final TextureAtlasSprite particleTextureIndex; @@ -58,6 +58,7 @@ public class EnergyFx extends EntityBreakingFX this.startBlkY = MathHelper.floor_double( this.posY ); this.startBlkZ = MathHelper.floor_double( this.posZ ); + //TODO 1.9.4 - noClip => ? this.noClip = true; } @@ -68,7 +69,7 @@ public class EnergyFx extends EntityBreakingFX } @Override - public void renderParticle( final WorldRenderer par1Tessellator, final Entity p_180434_2_, final float par2, final float par3, final float par4, final float par5, final float par6, final float par7 ) + public void renderParticle( final VertexBuffer par1Tessellator, final Entity p_180434_2_, final float par2, final float par3, final float par4, final float par5, final float par6, final float par7 ) { final float f6 = this.particleTextureIndex.getMinU(); final float f7 = this.particleTextureIndex.getMaxU(); @@ -109,4 +110,19 @@ public class EnergyFx extends EntityBreakingFX this.particleScale *= 0.89f; this.particleAlpha *= 0.89f; } + + public void setMotionX( float motionX ) + { + this.motionX = motionX; + } + + public void setMotionY( float motionY ) + { + this.motionY = motionY; + } + + public void setMotionZ( float motionZ ) + { + this.motionZ = motionZ; + } } diff --git a/src/main/java/appeng/client/render/effects/LightningArcFX.java b/src/main/java/appeng/client/render/effects/LightningArcFX.java index 5680abfb8..d0e761711 100644 --- a/src/main/java/appeng/client/render/effects/LightningArcFX.java +++ b/src/main/java/appeng/client/render/effects/LightningArcFX.java @@ -35,6 +35,7 @@ public class LightningArcFX extends LightningFX public LightningArcFX( final World w, final double x, final double y, final double z, final double ex, final double ey, final double ez, final double r, final double g, final double b ) { super( w, x, y, z, r, g, b, 6 ); + //TODO 1.9.4 - noClip => ? this.noClip = true; this.rx = ex - x; diff --git a/src/main/java/appeng/client/render/effects/LightningFX.java b/src/main/java/appeng/client/render/effects/LightningFX.java index 714579346..9b8a038f3 100644 --- a/src/main/java/appeng/client/render/effects/LightningFX.java +++ b/src/main/java/appeng/client/render/effects/LightningFX.java @@ -22,15 +22,15 @@ package appeng.client.render.effects; import java.util.Random; import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -public class LightningFX extends EntityFX +public class LightningFX extends Particle { private static final Random RANDOM_GENERATOR = new Random(); @@ -55,6 +55,7 @@ public class LightningFX extends EntityFX this.motionY = 0; this.motionZ = 0; this.particleMaxAge = maxAge; + //TODO 1.9.4 - noClip => ? this.noClip = true; } @@ -84,7 +85,7 @@ public class LightningFX extends EntityFX } @Override - public void renderParticle( final WorldRenderer tess, final Entity p_180434_2_, final float l, final float rX, final float rY, final float rZ, final float rYZ, final float rXY ) + public void renderParticle( final VertexBuffer tess, final Entity p_180434_2_, final float l, final float rX, final float rY, final float rZ, final float rYZ, final float rXY ) { final float j = 1.0f; float red = this.particleRed * j * 0.9f; @@ -210,7 +211,7 @@ public class LightningFX extends EntityFX this.hasData = false; } - private void draw( float red, float green, float blue, final WorldRenderer tess, final double[] a, final double[] b, final double f6, final double f8 ) + private void draw( float red, float green, float blue, final VertexBuffer tess, final double[] a, final double[] b, final double f6, final double f8 ) { if( this.hasData ) { diff --git a/src/main/java/appeng/client/render/effects/MatterCannonFX.java b/src/main/java/appeng/client/render/effects/MatterCannonFX.java index 307e0a38a..1a2583d8a 100644 --- a/src/main/java/appeng/client/render/effects/MatterCannonFX.java +++ b/src/main/java/appeng/client/render/effects/MatterCannonFX.java @@ -19,8 +19,8 @@ package appeng.client.render.effects; -import net.minecraft.client.particle.EntityBreakingFX; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.particle.ParticleBreaking; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.Entity; import net.minecraft.item.Item; @@ -30,7 +30,7 @@ import appeng.api.util.AEPartLocation; import appeng.client.texture.ExtraBlockTextures; -public class MatterCannonFX extends EntityBreakingFX +public class MatterCannonFX extends ParticleBreaking { private final TextureAtlasSprite particleTextureIndex; @@ -48,6 +48,7 @@ public class MatterCannonFX extends EntityBreakingFX this.motionY = 0.0f; this.motionZ = 0.0f; this.particleTextureIndex = ExtraBlockTextures.BlockMatterCannonParticle.getIcon().getAtlas(); + //TODO 1.9.4 - noClip => ? this.noClip = true; } @@ -71,7 +72,7 @@ public class MatterCannonFX extends EntityBreakingFX } @Override - public void renderParticle( final WorldRenderer par1Tessellator, final Entity p_180434_2_, final float par2, final float par3, final float par4, final float par5, final float par6, final float par7 ) + public void renderParticle( final VertexBuffer par1Tessellator, final Entity p_180434_2_, final float par2, final float par3, final float par4, final float par5, final float par6, final float par7 ) { final float f6 = this.particleTextureIndex.getMinU(); final float f7 = this.particleTextureIndex.getMaxU(); diff --git a/src/main/java/appeng/client/render/effects/VibrantFX.java b/src/main/java/appeng/client/render/effects/VibrantFX.java index 96c0191f9..0c58cf36f 100644 --- a/src/main/java/appeng/client/render/effects/VibrantFX.java +++ b/src/main/java/appeng/client/render/effects/VibrantFX.java @@ -19,14 +19,14 @@ package appeng.client.render.effects; -import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.particle.Particle; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly( Side.CLIENT ) -public class VibrantFX extends EntityFX +public class VibrantFX extends Particle { public VibrantFX( final World par1World, final double x, final double y, final double z, final double par8, final double par10, final double par12 ) @@ -46,13 +46,14 @@ public class VibrantFX extends EntityFX this.prevPosY = this.posY; this.prevPosZ = this.posZ; this.particleMaxAge = (int) ( 20.0D / ( Math.random() * 0.8D + 0.1D ) ); + //TODO 1.9.4 - noClip => ? this.noClip = true; } @Override - public float getBrightness( final float par1 ) + public int getBrightnessForRender( final float par1 ) { - return 1.0f; + return 1; } /** @@ -69,7 +70,7 @@ public class VibrantFX extends EntityFX if( this.particleMaxAge <= 0 || this.particleScale < 0.1 ) { - this.setDead(); + this.setExpired(); } this.particleMaxAge--; } diff --git a/src/main/java/appeng/client/texture/CableBusTextures.java b/src/main/java/appeng/client/texture/CableBusTextures.java index 51db92a15..d0317a72e 100644 --- a/src/main/java/appeng/client/texture/CableBusTextures.java +++ b/src/main/java/appeng/client/texture/CableBusTextures.java @@ -190,7 +190,7 @@ public enum CableBusTextures @SideOnly( Side.CLIENT ) public static TextureAtlasSprite getMissing() { - return ( (TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture( TextureMap.locationBlocksTexture ) ).getAtlasSprite( "missingno" ); + return ( (TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture( TextureMap.LOCATION_BLOCKS_TEXTURE ) ).getAtlasSprite( "missingno" ); } public String getName() diff --git a/src/main/java/appeng/client/texture/ExtraBlockTextures.java b/src/main/java/appeng/client/texture/ExtraBlockTextures.java index c79972fc2..f1d74753f 100644 --- a/src/main/java/appeng/client/texture/ExtraBlockTextures.java +++ b/src/main/java/appeng/client/texture/ExtraBlockTextures.java @@ -158,7 +158,7 @@ public enum ExtraBlockTextures @SideOnly( Side.CLIENT ) public static IAESprite getMissing() { - return new BaseIcon( ( (TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture( TextureMap.locationBlocksTexture ) ).getAtlasSprite( "missingno" ) ); + return new BaseIcon( ( (TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture( TextureMap.LOCATION_BLOCKS_TEXTURE ) ).getAtlasSprite( "missingno" ) ); } public String getName() diff --git a/src/main/java/appeng/client/texture/MissingIcon.java b/src/main/java/appeng/client/texture/MissingIcon.java index 4160b3c12..f274f584e 100644 --- a/src/main/java/appeng/client/texture/MissingIcon.java +++ b/src/main/java/appeng/client/texture/MissingIcon.java @@ -45,7 +45,7 @@ public class MissingIcon implements IAESprite @SideOnly( Side.CLIENT ) public static TextureAtlasSprite getMissing() { - return ( (TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture( TextureMap.locationBlocksTexture ) ).getAtlasSprite( "missingno" ); + return ( (TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture( TextureMap.LOCATION_BLOCKS_TEXTURE ) ).getAtlasSprite( "missingno" ); } @Override diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java index 60d435bbd..bcd7d3ece 100644 --- a/src/main/java/appeng/container/AEBaseContainer.java +++ b/src/main/java/appeng/container/AEBaseContainer.java @@ -33,7 +33,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -438,13 +438,13 @@ public abstract class AEBaseContainer extends Container if( Platform.isServer() ) { - for( final Object crafter : this.crafters ) + for( final Object crafter : this.listeners ) { - final ICrafting icrafting = (ICrafting) crafter; + final IContainerListener IContainerListener = (IContainerListener) crafter; for( final SyncData sd : this.syncData.values() ) { - sd.tick( icrafting ); + sd.tick( IContainerListener ); } } } diff --git a/src/main/java/appeng/container/ContainerOpenContext.java b/src/main/java/appeng/container/ContainerOpenContext.java index a13f04195..6f7ed7248 100644 --- a/src/main/java/appeng/container/ContainerOpenContext.java +++ b/src/main/java/appeng/container/ContainerOpenContext.java @@ -20,7 +20,7 @@ package appeng.container; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.parts.IPart; diff --git a/src/main/java/appeng/container/guisync/SyncData.java b/src/main/java/appeng/container/guisync/SyncData.java index 7c5129d96..043d91d67 100644 --- a/src/main/java/appeng/container/guisync/SyncData.java +++ b/src/main/java/appeng/container/guisync/SyncData.java @@ -24,7 +24,7 @@ import java.lang.reflect.Field; import java.util.EnumSet; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import appeng.container.AEBaseContainer; import appeng.core.AELog; @@ -54,7 +54,7 @@ public class SyncData return this.channel; } - public void tick( final ICrafting c ) + public void tick( final IContainerListener c ) { try { @@ -82,7 +82,7 @@ public class SyncData } } - private void send( final ICrafting o, final Object val ) throws IOException + private void send( final IContainerListener o, final Object val ) throws IOException { if( val instanceof String ) { diff --git a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java index 948297b0d..a5932b16c 100644 --- a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java +++ b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java @@ -24,10 +24,10 @@ import java.util.Iterator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; import appeng.api.AEApi; import appeng.api.config.CopyMode; @@ -151,9 +151,9 @@ public class ContainerCellWorkbench extends ContainerUpgradeable this.setValidContainer( false ); } - for( final Object crafter : this.crafters ) + for( final Object crafter : this.listeners ) { - final ICrafting icrafting = (ICrafting) crafter; + final IContainerListener IContainerListener = (IContainerListener) crafter; if( this.prevStack != is ) { @@ -163,10 +163,10 @@ public class ContainerCellWorkbench extends ContainerUpgradeable if( s instanceof OptionalSlotRestrictedInput ) { final OptionalSlotRestrictedInput sri = (OptionalSlotRestrictedInput) s; - icrafting.sendSlotContents( this, sri.slotNumber, sri.getStack() ); + IContainerListener.sendSlotContents( this, sri.slotNumber, sri.getStack() ); } } - ( (EntityPlayerMP) icrafting ).isChangingQuantityOnly = false; + ( (EntityPlayerMP) IContainerListener ).isChangingQuantityOnly = false; } } @@ -352,7 +352,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable } @Override - public IChatComponent getDisplayName() + public ITextComponent getDisplayName() { return null; } diff --git a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java index 5970d67d1..1dcc3fac4 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java @@ -31,9 +31,9 @@ import com.google.common.collect.ImmutableSet; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; import appeng.api.AEApi; @@ -259,7 +259,7 @@ public class ContainerCraftConfirm extends AEBaseContainer } } - for( final Object g : this.crafters ) + for( final Object g : this.listeners ) { if( g instanceof EntityPlayer ) { @@ -279,7 +279,7 @@ public class ContainerCraftConfirm extends AEBaseContainer } catch( final Throwable e ) { - this.getPlayerInv().player.addChatMessage( new ChatComponentText( "Error: " + e.toString() ) ); + this.getPlayerInv().player.addChatMessage( new TextComponentString( "Error: " + e.toString() ) ); AELog.debug( e ); this.setValidContainer( false ); this.result = null; @@ -365,8 +365,9 @@ public class ContainerCraftConfirm extends AEBaseContainer return new PlayerSource( this.getPlayerInv().player, (IActionHost) this.getTarget() ); } + //TODO 1.9.4 - removeCraftingFromCrafters => ? @Override - public void removeCraftingFromCrafters( final ICrafting c ) + public void removeCraftingFromCrafters( final IContainerListener c ) { super.removeCraftingFromCrafters( c ); if( this.getJob() != null ) diff --git a/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java b/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java index a4302d4d4..ab26e449e 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java @@ -24,7 +24,7 @@ import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import appeng.api.AEApi; import appeng.api.networking.IGrid; @@ -111,7 +111,7 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH this.getMonitor().removeListener( this ); } - for( final Object g : this.crafters ) + for( final Object g : this.listeners ) { if( g instanceof EntityPlayer ) { @@ -152,12 +152,13 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH this.setEstimatedTime( -1 ); } + //TODO 1.9.4 - removeCraftingFromCrafters => ? @Override - public void removeCraftingFromCrafters( final ICrafting c ) + public void removeCraftingFromCrafters( final IContainerListener c ) { super.removeCraftingFromCrafters( c ); - if( this.crafters.isEmpty() && this.getMonitor() != null ) + if( this.listeners.isEmpty() && this.getMonitor() != null ) { this.getMonitor().removeListener( this ); } @@ -202,7 +203,7 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH this.list.resetStatus(); - for( final Object g : this.crafters ) + for( final Object g : this.listeners ) { if( g instanceof EntityPlayer ) { diff --git a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java b/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java index da7e05ed8..a6fe1d1d6 100644 --- a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java +++ b/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java @@ -27,7 +27,7 @@ import javax.annotation.Nonnull; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -186,7 +186,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa if( sideLocal != sideRemote ) { this.clientCM.putSetting( set, sideLocal ); - for( final Object crafter : this.crafters ) + for( final Object crafter : this.listeners ) { try { @@ -226,7 +226,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa { this.items.resetStatus(); - for( final Object c : this.crafters ) + for( final Object c : this.listeners ) { if( c instanceof EntityPlayer ) { @@ -300,15 +300,16 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa super.onUpdate( field, oldValue, newValue ); } + //TODO 1.9.4 - onCraftGuiOpened => ? @Override - public void onCraftGuiOpened( final ICrafting c ) + public void onCraftGuiOpened( final IContainerListener c ) { super.onCraftGuiOpened( c ); this.queueInventory( c ); } - private void queueInventory( final ICrafting c ) + private void queueInventory( final IContainerListener c ) { if( Platform.isServer() && c instanceof EntityPlayer && this.monitor != null ) { @@ -340,13 +341,13 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa } } } - + @Override - public void removeCraftingFromCrafters( final ICrafting c ) + public void removeListener( final IContainerListener c ) { - super.removeCraftingFromCrafters( c ); + super.removeListener( c ); - if( this.crafters.isEmpty() && this.monitor != null ) + if( this.listeners.isEmpty() && this.monitor != null ) { this.monitor.removeListener( this ); } @@ -380,13 +381,9 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa @Override public void onListUpdate() { - for( final Object c : this.crafters ) + for( final IContainerListener c : this.listeners ) { - if( c instanceof ICrafting ) - { - final ICrafting cr = (ICrafting) c; - this.queueInventory( cr ); - } + this.queueInventory( c ); } } diff --git a/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java b/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java index 6075c2cbc..8ed494ffe 100644 --- a/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java +++ b/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java @@ -133,7 +133,7 @@ public class ContainerNetworkStatus extends AEBaseContainer } } - for( final Object c : this.crafters ) + for( final Object c : this.listeners ) { if( c instanceof EntityPlayer ) { diff --git a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java index cf28b1fb4..560014bd1 100644 --- a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java @@ -25,7 +25,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.inventory.Slot; @@ -423,7 +423,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA if( failed != null ) { - p.dropPlayerItemWithRandomChoice( failed, false ); + p.dropItem( failed, false ); } } @@ -481,19 +481,19 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA { if( s == this.patternSlotOUT && Platform.isServer() ) { - for( final Object crafter : this.crafters ) + for( final Object crafter : this.listeners ) { - final ICrafting icrafting = (ICrafting) crafter; + final IContainerListener IContainerListener = (IContainerListener) crafter; for( final Object g : this.inventorySlots ) { if( g instanceof OptionalSlotFake || g instanceof SlotFakeCraftingMatrix ) { final Slot sri = (Slot) g; - icrafting.sendSlotContents( this, sri.slotNumber, sri.getStack() ); + IContainerListener.sendSlotContents( this, sri.slotNumber, sri.getStack() ); } } - ( (EntityPlayerMP) icrafting ).isChangingQuantityOnly = false; + ( (EntityPlayerMP) IContainerListener ).isChangingQuantityOnly = false; } this.detectAndSendChanges(); } diff --git a/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java b/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java index dbdec76b3..99e4d56ab 100644 --- a/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java +++ b/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java @@ -24,7 +24,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; @@ -102,7 +102,7 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn { if( this.inSlot.getStackInSlot( 0 ) != null ) { - par1EntityPlayer.dropPlayerItemWithRandomChoice( this.inSlot.getStackInSlot( 0 ), false ); + par1EntityPlayer.dropItem( this.inSlot.getStackInSlot( 0 ), false ); } } @@ -174,6 +174,7 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn if( item.stackSize == 0 ) { this.getPlayerInv().mainInventory[this.getPlayerInv().currentItem] = null; + //TODO 1.9.4 - 2 hands. Just do something! MinecraftForge.EVENT_BUS.post( new PlayerDestroyItemEvent( this.getPlayerInv().player, item ) ); } @@ -246,7 +247,7 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn } @Override - public IChatComponent getDisplayName() + public ITextComponent getDisplayName() { return null; } diff --git a/src/main/java/appeng/container/implementations/ContainerSecurity.java b/src/main/java/appeng/container/implementations/ContainerSecurity.java index 8f060ddcf..def0a3f38 100644 --- a/src/main/java/appeng/container/implementations/ContainerSecurity.java +++ b/src/main/java/appeng/container/implementations/ContainerSecurity.java @@ -21,7 +21,7 @@ package appeng.container.implementations; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -124,12 +124,12 @@ public class ContainerSecurity extends ContainerMEMonitorable implements IAEAppE if( this.wirelessIn.getHasStack() ) { - player.dropPlayerItemWithRandomChoice( this.wirelessIn.getStack(), false ); + player.dropItem( this.wirelessIn.getStack(), false ); } if( this.wirelessOut.getHasStack() ) { - player.dropPlayerItemWithRandomChoice( this.wirelessOut.getStack(), false ); + player.dropItem( this.wirelessOut.getStack(), false ); } } @@ -168,11 +168,11 @@ public class ContainerSecurity extends ContainerMEMonitorable implements IAEAppE this.wirelessOut.putStack( term ); // update the two slots in question... - for( final Object crafter : this.crafters ) + for( final Object crafter : this.listeners ) { - final ICrafting icrafting = (ICrafting) crafter; - icrafting.sendSlotContents( this, this.wirelessIn.slotNumber, this.wirelessIn.getStack() ); - icrafting.sendSlotContents( this, this.wirelessOut.slotNumber, this.wirelessOut.getStack() ); + final IContainerListener IContainerListener = (IContainerListener) crafter; + IContainerListener.sendSlotContents( this, this.wirelessIn.slotNumber, this.wirelessIn.getStack() ); + IContainerListener.sendSlotContents( this, this.wirelessOut.slotNumber, this.wirelessOut.getStack() ); } } } diff --git a/src/main/java/appeng/container/implementations/ContainerUpgradeable.java b/src/main/java/appeng/container/implementations/ContainerUpgradeable.java index 1c7706953..320fcd790 100644 --- a/src/main/java/appeng/container/implementations/ContainerUpgradeable.java +++ b/src/main/java/appeng/container/implementations/ContainerUpgradeable.java @@ -23,7 +23,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.config.FuzzyMode; diff --git a/src/main/java/appeng/container/slot/AppEngCraftingSlot.java b/src/main/java/appeng/container/slot/AppEngCraftingSlot.java index dad04147a..5724840fa 100644 --- a/src/main/java/appeng/container/slot/AppEngCraftingSlot.java +++ b/src/main/java/appeng/container/slot/AppEngCraftingSlot.java @@ -88,54 +88,54 @@ public class AppEngCraftingSlot extends AppEngSlot par1ItemStack.onCrafting( this.thePlayer.worldObj, this.thePlayer, this.amountCrafted ); this.amountCrafted = 0; - if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.crafting_table ) ) + if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.CRAFTING_TABLE ) ) { - this.thePlayer.addStat( AchievementList.buildWorkBench, 1 ); + this.thePlayer.addStat( AchievementList.BUILD_WORK_BENCH, 1 ); } if( par1ItemStack.getItem() instanceof ItemPickaxe ) { - this.thePlayer.addStat( AchievementList.buildPickaxe, 1 ); + this.thePlayer.addStat( AchievementList.BUILD_PICKAXE, 1 ); } - if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.furnace ) ) + if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.FURNACE ) ) { - this.thePlayer.addStat( AchievementList.buildFurnace, 1 ); + this.thePlayer.addStat( AchievementList.BUILD_FURNACE, 1 ); } if( par1ItemStack.getItem() instanceof ItemHoe ) { - this.thePlayer.addStat( AchievementList.buildHoe, 1 ); + this.thePlayer.addStat( AchievementList.BUILD_HOE, 1 ); } - if( par1ItemStack.getItem() == Items.bread ) + if( par1ItemStack.getItem() == Items.BREAD ) { - this.thePlayer.addStat( AchievementList.makeBread, 1 ); + this.thePlayer.addStat( AchievementList.MAKE_BREAD, 1 ); } - if( par1ItemStack.getItem() == Items.cake ) + if( par1ItemStack.getItem() == Items.CAKE ) { - this.thePlayer.addStat( AchievementList.bakeCake, 1 ); + this.thePlayer.addStat( AchievementList.BAKE_CAKE, 1 ); } if( par1ItemStack.getItem() instanceof ItemPickaxe && ( (ItemTool) par1ItemStack.getItem() ).getToolMaterial() != Item.ToolMaterial.WOOD ) { - this.thePlayer.addStat( AchievementList.buildBetterPickaxe, 1 ); + this.thePlayer.addStat( AchievementList.BUILD_BETTER_PICKAXE, 1 ); } if( par1ItemStack.getItem() instanceof ItemSword ) { - this.thePlayer.addStat( AchievementList.buildSword, 1 ); + this.thePlayer.addStat( AchievementList.BUILD_SWORD, 1 ); } - if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.enchanting_table ) ) + if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.ENCHANTING_TABLE ) ) { - this.thePlayer.addStat( AchievementList.enchantments, 1 ); + this.thePlayer.addStat( AchievementList.ENCHANTMENTS, 1 ); } - if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.bookshelf ) ) + if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.BOOKSHELF ) ) { - this.thePlayer.addStat( AchievementList.bookcase, 1 ); + this.thePlayer.addStat( AchievementList.BOOKCASE, 1 ); } } @@ -152,7 +152,7 @@ public class AppEngCraftingSlot extends AppEngSlot ic.setInventorySlotContents( x, this.craftMatrix.getStackInSlot( x ) ); } - final ItemStack[] aitemstack = CraftingManager.getInstance().func_180303_b( ic, playerIn.worldObj ); + final ItemStack[] aitemstack = CraftingManager.getInstance().getRemainingItems( ic, playerIn.worldObj ); for( int x = 0; x < this.craftMatrix.getSizeInventory(); x++ ) { @@ -179,7 +179,7 @@ public class AppEngCraftingSlot extends AppEngSlot } else if( !this.thePlayer.inventory.addItemStackToInventory( itemstack2 ) ) { - this.thePlayer.dropPlayerItemWithRandomChoice( itemstack2, false ); + this.thePlayer.dropItem( itemstack2, false ); } } } diff --git a/src/main/java/appeng/container/slot/SlotCraftingTerm.java b/src/main/java/appeng/container/slot/SlotCraftingTerm.java index 2b4e1c63a..e845289ba 100644 --- a/src/main/java/appeng/container/slot/SlotCraftingTerm.java +++ b/src/main/java/appeng/container/slot/SlotCraftingTerm.java @@ -28,7 +28,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import appeng.api.config.Actionable; import appeng.api.networking.energy.IEnergySource; diff --git a/src/main/java/appeng/container/slot/SlotRestrictedInput.java b/src/main/java/appeng/container/slot/SlotRestrictedInput.java index 4a586c0d2..1100ca876 100644 --- a/src/main/java/appeng/container/slot/SlotRestrictedInput.java +++ b/src/main/java/appeng/container/slot/SlotRestrictedInput.java @@ -258,7 +258,7 @@ public class SlotRestrictedInput extends AppEngSlot public static boolean isMetalIngot( final ItemStack i ) { - if( Platform.isSameItemPrecise( i, new ItemStack( Items.iron_ingot ) ) ) + if( Platform.isSameItemPrecise( i, new ItemStack( Items.IRON_INGOT ) ) ) { return true; } diff --git a/src/main/java/appeng/core/AEConfig.java b/src/main/java/appeng/core/AEConfig.java index a94fa5e9e..d6a4b978c 100644 --- a/src/main/java/appeng/core/AEConfig.java +++ b/src/main/java/appeng/core/AEConfig.java @@ -243,9 +243,9 @@ public final class AEConfig extends Configuration implements IConfigurableObject this.priorityByStacks[btnNum] = Math.abs( pmb.getInt( this.priorityByStacks[btnNum] ) ); this.levelByStacks[btnNum] = Math.abs( pmb.getInt( this.levelByStacks[btnNum] ) ); - cmb.comment = "Controls buttons on Crafting Screen : Capped at " + buttonCap; - pmb.comment = "Controls buttons on Priority Screen : Capped at " + buttonCap; - lmb.comment = "Controls buttons on Level Emitter Screen : Capped at " + buttonCap; + cmb.setComment( "Controls buttons on Crafting Screen : Capped at " + buttonCap ); + pmb.setComment( "Controls buttons on Priority Screen : Capped at " + buttonCap ); + lmb.setComment( "Controls buttons on Level Emitter Screen : Capped at " + buttonCap ); this.craftByStacks[btnNum] = Math.min( this.craftByStacks[btnNum], buttonCap ); this.priorityByStacks[btnNum] = Math.min( this.priorityByStacks[btnNum], buttonCap ); @@ -353,7 +353,7 @@ public final class AEConfig extends Configuration implements IConfigurableObject @SubscribeEvent public void onConfigChanged( final ConfigChangedEvent.OnConfigChangedEvent eventArgs ) { - if( eventArgs.modID.equals( AppEng.MOD_ID ) ) + if( eventArgs.getModID().equals( AppEng.MOD_ID ) ) { this.clientSync(); } @@ -378,7 +378,7 @@ public final class AEConfig extends Configuration implements IConfigurableObject this.setCategoryComment( "OreCamouflage", "AE2 Automatically uses alternative ores present in your instance of MC to blend better with its surroundings, if you prefer you can disable this selectively using these flags; Its important to note, that some if these items even if enabled may not be craftable in game because other items are overriding their recipes." ); final Property p = this.get( "OreCamouflage", mt.name(), true ); - p.comment = "OreDictionary Names: " + mt.getOreName(); + p.setComment( "OreDictionary Names: " + mt.getOreName() ); return !p.getBoolean( true ); } diff --git a/src/main/java/appeng/core/AELog.java b/src/main/java/appeng/core/AELog.java index 3f0c0fc1c..560d48ab8 100644 --- a/src/main/java/appeng/core/AELog.java +++ b/src/main/java/appeng/core/AELog.java @@ -26,7 +26,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import appeng.core.features.AEFeature; import appeng.tile.AEBaseTile; diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 94be29101..1a931520f 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -61,7 +61,7 @@ import appeng.services.version.VersionCheckerConfig; import appeng.util.Platform; -@Mod( modid = AppEng.MOD_ID, acceptedMinecraftVersions = "[1.8.9]", name = AppEng.MOD_NAME, version = AEConfig.VERSION, dependencies = AppEng.MOD_DEPENDENCIES, guiFactory = "appeng.client.gui.config.AEConfigGuiFactory" ) +@Mod( modid = AppEng.MOD_ID, acceptedMinecraftVersions = "[1.9.4]", name = AppEng.MOD_NAME, version = AEConfig.VERSION, dependencies = AppEng.MOD_DEPENDENCIES, guiFactory = "appeng.client.gui.config.AEConfigGuiFactory" ) public final class AppEng { public static final String MOD_ID = "appliedenergistics2"; diff --git a/src/main/java/appeng/core/CommonHelper.java b/src/main/java/appeng/core/CommonHelper.java index bc93cdf4a..ee3630129 100644 --- a/src/main/java/appeng/core/CommonHelper.java +++ b/src/main/java/appeng/core/CommonHelper.java @@ -25,8 +25,8 @@ import java.util.Random; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.common.SidedProxy; @@ -58,7 +58,7 @@ public abstract class CommonHelper public abstract boolean shouldAddParticles( Random r ); - public abstract MovingObjectPosition getMOP(); + public abstract RayTraceResult getRTR(); public abstract void doRenderItem( ItemStack itemstack, World w ); diff --git a/src/main/java/appeng/core/CreativeTab.java b/src/main/java/appeng/core/CreativeTab.java index 1eecf8159..af4d0b338 100644 --- a/src/main/java/appeng/core/CreativeTab.java +++ b/src/main/java/appeng/core/CreativeTab.java @@ -73,6 +73,6 @@ public final class CreativeTab extends CreativeTabs } } - return new ItemStack( Blocks.chest ); + return new ItemStack( Blocks.CHEST ); } } \ No newline at end of file diff --git a/src/main/java/appeng/core/CreativeTabFacade.java b/src/main/java/appeng/core/CreativeTabFacade.java index 4ad0f2fa8..ba6f10624 100644 --- a/src/main/java/appeng/core/CreativeTabFacade.java +++ b/src/main/java/appeng/core/CreativeTabFacade.java @@ -60,6 +60,6 @@ public final class CreativeTabFacade extends CreativeTabs return ( (ItemFacade) maybeFacade.get() ).getCreativeTabIcon(); } - return new ItemStack( Blocks.planks ); + return new ItemStack( Blocks.PLANKS ); } } \ No newline at end of file diff --git a/src/main/java/appeng/core/FacadeConfig.java b/src/main/java/appeng/core/FacadeConfig.java index f4a7f19e2..b153c57cc 100644 --- a/src/main/java/appeng/core/FacadeConfig.java +++ b/src/main/java/appeng/core/FacadeConfig.java @@ -27,7 +27,6 @@ import java.util.regex.Pattern; import net.minecraft.block.Block; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.common.registry.GameRegistry.UniqueIdentifier; public class FacadeConfig extends Configuration @@ -49,6 +48,7 @@ public class FacadeConfig extends Configuration return false; } + //TODO 1.9.4 - UniqueIdentifier => ResourceLocation ??? final UniqueIdentifier blk = GameRegistry.findUniqueIdentifierFor( id ); if( blk == null ) { diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index 5456326ab..6bf484bbe 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -28,9 +28,8 @@ import com.google.common.base.Preconditions; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandomChestContent; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.common.ChestGenHooks; +import net.minecraft.world.DimensionType; +import net.minecraft.world.biome.Biome; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -117,18 +116,24 @@ import appeng.worldgen.QuartzWorldGen; public final class Registration { private final RecipeHandler recipeHandler; - private BiomeGenBase storageBiome; + private DimensionType storageDimensionType; + private Biome storageBiome; Registration() { this.recipeHandler = new RecipeHandler(); } - public BiomeGenBase getStorageBiome() + public Biome getStorageBiome() { return this.storageBiome; } + public DimensionType getStorageDimensionType() + { + return storageDimensionType; + } + void preInitialize( final FMLPreInitializationEvent event ) { this.registerSpatial( false ); @@ -170,35 +175,38 @@ public final class Registration { if( force && config.storageBiomeID == -1 ) { - config.storageBiomeID = Platform.findEmpty( BiomeGenBase.getBiomeGenArray() ); + config.storageBiomeID = Platform.findEmpty( Biome.REGISTRY, 0, 256 ); if( config.storageBiomeID == -1 ) { throw new IllegalStateException( "Biome Array is full, please free up some Biome ID's or disable spatial." ); } - this.storageBiome = new BiomeGenStorage( config.storageBiomeID ); + this.storageBiome = new BiomeGenStorage(); config.save(); } if( !force && config.storageBiomeID != -1 ) { - this.storageBiome = new BiomeGenStorage( config.storageBiomeID ); + this.storageBiome = new BiomeGenStorage(); } } if( config.storageProviderID != -1 ) { - DimensionManager.registerProviderType( config.storageProviderID, StorageWorldProvider.class, false ); + storageDimensionType = DimensionType.register( "Storage Cell", "_cell", config.storageProviderID, StorageWorldProvider.class, false ); } if( config.storageProviderID == -1 && force ) { config.storageProviderID = -11; - while( !DimensionManager.registerProviderType( config.storageProviderID, StorageWorldProvider.class, false ) ) + //TODO 1.9.4 - Storage provider ids aren't stored anywhere, so no way to find free one. Do something with this! + while( DimensionManager.isDimensionRegistered( config.storageProviderID ) ) { config.storageProviderID--; } + + storageDimensionType = DimensionType.register( "Storage Cell", "_cell", config.storageProviderID, StorageWorldProvider.class, false ); config.save(); } @@ -411,6 +419,7 @@ public final class Registration if( AEConfig.instance.isFeatureEnabled( AEFeature.ChestLoot ) ) { + //TODO 1.9.4 - Chest Gen => Loot Tables final ChestGenHooks d = ChestGenHooks.getInfo( ChestGenHooks.MINESHAFT_CORRIDOR ); final IMaterials materials = definitions.materials(); @@ -447,7 +456,7 @@ public final class Registration /** * You can't move bed rock. */ - mr.blacklistBlock( net.minecraft.init.Blocks.bedrock ); + mr.blacklistBlock( net.minecraft.init.Blocks.BEDROCK ); /* * White List Vanilla... diff --git a/src/main/java/appeng/core/api/ApiPart.java b/src/main/java/appeng/core/api/ApiPart.java index f348237dd..63a943a44 100644 --- a/src/main/java/appeng/core/api/ApiPart.java +++ b/src/main/java/appeng/core/api/ApiPart.java @@ -43,8 +43,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.parts.CableRenderMode; diff --git a/src/main/java/appeng/core/features/BlockDefinition.java b/src/main/java/appeng/core/features/BlockDefinition.java index 3034de907..4a8be1b43 100644 --- a/src/main/java/appeng/core/features/BlockDefinition.java +++ b/src/main/java/appeng/core/features/BlockDefinition.java @@ -30,7 +30,7 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import appeng.api.definitions.IBlockDefinition; diff --git a/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java b/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java index 3682f073a..b32a45236 100644 --- a/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java +++ b/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java @@ -53,24 +53,24 @@ public final class GrinderRecipeManager implements IGrinderRegistry, IOreListene this.ingots = new HashMap(); this.dusts = new HashMap(); - this.addOre( "Coal", new ItemStack( Items.coal ) ); - this.addOre( "Charcoal", new ItemStack( Items.coal, 1, 1 ) ); + this.addOre( "Coal", new ItemStack( Items.COAL ) ); + this.addOre( "Charcoal", new ItemStack( Items.COAL, 1, 1 ) ); - this.addOre( "NetherQuartz", new ItemStack( Blocks.quartz_ore ) ); - this.addIngot( "NetherQuartz", new ItemStack( Items.quartz ) ); + this.addOre( "NetherQuartz", new ItemStack( Blocks.QUARTZ_ORE ) ); + this.addIngot( "NetherQuartz", new ItemStack( Items.QUARTZ ) ); - this.addOre( "Gold", new ItemStack( Blocks.gold_ore ) ); - this.addIngot( "Gold", new ItemStack( Items.gold_ingot ) ); + this.addOre( "Gold", new ItemStack( Blocks.GOLD_ORE ) ); + this.addIngot( "Gold", new ItemStack( Items.GOLD_INGOT ) ); - this.addOre( "Iron", new ItemStack( Blocks.iron_ore ) ); - this.addIngot( "Iron", new ItemStack( Items.iron_ingot ) ); + this.addOre( "Iron", new ItemStack( Blocks.IRON_ORE ) ); + this.addIngot( "Iron", new ItemStack( Items.IRON_INGOT ) ); - this.addOre( "Obsidian", new ItemStack( Blocks.obsidian ) ); + this.addOre( "Obsidian", new ItemStack( Blocks.OBSIDIAN ) ); - this.addIngot( "Ender", new ItemStack( Items.ender_pearl ) ); - this.addIngot( "EnderPearl", new ItemStack( Items.ender_pearl ) ); + this.addIngot( "Ender", new ItemStack( Items.ENDER_PEARL ) ); + this.addIngot( "EnderPearl", new ItemStack( Items.ENDER_PEARL ) ); - this.addIngot( "Wheat", new ItemStack( Items.wheat ) ); + this.addIngot( "Wheat", new ItemStack( Items.WHEAT ) ); OreDictionaryHandler.INSTANCE.observe( this ); } diff --git a/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java b/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java index 607845fa5..47f31b8cd 100644 --- a/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java +++ b/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java @@ -38,7 +38,7 @@ public class MatterCannonAmmoRegistry implements IOreListener, IMatterCannonAmmo public MatterCannonAmmoRegistry() { OreDictionaryHandler.INSTANCE.observe( this ); - this.registerAmmo( new ItemStack( Items.gold_nugget ), 196.96655 ); + this.registerAmmo( new ItemStack( Items.GOLD_NUGGET ), 196.96655 ); } @Override diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java index e9b629424..a58227cef 100644 --- a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java +++ b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java @@ -54,23 +54,23 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry /** * light! */ - this.addNewAttunement( new ItemStack( Blocks.torch ), TunnelType.LIGHT ); - this.addNewAttunement( new ItemStack( Blocks.glowstone ), TunnelType.LIGHT ); + this.addNewAttunement( new ItemStack( Blocks.TORCH ), TunnelType.LIGHT ); + this.addNewAttunement( new ItemStack( Blocks.GLOWSTONE ), TunnelType.LIGHT ); /** * attune based on most redstone base items. */ - this.addNewAttunement( new ItemStack( Items.redstone ), TunnelType.REDSTONE ); - this.addNewAttunement( new ItemStack( Items.repeater ), TunnelType.REDSTONE ); - this.addNewAttunement( new ItemStack( Blocks.redstone_lamp ), TunnelType.REDSTONE ); - this.addNewAttunement( new ItemStack( Blocks.unpowered_comparator ), TunnelType.REDSTONE ); - this.addNewAttunement( new ItemStack( Blocks.powered_comparator ), TunnelType.REDSTONE ); - this.addNewAttunement( new ItemStack( Blocks.powered_repeater ), TunnelType.REDSTONE ); - this.addNewAttunement( new ItemStack( Blocks.unpowered_repeater ), TunnelType.REDSTONE ); - this.addNewAttunement( new ItemStack( Blocks.daylight_detector ), TunnelType.REDSTONE ); - this.addNewAttunement( new ItemStack( Blocks.redstone_wire ), TunnelType.REDSTONE ); - this.addNewAttunement( new ItemStack( Blocks.redstone_block ), TunnelType.REDSTONE ); - this.addNewAttunement( new ItemStack( Blocks.lever ), TunnelType.REDSTONE ); + this.addNewAttunement( new ItemStack( Items.REDSTONE ), TunnelType.REDSTONE ); + this.addNewAttunement( new ItemStack( Items.REPEATER ), TunnelType.REDSTONE ); + this.addNewAttunement( new ItemStack( Blocks.REDSTONE_LAMP ), TunnelType.REDSTONE ); + this.addNewAttunement( new ItemStack( Blocks.UNPOWERED_COMPARATOR ), TunnelType.REDSTONE ); + this.addNewAttunement( new ItemStack( Blocks.POWERED_COMPARATOR ), TunnelType.REDSTONE ); + this.addNewAttunement( new ItemStack( Blocks.POWERED_REPEATER ), TunnelType.REDSTONE ); + this.addNewAttunement( new ItemStack( Blocks.UNPOWERED_REPEATER ), TunnelType.REDSTONE ); + this.addNewAttunement( new ItemStack( Blocks.DAYLIGHT_DETECTOR ), TunnelType.REDSTONE ); + this.addNewAttunement( new ItemStack( Blocks.REDSTONE_WIRE ), TunnelType.REDSTONE ); + this.addNewAttunement( new ItemStack( Blocks.REDSTONE_BLOCK ), TunnelType.REDSTONE ); + this.addNewAttunement( new ItemStack( Blocks.LEVER ), TunnelType.REDSTONE ); this.addNewAttunement( this.getModItem( "EnderIO", "itemRedstoneConduit", OreDictionary.WILDCARD_VALUE ), TunnelType.REDSTONE ); /** @@ -86,9 +86,9 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry this.addNewAttunement( parts.importBus(), TunnelType.ITEM ); this.addNewAttunement( parts.exportBus(), TunnelType.ITEM ); - this.addNewAttunement( new ItemStack( Blocks.hopper ), TunnelType.ITEM ); - this.addNewAttunement( new ItemStack( Blocks.chest ), TunnelType.ITEM ); - this.addNewAttunement( new ItemStack( Blocks.trapped_chest ), TunnelType.ITEM ); + this.addNewAttunement( new ItemStack( Blocks.HOPPER ), TunnelType.ITEM ); + this.addNewAttunement( new ItemStack( Blocks.CHEST ), TunnelType.ITEM ); + this.addNewAttunement( new ItemStack( Blocks.TRAPPED_CHEST ), TunnelType.ITEM ); this.addNewAttunement( this.getModItem( "ExtraUtilities", "extractor_base", 0 ), TunnelType.ITEM ); this.addNewAttunement( this.getModItem( "Mekanism", "PartTransmitter", 9 ), TunnelType.ITEM ); this.addNewAttunement( this.getModItem( "EnderIO", "itemItemConduit", OreDictionary.WILDCARD_VALUE ), TunnelType.ITEM ); @@ -97,10 +97,10 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry /** * attune based on lots of random item related stuff */ - this.addNewAttunement( new ItemStack( Items.bucket ), TunnelType.FLUID ); - this.addNewAttunement( new ItemStack( Items.lava_bucket ), TunnelType.FLUID ); - this.addNewAttunement( new ItemStack( Items.milk_bucket ), TunnelType.FLUID ); - this.addNewAttunement( new ItemStack( Items.water_bucket ), TunnelType.FLUID ); + this.addNewAttunement( new ItemStack( Items.BUCKET ), TunnelType.FLUID ); + this.addNewAttunement( new ItemStack( Items.LAVA_BUCKET ), TunnelType.FLUID ); + this.addNewAttunement( new ItemStack( Items.MILK_BUCKET ), TunnelType.FLUID ); + this.addNewAttunement( new ItemStack( Items.WATER_BUCKET ), TunnelType.FLUID ); this.addNewAttunement( this.getModItem( "Mekanism", "MachineBlock2", 11 ), TunnelType.FLUID ); this.addNewAttunement( this.getModItem( "Mekanism", "PartTransmitter", 4 ), TunnelType.FLUID ); this.addNewAttunement( this.getModItem( "ExtraUtilities", "extractor_base", 6 ), TunnelType.FLUID ); diff --git a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java index 95a39f608..4e3976e44 100644 --- a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java +++ b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java @@ -96,8 +96,8 @@ public final class WorldGenRegistry implements IWorldGen } final boolean isBadProvider = this.types[type.ordinal()].badProviders.contains( w.provider.getClass() ); - final boolean isBadDimension = this.types[type.ordinal()].badDimensions.contains( w.provider.getDimensionId() ); - final boolean isGoodDimension = this.types[type.ordinal()].enabledDimensions.contains( w.provider.getDimensionId() ); + final boolean isBadDimension = this.types[type.ordinal()].badDimensions.contains( w.provider.getDimension() ); + final boolean isGoodDimension = this.types[type.ordinal()].enabledDimensions.contains( w.provider.getDimension() ); if( isBadProvider || isBadDimension ) { diff --git a/src/main/java/appeng/core/localization/ButtonToolTips.java b/src/main/java/appeng/core/localization/ButtonToolTips.java index 0d6895056..72b47c94b 100644 --- a/src/main/java/appeng/core/localization/ButtonToolTips.java +++ b/src/main/java/appeng/core/localization/ButtonToolTips.java @@ -18,9 +18,7 @@ package appeng.core.localization; - -import net.minecraft.util.StatCollector; - +import net.minecraft.util.text.translation.I18n; public enum ButtonToolTips { @@ -153,7 +151,7 @@ public enum ButtonToolTips public String getLocal() { - return StatCollector.translateToLocal( this.getUnlocalized() ); + return I18n.translateToLocal( this.getUnlocalized() ); } public String getUnlocalized() diff --git a/src/main/java/appeng/core/localization/GuiText.java b/src/main/java/appeng/core/localization/GuiText.java index 108646621..d9c2f19e9 100644 --- a/src/main/java/appeng/core/localization/GuiText.java +++ b/src/main/java/appeng/core/localization/GuiText.java @@ -19,7 +19,7 @@ package appeng.core.localization; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; public enum GuiText @@ -199,7 +199,7 @@ public enum GuiText public String getLocal() { - return StatCollector.translateToLocal( this.getUnlocalized() ); + return I18n.translateToLocal( this.getUnlocalized() ); } public String getUnlocalized() diff --git a/src/main/java/appeng/core/localization/PlayerMessages.java b/src/main/java/appeng/core/localization/PlayerMessages.java index 9e238f8a5..ae8c5356f 100644 --- a/src/main/java/appeng/core/localization/PlayerMessages.java +++ b/src/main/java/appeng/core/localization/PlayerMessages.java @@ -19,8 +19,8 @@ package appeng.core.localization; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentTranslation; public enum PlayerMessages @@ -42,9 +42,9 @@ public enum PlayerMessages StationCanNotBeLocated, SettingCleared, ; - public IChatComponent get() + public ITextComponent get() { - return new ChatComponentTranslation( this.getName() ); + return new TextComponentTranslation( this.getName() ); } String getName() diff --git a/src/main/java/appeng/core/localization/WailaText.java b/src/main/java/appeng/core/localization/WailaText.java index 3c940c4a8..9d27bf3c0 100644 --- a/src/main/java/appeng/core/localization/WailaText.java +++ b/src/main/java/appeng/core/localization/WailaText.java @@ -18,9 +18,7 @@ package appeng.core.localization; - -import net.minecraft.util.StatCollector; - +import net.minecraft.util.text.translation.I18n; public enum WailaText { @@ -46,7 +44,7 @@ public enum WailaText public String getLocal() { - return StatCollector.translateToLocal( this.getUnlocalized() ); + return I18n.translateToLocal( this.getUnlocalized() ); } public String getUnlocalized() diff --git a/src/main/java/appeng/core/stats/Stats.java b/src/main/java/appeng/core/stats/Stats.java index a3fd1546d..6743e8bc6 100644 --- a/src/main/java/appeng/core/stats/Stats.java +++ b/src/main/java/appeng/core/stats/Stats.java @@ -21,7 +21,7 @@ package appeng.core.stats; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.stats.StatBasic; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.text.TextComponentTranslation; public enum Stats @@ -51,7 +51,7 @@ public enum Stats { if( this.stat == null ) { - this.stat = new StatBasic( "stat.ae2." + this.name(), new ChatComponentTranslation( "stat.ae2." + this.name() ) ); + this.stat = new StatBasic( "stat.ae2." + this.name(), new TextComponentTranslation( "stat.ae2." + this.name() ) ); this.stat.registerStat(); } diff --git a/src/main/java/appeng/core/sync/GuiBridge.java b/src/main/java/appeng/core/sync/GuiBridge.java index 4c60c3690..59cdfa9c7 100644 --- a/src/main/java/appeng/core/sync/GuiBridge.java +++ b/src/main/java/appeng/core/sync/GuiBridge.java @@ -29,7 +29,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; import net.minecraftforge.fml.relauncher.ReflectionHelper; diff --git a/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java b/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java index b1ec96b3e..cf489cf28 100644 --- a/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java +++ b/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java @@ -58,7 +58,7 @@ public final class AppEngServerPacketHandler extends AppEngPacketHandlerBase imp }; pack.setCallParam( callState ); - PacketThreadUtil.checkThreadAndEnqueue( pack, handler, ( (EntityPlayerMP) player ).getServerForPlayer() ); + PacketThreadUtil.checkThreadAndEnqueue( pack, handler, ( (EntityPlayerMP) player ).getServer() ); callState.call( pack ); } catch( final InstantiationException e ) diff --git a/src/main/java/appeng/core/sync/network/NetworkHandler.java b/src/main/java/appeng/core/sync/network/NetworkHandler.java index 9cbfa9063..48250dbe7 100644 --- a/src/main/java/appeng/core/sync/network/NetworkHandler.java +++ b/src/main/java/appeng/core/sync/network/NetworkHandler.java @@ -82,7 +82,7 @@ public class NetworkHandler @SubscribeEvent public void newConnection( final ServerConnectionFromClientEvent ev ) { - WorldData.instance().dimensionData().sendToPlayer( ev.manager ); + WorldData.instance().dimensionData().sendToPlayer( ev.getManager() ); } @SubscribeEvent @@ -97,12 +97,12 @@ public class NetworkHandler @SubscribeEvent public void serverPacket( final ServerCustomPacketEvent ev ) { - final NetHandlerPlayServer srv = (NetHandlerPlayServer) ev.packet.handler(); + final NetHandlerPlayServer srv = (NetHandlerPlayServer) ev.getPacket().handler(); if( this.serveHandler != null ) { try { - this.serveHandler.onPacketData( null, ev.handler, ev.packet, srv.playerEntity ); + this.serveHandler.onPacketData( null, ev.getHandler(), ev.getPacket(), srv.playerEntity ); } catch( final ThreadQuickExitException ignored ) { @@ -118,7 +118,7 @@ public class NetworkHandler { try { - this.clientHandler.onPacketData( null, ev.handler, ev.packet, null ); + this.clientHandler.onPacketData( null, ev.getHandler(), ev.getPacket(), null ); } catch( final ThreadQuickExitException ignored ) { diff --git a/src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java b/src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java index 6b8612236..b84b4a5cb 100644 --- a/src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java +++ b/src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java @@ -25,7 +25,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/core/sync/packets/PacketClick.java b/src/main/java/appeng/core/sync/packets/PacketClick.java index 3cf98bf32..0f827296b 100644 --- a/src/main/java/appeng/core/sync/packets/PacketClick.java +++ b/src/main/java/appeng/core/sync/packets/PacketClick.java @@ -24,8 +24,8 @@ import io.netty.buffer.Unpooled; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import appeng.api.AEApi; import appeng.api.definitions.IComparableDefinition; diff --git a/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java b/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java index 057050d33..d95e2424e 100644 --- a/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java +++ b/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java @@ -41,8 +41,8 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.storage.data.IAEItemStack; +import appeng.client.gui.implementations.GuICraftingCPU; import appeng.client.gui.implementations.GuiCraftConfirm; -import appeng.client.gui.implementations.GuiCraftingCPU; import appeng.client.gui.implementations.GuiMEMonitorable; import appeng.client.gui.implementations.GuiNetworkStatus; import appeng.core.AELog; @@ -154,9 +154,9 @@ public class PacketMEInventoryUpdate extends AppEngPacket ( (GuiCraftConfirm) gs ).postUpdate( this.list, this.ref ); } - if( gs instanceof GuiCraftingCPU ) + if( gs instanceof GuICraftingCPU ) { - ( (GuiCraftingCPU) gs ).postUpdate( this.list, this.ref ); + ( (GuICraftingCPU) gs ).postUpdate( this.list, this.ref ); } if( gs instanceof GuiMEMonitorable ) diff --git a/src/main/java/appeng/core/sync/packets/PacketMatterCannon.java b/src/main/java/appeng/core/sync/packets/PacketMatterCannon.java index 5faaa6178..5a75cf773 100644 --- a/src/main/java/appeng/core/sync/packets/PacketMatterCannon.java +++ b/src/main/java/appeng/core/sync/packets/PacketMatterCannon.java @@ -96,7 +96,7 @@ public class PacketMatterCannon extends AppEngPacket final World world = FMLClientHandler.instance().getClient().theWorld; for( int a = 1; a < this.len; a++ ) { - final MatterCannonFX fx = new MatterCannonFX( world, this.x + this.dx * a, this.y + this.dy * a, this.z + this.dz * a, Items.diamond ); + final MatterCannonFX fx = new MatterCannonFX( world, this.x + this.dx * a, this.y + this.dy * a, this.z + this.dz * a, Items.DIAMOND ); Minecraft.getMinecraft().effectRenderer.addEffect( fx ); } diff --git a/src/main/java/appeng/core/sync/packets/PacketNewStorageDimension.java b/src/main/java/appeng/core/sync/packets/PacketNewStorageDimension.java index e7886e6ae..31b9768c3 100644 --- a/src/main/java/appeng/core/sync/packets/PacketNewStorageDimension.java +++ b/src/main/java/appeng/core/sync/packets/PacketNewStorageDimension.java @@ -27,7 +27,7 @@ import net.minecraftforge.common.DimensionManager; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import appeng.core.AEConfig; +import appeng.core.AppEng; import appeng.core.sync.AppEngPacket; import appeng.core.sync.network.INetworkInfo; @@ -62,7 +62,7 @@ public class PacketNewStorageDimension extends AppEngPacket { try { - DimensionManager.registerDimension( this.newDim, AEConfig.instance.storageProviderID ); + DimensionManager.registerDimension( this.newDim, AppEng.instance().getRegistration().getStorageDimensionType() ); } catch( final IllegalArgumentException iae ) { diff --git a/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java b/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java index 7814bd2cb..99fd864b1 100644 --- a/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java +++ b/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java @@ -24,8 +24,8 @@ import io.netty.buffer.Unpooled; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import appeng.core.CommonHelper; import appeng.core.sync.AppEngPacket; @@ -73,6 +73,7 @@ public class PacketPartPlacement extends AppEngPacket final EntityPlayerMP sender = (EntityPlayerMP) player; CommonHelper.proxy.updateRenderMode( sender ); PartPlacement.setEyeHeight( this.eyeHeight ); + //TODO 1.9.4 - 2 hands! Just do something! PartPlacement.place( sender.getHeldItem(), new BlockPos( this.x, this.y, this.z ), EnumFacing.VALUES[this.face], sender, sender.worldObj, PartPlacement.PlaceType.INTERACT_FIRST_PASS, 0 ); CommonHelper.proxy.updateRenderMode( null ); } diff --git a/src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java b/src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java index a32b94738..2b9994cbc 100644 --- a/src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java +++ b/src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java @@ -27,8 +27,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -92,16 +92,16 @@ public class PacketTransitionEffect extends AppEngPacket { if( CommonHelper.proxy.shouldAddParticles( Platform.getRandom() ) ) { - final EnergyFx fx = new EnergyFx( world, this.x + ( this.mode ? ( Platform.getRandomInt() % 100 ) * 0.01 : ( Platform.getRandomInt() % 100 ) * 0.005 - 0.25 ), this.y + ( this.mode ? ( Platform.getRandomInt() % 100 ) * 0.01 : ( Platform.getRandomInt() % 100 ) * 0.005 - 0.25 ), this.z + ( this.mode ? ( Platform.getRandomInt() % 100 ) * 0.01 : ( Platform.getRandomInt() % 100 ) * 0.005 - 0.25 ), Items.diamond ); + final EnergyFx fx = new EnergyFx( world, this.x + ( this.mode ? ( Platform.getRandomInt() % 100 ) * 0.01 : ( Platform.getRandomInt() % 100 ) * 0.005 - 0.25 ), this.y + ( this.mode ? ( Platform.getRandomInt() % 100 ) * 0.01 : ( Platform.getRandomInt() % 100 ) * 0.005 - 0.25 ), this.z + ( this.mode ? ( Platform.getRandomInt() % 100 ) * 0.01 : ( Platform.getRandomInt() % 100 ) * 0.005 - 0.25 ), Items.DIAMOND ); if( !this.mode ) { fx.fromItem( this.d ); } - fx.motionX = -0.1 * this.d.xOffset; - fx.motionY = -0.1 * this.d.yOffset; - fx.motionZ = -0.1 * this.d.zOffset; + fx.setMotionX( -0.1f * this.d.xOffset); + fx.setMotionY( -0.1f * this.d.yOffset); + fx.setMotionZ( -0.1f * this.d.zOffset); Minecraft.getMinecraft().effectRenderer.addEffect( fx ); } @@ -111,7 +111,7 @@ public class PacketTransitionEffect extends AppEngPacket { final Block block = world.getBlockState( new BlockPos( (int) this.x, (int) this.y, (int) this.z ) ).getBlock(); - Minecraft.getMinecraft().getSoundHandler().playSound( new PositionedSoundRecord( new ResourceLocation( block.stepSound.getBreakSound() ), ( block.stepSound.getVolume() + 1.0F ) / 2.0F, block.stepSound.getFrequency() * 0.8F, (float) this.x + 0.5F, (float) this.y + 0.5F, (float) this.z + 0.5F ) ); + Minecraft.getMinecraft().getSoundHandler().playSound( new PositionedSoundRecord( block.getSoundType().getBreakSound(), SoundCategory.BLOCKS, ( block.getSoundType().getVolume() + 1.0F ) / 2.0F, block.getSoundType().getPitch() * 0.8F, (float) this.x + 0.5F, (float) this.y + 0.5F, (float) this.z + 0.5F ) ); } } } diff --git a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java b/src/main/java/appeng/core/sync/packets/PacketValueConfig.java index 07cfcbf3f..a2fe1be38 100644 --- a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java +++ b/src/main/java/appeng/core/sync/packets/PacketValueConfig.java @@ -38,7 +38,7 @@ import appeng.api.config.FuzzyMode; import appeng.api.config.Settings; import appeng.api.util.IConfigManager; import appeng.api.util.IConfigurableObject; -import appeng.client.gui.implementations.GuiCraftingCPU; +import appeng.client.gui.implementations.GuICraftingCPU; import appeng.container.AEBaseContainer; import appeng.container.implementations.ContainerCellWorkbench; import appeng.container.implementations.ContainerCraftConfirm; @@ -97,6 +97,7 @@ public class PacketValueConfig extends AppEngPacket { final Container c = player.openContainer; + //TODO 1.9.4 - 2 hands! Just do something! if( this.Name.equals( "Item" ) && player.getHeldItem() != null && player.getHeldItem().getItem() instanceof IMouseWheelItem ) { final ItemStack is = player.getHeldItem(); @@ -249,9 +250,9 @@ public class PacketValueConfig extends AppEngPacket else if( this.Name.equals( "CraftingStatus" ) && this.Value.equals( "Clear" ) ) { final GuiScreen gs = Minecraft.getMinecraft().currentScreen; - if( gs instanceof GuiCraftingCPU ) + if( gs instanceof GuICraftingCPU ) { - ( (GuiCraftingCPU) gs ).clearItems(); + ( (GuICraftingCPU) gs ).clearItems(); } } else if( c instanceof IConfigurableObject ) diff --git a/src/main/java/appeng/core/worlddata/DimensionData.java b/src/main/java/appeng/core/worlddata/DimensionData.java index 187481f4d..e0b89427e 100644 --- a/src/main/java/appeng/core/worlddata/DimensionData.java +++ b/src/main/java/appeng/core/worlddata/DimensionData.java @@ -33,7 +33,7 @@ import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import appeng.api.util.WorldCoord; -import appeng.core.AEConfig; +import appeng.core.AppEng; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketNewStorageDimension; import appeng.hooks.TickHandler; @@ -88,7 +88,7 @@ final class DimensionData implements IWorldDimensionData, IOnWorldStartable, IOn { for( final Integer storageCellDimID : this.storageCellDimensionIDs ) { - DimensionManager.registerDimension( storageCellDimID, AEConfig.instance.storageProviderID ); + DimensionManager.registerDimension( storageCellDimID, AppEng.instance().getRegistration().getStorageDimensionType() ); } this.config.save(); @@ -111,7 +111,7 @@ final class DimensionData implements IWorldDimensionData, IOnWorldStartable, IOn public void addStorageCell( final int newStorageCellID ) { this.storageCellDimensionIDs.add( newStorageCellID ); - DimensionManager.registerDimension( newStorageCellID, AEConfig.instance.storageProviderID ); + DimensionManager.registerDimension( newStorageCellID, AppEng.instance().getRegistration().getStorageDimensionType() ); NetworkHandler.instance.sendToAll( new PacketNewStorageDimension( newStorageCellID ) ); diff --git a/src/main/java/appeng/debug/BlockChunkloader.java b/src/main/java/appeng/debug/BlockChunkloader.java index aefb2a9aa..c00910ab9 100644 --- a/src/main/java/appeng/debug/BlockChunkloader.java +++ b/src/main/java/appeng/debug/BlockChunkloader.java @@ -38,7 +38,7 @@ public class BlockChunkloader extends AEBaseTileBlock implements LoadingCallback public BlockChunkloader() { - super( Material.iron ); + super( Material.IRON ); this.setTileEntity( TileChunkLoader.class ); ForgeChunkManager.setForcedChunkLoadingCallback( AppEng.instance(), this ); this.setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); diff --git a/src/main/java/appeng/debug/BlockCubeGenerator.java b/src/main/java/appeng/debug/BlockCubeGenerator.java index a820412fd..ec3a56ec2 100644 --- a/src/main/java/appeng/debug/BlockCubeGenerator.java +++ b/src/main/java/appeng/debug/BlockCubeGenerator.java @@ -21,10 +21,14 @@ package appeng.debug; import java.util.EnumSet; +import javax.annotation.Nullable; + import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; @@ -36,13 +40,13 @@ public class BlockCubeGenerator extends AEBaseTileBlock public BlockCubeGenerator() { - super( Material.iron ); + super( Material.IRON ); this.setTileEntity( TileCubeGenerator.class ); this.setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); } @Override - public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { final TileCubeGenerator tcg = this.getTileEntity( w, pos ); if( tcg != null ) diff --git a/src/main/java/appeng/debug/BlockItemGen.java b/src/main/java/appeng/debug/BlockItemGen.java index e9795d0e4..f2f5f0d91 100644 --- a/src/main/java/appeng/debug/BlockItemGen.java +++ b/src/main/java/appeng/debug/BlockItemGen.java @@ -32,7 +32,7 @@ public class BlockItemGen extends AEBaseTileBlock public BlockItemGen() { - super( Material.iron ); + super( Material.IRON ); this.setTileEntity( TileItemGen.class ); this.setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); } diff --git a/src/main/java/appeng/debug/BlockPhantomNode.java b/src/main/java/appeng/debug/BlockPhantomNode.java index d8f576a8a..1f3fe5736 100644 --- a/src/main/java/appeng/debug/BlockPhantomNode.java +++ b/src/main/java/appeng/debug/BlockPhantomNode.java @@ -21,10 +21,14 @@ package appeng.debug; import java.util.EnumSet; +import javax.annotation.Nullable; + import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; @@ -36,13 +40,13 @@ public class BlockPhantomNode extends AEBaseTileBlock public BlockPhantomNode() { - super( Material.iron ); + super( Material.IRON ); this.setTileEntity( TilePhantomNode.class ); this.setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); } @Override - public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { final TilePhantomNode tpn = this.getTileEntity( w, pos ); tpn.triggerCrashMode(); diff --git a/src/main/java/appeng/debug/TileChunkLoader.java b/src/main/java/appeng/debug/TileChunkLoader.java index 3444d199b..73b4ac3d1 100644 --- a/src/main/java/appeng/debug/TileChunkLoader.java +++ b/src/main/java/appeng/debug/TileChunkLoader.java @@ -23,9 +23,9 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.ITickable; -import net.minecraft.world.ChunkCoordIntPair; +import net.minecraft.util.math.ChunkPos; +import net.minecraft.util.text.TextComponentString; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.ForgeChunkManager.Ticket; import net.minecraftforge.common.ForgeChunkManager.Type; @@ -69,17 +69,17 @@ public class TileChunkLoader extends AEBaseTile implements ITickable final MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); if( server != null ) { - final List pl = server.getConfigurationManager().playerEntityList; + final List pl = server.getPlayerList().getPlayerList(); for( final EntityPlayerMP p : pl ) { - p.addChatMessage( new ChatComponentText( "Can't chunk load.." ) ); + p.addChatMessage( new TextComponentString( "Can't chunk load.." ) ); } } return; } AELog.info( "New Ticket " + this.ct.toString() ); - ForgeChunkManager.forceChunk( this.ct, new ChunkCoordIntPair( this.pos.getX() >> 4, this.pos.getZ() >> 4 ) ); + ForgeChunkManager.forceChunk( this.ct, new ChunkPos( this.pos.getX() >> 4, this.pos.getZ() >> 4 ) ); } @Override diff --git a/src/main/java/appeng/debug/TileCubeGenerator.java b/src/main/java/appeng/debug/TileCubeGenerator.java index 8faf3ca5d..987271a63 100644 --- a/src/main/java/appeng/debug/TileCubeGenerator.java +++ b/src/main/java/appeng/debug/TileCubeGenerator.java @@ -22,10 +22,11 @@ package appeng.debug; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.ITickable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; import appeng.core.CommonHelper; import appeng.tile.AEBaseTile; @@ -53,7 +54,7 @@ public class TileCubeGenerator extends AEBaseTile implements ITickable { for( final EntityPlayer e : CommonHelper.proxy.getPlayers() ) { - e.addChatMessage( new ChatComponentText( "Spawning in... " + ( this.countdown / 20 ) ) ); + e.addChatMessage( new TextComponentString( "Spawning in... " + ( this.countdown / 20 ) ) ); } } @@ -80,7 +81,7 @@ public class TileCubeGenerator extends AEBaseTile implements ITickable for( int z = -half; z < half; z++ ) { final BlockPos p = this.pos.add( x, y - 1, z ); - i.onItemUse( this.is.copy(), this.who, this.worldObj, p, side, 0.5f, 0.0f, 0.5f ); + i.onItemUse( this.is.copy(), this.who, this.worldObj, p, EnumHand.MAIN_HAND, side, 0.5f, 0.0f, 0.5f ); } } } @@ -115,7 +116,7 @@ public class TileCubeGenerator extends AEBaseTile implements ITickable this.size = 64; } - player.addChatMessage( new ChatComponentText( "Size: " + this.size ) ); + player.addChatMessage( new TextComponentString( "Size: " + this.size ) ); } else { diff --git a/src/main/java/appeng/debug/TileItemGen.java b/src/main/java/appeng/debug/TileItemGen.java index e9af948b8..277e034f2 100644 --- a/src/main/java/appeng/debug/TileItemGen.java +++ b/src/main/java/appeng/debug/TileItemGen.java @@ -28,7 +28,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; import appeng.tile.AEBaseTile; @@ -42,7 +42,7 @@ public class TileItemGen extends AEBaseTile implements IInventory { if( POSSIBLE_ITEMS.isEmpty() ) { - for( final Object obj : Item.itemRegistry ) + for( final Object obj : Item.REGISTRY ) { final Item mi = (Item) obj; if( mi != null ) @@ -147,7 +147,7 @@ public class TileItemGen extends AEBaseTile implements IInventory } @Override - public IChatComponent getDisplayName() + public ITextComponent getDisplayName() { return null; } diff --git a/src/main/java/appeng/debug/ToolDebugCard.java b/src/main/java/appeng/debug/ToolDebugCard.java index 909f78e87..7dc48fa56 100644 --- a/src/main/java/appeng/debug/ToolDebugCard.java +++ b/src/main/java/appeng/debug/ToolDebugCard.java @@ -27,9 +27,11 @@ import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; import appeng.api.networking.IGridConnection; @@ -62,11 +64,11 @@ public class ToolDebugCard extends AEBaseItem } @Override - public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public EnumActionResult onItemUseFirst( final ItemStack heldItem, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ, final EnumHand hand ) { if( Platform.isClient() ) { - return false; + return EnumActionResult.PASS; } if( player.isSneaking() ) @@ -208,12 +210,12 @@ public class ToolDebugCard extends AEBaseItem } } } - return true; + return EnumActionResult.SUCCESS; } private void outputMsg( final ICommandSender player, final String string ) { - player.addChatMessage( new ChatComponentText( string ) ); + player.addChatMessage( new TextComponentString( string ) ); } private String timeMeasurement( final long nanos ) diff --git a/src/main/java/appeng/debug/ToolEraser.java b/src/main/java/appeng/debug/ToolEraser.java index 5fd0c1dc4..048db3ebe 100644 --- a/src/main/java/appeng/debug/ToolEraser.java +++ b/src/main/java/appeng/debug/ToolEraser.java @@ -26,8 +26,10 @@ import java.util.List; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.core.AELog; @@ -47,11 +49,11 @@ public class ToolEraser extends AEBaseItem } @Override - public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public EnumActionResult onItemUseFirst( final ItemStack heldItem, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ, final EnumHand hand ) { if( Platform.isClient() ) { - return false; + return EnumActionResult.PASS; } final IBlockState state = world.getBlockState( pos ); @@ -86,6 +88,6 @@ public class ToolEraser extends AEBaseItem AELog.info( "Delete " + blocks + " blocks" ); - return true; + return EnumActionResult.SUCCESS; } } diff --git a/src/main/java/appeng/debug/ToolMeteoritePlacer.java b/src/main/java/appeng/debug/ToolMeteoritePlacer.java index 660a69f81..4cc6f40b0 100644 --- a/src/main/java/appeng/debug/ToolMeteoritePlacer.java +++ b/src/main/java/appeng/debug/ToolMeteoritePlacer.java @@ -23,9 +23,11 @@ import java.util.EnumSet; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; import appeng.core.features.AEFeature; @@ -43,11 +45,11 @@ public class ToolMeteoritePlacer extends AEBaseItem } @Override - public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public EnumActionResult onItemUseFirst( final ItemStack heldItem, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ, final EnumHand hand ) { if( Platform.isClient() ) { - return false; + return EnumActionResult.PASS; } final MeteoritePlacer mp = new MeteoritePlacer(); @@ -55,9 +57,9 @@ public class ToolMeteoritePlacer extends AEBaseItem if( !worked ) { - player.addChatMessage( new ChatComponentText( "Un-suitable Location." ) ); + player.addChatMessage( new TextComponentString( "Un-suitable Location." ) ); } - return true; + return EnumActionResult.SUCCESS; } } diff --git a/src/main/java/appeng/debug/ToolReplicatorCard.java b/src/main/java/appeng/debug/ToolReplicatorCard.java index 19f1f9246..45fa8c8cf 100644 --- a/src/main/java/appeng/debug/ToolReplicatorCard.java +++ b/src/main/java/appeng/debug/ToolReplicatorCard.java @@ -28,9 +28,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; @@ -51,13 +53,13 @@ public class ToolReplicatorCard extends AEBaseItem { this.setFeature( EnumSet.of( AEFeature.UnsupportedDeveloperTools, AEFeature.Creative ) ); } - + @Override - public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public EnumActionResult onItemUseFirst( final ItemStack heldItem, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ, final EnumHand hand ) { if( Platform.isClient() ) { - return false; + return EnumActionResult.PASS; } int x = pos.getX(); @@ -73,8 +75,8 @@ public class ToolReplicatorCard extends AEBaseItem tag.setInteger( "y", y ); tag.setInteger( "z", z ); tag.setInteger( "side", side.ordinal() ); - tag.setInteger( "dimid", world.provider.getDimensionId() ); - stack.setTagCompound( tag ); + tag.setInteger( "dimid", world.provider.getDimension() ); + heldItem.setTagCompound( tag ); } else { @@ -83,7 +85,7 @@ public class ToolReplicatorCard extends AEBaseItem } else { - final NBTTagCompound ish = stack.getTagCompound(); + final NBTTagCompound ish = heldItem.getTagCompound(); if( ish != null ) { final int src_x = ish.getInteger( "x" ); @@ -148,6 +150,7 @@ public class ToolReplicatorCard extends AEBaseItem nte.readFromNBT( (NBTTagCompound) data.copy() ); world.setTileEntity( d, nte ); } + //TODO 1.9.4 - markBlockForUpdate => ? world.markBlockForUpdate( d ); } } @@ -178,11 +181,11 @@ public class ToolReplicatorCard extends AEBaseItem this.outputMsg( player, "No Source Defined" ); } } - return true; + return EnumActionResult.SUCCESS; } private void outputMsg( final ICommandSender player, final String string ) { - player.addChatMessage( new ChatComponentText( string ) ); + player.addChatMessage( new TextComponentString( string ) ); } } diff --git a/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java b/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java index 82b99abb5..041f3a0a0 100644 --- a/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java +++ b/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java @@ -25,7 +25,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.AEApi; @@ -67,7 +67,7 @@ public final class ChargedQuartzOreBlock extends QuartzOreBlock } @Override - public void randomDisplayTick( final World w, final BlockPos pos, final IBlockState state, final Random r ) + public void randomDisplayTick( final IBlockState state, final World w, final BlockPos pos, final Random r ) { if( !AEConfig.instance.enableEffects ) { diff --git a/src/main/java/appeng/decorative/solid/ChiseledQuartzBlock.java b/src/main/java/appeng/decorative/solid/ChiseledQuartzBlock.java index 76ede9b78..c2d8e1f1f 100644 --- a/src/main/java/appeng/decorative/solid/ChiseledQuartzBlock.java +++ b/src/main/java/appeng/decorative/solid/ChiseledQuartzBlock.java @@ -31,7 +31,7 @@ public final class ChiseledQuartzBlock extends AEDecorativeBlock { public ChiseledQuartzBlock() { - super( Material.rock ); + super( Material.ROCK ); this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) ); } diff --git a/src/main/java/appeng/decorative/solid/FluixBlock.java b/src/main/java/appeng/decorative/solid/FluixBlock.java index 84030b561..090ca06ac 100644 --- a/src/main/java/appeng/decorative/solid/FluixBlock.java +++ b/src/main/java/appeng/decorative/solid/FluixBlock.java @@ -31,7 +31,7 @@ public final class FluixBlock extends AEDecorativeBlock { public FluixBlock() { - super( Material.rock ); + super( Material.ROCK ); this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) ); } diff --git a/src/main/java/appeng/decorative/solid/QuartzBlock.java b/src/main/java/appeng/decorative/solid/QuartzBlock.java index b1772a00d..80e44f306 100644 --- a/src/main/java/appeng/decorative/solid/QuartzBlock.java +++ b/src/main/java/appeng/decorative/solid/QuartzBlock.java @@ -31,7 +31,7 @@ public final class QuartzBlock extends AEDecorativeBlock { public QuartzBlock() { - super( Material.rock ); + super( Material.ROCK ); this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) ); } diff --git a/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java b/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java index cd4e5aab5..7eb7e40a9 100644 --- a/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java +++ b/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java @@ -22,9 +22,10 @@ package appeng.decorative.solid; import java.util.EnumSet; import net.minecraft.block.material.Material; -import net.minecraft.util.BlockPos; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -40,16 +41,16 @@ public class QuartzGlassBlock extends AEBaseBlock { public QuartzGlassBlock() { - super( Material.glass ); + super( Material.GLASS ); this.setLightOpacity( 0 ); this.setOpaque( false ); this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) ); } @Override - public EnumWorldBlockLayer getBlockLayer() + public BlockRenderLayer getBlockLayer() { - return EnumWorldBlockLayer.CUTOUT; + return BlockRenderLayer.CUTOUT; } @Override @@ -60,16 +61,16 @@ public class QuartzGlassBlock extends AEBaseBlock } @Override - public boolean shouldSideBeRendered( final IBlockAccess w, final BlockPos pos, final EnumFacing side ) + public boolean shouldSideBeRendered( final IBlockState state, final IBlockAccess w, final BlockPos pos, final EnumFacing side ) { - final Material mat = w.getBlockState( pos ).getBlock().getMaterial(); - if( mat == Material.glass || mat == AEGlassMaterial.INSTANCE ) + final Material mat = w.getBlockState( pos ).getBlock().getMaterial(state); + if( mat == Material.GLASS || mat == AEGlassMaterial.INSTANCE ) { - if( w.getBlockState( pos ).getBlock().getRenderType() == this.getRenderType() ) + if( w.getBlockState( pos ).getBlock().getRenderType(state) == this.getRenderType(state) ) { return false; } } - return super.shouldSideBeRendered( w, pos, side ); + return super.shouldSideBeRendered( state, w, pos, side ); } } diff --git a/src/main/java/appeng/decorative/solid/QuartzLampBlock.java b/src/main/java/appeng/decorative/solid/QuartzLampBlock.java index 55613d1ff..bdcb61126 100644 --- a/src/main/java/appeng/decorative/solid/QuartzLampBlock.java +++ b/src/main/java/appeng/decorative/solid/QuartzLampBlock.java @@ -24,7 +24,7 @@ import java.util.Random; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.client.render.effects.VibrantFX; @@ -44,7 +44,7 @@ public class QuartzLampBlock extends QuartzGlassBlock } @Override - public void randomDisplayTick( final World w, final BlockPos pos, final IBlockState state, final Random r ) + public void randomDisplayTick( final IBlockState state, final World w, final BlockPos pos, final Random r ) { if( !AEConfig.instance.enableEffects ) { diff --git a/src/main/java/appeng/decorative/solid/QuartzOreBlock.java b/src/main/java/appeng/decorative/solid/QuartzOreBlock.java index bc50d92ce..ed1a4c4dc 100644 --- a/src/main/java/appeng/decorative/solid/QuartzOreBlock.java +++ b/src/main/java/appeng/decorative/solid/QuartzOreBlock.java @@ -26,9 +26,9 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumWorldBlockLayer; -import net.minecraft.util.MathHelper; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; @@ -49,7 +49,7 @@ public class QuartzOreBlock extends AEBaseBlock public QuartzOreBlock() { - super( Material.rock ); + super( Material.ROCK ); this.setHardness( 3.0F ); this.setResistance( 5.0F ); this.boostBrightnessLow = 0; @@ -59,9 +59,9 @@ public class QuartzOreBlock extends AEBaseBlock } @Override - public EnumWorldBlockLayer getBlockLayer() + public BlockRenderLayer getBlockLayer() { - return EnumWorldBlockLayer.CUTOUT; + return BlockRenderLayer.CUTOUT; } @Override @@ -77,9 +77,9 @@ public class QuartzOreBlock extends AEBaseBlock } @Override - public int getMixedBrightnessForBlock( final IBlockAccess worldIn, final BlockPos pos ) + public int getLightValue( final IBlockState state, final IBlockAccess worldIn, final BlockPos pos ) { - int j1 = super.getMixedBrightnessForBlock( worldIn, pos ); + int j1 = super.getLightValue( state, worldIn, pos ); if( this.enhanceBrightness ) { j1 = Math.max( j1 >> 20, j1 >> 4 ); diff --git a/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java b/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java index 4a860efd9..f058821ca 100644 --- a/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java +++ b/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java @@ -24,7 +24,7 @@ import java.util.EnumSet; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import appeng.api.util.IOrientable; @@ -40,7 +40,7 @@ public class QuartzPillarBlock extends AEBaseBlock implements IOrientableBlock public QuartzPillarBlock() { - super( Material.rock ); + super( Material.ROCK ); this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) ); } diff --git a/src/main/java/appeng/decorative/solid/SkyStoneBlock.java b/src/main/java/appeng/decorative/solid/SkyStoneBlock.java index ae67a9c7d..f097b30c4 100644 --- a/src/main/java/appeng/decorative/solid/SkyStoneBlock.java +++ b/src/main/java/appeng/decorative/solid/SkyStoneBlock.java @@ -25,8 +25,9 @@ import com.google.common.base.Optional; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerEvent; @@ -41,13 +42,13 @@ import appeng.util.Platform; public class SkyStoneBlock extends AEBaseBlock { private static final float BLOCK_RESISTANCE = 150.0f; - private static final double BREAK_SPEAK_SCALAR = 0.1; + private static final float BREAK_SPEAK_SCALAR = 0.1f; private static final double BREAK_SPEAK_THRESHOLD = 7.0; private final SkystoneType type; public SkyStoneBlock( final SkystoneType type ) { - super( Material.rock, Optional.of( type.name() ) ); + super( Material.ROCK, Optional.of( type.name() ) ); this.setHardness( 50 ); this.setHasSubtypes( true ); this.blockResistance = BLOCK_RESISTANCE; @@ -65,9 +66,9 @@ public class SkyStoneBlock extends AEBaseBlock @SubscribeEvent public void breakFaster( final PlayerEvent.BreakSpeed event ) { - if( event.state.getBlock() == this && event.entityPlayer != null ) + if( event.getState().getBlock() == this && event.getEntityPlayer() != null ) { - final ItemStack is = event.entityPlayer.inventory.getCurrentItem(); + final ItemStack is = event.getEntityPlayer().getItemStackFromSlot( EntityEquipmentSlot.MAINHAND ); int level = -1; if( is != null && is.getItem() != null ) @@ -75,9 +76,9 @@ public class SkyStoneBlock extends AEBaseBlock level = is.getItem().getHarvestLevel( is, "pickaxe" ); } - if( this.type != SkystoneType.STONE || level >= 3 || event.originalSpeed > BREAK_SPEAK_THRESHOLD ) + if( this.type != SkystoneType.STONE || level >= 3 || event.getOriginalSpeed() > BREAK_SPEAK_THRESHOLD ) { - event.newSpeed /= BREAK_SPEAK_SCALAR; + event.setNewSpeed( event.getNewSpeed() / BREAK_SPEAK_SCALAR ); } } } diff --git a/src/main/java/appeng/decorative/stair/StairBlockDefinition.java b/src/main/java/appeng/decorative/stair/StairBlockDefinition.java index bb5e3e8e9..c18e902df 100644 --- a/src/main/java/appeng/decorative/stair/StairBlockDefinition.java +++ b/src/main/java/appeng/decorative/stair/StairBlockDefinition.java @@ -10,7 +10,7 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import appeng.api.definitions.IBlockDefinition; diff --git a/src/main/java/appeng/entity/AEBaseEntityItem.java b/src/main/java/appeng/entity/AEBaseEntityItem.java index a17dcdfc5..cc3db0214 100644 --- a/src/main/java/appeng/entity/AEBaseEntityItem.java +++ b/src/main/java/appeng/entity/AEBaseEntityItem.java @@ -24,7 +24,7 @@ import java.util.List; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; diff --git a/src/main/java/appeng/entity/EntityChargedQuartz.java b/src/main/java/appeng/entity/EntityChargedQuartz.java index 55d1dcdb0..aa1590a92 100644 --- a/src/main/java/appeng/entity/EntityChargedQuartz.java +++ b/src/main/java/appeng/entity/EntityChargedQuartz.java @@ -22,13 +22,14 @@ package appeng.entity; import java.util.List; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import appeng.api.AEApi; @@ -79,7 +80,8 @@ public final class EntityChargedQuartz extends AEBaseEntityItem final int i = MathHelper.floor_double( this.posY ); final int k = MathHelper.floor_double( this.posZ ); - final Material mat = this.worldObj.getBlockState( new BlockPos( j, i, k ) ).getBlock().getMaterial(); + IBlockState state = this.worldObj.getBlockState( new BlockPos( j, i, k ) ); + final Material mat = state.getBlock().getMaterial( state ); if( Platform.isServer() && mat.isLiquid() ) { this.transformTime++; @@ -104,7 +106,7 @@ public final class EntityChargedQuartz extends AEBaseEntityItem if( materials.certusQuartzCrystalCharged().isSameAs( item ) ) { - final AxisAlignedBB region = AxisAlignedBB.fromBounds( this.posX - 1, this.posY - 1, this.posZ - 1, this.posX + 1, this.posY + 1, this.posZ + 1 ); + final AxisAlignedBB region = new AxisAlignedBB( this.posX - 1, this.posY - 1, this.posZ - 1, this.posX + 1, this.posY + 1, this.posZ + 1 ); final List l = this.getCheckedEntitiesWithinAABBExcludingEntity( region ); EntityItem redstone = null; @@ -117,12 +119,12 @@ public final class EntityChargedQuartz extends AEBaseEntityItem final ItemStack other = ( (EntityItem) e ).getEntityItem(); if( other != null && other.stackSize > 0 ) { - if( Platform.isSameItem( other, new ItemStack( Items.redstone ) ) ) + if( Platform.isSameItem( other, new ItemStack( Items.REDSTONE ) ) ) { redstone = (EntityItem) e; } - if( Platform.isSameItem( other, new ItemStack( Items.quartz ) ) ) + if( Platform.isSameItem( other, new ItemStack( Items.QUARTZ ) ) ) { netherQuartz = (EntityItem) e; } diff --git a/src/main/java/appeng/entity/EntityGrowingCrystal.java b/src/main/java/appeng/entity/EntityGrowingCrystal.java index e59690cdb..1b77a77ed 100644 --- a/src/main/java/appeng/entity/EntityGrowingCrystal.java +++ b/src/main/java/appeng/entity/EntityGrowingCrystal.java @@ -19,14 +19,14 @@ package appeng.entity; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import appeng.api.implementations.items.IGrowableCrystal; @@ -73,11 +73,11 @@ public final class EntityGrowingCrystal extends EntityItem final int i = MathHelper.floor_double( this.posY ); final int k = MathHelper.floor_double( this.posZ ); - final Block blk = this.worldObj.getBlockState( new BlockPos( j, i, k ) ).getBlock(); - final Material mat = blk.getMaterial(); + final IBlockState state = this.worldObj.getBlockState( new BlockPos( j, i, k ) ); + final Material mat = state.getMaterial(); final IGrowableCrystal cry = (IGrowableCrystal) is.getItem(); - final float multiplier = cry.getMultiplier( blk, mat ); + final float multiplier = cry.getMultiplier( state.getBlock(), mat ); final int speed = (int) Math.max( 1, this.getSpeed( j, i, k ) * multiplier ); final boolean isClient = Platform.isClient(); diff --git a/src/main/java/appeng/entity/EntitySingularity.java b/src/main/java/appeng/entity/EntitySingularity.java index 29b0f0157..c7f0ef168 100644 --- a/src/main/java/appeng/entity/EntitySingularity.java +++ b/src/main/java/appeng/entity/EntitySingularity.java @@ -26,8 +26,8 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; @@ -85,7 +85,7 @@ public final class EntitySingularity extends AEBaseEntityItem if( materials.singularity().isSameAs( item ) ) { - final AxisAlignedBB region = AxisAlignedBB.fromBounds( this.posX - 4, this.posY - 4, this.posZ - 4, this.posX + 4, this.posY + 4, this.posZ + 4 ); + final AxisAlignedBB region = new AxisAlignedBB( this.posX - 4, this.posY - 4, this.posZ - 4, this.posX + 4, this.posY + 4, this.posZ + 4 ); final List l = this.getCheckedEntitiesWithinAABBExcludingEntity( region ); for( final Entity e : l ) diff --git a/src/main/java/appeng/entity/EntityTinyTNTPrimed.java b/src/main/java/appeng/entity/EntityTinyTNTPrimed.java index 2c8388f8c..1d478037d 100644 --- a/src/main/java/appeng/entity/EntityTinyTNTPrimed.java +++ b/src/main/java/appeng/entity/EntityTinyTNTPrimed.java @@ -28,11 +28,13 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityTNTPrimed; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; @@ -104,7 +106,7 @@ public final class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntit } } - if( this.fuse <= 0 ) + if( this.getFuse() <= 0 ) { this.setDead(); @@ -117,24 +119,24 @@ public final class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntit { this.worldObj.spawnParticle( EnumParticleTypes.SMOKE_NORMAL, this.posX, this.posY, this.posZ, 0.0D, 0.0D, 0.0D ); } - this.fuse--; + this.setFuse( getFuse() - 1 ); } // override :P void explode() { - this.worldObj.playSoundEffect( this.posX, this.posY, this.posZ, "random.explode", 4.0F, ( 1.0F + ( this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat() ) * 0.2F ) * 32.9F ); + this.worldObj.playSound( null, this.posX, this.posY, this.posZ, SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.BLOCKS, 4.0F, ( 1.0F + ( this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat() ) * 0.2F ) * 32.9F ); if( this.isInWater() ) { return; } - for( final Object e : this.worldObj.getEntitiesWithinAABBExcludingEntity( this, AxisAlignedBB.fromBounds( this.posX - 1.5, this.posY - 1.5f, this.posZ - 1.5, this.posX + 1.5, this.posY + 1.5, this.posZ + 1.5 ) ) ) + for( final Object e : this.worldObj.getEntitiesWithinAABBExcludingEntity( this, new AxisAlignedBB( this.posX - 1.5, this.posY - 1.5f, this.posZ - 1.5, this.posX + 1.5, this.posY + 1.5, this.posZ + 1.5 ) ) ) { if( e instanceof Entity ) { - ( (Entity) e ).attackEntityFrom( DamageSource.setExplosionSource( null ), 6 ); + ( (Entity) e ).attackEntityFrom( DamageSource.causeExplosionDamage( (Explosion) null ), 6 ); } } @@ -152,7 +154,7 @@ public final class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntit final BlockPos point = new BlockPos( x, y, z ); final IBlockState state = this.worldObj.getBlockState( point ); final Block block = state.getBlock(); - if( block != null && !block.isAir( this.worldObj, point ) ) + if( block != null && !block.isAir( state, this.worldObj, point ) ) { float strength = (float) ( 2.3f - ( ( ( x + 0.5f ) - this.posX ) * ( ( x + 0.5f ) - this.posX ) + ( ( y + 0.5f ) - this.posY ) * ( ( y + 0.5f ) - this.posY ) + ( ( z + 0.5f ) - this.posZ ) * ( ( z + 0.5f ) - this.posZ ) ) ); @@ -161,7 +163,7 @@ public final class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntit if( strength > 0.01 ) { - if( block.getMaterial() != Material.air ) + if( block.getMaterial(state) != Material.AIR ) { if( block.canDropFromExplosion( ex ) ) { @@ -183,12 +185,12 @@ public final class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntit @Override public void writeSpawnData( final ByteBuf data ) { - data.writeByte( this.fuse ); + data.writeByte( this.getFuse() ); } @Override public void readSpawnData( final ByteBuf data ) { - this.fuse = data.readByte(); + this.setFuse( data.readByte() );; } } diff --git a/src/main/java/appeng/entity/RenderTinyTNTPrimed.java b/src/main/java/appeng/entity/RenderTinyTNTPrimed.java index f25c7aa61..c6d41b8fa 100644 --- a/src/main/java/appeng/entity/RenderTinyTNTPrimed.java +++ b/src/main/java/appeng/entity/RenderTinyTNTPrimed.java @@ -62,9 +62,9 @@ public class RenderTinyTNTPrimed extends Render GlStateManager.translate( (float) x, (float) y + 0.5F, (float) z ); float f2; - if( tnt.fuse - life + 1.0F < 10.0F ) + if( tnt.getFuse() - life + 1.0F < 10.0F ) { - f2 = 1.0F - ( tnt.fuse - life + 1.0F ) / 10.0F; + f2 = 1.0F - ( tnt.getFuse() - life + 1.0F ) / 10.0F; if( f2 < 0.0F ) { @@ -83,13 +83,13 @@ public class RenderTinyTNTPrimed extends Render } GL11.glScalef( 0.5f, 0.5f, 0.5f ); - f2 = ( 1.0F - ( tnt.fuse - life + 1.0F ) / 100.0F ) * 0.8F; + f2 = ( 1.0F - ( tnt.getFuse() - life + 1.0F ) / 100.0F ) * 0.8F; this.bindEntityTexture( tnt ); GlStateManager.translate( -0.5F, -0.5F, 0.5F ); - blockrendererdispatcher.renderBlockBrightness( Blocks.tnt.getDefaultState(), tnt.getBrightness( life ) ); + blockrendererdispatcher.renderBlockBrightness( Blocks.TNT.getDefaultState(), tnt.getBrightness( life ) ); GlStateManager.translate( 0.0F, 0.0F, 1.0F ); - if( tnt.fuse / 5 % 2 == 0 ) + if( tnt.getFuse() / 5 % 2 == 0 ) { GlStateManager.disableTexture2D(); GlStateManager.disableLighting(); @@ -98,7 +98,7 @@ public class RenderTinyTNTPrimed extends Render GlStateManager.color( 1.0F, 1.0F, 1.0F, f2 ); GlStateManager.doPolygonOffset( -3.0F, -3.0F ); GlStateManager.enablePolygonOffset(); - blockrendererdispatcher.renderBlockBrightness( Blocks.tnt.getDefaultState(), 1.0F ); + blockrendererdispatcher.renderBlockBrightness( Blocks.TNT.getDefaultState(), 1.0F ); GlStateManager.doPolygonOffset( 0.0F, 0.0F ); GlStateManager.disablePolygonOffset(); GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F ); @@ -114,6 +114,6 @@ public class RenderTinyTNTPrimed extends Render @Override protected ResourceLocation getEntityTexture( final Entity entity ) { - return TextureMap.locationBlocksTexture; + return TextureMap.LOCATION_BLOCKS_TEXTURE; } } diff --git a/src/main/java/appeng/facade/FacadePart.java b/src/main/java/appeng/facade/FacadePart.java index 2d4ab8c7a..c76e5493d 100644 --- a/src/main/java/appeng/facade/FacadePart.java +++ b/src/main/java/appeng/facade/FacadePart.java @@ -20,19 +20,21 @@ package appeng.facade; import java.util.EnumSet; + import javax.annotation.Nullable; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -170,7 +172,7 @@ public class FacadePart implements IFacadePart, IBoxProvider } else { - if( blk.canRenderInLayer( EnumWorldBlockLayer.TRANSLUCENT ) ) + if( blk.canRenderInLayer( BlockRenderLayer.TRANSLUCENT ) ) { instance.renderForPass( 1 ); } @@ -178,7 +180,7 @@ public class FacadePart implements IFacadePart, IBoxProvider try { - final int color = ib.getColorFromItemStack( randomItem, 0 ); + final int color = Minecraft.getMinecraft().getItemColors().getColorFromItemstack( randomItem, 0 ); } catch( final Throwable ignored ) { @@ -374,7 +376,7 @@ public class FacadePart implements IFacadePart, IBoxProvider try { - final int color = ib.getColorFromItemStack( randomItem, 0 ); + final int color = Minecraft.getMinecraft().getItemColors().getColorFromItemstack( randomItem, 0 ); instance.setInvColor( color ); } catch( final Throwable error ) @@ -457,7 +459,7 @@ public class FacadePart implements IFacadePart, IBoxProvider final ItemStack is = this.getTexture(); final Block blk = Block.getBlockFromItem( is.getItem() ); - return !blk.isOpaqueCube(); + return !blk.isOpaqueCube(blk.getDefaultState()); } @Nullable diff --git a/src/main/java/appeng/helpers/AEGlassMaterial.java b/src/main/java/appeng/helpers/AEGlassMaterial.java index 5933be7ed..7667ea789 100644 --- a/src/main/java/appeng/helpers/AEGlassMaterial.java +++ b/src/main/java/appeng/helpers/AEGlassMaterial.java @@ -26,7 +26,7 @@ import net.minecraft.block.material.Material; public class AEGlassMaterial extends Material { - public static final AEGlassMaterial INSTANCE = ( new AEGlassMaterial( MapColor.airColor ) ); + public static final AEGlassMaterial INSTANCE = ( new AEGlassMaterial( MapColor.AIR ) ); public AEGlassMaterial( final MapColor color ) { diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 0532c4f85..86bd91acb 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -29,6 +29,7 @@ import java.util.List; import com.google.common.collect.ImmutableSet; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.InventoryCrafting; @@ -37,10 +38,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import appeng.api.AEApi; @@ -1186,19 +1187,20 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn } } - final Block directedBlock = hostWorld.getBlockState( targ ).getBlock(); - ItemStack what = new ItemStack( directedBlock, 1, directedBlock.getDamageValue( hostWorld, targ ) ); + final IBlockState directedBlockState = hostWorld.getBlockState( targ ); + final Block directedBlock = directedBlockState.getBlock(); + ItemStack what = new ItemStack( directedBlock, 1, directedBlock.getMetaFromState( directedBlockState ) ); try { - Vec3 from = new Vec3( hostTile.getPos().getX() + 0.5, hostTile.getPos().getY() + 0.5, hostTile.getPos().getZ() + 0.5 ); + Vec3d from = new Vec3d( hostTile.getPos().getX() + 0.5, hostTile.getPos().getY() + 0.5, hostTile.getPos().getZ() + 0.5 ); from = from.addVector( direction.getFrontOffsetX() * 0.501, direction.getFrontOffsetY() * 0.501, direction.getFrontOffsetZ() * 0.501 ); - final Vec3 to = from.addVector( direction.getFrontOffsetX(), direction.getFrontOffsetY(), direction.getFrontOffsetZ() ); - final MovingObjectPosition mop = hostWorld.rayTraceBlocks( from, to, true ); + final Vec3d to = from.addVector( direction.getFrontOffsetX(), direction.getFrontOffsetY(), direction.getFrontOffsetZ() ); + final RayTraceResult mop = hostWorld.rayTraceBlocks( from, to, true ); if( mop != null && !BAD_BLOCKS.contains( directedBlock ) ) { if( mop.getBlockPos().equals( directedTile.getPos() ) ) { - final ItemStack g = directedBlock.getPickBlock( mop, hostWorld, directedTile.getPos() ); + final ItemStack g = directedBlock.getPickBlock( directedBlockState, mop, hostWorld, directedTile.getPos(), null ); if( g != null ) { what = g; diff --git a/src/main/java/appeng/helpers/ICustomCollision.java b/src/main/java/appeng/helpers/ICustomCollision.java index 02691bcc1..2a842dce8 100644 --- a/src/main/java/appeng/helpers/ICustomCollision.java +++ b/src/main/java/appeng/helpers/ICustomCollision.java @@ -22,8 +22,8 @@ package appeng.helpers; import java.util.List; import net.minecraft.entity.Entity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/appeng/helpers/MetaRotation.java b/src/main/java/appeng/helpers/MetaRotation.java index 7dfd4f431..40f0a053a 100644 --- a/src/main/java/appeng/helpers/MetaRotation.java +++ b/src/main/java/appeng/helpers/MetaRotation.java @@ -21,9 +21,9 @@ package appeng.helpers; import net.minecraft.block.BlockTorch; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Axis; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/appeng/helpers/Splotch.java b/src/main/java/appeng/helpers/Splotch.java index caed7563b..1b1c10c51 100644 --- a/src/main/java/appeng/helpers/Splotch.java +++ b/src/main/java/appeng/helpers/Splotch.java @@ -22,7 +22,7 @@ package appeng.helpers; import io.netty.buffer.ByteBuf; import net.minecraft.util.EnumFacing; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.Vec3d; import appeng.api.util.AEColor; @@ -35,7 +35,7 @@ public class Splotch private final AEColor color; private final int pos; - public Splotch( final AEColor col, final boolean lit, final EnumFacing side, final Vec3 position ) + public Splotch( final AEColor col, final boolean lit, final EnumFacing side, final Vec3d position ) { this.color = col; this.lumen = lit; diff --git a/src/main/java/appeng/hooks/IBlockTool.java b/src/main/java/appeng/hooks/IBlockTool.java index 0c1192d44..5ae8f9d2d 100644 --- a/src/main/java/appeng/hooks/IBlockTool.java +++ b/src/main/java/appeng/hooks/IBlockTool.java @@ -21,8 +21,8 @@ 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.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index d3bc1d70a..2fda43a39 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/src/main/java/appeng/hooks/TickHandler.java @@ -152,7 +152,7 @@ public class TickHandler { for( final IGridNode n : g.getNodes() ) { - if( n.getWorld() == ev.world ) + if( n.getWorld() == ev.getWorld() ) { toDestroy.add( n ); } diff --git a/src/main/java/appeng/integration/abstraction/IBuildCraftCore.java b/src/main/java/appeng/integration/abstraction/IBuildCraftCore.java index 3fd581b7c..3793661ab 100644 --- a/src/main/java/appeng/integration/abstraction/IBuildCraftCore.java +++ b/src/main/java/appeng/integration/abstraction/IBuildCraftCore.java @@ -24,7 +24,7 @@ import javax.annotation.Nullable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** diff --git a/src/main/java/appeng/integration/abstraction/INEI.java b/src/main/java/appeng/integration/abstraction/INEI.java index 817ef8b42..67f2dc3a3 100644 --- a/src/main/java/appeng/integration/abstraction/INEI.java +++ b/src/main/java/appeng/integration/abstraction/INEI.java @@ -19,7 +19,7 @@ package appeng.integration.abstraction; -import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.RenderItem; import net.minecraft.inventory.Slot; diff --git a/src/main/java/appeng/items/contents/NetworkToolViewer.java b/src/main/java/appeng/items/contents/NetworkToolViewer.java index ada678111..cef1b6021 100644 --- a/src/main/java/appeng/items/contents/NetworkToolViewer.java +++ b/src/main/java/appeng/items/contents/NetworkToolViewer.java @@ -21,7 +21,7 @@ package appeng.items.contents; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; import appeng.api.implementations.guiobjects.INetworkTool; import appeng.api.implementations.items.IUpgradeModule; @@ -164,7 +164,7 @@ public class NetworkToolViewer implements INetworkTool } @Override - public IChatComponent getDisplayName() + public ITextComponent getDisplayName() { return this.inv.getDisplayName(); } diff --git a/src/main/java/appeng/items/materials/MultiItem.java b/src/main/java/appeng/items/materials/MultiItem.java index d2f69e8c5..359bab76e 100644 --- a/src/main/java/appeng/items/materials/MultiItem.java +++ b/src/main/java/appeng/items/materials/MultiItem.java @@ -43,9 +43,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; -import net.minecraft.util.Vec3; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -298,7 +300,7 @@ public final class MultiItem extends AEBaseItem implements IStorageComponent, IU } @Override - public boolean onItemUseFirst( final ItemStack is, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public EnumActionResult onItemUseFirst( final ItemStack is, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ, final EnumHand hand ) { if( player.isSneaking() ) { @@ -307,7 +309,7 @@ public final class MultiItem extends AEBaseItem implements IStorageComponent, IU if( te instanceof IPartHost ) { - final SelectedPart sp = ( (IPartHost) te ).selectPart( new Vec3( hitX, hitY, hitZ ) ); + final SelectedPart sp = ( (IPartHost) te ).selectPart( new Vec3d( hitX, hitY, hitZ ) ); if( sp.part instanceof IUpgradeableHost ) { upgrades = ( (ISegmentedInventory) sp.part ).getInventoryByName( "upgrades" ); @@ -330,17 +332,17 @@ public final class MultiItem extends AEBaseItem implements IStorageComponent, IU { if( player.worldObj.isRemote ) { - return false; + return EnumActionResult.PASS; } player.inventory.setInventorySlotContents( player.inventory.currentItem, ad.addItems( is ) ); - return true; + return EnumActionResult.SUCCESS; } } } } - return super.onItemUseFirst( is, player, world, pos, side, hitX, hitY, hitZ ); + return super.onItemUseFirst( is, player, world, pos, side, hitX, hitY, hitZ, hand ); } @Override diff --git a/src/main/java/appeng/items/misc/ItemCrystalSeed.java b/src/main/java/appeng/items/misc/ItemCrystalSeed.java index 18ef9e5f5..9181d67d0 100644 --- a/src/main/java/appeng/items/misc/ItemCrystalSeed.java +++ b/src/main/java/appeng/items/misc/ItemCrystalSeed.java @@ -28,7 +28,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/appeng/items/misc/ItemEncodedPattern.java b/src/main/java/appeng/items/misc/ItemEncodedPattern.java index 818037fa4..77eaed1af 100644 --- a/src/main/java/appeng/items/misc/ItemEncodedPattern.java +++ b/src/main/java/appeng/items/misc/ItemEncodedPattern.java @@ -26,13 +26,16 @@ import java.util.WeakHashMap; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -101,17 +104,17 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt } @Override - public ItemStack onItemRightClick( final ItemStack stack, final World w, final EntityPlayer player ) + public ActionResult onItemRightClick( final ItemStack stack, final World w, final EntityPlayer player, final EnumHand hand ) { this.clearPattern( stack, player ); - return stack; + return new ActionResult( EnumActionResult.SUCCESS, stack ); } @Override - public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public EnumActionResult onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ, final EnumHand hand ) { - return this.clearPattern( stack, player ); + return this.clearPattern( stack, player ) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; } private boolean clearPattern( final ItemStack stack, final EntityPlayer player ) @@ -149,7 +152,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt if( details == null ) { - lines.add( EnumChatFormatting.RED + GuiText.InvalidPattern.getLocal() ); + lines.add( TextFormatting.RED + GuiText.InvalidPattern.getLocal() ); return; } diff --git a/src/main/java/appeng/items/misc/ItemPaintBall.java b/src/main/java/appeng/items/misc/ItemPaintBall.java index 38b3da289..5856dcf6c 100644 --- a/src/main/java/appeng/items/misc/ItemPaintBall.java +++ b/src/main/java/appeng/items/misc/ItemPaintBall.java @@ -24,7 +24,7 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -82,6 +82,7 @@ public class ItemPaintBall extends AEBaseItem return ( is.getItemDamage() >= DAMAGE_THRESHOLD ? GuiText.Lumen.getLocal() + ' ' : "" ) + this.getColor( is ); } + //TODO 1.9.4 - Move to IItemColor @Override public int getColorFromItemStack( final ItemStack stack, final int renderPass ) { diff --git a/src/main/java/appeng/items/parts/ItemFacade.java b/src/main/java/appeng/items/parts/ItemFacade.java index 1de8104fe..718070ae2 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/ItemFacade.java @@ -34,13 +34,14 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.common.registry.GameRegistry.UniqueIdentifier; import appeng.api.AEApi; import appeng.api.exceptions.MissingDefinition; @@ -68,9 +69,9 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte } @Override - public boolean onItemUseFirst( final ItemStack is, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public EnumActionResult onItemUseFirst( final ItemStack is, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ, final EnumHand hand ) { - return AEApi.instance().partHelper().placeBus( is, pos, side, player, world ); + return AEApi.instance().partHelper().placeBus( is, pos, side, player, world ) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; } @Override @@ -104,7 +105,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte if( this.subTypes == null ) { this.subTypes = new ArrayList( 1000 ); - for( final Object blk : Block.blockRegistry ) + for( final Object blk : Block.REGISTRY ) { final Block b = (Block) blk; try @@ -154,7 +155,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte final boolean enableGlass = b instanceof BlockGlass || b instanceof BlockStainedGlass; final boolean disableOre = b instanceof QuartzOreBlock; - final boolean defaultValue = ( b.isOpaqueCube() && !b.getTickRandomly() && !hasTile && !disableOre ) || enableGlass; + final boolean defaultValue = ( b.isOpaqueCube(b.getDefaultState()) && !b.getTickRandomly() && !hasTile && !disableOre ) || enableGlass; if( FacadeConfig.instance.checkEnabled( b, metadata, defaultValue ) ) { if( returnItem ) @@ -168,6 +169,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte ds[0] = Item.getIdFromItem( l.getItem() ); ds[1] = metadata; data.setIntArray( "x", ds ); + //TODO 1.9.4 - UniqueIdentifier => ResourceLocation ??? final UniqueIdentifier ui = GameRegistry.findUniqueIdentifierFor( l.getItem() ); data.setString( "modid", ui.modId ); data.setString( "itemname", ui.name ); @@ -238,7 +240,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte } } } - return Blocks.glass; + return Blocks.GLASS; } public List getFacades() @@ -252,7 +254,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte this.calculateSubTypes(); if( this.subTypes.isEmpty() ) { - return new ItemStack( Items.cake ); + return new ItemStack( Items.CAKE ); } return this.subTypes.get( 0 ); } @@ -282,7 +284,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte } final Block blk = Block.getBlockFromItem( out.getItem() ); - if( blk != null && blk.canRenderInLayer( EnumWorldBlockLayer.TRANSLUCENT ) ) + if( blk != null && blk.canRenderInLayer( BlockRenderLayer.TRANSLUCENT ) ) { return true; } diff --git a/src/main/java/appeng/items/parts/ItemMultiPart.java b/src/main/java/appeng/items/parts/ItemMultiPart.java index c598cdd36..8d6320d68 100644 --- a/src/main/java/appeng/items/parts/ItemMultiPart.java +++ b/src/main/java/appeng/items/parts/ItemMultiPart.java @@ -29,6 +29,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; + import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -39,9 +40,11 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -176,14 +179,14 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG } @Override - public boolean onItemUse( final ItemStack is, final EntityPlayer player, final World w, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public EnumActionResult onItemUse( final ItemStack is, final EntityPlayer player, final World w, final BlockPos pos, final EnumHand hand, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( this.getTypeByStack( is ) == PartType.InvalidType ) { - return false; + return EnumActionResult.PASS; } - return AEApi.instance().partHelper().placeBus( is, pos, side, player, w ); + return AEApi.instance().partHelper().placeBus( is, pos, side, player, w ) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; } @Override diff --git a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java index 59d1669df..2104ff079 100644 --- a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java @@ -29,8 +29,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.AEApi; @@ -217,10 +220,10 @@ public final class ItemBasicStorageCell extends AEBaseItem implements IStorageCe } @Override - public ItemStack onItemRightClick( final ItemStack stack, final World world, final EntityPlayer player ) + public ActionResult onItemRightClick( final ItemStack stack, final World world, final EntityPlayer player, final EnumHand hand ) { this.disassembleDrive( stack, world, player ); - return stack; + return new ActionResult( EnumActionResult.SUCCESS, stack ); } private boolean disassembleDrive( final ItemStack stack, final World world, final EntityPlayer player ) @@ -246,7 +249,7 @@ public final class ItemBasicStorageCell extends AEBaseItem implements IStorageCe final ItemStack extraB = ia.addItems( this.component.stack( 1 ) ); if( extraB != null ) { - player.dropPlayerItemWithRandomChoice( extraB, false ); + player.dropItem( extraB, false ); } // drop upgrades @@ -257,7 +260,7 @@ public final class ItemBasicStorageCell extends AEBaseItem implements IStorageCe final ItemStack leftStack = ia.addItems( upgradeStack ); if( leftStack != null && upgradeStack.getItem() instanceof IUpgradeModule ) { - player.dropPlayerItemWithRandomChoice( upgradeStack, false ); + player.dropItem( upgradeStack, false ); } } @@ -267,7 +270,7 @@ public final class ItemBasicStorageCell extends AEBaseItem implements IStorageCe final ItemStack extraA = ia.addItems( storageCellStack ); if( extraA != null ) { - player.dropPlayerItemWithRandomChoice( extraA, false ); + player.dropItem( extraA, false ); } } @@ -284,9 +287,9 @@ public final class ItemBasicStorageCell extends AEBaseItem implements IStorageCe } @Override - public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public EnumActionResult onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ, final EnumHand hand ) { - return this.disassembleDrive( stack, world, player ); + return this.disassembleDrive( stack, world, player ) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; } @Override diff --git a/src/main/java/appeng/items/tools/ToolBiometricCard.java b/src/main/java/appeng/items/tools/ToolBiometricCard.java index f25743d79..707eb4368 100644 --- a/src/main/java/appeng/items/tools/ToolBiometricCard.java +++ b/src/main/java/appeng/items/tools/ToolBiometricCard.java @@ -29,6 +29,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.world.World; import appeng.api.config.SecurityPermissions; @@ -56,29 +59,29 @@ public class ToolBiometricCard extends AEBaseItem implements IBiometricCard } @Override - public ItemStack onItemRightClick( final ItemStack is, final World w, final EntityPlayer p ) + public ActionResult onItemRightClick( final ItemStack is, final World w, final EntityPlayer p, final EnumHand hand ) { if( p.isSneaking() ) { this.encode( is, p ); - p.swingItem(); - return is; + p.swingArm( hand ); + return new ActionResult( EnumActionResult.SUCCESS, is ); } - return is; + return new ActionResult( EnumActionResult.PASS, is ); } - + @Override - public boolean itemInteractionForEntity( ItemStack is, final EntityPlayer par2EntityPlayer, final EntityLivingBase target ) + public boolean itemInteractionForEntity( ItemStack is, final EntityPlayer player, final EntityLivingBase target, final EnumHand hand ) { - if( target instanceof EntityPlayer && !par2EntityPlayer.isSneaking() ) + if( target instanceof EntityPlayer && !player.isSneaking() ) { - if( par2EntityPlayer.capabilities.isCreativeMode ) + if( player.capabilities.isCreativeMode ) { - is = par2EntityPlayer.getCurrentEquippedItem(); + is = player.getHeldItem( hand ); } this.encode( is, (EntityPlayer) target ); - par2EntityPlayer.swingItem(); + player.swingArm( hand ); return true; } return false; diff --git a/src/main/java/appeng/items/tools/ToolMemoryCard.java b/src/main/java/appeng/items/tools/ToolMemoryCard.java index c531ad383..a1cc5cca6 100644 --- a/src/main/java/appeng/items/tools/ToolMemoryCard.java +++ b/src/main/java/appeng/items/tools/ToolMemoryCard.java @@ -25,9 +25,12 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; -import net.minecraft.util.StatCollector; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.translation.I18n; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import appeng.api.implementations.items.IMemoryCard; @@ -55,7 +58,7 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard final NBTTagCompound data = this.getData( stack ); if( data.hasKey( "tooltip" ) ) { - lines.add( StatCollector.translateToLocal( this.getLocalizedName( data.getString( "tooltip" ) + ".name", data.getString( "tooltip" ) ) ) ); + lines.add( I18n.translateToLocal( this.getLocalizedName( data.getString( "tooltip" ) + ".name", data.getString( "tooltip" ) ) ) ); } } @@ -70,7 +73,7 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard { for( final String n : name ) { - final String l = StatCollector.translateToLocal( n ); + final String l = I18n.translateToLocal( n ); if( !l.equals( n ) ) { return l; @@ -140,23 +143,23 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard } @Override - public boolean onItemUse( final ItemStack is, final EntityPlayer player, final World w, final BlockPos pos, final EnumFacing side, final float hx, final float hy, final float hz ) + public EnumActionResult onItemUse( final ItemStack is, final EntityPlayer player, final World w, final BlockPos pos, final EnumHand hand, final EnumFacing side, final float hx, final float hy, final float hz ) { if( player.isSneaking() && !w.isRemote ) { final IMemoryCard mem = (IMemoryCard) is.getItem(); mem.notifyUser( player, MemoryCardMessages.SETTINGS_CLEARED ); is.setTagCompound( null ); - return true; + return EnumActionResult.SUCCESS; } else { - return super.onItemUse( is, player, w, pos, side, hx, hy, hz ); + return super.onItemUse( is, player, w, pos, hand, side, hx, hy, hz ); } } - + @Override - public boolean doesSneakBypassUse( final World world, final BlockPos pos, final EntityPlayer player ) + public boolean doesSneakBypassUse( final ItemStack itemstack, final IBlockAccess world, final BlockPos pos, final EntityPlayer player ) { return true; } diff --git a/src/main/java/appeng/items/tools/ToolNetworkTool.java b/src/main/java/appeng/items/tools/ToolNetworkTool.java index d7eed81d6..8acc36876 100644 --- a/src/main/java/appeng/items/tools/ToolNetworkTool.java +++ b/src/main/java/appeng/items/tools/ToolNetworkTool.java @@ -27,10 +27,14 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import appeng.api.implementations.guiobjects.IGuiItem; @@ -75,32 +79,32 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench / } @Override - public ItemStack onItemRightClick( final ItemStack it, final World w, final EntityPlayer p ) + public ActionResult onItemRightClick( final ItemStack it, final World w, final EntityPlayer p, final EnumHand hand ) { if( Platform.isClient() ) { - final MovingObjectPosition mop = ClientHelper.proxy.getMOP(); + final RayTraceResult mop = ClientHelper.proxy.getRTR(); if( mop == null ) { - this.onItemUseFirst( it, p, w, new BlockPos( 0, 0, 0 ), null, 0, 0, 0 ); // eh? + this.onItemUseFirst( it, p, w, new BlockPos( 0, 0, 0 ), null, 0, 0, 0, hand ); // eh? } else { - if( w.getBlockState( mop.getBlockPos() ).getBlock().isAir( w, mop.getBlockPos() ) ) + if( w.getBlockState( mop.getBlockPos() ).getBlock().isAir( w.getBlockState( mop.getBlockPos() ), w, mop.getBlockPos() ) ) { - this.onItemUseFirst( it, p, w, new BlockPos( 0, 0, 0 ), null, 0, 0, 0 ); // eh? + this.onItemUseFirst( it, p, w, new BlockPos( 0, 0, 0 ), null, 0, 0, 0, hand ); // eh? } } } - return it; + return new ActionResult( EnumActionResult.SUCCESS, it ); } @Override - public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public EnumActionResult onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ, final EnumHand hand ) { - final MovingObjectPosition mop = new MovingObjectPosition( new Vec3( hitX, hitY, hitZ ), side, pos ); + final RayTraceResult mop = new RayTraceResult( new Vec3d( hitX, hitY, hitZ ), side, pos ); final TileEntity te = world.getTileEntity( pos ); if( te instanceof IPartHost ) { @@ -109,24 +113,24 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench / { if( part.part instanceof INetworkToolAgent && !( (INetworkToolAgent) part.part ).showNetworkInfo( mop ) ) { - return false; + return EnumActionResult.FAIL; } } } else if( te instanceof INetworkToolAgent && !( (INetworkToolAgent) te ).showNetworkInfo( mop ) ) { - return false; + return EnumActionResult.FAIL; } if( Platform.isClient() ) { NetworkHandler.instance.sendToServer( new PacketClick( pos, side, hitX, hitY, hitZ ) ); } - return true; + return EnumActionResult.SUCCESS; } @Override - public boolean doesSneakBypassUse( final World world, final BlockPos pos, final EntityPlayer player ) + public boolean doesSneakBypassUse( final ItemStack itemstack, final IBlockAccess world, final BlockPos pos, final EntityPlayer player ) { return true; } @@ -135,6 +139,8 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench / { if( side != null ) { + //TODO 1.9.4 - 2 hands! Just do something! + final EnumHand hand = EnumHand.MAIN_HAND; if( !Platform.hasPermissions( new DimensionalCoord( w, pos ), p ) ) { return false; @@ -148,8 +154,8 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench / { if( b.rotateBlock( w, pos, side ) ) { - b.onNeighborBlockChange( w, pos, Platform.AIR_BLOCK.getDefaultState(), Platform.AIR_BLOCK ); - p.swingItem(); + b.neighborChanged( Platform.AIR_BLOCK.getDefaultState(), w, pos, Platform.AIR_BLOCK ); + p.swingArm( hand ); return !w.isRemote; } } @@ -177,7 +183,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench / } else { - b.onBlockActivated( w, pos, w.getBlockState( pos ), p, side, hitX, hitY, hitZ ); + b.onBlockActivated( w, pos, w.getBlockState( pos ), p, hand, is, side, hitX, hitY, hitZ ); } } else diff --git a/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java b/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java index 17cbcf9ad..404c5acfa 100644 --- a/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java +++ b/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java @@ -25,8 +25,8 @@ import com.google.common.base.Optional; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; +import net.minecraft.util.math.AxisAlignedBB; import appeng.core.AEConfig; import appeng.core.features.AEFeature; diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index a98f5226a..82fab0495 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -44,8 +44,8 @@ import net.minecraft.item.ItemSnowball; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; @@ -117,7 +117,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe public void postInit() { super.postInit(); - BlockDispenser.dispenseBehaviorRegistry.putObject( this, new DispenserBlockTool() ); + BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject( this, new DispenserBlockTool() ); } @Override @@ -371,12 +371,12 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe return w.setBlockState( pos, state.withProperty( BlockColored.COLOR, newColor.dye ) ); } - if( blk == Blocks.glass ) + if( blk == Blocks.GLASS ) { - return w.setBlockState( pos, Blocks.stained_glass.getDefaultState().withProperty( BlockStainedGlass.COLOR, newColor.dye ) ); + return w.setBlockState( pos, Blocks.STAINED_GLASS.getDefaultState().withProperty( BlockStainedGlass.COLOR, newColor.dye ) ); } - if( blk == Blocks.stained_glass ) + if( blk == Blocks.STAINED_GLASS ) { final EnumDyeColor color = (EnumDyeColor) state.getValue( BlockStainedGlass.COLOR ); @@ -388,12 +388,12 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe return w.setBlockState( pos, state.withProperty( BlockStainedGlass.COLOR, newColor.dye ) ); } - if( blk == Blocks.glass_pane ) + if( blk == Blocks.GLASS_PANE ) { - return w.setBlockState( pos, Blocks.stained_glass_pane.getDefaultState().withProperty( BlockStainedGlassPane.COLOR, newColor.dye ) ); + return w.setBlockState( pos, Blocks.STAINED_GLASS_PANE.getDefaultState().withProperty( BlockStainedGlassPane.COLOR, newColor.dye ) ); } - if( blk == Blocks.stained_glass_pane ) + if( blk == Blocks.STAINED_GLASS_PANE ) { final EnumDyeColor color = (EnumDyeColor) state.getValue( BlockStainedGlassPane.COLOR ); @@ -405,9 +405,9 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe return w.setBlockState( pos, state.withProperty( BlockStainedGlassPane.COLOR, newColor.dye ) ); } - if( blk == Blocks.hardened_clay ) + if( blk == Blocks.HARDENED_CLAY ) { - return w.setBlockState( pos, Blocks.stained_hardened_clay.getDefaultState().withProperty( BlockColored.COLOR, newColor.dye ) ); + return w.setBlockState( pos, Blocks.STAINED_HARDENED_CLAY.getDefaultState().withProperty( BlockColored.COLOR, newColor.dye ) ); } if( blk instanceof BlockCableBus ) diff --git a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java index 3c48f37f5..93cd9a5e0 100644 --- a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java +++ b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java @@ -36,13 +36,17 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.util.BlockPos; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.MovingObjectPosition.MovingObjectType; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import appeng.api.util.DimensionalCoord; @@ -70,28 +74,28 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT this.heatUp = new HashMap(); this.coolDown = new HashMap(); - this.coolDown.put( new InWorldToolOperationIngredient( Blocks.stone.getDefaultState() ), new InWorldToolOperationResult( new ItemStack( Blocks.cobblestone ) ) ); - this.coolDown.put( new InWorldToolOperationIngredient( Blocks.stonebrick.getDefaultState() ), new InWorldToolOperationResult( new ItemStack( Blocks.stonebrick, 1, 2 ) ) ); - this.coolDown.put( new InWorldToolOperationIngredient( Blocks.lava, true ), new InWorldToolOperationResult( new ItemStack( Blocks.obsidian ) ) ); - this.coolDown.put( new InWorldToolOperationIngredient( Blocks.flowing_lava, true ), new InWorldToolOperationResult( new ItemStack( Blocks.obsidian ) ) ); - this.coolDown.put( new InWorldToolOperationIngredient( Blocks.grass, true ), new InWorldToolOperationResult( new ItemStack( Blocks.dirt ) ) ); + this.coolDown.put( new InWorldToolOperationIngredient( Blocks.STONE.getDefaultState() ), new InWorldToolOperationResult( new ItemStack( Blocks.COBBLESTONE ) ) ); + this.coolDown.put( new InWorldToolOperationIngredient( Blocks.STONEBRICK.getDefaultState() ), new InWorldToolOperationResult( new ItemStack( Blocks.STONEBRICK, 1, 2 ) ) ); + this.coolDown.put( new InWorldToolOperationIngredient( Blocks.LAVA, true ), new InWorldToolOperationResult( new ItemStack( Blocks.OBSIDIAN ) ) ); + this.coolDown.put( new InWorldToolOperationIngredient( Blocks.FLOWING_LAVA, true ), new InWorldToolOperationResult( new ItemStack( Blocks.OBSIDIAN ) ) ); + this.coolDown.put( new InWorldToolOperationIngredient( Blocks.GRASS, true ), new InWorldToolOperationResult( new ItemStack( Blocks.DIRT ) ) ); final List snowBalls = new ArrayList(); - snowBalls.add( new ItemStack( Items.snowball ) ); - this.coolDown.put( new InWorldToolOperationIngredient( Blocks.flowing_water, true ), new InWorldToolOperationResult( null, snowBalls ) ); - this.coolDown.put( new InWorldToolOperationIngredient( Blocks.water, true ), new InWorldToolOperationResult( new ItemStack( Blocks.ice ) ) ); + snowBalls.add( new ItemStack( Items.SNOWBALL ) ); + this.coolDown.put( new InWorldToolOperationIngredient( Blocks.FLOWING_WATER, true ), new InWorldToolOperationResult( null, snowBalls ) ); + this.coolDown.put( new InWorldToolOperationIngredient( Blocks.WATER, true ), new InWorldToolOperationResult( new ItemStack( Blocks.ICE ) ) ); - this.heatUp.put( new InWorldToolOperationIngredient( Blocks.ice.getDefaultState() ), new InWorldToolOperationResult( new ItemStack( Blocks.water ) ) ); - this.heatUp.put( new InWorldToolOperationIngredient( Blocks.flowing_water, true ), new InWorldToolOperationResult() ); - this.heatUp.put( new InWorldToolOperationIngredient( Blocks.water, true ), new InWorldToolOperationResult() ); - this.heatUp.put( new InWorldToolOperationIngredient( Blocks.snow, true ), new InWorldToolOperationResult( new ItemStack( Blocks.flowing_water ) ) ); + this.heatUp.put( new InWorldToolOperationIngredient( Blocks.ICE.getDefaultState() ), new InWorldToolOperationResult( new ItemStack( Blocks.WATER ) ) ); + this.heatUp.put( new InWorldToolOperationIngredient( Blocks.FLOWING_WATER, true ), new InWorldToolOperationResult() ); + this.heatUp.put( new InWorldToolOperationIngredient( Blocks.WATER, true ), new InWorldToolOperationResult() ); + this.heatUp.put( new InWorldToolOperationIngredient( Blocks.SNOW, true ), new InWorldToolOperationResult( new ItemStack( Blocks.FLOWING_WATER ) ) ); } @Override public void postInit() { super.postInit(); - BlockDispenser.dispenseBehaviorRegistry.putObject( this, new DispenserBlockTool() ); + BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject( this, new DispenserBlockTool() ); } private static class InWorldToolOperationIngredient @@ -220,19 +224,21 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT } @Override - public ItemStack onItemRightClick( final ItemStack item, final World w, final EntityPlayer p ) + public ActionResult onItemRightClick( final ItemStack item, final World w, final EntityPlayer p, final EnumHand hand ) { - final MovingObjectPosition target = this.getMovingObjectPositionFromPlayer( w, p, true ); + //TODO 1.9.4 - getRayTraceResultFromPlayer => ? + final RayTraceResult target = this.getRayTraceResultFromPlayer( w, p, true ); if( target == null ) { - return item; + return new ActionResult( EnumActionResult.FAIL, item ); } else { - if( target.typeOfHit == MovingObjectType.BLOCK ) + if( target.typeOfHit == RayTraceResult.Type.BLOCK ) { - if( w.getBlockState( target.getBlockPos() ).getBlock().getMaterial() == Material.lava || w.getBlockState( target.getBlockPos() ).getBlock().getMaterial() == Material.water ) + final IBlockState state = w.getBlockState( target.getBlockPos() ); + if( state.getMaterial() == Material.LAVA || state.getMaterial() == Material.WATER ) { if( Platform.hasPermissions( new DimensionalCoord( w, target.getBlockPos() ), p ) ) { @@ -242,7 +248,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT } } - return item; + return new ActionResult( EnumActionResult.SUCCESS, item ); } @Override @@ -322,7 +328,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT { this.extractAEPower( item, 1600 ); final InWorldToolOperationResult or = InWorldToolOperationResult.getBlockOperationResult( out.toArray( new ItemStack[out.size()] ) ); - w.playSoundEffect( pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F ); + w.playSound( p, pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.PLAYERS, 1.0F, itemRand.nextFloat() * 0.4F + 0.8F ); if( or.getBlockItem() == null ) { @@ -353,8 +359,8 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT if( w.isAirBlock( offsetPos ) ) { this.extractAEPower( item, 1600 ); - w.playSoundEffect( offsetPos.getX() + 0.5D, offsetPos.getY() + 0.5D, offsetPos.getZ() + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F ); - w.setBlockState( offsetPos, Blocks.fire.getDefaultState() ); + w.playSound( p, offsetPos.getX() + 0.5D, offsetPos.getY() + 0.5D, offsetPos.getZ() + 0.5D, SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.PLAYERS, 1.0F, itemRand.nextFloat() * 0.4F + 0.8F ); + w.setBlockState( offsetPos, Blocks.FIRE.getDefaultState() ); } return true; diff --git a/src/main/java/appeng/items/tools/powered/ToolMassCannon.java b/src/main/java/appeng/items/tools/powered/ToolMassCannon.java index e260b259b..05963c622 100644 --- a/src/main/java/appeng/items/tools/powered/ToolMassCannon.java +++ b/src/main/java/appeng/items/tools/powered/ToolMassCannon.java @@ -26,6 +26,7 @@ import com.google.common.base.Optional; import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -34,13 +35,15 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.ActionResult; import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.MovingObjectPosition.MovingObjectType; -import net.minecraft.util.Vec3; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import appeng.api.AEApi; @@ -92,7 +95,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell public void postInit() { super.postInit(); - BlockDispenser.dispenseBehaviorRegistry.putObject( this, new DispenserMatterCannon() ); + BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject( this, new DispenserMatterCannon() ); } @Override @@ -114,7 +117,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell } @Override - public ItemStack onItemRightClick( final ItemStack item, final World w, final EntityPlayer p ) + public ActionResult onItemRightClick( final ItemStack item, final World w, final EntityPlayer p, final EnumHand hand ) { if( this.getAECurrentPower( item ) > 1600 ) { @@ -140,33 +143,33 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell if( Platform.isClient() ) { - return item; + return new ActionResult( EnumActionResult.SUCCESS, item ); } aeAmmo.setStackSize( 1 ); final ItemStack ammo = ( (IAEItemStack) aeAmmo ).getItemStack(); if( ammo == null ) { - return item; + return new ActionResult( EnumActionResult.SUCCESS, item ); } ammo.stackSize = 1; aeAmmo = inv.extractItems( aeAmmo, Actionable.MODULATE, new PlayerSource( p, null ) ); if( aeAmmo == null ) { - return item; + return new ActionResult( EnumActionResult.SUCCESS, item ); } final LookDirection dir = Platform.getPlayerRay( p, p.getEyeHeight() ); - final Vec3 vec3 = dir.getA(); - final Vec3 vec31 = dir.getB(); - final Vec3 direction = vec31.subtract( vec3 ); + final Vec3d Vec3d = dir.getA(); + final Vec3d Vec3d1 = dir.getB(); + final Vec3d direction = Vec3d1.subtract( Vec3d ); direction.normalize(); - final double d0 = vec3.xCoord; - final double d1 = vec3.yCoord; - final double d2 = vec3.zCoord; + final double d0 = Vec3d.xCoord; + final double d1 = Vec3d.yCoord; + final double d2 = Vec3d.zCoord; final float penetration = AEApi.instance().registries().matterCannon().getPenetration( ammo ); // 196.96655f; if( penetration <= 0 ) @@ -174,13 +177,13 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell final ItemStack type = ( (IAEItemStack) aeAmmo ).getItemStack(); if( type.getItem() instanceof ItemPaintBall ) { - this.shootPaintBalls( type, w, p, vec3, vec31, direction, d0, d1, d2 ); + this.shootPaintBalls( type, w, p, Vec3d, Vec3d1, direction, d0, d1, d2 ); } - return item; + return new ActionResult( EnumActionResult.SUCCESS, item ); } else { - this.standardAmmo( penetration, w, p, vec3, vec31, direction, d0, d1, d2 ); + this.standardAmmo( penetration, w, p, Vec3d, Vec3d1, direction, d0, d1, d2 ); } } } @@ -190,16 +193,16 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell { p.addChatMessage( PlayerMessages.AmmoDepleted.get() ); } - return item; + return new ActionResult( EnumActionResult.SUCCESS, item ); } } } - return item; + return new ActionResult( EnumActionResult.FAIL, item ); } - private void shootPaintBalls( final ItemStack type, final World w, final EntityPlayer p, final Vec3 vec3, final Vec3 vec31, final Vec3 direction, final double d0, final double d1, final double d2 ) + private void shootPaintBalls( final ItemStack type, final World w, final EntityPlayer p, final Vec3d Vec3d, final Vec3d Vec3d1, final Vec3d direction, final double d0, final double d1, final double d2 ) { - final AxisAlignedBB bb = AxisAlignedBB.fromBounds( Math.min( vec3.xCoord, vec31.xCoord ), Math.min( vec3.yCoord, vec31.yCoord ), Math.min( vec3.zCoord, vec31.zCoord ), Math.max( vec3.xCoord, vec31.xCoord ), Math.max( vec3.yCoord, vec31.yCoord ), Math.max( vec3.zCoord, vec31.zCoord ) ).expand( 16, 16, 16 ); + final AxisAlignedBB bb = new AxisAlignedBB( Math.min( Vec3d.xCoord, Vec3d1.xCoord ), Math.min( Vec3d.yCoord, Vec3d1.yCoord ), Math.min( Vec3d.zCoord, Vec3d1.zCoord ), Math.max( Vec3d.xCoord, Vec3d1.xCoord ), Math.max( Vec3d.yCoord, Vec3d1.yCoord ), Math.max( Vec3d.zCoord, Vec3d1.zCoord ) ).expand( 16, 16, 16 ); Entity entity = null; final List list = w.getEntitiesWithinAABBExcludingEntity( p, bb ); @@ -214,7 +217,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell if( entity1.isEntityAlive() ) { // prevent killing / flying of mounts. - if( entity1.riddenByEntity == p ) + if( entity1.isRidingOrBeingRiddenBy( p ) ) { continue; } @@ -222,11 +225,11 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell final float f1 = 0.3F; final AxisAlignedBB boundingBox = entity1.getEntityBoundingBox().expand( f1, f1, f1 ); - final MovingObjectPosition movingObjectPosition = boundingBox.calculateIntercept( vec3, vec31 ); + final RayTraceResult RayTraceResult = boundingBox.calculateIntercept( Vec3d, Vec3d1 ); - if( movingObjectPosition != null ) + if( RayTraceResult != null ) { - final double nd = vec3.squareDistanceTo( movingObjectPosition.hitVec ); + final double nd = Vec3d.squareDistanceTo( RayTraceResult.hitVec ); if( nd < closest ) { @@ -238,16 +241,16 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell } } - MovingObjectPosition pos = w.rayTraceBlocks( vec3, vec31, false ); + RayTraceResult pos = w.rayTraceBlocks( Vec3d, Vec3d1, false ); - final Vec3 vec = new Vec3( d0, d1, d2 ); + final Vec3d vec = new Vec3d( d0, d1, d2 ); if( entity != null && pos != null && pos.hitVec.squareDistanceTo( vec ) > closest ) { - pos = new MovingObjectPosition( entity ); + pos = new RayTraceResult( entity ); } else if( entity != null && pos == null ) { - pos = new MovingObjectPosition( entity ); + pos = new RayTraceResult( entity ); } try @@ -266,7 +269,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell final AEColor col = ipb.getColor( type ); // boolean lit = ipb.isLumen( type ); - if( pos.typeOfHit == MovingObjectType.ENTITY ) + if( pos.typeOfHit == RayTraceResult.Type.ENTITY ) { final int id = pos.entityHit.getEntityId(); final PlayerColor marker = new PlayerColor( id, col, 20 * 30 ); @@ -281,7 +284,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell pos.entityHit.attackEntityFrom( DamageSource.causePlayerDamage( p ), 0 ); NetworkHandler.instance.sendToAll( marker.getPacket() ); } - else if( pos.typeOfHit == MovingObjectType.BLOCK ) + else if( pos.typeOfHit == RayTraceResult.Type.BLOCK ) { final EnumFacing side = pos.sideHit; final BlockPos hitPos = pos.getBlockPos().offset( side ); @@ -303,21 +306,21 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell final TileEntity te = w.getTileEntity( hitPos ); if( te instanceof TilePaint ) { - final Vec3 hp = pos.hitVec.subtract( hitPos.getX(), hitPos.getY(), hitPos.getZ() ); + final Vec3d hp = pos.hitVec.subtract( hitPos.getX(), hitPos.getY(), hitPos.getZ() ); ( (TilePaint) te ).addBlot( type, side.getOpposite(), hp ); } } } } - private void standardAmmo( float penetration, final World w, final EntityPlayer p, final Vec3 vec3, final Vec3 vec31, final Vec3 direction, final double d0, final double d1, final double d2 ) + private void standardAmmo( float penetration, final World w, final EntityPlayer p, final Vec3d Vec3d, final Vec3d Vec3d1, final Vec3d direction, final double d0, final double d1, final double d2 ) { boolean hasDestroyed = true; while( penetration > 0 && hasDestroyed ) { hasDestroyed = false; - final AxisAlignedBB bb = AxisAlignedBB.fromBounds( Math.min( vec3.xCoord, vec31.xCoord ), Math.min( vec3.yCoord, vec31.yCoord ), Math.min( vec3.zCoord, vec31.zCoord ), Math.max( vec3.xCoord, vec31.xCoord ), Math.max( vec3.yCoord, vec31.yCoord ), Math.max( vec3.zCoord, vec31.zCoord ) ).expand( 16, 16, 16 ); + final AxisAlignedBB bb = new AxisAlignedBB( Math.min( Vec3d.xCoord, Vec3d1.xCoord ), Math.min( Vec3d.yCoord, Vec3d1.yCoord ), Math.min( Vec3d.zCoord, Vec3d1.zCoord ), Math.max( Vec3d.xCoord, Vec3d1.xCoord ), Math.max( Vec3d.yCoord, Vec3d1.yCoord ), Math.max( Vec3d.zCoord, Vec3d1.zCoord ) ).expand( 16, 16, 16 ); Entity entity = null; final List list = w.getEntitiesWithinAABBExcludingEntity( p, bb ); @@ -332,7 +335,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell if( entity1.isEntityAlive() ) { // prevent killing / flying of mounts. - if( entity1.riddenByEntity == p ) + if( entity1.isRidingOrBeingRiddenBy( p ) ) { continue; } @@ -340,11 +343,11 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell final float f1 = 0.3F; final AxisAlignedBB boundingBox = entity1.getEntityBoundingBox().expand( f1, f1, f1 ); - final MovingObjectPosition movingObjectPosition = boundingBox.calculateIntercept( vec3, vec31 ); + final RayTraceResult RayTraceResult = boundingBox.calculateIntercept( Vec3d, Vec3d1 ); - if( movingObjectPosition != null ) + if( RayTraceResult != null ) { - final double nd = vec3.squareDistanceTo( movingObjectPosition.hitVec ); + final double nd = Vec3d.squareDistanceTo( RayTraceResult.hitVec ); if( nd < closest ) { @@ -356,15 +359,15 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell } } - final Vec3 vec = new Vec3( d0, d1, d2 ); - MovingObjectPosition pos = w.rayTraceBlocks( vec3, vec31, true ); + final Vec3d vec = new Vec3d( d0, d1, d2 ); + RayTraceResult pos = w.rayTraceBlocks( Vec3d, Vec3d1, true ); if( entity != null && pos != null && pos.hitVec.squareDistanceTo( vec ) > closest ) { - pos = new MovingObjectPosition( entity ); + pos = new RayTraceResult( entity ); } else if( entity != null && pos == null ) { - pos = new MovingObjectPosition( entity ); + pos = new RayTraceResult( entity ); } try @@ -381,7 +384,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell final DamageSource dmgSrc = DamageSource.causePlayerDamage( p ); dmgSrc.damageType = "masscannon"; - if( pos.typeOfHit == MovingObjectType.ENTITY ) + if( pos.typeOfHit == RayTraceResult.Type.ENTITY ) { final int dmg = (int) Math.ceil( penetration / 20.0f ); if( pos.entityHit instanceof EntityLivingBase ) @@ -389,8 +392,8 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell final EntityLivingBase el = (EntityLivingBase) pos.entityHit; penetration -= dmg; el.knockBack( p, 0, -direction.xCoord, -direction.zCoord ); - // el.knockBack( p, 0, vec3.xCoord, - // vec3.zCoord ); + // el.knockBack( p, 0, Vec3d.xCoord, + // Vec3d.zCoord ); el.attackEntityFrom( dmgSrc, dmg ); if( !el.isEntityAlive() ) { @@ -407,7 +410,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell hasDestroyed = true; } } - else if( pos.typeOfHit == MovingObjectType.BLOCK ) + else if( pos.typeOfHit == RayTraceResult.Type.BLOCK ) { if( !AEConfig.instance.isFeatureEnabled( AEFeature.MassCannonBlockDamage ) ) { @@ -415,11 +418,11 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell } else { - final Block b = w.getBlockState( pos.getBlockPos() ).getBlock(); + final IBlockState bs = w.getBlockState( pos.getBlockPos() ); // int meta = w.getBlockMetadata( // pos.blockX, pos.blockY, pos.blockZ ); - final float hardness = b.getBlockHardness( w, pos.getBlockPos() ) * 9.0f; + final float hardness = bs.getBlockHardness( w, pos.getBlockPos() ) * 9.0f; if( hardness >= 0.0 ) { if( penetration > hardness && Platform.hasPermissions( new DimensionalCoord( w, pos.getBlockPos() ), p ) ) diff --git a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java index 729c8be35..baf25c8d9 100644 --- a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java +++ b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java @@ -28,7 +28,10 @@ import com.google.common.base.Optional; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -66,10 +69,10 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell, } @Override - public ItemStack onItemRightClick( final ItemStack item, final World w, final EntityPlayer player ) + public ActionResult onItemRightClick( final ItemStack item, final World w, final EntityPlayer player, final EnumHand hand ) { Platform.openGUI( player, null, AEPartLocation.INTERNAL, GuiBridge.GUI_PORTABLE_CELL ); - return item; + return new ActionResult( EnumActionResult.SUCCESS, item ); } @SideOnly( Side.CLIENT ) diff --git a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java index 7b14a3a1f..9d685144f 100644 --- a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java +++ b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java @@ -27,7 +27,10 @@ import com.google.common.base.Optional; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.StatCollector; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -58,10 +61,10 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless } @Override - public ItemStack onItemRightClick( final ItemStack item, final World w, final EntityPlayer player ) + public ActionResult onItemRightClick( final ItemStack item, final World w, final EntityPlayer player, final EnumHand hand ) { AEApi.instance().registries().wireless().openWirelessTerminalGui( item, w, player ); - return item; + return new ActionResult( EnumActionResult.SUCCESS, item ); } @SideOnly( Side.CLIENT ) @@ -95,7 +98,7 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless } else { - lines.add( StatCollector.translateToLocal( "AppEng.GuiITooltip.Unlinked" ) ); + lines.add( I18n.translateToLocal( "AppEng.GuiITooltip.Unlinked" ) ); } } diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java index 35d0f1dd3..3f153191c 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java @@ -25,8 +25,11 @@ 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.ActionResult; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.implementations.guiobjects.IGuiItem; @@ -54,24 +57,24 @@ public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem } @Override - public boolean onItemUse( final ItemStack stack, final EntityPlayer p, final World worldIn, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public EnumActionResult onItemUse( final ItemStack stack, final EntityPlayer p, final World worldIn, final BlockPos pos, final EnumHand hand, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { if( Platform.isServer() ) { Platform.openGUI( p, null, AEPartLocation.INTERNAL, GuiBridge.GUI_QUARTZ_KNIFE ); } - return true; + return EnumActionResult.SUCCESS; } @Override - public ItemStack onItemRightClick( final ItemStack it, final World w, final EntityPlayer p ) + public ActionResult onItemRightClick( final ItemStack it, final World w, final EntityPlayer p, final EnumHand hand ) { if( Platform.isServer() ) { Platform.openGUI( p, null, AEPartLocation.INTERNAL, GuiBridge.GUI_QUARTZ_KNIFE ); } - p.swingItem(); - return it; + p.swingArm( hand ); + return new ActionResult( EnumActionResult.SUCCESS, it ); } @Override diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java index 0f2a26b44..f4c4f16c5 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java @@ -26,8 +26,11 @@ 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.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import appeng.api.implementations.items.IAEWrench; @@ -52,28 +55,28 @@ public class ToolQuartzWrench extends AEBaseItem implements IAEWrench /* , ITool } @Override - public boolean onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) + public EnumActionResult onItemUseFirst( final ItemStack stack, final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ, final EnumHand hand ) { final Block b = world.getBlockState( pos ).getBlock(); if( b != null && !player.isSneaking() && Platform.hasPermissions( new DimensionalCoord( world, pos ), player ) ) { if( Platform.isClient() ) { - return !world.isRemote; + return !world.isRemote ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; } if( b.rotateBlock( world, pos, side ) ) { - b.onNeighborBlockChange( world, pos, Platform.AIR_BLOCK.getDefaultState(), Platform.AIR_BLOCK ); - player.swingItem(); - return !world.isRemote; + b.neighborChanged( Platform.AIR_BLOCK.getDefaultState(), world, pos, Platform.AIR_BLOCK ); + player.swingArm( hand ); + return !world.isRemote ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; } } - return false; + return EnumActionResult.PASS; } @Override - public boolean doesSneakBypassUse( final World world, final BlockPos pos, final EntityPlayer player ) + public boolean doesSneakBypassUse( final ItemStack itemstack, final IBlockAccess world, final BlockPos pos, final EntityPlayer player ) { return true; } diff --git a/src/main/java/appeng/me/GridNode.java b/src/main/java/appeng/me/GridNode.java index d9531fe21..4f89505b7 100644 --- a/src/main/java/appeng/me/GridNode.java +++ b/src/main/java/appeng/me/GridNode.java @@ -28,8 +28,8 @@ import java.util.List; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.exceptions.FailedConnection; diff --git a/src/main/java/appeng/me/cluster/MBCalculator.java b/src/main/java/appeng/me/cluster/MBCalculator.java index 2c3656d5d..cacd4bc29 100644 --- a/src/main/java/appeng/me/cluster/MBCalculator.java +++ b/src/main/java/appeng/me/cluster/MBCalculator.java @@ -20,7 +20,7 @@ package appeng.me.cluster; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.util.AEPartLocation; diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java index 307ee4f16..a95aa7c5d 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java @@ -22,7 +22,7 @@ package appeng.me.cluster.implementations; import java.util.Iterator; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.networking.IGrid; diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java b/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java index 7f6ac4d27..a5764a83c 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java @@ -21,7 +21,7 @@ package appeng.me.cluster.implementations; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java index 34adb07da..be4f84f09 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java @@ -68,7 +68,7 @@ public class QuantumCluster implements ILocatable, IAECluster @SubscribeEvent public void onUnload( final WorldEvent.Unload e ) { - if( this.center.getWorld() == e.world ) + if( this.center.getWorld() == e.getWorld() ) { this.setUpdateStatus( false ); this.destroy(); @@ -194,7 +194,7 @@ public class QuantumCluster implements ILocatable, IAECluster final Chunk c = theWorld.getChunkFromBlockCoords( qc.center.getPos() ); if( c.isLoaded() ) { - final int id = theWorld.provider.getDimensionId(); + final int id = theWorld.provider.getDimension(); final World cur = DimensionManager.getWorld( id ); final TileEntity te = theWorld.getTileEntity( qc.center.getPos() ); diff --git a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java index d7451e1ad..57960c28e 100644 --- a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java +++ b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java @@ -20,7 +20,7 @@ package appeng.me.cluster.implementations; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.util.DimensionalCoord; diff --git a/src/main/java/appeng/me/pathfinding/ControllerValidator.java b/src/main/java/appeng/me/pathfinding/ControllerValidator.java index 16980ed6a..fb9e7af2d 100644 --- a/src/main/java/appeng/me/pathfinding/ControllerValidator.java +++ b/src/main/java/appeng/me/pathfinding/ControllerValidator.java @@ -19,7 +19,7 @@ package appeng.me.pathfinding; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index 4b7d90e4c..c1c885ad7 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -38,9 +38,9 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -493,7 +493,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, } @Override - public final boolean onActivate( final EntityPlayer player, final Vec3 pos ) + public final boolean onActivate( final EntityPlayer player, final Vec3d pos ) { if( this.useMemoryCard( player ) ) { @@ -504,7 +504,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, } @Override - public final boolean onShiftActivate( final EntityPlayer player, final Vec3 pos ) + public final boolean onShiftActivate( final EntityPlayer player, final Vec3d pos ) { if( this.useMemoryCard( player ) ) { @@ -514,12 +514,12 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, return this.onPartShiftActivate( player, pos ); } - public boolean onPartActivate( final EntityPlayer player, final Vec3 pos ) + public boolean onPartActivate( final EntityPlayer player, final Vec3d pos ) { return false; } - public boolean onPartShiftActivate( final EntityPlayer player, final Vec3 pos ) + public boolean onPartShiftActivate( final EntityPlayer player, final Vec3d pos ) { return false; } diff --git a/src/main/java/appeng/parts/BusCollisionHelper.java b/src/main/java/appeng/parts/BusCollisionHelper.java index 1f5401a85..c6f138070 100644 --- a/src/main/java/appeng/parts/BusCollisionHelper.java +++ b/src/main/java/appeng/parts/BusCollisionHelper.java @@ -22,8 +22,8 @@ package appeng.parts; import java.util.List; import net.minecraft.entity.Entity; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; import appeng.api.parts.IPartCollisionHelper; import appeng.api.util.AEPartLocation; @@ -149,7 +149,7 @@ public class BusCollisionHelper implements IPartCollisionHelper maxY = Math.max( aY, bY ); maxZ = Math.max( aZ, bZ ); - this.boxes.add( AxisAlignedBB.fromBounds( minX, minY, minZ, maxX, maxY, maxZ ) ); + this.boxes.add( new AxisAlignedBB( minX, minY, minZ, maxX, maxY, maxZ ) ); } @Override diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 07d6ed6e5..6c3e54dc5 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -35,10 +35,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -401,7 +401,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } @Override - public SelectedPart selectPart( final Vec3 pos ) + public SelectedPart selectPart( final Vec3d pos ) { for( final AEPartLocation side : AEPartLocation.values() ) { @@ -802,7 +802,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } @Override - public boolean activate( final EntityPlayer player, final Vec3 pos ) + public boolean activate( final EntityPlayer player, final Vec3d pos ) { final SelectedPart p = this.selectPart( pos ); if( p != null && p.part != null ) diff --git a/src/main/java/appeng/parts/ICableBusContainer.java b/src/main/java/appeng/parts/ICableBusContainer.java index dcc651857..8b0f61e1a 100644 --- a/src/main/java/appeng/parts/ICableBusContainer.java +++ b/src/main/java/appeng/parts/ICableBusContainer.java @@ -25,9 +25,9 @@ import java.util.Random; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -47,7 +47,7 @@ public interface ICableBusContainer void onEntityCollision( Entity e ); - boolean activate( EntityPlayer player, Vec3 vecFromPool ); + boolean activate( EntityPlayer player, Vec3d vecFromPool ); void onNeighborChanged(); @@ -55,7 +55,7 @@ public interface ICableBusContainer boolean isEmpty(); - SelectedPart selectPart( Vec3 v3 ); + SelectedPart selectPart( Vec3d v3 ); boolean recolourBlock( EnumFacing side, AEColor colour, EntityPlayer who ); diff --git a/src/main/java/appeng/parts/NullCableBusContainer.java b/src/main/java/appeng/parts/NullCableBusContainer.java index c4012f572..8903505d4 100644 --- a/src/main/java/appeng/parts/NullCableBusContainer.java +++ b/src/main/java/appeng/parts/NullCableBusContainer.java @@ -25,9 +25,9 @@ import java.util.Random; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import appeng.api.parts.SelectedPart; @@ -62,7 +62,7 @@ public class NullCableBusContainer implements ICableBusContainer } @Override - public boolean activate( final EntityPlayer player, final Vec3 vecFromPool ) + public boolean activate( final EntityPlayer player, final Vec3d vecFromPool ) { return false; } @@ -86,7 +86,7 @@ public class NullCableBusContainer implements ICableBusContainer } @Override - public SelectedPart selectPart( final Vec3 v3 ) + public SelectedPart selectPart( final Vec3d v3 ) { return new SelectedPart(); } diff --git a/src/main/java/appeng/parts/PartBasicState.java b/src/main/java/appeng/parts/PartBasicState.java index 68aa53ffa..0ab59be96 100644 --- a/src/main/java/appeng/parts/PartBasicState.java +++ b/src/main/java/appeng/parts/PartBasicState.java @@ -25,8 +25,8 @@ import io.netty.buffer.ByteBuf; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index 52236fd6a..cee2c8711 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -25,21 +25,23 @@ import java.util.List; import com.google.common.base.Optional; import net.minecraft.block.Block; -import net.minecraft.block.Block.SoundType; +import net.minecraft.block.SoundType; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; @@ -75,6 +77,8 @@ public class PartPlacement public static boolean place( final ItemStack held, final BlockPos pos, EnumFacing side, final EntityPlayer player, final World world, PlaceType pass, final int depth ) { + //TODO 1.9.4 - 2 hands! Just do something! + final EnumHand hand = EnumHand.MAIN_HAND; if( depth > 3 ) { return false; @@ -101,7 +105,7 @@ public class PartPlacement if( !world.isRemote ) { final LookDirection dir = Platform.getPlayerRay( player, getEyeOffset( player ) ); - final MovingObjectPosition mop = block.collisionRayTrace( world, pos, dir.getA(), dir.getB() ); + final RayTraceResult mop = block.collisionRayTrace( world.getBlockState( pos ), world, pos, dir.getA(), dir.getB() ); if( mop != null ) { @@ -135,7 +139,7 @@ public class PartPlacement } else { - player.swingItem(); + player.swingArm( hand ); NetworkHandler.instance.sendToServer( new PacketPartPlacement( pos, side, getEyeOffset( player ) ) ); } return true; @@ -177,7 +181,7 @@ public class PartPlacement if( held.stackSize == 0 ) { player.inventory.mainInventory[player.inventory.currentItem] = null; - MinecraftForge.EVENT_BUS.post( new PlayerDestroyItemEvent( player, held ) ); + MinecraftForge.EVENT_BUS.post( new PlayerDestroyItemEvent( player, held, hand ) ); } } return true; @@ -186,7 +190,7 @@ public class PartPlacement } else { - player.swingItem(); + player.swingArm( hand ); NetworkHandler.instance.sendToServer( new PacketPartPlacement( pos, side, getEyeOffset( player ) ) ); return true; } @@ -217,7 +221,7 @@ public class PartPlacement if( host != null && player.isSneaking() && block != null ) { final LookDirection dir = Platform.getPlayerRay( player, getEyeOffset( player ) ); - final MovingObjectPosition mop = block.collisionRayTrace( world, pos, dir.getA(), dir.getB() ); + final RayTraceResult mop = block.collisionRayTrace( world.getBlockState( pos ), world, pos, dir.getA(), dir.getB() ); if( mop != null ) { @@ -308,7 +312,7 @@ public class PartPlacement } else { - player.swingItem(); + player.swingArm( hand ); NetworkHandler.instance.sendToServer( new PacketPartPlacement( pos, side, getEyeOffset( player ) ) ); return true; } @@ -350,9 +354,9 @@ public class PartPlacement if( !world.isRemote ) { - final Block block = world.getBlockState( pos ).getBlock(); + final IBlockState state = world.getBlockState( pos ); final LookDirection dir = Platform.getPlayerRay( player, getEyeOffset( player ) ); - final MovingObjectPosition mop = block.collisionRayTrace( world, pos, dir.getA(), dir.getB() ); + final RayTraceResult mop = state.getBlock().collisionRayTrace( state, world, pos, dir.getA(), dir.getB() ); if( mop != null ) { @@ -378,9 +382,9 @@ public class PartPlacement { for( final Block multiPartBlock : multiPart.maybeBlock().asSet() ) { - final SoundType ss = multiPartBlock.stepSound; + final SoundType ss = multiPartBlock.getSoundType(); - world.playSoundEffect( 0.5 + pos.getX(), 0.5 + pos.getY(), 0.5 + pos.getZ(), ss.getPlaceSound(), ( ss.getVolume() + 1.0F ) / 2.0F, ss.getFrequency() * 0.8F ); + world.playSound( player, 0.5 + pos.getX(), 0.5 + pos.getY(), 0.5 + pos.getZ(), ss.getPlaceSound(), SoundCategory.BLOCKS, ( ss.getVolume() + 1.0F ) / 2.0F, ss.getPitch() * 0.8F ); } if( !player.capabilities.isCreativeMode ) @@ -389,14 +393,14 @@ public class PartPlacement if( held.stackSize == 0 ) { player.inventory.mainInventory[player.inventory.currentItem] = null; - MinecraftForge.EVENT_BUS.post( new PlayerDestroyItemEvent( player, held ) ); + MinecraftForge.EVENT_BUS.post( new PlayerDestroyItemEvent( player, held, hand ) ); } } } } else { - player.swingItem(); + player.swingArm( hand ); NetworkHandler.instance.sendToServer( new PacketPartPlacement( pos, side, getEyeOffset( player ) ) ); } return true; @@ -412,7 +416,7 @@ public class PartPlacement return getEyeHeight(); } - private static SelectedPart selectPart( final EntityPlayer player, final IPartHost host, final Vec3 pos ) + private static SelectedPart selectPart( final EntityPlayer player, final IPartHost host, final Vec3d pos ) { CommonHelper.proxy.updateRenderMode( player ); final SelectedPart sp = host.selectPart( pos ); @@ -449,19 +453,19 @@ public class PartPlacement @SubscribeEvent public void playerInteract( final PlayerInteractEvent event ) { - if( event.action == Action.RIGHT_CLICK_AIR && event.entityPlayer.worldObj.isRemote ) + if( event instanceof PlayerInteractEvent.RightClickEmpty && event.getEntityPlayer().worldObj.isRemote ) { // re-check to see if this event was already channeled, cause these two events are really stupid... - final MovingObjectPosition mop = Platform.rayTrace( event.entityPlayer, true, false ); + final RayTraceResult mop = Platform.rayTrace( event.getEntityPlayer(), true, false ); final Minecraft mc = Minecraft.getMinecraft(); final float f = 1.0F; final double d0 = mc.playerController.getBlockReachDistance(); - final Vec3 vec3 = mc.getRenderViewEntity().getPositionEyes( f ); + final Vec3d vec3 = mc.getRenderViewEntity().getPositionEyes( f ); if( mop != null && mop.hitVec.distanceTo( vec3 ) < d0 ) { - final World w = event.entity.worldObj; + final World w = event.getEntity().worldObj; final TileEntity te = w.getTileEntity( mop.getBlockPos() ); if( te instanceof IPartHost && this.wasCanceled ) { @@ -470,19 +474,19 @@ public class PartPlacement } else { - final ItemStack held = event.entityPlayer.getHeldItem(); + final ItemStack held = event.getEntityPlayer().getHeldItem( event.getHand() ); final IItems items = AEApi.instance().definitions().items(); boolean supportedItem = items.memoryCard().isSameAs( held ); supportedItem |= items.colorApplicator().isSameAs( held ); - if( event.entityPlayer.isSneaking() && held != null && supportedItem ) + if( event.getEntityPlayer().isSneaking() && held != null && supportedItem ) { - NetworkHandler.instance.sendToServer( new PacketClick( event.pos, event.face, 0, 0, 0 ) ); + NetworkHandler.instance.sendToServer( new PacketClick( event.getPos(), event.getFace(), 0, 0, 0 ) ); } } } - else if( event.action == Action.RIGHT_CLICK_BLOCK && event.entityPlayer.worldObj.isRemote ) + else if( event instanceof PlayerInteractEvent.RightClickBlock && event.getEntityPlayer().worldObj.isRemote ) { if( this.placing.get() != null ) { @@ -491,8 +495,8 @@ public class PartPlacement this.placing.set( event ); - final ItemStack held = event.entityPlayer.getHeldItem(); - if( place( held, event.pos, event.face, event.entityPlayer, event.entityPlayer.worldObj, PlaceType.INTERACT_FIRST_PASS, 0 ) ) + final ItemStack held = event.getEntityPlayer().getHeldItem( event.getHand() ); + if( place( held, event.getPos(), event.getFace(), event.getEntityPlayer(), event.getEntityPlayer().worldObj, PlaceType.INTERACT_FIRST_PASS, 0 ) ) { event.setCanceled( true ); this.wasCanceled = true; diff --git a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java index ff093cc30..37732e854 100644 --- a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java @@ -23,16 +23,16 @@ import java.util.List; import com.google.common.collect.Lists; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.fml.relauncher.Side; @@ -483,11 +483,11 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab */ private boolean canHandleBlock( final WorldServer w, final BlockPos pos ) { - final Block block = w.getBlockState( pos ).getBlock(); - final Material material = block.getMaterial(); - final float hardness = block.getBlockHardness( w, pos ); - final boolean ignoreMaterials = material == Material.air || material == Material.lava || material == Material.water || material.isLiquid(); - final boolean ignoreBlocks = block == Blocks.bedrock || block == Blocks.end_portal || block == Blocks.end_portal_frame || block == Blocks.command_block; + final IBlockState state = w.getBlockState( pos ); + final Material material = state.getMaterial(); + final float hardness = state.getBlockHardness( w, pos ); + final boolean ignoreMaterials = material == Material.AIR || material == Material.LAVA || material == Material.WATER || material.isLiquid(); + final boolean ignoreBlocks = state.getBlock() == Blocks.BEDROCK || state.getBlock() == Blocks.END_PORTAL || state.getBlock() == Blocks.END_PORTAL_FRAME || state.getBlock() == Blocks.COMMAND_BLOCK; return !ignoreMaterials && !ignoreBlocks && !w.isAirBlock( pos ) && w.isBlockLoaded( pos ) && w.canMineBlockBody( Platform.getPlayer( w ), pos ) && hardness >= 0f; } @@ -503,8 +503,8 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab */ protected float calculateEnergyUsage( final WorldServer w, final BlockPos pos, final List items ) { - final Block block = w.getBlockState( pos ).getBlock(); - final float hardness = block.getBlockHardness( w, pos ); + final IBlockState state = w.getBlockState( pos ); + final float hardness = state.getBlockHardness( w, pos ); float requiredEnergy = 1 + hardness; for( final ItemStack is : items ) @@ -555,7 +555,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab { w.setBlockToAir( pos ); - final AxisAlignedBB box = AxisAlignedBB.fromBounds( pos.getX() - 0.2, pos.getY() - 0.2, pos.getZ() - 0.2, pos.getX() + 1.2, pos.getY() + 1.2, pos.getZ() + 1.2 ); + final AxisAlignedBB box = new AxisAlignedBB( pos.getX() - 0.2, pos.getY() - 0.2, pos.getZ() - 0.2, pos.getX() + 1.2, pos.getY() + 1.2, pos.getZ() + 1.2 ); for( final Object ei : w.getEntitiesWithinAABB( EntityItem.class, box ) ) { if( ei instanceof EntityItem ) diff --git a/src/main/java/appeng/parts/automation/PartExportBus.java b/src/main/java/appeng/parts/automation/PartExportBus.java index 10ebfd468..1d17837fc 100644 --- a/src/main/java/appeng/parts/automation/PartExportBus.java +++ b/src/main/java/appeng/parts/automation/PartExportBus.java @@ -25,8 +25,8 @@ import com.google.common.collect.ImmutableSet; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -234,7 +234,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest } @Override - public boolean onPartActivate( final EntityPlayer player, final Vec3 pos ) + public boolean onPartActivate( final EntityPlayer player, final Vec3d pos ) { if( !player.isSneaking() ) { diff --git a/src/main/java/appeng/parts/automation/PartFormationPlane.java b/src/main/java/appeng/parts/automation/PartFormationPlane.java index 0a4a5a6c5..eb06233fe 100644 --- a/src/main/java/appeng/parts/automation/PartFormationPlane.java +++ b/src/main/java/appeng/parts/automation/PartFormationPlane.java @@ -25,18 +25,20 @@ import java.util.List; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemFirework; -import net.minecraft.item.ItemReed; import net.minecraft.item.ItemSkull; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; -import net.minecraft.util.Vec3; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraft.world.chunk.Chunk; @@ -347,7 +349,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine } @Override - public boolean onPartActivate( final EntityPlayer player, final Vec3 pos ) + public boolean onPartActivate( final EntityPlayer player, final Vec3d pos ) { if( !player.isSneaking() ) { @@ -408,6 +410,9 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine @Override public IAEItemStack injectItems( final IAEItemStack input, final Actionable type, final BaseActionSource src ) { + //TODO 1.9.4 - 2 hands! Just do something! + final EnumHand hand = EnumHand.MAIN_HAND; + if( this.blocked || input == null || input.getStackSize() <= 0 ) { return input; @@ -429,7 +434,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine if( w.getBlockState( tePos ).getBlock().isReplaceable( w, tePos ) ) { - if( placeBlock == YesNo.YES && ( i instanceof ItemBlock || i instanceof IPlantable || i instanceof ItemSkull || i instanceof ItemFirework || i instanceof IPartItem || i instanceof ItemReed ) ) + if( placeBlock == YesNo.YES && ( i instanceof ItemBlock || i instanceof IPlantable || i instanceof ItemSkull || i instanceof ItemFirework || i instanceof IPartItem || i == Item.getItemFromBlock( Blocks.REEDS ) ) ) { final EntityPlayer player = Platform.getPlayer( (WorldServer) w ); Platform.configurePlayer( player, side, this.getTile() ); @@ -455,35 +460,35 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine worked = true; if( type == Actionable.MODULATE ) { - if( i instanceof IPlantable || i instanceof ItemSkull || i instanceof ItemReed ) + if( i instanceof IPlantable || i instanceof ItemSkull || i == Item.getItemFromBlock( Blocks.REEDS ) ) { boolean Worked = false; if( side.xOffset == 0 && side.zOffset == 0 ) { - Worked = i.onItemUse( is, player, w, tePos.offset( side.getFacing() ), side.getFacing().getOpposite(), side.xOffset, side.yOffset, side.zOffset ); + Worked = i.onItemUse( is, player, w, tePos.offset( side.getFacing() ), hand, side.getFacing().getOpposite(), side.xOffset, side.yOffset, side.zOffset ) == EnumActionResult.SUCCESS; } if( !Worked && side.xOffset == 0 && side.zOffset == 0 ) { - Worked = i.onItemUse( is, player, w, tePos.offset( side.getFacing().getOpposite() ), side.getFacing(), side.xOffset, side.yOffset, side.zOffset ); + Worked = i.onItemUse( is, player, w, tePos.offset( side.getFacing().getOpposite() ), hand, side.getFacing(), side.xOffset, side.yOffset, side.zOffset ) == EnumActionResult.SUCCESS; } if( !Worked && side.yOffset == 0 ) { - Worked = i.onItemUse( is, player, w, tePos.offset( EnumFacing.DOWN ), EnumFacing.UP, side.xOffset, side.yOffset, side.zOffset ); + Worked = i.onItemUse( is, player, w, tePos.offset( EnumFacing.DOWN ), hand, EnumFacing.UP, side.xOffset, side.yOffset, side.zOffset ) == EnumActionResult.SUCCESS; } if( !Worked ) { - i.onItemUse( is, player, w, tePos, side.getFacing().getOpposite(), side.xOffset, side.yOffset, side.zOffset ); + i.onItemUse( is, player, w, tePos, hand, side.getFacing().getOpposite(), side.xOffset, side.yOffset, side.zOffset ); } maxStorage -= is.stackSize; } else { - i.onItemUse( is, player, w, tePos, side.getFacing().getOpposite(), side.xOffset, side.yOffset, side.zOffset ); + i.onItemUse( is, player, w, tePos, hand, side.getFacing().getOpposite(), side.xOffset, side.yOffset, side.zOffset ); maxStorage -= is.stackSize; } } diff --git a/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java index 21c24fb48..24c6163c9 100644 --- a/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java @@ -26,7 +26,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayerFactory; diff --git a/src/main/java/appeng/parts/automation/PartImportBus.java b/src/main/java/appeng/parts/automation/PartImportBus.java index 49f7e3daa..97116ec92 100644 --- a/src/main/java/appeng/parts/automation/PartImportBus.java +++ b/src/main/java/appeng/parts/automation/PartImportBus.java @@ -21,8 +21,8 @@ package appeng.parts.automation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -144,7 +144,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin } @Override - public boolean onPartActivate( final EntityPlayer player, final Vec3 pos ) + public boolean onPartActivate( final EntityPlayer player, final Vec3d pos ) { if( !player.isSneaking() ) { diff --git a/src/main/java/appeng/parts/automation/PartLevelEmitter.java b/src/main/java/appeng/parts/automation/PartLevelEmitter.java index 3b2da6382..ee1eedd50 100644 --- a/src/main/java/appeng/parts/automation/PartLevelEmitter.java +++ b/src/main/java/appeng/parts/automation/PartLevelEmitter.java @@ -29,10 +29,10 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -595,6 +595,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH renderer.setRenderAllFaces( true ); + //TODO 1.9.4 - getMixedBrightnessForBlock => ? renderer.setBrightness( rh.getBlock().getMixedBrightnessForBlock( this.getHost().getTile().getWorld(), pos ) ); renderer.setColorOpaque_F( 1.0F, 1.0F, 1.0F ); @@ -642,7 +643,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH } @Override - public boolean onPartActivate( final EntityPlayer player, final Vec3 pos ) + public boolean onPartActivate( final EntityPlayer player, final Vec3d pos ) { if( !player.isSneaking() ) { diff --git a/src/main/java/appeng/parts/automation/PartSharedItemBus.java b/src/main/java/appeng/parts/automation/PartSharedItemBus.java index 082b34dea..425fb3ed4 100644 --- a/src/main/java/appeng/parts/automation/PartSharedItemBus.java +++ b/src/main/java/appeng/parts/automation/PartSharedItemBus.java @@ -22,7 +22,7 @@ package appeng.parts.automation; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.config.RedstoneMode; @@ -115,7 +115,7 @@ public abstract class PartSharedItemBus extends PartUpgradeable implements IGrid { final World w = self.getWorld(); - if( w.getChunkProvider().chunkExists( pos.getX() >> 4, pos.getZ() >> 4 ) ) + if( w.getChunkProvider().getLoadedChunk( pos.getX() >> 4, pos.getZ() >> 4 ) != null ) { return w.getTileEntity( pos ); } @@ -161,7 +161,7 @@ public abstract class PartSharedItemBus extends PartUpgradeable implements IGrid final int zCoordinate = selfPos.getZ(); final World world = self.getWorld(); - return world != null && world.getChunkProvider().chunkExists( xCoordinate >> 4, zCoordinate >> 4 ); + return world != null && world.getChunkProvider().getLoadedChunk( xCoordinate >> 4, zCoordinate >> 4 ) != null; } private void updateState() diff --git a/src/main/java/appeng/parts/layers/LayerISidedInventory.java b/src/main/java/appeng/parts/layers/LayerISidedInventory.java index 06633bf3b..502821d81 100644 --- a/src/main/java/appeng/parts/layers/LayerISidedInventory.java +++ b/src/main/java/appeng/parts/layers/LayerISidedInventory.java @@ -28,7 +28,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; import appeng.api.parts.IPart; import appeng.api.parts.IPartHost; @@ -293,7 +293,7 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory } @Override - public IChatComponent getDisplayName() + public ITextComponent getDisplayName() { return null; } diff --git a/src/main/java/appeng/parts/misc/PartCableAnchor.java b/src/main/java/appeng/parts/misc/PartCableAnchor.java index b23808aa6..fb2486690 100644 --- a/src/main/java/appeng/parts/misc/PartCableAnchor.java +++ b/src/main/java/appeng/parts/misc/PartCableAnchor.java @@ -32,8 +32,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -232,13 +232,13 @@ public class PartCableAnchor implements IPart } @Override - public boolean onActivate( final EntityPlayer player, final Vec3 pos ) + public boolean onActivate( final EntityPlayer player, final Vec3d pos ) { return false; } @Override - public boolean onShiftActivate( final EntityPlayer player, final Vec3 pos ) + public boolean onShiftActivate( final EntityPlayer player, final Vec3d pos ) { return false; } diff --git a/src/main/java/appeng/parts/misc/PartInterface.java b/src/main/java/appeng/parts/misc/PartInterface.java index 5801cf8b9..133054d50 100644 --- a/src/main/java/appeng/parts/misc/PartInterface.java +++ b/src/main/java/appeng/parts/misc/PartInterface.java @@ -32,10 +32,10 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -200,7 +200,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto } @Override - public boolean onPartActivate( final EntityPlayer p, final Vec3 pos ) + public boolean onPartActivate( final EntityPlayer p, final Vec3d pos ) { if( p.isSneaking() ) { @@ -450,7 +450,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto } @Override - public IChatComponent getDisplayName() + public ITextComponent getDisplayName() { return null; } diff --git a/src/main/java/appeng/parts/misc/PartStorageBus.java b/src/main/java/appeng/parts/misc/PartStorageBus.java index fd77a40f8..c02ca8c9c 100644 --- a/src/main/java/appeng/parts/misc/PartStorageBus.java +++ b/src/main/java/appeng/parts/misc/PartStorageBus.java @@ -28,8 +28,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -317,7 +317,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC } @Override - public boolean onPartActivate( final EntityPlayer player, final Vec3 pos ) + public boolean onPartActivate( final EntityPlayer player, final Vec3d pos ) { if( !player.isSneaking() ) { diff --git a/src/main/java/appeng/parts/misc/PartToggleBus.java b/src/main/java/appeng/parts/misc/PartToggleBus.java index 605cbf9a6..eaf5fad09 100644 --- a/src/main/java/appeng/parts/misc/PartToggleBus.java +++ b/src/main/java/appeng/parts/misc/PartToggleBus.java @@ -30,7 +30,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/parts/networking/PartCable.java b/src/main/java/appeng/parts/networking/PartCable.java index fa8de0a18..f069893d4 100644 --- a/src/main/java/appeng/parts/networking/PartCable.java +++ b/src/main/java/appeng/parts/networking/PartCable.java @@ -31,8 +31,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/parts/networking/PartCableCovered.java b/src/main/java/appeng/parts/networking/PartCableCovered.java index 993713abf..93e01cb98 100644 --- a/src/main/java/appeng/parts/networking/PartCableCovered.java +++ b/src/main/java/appeng/parts/networking/PartCableCovered.java @@ -24,8 +24,8 @@ import java.util.EnumSet; import org.lwjgl.opengl.GL11; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/parts/networking/PartCableSmart.java b/src/main/java/appeng/parts/networking/PartCableSmart.java index 07c3348d5..3c9deaf2f 100644 --- a/src/main/java/appeng/parts/networking/PartCableSmart.java +++ b/src/main/java/appeng/parts/networking/PartCableSmart.java @@ -24,8 +24,8 @@ import java.util.EnumSet; import org.lwjgl.opengl.GL11; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/parts/networking/PartDenseCable.java b/src/main/java/appeng/parts/networking/PartDenseCable.java index eea942467..5e6221ba4 100644 --- a/src/main/java/appeng/parts/networking/PartDenseCable.java +++ b/src/main/java/appeng/parts/networking/PartDenseCable.java @@ -25,8 +25,8 @@ import org.lwjgl.opengl.GL11; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/parts/networking/PartQuartzFiber.java b/src/main/java/appeng/parts/networking/PartQuartzFiber.java index b0a09604e..2df2e2d75 100644 --- a/src/main/java/appeng/parts/networking/PartQuartzFiber.java +++ b/src/main/java/appeng/parts/networking/PartQuartzFiber.java @@ -28,7 +28,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/parts/p2p/PartP2PItems.java b/src/main/java/appeng/parts/p2p/PartP2PItems.java index 8b4a2d27b..b97b0adba 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PItems.java +++ b/src/main/java/appeng/parts/p2p/PartP2PItems.java @@ -29,7 +29,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; import appeng.api.networking.IGridNode; import appeng.api.networking.events.MENetworkBootingStatusChange; @@ -400,7 +400,7 @@ public class PartP2PItems extends PartP2PTunnel implements /* IPip } @Override - public IChatComponent getDisplayName() + public ITextComponent getDisplayName() { return null; } diff --git a/src/main/java/appeng/parts/p2p/PartP2PRedstone.java b/src/main/java/appeng/parts/p2p/PartP2PRedstone.java index d4a98e0c4..b104945e7 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PRedstone.java +++ b/src/main/java/appeng/parts/p2p/PartP2PRedstone.java @@ -24,8 +24,8 @@ import net.minecraft.block.BlockRedstoneWire; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.networking.events.MENetworkBootingStatusChange; @@ -152,8 +152,8 @@ public class PartP2PRedstone extends PartP2PTunnel srcSide = EnumFacing.UP; } - this.power = b.getWeakPower( this.getTile().getWorld(), target, state, srcSide ); - this.power = Math.max( this.power, b.getWeakPower( this.getTile().getWorld(), target, state, srcSide ) ); + this.power = b.getWeakPower( state, this.getTile().getWorld(), target, srcSide ); + this.power = Math.max( this.power, b.getWeakPower( state, this.getTile().getWorld(), target, srcSide ) ); this.sendToOutput( this.power ); } else diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java index 554a6a527..12f4126cc 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java @@ -30,8 +30,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -149,7 +149,7 @@ public abstract class PartP2PTunnel extends PartBasicSt } else { - return renderer.getIcon( new ItemStack( Blocks.quartz_block ) ); + return renderer.getIcon( new ItemStack( Blocks.QUARTZ_BLOCK ) ); } } @@ -227,7 +227,7 @@ public abstract class PartP2PTunnel extends PartBasicSt } @Override - public boolean onPartActivate( final EntityPlayer player, final Vec3 pos ) + public boolean onPartActivate( final EntityPlayer player, final Vec3d pos ) { final ItemStack is = player.inventory.getCurrentItem(); @@ -394,7 +394,7 @@ public abstract class PartP2PTunnel extends PartBasicSt } @Override - public boolean onPartShiftActivate( final EntityPlayer player, final Vec3 pos ) + public boolean onPartShiftActivate( final EntityPlayer player, final Vec3d pos ) { final ItemStack is = player.inventory.getCurrentItem(); if( is != null && is.getItem() instanceof IMemoryCard ) diff --git a/src/main/java/appeng/parts/reporting/AbstractPartDisplay.java b/src/main/java/appeng/parts/reporting/AbstractPartDisplay.java index d55e0b90a..df254054f 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartDisplay.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartDisplay.java @@ -20,8 +20,8 @@ package appeng.parts.reporting; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java index 10cafc4d3..843b84ac5 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java @@ -31,13 +31,14 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -159,8 +160,11 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements } @Override - public boolean onPartActivate( final EntityPlayer player, final Vec3 pos ) + public boolean onPartActivate( final EntityPlayer player, final Vec3d pos ) { + //TODO 1.9.4 - 2 hands! Just do something! + final EnumHand hand = EnumHand.MAIN_HAND; + if( Platform.isClient() ) { return true; @@ -177,7 +181,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements } final TileEntity te = this.getTile(); - final ItemStack eq = player.getCurrentEquippedItem(); + final ItemStack eq = player.getHeldItem( hand ); if( Platform.isWrench( player, eq, te.getPos() ) ) { @@ -268,7 +272,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements } final Tessellator tess = Tessellator.getInstance(); - final WorldRenderer wr = tess.getWorldRenderer(); + final VertexBuffer wr = tess.getBuffer(); if( ( this.getClientFlags() & ( PartPanel.POWERED_FLAG | PartPanel.CHANNEL_FLAG ) ) != ( PartPanel.POWERED_FLAG | PartPanel.CHANNEL_FLAG ) ) { @@ -310,7 +314,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements return this.configuredItem; } - private void tesrRenderScreen( final WorldRenderer wr, final IAEItemStack ais ) + private void tesrRenderScreen( final VertexBuffer wr, final IAEItemStack ais ) { // GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS ); @@ -435,7 +439,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements } @Override - public boolean showNetworkInfo( final MovingObjectPosition where ) + public boolean showNetworkInfo( final RayTraceResult where ) { return false; } diff --git a/src/main/java/appeng/parts/reporting/AbstractPartPanel.java b/src/main/java/appeng/parts/reporting/AbstractPartPanel.java index 28d2641d4..499a6f9b9 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartPanel.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartPanel.java @@ -20,8 +20,8 @@ package appeng.parts.reporting; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/parts/reporting/AbstractPartReporting.java b/src/main/java/appeng/parts/reporting/AbstractPartReporting.java index ca04eba71..ef810870e 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartReporting.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartReporting.java @@ -27,8 +27,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; import appeng.api.implementations.IPowerChannelState; import appeng.api.implementations.parts.IPartMonitor; @@ -189,7 +189,7 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM } @Override - public boolean onPartActivate( final EntityPlayer player, final Vec3 pos ) + public boolean onPartActivate( final EntityPlayer player, final Vec3d pos ) { final TileEntity te = this.getTile(); diff --git a/src/main/java/appeng/parts/reporting/AbstractPartTerminal.java b/src/main/java/appeng/parts/reporting/AbstractPartTerminal.java index d5cfbddc1..72f1fbad8 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartTerminal.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartTerminal.java @@ -25,7 +25,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.Vec3d; import appeng.api.config.Settings; import appeng.api.config.SortDir; @@ -110,7 +110,7 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay implement } @Override - public boolean onPartActivate( final EntityPlayer player, final Vec3 pos ) + public boolean onPartActivate( final EntityPlayer player, final Vec3d pos ) { if( !super.onPartActivate( player, pos ) ) { diff --git a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java b/src/main/java/appeng/parts/reporting/PartConversionMonitor.java index 151109c7b..45a77f385 100644 --- a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java +++ b/src/main/java/appeng/parts/reporting/PartConversionMonitor.java @@ -26,7 +26,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraft.util.Vec3; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.Vec3d; import appeng.api.networking.energy.IEnergySource; import appeng.api.networking.security.PlayerSource; @@ -54,8 +55,11 @@ public class PartConversionMonitor extends AbstractPartMonitor } @Override - public boolean onPartShiftActivate( final EntityPlayer player, final Vec3 pos ) + public boolean onPartShiftActivate( final EntityPlayer player, final Vec3d pos ) { + //TODO 1.9.4 - 2 hands! Just do something! + final EnumHand hand = EnumHand.MAIN_HAND; + if( Platform.isClient() ) { return true; @@ -73,7 +77,7 @@ public class PartConversionMonitor extends AbstractPartMonitor boolean ModeB = false; - ItemStack item = player.getCurrentEquippedItem(); + ItemStack item = player.getHeldItem( hand ); if( item == null && this.getDisplayed() != null ) { ModeB = true; diff --git a/src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java b/src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java index 6b9c4f5ee..e63f5f39e 100644 --- a/src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java +++ b/src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java @@ -21,7 +21,7 @@ package appeng.parts.reporting; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.Vec3d; import appeng.client.texture.CableBusTextures; import appeng.core.sync.GuiBridge; @@ -40,7 +40,7 @@ public class PartInterfaceTerminal extends AbstractPartDisplay } @Override - public boolean onPartActivate( final EntityPlayer player, final Vec3 pos ) + public boolean onPartActivate( final EntityPlayer player, final Vec3d pos ) { if( !super.onPartActivate( player, pos ) ) { diff --git a/src/main/java/appeng/recipes/RecipeHandler.java b/src/main/java/appeng/recipes/RecipeHandler.java index 6e78189ae..45f28b29a 100644 --- a/src/main/java/appeng/recipes/RecipeHandler.java +++ b/src/main/java/appeng/recipes/RecipeHandler.java @@ -42,7 +42,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.LoaderState; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.common.registry.GameRegistry.UniqueIdentifier; import appeng.api.AEApi; import appeng.api.definitions.IBlocks; @@ -119,6 +118,7 @@ public class RecipeHandler implements IRecipeHandler { Preconditions.checkNotNull( is ); + //TODO 1.9.4 - UniqueIdentifier => ResourceLocation final UniqueIdentifier id = GameRegistry.findUniqueIdentifierFor( is.getItem() ); String realName = id.modId + ':' + id.name; diff --git a/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java b/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java index d15c2a131..5102cdda7 100644 --- a/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java +++ b/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java @@ -43,16 +43,16 @@ public class OreDictionaryHandler @SubscribeEvent public void onOreDictionaryRegister( final OreDictionary.OreRegisterEvent event ) { - if( event.Name == null || event.Ore == null ) + if( event.getName() == null || event.getOre() == null ) { return; } - if( this.shouldCare( event.Name ) ) + if( this.shouldCare( event.getName() ) ) { for( final IOreListener v : this.oreListeners ) { - v.oreRegistered( event.Name, event.Ore ); + v.oreRegistered( event.getName(), event.getOre() ); } } diff --git a/src/main/java/appeng/server/AECommand.java b/src/main/java/appeng/server/AECommand.java index 138327e79..133ef254f 100644 --- a/src/main/java/appeng/server/AECommand.java +++ b/src/main/java/appeng/server/AECommand.java @@ -56,7 +56,7 @@ public final class AECommand extends CommandBase } @Override - public void processCommand( final ICommandSender sender, final String[] args ) throws CommandException + public void execute( final MinecraftServer server, final ICommandSender sender, final String[] args ) throws CommandException { if( args.length == 0 ) { diff --git a/src/main/java/appeng/server/ServerHelper.java b/src/main/java/appeng/server/ServerHelper.java index 2887f6afc..9c23b0166 100644 --- a/src/main/java/appeng/server/ServerHelper.java +++ b/src/main/java/appeng/server/ServerHelper.java @@ -30,8 +30,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -83,7 +83,7 @@ public class ServerHelper extends CommonHelper if( server != null ) { - return (List) server.getConfigurationManager().playerEntityList; + return (List) server.getPlayerList().getPlayerList(); } } @@ -129,7 +129,7 @@ public class ServerHelper extends CommonHelper } @Override - public MovingObjectPosition getMOP() + public RayTraceResult getRTR() { return null; } diff --git a/src/main/java/appeng/server/subcommands/ChunkLogger.java b/src/main/java/appeng/server/subcommands/ChunkLogger.java index b7f1b4667..5c1d05664 100644 --- a/src/main/java/appeng/server/subcommands/ChunkLogger.java +++ b/src/main/java/appeng/server/subcommands/ChunkLogger.java @@ -21,7 +21,7 @@ package appeng.server.subcommands; import net.minecraft.command.ICommandSender; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -40,7 +40,7 @@ public class ChunkLogger implements ISubCommand @SubscribeEvent public void onChunkLoadEvent( final ChunkEvent.Load event ) { - if( !event.world.isRemote ) + if( !event.getWorld().isRemote ) { AELog.info( "Chunk Loaded: " + event.getChunk().xPosition + ", " + event.getChunk().zPosition ); this.displayStack(); @@ -69,7 +69,7 @@ public class ChunkLogger implements ISubCommand @SubscribeEvent public void onChunkUnloadEvent( final ChunkEvent.Unload unload ) { - if( !unload.world.isRemote ) + if( !unload.getWorld().isRemote ) { AELog.info( "Chunk Unloaded: " + unload.getChunk().xPosition + ", " + unload.getChunk().zPosition ); this.displayStack(); @@ -90,12 +90,12 @@ public class ChunkLogger implements ISubCommand if( this.enabled ) { MinecraftForge.EVENT_BUS.register( this ); - sender.addChatMessage( new ChatComponentTranslation( "commands.ae2.ChunkLoggerOn" ) ); + sender.addChatMessage( new TextComponentTranslation( "commands.ae2.ChunkLoggerOn" ) ); } else { MinecraftForge.EVENT_BUS.unregister( this ); - sender.addChatMessage( new ChatComponentTranslation( "commands.ae2.ChunkLoggerOff" ) ); + sender.addChatMessage( new TextComponentTranslation( "commands.ae2.ChunkLoggerOff" ) ); } } } diff --git a/src/main/java/appeng/server/subcommands/Supporters.java b/src/main/java/appeng/server/subcommands/Supporters.java index 61059abfe..0bd32df55 100644 --- a/src/main/java/appeng/server/subcommands/Supporters.java +++ b/src/main/java/appeng/server/subcommands/Supporters.java @@ -23,7 +23,7 @@ import com.google.common.base.Joiner; import net.minecraft.command.ICommandSender; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ChatComponentText; +import net.minecraft.util.text.TextComponentString; import appeng.server.ISubCommand; @@ -41,6 +41,6 @@ public class Supporters implements ISubCommand public void call( final MinecraftServer srv, final String[] data, final ICommandSender sender ) { final String[] who = { "Stig Halvorsen", "Josh Ricker", "Jenny \"Othlon\" Sutherland", "Hristo Bogdanov", "BevoLJ" }; - sender.addChatMessage( new ChatComponentText( "Special thanks to " + Joiner.on( ", " ).join( who ) ) ); + sender.addChatMessage( new TextComponentString( "Special thanks to " + Joiner.on( ", " ).join( who ) ) ); } } diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index 2732cf44f..8cfab95e4 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/src/main/java/appeng/services/CompassService.java @@ -82,9 +82,9 @@ public final class CompassService @SubscribeEvent public void unloadWorld( final WorldEvent.Unload event ) { - if( Platform.isServer() && this.worldSet.containsKey( event.world ) ) + if( Platform.isServer() && this.worldSet.containsKey( event.getWorld() ) ) { - final CompassReader compassReader = this.worldSet.remove( event.world ); + final CompassReader compassReader = this.worldSet.remove( event.getWorld() ); compassReader.close(); } @@ -141,7 +141,7 @@ public final class CompassService { for( int k = low_y; k < hi_y; k++ ) { - final Block blk = c.getBlock( i, k, j ); + final Block blk = c.getBlockState( i, k, j ).getBlock(); if( blk == skyStoneBlock ) { return this.executor.submit( new CMUpdatePost( w, cx, cz, cdy, true ) ); @@ -182,7 +182,7 @@ public final class CompassService if( cr == null ) { - cr = new CompassReader( w.provider.getDimensionId(), this.worldCompassFolder ); + cr = new CompassReader( w.provider.getDimension(), this.worldCompassFolder ); this.worldSet.put( w, cr ); } diff --git a/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java b/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java index 2e587b8f6..744e45033 100644 --- a/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java +++ b/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java @@ -43,7 +43,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry; import appeng.core.AELog; @@ -171,7 +171,7 @@ final class MinecraftItemCSVExporter implements Exporter final Item item = input.getItem(); final String unlocalizedItem = input.getUnlocalizedName(); final Block block = Block.getBlockFromItem( item ); - final boolean isBlock = !block.equals( Blocks.air ); + final boolean isBlock = !block.equals( Blocks.AIR ); final Class stackClass = input.getClass(); final String stackClassName = stackClass.getName(); @@ -193,7 +193,7 @@ final class MinecraftItemCSVExporter implements Exporter private static final class ItemRowExtractFunction implements Function { /** - * this extension is required to apply the {@link StatCollector} + * this extension is required to apply the {@link I18n} */ private static final String LOCALIZATION_NAME_EXTENSION = ".name"; private static final String EXPORTING_NOTHING_MESSAGE = "Exporting nothing"; @@ -266,7 +266,7 @@ final class MinecraftItemCSVExporter implements Exporter final List joinedBlockAttributes = Lists.newArrayListWithCapacity( 5 ); final String unlocalizedItem = input.getUnlocalizedName(); - final String localization = StatCollector.translateToLocal( unlocalizedItem + LOCALIZATION_NAME_EXTENSION ); + final String localization = I18n.translateToLocal( unlocalizedItem + LOCALIZATION_NAME_EXTENSION ); joinedBlockAttributes.add( itemName ); joinedBlockAttributes.add( localization ); @@ -274,7 +274,7 @@ final class MinecraftItemCSVExporter implements Exporter if( this.mode == ExportMode.VERBOSE ) { final Block block = Block.getBlockFromItem( input ); - final boolean isBlock = !block.equals( Blocks.air ); + final boolean isBlock = !block.equals( Blocks.AIR ); final Class itemClass = input.getClass(); final String itemClassName = itemClass.getName(); diff --git a/src/main/java/appeng/spatial/BiomeGenStorage.java b/src/main/java/appeng/spatial/BiomeGenStorage.java index 79e9e077a..63f417e1e 100644 --- a/src/main/java/appeng/spatial/BiomeGenStorage.java +++ b/src/main/java/appeng/spatial/BiomeGenStorage.java @@ -18,20 +18,14 @@ package appeng.spatial; +import net.minecraft.world.biome.Biome; -import net.minecraft.world.biome.BiomeGenBase; - - -public class BiomeGenStorage extends BiomeGenBase +public class BiomeGenStorage extends Biome { - public BiomeGenStorage( final int id ) + public BiomeGenStorage() { - super( id ); - this.setBiomeName( "Storage Cell" ); - - this.setDisableRain(); - this.temperature = -100; + super(new BiomeProperties( "Storage Cell" ).setRainDisabled().setTemperature( -100 )); this.theBiomeDecorator.treesPerChunk = 0; this.theBiomeDecorator.flowersPerChunk = 0; diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java index 76a463949..4d0933d33 100644 --- a/src/main/java/appeng/spatial/CachedPlane.java +++ b/src/main/java/appeng/spatial/CachedPlane.java @@ -27,7 +27,7 @@ import java.util.Map.Entry; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.NextTickListEntry; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; @@ -137,7 +137,7 @@ public class CachedPlane final Block blk = (Block) details[0]; // don't skip air, just let the code replace it... - if( blk != null && blk.isAir( c.getWorld(), tePOS ) && blk.isReplaceable( c.getWorld(), tePOS ) ) + if( blk != null && blk.isAir( c.getWorld().getBlockState( tePOS ), c.getWorld(), tePOS ) && blk.isReplaceable( c.getWorld(), tePOS ) ) { c.getWorld().setBlockToAir( tePOS ); } @@ -312,6 +312,7 @@ public class CachedPlane if( c.c.isLoaded() ) { this.world.addTileEntity( te ); + //TODO 1.9.4 - markBlockForUpdate => ? this.world.markBlockForUpdate( pos ); } } @@ -428,7 +429,7 @@ public class CachedPlane private boolean doNotSkip( final int y ) { final ExtendedBlockStorage extendedblockstorage = this.storage[y >> 4]; - if( CachedPlane.this.reg.isBlacklisted( extendedblockstorage.getBlockByExtId( this.x, y & 15, this.z ) ) ) + if( CachedPlane.this.reg.isBlacklisted( extendedblockstorage.get( this.x, y & 15, this.z ).getBlock() ) ) { return false; } diff --git a/src/main/java/appeng/spatial/DefaultSpatialHandler.java b/src/main/java/appeng/spatial/DefaultSpatialHandler.java index 29185fdab..dd0a96b8c 100644 --- a/src/main/java/appeng/spatial/DefaultSpatialHandler.java +++ b/src/main/java/appeng/spatial/DefaultSpatialHandler.java @@ -20,7 +20,7 @@ package appeng.spatial; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; @@ -55,6 +55,7 @@ public class DefaultSpatialHandler implements IMovableHandler if( c.isLoaded() ) { w.addTileEntity( te ); + //TODO 1.9.4 - markBlockForUpdate => ? w.markBlockForUpdate( newPosition ); } } diff --git a/src/main/java/appeng/spatial/ISpatialVisitor.java b/src/main/java/appeng/spatial/ISpatialVisitor.java index c11ee8351..dd2784526 100644 --- a/src/main/java/appeng/spatial/ISpatialVisitor.java +++ b/src/main/java/appeng/spatial/ISpatialVisitor.java @@ -19,7 +19,7 @@ package appeng.spatial; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; public interface ISpatialVisitor diff --git a/src/main/java/appeng/spatial/StorageChunkProvider.java b/src/main/java/appeng/spatial/StorageChunkProvider.java index 18ddc5444..da66bc57d 100644 --- a/src/main/java/appeng/spatial/StorageChunkProvider.java +++ b/src/main/java/appeng/spatial/StorageChunkProvider.java @@ -24,17 +24,16 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.EnumCreatureType; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.IChunkProvider; -import net.minecraft.world.gen.ChunkProviderGenerate; +import net.minecraft.world.gen.ChunkProviderOverworld; import appeng.api.AEApi; import appeng.core.AEConfig; -public class StorageChunkProvider extends ChunkProviderGenerate +public class StorageChunkProvider extends ChunkProviderOverworld { private static final int SQUARE_CHUNK_SIZE = 256; private static final Block[] BLOCKS; @@ -83,17 +82,11 @@ public class StorageChunkProvider extends ChunkProviderGenerate } @Override - public void populate( final IChunkProvider par1iChunkProvider, final int par2, final int par3 ) + public void populate( final int par2, final int par3 ) { } - @Override - public boolean unloadQueuedChunks() - { - return true; - } - @Override public List getPossibleCreatures( final EnumCreatureType creatureType, final BlockPos pos ) { diff --git a/src/main/java/appeng/spatial/StorageHelper.java b/src/main/java/appeng/spatial/StorageHelper.java index 47fec6e5b..161ccc6fd 100644 --- a/src/main/java/appeng/spatial/StorageHelper.java +++ b/src/main/java/appeng/spatial/StorageHelper.java @@ -27,9 +27,9 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityHanging; import net.minecraft.entity.EntityList; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.Teleporter; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -88,16 +88,18 @@ public class StorageHelper return entity; } + //TODO 1.9.4 - Multiple passangers & cell transfers. Take a look at portals. + // Is something riding? Handle it first. - if( entity.riddenByEntity != null ) + if( entity.isBeingRidden() ) { return this.teleportEntity( entity.riddenByEntity, link ); } // Are we riding something? Dismount and tell the mount to go first. - Entity cart = entity.ridingEntity; + Entity cart = entity.getRidingEntity(); if( cart != null ) { - entity.mountEntity( null ); + entity.dismountRidingEntity(); cart = this.teleportEntity( cart, link ); // We keep track of both so we can remount them on the other side. } @@ -115,10 +117,11 @@ public class StorageHelper Achievements.SpatialIOExplorer.addToPlayer( player ); } - player.mcServer.getConfigurationManager().transferPlayerToDimension( player, link.dim.provider.getDimensionId(), new METeleporter( newWorld, link ) ); + player.mcServer.getPlayerList().transferPlayerToDimension( player, link.dim.provider.getDimension(), new METeleporter( newWorld, link ) ); } else { + //TODO 1.9.4 - Whole entity transfer part, we now have changeDimension method. Evaluate it and remove this s... final int entX = entity.chunkCoordX; final int entZ = entity.chunkCoordZ; @@ -142,7 +145,7 @@ public class StorageHelper } newEntity.copyDataFromOld( entity ); - newEntity.dimension = newWorld.provider.getDimensionId(); + newEntity.dimension = newWorld.provider.getDimension(); newEntity.forceSpawn = true; entity.isDead = true; @@ -169,7 +172,7 @@ public class StorageHelper entity.worldObj.updateEntityWithOptionalForce( entity, true ); } - entity.mountEntity( cart ); + entity.startRiding( cart, false ); } return entity; @@ -214,9 +217,9 @@ public class StorageHelper this.transverseEdges( i - 1, j - 1, k - 1, i + scaleX + 1, j + scaleY + 1, k + scaleZ + 1, new WrapInMatrixFrame( matrixFrameBlock.getDefaultState(), dst ) ); } - final AxisAlignedBB srcBox = AxisAlignedBB.fromBounds( x, y, z, x + scaleX + 1, y + scaleY + 1, z + scaleZ + 1 ); + final AxisAlignedBB srcBox = new AxisAlignedBB( x, y, z, x + scaleX + 1, y + scaleY + 1, z + scaleZ + 1 ); - final AxisAlignedBB dstBox = AxisAlignedBB.fromBounds( i, j, k, i + scaleX + 1, j + scaleY + 1, k + scaleZ + 1 ); + final AxisAlignedBB dstBox = new AxisAlignedBB( i, j, k, i + scaleX + 1, j + scaleY + 1, k + scaleZ + 1 ); final CachedPlane cDst = new CachedPlane( dst, i, j, k, i + scaleX, j + scaleY, k + scaleZ ); final CachedPlane cSrc = new CachedPlane( src, x, y, z, x + scaleX, y + scaleY, z + scaleZ ); @@ -276,7 +279,7 @@ public class StorageHelper public void visit( final BlockPos pos ) { final Block blk = this.dst.getBlockState( pos ).getBlock(); - blk.onNeighborBlockChange( this.dst, pos, Platform.AIR_BLOCK.getDefaultState(), Platform.AIR_BLOCK ); + blk.neighborChanged( Platform.AIR_BLOCK.getDefaultState(), this.dst, pos, Platform.AIR_BLOCK ); } } diff --git a/src/main/java/appeng/spatial/StorageWorldProvider.java b/src/main/java/appeng/spatial/StorageWorldProvider.java index 7bac47429..94b679370 100644 --- a/src/main/java/appeng/spatial/StorageWorldProvider.java +++ b/src/main/java/appeng/spatial/StorageWorldProvider.java @@ -20,20 +20,19 @@ package appeng.spatial; import net.minecraft.entity.Entity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.DimensionType; import net.minecraft.world.WorldProvider; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.biome.WorldChunkManagerHell; +import net.minecraft.world.biome.BiomeProviderSingle; import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.IChunkProvider; +import net.minecraft.world.chunk.IChunkGenerator; import net.minecraftforge.client.IRenderHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import appeng.client.render.SpatialSkyRender; import appeng.core.AppEng; -import appeng.core.Registration; public class StorageWorldProvider extends WorldProvider @@ -42,20 +41,11 @@ public class StorageWorldProvider extends WorldProvider public StorageWorldProvider() { this.hasNoSky = true; + this.biomeProvider = new BiomeProviderSingle( AppEng.instance().getRegistration().getStorageBiome() ); } - + @Override - protected void registerWorldChunkManager() - { - final AppEng ae2internal = AppEng.instance(); - final Registration ae2registration = ae2internal.getRegistration(); - final BiomeGenBase storageBiome = ae2registration.getStorageBiome(); - - super.worldChunkMgr = new WorldChunkManagerHell( storageBiome, 0.0F ); - } - - @Override - public IChunkProvider createChunkGenerator() + public IChunkGenerator createChunkGenerator() { return new StorageChunkProvider( this.worldObj, 0 ); } @@ -80,9 +70,9 @@ public class StorageWorldProvider extends WorldProvider } @Override - public Vec3 getFogColor( final float par1, final float par2 ) + public Vec3d getFogColor( final float par1, final float par2 ) { - return new Vec3( 0.07, 0.07, 0.07 ); + return new Vec3d( 0.07, 0.07, 0.07 ); } @Override @@ -105,9 +95,9 @@ public class StorageWorldProvider extends WorldProvider } @Override - public String getDimensionName() + public DimensionType getDimensionType() { - return "Storage Cell"; + return AppEng.instance().getRegistration().getStorageDimensionType(); } @Override @@ -123,9 +113,9 @@ public class StorageWorldProvider extends WorldProvider } @Override - public Vec3 getSkyColor( final Entity cameraEntity, final float partialTicks ) + public Vec3d getSkyColor( final Entity cameraEntity, final float partialTicks ) { - return new Vec3( 0.07, 0.07, 0.07 ); + return new Vec3d( 0.07, 0.07, 0.07 ); } @Override @@ -157,10 +147,4 @@ public class StorageWorldProvider extends WorldProvider { return false; } - - @Override - public String getInternalNameSuffix() - { - return null; - } } diff --git a/src/main/java/appeng/tile/AEBaseInvTile.java b/src/main/java/appeng/tile/AEBaseInvTile.java index b1ff6b6c0..431a816cc 100644 --- a/src/main/java/appeng/tile/AEBaseInvTile.java +++ b/src/main/java/appeng/tile/AEBaseInvTile.java @@ -27,10 +27,10 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; import appeng.block.AEBaseBlock; import appeng.tile.events.TileEventType; @@ -202,13 +202,13 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor } @Override - public IChatComponent getDisplayName() + public ITextComponent getDisplayName() { if( this.hasCustomName() ) { - return new ChatComponentText( this.getCustomName() ); + return new TextComponentString( this.getCustomName() ); } - return new ChatComponentTranslation( this.getBlockType().getUnlocalizedName() ); + return new TextComponentTranslation( this.getBlockType().getUnlocalizedName() ); } public abstract int[] getAccessibleSlotsBySide( EnumFacing whichSide ); diff --git a/src/main/java/appeng/tile/AEBaseTile.java b/src/main/java/appeng/tile/AEBaseTile.java index 596f7183a..4851b4238 100644 --- a/src/main/java/appeng/tile/AEBaseTile.java +++ b/src/main/java/appeng/tile/AEBaseTile.java @@ -40,11 +40,10 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.implementations.tiles.ISegmentedInventory; @@ -160,7 +159,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, @Override // NOTE: WAS FINAL, changed for Immibis - public final void writeToNBT( final NBTTagCompound data ) + public final NBTTagCompound writeToNBT( final NBTTagCompound data ) { super.writeToNBT( data ); @@ -179,6 +178,8 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, { h.writeToNBT( this, data ); } + + return data; } public final void update() @@ -188,9 +189,9 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, h.tick( this ); } } - + @Override - public Packet getDescriptionPacket() + public SPacketUpdateTileEntity getUpdatePacket() { final NBTTagCompound data = new NBTTagCompound(); @@ -211,7 +212,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, stream.capacity( stream.readableBytes() ); data.setByteArray( "X", stream.array() ); - return new S35PacketUpdateTileEntity( this.pos, 64, data ); + return new SPacketUpdateTileEntity( this.pos, 64, data ); } private boolean hasHandlerFor( final TileEventType type ) @@ -222,7 +223,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, } @Override - public void onDataPacket( final NetworkManager net, final S35PacketUpdateTileEntity pkt ) + public void onDataPacket( final NetworkManager net, final SPacketUpdateTileEntity pkt ) { // / pkt.actionType if( pkt.getTileEntityType() == 64 ) @@ -298,6 +299,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, if( this.worldObj != null ) { AELog.blockUpdate( this.pos, this ); + //TODO 1.9.4 - markBlockForUpdate => ? this.worldObj.markBlockForUpdate( this.pos ); } } diff --git a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java index d7e601d9e..95c780b11 100644 --- a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java +++ b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java @@ -29,8 +29,8 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -509,7 +509,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade try { - final TargetPoint where = new TargetPoint( this.worldObj.provider.getDimensionId(), this.pos.getX(), this.pos.getY(), this.pos.getZ(), 32 ); + final TargetPoint where = new TargetPoint( this.worldObj.provider.getDimension(), this.pos.getX(), this.pos.getY(), this.pos.getZ(), 32 ); final IAEItemStack item = AEItemStack.create( output ); NetworkHandler.instance.sendToAllAround( new PacketAssemblerAnimation( this.pos, (byte) speed, item ), where ); } diff --git a/src/main/java/appeng/tile/grindstone/TileCrank.java b/src/main/java/appeng/tile/grindstone/TileCrank.java index 6ae1762c3..3ab0843a8 100644 --- a/src/main/java/appeng/tile/grindstone/TileCrank.java +++ b/src/main/java/appeng/tile/grindstone/TileCrank.java @@ -27,10 +27,10 @@ import io.netty.buffer.ByteBuf; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.implementations.tiles.ICrankable; @@ -108,7 +108,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, ITickable { super.setOrientation( inForward, inUp ); final IBlockState state = this.worldObj.getBlockState( this.pos ); - this.getBlockType().onNeighborBlockChange( this.worldObj, this.pos, state, state.getBlock() ); + this.getBlockType().neighborChanged( state, this.worldObj, this.pos, state.getBlock() ); } @Override @@ -159,7 +159,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, ITickable final double xOff = -0.15 * this.getUp().getFrontOffsetX(); final double yOff = -0.15 * this.getUp().getFrontOffsetY(); final double zOff = -0.15 * this.getUp().getFrontOffsetZ(); - return Collections.singletonList( AxisAlignedBB.fromBounds( xOff + 0.15, yOff + 0.15, zOff + 0.15, xOff + 0.85, yOff + 0.85, zOff + 0.85 ) ); + return Collections.singletonList( new AxisAlignedBB( xOff + 0.15, yOff + 0.15, zOff + 0.15, xOff + 0.85, yOff + 0.85, zOff + 0.85 ) ); } @Override @@ -168,7 +168,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision, ITickable final double xOff = -0.15 * this.getUp().getFrontOffsetX(); final double yOff = -0.15 * this.getUp().getFrontOffsetY(); final double zOff = -0.15 * this.getUp().getFrontOffsetZ(); - out.add( AxisAlignedBB.fromBounds( xOff + 0.15, yOff + 0.15, zOff + 0.15,// ahh + out.add( new AxisAlignedBB( xOff + 0.15, yOff + 0.15, zOff + 0.15,// ahh xOff + 0.85, yOff + 0.85, zOff + 0.85 ) ); } diff --git a/src/main/java/appeng/tile/grindstone/TileGrinder.java b/src/main/java/appeng/tile/grindstone/TileGrinder.java index 3bd402ea4..ac152edee 100644 --- a/src/main/java/appeng/tile/grindstone/TileGrinder.java +++ b/src/main/java/appeng/tile/grindstone/TileGrinder.java @@ -51,7 +51,7 @@ public class TileGrinder extends AEBaseInvTile implements ICrankable { super.setOrientation( inForward, inUp ); final IBlockState state = this.worldObj.getBlockState( this.pos ); - this.getBlockType().onNeighborBlockChange( this.worldObj, this.pos, state, state.getBlock() ); + this.getBlockType().neighborChanged( state, this.worldObj, this.pos, state.getBlock() ); } @Override diff --git a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java index 78a81e8d3..87594e165 100644 --- a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java @@ -25,7 +25,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; import appeng.api.AEApi; import appeng.api.storage.data.IAEItemStack; @@ -269,7 +269,7 @@ public class AppEngInternalAEInventory implements IInventory, Iterable } @Override - public IChatComponent getDisplayName() + public ITextComponent getDisplayName() { return null; } diff --git a/src/main/java/appeng/tile/inventory/AppEngNullInventory.java b/src/main/java/appeng/tile/inventory/AppEngNullInventory.java index 3b6f545e6..3a85a9b13 100644 --- a/src/main/java/appeng/tile/inventory/AppEngNullInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngNullInventory.java @@ -23,7 +23,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; public class AppEngNullInventory implements IInventory @@ -104,7 +104,7 @@ public class AppEngNullInventory implements IInventory } @Override - public IChatComponent getDisplayName() + public ITextComponent getDisplayName() { return null; } diff --git a/src/main/java/appeng/tile/misc/TileCellWorkbench.java b/src/main/java/appeng/tile/misc/TileCellWorkbench.java index fe0c67c12..2f08e8215 100644 --- a/src/main/java/appeng/tile/misc/TileCellWorkbench.java +++ b/src/main/java/appeng/tile/misc/TileCellWorkbench.java @@ -24,7 +24,7 @@ import java.util.List; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.config.CopyMode; diff --git a/src/main/java/appeng/tile/misc/TileInscriber.java b/src/main/java/appeng/tile/misc/TileInscriber.java index 7e059a7f3..e55919bf4 100644 --- a/src/main/java/appeng/tile/misc/TileInscriber.java +++ b/src/main/java/appeng/tile/misc/TileInscriber.java @@ -32,8 +32,8 @@ import io.netty.buffer.ByteBuf; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.AEApi; diff --git a/src/main/java/appeng/tile/misc/TileInterface.java b/src/main/java/appeng/tile/misc/TileInterface.java index 07079d8d3..c5dc927f9 100644 --- a/src/main/java/appeng/tile/misc/TileInterface.java +++ b/src/main/java/appeng/tile/misc/TileInterface.java @@ -29,8 +29,8 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.config.Actionable; diff --git a/src/main/java/appeng/tile/misc/TilePaint.java b/src/main/java/appeng/tile/misc/TilePaint.java index 0228a524e..e4ae59e44 100644 --- a/src/main/java/appeng/tile/misc/TilePaint.java +++ b/src/main/java/appeng/tile/misc/TilePaint.java @@ -32,9 +32,9 @@ import io.netty.buffer.Unpooled; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.EnumSkyBlock; import appeng.api.util.AEColor; @@ -150,7 +150,7 @@ public class TilePaint extends AEBaseTile return true; } - public void onNeighborBlockChange() + public void neighborChanged() { if( this.dots == null ) { @@ -172,7 +172,7 @@ public class TilePaint extends AEBaseTile { final BlockPos p = this.pos.offset( side ); final IBlockState blk = this.worldObj.getBlockState( p ); - return blk.getBlock().isSideSolid( this.worldObj, p, side.getOpposite() ); + return blk.getBlock().isSideSolid( this.worldObj.getBlockState( p ), this.worldObj, p, side.getOpposite() ); } private void removeSide( final EnumFacing side ) @@ -232,12 +232,12 @@ public class TilePaint extends AEBaseTile return this.isLit; } - public void addBlot( final ItemStack type, final EnumFacing side, final Vec3 hitVec ) + public void addBlot( final ItemStack type, final EnumFacing side, final Vec3d hitVec ) { final BlockPos p = this.pos.offset( side ); final IBlockState blk = this.worldObj.getBlockState( p ); - if( blk.getBlock().isSideSolid( this.worldObj, p, side.getOpposite() ) ) + if( blk.getBlock().isSideSolid( this.worldObj.getBlockState( p ), this.worldObj, p, side.getOpposite() ) ) { final ItemPaintBall ipb = (ItemPaintBall) type.getItem(); diff --git a/src/main/java/appeng/tile/misc/TileSecurity.java b/src/main/java/appeng/tile/misc/TileSecurity.java index 3fefe6f06..b2cf6099d 100644 --- a/src/main/java/appeng/tile/misc/TileSecurity.java +++ b/src/main/java/appeng/tile/misc/TileSecurity.java @@ -31,8 +31,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/appeng/tile/misc/TileVibrationChamber.java b/src/main/java/appeng/tile/misc/TileVibrationChamber.java index 34d17d513..ae3997b57 100644 --- a/src/main/java/appeng/tile/misc/TileVibrationChamber.java +++ b/src/main/java/appeng/tile/misc/TileVibrationChamber.java @@ -145,7 +145,7 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka @Override public boolean canExtractItem( final int slotIndex, final ItemStack extractedItem, final EnumFacing side ) { - return extractedItem.getItem() == Items.bucket; + return extractedItem.getItem() == Items.BUCKET; } @Override diff --git a/src/main/java/appeng/tile/networking/TileCableBus.java b/src/main/java/appeng/tile/networking/TileCableBus.java index 743abaeb0..cb645f931 100644 --- a/src/main/java/appeng/tile/networking/TileCableBus.java +++ b/src/main/java/appeng/tile/networking/TileCableBus.java @@ -29,10 +29,10 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import appeng.api.networking.IGridNode; @@ -294,7 +294,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl } @Override - public SelectedPart selectPart( final Vec3 pos ) + public SelectedPart selectPart( final Vec3d pos ) { return this.getCableBus().selectPart( pos ); } @@ -349,7 +349,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl { for( final AxisAlignedBB bx : this.getSelectedBoundingBoxesFromPool( w, pos, e, false ) ) { - out.add( AxisAlignedBB.fromBounds( bx.minX, bx.minY, bx.minZ, bx.maxX, bx.maxY, bx.maxZ ) ); + out.add( new AxisAlignedBB( bx.minX, bx.minY, bx.minZ, bx.maxX, bx.maxY, bx.maxZ ) ); } } diff --git a/src/main/java/appeng/tile/networking/TileController.java b/src/main/java/appeng/tile/networking/TileController.java index afb0dbeee..f766ec3e8 100644 --- a/src/main/java/appeng/tile/networking/TileController.java +++ b/src/main/java/appeng/tile/networking/TileController.java @@ -23,8 +23,8 @@ import java.util.EnumSet; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import appeng.api.config.Actionable; import appeng.api.networking.GridFlags; @@ -219,7 +219,7 @@ public class TileController extends AENetworkPowerTile private boolean checkController( final BlockPos pos ) { final BlockPos ownPos = this.getPos(); - if( this.worldObj.getChunkProvider().chunkExists( ownPos.getX() >> 4, ownPos.getZ() >> 4 ) ) + if( this.worldObj.getChunkProvider().getLoadedChunk( ownPos.getX() >> 4, ownPos.getZ() >> 4 ) != null ) { return this.worldObj.getTileEntity( pos ) instanceof TileController; } diff --git a/src/main/java/appeng/tile/spatial/TileSpatialPylon.java b/src/main/java/appeng/tile/spatial/TileSpatialPylon.java index 07b5a1db3..736c493cd 100644 --- a/src/main/java/appeng/tile/spatial/TileSpatialPylon.java +++ b/src/main/java/appeng/tile/spatial/TileSpatialPylon.java @@ -84,7 +84,7 @@ public class TileSpatialPylon extends AENetworkTile implements IAEMultiBlock public void onReady() { super.onReady(); - this.onNeighborBlockChange(); + this.neighborChanged(); } @Override @@ -94,7 +94,7 @@ public class TileSpatialPylon extends AENetworkTile implements IAEMultiBlock super.invalidate(); } - public void onNeighborBlockChange() + public void neighborChanged() { this.calc.calculateMultiblock( this.worldObj, this.getLocation() ); } diff --git a/src/main/java/appeng/tile/storage/TileIOPort.java b/src/main/java/appeng/tile/storage/TileIOPort.java index 81e51a02a..42d2f3f6b 100644 --- a/src/main/java/appeng/tile/storage/TileIOPort.java +++ b/src/main/java/appeng/tile/storage/TileIOPort.java @@ -25,8 +25,8 @@ import net.minecraft.block.Block; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.AEApi; diff --git a/src/main/java/appeng/tile/storage/TileSkyChest.java b/src/main/java/appeng/tile/storage/TileSkyChest.java index 248f2f40c..23e4605e5 100644 --- a/src/main/java/appeng/tile/storage/TileSkyChest.java +++ b/src/main/java/appeng/tile/storage/TileSkyChest.java @@ -22,9 +22,11 @@ package appeng.tile.storage; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.SoundCategory; import appeng.tile.AEBaseInvTile; import appeng.tile.TileEvent; @@ -89,7 +91,7 @@ public class TileSkyChest extends AEBaseInvTile if( this.getPlayerOpen() == 1 ) { - this.getWorld().playSoundEffect( this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D, "random.chestopen", 0.5F, this.getWorld().rand.nextFloat() * 0.1F + 0.9F ); + this.getWorld().playSound( player, this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D, SoundEvents.BLOCK_CHEST_OPEN, SoundCategory.BLOCKS, 0.5F, this.getWorld().rand.nextFloat() * 0.1F + 0.9F ); this.markForUpdate(); } } @@ -111,7 +113,7 @@ public class TileSkyChest extends AEBaseInvTile if( this.getPlayerOpen() == 0 ) { - this.getWorld().playSoundEffect( this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D, "random.chestclosed", 0.5F, this.getWorld().rand.nextFloat() * 0.1F + 0.9F ); + this.getWorld().playSound( player, this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D, SoundEvents.BLOCK_CHEST_CLOSE, SoundCategory.BLOCKS, 0.5F, this.getWorld().rand.nextFloat() * 0.1F + 0.9F ); this.markForUpdate(); } } diff --git a/src/main/java/appeng/util/BlockUpdate.java b/src/main/java/appeng/util/BlockUpdate.java index f681e3bee..23fc29510 100644 --- a/src/main/java/appeng/util/BlockUpdate.java +++ b/src/main/java/appeng/util/BlockUpdate.java @@ -19,7 +19,7 @@ package appeng.util; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/appeng/util/LookDirection.java b/src/main/java/appeng/util/LookDirection.java index a05cce613..33ea42b2b 100644 --- a/src/main/java/appeng/util/LookDirection.java +++ b/src/main/java/appeng/util/LookDirection.java @@ -18,28 +18,26 @@ package appeng.util; - -import net.minecraft.util.Vec3; - +import net.minecraft.util.math.Vec3d; public class LookDirection { - private final Vec3 a; - private final Vec3 b; + private final Vec3d a; + private final Vec3d b; - public LookDirection( final Vec3 a, final Vec3 b ) + public LookDirection( final Vec3d a, final Vec3d b ) { this.a = a; this.b = b; } - public Vec3 getA() + public Vec3d getA() { return this.a; } - public Vec3 getB() + public Vec3d getB() { return this.b; } diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 4c8f129c5..5b05a85cb 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -58,18 +58,19 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S21PacketChunkData; -import net.minecraft.server.management.PlayerManager; +import net.minecraft.network.play.server.SPacketChunkData; +import net.minecraft.server.management.PlayerChunkMap; import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.StatCollector; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.registry.RegistryNamespaced; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.ILockableContainer; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -149,7 +150,7 @@ import appeng.util.prioitylist.IPartitionList; public class Platform { - public static final Block AIR_BLOCK = Blocks.air; + public static final Block AIR_BLOCK = Blocks.AIR; public static final int DEF_OFFSET = 16; @@ -423,7 +424,7 @@ public class Platform { try { - return w.getBlockState( pos ).getBlock().isAir( w, pos ); + return w.getBlockState( pos ).getBlock().isAir( w.getBlockState( pos ), w, pos ); } catch( final Throwable e ) { @@ -1124,6 +1125,18 @@ public class Platform return -1; } + public static int findEmpty( final RegistryNamespaced registry, final int minId, final int maxId ) + { + for( int x = minId; x < maxId; x++ ) + { + if( registry.getObjectById( x ) == null ) + { + return x; + } + } + return -1; + } + public static int findEmpty( final Object[] l ) { for( int x = 0; x < l.length; x++ ) @@ -1365,7 +1378,7 @@ public class Platform @SideOnly( Side.CLIENT ) public static String gui_localize( final String string ) { - return StatCollector.translateToLocal( string ); + return I18n.translateToLocal( string ); } public static boolean isSameItemPrecise( @Nullable final ItemStack is, @Nullable final ItemStack filter ) @@ -1485,16 +1498,16 @@ public class Platform if( playerIn instanceof EntityPlayerMP ) { - reachDistance = ( (EntityPlayerMP) playerIn ).theItemInWorldManager.getBlockReachDistance(); + reachDistance = ( (EntityPlayerMP) playerIn ).interactionManager.getBlockReachDistance(); } - final Vec3 from = new Vec3( x, y, z ); - final Vec3 to = from.addVector( eyeRayX * reachDistance, eyeRayY * reachDistance, eyeRayZ * reachDistance ); + final Vec3d from = new Vec3d( x, y, z ); + final Vec3d to = from.addVector( eyeRayX * reachDistance, eyeRayY * reachDistance, eyeRayZ * reachDistance ); return new LookDirection( from, to ); } - public static MovingObjectPosition rayTrace( final EntityPlayer p, final boolean hitBlocks, final boolean hitEntities ) + public static RayTraceResult rayTrace( final EntityPlayer p, final boolean hitBlocks, final boolean hitEntities ) { final World w = p.getEntityWorld(); @@ -1504,7 +1517,7 @@ public class Platform final double d0 = p.prevPosX + ( p.posX - p.prevPosX ) * f; final double d1 = p.prevPosY + ( p.posY - p.prevPosY ) * f + 1.62D - p.getYOffset(); final double d2 = p.prevPosZ + ( p.posZ - p.prevPosZ ) * f; - final Vec3 vec3 = new Vec3( d0, d1, d2 ); + final Vec3d vec3 = new Vec3d( d0, d1, d2 ); final float f3 = MathHelper.cos( -f2 * 0.017453292F - (float) Math.PI ); final float f4 = MathHelper.sin( -f2 * 0.017453292F - (float) Math.PI ); final float f5 = -MathHelper.cos( -f1 * 0.017453292F ); @@ -1513,9 +1526,9 @@ public class Platform final float f8 = f3 * f5; final double d3 = 32.0D; - final Vec3 vec31 = vec3.addVector( f7 * d3, f6 * d3, f8 * d3 ); + final Vec3d vec31 = vec3.addVector( f7 * d3, f6 * d3, f8 * d3 ); - final AxisAlignedBB bb = AxisAlignedBB.fromBounds( Math.min( vec3.xCoord, vec31.xCoord ), Math.min( vec3.yCoord, vec31.yCoord ), Math.min( vec3.zCoord, vec31.zCoord ), Math.max( vec3.xCoord, vec31.xCoord ), Math.max( vec3.yCoord, vec31.yCoord ), Math.max( vec3.zCoord, vec31.zCoord ) ).expand( 16, 16, 16 ); + final AxisAlignedBB bb = new AxisAlignedBB( Math.min( vec3.xCoord, vec31.xCoord ), Math.min( vec3.yCoord, vec31.yCoord ), Math.min( vec3.zCoord, vec31.zCoord ), Math.max( vec3.xCoord, vec31.xCoord ), Math.max( vec3.yCoord, vec31.yCoord ), Math.max( vec3.zCoord, vec31.zCoord ) ).expand( 16, 16, 16 ); Entity entity = null; double closest = 9999999.0D; @@ -1532,18 +1545,18 @@ public class Platform if( entity1.isEntityAlive() ) { // prevent killing / flying of mounts. - if( entity1.riddenByEntity == p ) + if( entity1.isRidingOrBeingRiddenBy( p ) ) { continue; } f1 = 0.3F; final AxisAlignedBB boundingBox = entity1.getEntityBoundingBox().expand( f1, f1, f1 ); - final MovingObjectPosition movingObjectPosition = boundingBox.calculateIntercept( vec3, vec31 ); + final RayTraceResult RayTraceResult = boundingBox.calculateIntercept( vec3, vec31 ); - if( movingObjectPosition != null ) + if( RayTraceResult != null ) { - final double nd = vec3.squareDistanceTo( movingObjectPosition.hitVec ); + final double nd = vec3.squareDistanceTo( RayTraceResult.hitVec ); if( nd < closest ) { @@ -1556,22 +1569,22 @@ public class Platform } } - MovingObjectPosition pos = null; - Vec3 vec = null; + RayTraceResult pos = null; + Vec3d vec = null; if( hitBlocks ) { - vec = new Vec3( d0, d1, d2 ); + vec = new Vec3d( d0, d1, d2 ); pos = w.rayTraceBlocks( vec3, vec31, true ); } if( entity != null && pos != null && pos.hitVec.squareDistanceTo( vec ) > closest ) { - pos = new MovingObjectPosition( entity ); + pos = new RayTraceResult( entity ); } else if( entity != null && pos == null ) { - pos = new MovingObjectPosition( entity ); + pos = new RayTraceResult( entity ); } return pos; @@ -2080,7 +2093,7 @@ public class Platform if( type == AEFeature.NetherQuartzTools ) { - return Items.quartz == b.getItem(); + return Items.QUARTZ == b.getItem(); } return false; @@ -2116,16 +2129,17 @@ public class Platform return is; } + //TODO 1.9.4 - What do we want to do with this? Seriously, it wont work now, so JUST DO SOMETHING! public static void sendChunk( final Chunk c, final int verticalBits ) { try { final WorldServer ws = (WorldServer) c.getWorld(); - final PlayerManager pm = ws.getPlayerManager(); + final PlayerChunkMap pm = ws.getPlayerChunkMap(); if( getOrCreateChunkWatcher == null ) { - getOrCreateChunkWatcher = ReflectionHelper.findMethod( PlayerManager.class, pm, new String[] { "getOrCreateChunkWatcher", "func_72690_a" }, int.class, int.class, boolean.class ); + getOrCreateChunkWatcher = ReflectionHelper.findMethod( PlayerChunkMap.class, pm, new String[] { "getOrCreateChunkWatcher", "func_72690_a" }, int.class, int.class, boolean.class ); } if( getOrCreateChunkWatcher != null ) @@ -2142,7 +2156,7 @@ public class Platform if( sendToAllPlayersWatchingChunk != null ) { - sendToAllPlayersWatchingChunk.invoke( playerInstance, new S21PacketChunkData( c, false, verticalBits ) ); + sendToAllPlayersWatchingChunk.invoke( playerInstance, new SPacketChunkData( c, verticalBits ) ); } } } @@ -2158,21 +2172,21 @@ public class Platform switch( side ) { case DOWN: - return AxisAlignedBB.fromBounds( 0.0, 0.0, 0.0, 1.0, ( facadeThickness ) / 16.0, 1.0 ); + return new AxisAlignedBB( 0.0, 0.0, 0.0, 1.0, ( facadeThickness ) / 16.0, 1.0 ); case EAST: - return AxisAlignedBB.fromBounds( ( 16.0 - facadeThickness ) / 16.0, 0.0, 0.0, 1.0, 1.0, 1.0 ); + return new AxisAlignedBB( ( 16.0 - facadeThickness ) / 16.0, 0.0, 0.0, 1.0, 1.0, 1.0 ); case NORTH: - return AxisAlignedBB.fromBounds( 0.0, 0.0, 0.0, 1.0, 1.0, ( facadeThickness ) / 16.0 ); + return new AxisAlignedBB( 0.0, 0.0, 0.0, 1.0, 1.0, ( facadeThickness ) / 16.0 ); case SOUTH: - return AxisAlignedBB.fromBounds( 0.0, 0.0, ( 16.0 - facadeThickness ) / 16.0, 1.0, 1.0, 1.0 ); + return new AxisAlignedBB( 0.0, 0.0, ( 16.0 - facadeThickness ) / 16.0, 1.0, 1.0, 1.0 ); case UP: - return AxisAlignedBB.fromBounds( 0.0, ( 16.0 - facadeThickness ) / 16.0, 0.0, 1.0, 1.0, 1.0 ); + return new AxisAlignedBB( 0.0, ( 16.0 - facadeThickness ) / 16.0, 0.0, 1.0, 1.0, 1.0 ); case WEST: - return AxisAlignedBB.fromBounds( 0.0, 0.0, 0.0, ( facadeThickness ) / 16.0, 1.0, 1.0 ); + return new AxisAlignedBB( 0.0, 0.0, 0.0, ( facadeThickness ) / 16.0, 1.0, 1.0 ); default: break; } - return AxisAlignedBB.fromBounds( 0, 0, 0, 1, 1, 1 ); + return new AxisAlignedBB( 0, 0, 0, 1, 1, 1 ); } public static float getEyeOffset( final EntityPlayer player ) diff --git a/src/main/java/appeng/util/inv/AdaptorPlayerInventory.java b/src/main/java/appeng/util/inv/AdaptorPlayerInventory.java index 72bae7ead..6a4203d85 100644 --- a/src/main/java/appeng/util/inv/AdaptorPlayerInventory.java +++ b/src/main/java/appeng/util/inv/AdaptorPlayerInventory.java @@ -22,7 +22,7 @@ package appeng.util.inv; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; public class AdaptorPlayerInventory implements IInventory @@ -76,7 +76,7 @@ public class AdaptorPlayerInventory implements IInventory } @Override - public IChatComponent getDisplayName() + public ITextComponent getDisplayName() { return this.src.getDisplayName(); } diff --git a/src/main/java/appeng/util/inv/WrapperBCPipe.java b/src/main/java/appeng/util/inv/WrapperBCPipe.java index b8df9ddd1..ca611532a 100644 --- a/src/main/java/appeng/util/inv/WrapperBCPipe.java +++ b/src/main/java/appeng/util/inv/WrapperBCPipe.java @@ -24,7 +24,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; import appeng.integration.IntegrationRegistry; import appeng.integration.IntegrationType; @@ -150,7 +150,7 @@ public class WrapperBCPipe implements IInventory } @Override - public IChatComponent getDisplayName() + public ITextComponent getDisplayName() { return null; } diff --git a/src/main/java/appeng/util/inv/WrapperChainedInventory.java b/src/main/java/appeng/util/inv/WrapperChainedInventory.java index e3b231e84..0f30429cb 100644 --- a/src/main/java/appeng/util/inv/WrapperChainedInventory.java +++ b/src/main/java/appeng/util/inv/WrapperChainedInventory.java @@ -29,7 +29,7 @@ import com.google.common.collect.ImmutableList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; public class WrapperChainedInventory implements IInventory @@ -237,7 +237,7 @@ public class WrapperChainedInventory implements IInventory } @Override - public IChatComponent getDisplayName() + public ITextComponent getDisplayName() { return null; } diff --git a/src/main/java/appeng/util/inv/WrapperInvSlot.java b/src/main/java/appeng/util/inv/WrapperInvSlot.java index 3dd5fa406..5aeb364f9 100644 --- a/src/main/java/appeng/util/inv/WrapperInvSlot.java +++ b/src/main/java/appeng/util/inv/WrapperInvSlot.java @@ -22,7 +22,7 @@ package appeng.util.inv; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; public class WrapperInvSlot @@ -154,7 +154,7 @@ public class WrapperInvSlot } @Override - public IChatComponent getDisplayName() + public ITextComponent getDisplayName() { return this.inv.getDisplayName(); } diff --git a/src/main/java/appeng/util/inv/WrapperInventoryRange.java b/src/main/java/appeng/util/inv/WrapperInventoryRange.java index 632780709..d6679d062 100644 --- a/src/main/java/appeng/util/inv/WrapperInventoryRange.java +++ b/src/main/java/appeng/util/inv/WrapperInventoryRange.java @@ -22,7 +22,7 @@ package appeng.util.inv; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; public class WrapperInventoryRange implements IInventory @@ -165,7 +165,7 @@ public class WrapperInventoryRange implements IInventory } @Override - public IChatComponent getDisplayName() + public ITextComponent getDisplayName() { return this.src.getDisplayName(); } diff --git a/src/main/java/appeng/util/item/AEItemDef.java b/src/main/java/appeng/util/item/AEItemDef.java index 436187238..90acae086 100644 --- a/src/main/java/appeng/util/item/AEItemDef.java +++ b/src/main/java/appeng/util/item/AEItemDef.java @@ -24,7 +24,6 @@ import java.util.List; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.GameRegistry.UniqueIdentifier; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -49,6 +48,7 @@ public class AEItemDef private String displayName; @SideOnly( Side.CLIENT ) private List tooltip; + //TODO 1.9.4 - UniqueIdentifier => ? @SideOnly( Side.CLIENT ) private UniqueIdentifier uniqueID; private OreReference isOre; @@ -110,7 +110,7 @@ public class AEItemDef int getDamageValueHack( final ItemStack is ) { - return Items.blaze_rod.getDamage( is ); + return Items.BLAZE_ROD.getDamage( is ); } void reHash() diff --git a/src/main/java/appeng/util/item/AEItemStack.java b/src/main/java/appeng/util/item/AEItemStack.java index f942ff48a..5e50a169c 100644 --- a/src/main/java/appeng/util/item/AEItemStack.java +++ b/src/main/java/appeng/util/item/AEItemStack.java @@ -36,7 +36,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.common.registry.GameRegistry.UniqueIdentifier; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -218,7 +217,7 @@ public final class AEItemStack extends AEStack implements IAEItemS /* * if ( id != null && id instanceof NBTTagShort ) ((NBTTagShort) id).data = (short) this.def.item.itemID; else */ - i.setShort( "id", (short) Item.itemRegistry.getIDForObject( this.getDefinition().getItem() ) ); + i.setShort( "id", (short) Item.REGISTRY.getIDForObject( this.getDefinition().getItem() ) ); /* * if ( Count != null && Count instanceof NBTTagByte ) ((NBTTagByte) Count).data = (byte) 0; else @@ -591,7 +590,8 @@ public final class AEItemStack extends AEStack implements IAEItemS return this.getDefinition().getDisplayName(); } - + + //TODO 1.9.4 - UniqueIdentifier => ResourceLocation ? @SideOnly( Side.CLIENT ) public String getModID() { @@ -707,7 +707,7 @@ public final class AEItemStack extends AEStack implements IAEItemS @Override void writeIdentity( final ByteBuf i ) throws IOException { - i.writeShort( Item.itemRegistry.getIDForObject( this.getDefinition().getItem() ) ); + i.writeShort( Item.REGISTRY.getIDForObject( this.getDefinition().getItem() ) ); i.writeShort( this.getItemDamage() ); } diff --git a/src/main/java/appeng/util/item/SharedSearchObject.java b/src/main/java/appeng/util/item/SharedSearchObject.java index 970eecac1..ea1ba7327 100644 --- a/src/main/java/appeng/util/item/SharedSearchObject.java +++ b/src/main/java/appeng/util/item/SharedSearchObject.java @@ -35,7 +35,7 @@ public class SharedSearchObject public SharedSearchObject( final Item itemID, final int damageValue, final NBTTagCompound tagCompound ) { - this.def = ( damageValue << Platform.DEF_OFFSET ) | Item.itemRegistry.getIDForObject( itemID ); + this.def = ( damageValue << Platform.DEF_OFFSET ) | Item.REGISTRY.getIDForObject( itemID ); this.hash = Platform.NBTOrderlessHash( tagCompound ); this.setCompound( tagCompound ); } diff --git a/src/main/java/appeng/worldgen/MeteoritePlacer.java b/src/main/java/appeng/worldgen/MeteoritePlacer.java index c240353e6..e69a9dd23 100644 --- a/src/main/java/appeng/worldgen/MeteoritePlacer.java +++ b/src/main/java/appeng/worldgen/MeteoritePlacer.java @@ -33,9 +33,9 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.oredict.OreDictionary; import appeng.api.AEApi; @@ -78,41 +78,41 @@ public final class MeteoritePlacer this.skyChestDefinition = blocks.skyChest(); this.skyStoneDefinition = blocks.skyStone(); - this.validSpawn.add( Blocks.stone ); - this.validSpawn.add( Blocks.cobblestone ); - this.validSpawn.add( Blocks.grass ); - this.validSpawn.add( Blocks.sand ); - this.validSpawn.add( Blocks.dirt ); - this.validSpawn.add( Blocks.gravel ); - this.validSpawn.add( Blocks.netherrack ); - this.validSpawn.add( Blocks.iron_ore ); - this.validSpawn.add( Blocks.gold_ore ); - this.validSpawn.add( Blocks.diamond_ore ); - this.validSpawn.add( Blocks.redstone_ore ); - this.validSpawn.add( Blocks.hardened_clay ); - this.validSpawn.add( Blocks.ice ); - this.validSpawn.add( Blocks.snow ); - this.validSpawn.add( Blocks.stained_hardened_clay ); + this.validSpawn.add( Blocks.STONE ); + this.validSpawn.add( Blocks.COBBLESTONE ); + this.validSpawn.add( Blocks.GRASS ); + this.validSpawn.add( Blocks.SAND ); + this.validSpawn.add( Blocks.DIRT ); + this.validSpawn.add( Blocks.GRAVEL ); + this.validSpawn.add( Blocks.NETHERRACK ); + this.validSpawn.add( Blocks.IRON_ORE ); + this.validSpawn.add( Blocks.GOLD_ORE ); + this.validSpawn.add( Blocks.DIAMOND_ORE ); + this.validSpawn.add( Blocks.REDSTONE_ORE ); + this.validSpawn.add( Blocks.HARDENED_CLAY ); + this.validSpawn.add( Blocks.ICE ); + this.validSpawn.add( Blocks.SNOW ); + this.validSpawn.add( Blocks.STAINED_HARDENED_CLAY ); for( final Block skyStoneBlock : this.skyStoneDefinition.maybeBlock().asSet() ) { this.invalidSpawn.add( skyStoneBlock ); } - this.invalidSpawn.add( Blocks.planks ); - this.invalidSpawn.add( Blocks.iron_door ); - this.invalidSpawn.add( Blocks.iron_bars ); - this.invalidSpawn.add( Blocks.oak_door ); - this.invalidSpawn.add( Blocks.acacia_door ); - this.invalidSpawn.add( Blocks.birch_door ); - this.invalidSpawn.add( Blocks.dark_oak_door ); - this.invalidSpawn.add( Blocks.iron_door ); - this.invalidSpawn.add( Blocks.jungle_door ); - this.invalidSpawn.add( Blocks.spruce_door ); - this.invalidSpawn.add( Blocks.brick_block ); - this.invalidSpawn.add( Blocks.clay ); - this.invalidSpawn.add( Blocks.water ); - this.invalidSpawn.add( Blocks.log ); - this.invalidSpawn.add( Blocks.log2 ); + this.invalidSpawn.add( Blocks.PLANKS ); + this.invalidSpawn.add( Blocks.IRON_DOOR ); + this.invalidSpawn.add( Blocks.IRON_BARS ); + this.invalidSpawn.add( Blocks.OAK_DOOR ); + this.invalidSpawn.add( Blocks.ACACIA_DOOR ); + this.invalidSpawn.add( Blocks.BIRCH_DOOR ); + this.invalidSpawn.add( Blocks.DARK_OAK_DOOR ); + this.invalidSpawn.add( Blocks.IRON_DOOR ); + this.invalidSpawn.add( Blocks.JUNGLE_DOOR ); + this.invalidSpawn.add( Blocks.SPRUCE_DOOR ); + this.invalidSpawn.add( Blocks.BRICK_BLOCK ); + this.invalidSpawn.add( Blocks.CLAY ); + this.invalidSpawn.add( Blocks.WATER ); + this.invalidSpawn.add( Blocks.LOG ); + this.invalidSpawn.add( Blocks.LOG2 ); this.type = new Fallout( this.putter, this.skyStoneDefinition ); } @@ -132,15 +132,15 @@ public final class MeteoritePlacer final Block blk = Block.getBlockById( this.settings.getInteger( "blk" ) ); - if( blk == Blocks.sand ) + if( blk == Blocks.SAND ) { this.type = new FalloutSand( w, x, y, z, this.putter, this.skyStoneDefinition ); } - else if( blk == Blocks.hardened_clay ) + else if( blk == Blocks.HARDENED_CLAY ) { this.type = new FalloutCopy( w, x, y, z, this.putter, this.skyStoneDefinition ); } - else if( blk == Blocks.ice || blk == Blocks.snow ) + else if( blk == Blocks.ICE || blk == Blocks.SNOW ) { this.type = new FalloutSnow( w, x, y, z, this.putter, this.skyStoneDefinition ); } @@ -195,7 +195,7 @@ public final class MeteoritePlacer { if( j > h + distanceFrom * 0.02 ) { - this.putter.put( w, i, j, k, Blocks.lava ); + this.putter.put( w, i, j, k, Blocks.LAVA ); } } else @@ -207,7 +207,7 @@ public final class MeteoritePlacer } } - for( final Object o : w.getWorld().getEntitiesWithinAABB( EntityItem.class, AxisAlignedBB.fromBounds( w.minX( x - 30 ), y - 5, w.minZ( z - 30 ), w.maxX( x + 30 ), y + 30, w.maxZ( z + 30 ) ) ) ) + for( final Object o : w.getWorld().getEntitiesWithinAABB( EntityItem.class, new AxisAlignedBB( w.minX( x - 30 ), y - 5, w.minZ( z - 30 ), w.maxX( x + 30 ), y + 30, w.maxZ( z + 30 ) ) ) ) { final Entity e = (Entity) o; e.setDead(); @@ -350,7 +350,7 @@ public final class MeteoritePlacer possibles.addAll( OreDictionary.getOres( "nuggetNickel" ) ); possibles.addAll( OreDictionary.getOres( "nuggetAluminium" ) ); possibles.addAll( OreDictionary.getOres( "nuggetElectrum" ) ); - possibles.add( new ItemStack( net.minecraft.init.Items.gold_nugget ) ); + possibles.add( new ItemStack( net.minecraft.init.Items.GOLD_NUGGET ) ); ItemStack nugget = Platform.pickRandom( possibles ); if( nugget != null ) @@ -382,7 +382,7 @@ public final class MeteoritePlacer for( int j = y - 9; j < y + 30; j++ ) { Block blk = w.getBlock( i, j, k ); - if( blk == Blocks.lava ) + if( blk == Blocks.LAVA ) { continue; } @@ -478,15 +478,15 @@ public final class MeteoritePlacer this.settings.setBoolean( "lava", Math.random() > 0.9 ); - if( blk == Blocks.sand ) + if( blk == Blocks.SAND ) { this.type = new FalloutSand( w, x, y, z, this.putter, this.skyStoneDefinition ); } - else if( blk == Blocks.hardened_clay ) + else if( blk == Blocks.HARDENED_CLAY ) { this.type = new FalloutCopy( w, x, y, z, this.putter, this.skyStoneDefinition ); } - else if( blk == Blocks.ice || blk == Blocks.snow ) + else if( blk == Blocks.ICE || blk == Blocks.SNOW ) { this.type = new FalloutSnow( w, x, y, z, this.putter, this.skyStoneDefinition ); } @@ -580,7 +580,7 @@ public final class MeteoritePlacer this.settings.setInteger( "skyMode", skyMode ); w.done(); - WorldData.instance().spawnData().addNearByMeteorites( w.getWorld().provider.getDimensionId(), x >> 4, z >> 4, this.settings ); + WorldData.instance().spawnData().addNearByMeteorites( w.getWorld().provider.getDimension(), x >> 4, z >> 4, this.settings ); return true; } return false; diff --git a/src/main/java/appeng/worldgen/MeteoriteWorldGen.java b/src/main/java/appeng/worldgen/MeteoriteWorldGen.java index f9bc7ed8d..c5d2d61db 100644 --- a/src/main/java/appeng/worldgen/MeteoriteWorldGen.java +++ b/src/main/java/appeng/worldgen/MeteoriteWorldGen.java @@ -23,6 +23,7 @@ import java.util.Random; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import net.minecraft.world.chunk.IChunkGenerator; import net.minecraft.world.chunk.IChunkProvider; import net.minecraftforge.fml.common.IWorldGenerator; @@ -39,7 +40,7 @@ import appeng.worldgen.meteorite.ChunkOnly; public final class MeteoriteWorldGen implements IWorldGenerator { @Override - public void generate( final Random r, final int chunkX, final int chunkZ, final World w, final IChunkProvider chunkGenerator, final IChunkProvider chunkProvider ) + public void generate( final Random r, final int chunkX, final int chunkZ, final World w, final IChunkGenerator chunkGenerator, final IChunkProvider chunkProvider ) { if( WorldGenRegistry.INSTANCE.isWorldGenEnabled( WorldGenType.Meteorites, w ) ) { @@ -78,14 +79,14 @@ public final class MeteoriteWorldGen implements IWorldGenerator { for( int cz = pz - 6; cz < pz + 6; cz++ ) { - if( w.getChunkProvider().chunkExists( cx, cz ) ) + if( w.getChunkProvider().getLoadedChunk( cx, cz ) != null) { if( px == cx && pz == cz ) { continue; } - if( WorldData.instance().spawnData().hasGenerated( w.provider.getDimensionId(), cx, cz ) ) + if( WorldData.instance().spawnData().hasGenerated( w.provider.getDimension(), cx, cz ) ) { final MeteoritePlacer mp2 = new MeteoritePlacer(); mp2.spawnMeteorite( new ChunkOnly( w, cx, cz ), mp.getSettings() ); @@ -109,7 +110,7 @@ public final class MeteoriteWorldGen implements IWorldGenerator private Iterable getNearByMeteorites( final World w, final int chunkX, final int chunkZ ) { - return WorldData.instance().spawnData().getNearByMeteorites( w.provider.getDimensionId(), chunkX, chunkZ ); + return WorldData.instance().spawnData().getNearByMeteorites( w.provider.getDimension(), chunkX, chunkZ ); } private class MeteoriteSpawn implements IWorldCallable @@ -150,7 +151,7 @@ public final class MeteoriteWorldGen implements IWorldGenerator MeteoriteWorldGen.this.tryMeteorite( world, this.depth, this.x, this.z ); } - WorldData.instance().spawnData().setGenerated( world.provider.getDimensionId(), chunkX, chunkZ ); + WorldData.instance().spawnData().setGenerated( world.provider.getDimension(), chunkX, chunkZ ); WorldData.instance().compassData().service().updateArea( world, chunkX, chunkZ ); return null; diff --git a/src/main/java/appeng/worldgen/QuartzWorldGen.java b/src/main/java/appeng/worldgen/QuartzWorldGen.java index 49cc40411..8c15f8466 100644 --- a/src/main/java/appeng/worldgen/QuartzWorldGen.java +++ b/src/main/java/appeng/worldgen/QuartzWorldGen.java @@ -22,8 +22,9 @@ package appeng.worldgen; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraft.world.chunk.IChunkGenerator; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.feature.WorldGenMinable; import net.minecraftforge.fml.common.IWorldGenerator; @@ -55,7 +56,7 @@ public final class QuartzWorldGen implements IWorldGenerator } @Override - public void generate( final Random r, final int chunkX, final int chunkZ, final World w, final IChunkProvider chunkGenerator, final IChunkProvider chunkProvider ) + public void generate( final Random r, final int chunkX, final int chunkZ, final World w, final IChunkGenerator chunkGenerator, final IChunkProvider chunkProvider ) { int seaLevel = w.provider.getAverageGroundLevel() + 1; diff --git a/src/main/java/appeng/worldgen/meteorite/ChunkOnly.java b/src/main/java/appeng/worldgen/meteorite/ChunkOnly.java index d0fbd9730..659530341 100644 --- a/src/main/java/appeng/worldgen/meteorite/ChunkOnly.java +++ b/src/main/java/appeng/worldgen/meteorite/ChunkOnly.java @@ -4,7 +4,7 @@ package appeng.worldgen.meteorite; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; @@ -56,7 +56,7 @@ public class ChunkOnly extends StandardWorld { if( this.range( x, y, z ) ) { - return this.target.getBlock( x, y, z ); + return this.target.getBlockState( x, y, z ).getBlock(); } return Platform.AIR_BLOCK; } diff --git a/src/main/java/appeng/worldgen/meteorite/Fallout.java b/src/main/java/appeng/worldgen/meteorite/Fallout.java index e42fb516e..229595b37 100644 --- a/src/main/java/appeng/worldgen/meteorite/Fallout.java +++ b/src/main/java/appeng/worldgen/meteorite/Fallout.java @@ -30,19 +30,19 @@ public class Fallout final double a = Math.random(); if( a > 0.9 ) { - this.putter.put( w, x, y, z, Blocks.stone ); + this.putter.put( w, x, y, z, Blocks.STONE ); } else if( a > 0.8 ) { - this.putter.put( w, x, y, z, Blocks.cobblestone ); + this.putter.put( w, x, y, z, Blocks.COBBLESTONE ); } else if( a > 0.7 ) { - this.putter.put( w, x, y, z, Blocks.dirt ); + this.putter.put( w, x, y, z, Blocks.DIRT ); } else { - this.putter.put( w, x, y, z, Blocks.gravel ); + this.putter.put( w, x, y, z, Blocks.GRAVEL ); } } @@ -51,15 +51,15 @@ public class Fallout final double a = Math.random(); if( a > 0.9 ) { - this.putter.put( w, x, y, z, Blocks.cobblestone ); + this.putter.put( w, x, y, z, Blocks.COBBLESTONE ); } else if( a > 0.8 ) { - this.putter.put( w, x, y, z, Blocks.stone ); + this.putter.put( w, x, y, z, Blocks.STONE ); } else if( a > 0.7 ) { - this.putter.put( w, x, y, z, Blocks.grass ); + this.putter.put( w, x, y, z, Blocks.GRASS ); } else if( a > 0.6 ) { @@ -70,7 +70,7 @@ public class Fallout } else if( a > 0.5 ) { - this.putter.put( w, x, y, z, Blocks.gravel ); + this.putter.put( w, x, y, z, Blocks.GRAVEL ); } else { diff --git a/src/main/java/appeng/worldgen/meteorite/FalloutSand.java b/src/main/java/appeng/worldgen/meteorite/FalloutSand.java index dbc4afd3b..2c200ac4a 100644 --- a/src/main/java/appeng/worldgen/meteorite/FalloutSand.java +++ b/src/main/java/appeng/worldgen/meteorite/FalloutSand.java @@ -29,7 +29,7 @@ public class FalloutSand extends FalloutCopy { if( a > GLASS_THRESHOLD ) { - this.putter.put( w, x, y, z, Blocks.glass ); + this.putter.put( w, x, y, z, Blocks.GLASS ); } } } \ No newline at end of file diff --git a/src/main/java/appeng/worldgen/meteorite/FalloutSnow.java b/src/main/java/appeng/worldgen/meteorite/FalloutSnow.java index e5914301c..5b0a401dd 100644 --- a/src/main/java/appeng/worldgen/meteorite/FalloutSnow.java +++ b/src/main/java/appeng/worldgen/meteorite/FalloutSnow.java @@ -30,11 +30,11 @@ public class FalloutSnow extends FalloutCopy { if( a > SNOW_THRESHOLD ) { - this.putter.put( w, x, y, z, Blocks.snow ); + this.putter.put( w, x, y, z, Blocks.SNOW ); } else if( a > ICE_THRESHOLD ) { - this.putter.put( w, x, y, z, Blocks.ice ); + this.putter.put( w, x, y, z, Blocks.ICE ); } } } \ No newline at end of file diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java index f82f258cc..bf609f3da 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java @@ -13,7 +13,7 @@ public class MeteoriteBlockPutter { final Block original = w.getBlock( i, j, k ); - if( original == Blocks.bedrock || original == blk ) + if( original == Blocks.BEDROCK || original == blk ) { return false; } @@ -24,7 +24,7 @@ public class MeteoriteBlockPutter void put( final IMeteoriteWorld w, final int i, final int j, final int k, final IBlockState state, final int meta ) { - if( w.getBlock( i, j, k ) == Blocks.bedrock ) + if( w.getBlock( i, j, k ) == Blocks.BEDROCK ) { return; } diff --git a/src/main/java/appeng/worldgen/meteorite/StandardWorld.java b/src/main/java/appeng/worldgen/meteorite/StandardWorld.java index 1d0502a04..a00dafe32 100644 --- a/src/main/java/appeng/worldgen/meteorite/StandardWorld.java +++ b/src/main/java/appeng/worldgen/meteorite/StandardWorld.java @@ -6,7 +6,7 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.util.Platform; @@ -124,6 +124,6 @@ public class StandardWorld implements IMeteoriteWorld { return this.w.getBlockState( new BlockPos( x, y, z ) ); } - return Blocks.air.getDefaultState(); + return Blocks.AIR.getDefaultState(); } }