Fixed a bug which causes servers to crash

6 files changed, 45 insertions, 135 deletions

diff --git a/build.gradle b/build.gradle
index 7d1f8c1..60db159 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ apply plugin: 'curseforge'
 project.ext {

 	massive = "1"

     major = "1"

-    minor = "0"

+    minor = "1"

     mcVersion = "1.7.10"

 	ee3Version = "0.3.505"

 	alpacaVersion = "1.2"

diff --git a/changelog.txt b/changelog.txt
index 5b32814..1770895 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,48 +1,2 @@
-Added:

-- A GUI for Curses (default key is C)

-- Curses now have localized names

-- Config options to disable each curse individually or curses in general

-- Config option to disable or enable extra info on jewelry (it's on by default)

-- Crystals now emit particles (can be disabled through a config)

-- 1 achievement

-- 1 challenge (viewable in the achievements menu)

-- 1 new structure

-- 1 new curse

-- A curse tab in the guide

-- The book now remembers the last page and tab you visited

-- The ability to activate or deactivate curses in creative through the Curses GUI

-- A message telling you how bad of a person you are if you kill a heart

-- Sound effects while the ritual is in progress

-

-Removed:

-- The ore to ingots tab in the guide (it was more for testing anyway)

-

-Changed:

-- Changed Hearts despawn time from 30 to 45 seconds

-- Hearts now are invulnerable first 3 seconds after they spawn

-- "Humble Bundle" curse is now called "2 for 1"

-- The guide GUI (it's fancy now)

-- Crystals have a more random render

-- With Pentagram curse you can now steal a maximum of 2 hearts per entity (3 if you completed the challenge)

-- Moved the hearts icons so they don't conflict with the battlegears mod

-- Structure spawning method so it is more reliable

-- Molten metals are more reliable now

-- If you destroy a full smelter it will drop 6 cobblestone, a bucket of lava and a bucket of the molten metal it contained

-- The text in the guide is now slightly smaller

-- Vampire Hunger now has a 50% to heal you when attacking a creature

-- You will be set on fire if you go outside during the day while having Vampire Hunger active

-- Aurelyium Pink Crystal to Razzium Pink Crystal

-- Vazkiium Magenta Crystal to Aurelyium Magenta Crystal

-

 Fixed:

-- Pentagram should now be visible for everybody (aka people can now see the pentagram underneath you)

-- Hearts are no longer removed if in creative (so if you take damage in creative the extra hearts don't get removed)

-- Cursed Eye now follows you properly

-- Hearts now protect you from all damages (not just physical)

-- White Hearts not adding an extra heart in multiplayer

-- Some recipes being wrong in the guide

-- NEI not showing the recipes of some blocks

-- A lot of sync issues between the client and server (woohoo)

-- Smelters will now the block if you destroy them

-- The console log is a bit cleaner now

-- Displayer text being weird, displaying the same text twice
\ No newline at end of file
+- A bug where servers would crash
\ No newline at end of file
diff --git a/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java b/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java
index 1d57412..908aaf6 100644
--- a/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java
+++ b/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java
@@ -21,6 +21,8 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;

 import cpw.mods.fml.common.event.FMLServerStartingEvent;

 import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

 import darkknight.jewelrycraft.achievements.AchievementsList;

 import darkknight.jewelrycraft.block.BlockList;

 import darkknight.jewelrycraft.client.gui.GuiTab;

@@ -69,10 +71,6 @@ public class JewelrycraftMod
     public static SimpleNetworkWrapper netWrapper;

     public static boolean fancyRender = false;

     

-    //GUIDE

-    public static GuiTab prevActive = new GuiTabIntroduction(0);

-    public static int prevPage = 1;

-    

     /**

      * Pre initialization of mod stuff.

      *

diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiGuide.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiGuide.java
index b3caaf2..5f52897 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiGuide.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiGuide.java
@@ -15,6 +15,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;

 import net.minecraft.world.World;

 import org.lwjgl.opengl.GL11;

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

 import darkknight.jewelrycraft.JewelrycraftMod;

 import darkknight.jewelrycraft.block.BlockList;

 import darkknight.jewelrycraft.block.BlockShadowEye;

@@ -27,14 +29,18 @@ public class GuiGuide extends GuiContainer {
 	private final GuiTab[] tabs = new GuiTab[] { new GuiTabIntroduction(0), new GuiTabBlocks(1), new GuiTabItems(2), new GuiTabGemsAndIngots(3), new GuiTabCurses(4), new GuiTabModifiers(5), new GuiTabRitual(6) };

 	private GuiTab activeTab;

 	ResourceLocation pageTexture, flippedPageTexture;

+    

+    //GUIDE

+    public static GuiTab prevActive = new GuiTabIntroduction(0);

+    public static int prevPage = 1;

 

 	public GuiGuide(Container container, World world, ResourceLocation pageTex, ResourceLocation flipPageTex) {

 		super(container);

-		page = JewelrycraftMod.prevPage;

+		page = prevPage;

 		rot = 0;

 		del = 0;

 		this.world = world;

-		activeTab = JewelrycraftMod.prevActive;

+		activeTab = prevActive;

 		pageTexture = pageTex;

 		flippedPageTexture = flipPageTex;

 		this.xSize = 240;

@@ -93,19 +99,19 @@ public class GuiGuide extends GuiContainer {
 	protected void mouseClicked(int x, int y, int button) {

 		if (nextHover && page + 2 <= activeTab.getMaxPages()) {

 			page += 2;

-			JewelrycraftMod.prevPage = page;

+			prevPage = page;

 		}

 		else if (prevHover && page > 1) {

 			page -= 2;

-			JewelrycraftMod.prevPage = page;

+			prevPage = page;

 		}

 		activeTab.mouseClick(this, x, y, button);

 		for (GuiTab tab : tabs)

 			if (activeTab != tab) if (tab.inRect(this, x, y)) {

 				activeTab = tab;

-				JewelrycraftMod.prevActive = tab;

+				prevActive = tab;

 				page = 1;

-				JewelrycraftMod.prevPage = page;

+				prevPage = page;

 				break;

 			}

 	}

diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java
index 8258cfc..3ef224a 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java
@@ -3,80 +3,32 @@ package darkknight.jewelrycraft.client.gui;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-@SideOnly (Side.CLIENT)
-public abstract class GuiTab extends GuiRectangle
-{
-    protected int values;
-    protected int del;
-    
-    /**
-     * @param name
-     * @param id
-     */
-    public GuiTab(int id)
-    {
-        super(-62, 10 + 19 * id, 19, 18);
-        values = 0;
-        del = 0;
-    }
-    
-    /**
-     * @return
-     */
-    public String getName()
-    {
-        return "";
-    }
-    
-    /**
-     * @param gui
-     * @param x
-     * @param y
-     * @param page
-     */
-    public abstract void drawBackground(GuiGuide gui, int x, int y, int page);
-    
-    /**
-     * @param gui
-     * @param x
-     * @param y
-     * @param page
-     */
-    public abstract void drawForeground(GuiGuide gui, int x, int y, int page);
-    
-    /**
-     * @param gui
-     * @param x
-     * @param y
-     * @param button
-     */
-    public void mouseClick(GuiGuide gui, int x, int y, int button)
-    {}
-    
-    /**
-     * @param gui
-     * @param x
-     * @param y
-     * @param button
-     * @param timeSinceClicked
-     */
-    public void mouseMoveClick(GuiGuide gui, int x, int y, int button, long timeSinceClicked)
-    {}
-    
-    /**
-     * @param gui
-     * @param x
-     * @param y
-     * @param button
-     */
-    public void mouseReleased(GuiGuide gui, int x, int y, int button)
-    {}
-    
-    /**
-     * @return
-     */
-    public int getMaxPages()
-    {
-        return 1;
-    }
+@SideOnly(Side.CLIENT)
+public abstract class GuiTab extends GuiRectangle {
+	protected int values;
+	protected int del;
+
+	public GuiTab(int id) {
+		super(-62, 10 + 19 * id, 19, 18);
+		values = 0;
+		del = 0;
+	}
+
+	public String getName() {
+		return "";
+	}
+
+	public abstract void drawBackground(GuiGuide gui, int x, int y, int page);
+
+	public abstract void drawForeground(GuiGuide gui, int x, int y, int page);
+
+	public void mouseClick(GuiGuide gui, int x, int y, int button) {}
+
+	public void mouseMoveClick(GuiGuide gui, int x, int y, int button, long timeSinceClicked) {}
+
+	public void mouseReleased(GuiGuide gui, int x, int y, int button) {}
+
+	public int getMaxPages() {
+		return 1;
+	}
 }
diff --git a/src/main/java/darkknight/jewelrycraft/util/Variables.java b/src/main/java/darkknight/jewelrycraft/util/Variables.java
index 016bd54..fa48bcf 100644
--- a/src/main/java/darkknight/jewelrycraft/util/Variables.java
+++ b/src/main/java/darkknight/jewelrycraft/util/Variables.java
@@ -6,7 +6,7 @@ public class Variables
 {

     public static final String MODID = "jewelrycraft2";

     public static final String MODNAME = "Jewelrycraft 2";

-    public static final String VERSION = "1.1.0";

+    public static final String VERSION = "1.1.1";

     public static final String PACKET_CHANNEL = "jewelrycraft2";

     

     public static final String CONFIG_GUI = "darkknight.jewelrycraft.config.ConfigGuiFactory";