From 37ab0f0dfb27e5c9c9ae277b59b5577d8e115d8f Mon Sep 17 00:00:00 2001 From: OneEyeMaker Date: Sat, 23 Sep 2017 10:00:11 +0300 Subject: [PATCH] Reformatting code: First attempt --- .../mod/blocks/BlockAtomicReconstructor.java | 5 ++--- .../actuallyadditions/mod/booklet/InitBooklet.java | 4 ++-- .../actuallyadditions/mod/items/ItemDrill.java | 8 ++++---- .../actuallyadditions/mod/items/ItemFillingWand.java | 4 ++-- .../actuallyadditions/mod/items/ItemGrowthRing.java | 6 +++--- .../actuallyadditions/mod/items/ItemLeafBlower.java | 9 ++++----- .../actuallyadditions/mod/items/ItemMagnetRing.java | 4 ++-- .../actuallyadditions/mod/items/ItemPotionRing.java | 8 ++++---- .../actuallyadditions/mod/items/ItemTeleStaff.java | 2 +- .../actuallyadditions/mod/items/lens/LensColor.java | 8 ++++---- .../actuallyadditions/mod/items/lens/LensDeath.java | 4 ++-- .../mod/items/lens/LensDisenchanting.java | 6 +++--- .../mod/items/lens/LensDisruption.java | 4 ++-- .../actuallyadditions/mod/items/lens/LensMining.java | 4 ++-- .../mod/items/lens/LensRecipeHandler.java | 4 ++-- .../mod/misc/apiimpl/MethodHandler.java | 6 +++--- .../mod/recipe/EmpowererHandler.java | 6 +++--- .../mod/tile/TileEntityBioReactor.java | 6 +++--- .../actuallyadditions/mod/util/StackUtil.java | 12 ++++++------ 19 files changed, 54 insertions(+), 56 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java index cb5699c47..6777d99f9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.blocks; -import java.util.List; - import de.ellpeck.actuallyadditions.api.lens.ILensItem; import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase; import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase; @@ -49,11 +47,12 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import java.util.List; + public class BlockAtomicReconstructor extends BlockContainerBase implements IHudDisplay{ public static final int NAME_FLAVOR_AMOUNTS_1 = 12; public static final int NAME_FLAVOR_AMOUNTS_2 = 14; - public BlockAtomicReconstructor(String name){ super(Material.ROCK, name); this.setHarvestLevel("pickaxe", 0); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java index 46916bac1..3eef2e51b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.booklet; -import java.util.*; - import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry; @@ -51,6 +49,8 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; +import java.util.*; + public final class InitBooklet{ public static BookletChapter[] chaptersIntroduction = new BookletChapter[11]; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java index 012cd15de..d73ef11b7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java @@ -10,10 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import com.google.common.collect.Multimap; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheColoredLampColors; @@ -48,6 +44,10 @@ import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + public class ItemDrill extends ItemEnergy{ public static final int HARVEST_LEVEL = 4; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java index 6205837af..ca296e81c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import java.util.List; - import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; import de.ellpeck.actuallyadditions.mod.util.ModUtil; @@ -36,6 +34,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import java.util.List; + public class ItemFillingWand extends ItemEnergy{ public ItemFillingWand(String name){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java index f3e257197..4a0f77073 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemGrowthRing.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import java.util.ArrayList; -import java.util.List; - import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; import de.ellpeck.actuallyadditions.mod.util.StackUtil; @@ -29,6 +26,9 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; +import java.util.ArrayList; +import java.util.List; + public class ItemGrowthRing extends ItemEnergy{ public ItemGrowthRing(String name){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java index b6f5bd0e6..892bdac65 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLeafBlower.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import java.util.ArrayList; -import java.util.Collections; - import de.ellpeck.actuallyadditions.api.misc.IDisplayStandItem; import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; import de.ellpeck.actuallyadditions.mod.items.base.ItemBase; @@ -35,6 +32,9 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; +import java.util.ArrayList; +import java.util.Collections; + public class ItemLeafBlower extends ItemBase implements IDisplayStandItem{ private final boolean isAdvanced; @@ -108,8 +108,7 @@ public class ItemLeafBlower extends ItemBase implements IDisplayStandItem{ BlockPos pos = new BlockPos(x+reachX, y+reachY, z+reachZ); Block block = world.getBlockState(pos).getBlock(); - if((block instanceof BlockBush || block instanceof IShearable) && - (this.isAdvanced || !block.isLeaves(world.getBlockState(pos), world, pos))){ + if((block instanceof BlockBush || block instanceof IShearable) && (this.isAdvanced || !block.isLeaves(world.getBlockState(pos), world, pos))){ breakPositions.add(pos); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java index 378f2ce5c..1e1ea9d01 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import java.util.ArrayList; - import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; @@ -27,6 +25,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; +import java.util.ArrayList; + public class ItemMagnetRing extends ItemEnergy{ public ItemMagnetRing(String name){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java index 7b19957b5..c10600b35 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java @@ -10,10 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items; -import java.util.Collections; -import java.util.List; -import javax.annotation.Nullable; - import de.ellpeck.actuallyadditions.api.misc.IDisplayStandItem; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; @@ -39,6 +35,10 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; +import java.util.Collections; +import java.util.List; + public class ItemPotionRing extends ItemBase implements IColorProvidingItem, IDisplayStandItem{ public static final ThePotionRings[] ALL_RINGS = ThePotionRings.values(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java index 177becff6..f2c19d4d1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemTeleStaff.java @@ -44,7 +44,7 @@ public class ItemTeleStaff extends ItemEnergy{ double y = pos.hitVec.y-(side == 0 ? 2.0 : 0)+(side == 1 ? 0.5 : 0); double z = pos.hitVec.z-(side == 2 ? 0.5 : 0)+(side == 3 ? 0.5 : 0); int baseUse = ConfigIntValues.TELEPORT_STAFF_ENERGY_USE.getValue(); - int use = baseUse + (int)(baseUse * pos.hitVec.distanceTo(new Vec3d(player.posX, player.posY + (player.getEyeHeight() - player.getDefaultEyeHeight()), player.posZ))); + int use = baseUse+(int)(baseUse*pos.hitVec.distanceTo(new Vec3d(player.posX, player.posY+(player.getEyeHeight()-player.getDefaultEyeHeight()), player.posZ))); if(this.getEnergyStored(stack) >= use){ ((EntityPlayerMP)player).connection.setPlayerLocation(x, y, z, player.rotationYaw, player.rotationPitch); player.dismountRidingEntity(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java index 5ea9b72ca..9e8cc256b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java @@ -11,10 +11,6 @@ package de.ellpeck.actuallyadditions.mod.items.lens; -import java.util.ArrayList; -import java.util.Map; -import java.util.Random; - import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; @@ -34,6 +30,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.FakePlayerFactory; +import java.util.ArrayList; +import java.util.Map; +import java.util.Random; + public class LensColor extends Lens{ //Thanks to xdjackiexd for this, as I couldn't be bothered diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDeath.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDeath.java index b250f4d91..1dd927c4d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDeath.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDeath.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items.lens; -import java.util.ArrayList; - import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; @@ -21,6 +19,8 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import java.util.ArrayList; + public class LensDeath extends Lens{ @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisenchanting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisenchanting.java index 93767bc75..50bf23f3f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisenchanting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisenchanting.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items.lens; -import java.util.List; -import java.util.Map; - import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; @@ -31,6 +28,9 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import java.util.List; +import java.util.Map; + public class LensDisenchanting extends Lens{ @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java index 87d91e9ed..c0d87adee 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items.lens; -import java.util.ArrayList; - import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; @@ -27,6 +25,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import java.util.ArrayList; + public class LensDisruption extends Lens{ @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensMining.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensMining.java index bbbab1b37..89158472c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensMining.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensMining.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items.lens; -import java.util.List; - import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; @@ -37,6 +35,8 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.FakePlayerFactory; import net.minecraftforge.oredict.OreDictionary; +import java.util.List; + public class LensMining extends Lens{ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensRecipeHandler.java index e10478afb..6beb33a17 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensRecipeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensRecipeHandler.java @@ -10,8 +10,6 @@ package de.ellpeck.actuallyadditions.mod.items.lens; -import java.util.ArrayList; - import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.ColorLensChangerByDyeMeta; import de.ellpeck.actuallyadditions.api.recipe.IColorLensChanger; @@ -28,6 +26,8 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import java.util.ArrayList; + public final class LensRecipeHandler{ public static final ArrayList MAIN_PAGE_RECIPES = new ArrayList(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/MethodHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/MethodHandler.java index 107b92689..b66ca8ca5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/MethodHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/MethodHandler.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.misc.apiimpl; -import java.util.ArrayList; -import java.util.List; - import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry; @@ -51,6 +48,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.FakePlayerFactory; +import java.util.ArrayList; +import java.util.List; + public class MethodHandler implements IMethodHandler{ @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/EmpowererHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/EmpowererHandler.java index 0877c7dac..7c01504ac 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/EmpowererHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/EmpowererHandler.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.recipe; -import java.util.ArrayList; -import java.util.List; - import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; @@ -26,6 +23,9 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import java.util.ArrayList; +import java.util.List; + public final class EmpowererHandler{ public static final ArrayList MAIN_PAGE_RECIPES = new ArrayList(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBioReactor.java index ed7e56387..46bcdc197 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBioReactor.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.tile; -import java.util.ArrayList; -import java.util.List; - import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.block.Block; @@ -27,6 +24,9 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.common.IPlantable; import net.minecraftforge.energy.IEnergyStorage; +import java.util.ArrayList; +import java.util.List; + public class TileEntityBioReactor extends TileEntityInventoryBase implements ISharingEnergyProvider{ public final CustomEnergyStorage storage; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/StackUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/StackUtil.java index 23ba82702..8a7fc8802 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/StackUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/StackUtil.java @@ -36,13 +36,13 @@ public final class StackUtil{ } public static boolean isValid(ItemStack stack){//Stacks are nonnull. If we are making null stacks we're stupid anyway. - if(stack == null){ - AwfulUtil.callTheFuckinPolice("Oh yeah some idiot somewhere threw a null itemstack at us, might've been us, but whatever"); - return false; + if(stack == null){ + AwfulUtil.callTheFuckinPolice("Oh yeah some idiot somewhere threw a null itemstack at us, might've been us, but whatever"); + return false; } - Item i = stack.getItem(); - if(i instanceof IDisableableItem){ - return !((IDisableableItem) i).isDisabled(); + Item i = stack.getItem(); + if(i instanceof IDisableableItem){ + return !((IDisableableItem) i).isDisabled(); } return !stack.isEmpty(); }