diff --git a/src/main/java/taintedmagic/common/items/tools/ItemKatana.java b/src/main/java/taintedmagic/common/items/tools/ItemKatana.java index 2276e20..855c093 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemKatana.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemKatana.java @@ -39,6 +39,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import taintedmagic.client.handler.DashboardHud; import taintedmagic.client.model.ModelKatana; import taintedmagic.client.model.ModelSaya; import taintedmagic.common.TaintedMagic; @@ -273,7 +274,7 @@ public class ItemKatana extends Item implements IWarpingGear, IRepairable { float fract = ticksEquipped / time; float a = fract; - if (b || ticksEquipped != 0) { + if ((b || ticksEquipped != 0) && (!TaintedMagic.isDashboardActive || DashboardHud.beginKatanaCharge())) { float tickFract = Math.min((float) p.getItemInUseDuration() / 30.0F, 1.0F); int x = r.getScaledWidth() / 2 + 725; @@ -329,6 +330,7 @@ public class ItemKatana extends Item implements IWarpingGear, IRepairable { GL11.glDisable(GL11.GL_BLEND); GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glPopMatrix(); + if (TaintedMagic.isDashboardActive) DashboardHud.endRender(); } } diff --git a/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java b/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java index 42ad580..32ff05d 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java @@ -23,6 +23,7 @@ import org.lwjgl.opengl.GL12; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import taintedmagic.client.handler.DashboardHud; import taintedmagic.common.TaintedMagic; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -172,7 +173,8 @@ public class ItemThaumicDisassembler extends Item { ItemStack s = mc.thePlayer.getCurrentEquippedItem(); FontRenderer f = mc.fontRenderer; - if (s != null && s.getItem() instanceof ItemThaumicDisassembler) { + if (s != null && s.getItem() instanceof ItemThaumicDisassembler + && (!TaintedMagic.isDashboardActive || DashboardHud.beginDisassemblerMode())) { String str = "\u00A78" + StatCollector.translateToLocal("text.mode") + ": " + getModeName(s) @@ -198,6 +200,7 @@ public class ItemThaumicDisassembler extends Item { GL11.glDisable(GL11.GL_BLEND); GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glPopMatrix(); + if (TaintedMagic.isDashboardActive) DashboardHud.endRender(); } } }