sigonasr2/TwosideKeeper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Linked items now show up in Discord chat.

Browse Source
This commit is contained in:
sigonasr2 2016-06-18 18:55:40 -05:00
parent 82cbf67562
commit e03eee1035
3 changed files with 109 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TwosideKeeper.jar
View File

Binary file not shown.

103
src/sig/plugin/TwosideKeeper/HelperStructures/WorldShop.java
View File

@ -98,7 +98,16 @@ public class WorldShop {
item.getType().toString().contains("CHESTPLATE") || item.getType().toString().contains("CHESTPLATE") ||
item.getType().toString().contains("LEGGINGS") || item.getType().toString().contains("LEGGINGS") ||
item.getType().toString().contains("BOOTS") || item.getType().toString().contains("BOOTS") ||
item.getType().toString().contains("SHIELD")) { item.getType().toString().contains("SHIELD") ||
item.getType().toString().contains("BOW") ||
item.getType().toString().contains("SWORD") ||
item.getType().toString().contains("AXE") ||
item.getType().toString().contains("HOE") ||
item.getType().toString().contains("SPADE") ||
item.getType().toString().contains("CARROT_STICK") ||
item.getType().toString().contains("ELYTRA") ||
item.getType().toString().contains("FISHING_ROD") ||
item.getType().toString().contains("FLINT_AND_STEEL")) {
//Display the durability for these items. //Display the durability for these items.
int maxdura = 0; int maxdura = 0;
switch (item.getType()) { switch (item.getType()) {
@ -163,7 +172,97 @@ public class WorldShop {
maxdura = 430; maxdura = 430;
}break; }break;
case SHIELD:{ case SHIELD:{
maxdura = 430; maxdura = 337;
}break;
case BOW:{
maxdura = 385;
}break;
case WOOD_SWORD:{
maxdura = 60;
}break;
case STONE_SWORD:{
maxdura = 132;
}break;
case IRON_SWORD:{
maxdura = 251;
}break;
case DIAMOND_SWORD:{
maxdura = 1562;
}break;
case GOLD_SWORD:{
maxdura = 33;
}break;
case WOOD_PICKAXE:{
maxdura = 60;
}break;
case STONE_PICKAXE:{
maxdura = 132;
}break;
case IRON_PICKAXE:{
maxdura = 251;
}break;
case DIAMOND_PICKAXE:{
maxdura = 1562;
}break;
case GOLD_PICKAXE:{
maxdura = 33;
}break;
case WOOD_AXE:{
maxdura = 60;
}break;
case STONE_AXE:{
maxdura = 132;
}break;
case IRON_AXE:{
maxdura = 251;
}break;
case DIAMOND_AXE:{
maxdura = 1562;
}break;
case GOLD_AXE:{
maxdura = 33;
}break;
case WOOD_HOE:{
maxdura = 60;
}break;
case STONE_HOE:{
maxdura = 132;
}break;
case IRON_HOE:{
maxdura = 251;
}break;
case DIAMOND_HOE:{
maxdura = 1562;
}break;
case GOLD_HOE:{
maxdura = 33;
}break;
case WOOD_SPADE:{
maxdura = 60;
}break;
case STONE_SPADE:{
maxdura = 132;
}break;
case IRON_SPADE:{
maxdura = 251;
}break;
case DIAMOND_SPADE:{
maxdura = 1562;
}break;
case GOLD_SPADE:{
maxdura = 33;
}break;
case FISHING_ROD:{
maxdura = 65;
}break;
case FLINT_AND_STEEL:{
maxdura = 65;
}break;
case CARROT_STICK:{
maxdura = 26;
}break;
case ELYTRA:{
maxdura = 432;
}break; }break;
} }
message+="\n\n"+ChatColor.GRAY+"Durability: "+(maxdura-item.getDurability()-1)+"/"+(maxdura-1); message+="\n\n"+ChatColor.GRAY+"Durability: "+(maxdura-item.getDurability()-1)+"/"+(maxdura-1);

9
src/sig/plugin/TwosideKeeper/TwosideKeeper.java
View File

@ -111,6 +111,7 @@ import org.bukkit.util.Vector;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.common.collect.Iterators; import com.google.common.collect.Iterators;
import aPlugin.DiscordMessageSender;
import net.minecraft.server.v1_9_R1.Vector3f; import net.minecraft.server.v1_9_R1.Vector3f;
import sig.plugin.TwosideKeeper.HelperStructures.ArtifactItem; import sig.plugin.TwosideKeeper.HelperStructures.ArtifactItem;
import sig.plugin.TwosideKeeper.HelperStructures.CubeType; import sig.plugin.TwosideKeeper.HelperStructures.CubeType;
@ -1001,6 +1002,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
pos = ev.getMessage().indexOf("[]"); pos = ev.getMessage().indexOf("[]");
ev.setMessage(ev.getMessage().replace("[]", "")); ev.setMessage(ev.getMessage().replace("[]", ""));
log("pos is "+pos+" message is: {"+ev.getMessage()+"}",5); log("pos is "+pos+" message is: {"+ev.getMessage()+"}",5);
DiscordMessageSender.sendRawMessageDiscord("**"+ev.getPlayer().getName()+"** "+ev.getMessage().substring(0, pos)+"**["+ChatColor.stripColor(GenericFunctions.GetItemName(ev.getPlayer().getEquipment().getItemInMainHand()))+"]**"+"\n```"+WorldShop.GetItemInfo(ev.getPlayer().getEquipment().getItemInMainHand())+"```\n"+ev.getMessage().substring(pos));
Bukkit.dispatchCommand(Bukkit.getConsoleSender(),"tellraw @a [\"\",{\"text\":\"<"+ev.getPlayer().getName()+"> \"},{\"text\":\""+ev.getMessage().substring(0, pos)+"\"},{\"text\":\""+ChatColor.GREEN+"["+ChatColor.stripColor(GenericFunctions.GetItemName(ev.getPlayer().getEquipment().getItemInMainHand()))+ChatColor.GREEN+"]"+ChatColor.WHITE+"\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":\""+GenericFunctions.GetItemName(ev.getPlayer().getEquipment().getItemInMainHand())+"\n"+WorldShop.GetItemInfo(ev.getPlayer().getEquipment().getItemInMainHand()).replace("\"", "\\\"")+"\"}},{\"text\":\""+ev.getMessage().substring(pos)+"\"}]"); Bukkit.dispatchCommand(Bukkit.getConsoleSender(),"tellraw @a [\"\",{\"text\":\"<"+ev.getPlayer().getName()+"> \"},{\"text\":\""+ev.getMessage().substring(0, pos)+"\"},{\"text\":\""+ChatColor.GREEN+"["+ChatColor.stripColor(GenericFunctions.GetItemName(ev.getPlayer().getEquipment().getItemInMainHand()))+ChatColor.GREEN+"]"+ChatColor.WHITE+"\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":\""+GenericFunctions.GetItemName(ev.getPlayer().getEquipment().getItemInMainHand())+"\n"+WorldShop.GetItemInfo(ev.getPlayer().getEquipment().getItemInMainHand()).replace("\"", "\\\"")+"\"}},{\"text\":\""+ev.getMessage().substring(pos)+"\"}]");
ev.setCancelled(true); ev.setCancelled(true);
} }
@ -1148,6 +1150,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
size=27; size=27;
} }
ev.getPlayer().openInventory(Bukkit.getServer().createInventory(ev.getPlayer(), size, "Item Cube #"+itemcube_id)); ev.getPlayer().openInventory(Bukkit.getServer().createInventory(ev.getPlayer(), size, "Item Cube #"+itemcube_id));
ev.getPlayer().playSound(ev.getPlayer().getLocation(), Sound.BLOCK_CHEST_OPEN, 1.0f, 1.0f);
} }
} }
if (b!=null && (b.getType() == Material.SIGN || if (b!=null && (b.getType() == Material.SIGN ||
@ -1627,7 +1630,11 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
if (p.getFoodLevel()<ev.getFoodLevel()) { if (p.getFoodLevel()<ev.getFoodLevel()) {
//If we are eating food, restore health. //If we are eating food, restore health.
if (p.getHealth()<p.getMaxHealth()) { if (p.getHealth()<p.getMaxHealth()) {
p.setHealth(p.getHealth()+FOOD_HEAL_AMT); if (p.getHealth()+FOOD_HEAL_AMT>p.getMaxHealth()) {
p.setHealth(p.getMaxHealth());
} else {
p.setHealth(p.getHealth()+FOOD_HEAL_AMT);
}
} }
p.setSaturation(p.getSaturation()*2); p.setSaturation(p.getSaturation()*2);
} }