From 48d17315fcf24699fbdf5d263f3422e1579ff81f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Mon, 10 Feb 2014 03:19:45 +0100 Subject: [PATCH] undid weird replace in railcraft api (wtf?) and some minor cleanup --- .../mods/railcraft/DriverSteamTurbine.java | 20 +++++-------------- .../cil/occ/mods/railcraft/ModRailcraft.java | 5 ++--- .../occ/mods/tmechworks/DriverDrawBridge.java | 5 ----- .../occ/mods/tmechworks/ModTMechworks.java | 5 ++--- .../buildcraft/api/core/StackWrapper.java | 2 +- .../api/filler/IPatternIterator.java | 2 +- .../buildcraft/api/power/IPowerEmitter.java | 2 +- .../buildcraft/api/power/IPowerReceptor.java | 2 +- .../buildcraft/api/power/PowerHandler.java | 2 +- .../api/carts/IAlternateCartTexture.java | 2 +- .../carts/ICartContentsTextureProvider.java | 2 +- .../railcraft/api/carts/IEnergyTransfer.java | 2 +- .../railcraft/api/carts/IItemTransfer.java | 2 +- .../railcraft/api/carts/ILinkableCart.java | 2 +- .../railcraft/api/carts/ILinkageManager.java | 2 +- .../railcraft/api/carts/ILiquidTransfer.java | 2 +- .../mods/railcraft/api/carts/IMinecart.java | 2 +- .../railcraft/api/carts/IPaintedCart.java | 2 +- .../railcraft/api/carts/IRefuelableCart.java | 2 +- .../railcraft/api/carts/IRoutableCart.java | 2 +- .../railcraft/api/carts/bore/IBoreHead.java | 2 +- .../railcraft/api/carts/bore/IMineable.java | 2 +- .../mods/railcraft/api/core/IOwnable.java | 2 +- .../railcraft/api/core/IPostConnection.java | 2 +- .../railcraft/api/core/ITextureLoader.java | 2 +- .../railcraft/api/core/WorldCoordinate.java | 2 +- .../api/core/items/IMinecartItem.java | 2 +- .../api/core/items/IStackFilter.java | 2 +- .../api/core/items/IToolCrowbar.java | 2 +- .../railcraft/api/core/items/ITrackItem.java | 2 +- .../railcraft/api/core/items/TagList.java | 2 +- .../IBlastFurnaceCraftingManager.java | 2 +- .../api/crafting/IBlastFurnaceRecipe.java | 2 +- .../crafting/ICokeOvenCraftingManager.java | 2 +- .../api/crafting/ICokeOvenRecipe.java | 2 +- .../crafting/IRockCrusherCraftingManager.java | 2 +- .../api/crafting/IRockCrusherRecipe.java | 2 +- .../IRollingMachineCraftingManager.java | 2 +- .../crafting/RailcraftCraftingManager.java | 2 +- .../api/events/CartLockdownEvent.java | 2 +- .../mods/railcraft/api/fuel/FuelManager.java | 2 +- .../mods/railcraft/api/helpers/Helpers.java | 2 +- .../api/helpers/StructureHelper.java | 2 +- .../railcraft/api/signals/AbstractPair.java | 2 +- .../api/signals/DualSignalReceiver.java | 2 +- .../api/signals/IControllerTile.java | 2 +- .../api/signals/IPairEffectRenderer.java | 2 +- .../railcraft/api/signals/IReceiverTile.java | 2 +- .../api/signals/ISignalPacketBuilder.java | 2 +- .../railcraft/api/signals/SignalAspect.java | 2 +- .../api/signals/SignalController.java | 2 +- .../railcraft/api/signals/SignalReceiver.java | 2 +- .../railcraft/api/signals/SignalTools.java | 2 +- .../api/signals/SimpleSignalController.java | 2 +- .../api/signals/SimpleSignalReceiver.java | 2 +- .../railcraft/api/tracks/IRoutingTrack.java | 2 +- .../api/tracks/ITrackBlocksMovement.java | 2 +- .../api/tracks/ITrackCustomPlaced.java | 2 +- .../api/tracks/ITrackCustomShape.java | 2 +- .../railcraft/api/tracks/ITrackEmitter.java | 2 +- .../api/tracks/ITrackItemIconProvider.java | 2 +- .../railcraft/api/tracks/ITrackLockdown.java | 2 +- .../railcraft/api/tracks/ITrackPowered.java | 2 +- .../api/tracks/ITrackReversable.java | 2 +- .../mods/railcraft/api/tracks/ITrackTile.java | 2 +- .../mods/railcraft/api/tracks/RailTools.java | 2 +- .../api/tracks/TrackInstanceBase.java | 2 +- .../railcraft/api/tracks/TrackRegistry.java | 2 +- .../mods/railcraft/api/tracks/TrackSpec.java | 2 +- .../lib/blocks/IDrawbridgeLogicBase.java | 8 +++----- 70 files changed, 77 insertions(+), 96 deletions(-) diff --git a/src/main/java/li/cil/occ/mods/railcraft/DriverSteamTurbine.java b/src/main/java/li/cil/occ/mods/railcraft/DriverSteamTurbine.java index a681a8d81..70d7d18ae 100644 --- a/src/main/java/li/cil/occ/mods/railcraft/DriverSteamTurbine.java +++ b/src/main/java/li/cil/occ/mods/railcraft/DriverSteamTurbine.java @@ -8,14 +8,11 @@ import li.cil.oc.api.prefab.DriverTileEntity; import li.cil.occ.mods.ManagedTileEntityEnvironment; import li.cil.occ.util.Reflection; import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - -public class DriverSteamTurbine extends DriverTileEntity { - // See https://bitbucket.org/ChickenBones/enderstorage/ +public final class DriverSteamTurbine extends DriverTileEntity { private static final Class TileSteamTurbine = Reflection.getClass("mods.railcraft.common.blocks.machine.alpha.TileSteamTurbine"); @Override @@ -40,21 +37,14 @@ public class DriverSteamTurbine extends DriverTileEntity { @Callback public Object[] getTurbineRotorStatus(final Context context, final Arguments args) { - - - IInventory inventory = (IInventory) Reflection.tryInvoke(tileEntity, "getInventory"); - - if (inventory != null && inventory.getSizeInventory() >= 1) { - ItemStack itemStack = inventory.getStackInSlot(0); + IInventory inventory = Reflection.tryInvoke(tileEntity, "getInventory"); + if (inventory != null && inventory.getSizeInventory() > 0) { + final ItemStack itemStack = inventory.getStackInSlot(0); if (itemStack != null) { - Item item = itemStack.getItem(); - if (item != null) { - return new Object[]{100 - (int) (itemStack.getItemDamage() * 100.0 / item.getMaxDamage())}; - } + return new Object[]{100 - (int) (itemStack.getItemDamage() * 100.0 / itemStack.getMaxDamage())}; } } return new Object[]{null, "no Inventory"}; - } } } diff --git a/src/main/java/li/cil/occ/mods/railcraft/ModRailcraft.java b/src/main/java/li/cil/occ/mods/railcraft/ModRailcraft.java index 4c9fdb250..02aac63a5 100644 --- a/src/main/java/li/cil/occ/mods/railcraft/ModRailcraft.java +++ b/src/main/java/li/cil/occ/mods/railcraft/ModRailcraft.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import java.util.Map; -public class ModRailcraft implements IMod{ +public final class ModRailcraft implements IMod { @Override public String getModId() { return "Railcraft"; @@ -18,7 +18,6 @@ public class ModRailcraft implements IMod{ } @Override - public void populate(Map map, ItemStack stack) { - + public void populate(final Map map, final ItemStack stack) { } } diff --git a/src/main/java/li/cil/occ/mods/tmechworks/DriverDrawBridge.java b/src/main/java/li/cil/occ/mods/tmechworks/DriverDrawBridge.java index f8bb06ad5..8a0ae84d8 100644 --- a/src/main/java/li/cil/occ/mods/tmechworks/DriverDrawBridge.java +++ b/src/main/java/li/cil/occ/mods/tmechworks/DriverDrawBridge.java @@ -9,10 +9,7 @@ import li.cil.occ.mods.ManagedTileEntityEnvironment; import net.minecraft.world.World; import tmechworks.lib.blocks.IDrawbridgeLogicBase; - public class DriverDrawBridge extends DriverTileEntity { - - @Override public Class getTileEntityClass() { return IDrawbridgeLogicBase.class; @@ -32,7 +29,5 @@ public class DriverDrawBridge extends DriverTileEntity { public Object[] hasExtended(final Context context, final Arguments args) { return new Object[]{tileEntity.hasExtended()}; } - - } } diff --git a/src/main/java/li/cil/occ/mods/tmechworks/ModTMechworks.java b/src/main/java/li/cil/occ/mods/tmechworks/ModTMechworks.java index 301cc74c6..f0f234fe5 100644 --- a/src/main/java/li/cil/occ/mods/tmechworks/ModTMechworks.java +++ b/src/main/java/li/cil/occ/mods/tmechworks/ModTMechworks.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import java.util.Map; -public class ModTMechworks implements IMod{ +public final class ModTMechworks implements IMod { @Override public String getModId() { return "TMechworks"; @@ -18,7 +18,6 @@ public class ModTMechworks implements IMod{ } @Override - public void populate(Map map, ItemStack stack) { - + public void populate(final Map map, final ItemStack stack) { } } diff --git a/src/main/optional/buildcraft/api/core/StackWrapper.java b/src/main/optional/buildcraft/api/core/StackWrapper.java index 01da591fc..f46652c4f 100644 --- a/src/main/optional/buildcraft/api/core/StackWrapper.java +++ b/src/main/optional/buildcraft/api/core/StackWrapper.java @@ -12,7 +12,7 @@ import net.minecraft.item.ItemStack; /** * - * @author CovertJaguar + * @author CovertJaguar */ public class StackWrapper { diff --git a/src/main/optional/buildcraft/api/filler/IPatternIterator.java b/src/main/optional/buildcraft/api/filler/IPatternIterator.java index 1217e0740..0ea8c2021 100644 --- a/src/main/optional/buildcraft/api/filler/IPatternIterator.java +++ b/src/main/optional/buildcraft/api/filler/IPatternIterator.java @@ -12,7 +12,7 @@ import net.minecraft.item.ItemStack; /** * - * @author CovertJaguar + * @author CovertJaguar */ public interface IPatternIterator { diff --git a/src/main/optional/buildcraft/api/power/IPowerEmitter.java b/src/main/optional/buildcraft/api/power/IPowerEmitter.java index a621e7a35..7ccf62b9d 100644 --- a/src/main/optional/buildcraft/api/power/IPowerEmitter.java +++ b/src/main/optional/buildcraft/api/power/IPowerEmitter.java @@ -16,7 +16,7 @@ import net.minecraftforge.common.ForgeDirection; * This Tile Entity interface allows you to indicate that a block can emit power * from a specific side. * - * @author CovertJaguar + * @author CovertJaguar */ public interface IPowerEmitter { diff --git a/src/main/optional/buildcraft/api/power/IPowerReceptor.java b/src/main/optional/buildcraft/api/power/IPowerReceptor.java index e07783abc..48b84c909 100644 --- a/src/main/optional/buildcraft/api/power/IPowerReceptor.java +++ b/src/main/optional/buildcraft/api/power/IPowerReceptor.java @@ -14,7 +14,7 @@ import net.minecraftforge.common.ForgeDirection; * This interface should be implemented by any Tile Entity that wishes to be * able to receive power. * - * @author CovertJaguar + * @author CovertJaguar */ public interface IPowerReceptor { diff --git a/src/main/optional/buildcraft/api/power/PowerHandler.java b/src/main/optional/buildcraft/api/power/PowerHandler.java index cebe2ab83..5f4055465 100644 --- a/src/main/optional/buildcraft/api/power/PowerHandler.java +++ b/src/main/optional/buildcraft/api/power/PowerHandler.java @@ -27,7 +27,7 @@ import net.minecraftforge.common.ForgeDirection; * @see IPowerReceptor * @see IPowerEmitter * - * @author CovertJaguar + * @author CovertJaguar */ public final class PowerHandler { diff --git a/src/main/optional/mods/railcraft/api/carts/IAlternateCartTexture.java b/src/main/optional/mods/railcraft/api/carts/IAlternateCartTexture.java index 87a7ebfef..4314780f2 100644 --- a/src/main/optional/mods/railcraft/api/carts/IAlternateCartTexture.java +++ b/src/main/optional/mods/railcraft/api/carts/IAlternateCartTexture.java @@ -12,7 +12,7 @@ import net.minecraft.util.ResourceLocation; * Used to render a cart with a custom texture using Railcraft's cart renderer. * You could always write your own renderer of course. * - * @author CovertJaguar + * @author CovertJaguar */ public interface IAlternateCartTexture { diff --git a/src/main/optional/mods/railcraft/api/carts/ICartContentsTextureProvider.java b/src/main/optional/mods/railcraft/api/carts/ICartContentsTextureProvider.java index 40738b1bb..b131bffe5 100644 --- a/src/main/optional/mods/railcraft/api/carts/ICartContentsTextureProvider.java +++ b/src/main/optional/mods/railcraft/api/carts/ICartContentsTextureProvider.java @@ -11,7 +11,7 @@ import net.minecraft.util.Icon; /** * Used by the renderer to renders blocks in carts. * - * @author CovertJaguar + * @author CovertJaguar */ public interface ICartContentsTextureProvider{ diff --git a/src/main/optional/mods/railcraft/api/carts/IEnergyTransfer.java b/src/main/optional/mods/railcraft/api/carts/IEnergyTransfer.java index 91fc43f58..df40c1a38 100644 --- a/src/main/optional/mods/railcraft/api/carts/IEnergyTransfer.java +++ b/src/main/optional/mods/railcraft/api/carts/IEnergyTransfer.java @@ -6,7 +6,7 @@ package mods.railcraft.api.carts; * It is roughly equivalent to the IItemTransfer interface * and based on ElectricItem and IElectricItem. * - * @author CovertJaguar + * @author CovertJaguar * @see IItemTransfer */ public interface IEnergyTransfer diff --git a/src/main/optional/mods/railcraft/api/carts/IItemTransfer.java b/src/main/optional/mods/railcraft/api/carts/IItemTransfer.java index fe2a2c1cc..1e0baeafa 100644 --- a/src/main/optional/mods/railcraft/api/carts/IItemTransfer.java +++ b/src/main/optional/mods/railcraft/api/carts/IItemTransfer.java @@ -7,7 +7,7 @@ import mods.railcraft.api.core.items.IStackFilter; * This interface allows items to be passed around with out needing * to know anything about the underlying implementation of the inventories. * - * @author CovertJaguar + * @author CovertJaguar */ public interface IItemTransfer { diff --git a/src/main/optional/mods/railcraft/api/carts/ILinkableCart.java b/src/main/optional/mods/railcraft/api/carts/ILinkableCart.java index 5f98744b4..d34f0600b 100644 --- a/src/main/optional/mods/railcraft/api/carts/ILinkableCart.java +++ b/src/main/optional/mods/railcraft/api/carts/ILinkableCart.java @@ -7,7 +7,7 @@ import net.minecraft.entity.item.EntityMinecart; * to change the default linkage behavior. * It is NOT required to be able to link a cart, * it merely gives you more control over the process. - * @author CovertJaguar + * @author CovertJaguar */ public interface ILinkableCart { diff --git a/src/main/optional/mods/railcraft/api/carts/ILinkageManager.java b/src/main/optional/mods/railcraft/api/carts/ILinkageManager.java index 47a026374..c1e2b8484 100644 --- a/src/main/optional/mods/railcraft/api/carts/ILinkageManager.java +++ b/src/main/optional/mods/railcraft/api/carts/ILinkageManager.java @@ -11,7 +11,7 @@ import net.minecraft.entity.item.EntityMinecart; * Each cart can up to two links. They are called Link A and Link B. * Some carts will have only Link A, for example the Tunnel Bore. * - * @author CovertJaguar + * @author CovertJaguar * @see CartTools, ILinkableCart */ public interface ILinkageManager diff --git a/src/main/optional/mods/railcraft/api/carts/ILiquidTransfer.java b/src/main/optional/mods/railcraft/api/carts/ILiquidTransfer.java index 9bd0ca99b..b916c84da 100644 --- a/src/main/optional/mods/railcraft/api/carts/ILiquidTransfer.java +++ b/src/main/optional/mods/railcraft/api/carts/ILiquidTransfer.java @@ -6,7 +6,7 @@ import net.minecraftforge.fluids.FluidStack; * This interface allows carts to transfer liquid between each other as well as * adding a couple other functions related to liquids. * - * @author CovertJaguar + * @author CovertJaguar */ public interface ILiquidTransfer { diff --git a/src/main/optional/mods/railcraft/api/carts/IMinecart.java b/src/main/optional/mods/railcraft/api/carts/IMinecart.java index 9472676c0..8371fc1fa 100644 --- a/src/main/optional/mods/railcraft/api/carts/IMinecart.java +++ b/src/main/optional/mods/railcraft/api/carts/IMinecart.java @@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack; * * This interface is implemented by CartBase. * - * @author CovertJaguar + * @author CovertJaguar * @see CartBase */ public interface IMinecart { diff --git a/src/main/optional/mods/railcraft/api/carts/IPaintedCart.java b/src/main/optional/mods/railcraft/api/carts/IPaintedCart.java index d8c2ff364..5ea892e48 100644 --- a/src/main/optional/mods/railcraft/api/carts/IPaintedCart.java +++ b/src/main/optional/mods/railcraft/api/carts/IPaintedCart.java @@ -10,7 +10,7 @@ package mods.railcraft.api.carts; /** * - * @author CovertJaguar + * @author CovertJaguar */ public interface IPaintedCart { diff --git a/src/main/optional/mods/railcraft/api/carts/IRefuelableCart.java b/src/main/optional/mods/railcraft/api/carts/IRefuelableCart.java index 8ecf014df..eb448f3e5 100644 --- a/src/main/optional/mods/railcraft/api/carts/IRefuelableCart.java +++ b/src/main/optional/mods/railcraft/api/carts/IRefuelableCart.java @@ -11,7 +11,7 @@ package mods.railcraft.api.carts; /** * This is used for the "NeedsRefuel" routing conditional. * - * @author CovertJaguar + * @author CovertJaguar */ public interface IRefuelableCart { diff --git a/src/main/optional/mods/railcraft/api/carts/IRoutableCart.java b/src/main/optional/mods/railcraft/api/carts/IRoutableCart.java index 237a3915e..07c38937a 100644 --- a/src/main/optional/mods/railcraft/api/carts/IRoutableCart.java +++ b/src/main/optional/mods/railcraft/api/carts/IRoutableCart.java @@ -12,7 +12,7 @@ import net.minecraft.item.ItemStack; /** * - * @author CovertJaguar + * @author CovertJaguar */ public interface IRoutableCart { diff --git a/src/main/optional/mods/railcraft/api/carts/bore/IBoreHead.java b/src/main/optional/mods/railcraft/api/carts/bore/IBoreHead.java index 1d5ddbdd1..eb4e57b7b 100644 --- a/src/main/optional/mods/railcraft/api/carts/bore/IBoreHead.java +++ b/src/main/optional/mods/railcraft/api/carts/bore/IBoreHead.java @@ -5,7 +5,7 @@ import net.minecraft.util.ResourceLocation; /** * This interface it used to define an item that can * be used as a bore head for the Tunnel Bore. - * @author CovertJaguar + * @author CovertJaguar */ public interface IBoreHead { diff --git a/src/main/optional/mods/railcraft/api/carts/bore/IMineable.java b/src/main/optional/mods/railcraft/api/carts/bore/IMineable.java index 95a97d0be..68a1f0705 100644 --- a/src/main/optional/mods/railcraft/api/carts/bore/IMineable.java +++ b/src/main/optional/mods/railcraft/api/carts/bore/IMineable.java @@ -14,7 +14,7 @@ import net.minecraft.world.World; * Generally, the reason blocks are not minable by default is to prevent you * from intentionally or accidentally boring through your base. * - * @author CovertJaguar + * @author CovertJaguar */ public interface IMineable { diff --git a/src/main/optional/mods/railcraft/api/core/IOwnable.java b/src/main/optional/mods/railcraft/api/core/IOwnable.java index b6fc8c0bf..c69b72c5a 100644 --- a/src/main/optional/mods/railcraft/api/core/IOwnable.java +++ b/src/main/optional/mods/railcraft/api/core/IOwnable.java @@ -10,7 +10,7 @@ package mods.railcraft.api.core; /** * - * @author CovertJaguar + * @author CovertJaguar */ public interface IOwnable { diff --git a/src/main/optional/mods/railcraft/api/core/IPostConnection.java b/src/main/optional/mods/railcraft/api/core/IPostConnection.java index 6beadfd6f..1b57c27a5 100644 --- a/src/main/optional/mods/railcraft/api/core/IPostConnection.java +++ b/src/main/optional/mods/railcraft/api/core/IPostConnection.java @@ -9,7 +9,7 @@ import net.minecraftforge.common.ForgeDirection; * * The result takes priority over any other rules. * - * @author CovertJaguar + * @author CovertJaguar */ public interface IPostConnection { diff --git a/src/main/optional/mods/railcraft/api/core/ITextureLoader.java b/src/main/optional/mods/railcraft/api/core/ITextureLoader.java index 18bb1034f..ad20597cc 100644 --- a/src/main/optional/mods/railcraft/api/core/ITextureLoader.java +++ b/src/main/optional/mods/railcraft/api/core/ITextureLoader.java @@ -12,7 +12,7 @@ import net.minecraft.client.renderer.texture.IconRegister; /** * - * @author CovertJaguar + * @author CovertJaguar */ public interface ITextureLoader { diff --git a/src/main/optional/mods/railcraft/api/core/WorldCoordinate.java b/src/main/optional/mods/railcraft/api/core/WorldCoordinate.java index a0480869e..dc5c2fd01 100644 --- a/src/main/optional/mods/railcraft/api/core/WorldCoordinate.java +++ b/src/main/optional/mods/railcraft/api/core/WorldCoordinate.java @@ -7,7 +7,7 @@ import net.minecraft.nbt.NBTTagCompound; * This immutable class represents a point in the Minecraft world, while taking * into account the possibility of coordinates in different dimensions. * - * @author CovertJaguar + * @author CovertJaguar */ public class WorldCoordinate { diff --git a/src/main/optional/mods/railcraft/api/core/items/IMinecartItem.java b/src/main/optional/mods/railcraft/api/core/items/IMinecartItem.java index d9b625e5e..a59134074 100644 --- a/src/main/optional/mods/railcraft/api/core/items/IMinecartItem.java +++ b/src/main/optional/mods/railcraft/api/core/items/IMinecartItem.java @@ -8,7 +8,7 @@ import net.minecraft.world.World; * This interface should be implemented by any cart item, * but it is generally optional. * - * @author CovertJaguar + * @author CovertJaguar */ public interface IMinecartItem { diff --git a/src/main/optional/mods/railcraft/api/core/items/IStackFilter.java b/src/main/optional/mods/railcraft/api/core/items/IStackFilter.java index 5f1abb19c..cdea3ca69 100644 --- a/src/main/optional/mods/railcraft/api/core/items/IStackFilter.java +++ b/src/main/optional/mods/railcraft/api/core/items/IStackFilter.java @@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack; * This interface is used with several of the functions in IItemTransfer * to provide a convenient means of dealing with entire classes of items without * having to specify each item individually. - * @author CovertJaguar + * @author CovertJaguar */ public interface IStackFilter { diff --git a/src/main/optional/mods/railcraft/api/core/items/IToolCrowbar.java b/src/main/optional/mods/railcraft/api/core/items/IToolCrowbar.java index f7494706d..9e699fe3c 100644 --- a/src/main/optional/mods/railcraft/api/core/items/IToolCrowbar.java +++ b/src/main/optional/mods/railcraft/api/core/items/IToolCrowbar.java @@ -12,7 +12,7 @@ import net.minecraft.item.ItemStack; /** * - * @author CovertJaguar + * @author CovertJaguar */ public interface IToolCrowbar { diff --git a/src/main/optional/mods/railcraft/api/core/items/ITrackItem.java b/src/main/optional/mods/railcraft/api/core/items/ITrackItem.java index 49c5dc6ae..3510ae12b 100644 --- a/src/main/optional/mods/railcraft/api/core/items/ITrackItem.java +++ b/src/main/optional/mods/railcraft/api/core/items/ITrackItem.java @@ -10,7 +10,7 @@ import net.minecraft.world.World; * * If you defined your rails with a TrackSpec, you don't need to worry about this. * - * @author CovertJaguar + * @author CovertJaguar */ public interface ITrackItem { diff --git a/src/main/optional/mods/railcraft/api/core/items/TagList.java b/src/main/optional/mods/railcraft/api/core/items/TagList.java index 7f3639459..8bd1d5999 100644 --- a/src/main/optional/mods/railcraft/api/core/items/TagList.java +++ b/src/main/optional/mods/railcraft/api/core/items/TagList.java @@ -17,7 +17,7 @@ import java.util.TreeSet; * This is a collection of ItemStack tags than can be used with * GameRegistry.findItemStack(). * - * @author CovertJaguar + * @author CovertJaguar * @see GameRegistry#findItemStack(java.lang.String, java.lang.String, int) */ public class TagList { diff --git a/src/main/optional/mods/railcraft/api/crafting/IBlastFurnaceCraftingManager.java b/src/main/optional/mods/railcraft/api/crafting/IBlastFurnaceCraftingManager.java index d9ab69ee5..1529b45f6 100644 --- a/src/main/optional/mods/railcraft/api/crafting/IBlastFurnaceCraftingManager.java +++ b/src/main/optional/mods/railcraft/api/crafting/IBlastFurnaceCraftingManager.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; /** * - * @author CovertJaguar + * @author CovertJaguar */ public interface IBlastFurnaceCraftingManager { diff --git a/src/main/optional/mods/railcraft/api/crafting/IBlastFurnaceRecipe.java b/src/main/optional/mods/railcraft/api/crafting/IBlastFurnaceRecipe.java index b7a263502..4e2aebeb1 100644 --- a/src/main/optional/mods/railcraft/api/crafting/IBlastFurnaceRecipe.java +++ b/src/main/optional/mods/railcraft/api/crafting/IBlastFurnaceRecipe.java @@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack; /** * - * @author CovertJaguar + * @author CovertJaguar */ public interface IBlastFurnaceRecipe { diff --git a/src/main/optional/mods/railcraft/api/crafting/ICokeOvenCraftingManager.java b/src/main/optional/mods/railcraft/api/crafting/ICokeOvenCraftingManager.java index 8670c94b7..65f51885c 100644 --- a/src/main/optional/mods/railcraft/api/crafting/ICokeOvenCraftingManager.java +++ b/src/main/optional/mods/railcraft/api/crafting/ICokeOvenCraftingManager.java @@ -6,7 +6,7 @@ import net.minecraftforge.fluids.FluidStack; /** * - * @author CovertJaguar + * @author CovertJaguar */ public interface ICokeOvenCraftingManager { diff --git a/src/main/optional/mods/railcraft/api/crafting/ICokeOvenRecipe.java b/src/main/optional/mods/railcraft/api/crafting/ICokeOvenRecipe.java index 5e75b6417..46ea2a4bd 100644 --- a/src/main/optional/mods/railcraft/api/crafting/ICokeOvenRecipe.java +++ b/src/main/optional/mods/railcraft/api/crafting/ICokeOvenRecipe.java @@ -5,7 +5,7 @@ import net.minecraftforge.fluids.FluidStack; /** * - * @author CovertJaguar + * @author CovertJaguar */ public interface ICokeOvenRecipe { diff --git a/src/main/optional/mods/railcraft/api/crafting/IRockCrusherCraftingManager.java b/src/main/optional/mods/railcraft/api/crafting/IRockCrusherCraftingManager.java index a2f728629..837354c93 100644 --- a/src/main/optional/mods/railcraft/api/crafting/IRockCrusherCraftingManager.java +++ b/src/main/optional/mods/railcraft/api/crafting/IRockCrusherCraftingManager.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; /** * - * @author CovertJaguar + * @author CovertJaguar */ public interface IRockCrusherCraftingManager { diff --git a/src/main/optional/mods/railcraft/api/crafting/IRockCrusherRecipe.java b/src/main/optional/mods/railcraft/api/crafting/IRockCrusherRecipe.java index ef1d1496d..a5799397a 100644 --- a/src/main/optional/mods/railcraft/api/crafting/IRockCrusherRecipe.java +++ b/src/main/optional/mods/railcraft/api/crafting/IRockCrusherRecipe.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; /** * - * @author CovertJaguar + * @author CovertJaguar */ public interface IRockCrusherRecipe { diff --git a/src/main/optional/mods/railcraft/api/crafting/IRollingMachineCraftingManager.java b/src/main/optional/mods/railcraft/api/crafting/IRollingMachineCraftingManager.java index 30e754c40..a0d279791 100644 --- a/src/main/optional/mods/railcraft/api/crafting/IRollingMachineCraftingManager.java +++ b/src/main/optional/mods/railcraft/api/crafting/IRollingMachineCraftingManager.java @@ -8,7 +8,7 @@ import net.minecraft.world.World; /** * - * @author CovertJaguar + * @author CovertJaguar */ public interface IRollingMachineCraftingManager { diff --git a/src/main/optional/mods/railcraft/api/crafting/RailcraftCraftingManager.java b/src/main/optional/mods/railcraft/api/crafting/RailcraftCraftingManager.java index f4c1ca96c..abe8e20d6 100644 --- a/src/main/optional/mods/railcraft/api/crafting/RailcraftCraftingManager.java +++ b/src/main/optional/mods/railcraft/api/crafting/RailcraftCraftingManager.java @@ -4,7 +4,7 @@ package mods.railcraft.api.crafting; * These variables are defined during the pre-init phase. * Do not attempt to access them during pre-init. * - * @author CovertJaguar + * @author CovertJaguar */ public abstract class RailcraftCraftingManager { diff --git a/src/main/optional/mods/railcraft/api/events/CartLockdownEvent.java b/src/main/optional/mods/railcraft/api/events/CartLockdownEvent.java index 3cc0d97a6..fbbed98e0 100644 --- a/src/main/optional/mods/railcraft/api/events/CartLockdownEvent.java +++ b/src/main/optional/mods/railcraft/api/events/CartLockdownEvent.java @@ -13,7 +13,7 @@ import net.minecraftforge.event.Event; /** * - * @author CovertJaguar + * @author CovertJaguar */ public abstract class CartLockdownEvent extends Event { diff --git a/src/main/optional/mods/railcraft/api/fuel/FuelManager.java b/src/main/optional/mods/railcraft/api/fuel/FuelManager.java index 46113e625..9fef3769d 100644 --- a/src/main/optional/mods/railcraft/api/fuel/FuelManager.java +++ b/src/main/optional/mods/railcraft/api/fuel/FuelManager.java @@ -7,7 +7,7 @@ import net.minecraftforge.fluids.Fluid; /** * - * @author CovertJaguar + * @author CovertJaguar */ public class FuelManager { diff --git a/src/main/optional/mods/railcraft/api/helpers/Helpers.java b/src/main/optional/mods/railcraft/api/helpers/Helpers.java index cfec44a1f..de2285b12 100644 --- a/src/main/optional/mods/railcraft/api/helpers/Helpers.java +++ b/src/main/optional/mods/railcraft/api/helpers/Helpers.java @@ -2,7 +2,7 @@ package mods.railcraft.api.helpers; /** * - * @author CovertJaguar + * @author CovertJaguar */ public class Helpers { diff --git a/src/main/optional/mods/railcraft/api/helpers/StructureHelper.java b/src/main/optional/mods/railcraft/api/helpers/StructureHelper.java index cab9a2a61..cf0d91b34 100644 --- a/src/main/optional/mods/railcraft/api/helpers/StructureHelper.java +++ b/src/main/optional/mods/railcraft/api/helpers/StructureHelper.java @@ -7,7 +7,7 @@ import net.minecraftforge.fluids.FluidStack; /** * - * @author CovertJaguar + * @author CovertJaguar */ public interface StructureHelper { diff --git a/src/main/optional/mods/railcraft/api/signals/AbstractPair.java b/src/main/optional/mods/railcraft/api/signals/AbstractPair.java index fbd65aa56..55dbc0c08 100644 --- a/src/main/optional/mods/railcraft/api/signals/AbstractPair.java +++ b/src/main/optional/mods/railcraft/api/signals/AbstractPair.java @@ -22,7 +22,7 @@ import mods.railcraft.api.core.WorldCoordinate; /** * - * @author CovertJaguar + * @author CovertJaguar */ public abstract class AbstractPair { diff --git a/src/main/optional/mods/railcraft/api/signals/DualSignalReceiver.java b/src/main/optional/mods/railcraft/api/signals/DualSignalReceiver.java index 75816b0a4..4838d1bb5 100644 --- a/src/main/optional/mods/railcraft/api/signals/DualSignalReceiver.java +++ b/src/main/optional/mods/railcraft/api/signals/DualSignalReceiver.java @@ -15,7 +15,7 @@ import mods.railcraft.api.core.WorldCoordinate; /** * - * @author CovertJaguar + * @author CovertJaguar */ public class DualSignalReceiver extends SignalReceiver { diff --git a/src/main/optional/mods/railcraft/api/signals/IControllerTile.java b/src/main/optional/mods/railcraft/api/signals/IControllerTile.java index 832cd2c27..e5c74020c 100644 --- a/src/main/optional/mods/railcraft/api/signals/IControllerTile.java +++ b/src/main/optional/mods/railcraft/api/signals/IControllerTile.java @@ -8,7 +8,7 @@ package mods.railcraft.api.signals; /** * - * @author CovertJaguar + * @author CovertJaguar */ public interface IControllerTile { diff --git a/src/main/optional/mods/railcraft/api/signals/IPairEffectRenderer.java b/src/main/optional/mods/railcraft/api/signals/IPairEffectRenderer.java index b936312fc..f61afd81d 100644 --- a/src/main/optional/mods/railcraft/api/signals/IPairEffectRenderer.java +++ b/src/main/optional/mods/railcraft/api/signals/IPairEffectRenderer.java @@ -10,7 +10,7 @@ import net.minecraft.tileentity.TileEntity; /** * - * @author CovertJaguar + * @author CovertJaguar */ public interface IPairEffectRenderer { diff --git a/src/main/optional/mods/railcraft/api/signals/IReceiverTile.java b/src/main/optional/mods/railcraft/api/signals/IReceiverTile.java index 08d0f6ada..61ea55e86 100644 --- a/src/main/optional/mods/railcraft/api/signals/IReceiverTile.java +++ b/src/main/optional/mods/railcraft/api/signals/IReceiverTile.java @@ -10,7 +10,7 @@ import net.minecraft.world.World; /** * - * @author CovertJaguar + * @author CovertJaguar */ public interface IReceiverTile { diff --git a/src/main/optional/mods/railcraft/api/signals/ISignalPacketBuilder.java b/src/main/optional/mods/railcraft/api/signals/ISignalPacketBuilder.java index b158febe5..030ce63e2 100644 --- a/src/main/optional/mods/railcraft/api/signals/ISignalPacketBuilder.java +++ b/src/main/optional/mods/railcraft/api/signals/ISignalPacketBuilder.java @@ -8,7 +8,7 @@ package mods.railcraft.api.signals; /** * - * @author CovertJaguar + * @author CovertJaguar */ public interface ISignalPacketBuilder { public void sendPairPacketUpdate(AbstractPair pairing); diff --git a/src/main/optional/mods/railcraft/api/signals/SignalAspect.java b/src/main/optional/mods/railcraft/api/signals/SignalAspect.java index 50e515215..fee532e0f 100644 --- a/src/main/optional/mods/railcraft/api/signals/SignalAspect.java +++ b/src/main/optional/mods/railcraft/api/signals/SignalAspect.java @@ -5,7 +5,7 @@ import java.util.Locale; /** * Represents a Signal state. * - * @author CovertJaguar + * @author CovertJaguar */ public enum SignalAspect { diff --git a/src/main/optional/mods/railcraft/api/signals/SignalController.java b/src/main/optional/mods/railcraft/api/signals/SignalController.java index 54bc24900..5cc1b6fcd 100644 --- a/src/main/optional/mods/railcraft/api/signals/SignalController.java +++ b/src/main/optional/mods/railcraft/api/signals/SignalController.java @@ -11,7 +11,7 @@ import mods.railcraft.api.core.WorldCoordinate; /** * - * @author CovertJaguar + * @author CovertJaguar */ public abstract class SignalController extends AbstractPair { diff --git a/src/main/optional/mods/railcraft/api/signals/SignalReceiver.java b/src/main/optional/mods/railcraft/api/signals/SignalReceiver.java index f8d19174e..9e635a0c5 100644 --- a/src/main/optional/mods/railcraft/api/signals/SignalReceiver.java +++ b/src/main/optional/mods/railcraft/api/signals/SignalReceiver.java @@ -11,7 +11,7 @@ import mods.railcraft.api.core.WorldCoordinate; /** * - * @author CovertJaguar + * @author CovertJaguar */ public abstract class SignalReceiver extends AbstractPair { diff --git a/src/main/optional/mods/railcraft/api/signals/SignalTools.java b/src/main/optional/mods/railcraft/api/signals/SignalTools.java index a11ed63f4..90aa7585a 100644 --- a/src/main/optional/mods/railcraft/api/signals/SignalTools.java +++ b/src/main/optional/mods/railcraft/api/signals/SignalTools.java @@ -2,7 +2,7 @@ package mods.railcraft.api.signals; /** * - * @author CovertJaguar + * @author CovertJaguar */ public abstract class SignalTools { diff --git a/src/main/optional/mods/railcraft/api/signals/SimpleSignalController.java b/src/main/optional/mods/railcraft/api/signals/SimpleSignalController.java index 75bbbfee7..1f0c0f98d 100644 --- a/src/main/optional/mods/railcraft/api/signals/SimpleSignalController.java +++ b/src/main/optional/mods/railcraft/api/signals/SimpleSignalController.java @@ -15,7 +15,7 @@ import mods.railcraft.api.core.WorldCoordinate; /** * - * @author CovertJaguar + * @author CovertJaguar */ public class SimpleSignalController extends SignalController { diff --git a/src/main/optional/mods/railcraft/api/signals/SimpleSignalReceiver.java b/src/main/optional/mods/railcraft/api/signals/SimpleSignalReceiver.java index 12188c557..70e0bba17 100644 --- a/src/main/optional/mods/railcraft/api/signals/SimpleSignalReceiver.java +++ b/src/main/optional/mods/railcraft/api/signals/SimpleSignalReceiver.java @@ -14,7 +14,7 @@ import net.minecraft.tileentity.TileEntity; /** * - * @author CovertJaguar + * @author CovertJaguar */ public class SimpleSignalReceiver extends SignalReceiver { diff --git a/src/main/optional/mods/railcraft/api/tracks/IRoutingTrack.java b/src/main/optional/mods/railcraft/api/tracks/IRoutingTrack.java index afe025a48..a82cd781c 100644 --- a/src/main/optional/mods/railcraft/api/tracks/IRoutingTrack.java +++ b/src/main/optional/mods/railcraft/api/tracks/IRoutingTrack.java @@ -13,7 +13,7 @@ package mods.railcraft.api.tracks; * change the ticket on the fly. Be warned, security is the responsibility of * the addon. * - * @author CovertJaguar + * @author CovertJaguar */ public interface IRoutingTrack { diff --git a/src/main/optional/mods/railcraft/api/tracks/ITrackBlocksMovement.java b/src/main/optional/mods/railcraft/api/tracks/ITrackBlocksMovement.java index 7f788c50c..9061bbd82 100644 --- a/src/main/optional/mods/railcraft/api/tracks/ITrackBlocksMovement.java +++ b/src/main/optional/mods/railcraft/api/tracks/ITrackBlocksMovement.java @@ -10,7 +10,7 @@ package mods.railcraft.api.tracks; /** * - * @author CovertJaguar + * @author CovertJaguar */ public interface ITrackBlocksMovement { diff --git a/src/main/optional/mods/railcraft/api/tracks/ITrackCustomPlaced.java b/src/main/optional/mods/railcraft/api/tracks/ITrackCustomPlaced.java index 84d0d7516..13c68b062 100644 --- a/src/main/optional/mods/railcraft/api/tracks/ITrackCustomPlaced.java +++ b/src/main/optional/mods/railcraft/api/tracks/ITrackCustomPlaced.java @@ -7,7 +7,7 @@ import net.minecraft.world.World; * * Used by tracks such as the Suspended Track. * - * @author CovertJaguar + * @author CovertJaguar */ public interface ITrackCustomPlaced extends ITrackInstance { diff --git a/src/main/optional/mods/railcraft/api/tracks/ITrackCustomShape.java b/src/main/optional/mods/railcraft/api/tracks/ITrackCustomShape.java index 083c209ca..09558cbe7 100644 --- a/src/main/optional/mods/railcraft/api/tracks/ITrackCustomShape.java +++ b/src/main/optional/mods/railcraft/api/tracks/ITrackCustomShape.java @@ -11,7 +11,7 @@ import net.minecraft.util.Vec3; * * Not very useful since there is no system in place to insert custom render code. * - * @author CovertJaguar + * @author CovertJaguar */ public interface ITrackCustomShape extends ITrackInstance { diff --git a/src/main/optional/mods/railcraft/api/tracks/ITrackEmitter.java b/src/main/optional/mods/railcraft/api/tracks/ITrackEmitter.java index b3acceb39..888e9eb86 100644 --- a/src/main/optional/mods/railcraft/api/tracks/ITrackEmitter.java +++ b/src/main/optional/mods/railcraft/api/tracks/ITrackEmitter.java @@ -8,7 +8,7 @@ package mods.railcraft.api.tracks; * * A track cannot implement both ITrackPowered and ITrackEmitter. * - * @author CovertJaguar + * @author CovertJaguar */ public interface ITrackEmitter extends ITrackInstance { diff --git a/src/main/optional/mods/railcraft/api/tracks/ITrackItemIconProvider.java b/src/main/optional/mods/railcraft/api/tracks/ITrackItemIconProvider.java index 9bc7f7308..f773a499c 100644 --- a/src/main/optional/mods/railcraft/api/tracks/ITrackItemIconProvider.java +++ b/src/main/optional/mods/railcraft/api/tracks/ITrackItemIconProvider.java @@ -12,7 +12,7 @@ import net.minecraft.util.Icon; /** * - * @author CovertJaguar + * @author CovertJaguar */ public interface ITrackItemIconProvider { diff --git a/src/main/optional/mods/railcraft/api/tracks/ITrackLockdown.java b/src/main/optional/mods/railcraft/api/tracks/ITrackLockdown.java index 67f6e1a90..bf3b655b5 100644 --- a/src/main/optional/mods/railcraft/api/tracks/ITrackLockdown.java +++ b/src/main/optional/mods/railcraft/api/tracks/ITrackLockdown.java @@ -7,7 +7,7 @@ import net.minecraft.entity.item.EntityMinecart; * all cart movement should implement this interface. * (Used in collision handling) * - * @author CovertJaguar + * @author CovertJaguar */ public interface ITrackLockdown extends ITrackInstance { diff --git a/src/main/optional/mods/railcraft/api/tracks/ITrackPowered.java b/src/main/optional/mods/railcraft/api/tracks/ITrackPowered.java index fde72a09f..cbe647ee8 100644 --- a/src/main/optional/mods/railcraft/api/tracks/ITrackPowered.java +++ b/src/main/optional/mods/railcraft/api/tracks/ITrackPowered.java @@ -7,7 +7,7 @@ package mods.railcraft.api.tracks; * And so long as you inherit from TrackInstanceBase, all the code for updating * the power state is already in place (including propagation). * - * @author CovertJaguar + * @author CovertJaguar */ public interface ITrackPowered extends ITrackInstance { diff --git a/src/main/optional/mods/railcraft/api/tracks/ITrackReversable.java b/src/main/optional/mods/railcraft/api/tracks/ITrackReversable.java index b354021c3..563daa729 100644 --- a/src/main/optional/mods/railcraft/api/tracks/ITrackReversable.java +++ b/src/main/optional/mods/railcraft/api/tracks/ITrackReversable.java @@ -6,7 +6,7 @@ package mods.railcraft.api.tracks; * And so long as you inherit from TrackInstanceBase it will automatically be * reversable via the Crowbar. * - * @author CovertJaguar + * @author CovertJaguar */ public interface ITrackReversable extends ITrackInstance { diff --git a/src/main/optional/mods/railcraft/api/tracks/ITrackTile.java b/src/main/optional/mods/railcraft/api/tracks/ITrackTile.java index e94a98d9a..b5873df9f 100644 --- a/src/main/optional/mods/railcraft/api/tracks/ITrackTile.java +++ b/src/main/optional/mods/railcraft/api/tracks/ITrackTile.java @@ -4,7 +4,7 @@ package mods.railcraft.api.tracks; * Don't use this, its an interface that allows other API code * access to internal functions of the code. * - * @author CovertJaguar + * @author CovertJaguar */ public interface ITrackTile { diff --git a/src/main/optional/mods/railcraft/api/tracks/RailTools.java b/src/main/optional/mods/railcraft/api/tracks/RailTools.java index 81bbe0e0c..2d8c9051c 100644 --- a/src/main/optional/mods/railcraft/api/tracks/RailTools.java +++ b/src/main/optional/mods/railcraft/api/tracks/RailTools.java @@ -13,7 +13,7 @@ import net.minecraft.block.BlockRailBase; /** * A number of utility functions related to rails. * - * @author CovertJaguar + * @author CovertJaguar */ public abstract class RailTools { diff --git a/src/main/optional/mods/railcraft/api/tracks/TrackInstanceBase.java b/src/main/optional/mods/railcraft/api/tracks/TrackInstanceBase.java index 797e26dd6..f8e244055 100644 --- a/src/main/optional/mods/railcraft/api/tracks/TrackInstanceBase.java +++ b/src/main/optional/mods/railcraft/api/tracks/TrackInstanceBase.java @@ -24,7 +24,7 @@ import net.minecraft.entity.EntityLivingBase; * functions and standard behavior for Tracks that should greatly simplify * implementing new Tracks when using this API. * - * @author CovertJaguar + * @author CovertJaguar * @see ITrackInstance * @see TrackRegistry * @see TrackSpec diff --git a/src/main/optional/mods/railcraft/api/tracks/TrackRegistry.java b/src/main/optional/mods/railcraft/api/tracks/TrackRegistry.java index 1a16e8861..7f7150da6 100644 --- a/src/main/optional/mods/railcraft/api/tracks/TrackRegistry.java +++ b/src/main/optional/mods/railcraft/api/tracks/TrackRegistry.java @@ -20,7 +20,7 @@ import mods.railcraft.api.core.ITextureLoader; * The TrackSpec contains basic constant information about the Track, while the * TrackInstace controls how an individual Track block interact with the world. * - * @author CovertJaguar + * @author CovertJaguar * @see TrackSpec * @see ITrackInstance * @see TrackInstanceBase diff --git a/src/main/optional/mods/railcraft/api/tracks/TrackSpec.java b/src/main/optional/mods/railcraft/api/tracks/TrackSpec.java index 8d2eb6707..cec8dd16e 100644 --- a/src/main/optional/mods/railcraft/api/tracks/TrackSpec.java +++ b/src/main/optional/mods/railcraft/api/tracks/TrackSpec.java @@ -22,7 +22,7 @@ import net.minecraft.util.Icon; * @see TrackRegistry * @see ITrackInstance * - * @author CovertJaguar + * @author CovertJaguar */ public final class TrackSpec { diff --git a/src/main/optional/tmechworks/lib/blocks/IDrawbridgeLogicBase.java b/src/main/optional/tmechworks/lib/blocks/IDrawbridgeLogicBase.java index 32c016534..fd2a8c72b 100644 --- a/src/main/optional/tmechworks/lib/blocks/IDrawbridgeLogicBase.java +++ b/src/main/optional/tmechworks/lib/blocks/IDrawbridgeLogicBase.java @@ -1,9 +1,7 @@ package tmechworks.lib.blocks; -public interface IDrawbridgeLogicBase -{ +public interface IDrawbridgeLogicBase { + public boolean hasExtended(); - public boolean hasExtended (); - - public byte getPlacementDirection (); + public byte getPlacementDirection(); }