Merge branch 'dev-world-scripts' of https://github.com/Grasscutters/Grasscutter into development

src/main/java/emu/grasscutter/data/excels/GatherData.java

@@ -0,0 +1,49 @@
+package emu.grasscutter.data.def;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+
+@ResourceType(name = "GatherExcelConfigData.json")
+public class GatherData extends GameResource {
+	private int PointType;
+	private int Id;
+	private int GadgetId;
+	private int ItemId;
+	private int Cd; // Probably hours
+	private boolean IsForbidGuest;
+	private boolean InitDisableInteract;
+	    
+	@Override
+	public int getId() {
+		return this.PointType;
+	}
+
+	public int getGatherId() {
+		return Id;
+	}
+
+	public int getGadgetId() {
+		return GadgetId;
+	}
+
+	public int getItemId() {
+		return ItemId;
+	}
+
+	public int getCd() {
+		return Cd;
+	}
+
+	public boolean isForbidGuest() {
+		return IsForbidGuest;
+	}
+
+	public boolean initDisableInteract() {
+		return InitDisableInteract;
+	}
+
+	@Override
+	public void onLoad() {
+
+	}
+}

src/main/java/emu/grasscutter/data/excels/InvestigationMonsterData.java

@@ -0,0 +1,29 @@
+package emu.grasscutter.data.def;
+
+import emu.grasscutter.data.GameResource;
+import emu.grasscutter.data.ResourceType;
+import lombok.Data;
+
+import java.util.List;
+
+@ResourceType(name = "InvestigationMonsterConfigData.json")
+@Data
+public class InvestigationMonsterData extends GameResource {
+    private int Id;
+    private int CityId;
+    private List<Integer> MonsterIdList;
+    private List<Integer> GroupIdList;
+    private int RewardPreviewId;
+    private String MapMarkCreateType;
+    private String MonsterCategory;
+
+    @Override
+    public int getId() {
+        return this.Id;
+    }
+
+    @Override
+    public void onLoad() {
+        super.onLoad();
+    }
+}