lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Move some of the ritual chat lines to action bar

Browse source
This commit is contained in:
Nicholas Ignoffo 2017-03-08 18:00:36 -08:00
parent 0940c9ea92
commit 7c8e9b6d8d
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java
View file

@ -18,6 +18,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.world.Explosion;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.Optional;
@ -83,7 +84,7 @@ public class BlockRitualController extends BlockEnum<EnumRitualController> imple
}
} else
{
ChatUtil.sendNoSpamUnloc(player, "chat.bloodmagic.ritual.notValid");
player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.ritual.notValid"), true);
}
}
} else if (state.getValue(getProperty()) == EnumRitualController.IMPERFECT && tile instanceof TileImperfectRitualStone)

4
src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java
View file

@ -18,6 +18,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.*;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -586,7 +588,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider
Ritual ritual = RitualRegistry.getRitualForId(key);
if (ritual != null)
{
ChatUtil.sendNoSpam(player, TextHelper.localize(tooltipBase + "currentRitual") + TextHelper.localize(ritual.getUnlocalizedName()));
player.sendStatusMessage(new TextComponentTranslation(ritual.getUnlocalizedName()), true);
}
}

10
src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java
View file

@ -93,7 +93,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS
if (currentRitual != null)
{
NBTTagCompound ritualTag = tag.getCompoundTag(Constants.NBT.CURRENT_RITUAL_TAG);
if (ritualTag != null)
if (!ritualTag.hasNoTags())
{
currentRitual.readFromNBT(ritualTag);
}
@ -159,7 +159,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS
if (!isRedstoned() && network.getCurrentEssence() < ritual.getActivationCost() && !activator.capabilities.isCreativeMode)
{
ChatUtil.sendNoSpamUnloc(activator, "chat.bloodmagic.ritual.weak");
activator.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.ritual.weak"), true);
return false;
}
@ -170,7 +170,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS
if (MinecraftForge.EVENT_BUS.post(event) || event.getResult() == Event.Result.DENY)
{
ChatUtil.sendNoSpamUnloc(activator, "chat.bloodmagic.ritual.prevent");
activator.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.ritual.prevent"), true);
return false;
}
@ -179,7 +179,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS
if (!isRedstoned() && !activator.capabilities.isCreativeMode)
network.syphon(ritual.getActivationCost());
ChatUtil.sendNoSpamUnloc(activator, "chat.bloodmagic.ritual.activate");
activator.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.ritual.activate"), true);
this.active = true;
this.owner = crystalOwner;
@ -197,7 +197,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS
}
} else
{
ChatUtil.sendNoSpamUnloc(activator, "chat.bloodmagic.ritual.notValid");
activator.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic.ritual.notValid"), true);
}
return false;