Merge pull request #54 from 1whohears/dev

Some Extra Soul Stone Options
This commit is contained in:
Luis C.M authored and GitHub committed 2022-06-09 02:35:22 -05:00
commit b64ee1c93a
14 files changed
+177 -36

No files matched your search

@@ -1,21 +1,29 @@
package noppes.npcs.scripted.entity;
import java.util.ArrayList;
import java.util.UUID;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.CustomNpcs;
import noppes.npcs.NoppesUtilServer;
import noppes.npcs.constants.*;
import noppes.npcs.constants.EnumAnimation;
import noppes.npcs.constants.EnumJobType;
import noppes.npcs.constants.EnumNavType;
import noppes.npcs.constants.EnumRoleType;
import noppes.npcs.constants.EnumStandingType;
import noppes.npcs.controllers.data.Line;
import noppes.npcs.entity.EntityCustomNpc;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.scripted.NpcAPI;
import noppes.npcs.scripted.ScriptFaction;
import noppes.npcs.scripted.constants.AnimationType;
import noppes.npcs.scripted.constants.EntityType;
import noppes.npcs.scripted.interfaces.ITimers;
import noppes.npcs.scripted.interfaces.entity.ICustomNpc;
import noppes.npcs.scripted.interfaces.entity.IEntityLivingBase;
import noppes.npcs.scripted.interfaces.entity.IPlayer;
import noppes.npcs.scripted.interfaces.handler.IOverlayHandler;
import noppes.npcs.scripted.interfaces.item.IItemStack;
import noppes.npcs.scripted.constants.AnimationType;
import noppes.npcs.scripted.constants.EntityType;
import noppes.npcs.scripted.interfaces.entity.ICustomNpc;
import noppes.npcs.scripted.interfaces.ITimers;
import noppes.npcs.scripted.roles.ScriptJobBard;
import noppes.npcs.scripted.roles.ScriptJobConversation;
import noppes.npcs.scripted.roles.ScriptJobFollower;
@@ -31,12 +39,8 @@ import noppes.npcs.scripted.roles.ScriptRoleInterface;
import noppes.npcs.scripted.roles.ScriptRoleMailman;
import noppes.npcs.scripted.roles.ScriptRoleTrader;
import noppes.npcs.scripted.roles.ScriptRoleTransporter;
import noppes.npcs.scripted.NpcAPI;
import noppes.npcs.util.ValueUtil;
import java.util.ArrayList;
import java.util.UUID;
public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> implements ICustomNpc {
public EntityNPCInterface npc;
@@ -862,6 +866,34 @@ public class ScriptNpc<T extends EntityNPCInterface> extends ScriptLiving<T> imp
npc.stats.canDespawn = canDespawn;
npc.stats.playerSetCanDespawn = canDespawn;
}
public boolean spawnedFromSoulStone() {
return !npc.advanced.soulStonePlayerName.equals("");
}
public String getSoulStonePlayerName() {
return npc.advanced.soulStonePlayerName;
}
public boolean getRefuseSoulStone() {
return npc.advanced.refuseSoulStone;
}
public void setRefuseSoulStone(boolean refuse) {
npc.advanced.refuseSoulStone = refuse;
}
public boolean isSoulStoneInit() {
return npc.advanced.soulStoneInit;
}
public int getMinPointsToSoulStone() {
return npc.advanced.minFactionPointsToSoulStone;
}
public void setMinPointsToSoulStone(int points) {
npc.advanced.minFactionPointsToSoulStone = points;
}
public void giveItem(IPlayer player, IItemStack item){
npc.givePlayerItem((EntityPlayer) player.getMCEntity(), item.getMCItemStack());
@@ -277,6 +277,40 @@ public class ScriptPlayer<T extends EntityPlayerMP> extends ScriptLivingBase<T>
chat.setChatStyle(style);
player.addChatMessage(chat);
}
public void sendMessage(String message, String color, boolean bold, boolean italic, boolean underlined) {
EnumChatFormatting c = getColor(color);
if (c == null) return;
sendMessage(message, c, bold, italic, underlined);
}
public void sendMessage(String message, String color, boolean bold, boolean italic, boolean obfuscated, boolean strikethrough, boolean underlined) {
EnumChatFormatting c = getColor(color);
if (c == null) return;
sendMessage(message, c, bold, italic, obfuscated, strikethrough, underlined);
}
private EnumChatFormatting getColor(String color) {
switch (color) {
case "black": return EnumChatFormatting.BLACK;
case "dark_blue": return EnumChatFormatting.DARK_BLUE;
case "dark_green": return EnumChatFormatting.DARK_GREEN;
case "dark_aqua": return EnumChatFormatting.DARK_AQUA;
case "dark_red": return EnumChatFormatting.DARK_RED;
case "dark_purple": return EnumChatFormatting.DARK_PURPLE;
case "gold": return EnumChatFormatting.GOLD;
case "gray": return EnumChatFormatting.GRAY;
case "dark_gray": return EnumChatFormatting.DARK_GRAY;
case "blue": return EnumChatFormatting.BLUE;
case "green": return EnumChatFormatting.GREEN;
case "aqua": return EnumChatFormatting.AQUA;
case "red": return EnumChatFormatting.RED;
case "light_purple": return EnumChatFormatting.LIGHT_PURPLE;
case "yellow": return EnumChatFormatting.YELLOW;
case "white": return EnumChatFormatting.WHITE;
default: return null;
}
}
/**
* @return Return gamemode. 0: Survival, 1: Creative, 2: Adventure
@@ -7,11 +7,11 @@ package noppes.npcs.scripted.interfaces.entity;
import net.minecraft.entity.EntityCreature;
import noppes.npcs.scripted.ScriptFaction;
import noppes.npcs.scripted.interfaces.ISkinOverlay;
import noppes.npcs.scripted.interfaces.ITimers;
import noppes.npcs.scripted.interfaces.handler.IOverlayHandler;
import noppes.npcs.scripted.interfaces.item.IItemStack;
import noppes.npcs.scripted.interfaces.ITimers;
import noppes.npcs.scripted.roles.*;
import noppes.npcs.scripted.roles.ScriptJobInterface;
import noppes.npcs.scripted.roles.ScriptRoleInterface;
public interface ICustomNpc<T extends EntityCreature> extends IEntityLiving<T> {
/**
@@ -623,7 +623,48 @@ public interface ICustomNpc<T extends EntityCreature> extends IEntityLiving<T> {
* @param canDespawn True if the NPC should naturally despawn. False otherwise.
*/
void setNaturallyDespawns(boolean canDespawn);
/**
* @return true if this npc was spawned by a player using soulstone
*/
boolean spawnedFromSoulStone();
/**
* @return the name of the player who spawned this npc using soulstone. null if not spawned by soulstone
*/
String getSoulStonePlayerName();
/**
* @return true if npc was spawned by soul stone. becomes false after the init function is called.
*/
boolean isSoulStoneInit();
/**
* @return does this npc refuse to be taken by soul stone
*/
boolean getRefuseSoulStone();
/**
* @param refuse set if this npc refuses to be taken by soul stone
*/
void setRefuseSoulStone(boolean refuse);
/**
* requires SoulStoneFriendlyNPCs in config to be true
* -1 by default
* if -1, the minimum points are the faction's friendly points
* @return the minimum faction points needed to soulstone this npc
*/
int getMinPointsToSoulStone();
/**
* requires SoulStoneFriendlyNPCs in config to be true
* -1 by default
* if -1, the minimum points are the faction's friendly points
* @param points the minimum faction points needed to soulstone this npc
*/
void setMinPointsToSoulStone(int points);
/**
* @param player The player to give the item to
* @param item The item given to the player
@@ -99,6 +99,10 @@ public interface IPlayer<T extends EntityPlayerMP> extends IEntityLivingBase<T>
void sendMessage(String message, EnumChatFormatting color, boolean bold, boolean italic, boolean underlined);
void sendMessage(String message, EnumChatFormatting color, boolean bold, boolean italic, boolean obfuscated, boolean strikethrough, boolean underlined);
void sendMessage(String message, String color, boolean bold, boolean italic, boolean underlined);
void sendMessage(String message, String color, boolean bold, boolean italic, boolean obfuscated, boolean strikethrough, boolean underlined);
/**
* @return Return gamemode. 0: Survival, 1: Creative, 2: Adventure
@@ -1,13 +1,12 @@
package noppes.npcs.scripted.roles;
import foxz.utils.Market;
import net.minecraft.entity.player.EntityPlayer;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.roles.RoleTrader;
import noppes.npcs.scripted.NpcAPI;
import noppes.npcs.scripted.interfaces.item.IItemStack;
import noppes.npcs.scripted.constants.RoleType;
import noppes.npcs.scripted.interfaces.entity.IPlayer;
import noppes.npcs.scripted.interfaces.item.IItemStack;
public class ScriptRoleTrader extends ScriptRoleInterface{
private RoleTrader role;
@@ -56,7 +55,7 @@ public class ScriptRoleTrader extends ScriptRoleInterface{
public IItemStack getSellOption(int slot) {
if (slot >= 18 || slot < 0) return null;
if (role.inventorySold.items.get(slot) == null) return null;
return NpcAPI.Instance().getIItemStack(role.inventoryCurrency.items.get(slot));
return NpcAPI.Instance().getIItemStack(role.inventorySold.items.get(slot));
}
/**
@@ -160,7 +159,7 @@ public class ScriptRoleTrader extends ScriptRoleInterface{
*/
public boolean isSlotEnabled(int slot, IPlayer player) {
if(slot >= 18 || slot < 0) return false;
return role.isSlotEnabled(slot, (EntityPlayer)player.getMCEntity());
return role.isSlotEnabled(slot, player.getDisplayName());
}
/**