summaryrefslogtreecommitdiff
path: root/src/main/java/darkknight/jewelrycraft/curses
diff options
context:
space:
mode:
authorOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-05-05 22:07:10 +0100
committerOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-05-05 22:07:10 +0100
commit208b1f1e0d5faf601b53818b04f6699b2e6cb6bc (patch)
tree56c059b812f1917b582e65e7ef15faa70a429f0b /src/main/java/darkknight/jewelrycraft/curses
parent80417b99e10a462fd72b8f8fcd3b226c862534e4 (diff)
- Working on a GUI showing what curses you get with a description on them
- Added a search bar in the Liquids Tab for easier searching - Fixed an issue with golden objects giving errors due to missing default texture - Improved the Infamy Mask to have less parts, thus causing less lag - Improved ingots and ore detection - Fixed certain ores when smelted outputting a different ingot - Necklaces and Rings now render as well - Updated the guide at the Guide item to have the proper link to the mod as well as mention the right people who helped with it - Added a list of the ores that work in the guide - Added a new tab to the guide regarding the ores and the ingots they create - Changed the stun effect caused by rings with feathers as modifiers to be a potion effect instead
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/curses')
-rw-r--r--src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java5
-rw-r--r--src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java11
-rw-r--r--src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java5
3 files changed, 21 insertions, 0 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java b/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java
index 21007a7..4ced57a 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java
@@ -50,4 +50,9 @@ public class CurseHumbleBundle extends Curse
entityitem.motionY = 0.11000000298023224D;
world.spawnEntityInWorld(entityitem);
}
+
+ public String getDescription()
+ {
+ return "Get two for the price of one";
+ }
}
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
index 8597c6b..e2a41f0 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
@@ -10,6 +10,9 @@ import net.minecraft.world.World;
import net.minecraftforge.client.event.RenderPlayerEvent;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.event.FMLInterModComms;
+import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import darkknight.jewelrycraft.api.Curse;
@@ -25,6 +28,14 @@ public class CursePentagram extends Curse
}
@Override
+ public void action(World world, EntityPlayer player)
+ {
+// FMLInterModComms.sendMessage(modId, key, value);
+// GameRegistry.findItem("Botania", "flower");
+// FMLInterModComms.fetchRuntimeMessages(forMod)
+ }
+
+ @Override
public void attackedByPlayerAction(World world, EntityPlayer player, Entity target)
{}
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java b/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java
index 08b5a65..18b676a 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java
@@ -23,4 +23,9 @@ public class CurseVampireHunger extends Curse
{
if(player.shouldHeal() && rand.nextInt(5) == 0) player.heal(1F);
}
+
+ public String getDescription()
+ {
+ return "You feel the need for blood";
+ }
}