From 2d8e077e086ba25104bd8540cc36d00f19c70494 Mon Sep 17 00:00:00 2001 From: John Yorke Date: Tue, 15 Nov 2016 21:36:01 -0400 Subject: [PATCH] Cleanup / bug fixes --- src/main/java/taintedmagic/common/items/tools/ItemKatana.java | 2 +- .../java/taintedmagic/common/registry/ResearchRegistry.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/taintedmagic/common/items/tools/ItemKatana.java b/src/main/java/taintedmagic/common/items/tools/ItemKatana.java index 77ee04d..dfb4631 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemKatana.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemKatana.java @@ -247,7 +247,7 @@ public class ItemKatana extends Item implements IWarpingGear, IRepairable } p.swingItem(); } - p.worldObj.playSoundAtEntity(p, ("thaumcraft:swing"), 0.5F + (float) Math.random(), 0.5F + (float) Math.random()); + p.worldObj.playSoundAtEntity(p, "thaumcraft:swing", 0.5F + (float) Math.random(), 0.5F + (float) Math.random()); } else if (hasAnyInscription(s) && isFullyCharged(p) && !p.isSneaking()) { diff --git a/src/main/java/taintedmagic/common/registry/ResearchRegistry.java b/src/main/java/taintedmagic/common/registry/ResearchRegistry.java index e346aaf..6581513 100644 --- a/src/main/java/taintedmagic/common/registry/ResearchRegistry.java +++ b/src/main/java/taintedmagic/common/registry/ResearchRegistry.java @@ -182,7 +182,7 @@ public class ResearchRegistry new ResearchPage((InfusionRecipe) recipes.get("ItemVoidwalkerBoots")) }).registerResearchItem(); ThaumcraftApi.addWarpToResearch("VOIDWALKERBOOTS", 3); - new TaintedMagicResearchItem("CREATIONSHARD", TM, TaintedMagicHelper.getPrimals(16), 8, -5, 0, new ItemStack(ItemRegistry.ItemMaterial, 1, 5)).setConcealed().setParents(new String[]{ "TMELDRITCHMAJOR" }).setPages(new ResearchPage[]{ + new TaintedMagicResearchItem("CREATIONSHARD", TM, TaintedMagicHelper.getPrimals(16), 8, -5, 0, new ItemStack(ItemRegistry.ItemMaterial, 1, 5)).setConcealed().setParents("TMELDRITCHMAJOR").setParentsHidden("PRIMPEARL").setPages(new ResearchPage[]{ new ResearchPage("1"), new ResearchPage((InfusionRecipe) recipes.get("ItemMaterial:5")) }).setSecondary().registerResearchItem(); ThaumcraftApi.addWarpToResearch("CREATIONSHARD", 5);