UPGRADE TO 1.1.0 POG

Merge `development` into `stable`

src/main/java/emu/grasscutter/server/packet/send/PacketTowerTeamSelectRsp.java

+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.TowerTeamSelectRspOuterClass.TowerTeamSelectRsp;
+
+public class PacketTowerTeamSelectRsp extends BasePacket {
+
+	public PacketTowerTeamSelectRsp() {
+		super(PacketOpcodes.TowerTeamSelectRsp);
+
+		TowerTeamSelectRsp proto = TowerTeamSelectRsp.newBuilder()
+				.build();
+		
+		this.setData(proto);
+	}
+}

src/main/java/emu/grasscutter/server/packet/send/PacketUnlockAvatarTalentRsp.java

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.avatar.GenshinAvatar;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.UnlockAvatarTalentRspOuterClass.UnlockAvatarTalentRsp;
 
-public class PacketUnlockAvatarTalentRsp extends GenshinPacket {
+public class PacketUnlockAvatarTalentRsp extends BasePacket {
 	
-	public PacketUnlockAvatarTalentRsp(GenshinAvatar avatar, int talentId) {
+	public PacketUnlockAvatarTalentRsp(Avatar avatar, int talentId) {
 		super(PacketOpcodes.UnlockAvatarTalentRsp);
 
 		UnlockAvatarTalentRsp proto = UnlockAvatarTalentRsp.newBuilder()

src/main/java/emu/grasscutter/server/packet/send/PacketUnlockNameCardNotify.java

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.UnlockNameCardNotifyOuterClass.UnlockNameCardNotify;
 
-public class PacketUnlockNameCardNotify extends GenshinPacket {
+public class PacketUnlockNameCardNotify extends BasePacket {
 	
 	public PacketUnlockNameCardNotify(int nameCard) {
 		super(PacketOpcodes.UnlockNameCardNotify);

src/main/java/emu/grasscutter/server/packet/send/PacketUpdatePlayerShowAvatarListRsp.java

+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.UpdatePlayerShowAvatarListRspOuterClass.UpdatePlayerShowAvatarListRsp;
+
+import java.util.List;
+
+public class PacketUpdatePlayerShowAvatarListRsp extends BasePacket {
+
+    public PacketUpdatePlayerShowAvatarListRsp(boolean isShowAvatar, List<Integer> avatarIds) {
+        super(PacketOpcodes.UpdatePlayerShowAvatarListRsp);
+
+        UpdatePlayerShowAvatarListRsp proto = UpdatePlayerShowAvatarListRsp.newBuilder()
+                .setIsShowAvatar(isShowAvatar)
+                .addAllShowAvatarIdList(avatarIds)
+                .setRetcode(0)
+                .build();
+
+        this.setData(proto);
+    }
+}

src/main/java/emu/grasscutter/server/packet/send/PacketUseItemRsp.java

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.inventory.GenshinItem;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.RetcodeOuterClass;
 import emu.grasscutter.net.proto.UseItemRspOuterClass.UseItemRsp;
 
-public class PacketUseItemRsp extends GenshinPacket {
+public class PacketUseItemRsp extends BasePacket {
 	
-	public PacketUseItemRsp(long targetGuid, GenshinItem useItem) {
+	public PacketUseItemRsp(long targetGuid, GameItem useItem) {
 		super(PacketOpcodes.UseItemRsp);
 		
 		UseItemRsp proto = UseItemRsp.newBuilder()
@@ -22,7 +23,7 @@ public class PacketUseItemRsp extends GenshinPacket {
 	public PacketUseItemRsp() {
 		super(PacketOpcodes.UseItemRsp);
 		
-		UseItemRsp proto = UseItemRsp.newBuilder().setRetcode(1).build();
+		UseItemRsp proto = UseItemRsp.newBuilder().setRetcode(RetcodeOuterClass.Retcode.RET_SVR_ERROR_VALUE).build();
 		
 		this.setData(proto);
 	}

src/main/java/emu/grasscutter/server/packet/send/PacketVehicleInteractRsp.java

+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.game.entity.EntityVehicle;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.entity.GameEntity;
+
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType;
+import emu.grasscutter.net.proto.VehicleInteractRspOuterClass.VehicleInteractRsp;
+import emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember;
+
+public class PacketVehicleInteractRsp extends BasePacket {
+
+	public PacketVehicleInteractRsp(Player player, int entityId, VehicleInteractType interactType) {
+		super(PacketOpcodes.VehicleInteractRsp);
+		VehicleInteractRsp.Builder proto = VehicleInteractRsp.newBuilder();
+
+		GameEntity vehicle = player.getScene().getEntityById(entityId);
+
+		if(vehicle instanceof EntityVehicle) {
+			proto.setEntityId(vehicle.getId());
+
+			VehicleMember vehicleMember = VehicleMember.newBuilder()
+					.setUid(player.getUid())
+					.setAvatarGuid(player.getTeamManager().getCurrentCharacterGuid())
+					.build();
+
+			proto.setInteractType(interactType);
+			proto.setMember(vehicleMember);
+
+			switch(interactType){
+				case VEHICLE_INTERACT_IN -> {
+					((EntityVehicle) vehicle).getVehicleMembers().add(vehicleMember);
+				}
+				case VEHICLE_INTERACT_OUT -> {
+					((EntityVehicle) vehicle).getVehicleMembers().remove(vehicleMember);
+				}
+				default -> {}
+			}
+		}
+		this.setData(proto.build());
+	}
+
+	public PacketVehicleInteractRsp(EntityVehicle vehicle, VehicleMember vehicleMember, VehicleInteractType interactType) {
+		super(PacketOpcodes.VehicleInteractRsp);
+		VehicleInteractRsp.Builder proto = VehicleInteractRsp.newBuilder();
+
+		if(vehicle != null) {
+			proto.setEntityId(vehicle.getId());
+			proto.setInteractType(interactType);
+			proto.setMember(vehicleMember);
+
+			switch(interactType){
+				case VEHICLE_INTERACT_IN -> {
+					vehicle.getVehicleMembers().add(vehicleMember);
+				}
+				case VEHICLE_INTERACT_OUT -> {
+					vehicle.getVehicleMembers().remove(vehicleMember);
+				}
+				default -> {}
+			}
+		}
+		this.setData(proto.build());
+	}
+}

src/main/java/emu/grasscutter/server/packet/send/PacketVehicleSpawnRsp.java

+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.entity.EntityVehicle;
+import emu.grasscutter.game.props.FightProperty;
+import emu.grasscutter.game.entity.GameEntity;
+
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+
+import emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember;
+import emu.grasscutter.net.proto.VehicleSpawnRspOuterClass.VehicleSpawnRsp;
+
+import emu.grasscutter.utils.Position;
+
+import java.util.List;
+
+
+import static emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.VEHICLE_INTERACT_OUT;
+
+public class PacketVehicleSpawnRsp extends BasePacket {
+
+	public PacketVehicleSpawnRsp(Player player, int vehicleId, int pointId, Position pos, Position rot) {
+		super(PacketOpcodes.VehicleSpawnRsp);
+		VehicleSpawnRsp.Builder proto = VehicleSpawnRsp.newBuilder();
+
+		// Eject vehicle members and Kill previous vehicles if there are any
+		List<GameEntity> previousVehicles = player.getScene().getEntities().values().stream()
+				.filter(entity -> entity instanceof EntityVehicle
+						&& ((EntityVehicle) entity).getGadgetId() == vehicleId
+						&& ((EntityVehicle) entity).getOwner().equals(player))
+				.toList();
+
+		previousVehicles.stream().forEach(entity -> {
+			List<VehicleMember> vehicleMembers = ((EntityVehicle) entity).getVehicleMembers().stream().toList();
+
+			vehicleMembers.stream().forEach(vehicleMember -> {
+				player.getScene().broadcastPacket(new PacketVehicleInteractRsp(((EntityVehicle) entity), vehicleMember, VEHICLE_INTERACT_OUT));
+			});
+
+			player.getScene().killEntity(entity, 0);
+		});
+
+		EntityVehicle vehicle = new EntityVehicle(player.getScene(), player, vehicleId, pointId, pos, rot);
+
+		switch (vehicleId) {
+			// TODO: Not hardcode this. Waverider (skiff)
+			case 45001001,45001002 -> {
+				vehicle.addFightProperty(FightProperty.FIGHT_PROP_BASE_HP, 10000);
+				vehicle.addFightProperty(FightProperty.FIGHT_PROP_BASE_ATTACK, 100);
+				vehicle.addFightProperty(FightProperty.FIGHT_PROP_CUR_ATTACK, 100);
+				vehicle.addFightProperty(FightProperty.FIGHT_PROP_CUR_HP, 10000);
+				vehicle.addFightProperty(FightProperty.FIGHT_PROP_CUR_DEFENSE, 0);
+				vehicle.addFightProperty(FightProperty.FIGHT_PROP_CUR_SPEED, 0);
+				vehicle.addFightProperty(FightProperty.FIGHT_PROP_CHARGE_EFFICIENCY, 0);
+				vehicle.addFightProperty(FightProperty.FIGHT_PROP_MAX_HP, 10000);
+			}
+			default -> {}
+		}
+
+		player.getScene().addEntity(vehicle);
+
+		proto.setVehicleId(vehicleId);
+		proto.setEntityId(vehicle.getId());
+
+		this.setData(proto.build());
+	}
+}

src/main/java/emu/grasscutter/server/packet/send/PacketWeaponAwakenRsp.java

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.avatar.GenshinAvatar;
-import emu.grasscutter.game.inventory.GenshinItem;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp;
 
-public class PacketWeaponAwakenRsp extends GenshinPacket {
+public class PacketWeaponAwakenRsp extends BasePacket {
 	
-	public PacketWeaponAwakenRsp(GenshinAvatar avatar, GenshinItem item, GenshinItem feedWeapon, int oldRefineLevel) {
+	public PacketWeaponAwakenRsp(Avatar avatar, GameItem item, GameItem feedWeapon, int oldRefineLevel) {
 		super(PacketOpcodes.WeaponAwakenRsp);
 
 		WeaponAwakenRsp.Builder proto = WeaponAwakenRsp.newBuilder()

src/main/java/emu/grasscutter/server/packet/send/PacketWeaponPromoteRsp.java

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.inventory.GenshinItem;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp;
 
-public class PacketWeaponPromoteRsp extends GenshinPacket {
+public class PacketWeaponPromoteRsp extends BasePacket {
 	
-	public PacketWeaponPromoteRsp(GenshinItem item, int oldPromoteLevel) {
+	public PacketWeaponPromoteRsp(GameItem item, int oldPromoteLevel) {
 		super(PacketOpcodes.WeaponPromoteRsp);
 
 		WeaponPromoteRsp proto = WeaponPromoteRsp.newBuilder()

src/main/java/emu/grasscutter/server/packet/send/PacketWeaponUpgradeRsp.java

@@ -2,15 +2,15 @@ package emu.grasscutter.server.packet.send;
 
 import java.util.List;
 
-import emu.grasscutter.game.inventory.GenshinItem;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam;
 import emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp;
 
-public class PacketWeaponUpgradeRsp extends GenshinPacket {
+public class PacketWeaponUpgradeRsp extends BasePacket {
 	
-	public PacketWeaponUpgradeRsp(GenshinItem item, int oldLevel, List<ItemParam> leftoverOres) {
+	public PacketWeaponUpgradeRsp(GameItem item, int oldLevel, List<ItemParam> leftoverOres) {
 		super(PacketOpcodes.WeaponUpgradeRsp);
 		
 		WeaponUpgradeRsp proto = WeaponUpgradeRsp.newBuilder()

src/main/java/emu/grasscutter/server/packet/send/PacketWearEquipRsp.java

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp;
 
-public class PacketWearEquipRsp extends GenshinPacket {
+public class PacketWearEquipRsp extends BasePacket {
 
 	public PacketWearEquipRsp(long avatarGuid, long equipGuid) {
 		super(PacketOpcodes.WearEquipRsp);

src/main/java/emu/grasscutter/server/packet/send/PacketWorktopOptionNotify.java

+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.WorktopOptionNotifyOuterClass.WorktopOptionNotify;
+
+public class PacketWorktopOptionNotify extends BasePacket {
+	
+	public PacketWorktopOptionNotify(EntityGadget gadget) {
+		super(PacketOpcodes.WorktopOptionNotify);
+		
+		WorktopOptionNotify.Builder proto = WorktopOptionNotify.newBuilder()
+				.setGadgetEntityId(gadget.getId());
+		
+		if (gadget.getWorktopOptions() != null) {
+			proto.addAllOptionList(gadget.getWorktopOptions());
+		}
+		
+		this.setData(proto);
+	}
+}

src/main/java/emu/grasscutter/server/packet/send/PacketWorldDataNotify.java

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.World;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.game.world.World;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.PropValueOuterClass.PropValue;
 import emu.grasscutter.net.proto.WorldDataNotifyOuterClass.WorldDataNotify;
 
-public class PacketWorldDataNotify extends GenshinPacket {
+public class PacketWorldDataNotify extends BasePacket {
 	
 	public PacketWorldDataNotify(World world) {
 		super(PacketOpcodes.WorldDataNotify);

src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerDieNotify.java

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType;
 import emu.grasscutter.net.proto.WorldPlayerDieNotifyOuterClass.WorldPlayerDieNotify;
 
-public class PacketWorldPlayerDieNotify extends GenshinPacket {
+public class PacketWorldPlayerDieNotify extends BasePacket {
 	
 	public PacketWorldPlayerDieNotify(PlayerDieType playerDieType, int killerId) {
 		super(PacketOpcodes.WorldPlayerDieNotify);

src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerInfoNotify.java

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.GenshinPlayer;
-import emu.grasscutter.game.World;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.world.World;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify;
 
-public class PacketWorldPlayerInfoNotify extends GenshinPacket {
+public class PacketWorldPlayerInfoNotify extends BasePacket {
 	
 	public PacketWorldPlayerInfoNotify(World world) {
 		super(PacketOpcodes.WorldPlayerInfoNotify);
@@ -14,7 +14,7 @@ public class PacketWorldPlayerInfoNotify extends GenshinPacket {
 		WorldPlayerInfoNotify.Builder proto = WorldPlayerInfoNotify.newBuilder();
 		
 		for (int i = 0; i < world.getPlayers().size(); i++) {
-			GenshinPlayer p = world.getPlayers().get(i);
+			Player p = world.getPlayers().get(i);
 			
 			proto.addPlayerInfoList(p.getOnlinePlayerInfo());
 			proto.addPlayerUidList(p.getUid());

src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerLocationNotify.java

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.GenshinPlayer;
-import emu.grasscutter.game.World;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.world.World;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify;
 
-public class PacketWorldPlayerLocationNotify extends GenshinPacket {
+public class PacketWorldPlayerLocationNotify extends BasePacket {
 	
 	public PacketWorldPlayerLocationNotify(World world) {
 		super(PacketOpcodes.WorldPlayerLocationNotify);
 
 		WorldPlayerLocationNotify.Builder proto = WorldPlayerLocationNotify.newBuilder();
 		
-		for (GenshinPlayer p : world.getPlayers()) {
-			proto.addPlayerLocList(p.getWorldPlayerLocationInfo());
+		for (Player p : world.getPlayers()) {
+			proto.addPlayerWorldLocList(p.getWorldPlayerLocationInfo());
 		}
 		
 		this.setData(proto);

src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerRTTNotify.java

 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.GenshinPlayer;
-import emu.grasscutter.game.World;
-import emu.grasscutter.net.packet.GenshinPacket;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.world.World;
+import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo;
 import emu.grasscutter.net.proto.WorldPlayerRTTNotifyOuterClass.WorldPlayerRTTNotify;
 
-public class PacketWorldPlayerRTTNotify extends GenshinPacket {
+public class PacketWorldPlayerRTTNotify extends BasePacket {
 	
 	public PacketWorldPlayerRTTNotify(World world) {
 		super(PacketOpcodes.WorldPlayerRTTNotify);
 		
 		WorldPlayerRTTNotify.Builder proto = WorldPlayerRTTNotify.newBuilder();
 		
-		for (GenshinPlayer player : world.getPlayers()) {
+		for (Player player : world.getPlayers()) {
 			proto.addPlayerRttList(
 					PlayerRTTInfo.newBuilder()
 							.setUid(player.getUid())

src/main/java/emu/grasscutter/server/packet/send/PacketWorldPlayerReviveRsp.java

+package emu.grasscutter.server.packet.send;
+
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.world.World;
+import emu.grasscutter.net.packet.BasePacket;
+import emu.grasscutter.net.packet.PacketOpcodes;
+import emu.grasscutter.net.proto.WorldPlayerReviveRspOuterClass.WorldPlayerReviveRsp;
+
+public class PacketWorldPlayerReviveRsp extends BasePacket {
+
+	public PacketWorldPlayerReviveRsp() {
+		super(PacketOpcodes.WorldPlayerReviveRsp);
+
+		WorldPlayerReviveRsp.Builder proto = WorldPlayerReviveRsp.newBuilder();
+		
+		this.setData(proto.build());
+	}
+}

src/main/java/emu/grasscutter/task/Task.java

+package emu.grasscutter.task;
+
+import org.quartz.JobDataMap;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+
+/*
+* So what is cron expression?
+The format of a Cron expression is as follows.
+Second Minute Hour Day Month Week Year
+Seconds: 0-59
+Minute: 0-59
+hour: 0-23
+Day: 1-31
+Month: 1-12
+Week: 1-7 (0-6 sometimes)
+Year: Specify your own
+
+If you want to express every second or every minute or something like that, use the * symbol in that position;
+if you want to express more than one such as every 15 minutes and every 30 minutes, you can write:`15, 30`.
+
+For the rest of the wildcard characters, please Google them yourself
+*/
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Task {
+    String taskName() default "NO_NAME";
+    String taskCronExpression() default "0 0 0 0 0 ?";
+    String triggerName() default "NO_NAME";
+    boolean executeImmediatelyAfterReset() default false;
+    boolean executeImmediately() default false;
+}

src/main/java/emu/grasscutter/task/TaskHandler.java

+package emu.grasscutter.task;
+
+import org.quartz.*;
+
+@PersistJobDataAfterExecution
+public abstract class TaskHandler implements Job {
+    public void restartExecute() throws JobExecutionException {
+        execute(null);
+    }
+
+    public abstract void onEnable();
+
+    public abstract void onDisable();
+}