From 4ac490a5817dc7b5d08223e0fe0d604098ffffab Mon Sep 17 00:00:00 2001 From: asiekierka Date: Fri, 24 Oct 2014 16:34:15 +0200 Subject: [PATCH] fix style --- common/buildcraft/BuildCraftBuilders.java | 1 - common/buildcraft/BuildCraftCore.java | 6 ++++-- common/buildcraft/BuildCraftEnergy.java | 1 - common/buildcraft/BuildCraftSilicon.java | 4 +++- common/buildcraft/BuildCraftTransport.java | 3 +++ common/buildcraft/core/TickHandlerCore.java | 6 ------ common/buildcraft/core/triggers/TriggerRedstoneInput.java | 5 ++--- common/buildcraft/transport/triggers/ActionValve.java | 2 +- .../transport/triggers/TriggerRedstoneFaderInput.java | 4 +--- 9 files changed, 14 insertions(+), 18 deletions(-) diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java index c0b3d5bd..6656d461 100644 --- a/common/buildcraft/BuildCraftBuilders.java +++ b/common/buildcraft/BuildCraftBuilders.java @@ -28,7 +28,6 @@ import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLMissingMappingsEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStoppingEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index a694dbe1..808a6c31 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -32,6 +32,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.IIcon; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -44,6 +45,7 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.AchievementPage; @@ -54,6 +56,7 @@ import net.minecraftforge.common.config.Property; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.oredict.OreDictionary; + import buildcraft.api.blueprints.SchematicRegistry; import buildcraft.api.core.BCLog; import buildcraft.api.core.BlockIndex; @@ -96,11 +99,11 @@ import buildcraft.core.render.BlockHighlightHandler; import buildcraft.core.robots.EntityRobot; import buildcraft.core.triggers.ActionMachineControl; import buildcraft.core.triggers.ActionMachineControl.Mode; -import buildcraft.core.triggers.StatementParameterDirection; import buildcraft.core.triggers.ActionRedstoneOutput; import buildcraft.core.triggers.DefaultActionProvider; import buildcraft.core.triggers.DefaultTriggerProvider; import buildcraft.core.triggers.StatementIconProvider; +import buildcraft.core.triggers.StatementParameterDirection; import buildcraft.core.triggers.TriggerEnergy; import buildcraft.core.triggers.TriggerFluidContainer; import buildcraft.core.triggers.TriggerFluidContainerLevel; @@ -120,7 +123,6 @@ import buildcraft.core.utils.WorldPropertyIsSoft; import buildcraft.core.utils.WorldPropertyIsWood; import buildcraft.energy.fuels.CoolantManager; import buildcraft.energy.fuels.FuelManager; -import buildcraft.silicon.ItemRedstoneChipset.Chipset; @Mod(name = "BuildCraft", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Core", acceptedMinecraftVersions = "[1.7.10,1.8)", dependencies = "required-after:Forge@[10.13.0.1207,)") public class BuildCraftCore extends BuildCraftMod { diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index 6f12ab2c..12ae99b3 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -76,7 +76,6 @@ import buildcraft.energy.worldgen.BiomeGenOilDesert; import buildcraft.energy.worldgen.BiomeGenOilOcean; import buildcraft.energy.worldgen.BiomeInitializer; import buildcraft.energy.worldgen.OilPopulate; -import buildcraft.silicon.ItemRedstoneChipset.Chipset; import buildcraft.transport.network.PacketHandlerTransport; @Mod(name = "BuildCraft Energy", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Energy", dependencies = DefaultProps.DEPENDENCY_CORE) diff --git a/common/buildcraft/BuildCraftSilicon.java b/common/buildcraft/BuildCraftSilicon.java index bab72ca1..072765e7 100644 --- a/common/buildcraft/BuildCraftSilicon.java +++ b/common/buildcraft/BuildCraftSilicon.java @@ -12,15 +12,17 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; + import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLMissingMappingsEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; + import net.minecraftforge.oredict.OreDictionary; + import buildcraft.api.blueprints.SchematicRegistry; import buildcraft.api.boards.RedstoneBoardRegistry; import buildcraft.api.gates.IAction; diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index aaeab37e..b329e80d 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -19,6 +19,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -28,11 +29,13 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; + import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.RecipeSorter; + import buildcraft.api.blueprints.SchematicRegistry; import buildcraft.api.core.EnumColor; import buildcraft.api.core.IIconProvider; diff --git a/common/buildcraft/core/TickHandlerCore.java b/common/buildcraft/core/TickHandlerCore.java index a752b289..193e4ace 100644 --- a/common/buildcraft/core/TickHandlerCore.java +++ b/common/buildcraft/core/TickHandlerCore.java @@ -9,18 +9,12 @@ package buildcraft.core; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentTranslation; - import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - -import buildcraft.api.core.IInvSlot; -import buildcraft.core.inventory.InventoryIterator; import buildcraft.core.proxy.CoreProxy; -import buildcraft.core.utils.NBTUtils; public class TickHandlerCore { diff --git a/common/buildcraft/core/triggers/TriggerRedstoneInput.java b/common/buildcraft/core/triggers/TriggerRedstoneInput.java index c08cd33d..3342780e 100644 --- a/common/buildcraft/core/triggers/TriggerRedstoneInput.java +++ b/common/buildcraft/core/triggers/TriggerRedstoneInput.java @@ -11,7 +11,6 @@ package buildcraft.core.triggers; import buildcraft.api.gates.IGate; import buildcraft.api.gates.ITriggerParameter; import buildcraft.core.utils.StringUtils; -import buildcraft.transport.Pipe; import buildcraft.transport.TileGenericPipe; public class TriggerRedstoneInput extends BCTrigger { @@ -30,10 +29,10 @@ public class TriggerRedstoneInput extends BCTrigger { @Override public boolean isTriggerActive(IGate gate, ITriggerParameter[] parameters) { - TileGenericPipe tile = ((TileGenericPipe) gate.getPipe().getTile()); + TileGenericPipe tile = (TileGenericPipe) gate.getPipe().getTile(); int level = tile.redstoneInputSide[gate.getSide().ordinal()]; - return (active ? level > 0 : level == 0); + return active ? level > 0 : level == 0; } @Override diff --git a/common/buildcraft/transport/triggers/ActionValve.java b/common/buildcraft/transport/triggers/ActionValve.java index 33c9f618..aa7cf5e1 100644 --- a/common/buildcraft/transport/triggers/ActionValve.java +++ b/common/buildcraft/transport/triggers/ActionValve.java @@ -15,8 +15,8 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.gates.IActionParameter; import buildcraft.api.gates.IGate; import buildcraft.api.transport.IPipe; -import buildcraft.core.triggers.StatementParameterDirection; import buildcraft.core.triggers.BCActionActive; +import buildcraft.core.triggers.StatementParameterDirection; import buildcraft.core.utils.StringUtils; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransport; diff --git a/common/buildcraft/transport/triggers/TriggerRedstoneFaderInput.java b/common/buildcraft/transport/triggers/TriggerRedstoneFaderInput.java index 06eeb411..1eb8bbf7 100644 --- a/common/buildcraft/transport/triggers/TriggerRedstoneFaderInput.java +++ b/common/buildcraft/transport/triggers/TriggerRedstoneFaderInput.java @@ -11,11 +11,9 @@ package buildcraft.transport.triggers; import net.minecraft.client.renderer.texture.IIconRegister; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.api.gates.IActionParameter; import buildcraft.api.gates.IGate; import buildcraft.api.gates.ITriggerParameter; import buildcraft.core.triggers.BCTrigger; -import buildcraft.core.triggers.StatementParameterDirection; import buildcraft.core.utils.StringUtils; import buildcraft.transport.TileGenericPipe; @@ -36,7 +34,7 @@ public class TriggerRedstoneFaderInput extends BCTrigger { @Override public boolean isTriggerActive(IGate gate, ITriggerParameter[] parameter) { - TileGenericPipe tile = ((TileGenericPipe) gate.getPipe().getTile()); + TileGenericPipe tile = (TileGenericPipe) gate.getPipe().getTile(); return tile.redstoneInputSide[gate.getSide().ordinal()] == level; }