diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 0e977b7..992979b 100644 Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ diff --git a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java index d36dda2..59af2d5 100644 --- a/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java +++ b/src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java @@ -5773,7 +5773,7 @@ public class GenericFunctions { boolean found=false; ItemContainer currentItem = items.get(i); boolean matchesAll=true; - String displayName = GenericFunctions.UserFriendlyMaterialName(currentItem.getItem()); + String displayName = GenericFunctions.UserFriendlyMaterialName(currentItem.getItem())+(TwosideKeeperAPI.isSetItem(currentItem.getItem())?" (T"+TwosideKeeperAPI.getItemTier(currentItem.getItem())+")":"")+(currentItem.getAmount()>1?ChatColor.YELLOW+" x"+currentItem.getAmount():""); for (String s : filters) { if (!displayName.toLowerCase().contains(s.toLowerCase())) { //TwosideKeeper.log("Cannot find "+s+" in "+displayName, 1); diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java index 10357a9..d8841dc 100644 --- a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java +++ b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java @@ -1386,7 +1386,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener { /*MonsterTemplate newtemp = new MonsterTemplate(new File(filesave+"/monsterdata/KingSlime.md")); int newint = (int)newtemp.getValue("timeToLive"); log(Integer.toString(newint),0);*/ - log(" lolol. This is here to change the file size if necessary Kappa Kappa Kappa No Copy-pasterino Kappachino Lulu c: Please update version number. lololol cy@ storm is boosted. This is nice.",5); + log(" lolol. This is here to change the file size if necessary Kappa Kappa Kappa No Copy-pasterino Kappachino Lulu c: Please update version number. lololol cy@ storm is boosted. This is nice. Hey look! It's my favorite streamer! The one and only >>Legendary<<, yes LEGENDARY Captain_Marrow aka Storm! We break ultimate plates, alchemize Artifacts, miss skillshots, break Master Swords, collect food because we cannot dodge the Ganon, deny our combat-buddies from keeping their legendary equipment, jump off boats right before they leave ( cy@ VoHiYo ), craft expensive male costumes when every guildie's a female xD, and make new daddy memes for his Dad! Come join the fun! Kappa",5); } private static void InitializeBotCommands() { @@ -1428,20 +1428,25 @@ public class TwosideKeeper extends JavaPlugin implements Listener { },"roll"); aPlugin.API.addCommand(args->{ List recyclingCenterItems = populateRecyclingCenterItems(); - if (args.length==0) { + if (args.length==1) { //Get a master list of all Recycling Center items. - aPlugin.API.discordSendRaw("'''\n"+ + aPlugin.API.discordSendRaw("```\n"+ GenericFunctions.generateItemList( GenericFunctions.getItemList(recyclingCenterItems) - )+"\n'''" + )+"\n```" ); } else { //Try to use the search phrase given. - aPlugin.API.discordSendRaw("'''\n"+ + String[] newargs = new String[args.length-1]; + for (int i=1;i