diff --git a/build.properties b/build.properties
index 5827b5e..2641af8 100644
--- a/build.properties
+++ b/build.properties
@@ -1,3 +1,3 @@
minecraft_version=1.7.10
forge_version=10.13.1.1225
-mod_version=0.562
\ No newline at end of file
+mod_version=0.572
\ No newline at end of file
diff --git a/src/main/java/fox/spiteful/forbidden/compat/ForbiddenBotany.java b/src/main/java/fox/spiteful/forbidden/compat/ForbiddenBotany.java
index 796c79c..9dd387b 100644
--- a/src/main/java/fox/spiteful/forbidden/compat/ForbiddenBotany.java
+++ b/src/main/java/fox/spiteful/forbidden/compat/ForbiddenBotany.java
@@ -15,8 +15,10 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
+import net.minecraft.item.crafting.IRecipe;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.oredict.OreDictionary;
+import net.minecraftforge.oredict.ShapedOreRecipe;
import org.apache.logging.log4j.Level;
import thaumcraft.api.ThaumcraftApi;
import thaumcraft.api.aspects.Aspect;
@@ -39,7 +41,6 @@ public class ForbiddenBotany {
Block livingLog = GameRegistry.findBlock("Botania", "livingwood");
Item flower = Compat.getItem("Botania", "flower");
Item petal = Compat.getItem("Botania", "petal");
- Item manaPetal = Compat.getItem("Botania", "manaPetal");
Block dreamwood = GameRegistry.findBlock("Botania", "dreamwood");
Item lexicon = Compat.getItem("Botania", "lexicon");
@@ -85,6 +86,10 @@ public class ForbiddenBotany {
InfusionRecipe elementium_cap = ThaumcraftApi.addInfusionCraftingRecipe("CAP_elementium", new ItemStack(ForbiddenItems.wandCap, 1, 5), 1, (new AspectList()).add(Aspect.EARTH, 18).add(Aspect.FIRE, 18).add(Aspect.WATER, 18).add(Aspect.AIR, 18), new ItemStack(ForbiddenItems.wandCap, 1, 6), new ItemStack[]{new ItemStack(resource, 1, 5), new ItemStack(rune, 1, 0), new ItemStack(rune, 1, 1), new ItemStack(rune, 1, 2), new ItemStack(rune, 1, 3)});
(new DarkResearchItem("CAP_elementium", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.FIRE, 8).add(Aspect.MAGIC, 12).add(Aspect.WATER, 8).add(Aspect.AIR, 8).add(Aspect.EARTH, 8), 3, 3, 4, new ItemStack(ForbiddenItems.wandCap, 1, 5))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_elementium.1"), new ResearchPage(elementium_cap_inert), new ResearchPage(elementium_cap)}).setParents(new String[]{"ROD_dreamwood_staff"}).setConcealed().registerResearchItem();
+ IRecipe terrasteel_cap = new ShapedOreRecipe(new ItemStack(ForbiddenItems.wandCap, 1, 2), new Object[]{"NNN", "N N", Character.valueOf('N'), "nuggetTerrasteel"});
+ CraftingManager.getInstance().getRecipeList().add(terrasteel_cap);
+ (new DarkResearchItem("CAP_terrasteel", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.ENERGY, 1).add(Aspect.METAL, 1), 3, 2, 1, new ItemStack(ForbiddenItems.wandCap, 1, 2))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_terrasteel.1"), new ResearchPage(terrasteel_cap)}).setParents(new String[]{"CAP_manasteel"}).setConcealed().setSecondary().registerResearchItem();
+
}
BotaniaAPI.registerSubTile("euclidaisy", SubTileEuclidaisy.class);
@@ -98,7 +103,7 @@ public class ForbiddenBotany {
ItemStack euclidaisy = getFlower("euclidaisy");
SubTileEuclidaisy.lexicon.setIcon(euclidaisy);
- InfusionRecipe euclid = ThaumcraftApi.addInfusionCraftingRecipe("EUCLIDAISY", euclidaisy, 8, (new AspectList()).add(Aspect.AURA, 8).add(Aspect.ELDRITCH, 10).add(Aspect.MAGIC, 8), new ItemStack(flower, 1, 6), new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(resource, 1, 1), new ItemStack(resource, 1, 6), new ItemStack(manaPetal, 1, 6), new ItemStack(manaPetal, 1, 6), new ItemStack(rune, 1, 12), new ItemStack(rune, 1, 11) });
+ InfusionRecipe euclid = ThaumcraftApi.addInfusionCraftingRecipe("EUCLIDAISY", euclidaisy, 8, (new AspectList()).add(Aspect.AURA, 8).add(Aspect.ELDRITCH, 10).add(Aspect.MAGIC, 8), new ItemStack(flower, 1, 6), new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(resource, 1, 1), new ItemStack(resource, 1, 6), new ItemStack(petal, 1, 6), new ItemStack(petal, 1, 6), new ItemStack(rune, 1, 12), new ItemStack(rune, 1, 11) });
(new DarkResearchItem("EUCLIDAISY", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.PLANT, 8).add(Aspect.MAGIC, 4).add(Aspect.AURA, 12), -3, 5, 2, euclidaisy)).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.EUCLIDAISY.1"), new ResearchPage(euclid) }).setParents(new String[] { "BOTANY", "INFUSION" }).setConcealed().registerResearchItem();
BotaniaAPI.registerSubTile("whisperweed", SubTileWhisperweed.class);
@@ -112,7 +117,7 @@ public class ForbiddenBotany {
ItemStack whisperweed = getFlower("whisperweed");
SubTileWhisperweed.lexicon.setIcon(whisperweed);
- IArcaneRecipe whispercraft = ThaumcraftApi.addShapelessArcaneCraftingRecipe("WHISPERWEED", whisperweed, (new AspectList()).add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.EARTH, 10).add(Aspect.AIR, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10), new ItemStack[] { new ItemStack(Blocks.tallgrass, 1, 1), new ItemStack(resource, 1, 2), new ItemStack(resource, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 9), new ItemStack(manaPetal, 1, 7), new ItemStack(manaPetal, 1, 10), new ItemStack(rune, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 6) });
+ IArcaneRecipe whispercraft = ThaumcraftApi.addShapelessArcaneCraftingRecipe("WHISPERWEED", whisperweed, (new AspectList()).add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.EARTH, 10).add(Aspect.AIR, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10), new ItemStack[] { new ItemStack(Blocks.tallgrass, 1, 1), new ItemStack(resource, 1, 2), new ItemStack(resource, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 9), new ItemStack(petal, 1, 7), new ItemStack(petal, 1, 10), new ItemStack(rune, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 6) });
(new DarkResearchItem("WHISPERWEED", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.PLANT, 8).add(Aspect.MIND, 10).add(Aspect.SENSES, 4), -4, 5, 1, whisperweed)).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.WHISPERWEED.1"), new ResearchPage(whispercraft) }).setParents(new String[] { "BOTANY" }).setConcealed().registerResearchItem();
BotaniaAPI.registerSubTile("tainthistle", SubTileTainthistle.class);
@@ -126,7 +131,7 @@ public class ForbiddenBotany {
ItemStack tainthistle = getFlower("tainthistle");
SubTileTainthistle.lexicon.setIcon(tainthistle);
- InfusionRecipe thistlecraft = ThaumcraftApi.addInfusionCraftingRecipe("TAINTHISTLE", tainthistle, 4, (new AspectList()).add(Aspect.TAINT, 8).add(Aspect.HUNGER, 4).add(Aspect.AIR, 4).add(Aspect.WATER, 4), new ItemStack(ConfigItems.itemResource, 1, 12), new ItemStack[] { new ItemStack(petal, 1, 10), new ItemStack(manaPetal, 1, 10), new ItemStack(manaPetal, 1, 10), new ItemStack(rune, 1, 10), new ItemStack(rune, 1, 8)});
+ InfusionRecipe thistlecraft = ThaumcraftApi.addInfusionCraftingRecipe("TAINTHISTLE", tainthistle, 4, (new AspectList()).add(Aspect.TAINT, 8).add(Aspect.HUNGER, 4).add(Aspect.AIR, 4).add(Aspect.WATER, 4), new ItemStack(ConfigItems.itemResource, 1, 12), new ItemStack[] { new ItemStack(petal, 1, 10), new ItemStack(petal, 1, 10), new ItemStack(petal, 1, 10), new ItemStack(rune, 1, 10), new ItemStack(rune, 1, 8)});
(new DarkResearchItem("TAINTHISTLE", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.PLANT, 8).add(Aspect.TAINT, 10).add(Aspect.MAGIC, 4), -2, 5, 2, tainthistle)).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.TAINTHISTLE.1"), new ResearchPage(thistlecraft) }).setParents(new String[] { "BOTANY", "INFUSION" }).setConcealed().registerResearchItem();
if(Compat.bm){
@@ -137,7 +142,7 @@ public class ForbiddenBotany {
SubTileBloodthorn.lexicon = new ForbiddenLexicon("bloodthorn", BotaniaAPI.categoryFunctionalFlowers){
@Override
public String getSubtitle(){
- return "[Forbidden Magic][Blood Magic]";
+ return "[Forbidden Magic x Blood Magic x Botania]";
}
};
diff --git a/src/main/java/fox/spiteful/forbidden/compat/ForbiddenLexicon.java b/src/main/java/fox/spiteful/forbidden/compat/ForbiddenLexicon.java
index 575bdf9..6f53fec 100644
--- a/src/main/java/fox/spiteful/forbidden/compat/ForbiddenLexicon.java
+++ b/src/main/java/fox/spiteful/forbidden/compat/ForbiddenLexicon.java
@@ -15,7 +15,7 @@ public class ForbiddenLexicon extends LexiconEntry implements IAddonEntry {
@Override
public String getSubtitle(){
- return "[Forbidden Magic]";
+ return "[Forbidden Magic x Botania]";
}
@Override
diff --git a/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java b/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java
index ae6addf..ca62235 100644
--- a/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java
+++ b/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java
@@ -74,6 +74,7 @@ public class ForbiddenItems {
public static WandCap WAND_CAP_VINTEUM;
public static WandCap WAND_CAP_MANASTEEL;
public static WandCap WAND_CAP_ELEMENTIUM;
+ public static WandCap WAND_CAP_TERRASTEEL;
public static void addItems() {
deadlyShards = new ItemDeadlyShard().setUnlocalizedName("NetherShard");
@@ -142,6 +143,7 @@ public class ForbiddenItems {
WAND_CAP_VINTEUM = new DarkWandCap("vinteum", 0.9F, new ItemStack(wandCap, 1, 1), 6, new ResourceLocation("forbidden", "textures/models/wand_cap_vinteum.png"));
WAND_CAP_MANASTEEL = new DarkWandCap("manasteel", 0.9F, new ItemStack(wandCap, 1, 3), 6, new ResourceLocation("forbidden", "textures/models/wand_cap_manasteel.png"));
WAND_CAP_ELEMENTIUM = new DarkWandCap("elementium", 0.8F, new ItemStack(wandCap, 1, 5), 9, new ResourceLocation("forbidden", "textures/models/wand_cap_elementium.png"));
+ WAND_CAP_TERRASTEEL = new DarkWandCap("terrasteel", 1.8F, new ItemStack(wandCap, 1, 5), 1, new ResourceLocation("forbidden", "textures/models/wand_cap_terrasteel.png"));
resource = new ItemResource().setUnlocalizedName("FMResource");
diff --git a/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphPickaxe.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphPickaxe.java
index a386be0..d1341ad 100644
--- a/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphPickaxe.java
+++ b/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphPickaxe.java
@@ -162,7 +162,7 @@ public class ItemMorphPickaxe extends ItemPickaxe implements IRepairable, IWarpi
@Override
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase player) {
if(EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.impact.effectId, stack) <= 0)
- return true;
+ return super.onBlockDestroyed(stack, world, block, x, y, z, player);
if(!player.worldObj.isRemote) {
int meta = world.getBlockMetadata(x, y, z);
if(ForgeHooks.isToolEffective(stack, block, meta)) {
@@ -197,7 +197,7 @@ public class ItemMorphPickaxe extends ItemPickaxe implements IRepairable, IWarpi
return super.onBlockDestroyed(stack, world, block, x, y, z, player);
}
- return true;
+ return super.onBlockDestroyed(stack, world, block, x, y, z, player);
}
}
diff --git a/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphShovel.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphShovel.java
index 306b866..562c290 100644
--- a/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphShovel.java
+++ b/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphShovel.java
@@ -156,7 +156,7 @@ public class ItemMorphShovel extends ItemSpade implements IRepairable, IWarpingG
@Override
public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase player) {
if(EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.impact.effectId, stack) <= 0)
- return true;
+ return super.onBlockDestroyed(stack, world, block, x, y, z, player);
if(!player.worldObj.isRemote) {
int meta = world.getBlockMetadata(x, y, z);
if(ForgeHooks.isToolEffective(stack, block, meta)) {
@@ -191,7 +191,7 @@ public class ItemMorphShovel extends ItemSpade implements IRepairable, IWarpingG
return super.onBlockDestroyed(stack, world, block, x, y, z, player);
}
- return true;
+ return super.onBlockDestroyed(stack, world, block, x, y, z, player);
}
}
diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCaps.java b/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCaps.java
index 2e42591..f1dfeba 100644
--- a/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCaps.java
+++ b/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCaps.java
@@ -17,7 +17,7 @@ public class ItemWandCaps extends Item {
public final String[] types = {
"alchemical",
"vinteum",
- "soul",
+ "terrasteel",
"manasteel",
"manasteel_inert",
"elementium",
diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java b/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java
index 2220a64..f2fe05b 100644
--- a/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java
+++ b/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java
@@ -123,6 +123,10 @@ public class ItemWandCores extends Item {
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("elementium"));
((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("dreamwood_staff"));
list.add(wand);
+ wand = new ItemStack(ConfigItems.itemWandCasting, 1, 1);
+ ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("terrasteel"));
+ ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("wood"));
+ list.add(wand);
}
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 84);
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("void"));
diff --git a/src/main/resources/assets/forbidden/lang/en_US.lang b/src/main/resources/assets/forbidden/lang/en_US.lang
index 768e80c..fe16b78 100644
--- a/src/main/resources/assets/forbidden/lang/en_US.lang
+++ b/src/main/resources/assets/forbidden/lang/en_US.lang
@@ -65,6 +65,7 @@ item.Wand.alchemical.cap=Alchemically Crowned
item.Wand.vinteum.cap=Vinteum Bossed
item.Wand.manasteel.cap=Manasteel Entwined
item.Wand.elementium.cap=Elementium Kissed
+item.Wand.terrasteel.cap=Terrasteel Nerfed
item.WandCores.tainted.name=Tainted Rod
item.WandCores.infernal.name=Infernal Rod
item.WandCores.soul.name=Eldritch Rod
@@ -86,6 +87,7 @@ item.WandCaps.manasteel.name=Manasteel Cap
item.WandCaps.manasteel_inert.name=Inert Manasteel Cap
item.WandCaps.elementium.name=Elementium Cap
item.WandCaps.elementium_inert.name=Inert Elementium Cap
+item.WandCaps.terrasteel.name=Terrasteel Cap
item.BlinkFocus.name=Wand Focus: Blink
#
# Blocks
@@ -244,6 +246,10 @@ forbidden.research_name.CAP_elementium=Elementium Caps
forbidden.research_text.CAP_elementium=Eco Friendly Wand Caps
forbidden.research_page.CAP_elementium.1=Alfheim seems to be a world steeped in magical power, and Elementium is no exception. When crafted into a wand cap and treated with the right materials, Elementium Caps have an exceptional ability to channel vis. When combined with a wand or staff that uses mana, they'll also reduce the mana conversion rate.
Elementium's pretty pink color is just icing on the cake.
#
+forbidden.research_name.CAP_terrasteel=Terrasteel Caps
+forbidden.research_text.CAP_terrasteel=Completion!
+forbidden.research_page.CAP_terrasteel.1=Sweet Baby Haruhi, this was a terrible idea. What were you thinking?
Terrasteel's oversaturation of mana gives it many of the qualities of the earth it's named after: Strength, durability, density, and... extreme resistance to energy. Terrasteel's sheer inability to channel vis causes most vis to just dissipate harmlessly against it instead of being focused out of the wand.
Apparently just making caps out of every material under the sun isn't a great idea.
+#
forbidden.research_name.TRANSEMERALD=Emerald Transmutation
forbidden.research_text.TRANSEMERALD=Transformation of valuables into emerald
forbidden.research_page.TRANSEMERALD.1=You have discovered a way to multiply emeralds by steeping emerald fragments in lucrum harvested from other substances.
diff --git a/src/main/resources/assets/forbidden/textures/items/wand_cap_soul.png b/src/main/resources/assets/forbidden/textures/items/wand_cap_soul.png
deleted file mode 100644
index a9ea1f5..0000000
Binary files a/src/main/resources/assets/forbidden/textures/items/wand_cap_soul.png and /dev/null differ
diff --git a/src/main/resources/assets/forbidden/textures/items/wand_cap_soul.png.mcmeta b/src/main/resources/assets/forbidden/textures/items/wand_cap_soul.png.mcmeta
deleted file mode 100644
index ce40017..0000000
--- a/src/main/resources/assets/forbidden/textures/items/wand_cap_soul.png.mcmeta
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "animation": {
- "frametime": 3,
- "frames": [
- 0,
- 1,
- 2,
- 1
- ]
- }
-}
diff --git a/src/main/resources/assets/forbidden/textures/items/wand_cap_terrasteel.png b/src/main/resources/assets/forbidden/textures/items/wand_cap_terrasteel.png
new file mode 100644
index 0000000..dcf6ba9
Binary files /dev/null and b/src/main/resources/assets/forbidden/textures/items/wand_cap_terrasteel.png differ
diff --git a/src/main/resources/assets/forbidden/textures/models/wand_cap_soul.png b/src/main/resources/assets/forbidden/textures/models/wand_cap_soul.png
deleted file mode 100644
index b2be6f3..0000000
Binary files a/src/main/resources/assets/forbidden/textures/models/wand_cap_soul.png and /dev/null differ
diff --git a/src/main/resources/assets/forbidden/textures/models/wand_cap_terrasteel.png b/src/main/resources/assets/forbidden/textures/models/wand_cap_terrasteel.png
new file mode 100644
index 0000000..14d4855
Binary files /dev/null and b/src/main/resources/assets/forbidden/textures/models/wand_cap_terrasteel.png differ