From bec52edce4643999adc4b22d05ade73fa20040db Mon Sep 17 00:00:00 2001 From: Electroblob <35599699+Electroblob77@users.noreply.github.com> Date: Fri, 16 Feb 2018 22:26:28 +0000 Subject: [PATCH] More cleanup --- .../wizardry/block/BlockArcaneWorkbench.java | 46 +++++++++---------- .../wizardry/registry/WizardryRegistry.java | 25 ++++------ .../wizardry/spell/Clairvoyance.java | 2 +- 3 files changed, 32 insertions(+), 41 deletions(-) diff --git a/src/main/java/electroblob/wizardry/block/BlockArcaneWorkbench.java b/src/main/java/electroblob/wizardry/block/BlockArcaneWorkbench.java index 9e7b9d72..062c02d0 100644 --- a/src/main/java/electroblob/wizardry/block/BlockArcaneWorkbench.java +++ b/src/main/java/electroblob/wizardry/block/BlockArcaneWorkbench.java @@ -25,43 +25,43 @@ public class BlockArcaneWorkbench extends BlockContainer { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.75D, 1.0D); - public BlockArcaneWorkbench() { + public BlockArcaneWorkbench(){ super(Material.ROCK); this.setLightLevel(0.8f); } @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos){ return AABB; } @Override - public TileEntity createNewTileEntity(World world, int metadata) { + public TileEntity createNewTileEntity(World world, int metadata){ return new TileEntityArcaneWorkbench(); } @Override - public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos){ return false; } @Override - public EnumBlockRenderType getRenderType(IBlockState state) { + public EnumBlockRenderType getRenderType(IBlockState state){ return EnumBlockRenderType.MODEL; } @Override - public boolean isOpaqueCube(IBlockState state) { + public boolean isOpaqueCube(IBlockState state){ return false; } @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState block, EntityPlayer player, EnumHand hand, - EnumFacing side, float hitX, float hitY, float hitZ) { + EnumFacing side, float hitX, float hitY, float hitZ){ TileEntity tileEntity = world.getTileEntity(pos); - if (tileEntity == null || player.isSneaking()) { + if(tileEntity == null || player.isSneaking()){ return false; } @@ -71,44 +71,44 @@ public class BlockArcaneWorkbench extends BlockContainer { } @Override - public void breakBlock(World world, BlockPos pos, IBlockState block) { + public void breakBlock(World world, BlockPos pos, IBlockState block){ Random random = new Random(); - TileEntityArcaneWorkbench tileentityarcaneworkbench = (TileEntityArcaneWorkbench) world.getTileEntity(pos); + TileEntityArcaneWorkbench tileentityarcaneworkbench = (TileEntityArcaneWorkbench)world.getTileEntity(pos); - if (tileentityarcaneworkbench != null) { + if(tileentityarcaneworkbench != null){ - for (int j1 = 0; j1 < tileentityarcaneworkbench.getSizeInventory(); ++j1) { + for(int j1 = 0; j1 < tileentityarcaneworkbench.getSizeInventory(); ++j1){ ItemStack itemstack = tileentityarcaneworkbench.getStackInSlot(j1); - if (!itemstack.isEmpty()) { + if(!itemstack.isEmpty()){ float f = random.nextFloat() * 0.8F + 0.1F; float f1 = random.nextFloat() * 0.8F + 0.1F; EntityItem entityitem; - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.getCount() > 0; world - .spawnEntity(entityitem)) { + for(float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.getCount() > 0; world + .spawnEntity(entityitem)){ int k1 = random.nextInt(21) + 10; - if (k1 > itemstack.getCount()) { + if(k1 > itemstack.getCount()){ k1 = itemstack.getCount(); } itemstack.shrink(k1); - entityitem = new EntityItem(world, (double) ((float) pos.getX() + f), - (double) ((float) pos.getY() + f1), (double) ((float) pos.getZ() + f2), + entityitem = new EntityItem(world, (double)((float)pos.getX() + f), + (double)((float)pos.getY() + f1), (double)((float)pos.getZ() + f2), new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; - entityitem.motionX = (double) ((float) random.nextGaussian() * f3); - entityitem.motionY = (double) ((float) random.nextGaussian() * f3 + 0.2F); - entityitem.motionZ = (double) ((float) random.nextGaussian() * f3); + entityitem.motionX = (double)((float)random.nextGaussian() * f3); + entityitem.motionY = (double)((float)random.nextGaussian() * f3 + 0.2F); + entityitem.motionZ = (double)((float)random.nextGaussian() * f3); - if (itemstack.hasTagCompound()) { - entityitem.getItem().setTagCompound(((NBTTagCompound) itemstack.getTagCompound().copy())); + if(itemstack.hasTagCompound()){ + entityitem.getItem().setTagCompound(((NBTTagCompound)itemstack.getTagCompound().copy())); } } } diff --git a/src/main/java/electroblob/wizardry/registry/WizardryRegistry.java b/src/main/java/electroblob/wizardry/registry/WizardryRegistry.java index 40cfc023..a3586556 100644 --- a/src/main/java/electroblob/wizardry/registry/WizardryRegistry.java +++ b/src/main/java/electroblob/wizardry/registry/WizardryRegistry.java @@ -229,8 +229,7 @@ public final class WizardryRegistry { biomes.remove(Biomes.MUSHROOM_ISLAND); biomes.remove(Biomes.MUSHROOM_ISLAND_SHORE); // For reference: 5, 1, 1 are the parameters for the witch in vanilla. - EntityRegistry.addSpawn(EntityEvilWizard.class, 3, 1, 1, EnumCreatureType.MONSTER, - biomes.toArray(new Biome[biomes.size()])); + EntityRegistry.addSpawn(EntityEvilWizard.class, 3, 1, 1, EnumCreatureType.MONSTER, biomes.toArray(new Biome[biomes.size()])); } @@ -273,11 +272,9 @@ public final class WizardryRegistry { ItemStack scrollStack = new ItemStack(WizardryItems.blank_scroll); ItemStack paperStack = new ItemStack(Items.PAPER); - GameRegistry.addRecipe(magicWandStack, " x", " y ", "z ", 'x', magicCrystalStack, 'y', stickStack, 'z', - goldNuggetStack); + GameRegistry.addRecipe(magicWandStack, " x", " y ", "z ", 'x', magicCrystalStack, 'y', stickStack, 'z', goldNuggetStack); GameRegistry.addRecipe(spellBookStack, " x ", "xyx", " x ", 'x', magicCrystalStack, 'y', bookStack); - GameRegistry.addRecipe(arcaneWorkbenchStack, "vwv", "xyx", "zzz", 'v', goldNuggetStack, 'w', purpleCarpetStack, - 'x', magicCrystalStack, 'y', lapisBlockStack, 'z', stoneStack); + GameRegistry.addRecipe(arcaneWorkbenchStack, "vwv", "xyx", "zzz", 'v', goldNuggetStack, 'w', purpleCarpetStack, 'x', magicCrystalStack, 'y', lapisBlockStack, 'z', stoneStack); GameRegistry.addRecipe(manaFlaskStack, "yyy", "yxy", "yyy", 'x', bottleStack, 'y', magicCrystalStack); GameRegistry.addRecipe(transportationStoneStack, " x ", "xyx", " x ", 'x', stoneStack, 'y', magicCrystalStack); GameRegistry.addRecipe(hatStack, "yyy", "y y", 'y', silkStack); @@ -290,14 +287,10 @@ public final class WizardryRegistry { GameRegistry.addShapelessRecipe(wizardHandbookStack, bookStack, magicCrystalStack); GameRegistry.addShapelessRecipe(magicCrystalStack1, crystalFlowerStack); GameRegistry.addShapelessRecipe(magicCrystalStack2, crystalBlockStack); - - if(Wizardry.settings.firebombIsCraftable) - GameRegistry.addShapelessRecipe(firebombStack, bottleStack, gunpowderStack, blazePowderStack, blazePowderStack); - if(Wizardry.settings.poisonBombIsCraftable) - GameRegistry.addShapelessRecipe(poisonBombStack, bottleStack, gunpowderStack, spiderEyeStack, spiderEyeStack); - if(Wizardry.settings.smokeBombIsCraftable) - GameRegistry.addShapelessRecipe(smokeBombStack, bottleStack, gunpowderStack, coalStack, coalStack); + if(Wizardry.settings.firebombIsCraftable) GameRegistry.addShapelessRecipe(firebombStack, bottleStack, gunpowderStack, blazePowderStack, blazePowderStack); + if(Wizardry.settings.poisonBombIsCraftable) GameRegistry.addShapelessRecipe(poisonBombStack, bottleStack, gunpowderStack, spiderEyeStack, spiderEyeStack); + if(Wizardry.settings.smokeBombIsCraftable) GameRegistry.addShapelessRecipe(smokeBombStack, bottleStack, gunpowderStack, coalStack, coalStack); if(Wizardry.settings.useAlternateScrollRecipe){ GameRegistry.addShapelessRecipe(scrollStack, paperStack, stringStack, magicCrystalStack); @@ -310,8 +303,7 @@ public final class WizardryRegistry { for(Element element : Element.values()){ for(Tier tier : Tier.values()){ - miscWandStack = new ItemStack(WizardryUtilities.getWand(tier, element), 1, - OreDictionary.WILDCARD_VALUE); + miscWandStack = new ItemStack(WizardryUtilities.getWand(tier, element), 1, OreDictionary.WILDCARD_VALUE); GameRegistry.addShapelessRecipe(miscWandStack, miscWandStack, manaFlaskStack); } } @@ -320,8 +312,7 @@ public final class WizardryRegistry { for(Element element : Element.values()){ for(EntityEquipmentSlot slot : WizardryUtilities.ARMOUR_SLOTS){ - miscArmourStack = new ItemStack(WizardryUtilities.getArmour(element, slot), 1, - OreDictionary.WILDCARD_VALUE); + miscArmourStack = new ItemStack(WizardryUtilities.getArmour(element, slot), 1, OreDictionary.WILDCARD_VALUE); GameRegistry.addShapelessRecipe(miscArmourStack, miscArmourStack, manaFlaskStack); } } diff --git a/src/main/java/electroblob/wizardry/spell/Clairvoyance.java b/src/main/java/electroblob/wizardry/spell/Clairvoyance.java index 7f1390e1..320bd9a7 100644 --- a/src/main/java/electroblob/wizardry/spell/Clairvoyance.java +++ b/src/main/java/electroblob/wizardry/spell/Clairvoyance.java @@ -81,7 +81,7 @@ public class Clairvoyance extends Spell { 256 * modifiers.get(WizardryItems.range_upgrade)); if(path != null && path.getFinalPathPoint() != null){ - // TODO Corail : is it normal to have x in each ??? + int x = path.getFinalPathPoint().x; int y = path.getFinalPathPoint().y; int z = path.getFinalPathPoint().z;