diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index abc9ad7cf..5b1a408e0 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -70,8 +70,8 @@ import appeng.parts.NullCableBusContainer; import appeng.tile.AEBaseTile; import appeng.tile.networking.TileCableBus; import appeng.tile.networking.TileCableBusTESR; -import appeng.transformer.annotations.integration.Interface; -import appeng.transformer.annotations.integration.Method; +import appeng.transformer.annotations.Integration.Interface; +import appeng.transformer.annotations.Integration.Method; import appeng.util.Platform; @Interface(iface = "powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection", iname = "MFR") diff --git a/src/main/java/appeng/items/tools/ToolNetworkTool.java b/src/main/java/appeng/items/tools/ToolNetworkTool.java index e778f345c..c31876f36 100644 --- a/src/main/java/appeng/items/tools/ToolNetworkTool.java +++ b/src/main/java/appeng/items/tools/ToolNetworkTool.java @@ -50,7 +50,7 @@ import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketClick; import appeng.items.AEBaseItem; import appeng.items.contents.NetworkToolViewer; -import appeng.transformer.annotations.integration.Interface; +import appeng.transformer.annotations.Integration.Interface; import appeng.util.Platform; diff --git a/src/main/java/appeng/items/tools/powered/powersink/IC2.java b/src/main/java/appeng/items/tools/powered/powersink/IC2.java index 4114fb3a1..7e7a80b38 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/IC2.java +++ b/src/main/java/appeng/items/tools/powered/powersink/IC2.java @@ -29,9 +29,9 @@ import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; import appeng.api.config.PowerUnits; -import appeng.transformer.annotations.integration.Interface; -import appeng.transformer.annotations.integration.InterfaceList; -import appeng.transformer.annotations.integration.Method; +import appeng.transformer.annotations.Integration.Interface; +import appeng.transformer.annotations.Integration.InterfaceList; +import appeng.transformer.annotations.Integration.Method; @InterfaceList( value = { @Interface( iface = "ic2.api.item.ISpecialElectricItem", iname = "IC2" ), diff --git a/src/main/java/appeng/items/tools/powered/powersink/RedstoneFlux.java b/src/main/java/appeng/items/tools/powered/powersink/RedstoneFlux.java index 693bb18ac..9f1d2b1a5 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/RedstoneFlux.java +++ b/src/main/java/appeng/items/tools/powered/powersink/RedstoneFlux.java @@ -26,7 +26,7 @@ import net.minecraft.item.ItemStack; import cofh.api.energy.IEnergyContainerItem; import appeng.api.config.PowerUnits; -import appeng.transformer.annotations.integration.Interface; +import appeng.transformer.annotations.Integration.Interface; @Interface( iface = "cofh.api.energy.IEnergyContainerItem", iname = "RFItem" ) diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java index 7b6bea391..7f45b40ea 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java @@ -35,7 +35,7 @@ import appeng.api.implementations.items.IAEWrench; import appeng.api.util.DimensionalCoord; import appeng.core.features.AEFeature; import appeng.items.AEBaseItem; -import appeng.transformer.annotations.integration.Interface; +import appeng.transformer.annotations.Integration.Interface; import appeng.util.Platform; diff --git a/src/main/java/appeng/parts/misc/PartStorageBus.java b/src/main/java/appeng/parts/misc/PartStorageBus.java index 44d8cec02..2a38a5865 100644 --- a/src/main/java/appeng/parts/misc/PartStorageBus.java +++ b/src/main/java/appeng/parts/misc/PartStorageBus.java @@ -82,8 +82,8 @@ import appeng.me.storage.MEMonitorIInventory; import appeng.parts.automation.PartUpgradeable; import appeng.tile.inventory.AppEngInternalAEInventory; import appeng.tile.inventory.InvOperation; -import appeng.transformer.annotations.integration.Interface; -import appeng.transformer.annotations.integration.Method; +import appeng.transformer.annotations.Integration.Interface; +import appeng.transformer.annotations.Integration.Method; import appeng.util.Platform; import appeng.util.prioitylist.FuzzyPriorityList; import appeng.util.prioitylist.PrecisePriorityList; diff --git a/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java b/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java index da5dcf0f3..226331037 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java +++ b/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java @@ -36,8 +36,8 @@ import appeng.core.AppEng; import appeng.integration.IntegrationType; import appeng.me.GridAccessException; import appeng.me.cache.helpers.TunnelCollection; -import appeng.transformer.annotations.integration.Interface; -import appeng.transformer.annotations.integration.InterfaceList; +import appeng.transformer.annotations.Integration.Interface; +import appeng.transformer.annotations.Integration.InterfaceList; import appeng.util.Platform; @InterfaceList(value = { @Interface(iface = "ic2.api.energy.tile.IEnergySink", iname = "IC2"), diff --git a/src/main/java/appeng/parts/p2p/PartP2PItems.java b/src/main/java/appeng/parts/p2p/PartP2PItems.java index 25dbae942..9f90f7a44 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PItems.java +++ b/src/main/java/appeng/parts/p2p/PartP2PItems.java @@ -53,8 +53,8 @@ import appeng.integration.abstraction.IBC; import appeng.me.GridAccessException; import appeng.me.cache.helpers.TunnelCollection; import appeng.tile.inventory.AppEngNullInventory; -import appeng.transformer.annotations.integration.Interface; -import appeng.transformer.annotations.integration.Method; +import appeng.transformer.annotations.Integration.Interface; +import appeng.transformer.annotations.Integration.Method; import appeng.util.Platform; import appeng.util.inv.WrapperBCPipe; import appeng.util.inv.WrapperChainedInventory; diff --git a/src/main/java/appeng/parts/p2p/PartP2PRFPower.java b/src/main/java/appeng/parts/p2p/PartP2PRFPower.java index c3404a881..993ae5642 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PRFPower.java +++ b/src/main/java/appeng/parts/p2p/PartP2PRFPower.java @@ -38,8 +38,8 @@ import appeng.core.AppEng; import appeng.integration.IntegrationType; import appeng.integration.modules.helpers.NullRFHandler; import appeng.me.GridAccessException; -import appeng.transformer.annotations.integration.Interface; -import appeng.transformer.annotations.integration.InterfaceList; +import appeng.transformer.annotations.Integration.Interface; +import appeng.transformer.annotations.Integration.InterfaceList; import appeng.util.Platform; diff --git a/src/main/java/appeng/tile/powersink/IC2.java b/src/main/java/appeng/tile/powersink/IC2.java index 1295d68af..41cea5d11 100644 --- a/src/main/java/appeng/tile/powersink/IC2.java +++ b/src/main/java/appeng/tile/powersink/IC2.java @@ -29,7 +29,7 @@ import appeng.api.config.PowerUnits; import appeng.core.AppEng; import appeng.integration.IntegrationType; import appeng.integration.abstraction.IIC2; -import appeng.transformer.annotations.integration.Interface; +import appeng.transformer.annotations.Integration.Interface; import appeng.util.Platform; @Interface(iname = "IC2", iface = "ic2.api.energy.tile.IEnergySink") diff --git a/src/main/java/appeng/tile/powersink/MekJoules.java b/src/main/java/appeng/tile/powersink/MekJoules.java index 6ab3882a1..a8f03dfde 100644 --- a/src/main/java/appeng/tile/powersink/MekJoules.java +++ b/src/main/java/appeng/tile/powersink/MekJoules.java @@ -23,7 +23,7 @@ import net.minecraftforge.common.util.ForgeDirection; import mekanism.api.energy.IStrictEnergyAcceptor; import appeng.api.config.PowerUnits; -import appeng.transformer.annotations.integration.Interface; +import appeng.transformer.annotations.Integration.Interface; @Interface(iname = "Mekanism", iface = "mekanism.api.energy.IStrictEnergyAcceptor") public abstract class MekJoules extends RedstoneFlux implements IStrictEnergyAcceptor { diff --git a/src/main/java/appeng/tile/powersink/RedstoneFlux.java b/src/main/java/appeng/tile/powersink/RedstoneFlux.java index 7386b32a8..c6c97a1a1 100644 --- a/src/main/java/appeng/tile/powersink/RedstoneFlux.java +++ b/src/main/java/appeng/tile/powersink/RedstoneFlux.java @@ -24,7 +24,7 @@ import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyReceiver; import appeng.api.config.PowerUnits; -import appeng.transformer.annotations.integration.Interface; +import appeng.transformer.annotations.Integration.Interface; @Interface( iname = "RF", iface = "cofh.api.energy.IEnergyReceiver" ) diff --git a/src/main/java/appeng/tile/powersink/RotaryCraft.java b/src/main/java/appeng/tile/powersink/RotaryCraft.java index efb205d94..e7d45e14e 100644 --- a/src/main/java/appeng/tile/powersink/RotaryCraft.java +++ b/src/main/java/appeng/tile/powersink/RotaryCraft.java @@ -25,8 +25,8 @@ import Reika.RotaryCraft.API.ShaftPowerReceiver; import appeng.api.config.PowerUnits; import appeng.tile.TileEvent; import appeng.tile.events.TileEventType; -import appeng.transformer.annotations.integration.Interface; -import appeng.transformer.annotations.integration.Method; +import appeng.transformer.annotations.Integration.Interface; +import appeng.transformer.annotations.Integration.Method; import appeng.util.Platform; @Interface(iname = "RotaryCraft", iface = "Reika.RotaryCraft.API.ShaftPowerReceiver") diff --git a/src/main/java/appeng/transformer/annotations/integration.java b/src/main/java/appeng/transformer/annotations/Integration.java similarity index 70% rename from src/main/java/appeng/transformer/annotations/integration.java rename to src/main/java/appeng/transformer/annotations/Integration.java index dc180003f..267d3c479 100644 --- a/src/main/java/appeng/transformer/annotations/integration.java +++ b/src/main/java/appeng/transformer/annotations/Integration.java @@ -18,36 +18,35 @@ package appeng.transformer.annotations; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -public @interface integration { - - @Retention(RetentionPolicy.RUNTIME) - @Target(ElementType.TYPE) - public @interface InterfaceList { - - public Interface[] value(); +public @interface Integration +{ + @Retention( RetentionPolicy.RUNTIME ) + @Target( ElementType.TYPE ) + @interface InterfaceList + { + Interface[] value(); } - @Retention(RetentionPolicy.RUNTIME) - @Target(ElementType.TYPE) - public @interface Interface { - - public String iface(); - - public String iname(); + @Retention( RetentionPolicy.RUNTIME ) + @Target( ElementType.TYPE ) + @interface Interface + { + String iface(); + String iname(); } - @Retention(RetentionPolicy.RUNTIME) - @Target(ElementType.METHOD) - public @interface Method { - - public String iname(); - + @Retention( RetentionPolicy.RUNTIME ) + @Target( ElementType.METHOD ) + @interface Method + { + String iname(); } } diff --git a/src/main/java/appeng/transformer/asm/ASMIntegration.java b/src/main/java/appeng/transformer/asm/ASMIntegration.java index 65f314437..d8fcee65f 100644 --- a/src/main/java/appeng/transformer/asm/ASMIntegration.java +++ b/src/main/java/appeng/transformer/asm/ASMIntegration.java @@ -36,7 +36,7 @@ import cpw.mods.fml.relauncher.FMLRelaunchLog; import appeng.integration.IntegrationRegistry; import appeng.integration.IntegrationType; -import appeng.transformer.annotations.integration; +import appeng.transformer.annotations.Integration; public class ASMIntegration implements IClassTransformer @@ -105,16 +105,16 @@ public class ASMIntegration implements IClassTransformer { for ( AnnotationNode an : classNode.visibleAnnotations ) { - if ( this.hasAnnotation( an, integration.Interface.class ) ) + if ( this.hasAnnotation( an, Integration.Interface.class ) ) { - if ( this.stripInterface( classNode, integration.Interface.class, an ) ) + if ( this.stripInterface( classNode, Integration.Interface.class, an ) ) changed = true; } - else if ( this.hasAnnotation( an, integration.InterfaceList.class ) ) + else if ( this.hasAnnotation( an, Integration.InterfaceList.class ) ) { for ( Object o : ( ( List ) an.values.get( 1 ) ) ) { - if ( this.stripInterface( classNode, integration.InterfaceList.class, ( AnnotationNode ) o ) ) + if ( this.stripInterface( classNode, Integration.InterfaceList.class, ( AnnotationNode ) o ) ) changed = true; } } @@ -130,9 +130,9 @@ public class ASMIntegration implements IClassTransformer { for ( AnnotationNode an : mn.visibleAnnotations ) { - if ( this.hasAnnotation( an, integration.Method.class ) ) + if ( this.hasAnnotation( an, Integration.Method.class ) ) { - if ( this.stripMethod( classNode, mn, i, integration.Method.class, an ) ) + if ( this.stripMethod( classNode, mn, i, Integration.Method.class, an ) ) changed = true; } }