diff --git a/build.gradle b/build.gradle index 7338fad8..8dd1d656 100755 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ group= "com.mod-buildcraft" archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension] minecraft { - version = "1.7.10-10.13.0.1207" // McVersion-ForgeVersion this variable is later changed to contain only the MC version, while the apiVersion variable is used for the forge version. Yeah its stupid, and will be changed eentually. + version = "1.7.10-10.13.0.1179" // McVersion-ForgeVersion this variable is later changed to contain only the MC version, while the apiVersion variable is used for the forge version. Yeah its stupid, and will be changed eentually. runDir = "run" // the directory for ForgeGradle to run Minecraft in diff --git a/common/buildcraft/builders/BlockArchitect.java b/common/buildcraft/builders/BlockArchitect.java index 99842b78..0287797f 100644 --- a/common/buildcraft/builders/BlockArchitect.java +++ b/common/buildcraft/builders/BlockArchitect.java @@ -32,108 +32,108 @@ import buildcraft.core.utils.Utils; public class BlockArchitect extends BlockMultiTexture { - public BlockArchitect() { - super(Material.iron, CreativeTabBuildCraft.BLOCKS); - } + public BlockArchitect() { + super(Material.iron, CreativeTabBuildCraft.BLOCKS); + } - @Override - public TileEntity createNewTileEntity(World world, int metadata) { - return new TileArchitect(); - } + @Override + public TileEntity createNewTileEntity(World world, int metadata) { + return new TileArchitect(); + } - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int par6, float par7, - float par8, float par9) { + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int par6, float par7, + float par8, float par9) { - // Drop through if the player is sneaking - if (entityplayer.isSneaking()) { - return false; - } + // Drop through if the player is sneaking + if (entityplayer.isSneaking()) { + return false; + } - BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); - FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; - } + BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); + FMLCommonHandler.instance().bus().post(event); + if (event.isCanceled()) { + return false; + } - Item equipped = entityplayer.getCurrentEquippedItem() != null ? entityplayer.getCurrentEquippedItem().getItem() : null; - if (equipped instanceof IToolWrench && ((IToolWrench) equipped).canWrench(entityplayer, x, y, z)) { + Item equipped = entityplayer.getCurrentEquippedItem() != null ? entityplayer.getCurrentEquippedItem().getItem() : null; + if (equipped instanceof IToolWrench && ((IToolWrench) equipped).canWrench(entityplayer, x, y, z)) { - int meta = world.getBlockMetadata(x, y, z); + int meta = world.getBlockMetadata(x, y, z); - switch (ForgeDirection.values()[meta]) { - case WEST: - world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.SOUTH.ordinal(), 0); - break; - case EAST: - world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.NORTH.ordinal(), 0); - break; - case NORTH: - world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.WEST.ordinal(), 0); - break; - case SOUTH: - default: - world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.EAST.ordinal(), 0); - break; - } + switch (ForgeDirection.values()[meta]) { + case WEST: + world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.SOUTH.ordinal(), 0); + break; + case EAST: + world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.NORTH.ordinal(), 0); + break; + case NORTH: + world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.WEST.ordinal(), 0); + break; + case SOUTH: + default: + world.setBlockMetadataWithNotify(x, y, z, ForgeDirection.EAST.ordinal(), 0); + break; + } - world.markBlockForUpdate(x, y, z); - ((IToolWrench) equipped).wrenchUsed(entityplayer, x, y, z); - return true; - } else if (equipped instanceof ItemConstructionMarker) { - ItemConstructionMarker.link(entityplayer.getCurrentEquippedItem(), world, x, y, z); + world.markBlockForUpdate(x, y, z); + ((IToolWrench) equipped).wrenchUsed(entityplayer, x, y, z); + return true; + } else if (equipped instanceof ItemConstructionMarker) { + ItemConstructionMarker.link(entityplayer.getCurrentEquippedItem(), world, x, y, z); - return true; - } else { + return true; + } else { - if (!world.isRemote) { - entityplayer.openGui(BuildCraftBuilders.instance, GuiIds.ARCHITECT_TABLE, world, x, y, z); - } - return true; + if (!world.isRemote) { + entityplayer.openGui(BuildCraftBuilders.instance, GuiIds.ARCHITECT_TABLE, world, x, y, z); + } + return true; - } - } + } + } - @Override - public void breakBlock(World world, int i, int j, int k, Block block, int par6) { - Utils.preDestroyBlock(world, i, j, k); + @Override + public void breakBlock(World world, int i, int j, int k, Block block, int par6) { + Utils.preDestroyBlock(world, i, j, k); - super.breakBlock(world, i, j, k, block, par6); - } + super.breakBlock(world, i, j, k, block, par6); + } - @Override - public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityliving, ItemStack stack) { - super.onBlockPlacedBy(world, i, j, k, entityliving, stack); + @Override + public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityliving, ItemStack stack) { + super.onBlockPlacedBy(world, i, j, k, entityliving, stack); - ForgeDirection orientation = Utils.get2dOrientation(entityliving); + ForgeDirection orientation = Utils.get2dOrientation(entityliving); - world.setBlockMetadataWithNotify(i, j, k, orientation.getOpposite().ordinal(), 1); - } + world.setBlockMetadataWithNotify(i, j, k, orientation.getOpposite().ordinal(), 1); + } - @Override - public boolean renderAsNormalBlock() { - return false; - } + @Override + public boolean renderAsNormalBlock() { + return false; + } - @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return false; - } + @Override + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + return false; + } - @Override - public int getLightValue(IBlockAccess world, int x, int y, int z) { - return 1; - } + @Override + public int getLightValue(IBlockAccess world, int x, int y, int z) { + return 1; + } - /* MULTI TEXTURE */ - @Override - public String getIconPrefix() { - return "architect_"; - } + /* MULTI TEXTURE */ + @Override + public String getIconPrefix() { + return "architect_"; + } - @Override - public int getFrontSide(IBlockAccess world, int x, int y, int z) { - return world.getBlockMetadata(x, y, z); - } + @Override + public int getFrontSide(IBlockAccess world, int x, int y, int z) { + return world.getBlockMetadata(x, y, z); + } } diff --git a/common/buildcraft/builders/BlockBlueprintLibrary.java b/common/buildcraft/builders/BlockBlueprintLibrary.java index 94ce9c69..775f8bab 100644 --- a/common/buildcraft/builders/BlockBlueprintLibrary.java +++ b/common/buildcraft/builders/BlockBlueprintLibrary.java @@ -48,9 +48,9 @@ public class BlockBlueprintLibrary extends BlockContainer { } BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; - } + if (event.isCanceled()) { + return false; + } TileEntity tile = world.getTileEntity(i, j, k); if (tile instanceof TileBlueprintLibrary) { diff --git a/common/buildcraft/builders/BlockBuilder.java b/common/buildcraft/builders/BlockBuilder.java index e1cd5228..b21c4659 100644 --- a/common/buildcraft/builders/BlockBuilder.java +++ b/common/buildcraft/builders/BlockBuilder.java @@ -79,9 +79,9 @@ public class BlockBuilder extends BlockContainer { } BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; - } + if (event.isCanceled()) { + return false; + } TileEntity tile = world.getTileEntity(x, y, z); TileBuilder builder = tile instanceof TileBuilder ? (TileBuilder) tile : null; diff --git a/common/buildcraft/builders/BlockConstructionMarker.java b/common/buildcraft/builders/BlockConstructionMarker.java index 845aa5d8..04af9b43 100755 --- a/common/buildcraft/builders/BlockConstructionMarker.java +++ b/common/buildcraft/builders/BlockConstructionMarker.java @@ -61,9 +61,9 @@ public class BlockConstructionMarker extends BlockMarker { BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; - } + if (event.isCanceled()) { + return false; + } TileConstructionMarker marker = (TileConstructionMarker) world.getTileEntity(x, y, z); diff --git a/common/buildcraft/builders/BlockFiller.java b/common/buildcraft/builders/BlockFiller.java index ec1acb5a..33e2ae03 100644 --- a/common/buildcraft/builders/BlockFiller.java +++ b/common/buildcraft/builders/BlockFiller.java @@ -55,9 +55,9 @@ public class BlockFiller extends BlockContainer { BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; - } + if (event.isCanceled()) { + return false; + } if (!world.isRemote) { entityplayer.openGui(BuildCraftBuilders.instance, GuiIds.FILLER, world, i, j, k); diff --git a/common/buildcraft/builders/BlockMarker.java b/common/buildcraft/builders/BlockMarker.java index 869eaa0e..00a52169 100644 --- a/common/buildcraft/builders/BlockMarker.java +++ b/common/buildcraft/builders/BlockMarker.java @@ -103,9 +103,9 @@ public class BlockMarker extends BlockContainer { BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; - } + if (event.isCanceled()) { + return false; + } TileEntity tile = world.getTileEntity(i, j, k); if (tile instanceof TileMarker) { diff --git a/common/buildcraft/builders/urbanism/BlockUrbanist.java b/common/buildcraft/builders/urbanism/BlockUrbanist.java index c8380f5e..3fadf16d 100755 --- a/common/buildcraft/builders/urbanism/BlockUrbanist.java +++ b/common/buildcraft/builders/urbanism/BlockUrbanist.java @@ -42,9 +42,9 @@ public class BlockUrbanist extends BlockBuildCraft { BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; - } + if (event.isCanceled()) { + return false; + } return true; diff --git a/common/buildcraft/commander/BlockRequester.java b/common/buildcraft/commander/BlockRequester.java index 2634ba70..f8788e4a 100755 --- a/common/buildcraft/commander/BlockRequester.java +++ b/common/buildcraft/commander/BlockRequester.java @@ -49,9 +49,9 @@ public class BlockRequester extends BlockBuildCraft { BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; - } + if (event.isCanceled()) { + return false; + } if (!world.isRemote) { entityplayer.openGui(BuildCraftBuilders.instance, GuiIds.REQUESTER, diff --git a/common/buildcraft/commander/BlockZonePlan.java b/common/buildcraft/commander/BlockZonePlan.java index 367bf660..3f5d36f2 100755 --- a/common/buildcraft/commander/BlockZonePlan.java +++ b/common/buildcraft/commander/BlockZonePlan.java @@ -49,9 +49,9 @@ public class BlockZonePlan extends BlockBuildCraft { BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; - } + if (event.isCanceled()) { + return false; + } if (!world.isRemote) { entityplayer.openGui(BuildCraftBuilders.instance, GuiIds.MAP, diff --git a/common/buildcraft/energy/BlockEngine.java b/common/buildcraft/energy/BlockEngine.java index 0b1cd387..90e8c697 100644 --- a/common/buildcraft/energy/BlockEngine.java +++ b/common/buildcraft/energy/BlockEngine.java @@ -133,9 +133,9 @@ public class BlockEngine extends BlockBuildCraft implements ICustomHighlight { BlockInteractionEvent event = new BlockInteractionEvent(player, this); FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; - } + if (event.isCanceled()) { + return false; + } // Do not open guis when having a pipe in hand if (player.getCurrentEquippedItem() != null) { diff --git a/common/buildcraft/factory/BlockAutoWorkbench.java b/common/buildcraft/factory/BlockAutoWorkbench.java index 62cb72f8..e0582604 100644 --- a/common/buildcraft/factory/BlockAutoWorkbench.java +++ b/common/buildcraft/factory/BlockAutoWorkbench.java @@ -49,9 +49,9 @@ public class BlockAutoWorkbench extends BlockBuildCraft { super.onBlockActivated(world, i, j, k, entityplayer, par6, par7, par8, par9); BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; - } + if (event.isCanceled()) { + return false; + } // Drop through if the player is sneaking if (entityplayer.isSneaking()) { diff --git a/common/buildcraft/factory/BlockHopper.java b/common/buildcraft/factory/BlockHopper.java index aa07a282..740b8f2d 100644 --- a/common/buildcraft/factory/BlockHopper.java +++ b/common/buildcraft/factory/BlockHopper.java @@ -65,9 +65,9 @@ public class BlockHopper extends BlockBuildCraft { BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; - } + if (event.isCanceled()) { + return false; + } if (entityplayer.getCurrentEquippedItem() != null) { if (entityplayer.getCurrentEquippedItem().getItem() instanceof IItemPipe) { diff --git a/common/buildcraft/factory/BlockRefinery.java b/common/buildcraft/factory/BlockRefinery.java index f32e24a6..18bd9c5c 100644 --- a/common/buildcraft/factory/BlockRefinery.java +++ b/common/buildcraft/factory/BlockRefinery.java @@ -112,9 +112,9 @@ public class BlockRefinery extends BlockContainer { } BlockInteractionEvent event = new BlockInteractionEvent(player, this); FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; - } + if (event.isCanceled()) { + return false; + } ItemStack current = player.getCurrentEquippedItem(); Item equipped = current != null ? current.getItem() : null; diff --git a/common/buildcraft/factory/BlockTank.java b/common/buildcraft/factory/BlockTank.java index 2e5a5f99..dda6c8ea 100644 --- a/common/buildcraft/factory/BlockTank.java +++ b/common/buildcraft/factory/BlockTank.java @@ -93,9 +93,9 @@ public class BlockTank extends BlockContainer { BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); FMLCommonHandler.instance().bus().post(event); - if (event.isCanceled()) { - return false; - } + if (event.isCanceled()) { + return false; + } if (current != null) { FluidStack liquid = FluidContainerRegistry.getFluidForFilledItem(current); diff --git a/common/buildcraft/silicon/BlockLaserTable.java b/common/buildcraft/silicon/BlockLaserTable.java index 36e5cfa9..3d733d50 100644 --- a/common/buildcraft/silicon/BlockLaserTable.java +++ b/common/buildcraft/silicon/BlockLaserTable.java @@ -68,8 +68,8 @@ public class BlockLaserTable extends BlockBuildCraft { BlockInteractionEvent event = new BlockInteractionEvent(entityplayer, this); FMLCommonHandler.instance().bus().post(event); if (event.isCanceled()) { - return false; - } + return false; + } if (!world.isRemote) { int meta = world.getBlockMetadata(i, j, k);