From eedad2e33dc2a60eeffdef8c90c9cb83499b1991 Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Sun, 27 Dec 2015 03:58:52 +0100
Subject: [PATCH] Fix what I just did. I wanted to add MineTweaker Support, but
 then I noticed MineTweaker Support is really stupid and complicated so fuck
 it.

---
 .../ellpeck/actuallyadditions/ActuallyAdditions.java     | 9 +--------
 .../ellpeck/actuallyadditions/blocks/InitBlocks.java     | 2 +-
 .../java/ellpeck/actuallyadditions/items/InitItems.java  | 2 +-
 .../actuallyadditions/util/{compat => }/CompatUtil.java  | 2 +-
 4 files changed, 4 insertions(+), 11 deletions(-)
 rename src/main/java/ellpeck/actuallyadditions/util/{compat => }/CompatUtil.java (96%)

diff --git a/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java b/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java
index 666ac6574..936f7d3b2 100644
--- a/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java
+++ b/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java
@@ -18,7 +18,6 @@ import cpw.mods.fml.common.event.*;
 import ellpeck.actuallyadditions.achievement.InitAchievements;
 import ellpeck.actuallyadditions.blocks.InitBlocks;
 import ellpeck.actuallyadditions.booklet.InitBooklet;
-import ellpeck.actuallyadditions.communication.InterModCommunications;
 import ellpeck.actuallyadditions.config.ConfigurationHandler;
 import ellpeck.actuallyadditions.crafting.CrusherCrafting;
 import ellpeck.actuallyadditions.crafting.InitCrafting;
@@ -49,7 +48,7 @@ import net.minecraft.init.Items;
 import net.minecraft.server.MinecraftServer;
 
 //                                                                           So that BuildCraft Oil always gets used
-@Mod(modid = ModUtil.MOD_ID, name = ModUtil.NAME, version = ModUtil.VERSION, dependencies = "after:BuildCraft|Energy", canBeDeactivated = false, guiFactory = "ellpeck.actuallyadditions.config.GuiFactory")
+@Mod(modid = ModUtil.MOD_ID, name = ModUtil.NAME, version = ModUtil.VERSION, dependencies = "after:BuildCraft|Energy", guiFactory = "ellpeck.actuallyadditions.config.GuiFactory")
 public class ActuallyAdditions{
 
     @Instance(ModUtil.MOD_ID)
@@ -109,15 +108,9 @@ public class ActuallyAdditions{
         proxy.postInit(event);
 
         ModUtil.LOGGER.info("PostInitialization Finished.");
-
         FakePlayerUtil.info();
     }
 
-    @EventHandler
-    public void onIMCReceived(FMLInterModComms.IMCEvent event){
-        InterModCommunications.processIMC(event.getMessages());
-    }
-
     @EventHandler
     public void serverStarting(FMLServerStartingEvent event){
         Util.registerDispenserHandler(InitItems.itemBucketOil, new DispenserHandlerEmptyBucket());
diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java b/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java
index 727d95791..b299bf263 100644
--- a/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java
+++ b/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java
@@ -16,8 +16,8 @@ import ellpeck.actuallyadditions.blocks.base.BlockStair;
 import ellpeck.actuallyadditions.blocks.base.BlockWallAA;
 import ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks;
 import ellpeck.actuallyadditions.config.values.ConfigBoolValues;
+import ellpeck.actuallyadditions.util.CompatUtil;
 import ellpeck.actuallyadditions.util.ModUtil;
-import ellpeck.actuallyadditions.util.compat.CompatUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.EnumRarity;
diff --git a/src/main/java/ellpeck/actuallyadditions/items/InitItems.java b/src/main/java/ellpeck/actuallyadditions/items/InitItems.java
index ace11bb30..411d580af 100644
--- a/src/main/java/ellpeck/actuallyadditions/items/InitItems.java
+++ b/src/main/java/ellpeck/actuallyadditions/items/InitItems.java
@@ -18,8 +18,8 @@ import ellpeck.actuallyadditions.items.metalists.TheFoods;
 import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
 import ellpeck.actuallyadditions.material.InitArmorMaterials;
 import ellpeck.actuallyadditions.material.InitToolMaterials;
+import ellpeck.actuallyadditions.util.CompatUtil;
 import ellpeck.actuallyadditions.util.ModUtil;
-import ellpeck.actuallyadditions.util.compat.CompatUtil;
 import net.minecraft.init.Items;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
diff --git a/src/main/java/ellpeck/actuallyadditions/util/compat/CompatUtil.java b/src/main/java/ellpeck/actuallyadditions/util/CompatUtil.java
similarity index 96%
rename from src/main/java/ellpeck/actuallyadditions/util/compat/CompatUtil.java
rename to src/main/java/ellpeck/actuallyadditions/util/CompatUtil.java
index cb0a26c28..2f1fc1d8a 100644
--- a/src/main/java/ellpeck/actuallyadditions/util/compat/CompatUtil.java
+++ b/src/main/java/ellpeck/actuallyadditions/util/CompatUtil.java
@@ -8,7 +8,7 @@
  * © 2015 Ellpeck
  */
 
-package ellpeck.actuallyadditions.util.compat;
+package ellpeck.actuallyadditions.util;
 
 import cpw.mods.fml.common.event.FMLInterModComms;
 import ellpeck.actuallyadditions.items.ItemSeed;