Fixed slabs and unfortunately all the packages

I combined two fixes, I'm sorry
ObsidianBox · Jun 28, 2014 · 98ea0a2 · 98ea0a2
1 parent 92b774b
commit 98ea0a2
Show file tree

Hide file tree

Showing 26 changed files with 51 additions and 56 deletions.
diff --git a/src/main/java/org/obsidianbox/mod/ClientStack.java b/src/main/java/org/obsidianbox/mod/ClientStack.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian;
+package org.obsidianbox.mod;
 
 import java.util.Iterator;
 import java.util.LinkedHashSet;

diff --git a/src/main/java/org/obsidianbox/mod/CustomTabs.java b/src/main/java/org/obsidianbox/mod/CustomTabs.java
@@ -21,15 +21,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian;
+package org.obsidianbox.mod;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import org.obsidianbox.magma.lang.Languages;
-import org.obsidianbox.obsidian.addon.InternalAddon;
+import org.obsidianbox.mod.addon.InternalAddon;
 import org.obsidianbox.magma.Game;
-import org.obsidianbox.magma.addon.Addon;
-import org.obsidianbox.obsidian.addon.CommonAddonManager;
+import org.obsidianbox.mod.addon.CommonAddonManager;
 
 public class CustomTabs extends CreativeTabs {
     private final InternalAddon addon;

diff --git a/src/main/java/org/obsidianbox/mod/GameListener.java b/src/main/java/org/obsidianbox/mod/GameListener.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian;
+package org.obsidianbox.mod;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent;
@@ -35,10 +35,9 @@
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import org.lwjgl.opengl.GL11;
 import org.obsidianbox.magma.util.RenderUtil;
-import org.obsidianbox.obsidian.gui.builtin.ObsidianMainMenu;
+import org.obsidianbox.mod.gui.builtin.ObsidianMainMenu;
 import org.obsidianbox.magma.Game;
-import org.obsidianbox.obsidian.addon.CommonAddonManager;
-import org.obsidianbox.obsidian.message.builtin.AddonListMessage;
+import org.obsidianbox.mod.message.builtin.AddonListMessage;
 
 public class GameListener {
     private final Game game;

diff --git a/src/main/java/org/obsidianbox/mod/ObsidianMod.java b/src/main/java/org/obsidianbox/mod/ObsidianMod.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian;
+package org.obsidianbox.mod;
 
 import java.nio.ByteBuffer;
 
@@ -41,14 +41,14 @@
 import org.obsidianbox.magma.addon.AddonManager;
 import org.obsidianbox.magma.resource.FileSystem;
 import org.obsidianbox.magma.util.RenderUtil;
-import org.obsidianbox.obsidian.lang.CommonLanguageRegistry;
-import org.obsidianbox.obsidian.message.CommonMessagePipeline;
-import org.obsidianbox.obsidian.renderer.GuiRenderer;
-import org.obsidianbox.obsidian.resource.ClientFileSystem;
-import org.obsidianbox.obsidian.resource.CommonFileSystem;
+import org.obsidianbox.mod.lang.CommonLanguageRegistry;
+import org.obsidianbox.mod.message.CommonMessagePipeline;
+import org.obsidianbox.mod.renderer.GuiRenderer;
+import org.obsidianbox.mod.resource.ClientFileSystem;
+import org.obsidianbox.mod.resource.CommonFileSystem;
 import org.obsidianbox.magma.Game;
-import org.obsidianbox.obsidian.addon.ClientAddonManager;
-import org.obsidianbox.obsidian.addon.CommonAddonManager;
+import org.obsidianbox.mod.addon.ClientAddonManager;
+import org.obsidianbox.mod.addon.CommonAddonManager;
 
 import org.spout.renderer.lwjgl.gl32.GL32Context;
 

diff --git a/src/main/java/org/obsidianbox/mod/addon/AddonClassLoader.java b/src/main/java/org/obsidianbox/mod/addon/AddonClassLoader.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian.addon;
+package org.obsidianbox.mod.addon;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

diff --git a/src/main/java/org/obsidianbox/mod/addon/AddonDescriptionJsonDeserializer.java b/src/main/java/org/obsidianbox/mod/addon/AddonDescriptionJsonDeserializer.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian.addon;
+package org.obsidianbox.mod.addon;
 
 import java.lang.reflect.Type;
 

diff --git a/src/main/java/org/obsidianbox/mod/addon/ClientAddonManager.java b/src/main/java/org/obsidianbox/mod/addon/ClientAddonManager.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian.addon;
+package org.obsidianbox.mod.addon;
 
 import java.nio.file.Path;
 import java.util.List;
@@ -32,10 +32,10 @@
 import net.minecraft.client.resources.IResourcePack;
 import org.obsidianbox.magma.addon.InvalidAddonException;
 import org.obsidianbox.magma.addon.InvalidDescriptionException;
-import org.obsidianbox.obsidian.resource.AddonResourcePack;
+import org.obsidianbox.mod.resource.AddonResourcePack;
 import org.obsidianbox.magma.Game;
 import org.obsidianbox.magma.addon.Addon;
-import org.obsidianbox.obsidian.util.ReflectionEntry;
+import org.obsidianbox.mod.util.ReflectionEntry;
 
 //TODO Override parent methods and show GUI acceptance screens
 @SideOnly(Side.CLIENT)

diff --git a/src/main/java/org/obsidianbox/mod/addon/CommonAddonManager.java b/src/main/java/org/obsidianbox/mod/addon/CommonAddonManager.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian.addon;
+package org.obsidianbox.mod.addon;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -47,8 +47,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.obsidianbox.magma.Game;
 import org.obsidianbox.magma.util.FileUtils;
-import org.obsidianbox.obsidian.resource.CommonFileSystem;
-import org.obsidianbox.obsidian.util.map.SerializableHashMap;
+import org.obsidianbox.mod.resource.CommonFileSystem;
+import org.obsidianbox.mod.util.map.SerializableHashMap;
 import org.obsidianbox.magma.addon.Addon;
 import org.obsidianbox.magma.addon.AddonDescription;
 import org.obsidianbox.magma.addon.AddonManager;

diff --git a/src/main/java/org/obsidianbox/mod/addon/InternalAddon.java b/src/main/java/org/obsidianbox/mod/addon/InternalAddon.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian.addon;
+package org.obsidianbox.mod.addon;
 
 import java.lang.reflect.Field;
 
@@ -39,14 +39,13 @@
 import org.obsidianbox.magma.message.MessagePipeline;
 import org.obsidianbox.magma.item.CustomArmor;
 import org.obsidianbox.magma.item.CustomAxe;
-import org.obsidianbox.magma.item.CustomFood;
 import org.obsidianbox.magma.item.CustomItem;
 import org.obsidianbox.magma.item.CustomPickaxe;
 import org.obsidianbox.magma.item.CustomSpade;
 import org.obsidianbox.magma.item.CustomSword;
-import org.obsidianbox.obsidian.message.builtin.AddFileMessage;
-import org.obsidianbox.obsidian.message.builtin.AddonListMessage;
-import org.obsidianbox.obsidian.message.builtin.DownloadLinkMessage;
+import org.obsidianbox.mod.message.builtin.AddFileMessage;
+import org.obsidianbox.mod.message.builtin.AddonListMessage;
+import org.obsidianbox.mod.message.builtin.DownloadLinkMessage;
 
 public final class InternalAddon extends Addon {
     private CustomItem obsidianEmblem;

diff --git a/src/main/java/org/obsidianbox/mod/gui/builtin/ObsidianBackground.java b/src/main/java/org/obsidianbox/mod/gui/builtin/ObsidianBackground.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian.gui.builtin;
+package org.obsidianbox.mod.gui.builtin;
 
 import java.util.Calendar;
 import java.util.Random;

diff --git a/src/main/java/org/obsidianbox/mod/gui/builtin/ObsidianMainMenu.java b/src/main/java/org/obsidianbox/mod/gui/builtin/ObsidianMainMenu.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian.gui.builtin;
+package org.obsidianbox.mod.gui.builtin;
 
 import cpw.mods.fml.client.GuiModList;
 import net.minecraft.client.gui.GuiButton;

diff --git a/src/main/java/org/obsidianbox/mod/gui/builtin/ObsidianSimpleButton.java b/src/main/java/org/obsidianbox/mod/gui/builtin/ObsidianSimpleButton.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian.gui.builtin;
+package org.obsidianbox.mod.gui.builtin;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;

diff --git a/src/main/java/org/obsidianbox/mod/lang/CommonLanguageRegistry.java b/src/main/java/org/obsidianbox/mod/lang/CommonLanguageRegistry.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian.lang;
+package org.obsidianbox.mod.lang;
 
 import java.util.Collections;
 import java.util.HashMap;

diff --git a/src/main/java/org/obsidianbox/mod/message/CommonMessagePipeline.java b/src/main/java/org/obsidianbox/mod/message/CommonMessagePipeline.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian.message;
+package org.obsidianbox.mod.message;
 
 import java.lang.reflect.Field;
 import java.util.EnumMap;

diff --git a/src/main/java/org/obsidianbox/mod/message/builtin/AddFileMessage.java b/src/main/java/org/obsidianbox/mod/message/builtin/AddFileMessage.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian.message.builtin;
+package org.obsidianbox.mod.message.builtin;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -39,7 +39,7 @@
 import org.obsidianbox.magma.addon.InvalidAddonException;
 import org.obsidianbox.magma.addon.InvalidDescriptionException;
 import org.obsidianbox.magma.message.Message;
-import org.obsidianbox.obsidian.resource.CommonFileSystem;
+import org.obsidianbox.mod.resource.CommonFileSystem;
 import org.obsidianbox.magma.Game;
 
 public class AddFileMessage implements Message {

diff --git a/src/main/java/org/obsidianbox/mod/message/builtin/AddonListMessage.java b/src/main/java/org/obsidianbox/mod/message/builtin/AddonListMessage.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian.message.builtin;
+package org.obsidianbox.mod.message.builtin;
 
 import java.io.Serializable;
 import java.util.Map;
@@ -31,10 +31,10 @@
 import net.minecraft.entity.player.EntityPlayerMP;
 import org.obsidianbox.magma.addon.Addon;
 import org.obsidianbox.magma.message.Message;
-import org.obsidianbox.obsidian.resource.CommonFileSystem;
-import org.obsidianbox.obsidian.util.map.SerializableHashMap;
+import org.obsidianbox.mod.resource.CommonFileSystem;
+import org.obsidianbox.mod.util.map.SerializableHashMap;
 import org.obsidianbox.magma.Game;
-import org.obsidianbox.obsidian.addon.CommonAddonManager;
+import org.obsidianbox.mod.addon.CommonAddonManager;
 
 /**
  * Message used to communicate the addon list between client and server.

diff --git a/src/main/java/org/obsidianbox/mod/message/builtin/DownloadLinkMessage.java b/src/main/java/org/obsidianbox/mod/message/builtin/DownloadLinkMessage.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian.message.builtin;
+package org.obsidianbox.mod.message.builtin;
 
 import java.io.IOException;
 import java.net.MalformedURLException;

diff --git a/src/main/java/org/obsidianbox/mod/renderer/GuiRenderer.java b/src/main/java/org/obsidianbox/mod/renderer/GuiRenderer.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian.renderer;
+package org.obsidianbox.mod.renderer;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -42,7 +42,7 @@
 import org.obsidianbox.magma.Game;
 import org.obsidianbox.magma.addon.Addon;
 import org.obsidianbox.magma.renderer.Renderer;
-import org.obsidianbox.obsidian.addon.CommonAddonManager;
+import org.obsidianbox.mod.addon.CommonAddonManager;
 
 import org.spout.renderer.api.Camera;
 import org.spout.renderer.api.Material;

diff --git a/src/main/java/org/obsidianbox/mod/resource/AddonResourcePack.java b/src/main/java/org/obsidianbox/mod/resource/AddonResourcePack.java
@@ -21,10 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian.resource;
+package org.obsidianbox.mod.resource;
 
 import java.awt.image.BufferedImage;
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashSet;
 import java.util.Set;
@@ -33,7 +32,6 @@
 import net.minecraft.client.resources.data.IMetadataSection;
 import net.minecraft.client.resources.data.IMetadataSerializer;
 import net.minecraft.util.ResourceLocation;
-import org.obsidianbox.magma.Game;
 import org.obsidianbox.magma.addon.Addon;
 
 public class AddonResourcePack implements IResourcePack {

diff --git a/src/main/java/org/obsidianbox/mod/resource/ClientFileSystem.java b/src/main/java/org/obsidianbox/mod/resource/ClientFileSystem.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian.resource;
+package org.obsidianbox.mod.resource;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;

diff --git a/src/main/java/org/obsidianbox/mod/resource/CommonFileSystem.java b/src/main/java/org/obsidianbox/mod/resource/CommonFileSystem.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian.resource;
+package org.obsidianbox.mod.resource;
 
 import java.io.File;
 import java.io.FileNotFoundException;

diff --git a/src/main/java/org/obsidianbox/mod/util/ReflectionEntry.java b/src/main/java/org/obsidianbox/mod/util/ReflectionEntry.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian.util;
+package org.obsidianbox.mod.util;
 
 import java.util.List;
 import java.lang.reflect.Modifier;

diff --git a/src/main/java/org/obsidianbox/mod/util/map/SerializableHashMap.java b/src/main/java/org/obsidianbox/mod/util/map/SerializableHashMap.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.obsidianbox.obsidian.util.map;
+package org.obsidianbox.mod.util.map;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -44,7 +44,7 @@
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.obsidianbox.magma.util.map.DefaultedKey;
 import org.obsidianbox.magma.util.map.SerializableMap;
-import org.obsidianbox.obsidian.addon.AddonClassLoader;
+import org.obsidianbox.mod.addon.AddonClassLoader;
 
 /**
  * Manages a string keyed, serializable object hashmap that can be serialized easily to an array of bytes and deserialized from an array of bytes, intended for persistence and network transfers.

diff --git a/src/test/java/org/obsidianbox/api/AddonManagerTest.java b/src/test/java/org/obsidianbox/api/AddonManagerTest.java
@@ -25,7 +25,7 @@
 
 import cpw.mods.fml.relauncher.Side;
 import org.junit.Test;
-import org.obsidianbox.obsidian.addon.CommonAddonManager;
+import org.obsidianbox.mod.addon.CommonAddonManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;

diff --git a/src/test/java/org/obsidianbox/api/LanguageRegistryTest.java b/src/test/java/org/obsidianbox/api/LanguageRegistryTest.java
@@ -29,8 +29,8 @@
 import org.junit.Test;
 import org.obsidianbox.magma.addon.Addon;
 import org.obsidianbox.magma.lang.Languages;
-import org.obsidianbox.obsidian.lang.CommonLanguageRegistry;
-import org.obsidianbox.obsidian.addon.CommonAddonManager;
+import org.obsidianbox.mod.lang.CommonLanguageRegistry;
+import org.obsidianbox.mod.addon.CommonAddonManager;
 
 import static org.junit.Assert.assertTrue;
 

diff --git a/src/test/java/org/obsidianbox/api/SerializableHashMapTest.java b/src/test/java/org/obsidianbox/api/SerializableHashMapTest.java
@@ -24,7 +24,7 @@
 package org.obsidianbox.magma;
 
 import org.junit.Test;
-import org.obsidianbox.obsidian.util.map.SerializableHashMap;
+import org.obsidianbox.mod.util.map.SerializableHashMap;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;