Refactor references to EE3/Equivalent-Exchange-3 to EE/Equivalent-Exc…

…hange

.gitignore

@@ -1,3 +1,6 @@
+## project stuff
+/versions.json
+
 ## gradle
 /.gradle
 /build

build.gradle

@@ -61,7 +61,7 @@ minecraft {
     useDepAts = true // Required for JEI
 
     // Set mod version in code prior to compilation
-    replaceIn "EquivalentExchange3.java"
+    replaceIn "EquivalentExchange.java"
     replace "@MOD_VERSION@", "${mod_version}.${System.getenv("BUILD_NUMBER") ?: 0}"
 
     // Set the jar signature in code prior to compilation, if it exists as a build property
@@ -150,7 +150,7 @@ task buildVersionFile {
     def modVersion = "${mod_version}.${System.getenv("BUILD_NUMBER") ?: 0}"
     def isReleaseVersion = project.hasProperty("mod_release_type") && project.property("mod_release_type") == "release"
     def fileName = "versions.json"
-    def remoteUrl = "http://ee3.pahimar.com/"
+    def remoteUrl = "http://ee.pahimar.com/"
     def changelogStatement = "Changelog available at " + remoteUrl + minecraftVersion + "/${project.archivesBaseName}-${project.version}-changelog.txt"
     def localUpdateJson = new HashMap()
 

gradle.properties

@@ -4,16 +4,16 @@ org.gradle.jvmargs=-Xmx3G
 
 # Build related properties
 minecraft_version = 1.11.2
-forge_version = 13.20.0.2259
+forge_version = 13.20.0.2263
 mcp_mappings_version = snapshot_20161220
 curseforge_plugin_version = 1.0.7
 
 # Mod related properties
-mod_artifact_basename = EquivalentExchange3
-mod_group = com.pahimar.ee3
-mod_version = 0.5.0
-api_version = 1.5.0
-mod_release_type = beta
+mod_artifact_basename = EquivalentExchange
+mod_group = com.pahimar.ee
+mod_version = 3.0.0
+api_version = 3.0.0
+mod_release_type = alpha
 
 # Mod dependency related properties
 dep_jei_version = 4.2.0.211

src/main/java/com/pahimar/ee3/EquivalentExchange3.java → src/main/java/com/pahimar/ee/EquivalentExchange.java

@@ -1,33 +1,33 @@
-package com.pahimar.ee3;
-
-import com.pahimar.ee3.array.AlchemyArrayRegistry;
-import com.pahimar.ee3.blacklist.BlacklistRegistry;
-import com.pahimar.ee3.exchange.EnergyValueRegistry;
-import com.pahimar.ee3.knowledge.PlayerKnowledgeRegistry;
-import com.pahimar.ee3.proxy.IProxy;
-import com.pahimar.ee3.recipe.AludelRecipeManager;
-import com.pahimar.ee3.recipe.RecipeRegistry;
-import com.pahimar.ee3.reference.Messages;
-import com.pahimar.ee3.util.LogHelper;
+package com.pahimar.ee;
+
+import com.pahimar.ee.array.AlchemyArrayRegistry;
+import com.pahimar.ee.blacklist.BlacklistRegistry;
+import com.pahimar.ee.exchange.EnergyValueRegistry;
+import com.pahimar.ee.knowledge.PlayerKnowledgeRegistry;
+import com.pahimar.ee.proxy.IProxy;
+import com.pahimar.ee.recipe.AludelRecipeManager;
+import com.pahimar.ee.recipe.RecipeRegistry;
+import com.pahimar.ee.reference.Messages;
+import com.pahimar.ee.util.LogHelper;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.SidedProxy;
 import net.minecraftforge.fml.common.event.*;
 
-@Mod(modid = EquivalentExchange3.MOD_ID,
+@Mod(modid = EquivalentExchange.MOD_ID,
         name = "Equivalent Exchange 3",
-        certificateFingerprint = EquivalentExchange3.FINGERPRINT,
+        certificateFingerprint = EquivalentExchange.FINGERPRINT,
         version = "@MOD_VERSION@",
-        guiFactory = "com.pahimar.ee3.client.gui.GuiFactory",
-        updateJSON = "http://ee3.pahimar.com/update/versions.json")
-public class EquivalentExchange3 {
+        guiFactory = "com.pahimar.ee.client.gui.GuiFactory",
+        updateJSON = "http://ee.pahimar.com/update/versions.json")
+public class EquivalentExchange {
 
-    public static final String MOD_ID = "ee3";
+    public static final String MOD_ID = "ee";
     static final String FINGERPRINT = "@FINGERPRINT@";
 
-    @Mod.Instance(EquivalentExchange3.MOD_ID)
-    public static EquivalentExchange3 instance;
+    @Mod.Instance(EquivalentExchange.MOD_ID)
+    public static EquivalentExchange instance;
 
-    @SidedProxy(clientSide = "com.pahimar.ee3.proxy.ClientProxy", serverSide = "com.pahimar.ee3.proxy.ServerProxy")
+    @SidedProxy(clientSide = "com.pahimar.ee.proxy.ClientProxy", serverSide = "com.pahimar.ee.proxy.ServerProxy")
     public static IProxy proxy;
 
     @Mod.EventHandler

src/main/java/com/pahimar/ee3/api/array/AlchemyArray.java → src/main/java/com/pahimar/ee/api/array/AlchemyArray.java

@@ -1,4 +1,4 @@
-package com.pahimar.ee3.api.array;
+package com.pahimar.ee.api.array;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.resources.I18n;

src/main/java/com/pahimar/ee3/api/array/AlchemyArrayRegistryProxy.java → src/main/java/com/pahimar/ee/api/array/AlchemyArrayRegistryProxy.java

@@ -1,6 +1,6 @@
-package com.pahimar.ee3.api.array;
+package com.pahimar.ee.api.array;
 
-import com.pahimar.ee3.EquivalentExchange3;
+import com.pahimar.ee.EquivalentExchange;
 import net.minecraftforge.fml.common.Mod;
 
 import java.util.Set;
@@ -17,8 +17,8 @@ public static boolean register(AlchemyArray alchemyArray) {
 
         init();
 
-        if (ee3Mod != null) {
-            return EE3Wrapper.ee3mod.getAlchemyArrayRegistry().register(alchemyArray);
+        if (mod != null) {
+            return ModWrapper.mod.getAlchemyArrayRegistry().register(alchemyArray);
         }
 
         return false;
@@ -33,23 +33,23 @@ public static Set<AlchemyArray> getAlchemyArrays() {
 
         init();
 
-        if (ee3Mod != null) {
-            return EE3Wrapper.ee3mod.getAlchemyArrayRegistry().getAlchemyArrays();
+        if (mod != null) {
+            return ModWrapper.mod.getAlchemyArrayRegistry().getAlchemyArrays();
         }
 
         return null;
     }
 
-    @Mod.Instance("ee3")
-    private static Object ee3Mod;
+    @Mod.Instance("ee")
+    private static Object mod;
 
-    private static class EE3Wrapper {
-        private static EquivalentExchange3 ee3mod;
+    private static class ModWrapper {
+        private static EquivalentExchange mod;
     }
 
     private static void init() {
-        if (ee3Mod != null) {
-            EE3Wrapper.ee3mod = (EquivalentExchange3) ee3Mod;
+        if (mod != null) {
+            ModWrapper.mod = (EquivalentExchange) mod;
         }
     }
 }

src/main/java/com/pahimar/ee/api/array/package-info.java

@@ -0,0 +1,3 @@
+@API(owner = "ee", apiVersion = "@API_VERSION@", provides = "EE-API|array") package com.pahimar.ee.api.array;
+
+import net.minecraftforge.fml.common.API;

src/main/java/com/pahimar/ee3/api/blacklist/BlacklistRegistryProxy.java → src/main/java/com/pahimar/ee/api/blacklist/BlacklistRegistryProxy.java

@@ -1,7 +1,7 @@
-package com.pahimar.ee3.api.blacklist;
+package com.pahimar.ee.api.blacklist;
 
-import com.pahimar.ee3.EquivalentExchange3;
-import com.pahimar.ee3.exchange.WrappedStack;
+import com.pahimar.ee.EquivalentExchange;
+import com.pahimar.ee.exchange.WrappedStack;
 import net.minecraftforge.fml.common.Mod;
 
 import java.util.Set;
@@ -36,12 +36,12 @@ public static Set<WrappedStack> getBlacklist(Blacklist blacklist) {
 
         init();
 
-        if (ee3Mod != null) {
+        if (mod != null) {
             if (blacklist == Blacklist.KNOWLEDGE) {
-                return EE3Wrapper.ee3mod.getBlacklistRegistry().getKnowledgeBlacklist();
+                return ModWrappper.mod.getBlacklistRegistry().getKnowledgeBlacklist();
             }
             else if (blacklist == Blacklist.EXCHANGE) {
-                return EE3Wrapper.ee3mod.getBlacklistRegistry().getExchangeBlacklist();
+                return ModWrappper.mod.getBlacklistRegistry().getExchangeBlacklist();
             }
         }
 
@@ -58,8 +58,8 @@ public static boolean isLearnable(Object object) {
 
         init();
 
-        if (ee3Mod != null) {
-            return EE3Wrapper.ee3mod.getBlacklistRegistry().isLearnable(object);
+        if (mod != null) {
+            return ModWrappper.mod.getBlacklistRegistry().isLearnable(object);
         }
 
         return false;
@@ -75,8 +75,8 @@ public static boolean isExchangeable(Object object) {
 
         init();
 
-        if (ee3Mod != null) {
-            return EE3Wrapper.ee3mod.getBlacklistRegistry().isExchangeable(object);
+        if (mod != null) {
+            return ModWrappper.mod.getBlacklistRegistry().isExchangeable(object);
         }
 
         return false;
@@ -128,8 +128,8 @@ public static void addToBlacklist(Object object, Blacklist blacklist) {
 
         init();
 
-        if (ee3Mod != null) {
-            EE3Wrapper.ee3mod.getBlacklistRegistry().addToBlacklist(object, blacklist);
+        if (mod != null) {
+            ModWrappper.mod.getBlacklistRegistry().addToBlacklist(object, blacklist);
         }
     }
 
@@ -143,22 +143,22 @@ public static void removeFromBlacklist(Object object, Blacklist blacklist) {
 
         init();
 
-        if (ee3Mod != null) {
-            EE3Wrapper.ee3mod.getBlacklistRegistry().removeFromBlacklist(object, blacklist);
+        if (mod != null) {
+            ModWrappper.mod.getBlacklistRegistry().removeFromBlacklist(object, blacklist);
         }
     }
 
-    @Mod.Instance("ee3")
-    private static Object ee3Mod;
+    @Mod.Instance("ee")
+    private static Object mod;
 
-    private static class EE3Wrapper {
-        private static EquivalentExchange3 ee3mod;
+    private static class ModWrappper {
+        private static EquivalentExchange mod;
     }
 
     private static void init() {
 
-        if (ee3Mod != null) {
-            BlacklistRegistryProxy.EE3Wrapper.ee3mod = (EquivalentExchange3) ee3Mod;
+        if (mod != null) {
+            ModWrappper.mod = (EquivalentExchange) mod;
         }
     }
 

src/main/java/com/pahimar/ee/api/blacklist/package-info.java

@@ -0,0 +1,3 @@
+@API(owner = "ee", apiVersion = "@API_VERSION@", provides = "EE-API|blacklist") package com.pahimar.ee.api.blacklist;
+
+import net.minecraftforge.fml.common.API;

src/main/java/com/pahimar/ee3/api/event/BlacklistEvent.java → src/main/java/com/pahimar/ee/api/event/BlacklistEvent.java

@@ -1,4 +1,4 @@
-package com.pahimar.ee3.api.event;
+package com.pahimar.ee.api.event;
 
 import net.minecraftforge.fml.common.eventhandler.Event;
 

src/main/java/com/pahimar/ee3/api/event/EnergyValueEvent.java → src/main/java/com/pahimar/ee/api/event/EnergyValueEvent.java

@@ -1,7 +1,7 @@
-package com.pahimar.ee3.api.event;
+package com.pahimar.ee.api.event;
 
-import com.pahimar.ee3.api.exchange.EnergyValue;
-import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy;
+import com.pahimar.ee.api.exchange.EnergyValue;
+import com.pahimar.ee.api.exchange.EnergyValueRegistryProxy;
 import net.minecraftforge.fml.common.eventhandler.Event;
 
 public class EnergyValueEvent extends Event {

src/main/java/com/pahimar/ee3/api/event/PlayerKnowledgeEvent.java → src/main/java/com/pahimar/ee/api/event/PlayerKnowledgeEvent.java

@@ -1,4 +1,4 @@
-package com.pahimar.ee3.api.event;
+package com.pahimar.ee.api.event;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.fml.common.eventhandler.Event;

src/main/java/com/pahimar/ee3/api/event/WorldTransmutationEvent.java → src/main/java/com/pahimar/ee/api/event/WorldTransmutationEvent.java

@@ -1,4 +1,4 @@
-package com.pahimar.ee3.api.event;
+package com.pahimar.ee.api.event;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLiving;

src/main/java/com/pahimar/ee/api/event/package-info.java

@@ -0,0 +1,3 @@
+@API(owner = "ee", apiVersion = "@API_VERSION@", provides = "EE-API|event") package com.pahimar.ee.api.event;
+
+import net.minecraftforge.fml.common.API;

src/main/java/com/pahimar/ee3/api/exchange/EnergyValue.java → src/main/java/com/pahimar/ee/api/exchange/EnergyValue.java

@@ -1,4 +1,4 @@
-package com.pahimar.ee3.api.exchange;
+package com.pahimar.ee.api.exchange;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.text.ITextComponent;