From aded4c94084229da3ed234e94c7e81fcf5c62838 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Sun, 9 Oct 2016 16:03:54 +0200
Subject: [PATCH] Rename RSAPI to RSAPIInject

---
 src/main/java/refinedstorage/api/IRSAPI.java           |  2 +-
 .../api/{RSAPI.java => RSAPIInject.java}               |  4 ++--
 src/main/java/refinedstorage/apiimpl/API.java          | 10 +++++++---
 src/main/java/refinedstorage/tile/ClientNode.java      |  1 -
 4 files changed, 10 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 src/main/java/refinedstorage/api/IRSAPI.java
 rename src/main/java/refinedstorage/api/{RSAPI.java => RSAPIInject.java} (59%)
 mode change 100644 => 100755

diff --git a/src/main/java/refinedstorage/api/IRSAPI.java b/src/main/java/refinedstorage/api/IRSAPI.java
old mode 100644
new mode 100755
index 5e1efd726..1cb4c328c
--- a/src/main/java/refinedstorage/api/IRSAPI.java
+++ b/src/main/java/refinedstorage/api/IRSAPI.java
@@ -12,7 +12,7 @@ import javax.annotation.Nonnull;
 
 /**
  * Represents a Refined Storage API implementation.
- * Delivered by the {@link RSAPI} annotation
+ * Delivered by the {@link RSAPIInject} annotation.
  */
 public interface IRSAPI {
     /**
diff --git a/src/main/java/refinedstorage/api/RSAPI.java b/src/main/java/refinedstorage/api/RSAPIInject.java
old mode 100644
new mode 100755
similarity index 59%
rename from src/main/java/refinedstorage/api/RSAPI.java
rename to src/main/java/refinedstorage/api/RSAPIInject.java
index 73d175e6a..b8ccd3704
--- a/src/main/java/refinedstorage/api/RSAPI.java
+++ b/src/main/java/refinedstorage/api/RSAPIInject.java
@@ -4,8 +4,8 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
 /**
- * Needs to implemented on a public static {@link IRSAPI} field
+ * Needs to be implemented on a public static {@link IRSAPI} field.
  */
 @Target(ElementType.FIELD)
-public @interface RSAPI {
+public @interface RSAPIInject {
 }
diff --git a/src/main/java/refinedstorage/apiimpl/API.java b/src/main/java/refinedstorage/apiimpl/API.java
index 6a053d465..e29a2428e 100755
--- a/src/main/java/refinedstorage/apiimpl/API.java
+++ b/src/main/java/refinedstorage/apiimpl/API.java
@@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fml.common.discovery.ASMDataTable;
 import refinedstorage.api.IRSAPI;
-import refinedstorage.api.RSAPI;
+import refinedstorage.api.RSAPIInject;
 import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry;
 import refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry;
 import refinedstorage.api.solderer.ISoldererRegistry;
@@ -73,14 +73,18 @@ public class API implements IRSAPI {
     }
 
     public static void deliver(ASMDataTable asmDataTable) {
-        String annotationClassName = RSAPI.class.getCanonicalName();
+        String annotationClassName = RSAPIInject.class.getCanonicalName();
+
         Set<ASMDataTable.ASMData> asmDataSet = asmDataTable.getAll(annotationClassName);
+
         for (ASMDataTable.ASMData asmData : asmDataSet) {
             try {
                 Class clazz = Class.forName(asmData.getClassName());
                 Field field = clazz.getField(asmData.getObjectName());
-                if (field.getType() == IRSAPI.class)
+
+                if (field.getType() == IRSAPI.class) {
                     field.set(null, INSTANCE);
+                }
             } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
                 throw new RuntimeException("Failed to set: {}" + asmData.getClassName() + "." + asmData.getObjectName(), e);
             }
diff --git a/src/main/java/refinedstorage/tile/ClientNode.java b/src/main/java/refinedstorage/tile/ClientNode.java
index 697ec6279..486f0bdc4 100755
--- a/src/main/java/refinedstorage/tile/ClientNode.java
+++ b/src/main/java/refinedstorage/tile/ClientNode.java
@@ -1,7 +1,6 @@
 package refinedstorage.tile;
 
 import net.minecraft.item.ItemStack;
-import refinedstorage.api.RSAPI;
 import refinedstorage.apiimpl.API;
 
 public class ClientNode {