tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Renamed Integration class to upper case

Browse source
This commit is contained in:
thatsIch 2015-03-24 13:16:01 +01:00
parent eb98ec891b
commit c1a7a35192
15 changed files with 47 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/appeng/block/networking/BlockCableBus.java
View file

@ -70,8 +70,8 @@ import appeng.parts.NullCableBusContainer;
import appeng.tile.AEBaseTile; import appeng.tile.AEBaseTile;
import appeng.tile.networking.TileCableBus; import appeng.tile.networking.TileCableBus;
import appeng.tile.networking.TileCableBusTESR; import appeng.tile.networking.TileCableBusTESR;
import appeng.transformer.annotations.integration.Interface; import appeng.transformer.annotations.Integration.Interface;
import appeng.transformer.annotations.integration.Method; import appeng.transformer.annotations.Integration.Method;
import appeng.util.Platform; import appeng.util.Platform;
@Interface(iface = "powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection", iname = "MFR") @Interface(iface = "powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection", iname = "MFR")

2
src/main/java/appeng/items/tools/ToolNetworkTool.java
View file

@ -50,7 +50,7 @@ import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketClick; import appeng.core.sync.packets.PacketClick;
import appeng.items.AEBaseItem; import appeng.items.AEBaseItem;
import appeng.items.contents.NetworkToolViewer; import appeng.items.contents.NetworkToolViewer;
import appeng.transformer.annotations.integration.Interface; import appeng.transformer.annotations.Integration.Interface;
import appeng.util.Platform; import appeng.util.Platform;

6
src/main/java/appeng/items/tools/powered/powersink/IC2.java
View file

@ -29,9 +29,9 @@ import ic2.api.item.IElectricItemManager;
import ic2.api.item.ISpecialElectricItem; import ic2.api.item.ISpecialElectricItem;
import appeng.api.config.PowerUnits; import appeng.api.config.PowerUnits;
import appeng.transformer.annotations.integration.Interface; import appeng.transformer.annotations.Integration.Interface;
import appeng.transformer.annotations.integration.InterfaceList; import appeng.transformer.annotations.Integration.InterfaceList;
import appeng.transformer.annotations.integration.Method; import appeng.transformer.annotations.Integration.Method;
@InterfaceList( value = { @Interface( iface = "ic2.api.item.ISpecialElectricItem", iname = "IC2" ), @InterfaceList( value = { @Interface( iface = "ic2.api.item.ISpecialElectricItem", iname = "IC2" ),

2
src/main/java/appeng/items/tools/powered/powersink/RedstoneFlux.java
View file

@ -26,7 +26,7 @@ import net.minecraft.item.ItemStack;
import cofh.api.energy.IEnergyContainerItem; import cofh.api.energy.IEnergyContainerItem;
import appeng.api.config.PowerUnits; 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" ) @Interface( iface = "cofh.api.energy.IEnergyContainerItem", iname = "RFItem" )

2
src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java
View file

@ -35,7 +35,7 @@ import appeng.api.implementations.items.IAEWrench;
import appeng.api.util.DimensionalCoord; import appeng.api.util.DimensionalCoord;
import appeng.core.features.AEFeature; import appeng.core.features.AEFeature;
import appeng.items.AEBaseItem; import appeng.items.AEBaseItem;
import appeng.transformer.annotations.integration.Interface; import appeng.transformer.annotations.Integration.Interface;
import appeng.util.Platform; import appeng.util.Platform;

4
src/main/java/appeng/parts/misc/PartStorageBus.java
View file

@ -82,8 +82,8 @@ import appeng.me.storage.MEMonitorIInventory;
import appeng.parts.automation.PartUpgradeable; import appeng.parts.automation.PartUpgradeable;
import appeng.tile.inventory.AppEngInternalAEInventory; import appeng.tile.inventory.AppEngInternalAEInventory;
import appeng.tile.inventory.InvOperation; import appeng.tile.inventory.InvOperation;
import appeng.transformer.annotations.integration.Interface; import appeng.transformer.annotations.Integration.Interface;
import appeng.transformer.annotations.integration.Method; import appeng.transformer.annotations.Integration.Method;
import appeng.util.Platform; import appeng.util.Platform;
import appeng.util.prioitylist.FuzzyPriorityList; import appeng.util.prioitylist.FuzzyPriorityList;
import appeng.util.prioitylist.PrecisePriorityList; import appeng.util.prioitylist.PrecisePriorityList;

4
src/main/java/appeng/parts/p2p/PartP2PIC2Power.java
View file

@ -36,8 +36,8 @@ import appeng.core.AppEng;
import appeng.integration.IntegrationType; import appeng.integration.IntegrationType;
import appeng.me.GridAccessException; import appeng.me.GridAccessException;
import appeng.me.cache.helpers.TunnelCollection; import appeng.me.cache.helpers.TunnelCollection;
import appeng.transformer.annotations.integration.Interface; import appeng.transformer.annotations.Integration.Interface;
import appeng.transformer.annotations.integration.InterfaceList; import appeng.transformer.annotations.Integration.InterfaceList;
import appeng.util.Platform; import appeng.util.Platform;
@InterfaceList(value = { @Interface(iface = "ic2.api.energy.tile.IEnergySink", iname = "IC2"), @InterfaceList(value = { @Interface(iface = "ic2.api.energy.tile.IEnergySink", iname = "IC2"),

4
src/main/java/appeng/parts/p2p/PartP2PItems.java
View file

@ -53,8 +53,8 @@ import appeng.integration.abstraction.IBC;
import appeng.me.GridAccessException; import appeng.me.GridAccessException;
import appeng.me.cache.helpers.TunnelCollection; import appeng.me.cache.helpers.TunnelCollection;
import appeng.tile.inventory.AppEngNullInventory; import appeng.tile.inventory.AppEngNullInventory;
import appeng.transformer.annotations.integration.Interface; import appeng.transformer.annotations.Integration.Interface;
import appeng.transformer.annotations.integration.Method; import appeng.transformer.annotations.Integration.Method;
import appeng.util.Platform; import appeng.util.Platform;
import appeng.util.inv.WrapperBCPipe; import appeng.util.inv.WrapperBCPipe;
import appeng.util.inv.WrapperChainedInventory; import appeng.util.inv.WrapperChainedInventory;

4
src/main/java/appeng/parts/p2p/PartP2PRFPower.java
View file

@ -38,8 +38,8 @@ import appeng.core.AppEng;
import appeng.integration.IntegrationType; import appeng.integration.IntegrationType;
import appeng.integration.modules.helpers.NullRFHandler; import appeng.integration.modules.helpers.NullRFHandler;
import appeng.me.GridAccessException; import appeng.me.GridAccessException;
import appeng.transformer.annotations.integration.Interface; import appeng.transformer.annotations.Integration.Interface;
import appeng.transformer.annotations.integration.InterfaceList; import appeng.transformer.annotations.Integration.InterfaceList;
import appeng.util.Platform; import appeng.util.Platform;

2
src/main/java/appeng/tile/powersink/IC2.java
View file

@ -29,7 +29,7 @@ import appeng.api.config.PowerUnits;
import appeng.core.AppEng; import appeng.core.AppEng;
import appeng.integration.IntegrationType; import appeng.integration.IntegrationType;
import appeng.integration.abstraction.IIC2; import appeng.integration.abstraction.IIC2;
import appeng.transformer.annotations.integration.Interface; import appeng.transformer.annotations.Integration.Interface;
import appeng.util.Platform; import appeng.util.Platform;
@Interface(iname = "IC2", iface = "ic2.api.energy.tile.IEnergySink") @Interface(iname = "IC2", iface = "ic2.api.energy.tile.IEnergySink")

2
src/main/java/appeng/tile/powersink/MekJoules.java
View file

@ -23,7 +23,7 @@ import net.minecraftforge.common.util.ForgeDirection;
import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyAcceptor;
import appeng.api.config.PowerUnits; 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") @Interface(iname = "Mekanism", iface = "mekanism.api.energy.IStrictEnergyAcceptor")
public abstract class MekJoules extends RedstoneFlux implements IStrictEnergyAcceptor { public abstract class MekJoules extends RedstoneFlux implements IStrictEnergyAcceptor {

2
src/main/java/appeng/tile/powersink/RedstoneFlux.java
View file

@ -24,7 +24,7 @@ import net.minecraftforge.common.util.ForgeDirection;
import cofh.api.energy.IEnergyReceiver; import cofh.api.energy.IEnergyReceiver;
import appeng.api.config.PowerUnits; 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" ) @Interface( iname = "RF", iface = "cofh.api.energy.IEnergyReceiver" )

4
src/main/java/appeng/tile/powersink/RotaryCraft.java
View file

@ -25,8 +25,8 @@ import Reika.RotaryCraft.API.ShaftPowerReceiver;
import appeng.api.config.PowerUnits; import appeng.api.config.PowerUnits;
import appeng.tile.TileEvent; import appeng.tile.TileEvent;
import appeng.tile.events.TileEventType; import appeng.tile.events.TileEventType;
import appeng.transformer.annotations.integration.Interface; import appeng.transformer.annotations.Integration.Interface;
import appeng.transformer.annotations.integration.Method; import appeng.transformer.annotations.Integration.Method;
import appeng.util.Platform; import appeng.util.Platform;
@Interface(iname = "RotaryCraft", iface = "Reika.RotaryCraft.API.ShaftPowerReceiver") @Interface(iname = "RotaryCraft", iface = "Reika.RotaryCraft.API.ShaftPowerReceiver")

39
src/main/java/appeng/transformer/annotations/integration.java → src/main/java/appeng/transformer/annotations/Integration.java
View file

@ -18,36 +18,35 @@
package appeng.transformer.annotations; package appeng.transformer.annotations;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; 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) @Retention( RetentionPolicy.RUNTIME )
@Target(ElementType.TYPE) @Target( ElementType.TYPE )
public @interface Interface { @interface Interface
{
public String iface(); String iface();
public String iname();
String iname();
} }
@Retention(RetentionPolicy.RUNTIME) @Retention( RetentionPolicy.RUNTIME )
@Target(ElementType.METHOD) @Target( ElementType.METHOD )
public @interface Method { @interface Method
{
public String iname(); String iname();
} }
} }

14
src/main/java/appeng/transformer/asm/ASMIntegration.java
View file

@ -36,7 +36,7 @@ import cpw.mods.fml.relauncher.FMLRelaunchLog;
import appeng.integration.IntegrationRegistry; import appeng.integration.IntegrationRegistry;
import appeng.integration.IntegrationType; import appeng.integration.IntegrationType;
import appeng.transformer.annotations.integration; import appeng.transformer.annotations.Integration;
public class ASMIntegration implements IClassTransformer public class ASMIntegration implements IClassTransformer
@ -105,16 +105,16 @@ public class ASMIntegration implements IClassTransformer
{ {
for ( AnnotationNode an : classNode.visibleAnnotations ) 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; 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 ) ) ) 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; changed = true;
} }
} }
@ -130,9 +130,9 @@ public class ASMIntegration implements IClassTransformer
{ {
for ( AnnotationNode an : mn.visibleAnnotations ) 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; changed = true;
} }
} }