Merge branch 'development' into api

.github/ISSUE_TEMPLATE/a_issue_report.md

+---
+name: Issues
+about: Create an issue if you need any help
+title: '[Issue] '
+labels: 'help wanted, question'
+assignees: ''
+
+---
+**Did you look for other closed issues that have the same problem?**
+<!--- It will be easier for us to solve your problem if there is less duplication of problems -->
+
+**Describe the issue**
+<!--- A clear and concise description of what the issue is. -->
+
+**Which branch did you use?**
+<!--- Stable branch / Development branch -->
+
+**Screenshots**
+<!--- If applicable, add screenshots to help explain your problem. -->
+
+**Additional context**
+<!--- Add any other context about the problem here. -->
+

.github/ISSUE_TEMPLATE/b_bug_report.md

+---
+name: Bug report
+about: Create a bug report to help us improve Grasscutter
+title: '[Bug] '
+labels: 'bug'
+assignees: ''
+
+---
+<!--- ONLY USE this form for bug reporting. If you need help or support, please USE issue report form instead. -->
+
+**Describe the bug**
+<!--- A clear and concise description of what the bug is. -->
+
+**Which branch did you use?**
+<!--- Stable branch / Development branch -->
+
+**Screenshots**
+<!--- If applicable, add screenshots to help explain your problem. -->
+
+**Additional context**
+<!--- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/c_feature_request.md

+---
+name: Feature request
+about: Suggest an idea for Grasscutter
+title: '[Feature Request] '
+labels: 'enhancement, suggestion'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+<!--- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the solution you'd like**
+<!--- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+<!--- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+<!--- Add any other context or screenshots about the feature request here. -->

.github/ISSUE_TEMPLATE/config.yml

+blank_issues_enabled: false
+contact_links:
+  - name: Grasscutter Discord
+    url: https://discord.gg/T5vZU6UyeG
+    about: For support, discuss and and other things with Grasscutter.
+ 
\ No newline at end of file

.github/PULL_REQUEST_TEMPLATE.md

+## Description
+
+Please carefully read the [Contributing note](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md) and [Code of conduct](https://github.com/Grasscutters/Grasscutter/blob/development/CODE_OF_CONDUCT.md) before making any pull requests.
+And, **Do not make a pull request to merge into stable unless it is a hotfix. Use the development branch instead.**
+## Issues fixed by this PR
+
+<!--- Put the links of issues that may be fixed by this PR here (if any). -->
+## Type of changes
+
+<!--- Put an `x` in all the boxes that apply your changes. -->
+
+- [ ] Bug fix
+- [ ] New feature 
+- [ ] Enhancement
+- [ ] Documentation
+
+## Checklist:
+
+- [ ] My code follows the style guidelines of this project
+- [ ] My pull request is unique and no other pull requests have been opened for these changes
+- [ ] I have read the [Contributing note](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md) and [Code of conduct](https://github.com/Grasscutters/Grasscutter/blob/development/CODE_OF_CONDUCT.md)
+- [ ] I am responsible for any copyright issues with my code if it occurs in the future.
\ No newline at end of file

README.md

@@ -108,12 +108,14 @@ There is a dummy user named "Server" in every player's friends list that you can
 | -------------- | ------------------------------------------------- | ------------------------- | ------------ | ------------------------------------------------------------ | ----------------------------------------------- |
 | account        | account <create\|delete> <username> [UID]         |                           | Server only  | Creates an account with the specified username and the in-game UID for that account. The UID will be auto generated if not set. |                                                 |
 | broadcast      | broadcast <message>                               | server.broadcast          | Both side    | Sends a message to all the players.                          | b                                               |
+| coop           | coop <playerId> <target playerId>                 | server.coop               | Both side    | Forces someone to join the world of others.                  |                                                 |                                           
 | changescene    | changescene <scene id>                            | player.changescene        | Client only  | Switch scenes by scene ID.                                   | scene                                           |
 | clearartifacts | clearartifacts                                    | player.clearartifacts     | Client only  | Deletes all unequipped and unlocked level 0 artifacts, including 5-star rarity ones from your inventory. | clearart                                        |
 | clearweapons   | clearweapons                                      | player.clearweapons       | Client only  | Deletes all unequipped and unlocked weapons, including 5-star rarity ones from your inventory. | clearwpns                                       |
 | drop           | drop <itemID\|itemName> [amount]                  | server.drop               | Client only  | Drops an item around you.                                    | `d` `dropitem`                                  |
 | give           | give [player] <itemId\|itemName> [amount] [level] | player.give               | Both side    | Gives item(s) to you or the specified player.                | `g` `item` `giveitem`                           |
-| givechar       | givechar <uid> <avatarId> [level]                 | player.givechar           | Both side    | Gives the player a specified character.                      | givec                                           |
+| givechar       | givechar <uid> <avatarId>                 | player.givechar           | Both side    | Gives the player a specified character.                      | givec                                           |
+| giveall       | giveall [uid] [amount]             | player.giveall      | Both side    | Gives all items.      | givea                                         |
 | godmode        | godmode [uid]                                     | player.godmode            | Client only  | Prevents you from taking damage.                             |                                                 |
 | heal           | heal                                              | player.heal               | Client only  | Heals all characters in your current team.                    | h                                               |
 | help           | help [command]                                    |                           | Both side    | Sends the help message or shows information about a specified command. |                                                 |
@@ -133,6 +135,7 @@ There is a dummy user named "Server" in every player's friends list that you can
 | stop           | stop                                              | server.stop               | Both side    | Stops the server                                             |                                                 |
 | talent         | talent <talentID> <value>                         | player.settalent          | Client only  | Sets talent level for your currently selected character           |                                                 |
 | teleport       | teleport <x> <y> <z>                              | player.teleport           | Client only  | Change the player's position.                                | tp                                              |
+| tpall          |                                                   | player.tpall              | Client only  | Teleports all players in your world to your position         |                                                 |
 | weather        | weather <weatherID> <climateID>                   | player.weather            | Client only  | Changes the weather                                          | w                                               |
 
 ### Bonus

README_zh-CN.md

@@ -109,12 +109,14 @@ chmod +x gradlew
 | -------------- | -------------------------------------------- | ------------------------- | -------- | ------------------------------------------ | ----------------------------------------------- |
 | account        | account <create\|delete> <用户名> [uid]      |                           | 仅服务端 | 通过指定用户名和uid增删账户                |                                                 |
 | broadcast      | broadcast <消息内容>                         | server.broadcast          | 均可使用 | 给所有玩家发送公告                         | b                                               |
+| coop           | coop <uid> <目标uid>                 | server.coop               | 均可使用    | 强制某位玩家进入指定玩家的多人世界                  |                                                 |
 | changescene    | changescene <场景ID>                         | player.changescene        | 仅客户端 | 切换到指定场景                             | scene                                           |
 | clearartifacts | clearartifacts                               | player.clearartifacts     | 仅客户端 | 删除所有未装备及未解锁的圣遗物,包括五星    | clearart                                        |
 | clearweapons   | clearweapons                                 | player.clearweapons       | 仅客户端 | 删除所有未装备及未解锁的武器,包括五星      | clearwp                                         |
 | drop           | drop <物品ID\|物品名称> [数量]               | server.drop               | 仅客户端 | 在指定玩家周围掉落指定物品                 | `d` `dropitem`                                  |
 | give           | give [uid] <物品ID\|物品名称> [数量] [等级]  |                           |          | 给予指定玩家一定数量及等级的物品           | `g` `item` `giveitem`                           |
 | givechar       | givechar <uid> <角色ID> [等级]               | player.givechar           | 均可使用 | 给予指定玩家对应角色                       | givec                                           |
+| giveall        | giveall [uid] [数量]                         | player.giveall            | 均可使用 | 给予指定玩家全部物品                       | givea                                           |
 | godmode        | godmode [uid]                                | player.godmode            | 仅客户端 | 保护你不受到任何伤害(依然会被击退)         |                                                 |
 | heal           | heal                                         | player.heal               | 仅客户端 | 治疗队伍中所有角色                         | h                                               |
 | help           | help [命令]                                  |                           | 均可使用 | 显示帮助或展示指定命令的帮助               |                                                 |
@@ -134,6 +136,7 @@ chmod +x gradlew
 | stop           | stop                                         | server.stop               | 均可使用 | 停止服务器                                 |                                                 |
 | talent         | talent <天赋ID> <等级>                       | player.settalent          | 仅客户端 | 设置当前角色的天赋等级                     |                                                 |
 | teleport       | teleport <x> <y> <z>                         | player.teleport           | 仅客户端 | 传送玩家到指定坐标                         | tp                                              |
+| tpall          |                                                   | player.tpall              | 仅客户端  | 传送多人世界中所有的玩家到自身地点         |                                                 |
 | weather        | weather <天气ID> <气候ID>                    | player.weather            | 仅客户端 | 改变天气                                   | w                                               |
 
 ### 额外功能

src/main/java/emu/grasscutter/Config.java

@@ -33,6 +33,7 @@ public final class Config {
 		public Boolean FrontHTTPS = true;
 
 		public boolean AutomaticallyCreateAccounts = false;
+		public String[] defaultPermissions = new String[] { "" };
 
 		public RegionInfo[] GameServers = {};
 
@@ -71,6 +72,10 @@ public final class Config {
 		public boolean WatchGacha = false;
 		public int[] WelcomeEmotes = {2007, 1002, 4010};
 		public String WelcomeMotd = "Welcome to Grasscutter emu";
+		public String WelcomeMailContent = "Hi there!\r\nFirst of all, welcome to Grasscutter. If you have any issues, please let us know so that Lawnmower can help you! \r\n\r\nCheck out our:\r\n<type=\"browser\" text=\"Discord\" href=\"https://discord.gg/T5vZU6UyeG\"/> <type=\"browser\" text=\"GitHub\" href=\"https://github.com/Melledy/Grasscutter\"/>";
+		public int[] WelcomeMailItems = {13509};
+
+		public boolean EnableOfficialShop = true;
 
 		public GameRates Game = new GameRates();
 

src/main/java/emu/grasscutter/command/commands/AccountCommand.java

 package emu.grasscutter.command.commands;
 
+import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.database.DatabaseHelper;
@@ -7,8 +8,7 @@ import emu.grasscutter.game.player.Player;
 
 import java.util.List;
 
-@Command(label = "account", usage = "account <create|delete> <username> [uid]",
-        description = "Modify user accounts")
+@Command(label = "account", usage = "account <create|delete> <username> [uid]", description = "Modify user accounts")
 public final class AccountCommand implements CommandHandler {
 
     @Override
@@ -46,9 +46,10 @@ public final class AccountCommand implements CommandHandler {
                     CommandHandler.sendMessage(null, "Account already exists.");
                     return;
                 } else {
-                    CommandHandler.sendMessage(null, "Account created with UID " + account.getPlayerUid() + ".");
-                    account.addPermission("*"); // Grant the player superuser permissions.
+                    account.addPermission("*");
                     account.save(); // Save account to database.
+
+                    CommandHandler.sendMessage(null, "Account created with UID " + account.getPlayerUid() + ".");
                 }
                 return;
             case "delete":

src/main/java/emu/grasscutter/command/commands/CoopCommand.java

+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.player.Player;
+
+import java.util.List;
+
+@Command(label = "coop", usage = "coop",
+        description = "Forces someone to join the world of others", permission = "server.coop")
+public class CoopCommand implements CommandHandler {
+    @Override
+    public void execute(Player sender, List<String> args) {
+        if (args.size() < 2) {
+            CommandHandler.sendMessage(sender, "Usage: coop <playerId> <target playerId>");
+            return;
+        }
+        try {
+            int tid = Integer.parseInt(args.get(0));
+            int hostId = Integer.parseInt(args.get(1));
+            Player host = sender.getServer().getPlayerByUid(hostId);
+            Player want = sender.getServer().getPlayerByUid(tid);
+            if (host == null || want == null) {
+                CommandHandler.sendMessage(sender, "Player is offline.");
+                return;
+            }
+            if (want.isInMultiplayer()) {
+                sender.getServer().getMultiplayerManager().leaveCoop(want);
+            }
+            sender.getServer().getMultiplayerManager().applyEnterMp(want, hostId);
+            sender.getServer().getMultiplayerManager().applyEnterMpReply(host, tid, true);
+        } catch (Exception e) {
+            CommandHandler.sendMessage(sender, "Player id is not valid.");
+        }
+    }
+}

src/main/java/emu/grasscutter/command/commands/GiveAllCommand.java

@@ -13,7 +13,7 @@ import emu.grasscutter.game.player.Player;
 
 import java.util.*;
 
-@Command(label = "giveall", usage = "giveall [player] <amount>",
+@Command(label = "giveall", usage = "giveall [player] [amount]",
         description = "Gives all items", aliases = {"givea"}, permission = "player.giveall", threading = true)
 public class GiveAllCommand implements CommandHandler {
 
@@ -59,7 +59,7 @@ public class GiveAllCommand implements CommandHandler {
                 break;
 
             default: // invalid
-                CommandHandler.sendMessage(null, "Usage: giveall [player] <amount>");
+                CommandHandler.sendMessage(null, "Usage: giveall [player] [amount]");
                 return;
         }
 
@@ -142,7 +142,7 @@ public class GiveAllCommand implements CommandHandler {
             }
         }
 
-        if (testItemsList.contains(itemId)) {
+       if (testItemsList.contains(itemId)) {
             return true;
         }
 
@@ -175,7 +175,6 @@ public class GiveAllCommand implements CommandHandler {
             new Range(2017, 2029),
           //  new Range(108001, 108387) //food
     };
-
     private static final Integer[] testItemsIds = new Integer[] {
             210, 211, 314, 315, 317, 1005, 1007, 1105, 1107, 1201, 1202, 2800,
             100001, 100002, 100244, 100305, 100312, 100313, 101212, 11411, 11506, 11507, 11508, 12505,

src/main/java/emu/grasscutter/command/commands/KillAllCommand.java

@@ -4,6 +4,7 @@ import emu.grasscutter.Grasscutter;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.game.entity.EntityMonster;
+import emu.grasscutter.game.entity.GameEntity;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.world.Scene;
 
@@ -53,10 +54,12 @@ public final class KillAllCommand implements CommandHandler {
                     return;
             }
 
-            mainScene.getEntities().values().stream()
+            // Separate into list to avoid concurrency issue
+            List<GameEntity> toKill = mainScene.getEntities().values().stream()
                     .filter(entity -> entity instanceof EntityMonster)
-                    .forEach(entity -> mainScene.killEntity(entity, 0));
-            CommandHandler.sendMessage(sender, "Killing all monsters in scene " + mainScene.getId());
+                    .toList();
+            toKill.stream().forEach(entity -> mainScene.killEntity(entity, 0));
+            CommandHandler.sendMessage(sender, "Killing " + toKill.size() + " monsters in scene " + mainScene.getId());
         } catch (NumberFormatException ignored) {
             CommandHandler.sendMessage(sender, "Invalid arguments.");
         }

src/main/java/emu/grasscutter/command/commands/ResetShopLimitCommand.java

+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.player.Player;
+
+import java.util.List;
+
+@Command(label = "resetshop", usage = "resetshop",
+        description = "Reset target player's shop refresh time.", permission = "server.resetshop")
+public final class ResetShopLimitCommand implements CommandHandler {
+    @Override
+    public void execute(Player sender, List<String> args) {
+        if (args.size() < 1) {
+            CommandHandler.sendMessage(sender,"Usage: /resetshop <player id>");
+            return;
+        }
+
+        int target = Integer.parseInt(args.get(0));
+        Player targetPlayer = Grasscutter.getGameServer().getPlayerByUid(target);
+        if (targetPlayer == null) {
+            CommandHandler.sendMessage(sender, "Player not found.");
+            return;
+        }
+
+        targetPlayer.getShopLimit().forEach(x -> x.setNextRefreshTime(0));
+        targetPlayer.save();
+        CommandHandler.sendMessage(sender, "Success");
+    }
+}

src/main/java/emu/grasscutter/command/commands/TpallCommand.java

+package emu.grasscutter.command.commands;
+
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.utils.Position;
+
+import java.util.List;
+
+@Command(label = "tpall", usage = "tpall",
+        description = "Teleports all players in your world to your position", permission = "player.tpall")
+public class TpallCommand implements CommandHandler {
+    @Override
+    public void execute(Player sender, List<String> args) {
+        if (sender == null) {
+            CommandHandler.sendMessage(null, "Run this command in-game.");
+            return;
+        }
+        if (!sender.getWorld().isMultiplayer()) {
+            CommandHandler.sendMessage(sender, "You only can use this command in MP mode.");
+            return;
+        }
+        for (Player gp : sender.getWorld().getPlayers()) {
+            if (gp.equals(sender))
+                continue;
+            Position pos = sender.getPos();
+
+            gp.getWorld().transferPlayerToScene(gp, sender.getSceneId(), pos);
+        }
+    }
+}

src/main/java/emu/grasscutter/data/GameData.java

@@ -61,9 +61,12 @@ public class GameData {
 	private static final Int2ObjectMap<FetterCharacterCardData> fetterCharacterCardDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<RewardData> rewardDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<WorldLevelData> worldLevelDataMap = new Int2ObjectOpenHashMap<>();
+
+	private static final Int2ObjectMap<ShopGoodsData> shopGoodsDataMap = new Int2ObjectOpenHashMap<>();
 	
 	// Cache
 	private static Map<Integer, List<Integer>> fetters = new HashMap<>();
+	private static Map<Integer, List<ShopGoodsData>> shopGoods = new HashMap<>();
 	
 	public static Int2ObjectMap<?> getMapByResourceDef(Class<?> resourceDefinition) {
 		Int2ObjectMap<?> map = null;
@@ -265,4 +268,18 @@ public class GameData {
 	public static Int2ObjectMap<WorldLevelData> getWorldLevelDataMap() {
 		return worldLevelDataMap;
 	}
+
+  public static char EJWOA = 's';
+  
+	public static Map<Integer, List<ShopGoodsData>> getShopGoodsDataEntries() {
+		if (shopGoods.isEmpty()) {
+			shopGoodsDataMap.forEach((k, v) -> {
+				if (!shopGoods.containsKey(v.getShopType()))
+					shopGoods.put(v.getShopType(), new ArrayList<>());
+				shopGoods.get(v.getShopType()).add(v);
+			});
+		}
+
+		return shopGoods;
+	}
 }

src/main/java/emu/grasscutter/data/common/ItemParamData.java

@@ -3,6 +3,12 @@ package emu.grasscutter.data.common;
 public class ItemParamData {
 	private int Id;
     private int Count;
+
+    public ItemParamData() {}
+	public ItemParamData(int id, int count) {
+    	this.Id = id;
+    	this.Count = count;
+	}
     
 	public int getId() {
 		return Id;

src/main/java/emu/grasscutter/data/def/GadgetData.java

@@ -8,14 +8,15 @@ public class GadgetData extends GameResource {
 	private int Id;
 	
 	private String Type;
-    private String JsonName;
-    private boolean IsInteractive;
-    private String[] Tags;
-    private String ItemJsonName;
-    private String InteeIconName;
-    private long NameTextMapHash;
-    private int CampID;
-	    
+	private String JsonName;
+	private boolean IsInteractive;
+	private String[] Tags;
+	private String ItemJsonName;
+	private String InteeIconName;
+	private long NameTextMapHash;
+	private int CampID;
+	private String LODPatternName;
+
 	@Override
 	public int getId() {
 		return this.Id;
@@ -53,6 +54,8 @@ public class GadgetData extends GameResource {
 		return CampID;
 	}
 
+	public String getLODPatternName() { return LODPatternName; }
+
 	@Override
 	public void onLoad() {
 

src/main/java/emu/grasscutter/data/def/ShopGoodsData.java

+package emu.grasscutter.data.def;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import emu.grasscutter.data.common.ItemParamData;
+import emu.grasscutter.game.shop.ShopInfo;
+
+import java.util.List;
+
+@ResourceType(name = "ShopGoodsExcelConfigData.json")
+public class ShopGoodsData extends GameResource {
+    private int GoodsId;
+    private int ShopType;
+    private int ItemId;
+
+    private int ItemCount;
+
+    private int CostScoin;
+    private int CostHcoin;
+    private int CostMcoin;
+
+    private List<ItemParamData> CostItems;
+    private int MinPlayerLevel;
+    private int MaxPlayerLevel;
+
+    private int BuyLimit;
+    private int SubTabId;
+
+    private String RefreshType;
+    private transient ShopInfo.ShopRefreshType RefreshTypeEnum;
+    
+    private int RefreshParam;
+
+    @Override
+    public void onLoad() {
+       if (this.RefreshType == null)
+           this.RefreshTypeEnum = ShopInfo.ShopRefreshType.NONE;
+       else {
+           this.RefreshTypeEnum = switch (this.RefreshType) {
+               case "SHOP_REFRESH_DAILY" -> ShopInfo.ShopRefreshType.SHOP_REFRESH_DAILY;
+               case "SHOP_REFRESH_WEEKLY" -> ShopInfo.ShopRefreshType.SHOP_REFRESH_WEEKLY;
+               case "SHOP_REFRESH_MONTHLY" -> ShopInfo.ShopRefreshType.SHOP_REFRESH_MONTHLY;
+               default -> ShopInfo.ShopRefreshType.NONE;
+           };
+       }
+    }
+
+    @Override
+    public int getId() {
+        return getGoodsId();
+    }
+
+    public int getGoodsId() {
+        return GoodsId;
+    }
+
+    public int getShopType() {
+        return ShopType;
+    }
+
+    public int getItemId() {
+        return ItemId;
+    }
+
+    public int getItemCount() {
+        return ItemCount;
+    }
+
+    public int getCostScoin() {
+        return CostScoin;
+    }
+
+    public int getCostHcoin() {
+        return CostHcoin;
+    }
+
+    public int getCostMcoin() {
+        return CostMcoin;
+    }
+
+    public List<ItemParamData> getCostItems() {
+        return CostItems;
+    }
+
+    public int getMinPlayerLevel() {
+        return MinPlayerLevel;
+    }
+
+    public int getMaxPlayerLevel() {
+        return MaxPlayerLevel;
+    }
+
+    public int getBuyLimit() {
+        return BuyLimit;
+    }
+
+    public int getSubTabId() {
+        return SubTabId;
+    }
+
+    public ShopInfo.ShopRefreshType getRefreshType() {
+        return RefreshTypeEnum;
+    }
+
+    public int getRefreshParam() {
+        return RefreshParam;
+    }
+}

src/main/java/emu/grasscutter/database/DatabaseHelper.java

@@ -180,4 +180,6 @@ public final class DatabaseHelper {
 				Filters.eq("friendId", friendship.getOwnerId())
 		)).first();
 	}
+
+	public static char AWJVN = 'e';
 }