Fix ASM problem attempt 2

Former-commit-id: 9e7f7e39f1dd6c8778506c203387913841f74d6c

11 files changed, 13 insertions, 15 deletions

diff --git a/README.md b/README.md
index af2d69b350..7fcf015b51 100644
--- a/README.md
+++ b/README.md
@@ -4,4 +4,4 @@ Visit us on Twitch:
 https://minecraft.curseforge.com/projects/bartworks/
 
 
-Please add -Dfml.coreMods.load=com.github.bartimaeusnek.ASM.BWCorePlugin to your args when you run this in a dev enviroment!
\ No newline at end of file
+Please add -Dfml.coreMods.load=com.github.bartimaeusnek.bartworks.ASM.BWCorePlugin to your args when you run this in a dev enviroment!
\ No newline at end of file
diff --git a/addon.gradle b/addon.gradle
index 15ba866637..cc0f5d57e5 100644
--- a/addon.gradle
+++ b/addon.gradle
@@ -1,5 +1,3 @@
 compileJava {
     options.encoding = "UTF-8"
 }
-
-project.coreModClass = "com.github.bartimaeusnek.ASM.BWCorePlugin"
diff --git a/gradle.properties b/gradle.properties
index 9f5ae76b21..5472edd8cf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -50,7 +50,7 @@ mixinsPackage =
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
 # This parameter is for legacy compatability only
 # Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
-coreModClass =
+coreModClass = ASM.BWCorePlugin
 # If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
 # that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
 containsMixinsAndOrCoreModOnly = false
diff --git a/src/main/java/com/github/bartimaeusnek/ASM/ASMUtils.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/ASMUtils.java
index 9055909567..48a8f49d5c 100644
--- a/src/main/java/com/github/bartimaeusnek/ASM/ASMUtils.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/ASMUtils.java
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.github.bartimaeusnek.ASM;
+package com.github.bartimaeusnek.bartworks.ASM;
 
 import org.objectweb.asm.tree.MethodNode;
 
diff --git a/src/main/java/com/github/bartimaeusnek/ASM/BWCore.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java
index 6592da592f..e97de8cf21 100644
--- a/src/main/java/com/github/bartimaeusnek/ASM/BWCore.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.github.bartimaeusnek.ASM;
+package com.github.bartimaeusnek.bartworks.ASM;
 
 import com.github.bartimaeusnek.bartworks.MainMod;
 import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler;
@@ -39,7 +39,7 @@ import org.apache.logging.log4j.Logger;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.github.bartimaeusnek.ASM.BWCoreTransformer.shouldTransform;
+import static com.github.bartimaeusnek.bartworks.ASM.BWCoreTransformer.shouldTransform;
 
 @SuppressWarnings("ALL")
 public class BWCore extends DummyModContainer {
diff --git a/src/main/java/com/github/bartimaeusnek/ASM/BWCorePlugin.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCorePlugin.java
index bbaff54ba1..37a64add7c 100644
--- a/src/main/java/com/github/bartimaeusnek/ASM/BWCorePlugin.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCorePlugin.java
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.github.bartimaeusnek.ASM;
+package com.github.bartimaeusnek.bartworks.ASM;
 
 import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler;
 import cpw.mods.fml.relauncher.FMLInjectionData;
@@ -33,7 +33,7 @@ import java.util.Map;
 
 @IFMLLoadingPlugin.SortingIndex(Integer.MAX_VALUE)//Load as late as possible (after fastcraft/OptiFine).
 @IFMLLoadingPlugin.MCVersion("1.7.10")
-@IFMLLoadingPlugin.TransformerExclusions("com.github.bartimaeusnek.ASM")
+@IFMLLoadingPlugin.TransformerExclusions("com.github.bartimaeusnek.bartworks.ASM")
 @IFMLLoadingPlugin.Name(BWCorePlugin.BWCORE_PLUGIN_NAME)
 public class BWCorePlugin implements IFMLLoadingPlugin {
 
diff --git a/src/main/java/com/github/bartimaeusnek/ASM/BWCoreStaticReplacementMethodes.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes.java
index 47705042a9..e4b14820c7 100644
--- a/src/main/java/com/github/bartimaeusnek/ASM/BWCoreStaticReplacementMethodes.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes.java
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.github.bartimaeusnek.ASM;
+package com.github.bartimaeusnek.bartworks.ASM;
 
 import com.github.bartimaeusnek.bartworks.util.NonNullWrappedHashSet;
 import com.github.bartimaeusnek.bartworks.util.accessprioritylist.AccessPriorityList;
diff --git a/src/main/java/com/github/bartimaeusnek/ASM/BWCoreTransformer.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java
index 775c3fc9b1..4ea3582bd1 100644
--- a/src/main/java/com/github/bartimaeusnek/ASM/BWCoreTransformer.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.github.bartimaeusnek.ASM;
+package com.github.bartimaeusnek.bartworks.ASM;
 
 import net.minecraft.launchwrapper.IClassTransformer;
 import org.objectweb.asm.ClassReader;
@@ -294,7 +294,7 @@ public class BWCoreTransformer implements IClassTransformer {
                             toPatch.instructions = new InsnList();
                             toPatch.instructions.add(new VarInsnNode(ALOAD,1));
                             toPatch.instructions.add(new VarInsnNode(ALOAD,2));
-                            toPatch.instructions.add(new MethodInsnNode(INVOKESTATIC,"com/github/bartimaeusnek/ASM/BWCoreStaticReplacementMethodes","findCachedMatchingRecipe","(Lnet/minecraft/inventory/InventoryCrafting;Lnet/minecraft/world/World;)Lnet/minecraft/item/ItemStack;",false));
+                            toPatch.instructions.add(new MethodInsnNode(INVOKESTATIC,"com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes","findCachedMatchingRecipe","(Lnet/minecraft/inventory/InventoryCrafting;Lnet/minecraft/world/World;)Lnet/minecraft/item/ItemStack;",false));
                             toPatch.instructions.add(new InsnNode(ARETURN));
                             break scase;
                         }
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/ClearCraftingCache.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/ClearCraftingCache.java
index f9aba701a6..0beec2c8af 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/ClearCraftingCache.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/ClearCraftingCache.java
@@ -22,7 +22,7 @@
 
 package com.github.bartimaeusnek.bartworks.common.commands;
 
-import com.github.bartimaeusnek.ASM.BWCoreStaticReplacementMethodes;
+import com.github.bartimaeusnek.bartworks.ASM.BWCoreStaticReplacementMethodes;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.ChatComponentText;
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java
index 64095f5cc4..11c97e6b8e 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java
@@ -23,7 +23,7 @@
 package com.github.bartimaeusnek.bartworks.common.configs;
 
 
-import com.github.bartimaeusnek.ASM.BWCoreTransformer;
+import com.github.bartimaeusnek.bartworks.ASM.BWCoreTransformer;
 import com.github.bartimaeusnek.bartworks.API.API_ConfigValues;
 import net.minecraftforge.common.config.Configuration;
 
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java
index 6831198a56..90740455c2 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java
@@ -22,7 +22,7 @@
 
 package com.github.bartimaeusnek.bartworks.system.material.CircuitGeneration;
 
-import com.github.bartimaeusnek.ASM.BWCoreStaticReplacementMethodes;
+import com.github.bartimaeusnek.bartworks.ASM.BWCoreStaticReplacementMethodes;
 import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler;
 import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
 import com.github.bartimaeusnek.bartworks.util.BWRecipes;