Added a new structure, a new curse, achievements, challenges, curses

entry in the guide; reworked liquids to be tile entities, cleaned the
structures code, potion code and... you know what? I improved and
changed so much stuff that I literally forgot what I did...

27 files changed, 25 insertions, 9 deletions

diff --git a/src/main/resources/assets/jewelrycraft2/lang/en_US.lang b/src/main/resources/assets/jewelrycraft2/lang/en_US.lang
index ec05cce..c45d28c 100644
--- a/src/main/resources/assets/jewelrycraft2/lang/en_US.lang
+++ b/src/main/resources/assets/jewelrycraft2/lang/en_US.lang
@@ -16,10 +16,11 @@ item.jewelrycraft2.bracelet.name=Bracelet
 item.jewelrycraft2.earrings.name=Earrings

 item.jewelrycraft2.guide.name=Jewelrycraft 2 Guide

 item.jewelrycraft2.bucket.name=Bucket of Molten

+item.jewelrycraft2.test.name=Chuck TestTa

 

-item.jewelrycraft2.jewelryModifier.name=Jewelry Modifier (Creative Only)

+item.jewelrycraft2.jewelryModifier.name=Jewelry Modifier

 item.jewelrycraft2.goldObject.name=Golden Object

-item.jewelrycraft2.structureGen.name=Structure Generator (Creative Only)

+item.jewelrycraft2.structureGen.name=Structure Generator

 

 item.jewelrycraft2.goldObject.info.standard=Shiny, but useless :(

 item.jewelrycraft2.goldObject.info.food=It's made of solid gold! How are you suppose to eat this?

@@ -52,11 +53,11 @@ tile.jewelrycraft2.blockCrystal.5.name=Jadium Purple Crystal
 tile.jewelrycraft2.blockCrystal.6.name=Ecutruinium Cyan Crystal

 tile.jewelrycraft2.blockCrystal.7.name=Fiskium Light Gray Crystal

 tile.jewelrycraft2.blockCrystal.8.name=Pigmented Gray Crystal

-tile.jewelrycraft2.blockCrystal.9.name=Aureylium Pink Crystal

+tile.jewelrycraft2.blockCrystal.9.name=Razzium Pink Crystal

 tile.jewelrycraft2.blockCrystal.10.name=Soarynum Lime Crystal

 tile.jewelrycraft2.blockCrystal.11.name=Blorphium Yellow Crystal

 tile.jewelrycraft2.blockCrystal.12.name=Direium Light Blue Crystal

-tile.jewelrycraft2.blockCrystal.13.name=Vazkiium Magenta Crystal

+tile.jewelrycraft2.blockCrystal.13.name=Aureylium Magenta Crystal

 tile.jewelrycraft2.blockCrystal.14.name=Sipsium Orange Crystal

 tile.jewelrycraft2.blockCrystal.15.name=Pahium White Crystal

 

@@ -107,6 +108,11 @@ chatmessage.jewelrycraft2.endereye.1=You sense some
 chatmessage.jewelrycraft2.endereye.2=around you.

 chatmessage.jewelrycraft2.feather=The necklace protected you from taking damage!

 

+chatmessage.jewelrycraft2.heartKilled.Red=GG! You just killed something that was beneficial to you! MURDERER! Red hearts heal you if you collide with them >:c

+chatmessage.jewelrycraft2.heartKilled.White=GG! You just killed something that was beneficial to you! MURDERER! If you collect 2 halves by colliding with them you would've gained an extra heart >:c

+chatmessage.jewelrycraft2.heartKilled.Blue=GG! You just killed something that was beneficial to you! MURDERER! Blue hearts protect your red hearts, just collide with them, not kill them >:c

+chatmessage.jewelrycraft2.heartKilled.Black=GG! You just killed something that was beneficial to you! MURDERER! Black hearts are just like blue ones, but they also deal damage to the attacker >:c 

+

 curse.jewelrycraft2.blind.description=You see the light slowly fading in front of you

 curse.jewelrycraft2.flamingsoul.description=Is it me or is it getting hot in here?

 curse.jewelrycraft2.greed.description=You might need that later

@@ -133,7 +139,7 @@ curse.jewelrycraft2.activated=You got cursed, press C to open the tab to see the
 

 death.attack.weak=%1$s was weakened by a piece of jewelry and died

 death.attack.shadows=%1$s was consumed by the shadows

-death.attack.blackHeart=%1$s was killed by %2$s's curse

+death.attack.blackHeart=%1$s was killed by a nearby player's curse

 

 entity.jewelrycraft2.Heart.name=Heart

 entity.jewelrycraft2.HalfHeart.name=Half-Heart

@@ -152,9 +158,8 @@ jeweler.jewelrycraft2.ingotchest=Ingot Chest
 jeweler.jewelrycraft2.orechest=Ores Chest

 

 guide.jewelrycraft2.tab.introduction=Introduction

-guide.jewelrycraft2.tab.introduction.1=Welcome to Jewelrycraft 2! This mod is about making jewelry that you can modify to your own will. To find out how to create a jewelry, please consult the book and look at the Smelter block. To add modifiers to it you need to perform a ritual. To see how to do that, look at the Cursed Eye

-guide.jewelrycraft2.tab.introduction.2=block in this guide. Please be aware that even if you can add anything as a modifier and can have multiple modifiers on one jewelry, this mod is still in alpha and does not have that many modifiers implemented and currently don't have any different effects depending on

-guide.jewelrycraft2.tab.introduction.3=the gem used. To see what modifiers are currently implemented, just look in the Modifiers tab located in this guide (it is the one with the blaze powder as an icon). This mod was made by OnyxDarkKnight and the help of domi1819, pau101, Damien Hazard, boni and MineMarteen.

+guide.jewelrycraft2.tab.introduction.1=Welcome to Jewelrycraft 2! This mod is about making jewelry that you can modify to your own will. To find out how to create a jewelry, please consult the book and look at the Smelter block. To add modifiers to it you need to perform a ritual. To see how to do that, look at the Cursed Eye block in this guide. Please be aware that even if you can add anything as a modifier and can have multiple modifiers on one jewelry, this mod does not have that many modifiers implemented and

+guide.jewelrycraft2.tab.introduction.2=currently don't have any different effects depending on the gem used. To see what modifiers are currently implemented, just look in the Modifiers tab located in this guide (it is the one with the blaze powder as an icon). This mod was made by OnyxDarkKnight and the help of domi1819, pau101, Damien Hazard, boni and MineMarteen.

 

 guide.jewelrycraft2.tab.blocks=Blocks

 guide.jewelrycraft2.tab.misc=Gems, Ores and Ingots

@@ -162,5 +167,13 @@ guide.jewelrycraft2.tab.items=Items
 guide.jewelrycraft2.tab.modifiers=Modifiers

 guide.jewelrycraft2.tab.oretoingot=Ores to Ingots

 guide.jewelrycraft2.tab.ritual=Ritual

+guide.jewelrycraft2.tab.curses=Curses

+

+bucket.unknown=Bucket of Unknown Content

+

+achievement.jewelrycraft.openGuide=A Whole New Woooorld

+achievement.jewelrycraft.openGuide.desc=Open the Jewelrycraft 2 Guide

+achievement.jewelrycraft.pentagram=Resist Temptation

+achievement.jewelrycraft.pentagram.desc=§4Challenge:§7 Do not steal health from entities for a day when Pentagram curse is active. §aReward:§7 You permanently steal 1 extra heart from all entities when the curse is active.

 

-bucket.unknown=Bucket of Unknown Content
\ No newline at end of file
+challenge.failed=You failed the challenge:
\ No newline at end of file
diff --git a/src/main/resources/assets/jewelrycraft2/sounds.json b/src/main/resources/assets/jewelrycraft2/sounds.json
new file mode 100644
index 0000000..ec9ff11
--- /dev/null
+++ b/src/main/resources/assets/jewelrycraft2/sounds.json
@@ -0,0 +1,3 @@
+{

+	"Ritual": {"category": "master","sounds": [{"name": "Ritual","stream": false}]}

+}
\ No newline at end of file
diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/guidePage.png b/src/main/resources/assets/jewelrycraft2/textures/gui/guidePage.png
index 7387be5..f715b17 100644
--- a/src/main/resources/assets/jewelrycraft2/textures/gui/guidePage.png
+++ b/src/main/resources/assets/jewelrycraft2/textures/gui/guidePage.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/guidePageFlip.png b/src/main/resources/assets/jewelrycraft2/textures/gui/guidePageFlip.png
index 92f2705..7d7845d 100644
--- a/src/main/resources/assets/jewelrycraft2/textures/gui/guidePageFlip.png
+++ b/src/main/resources/assets/jewelrycraft2/textures/gui/guidePageFlip.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/hearts.png b/src/main/resources/assets/jewelrycraft2/textures/gui/hearts.png
index 4238307..e9dc99d 100644
--- a/src/main/resources/assets/jewelrycraft2/textures/gui/hearts.png
+++ b/src/main/resources/assets/jewelrycraft2/textures/gui/hearts.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/jewelrycraft2_curses_0.png b/src/main/resources/assets/jewelrycraft2/textures/gui/jewelrycraft2_curses_0.png
index 27a9592..ad4f35a 100644
--- a/src/main/resources/assets/jewelrycraft2/textures/gui/jewelrycraft2_curses_0.png
+++ b/src/main/resources/assets/jewelrycraft2/textures/gui/jewelrycraft2_curses_0.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/guide.png b/src/main/resources/assets/jewelrycraft2/textures/items/guide.png
index c015875..8d6eb02 100644
--- a/src/main/resources/assets/jewelrycraft2/textures/items/guide.png
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/guide.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_0.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_0.png
new file mode 100644
index 0000000..b697488
--- /dev/null
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_0.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_1.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_1.png
new file mode 100644
index 0000000..e685e40
--- /dev/null
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_1.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_10.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_10.png
new file mode 100644
index 0000000..8a2cc52
--- /dev/null
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_10.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_11.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_11.png
new file mode 100644
index 0000000..91a2869
--- /dev/null
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_11.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_12.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_12.png
new file mode 100644
index 0000000..6e2360c
--- /dev/null
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_12.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_2.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_2.png
new file mode 100644
index 0000000..32a0cfb
--- /dev/null
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_2.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_3.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_3.png
new file mode 100644
index 0000000..75141a5
--- /dev/null
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_3.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_4.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_4.png
new file mode 100644
index 0000000..ee2a582
--- /dev/null
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_4.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_5.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_5.png
new file mode 100644
index 0000000..c011c21
--- /dev/null
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_5.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_6.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_6.png
new file mode 100644
index 0000000..5c145ff
--- /dev/null
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_6.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_7.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_7.png
new file mode 100644
index 0000000..833e7d6
--- /dev/null
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_7.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_8.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_8.png
new file mode 100644
index 0000000..d3bc0af
--- /dev/null
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_8.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_9.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_9.png
new file mode 100644
index 0000000..1b3193f
--- /dev/null
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_9.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_axe.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_axe.png
index d17f67a..d17f67a 100644
--- a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_axe.png
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_axe.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_boots.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_boots.png
index 9c88a3b..9c88a3b 100644
--- a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_boots.png
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_boots.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_chestplate.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_chestplate.png
index 9d4a336..9d4a336 100644
--- a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_chestplate.png
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_chestplate.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_helmet.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_helmet.png
index 97e1541..97e1541 100644
--- a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_helmet.png
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_helmet.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_hoe.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_hoe.png
index 5e0df11..5e0df11 100644
--- a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_hoe.png
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_hoe.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_leggings.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_leggings.png
index 65f5117..65f5117 100644
--- a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_leggings.png
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_leggings.png
diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_pickaxe.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_pickaxe.png
index 95c5394..95c5394 100644
--- a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_pickaxe.png
+++ b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_pickaxe.png