proto/AvatarChangeElementTypeReq.proto

@@ -1,12 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-// CmdId: 1706
-// EnetChannelId: 0
-// EnetIsReliable: true
-// IsAllowClient: true
-message AvatarChangeElementTypeReq {
-	uint32 scene_id = 15;
-	uint32 area_id = 4;
-}

proto/AvatarChangeElementTypeRsp.proto

@@ -1,10 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-// CmdId: 1708
-// EnetChannelId: 0
-// EnetIsReliable: true
-message AvatarChangeElementTypeRsp {
-	int32 retcode = 15;
-}

proto/AvatarSkillDepotChangeNotify.proto

@@ -1,17 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-// CmdId: 1037
-// EnetChannelId: 0
-// EnetIsReliable: true
-message AvatarSkillDepotChangeNotify {
-	uint64 avatar_guid = 2;
-	uint32 entity_id = 8;
-	uint32 skill_depot_id = 9;
-	repeated uint32 talent_id_list = 1;
-	repeated uint32 proud_skill_list = 5;
-	uint32 core_proud_skill_level = 4;
-	map<uint32, uint32> skill_level_map = 10;
-	map<uint32, uint32> proud_skill_extra_level_map = 11;
-}

proto/GachaWishReq.proto

@@ -1,13 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-// CmdId: 1532
-// EnetChannelId: 0
-// EnetIsReliable: true
-// IsAllowClient: true
-message GachaWishReq {
-  uint32 gacha_type = 2;
-  uint32 gacha_schedule_id = 4;
-  uint32 item_id = 14;
-}

proto/GachaWishRsp.proto

@@ -1,15 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-// CmdId: 1517
-// EnetChannelId: 0
-// EnetIsReliable: true
-message GachaWishRsp {
-  int32 retcode = 7;
-  uint32 gacha_type = 14;
-  uint32 gacha_schedule_id = 15;
-  uint32 wish_item_id = 3;
-  uint32 wish_progress = 12;
-  uint32 wish_max_progress = 10;
-}

src/main/java/emu/grasscutter/Grasscutter.java

@@ -6,10 +6,8 @@ import java.util.Calendar;
 import emu.grasscutter.auth.AuthenticationSystem;
 import emu.grasscutter.auth.DefaultAuthentication;
 import emu.grasscutter.command.CommandMap;
-import emu.grasscutter.command.DefaultPermissionHandler;
+import emu.grasscutter.game.managers.EnergyManager.EnergyManager;
-import emu.grasscutter.command.PermissionHandler;
+import emu.grasscutter.game.managers.StaminaManager.StaminaManager;
-import emu.grasscutter.game.managers.energy.EnergyManager;
-import emu.grasscutter.game.managers.stamina.StaminaManager;
 import emu.grasscutter.plugin.PluginManager;
 import emu.grasscutter.plugin.api.ServerHook;
 import emu.grasscutter.scripts.ScriptLoader;
@@ -60,7 +58,6 @@ public final class Grasscutter {
 	private static GameServer gameServer;
 	private static PluginManager pluginManager;
 	private static AuthenticationSystem authenticationSystem;
-	private static PermissionHandler permissionHandler;
 
 	public static final Reflections reflector = new Reflections("emu.grasscutter");
 	public static ConfigContainer config;
@@ -117,9 +114,8 @@ public final class Grasscutter {
 		// Initialize database.
 		DatabaseManager.initialize();
 		
-		// Initialize the default systems.
+		// Initialize the default authentication system.
 		authenticationSystem = new DefaultAuthentication();
-		permissionHandler = new DefaultPermissionHandler();
 	
 		// Create server instances.
 		httpServer = new HttpServer();
@@ -291,10 +287,6 @@ public final class Grasscutter {
 		return authenticationSystem;
 	}
 
-	public static PermissionHandler getPermissionHandler() {
-		return permissionHandler;
-	}
-
 	public static int getCurrentDayOfWeek() {
 		return day;
 	}
@@ -354,14 +346,6 @@ public final class Grasscutter {
 		Grasscutter.authenticationSystem = authenticationSystem;
 	}
 
-	/**
-	 * Sets the permission handler for the server.
-	 * @param permissionHandler The permission handler to use.
-	 */
-	public static void setPermissionHandler(PermissionHandler permissionHandler) {
-		Grasscutter.permissionHandler = permissionHandler;
-	}
-
 	/*
 	 * Enums for the configuration.
 	 */

src/main/java/emu/grasscutter/command/CommandMap.java

@@ -14,7 +14,6 @@ public final class CommandMap {
     private final Map<String, Command> annotations = new HashMap<>();
     private final Map<String, Integer> targetPlayerIds = new HashMap<>();
     private static final String consoleId = "console";
-
     public CommandMap() {
         this(false);
     }
@@ -203,10 +202,22 @@ public final class CommandMap {
             }
         }
 
-        // Check for permissions.
+        // Check for permission.
-        if (!Grasscutter.getPermissionHandler().checkPermission(player, targetPlayer, this.annotations.get(label).permission(), this.annotations.get(label).permissionTargeted())) {
+        if (player != null) {
+            String permissionNode = this.annotations.get(label).permission();
+            String permissionNodeTargeted = this.annotations.get(label).permissionTargeted();
+            Account account = player.getAccount();
+            if (player != targetPlayer) {  // Additional permission required for targeting another player
+                if (!permissionNodeTargeted.isEmpty() && !account.hasPermission(permissionNodeTargeted)) {
+                    CommandHandler.sendTranslatedMessage(player, "commands.generic.permission_error");
                     return;
                 }
+            }
+            if (!permissionNode.isEmpty() && !account.hasPermission(permissionNode)) {
+                CommandHandler.sendTranslatedMessage(player, "commands.generic.permission_error");
+                return;
+            }
+        }
 
         // Check if command has unfulfilled constraints on targetPlayer
         Command.TargetRequirement targetRequirement = this.annotations.get(label).targetRequirement();

src/main/java/emu/grasscutter/command/DefaultPermissionHandler.java

@@ -1,32 +0,0 @@
-package emu.grasscutter.command;
-
-import emu.grasscutter.game.Account;
-import emu.grasscutter.game.player.Player;
-
-public class DefaultPermissionHandler implements PermissionHandler {
-    @Override
-    public boolean EnablePermissionCommand() {
-        return true;
-    }
-
-    @Override
-    public boolean checkPermission(Player player, Player targetPlayer, String permissionNode, String permissionNodeTargeted) {
-        if(player == null) {
-            return true;
-        }
-
-        Account account = player.getAccount();
-        if (player != targetPlayer) {  // Additional permission required for targeting another player
-            if (!permissionNodeTargeted.isEmpty() && !account.hasPermission(permissionNodeTargeted)) {
-                CommandHandler.sendTranslatedMessage(player, "commands.generic.permission_error");
-                return false;
-            }
-        }
-        if (!permissionNode.isEmpty() && !account.hasPermission(permissionNode)) {
-            CommandHandler.sendTranslatedMessage(player, "commands.generic.permission_error");
-            return false;
-        }
-
-        return true;
-    }
-}

src/main/java/emu/grasscutter/command/PermissionHandler.java

@@ -1,8 +0,0 @@
-package emu.grasscutter.command;
-
-import emu.grasscutter.game.player.Player;
-
-public interface PermissionHandler {
-    public boolean EnablePermissionCommand();
-    public boolean checkPermission(Player player, Player targetPlayer, String permissionNode, String permissionNodeTargeted);
-}

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

@@ -20,11 +20,6 @@ public final class PermissionCommand implements CommandHandler {
             return;
         }
 
-        if(!Grasscutter.getPermissionHandler().EnablePermissionCommand()) {
-            CommandHandler.sendTranslatedMessage(sender, "commands.generic.permission_error");
-            return;
-        }
-
         String action = args.get(0);
         String permission = args.get(1);
 

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

@@ -5,7 +5,7 @@ import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
 import emu.grasscutter.game.avatar.Avatar;
 import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.game.managers.energy.EnergyManager;
+import emu.grasscutter.game.managers.EnergyManager.EnergyManager;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.player.TeamManager;
 import emu.grasscutter.game.props.ElementType;

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

@@ -77,7 +77,6 @@ public class GameData {
 	private static final ArrayList<CodexReliquaryData> codexReliquaryArrayList = new ArrayList<>();
 	private static final Int2ObjectMap<FetterCharacterCardData> fetterCharacterCardDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<RewardData> rewardDataMap = new Int2ObjectOpenHashMap<>();
-	private static final Int2ObjectMap<WorldAreaData> worldAreaDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<WorldLevelData> worldLevelDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<DailyDungeonData> dailyDungeonDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<DungeonData> dungeonDataMap = new Int2ObjectOpenHashMap<>();
@@ -320,10 +319,6 @@ public class GameData {
 
 	public static ArrayList<CodexReliquaryData> getcodexReliquaryArrayList(){return codexReliquaryArrayList;}
 
-	public static Int2ObjectMap<WorldAreaData> getWorldAreaDataMap() {
-		return worldAreaDataMap;
-	}
-	
 	public static Int2ObjectMap<WorldLevelData> getWorldLevelDataMap() {
 		return worldLevelDataMap;
 	}

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

@@ -1,16 +1,12 @@
 package emu.grasscutter.data;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.danilopianini.util.FlexibleQuadTree;
 import org.danilopianini.util.SpatialIndex;
 
 import emu.grasscutter.Grasscutter;
-import emu.grasscutter.data.ResourceLoader.AvatarConfig;
-import emu.grasscutter.data.ResourceLoader.AvatarConfigAbility;
 import emu.grasscutter.data.excels.ReliquaryAffixData;
 import emu.grasscutter.data.excels.ReliquaryMainPropData;
 import emu.grasscutter.game.world.SpawnDataEntry;
@@ -23,7 +19,6 @@ public class GameDepot {
 	private static Int2ObjectMap<WeightedList<ReliquaryMainPropData>> relicMainPropDepot = new Int2ObjectOpenHashMap<>();
 	private static Int2ObjectMap<List<ReliquaryAffixData>> relicAffixDepot = new Int2ObjectOpenHashMap<>();
 	
-	private static Map<String, AvatarConfig> playerAbilities = new HashMap<>();
 	private static Int2ObjectMap<SpatialIndex<SpawnGroupEntry>> spawnLists = new Int2ObjectOpenHashMap<>();
 	
 	public static void load() {
@@ -66,12 +61,4 @@ public class GameDepot {
 	public static SpatialIndex<SpawnGroupEntry> getSpawnListById(int sceneId) {
 		return getSpawnLists().computeIfAbsent(sceneId, id -> new FlexibleQuadTree<>());
 	}
-
-	public static Map<String, AvatarConfig> getPlayerAbilities() {
-		return playerAbilities;
-	}
-
-	public static void setPlayerAbilities(Map<String, AvatarConfig> playerAbilities) {
-		GameDepot.playerAbilities = playerAbilities;
-	}
 }

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

@@ -66,6 +66,37 @@ public class ResourceLoader {
 		loadQuests();
 		// Load scene points - must be done AFTER resources are loaded
 		loadScenePoints();
+		// Custom - TODO move this somewhere else
+		try {
+			GameData.getAvatarSkillDepotDataMap().get(504).setAbilities(
+				new AbilityEmbryoEntry(
+					"", 
+					new String[] {
+						"Avatar_PlayerBoy_ExtraAttack_Wind",
+						"Avatar_Player_UziExplode_Mix",
+						"Avatar_Player_UziExplode",
+						"Avatar_Player_UziExplode_Strike_01",
+						"Avatar_Player_UziExplode_Strike_02",
+						"Avatar_Player_WindBreathe",
+						"Avatar_Player_WindBreathe_CameraController"
+					}
+			));
+			GameData.getAvatarSkillDepotDataMap().get(704).setAbilities(
+				new AbilityEmbryoEntry(
+					"", 
+					new String[] {
+						"Avatar_PlayerGirl_ExtraAttack_Wind",
+						"Avatar_Player_UziExplode_Mix",
+						"Avatar_Player_UziExplode",
+						"Avatar_Player_UziExplode_Strike_01",
+						"Avatar_Player_UziExplode_Strike_02",
+						"Avatar_Player_WindBreathe",
+						"Avatar_Player_WindBreathe_CameraController"
+					}
+			));
+		} catch (Exception e) {
+			Grasscutter.getLogger().error("Error loading abilities", e);
+		}
 	}
 
 	public static void loadResources() {
@@ -213,16 +244,6 @@ public class ResourceLoader {
 				AbilityEmbryoEntry al = new AbilityEmbryoEntry(avatarName, config.abilities.stream().map(Object::toString).toArray(size -> new String[s]));
 				embryoList.add(al);
 			}
-			
-			File playerElementsFile = new File(Utils.toFilePath(RESOURCE("BinOutput/AbilityGroup/AbilityGroup_Other_PlayerElementAbility.json")));
-			
-			if (playerElementsFile.exists()) {
-				try (FileReader fileReader = new FileReader(playerElementsFile)) {
-					GameDepot.setPlayerAbilities(Grasscutter.getGsonFactory().fromJson(fileReader, new TypeToken<Map<String, AvatarConfig>>(){}.getType()));
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
 		}
 		
 		if (embryoList == null || embryoList.isEmpty()) {
@@ -396,17 +417,16 @@ public class ResourceLoader {
 
 	// BinOutput configs
 	
-	public static class AvatarConfig {
+	private static class AvatarConfig {
-		@SerializedName(value="abilities", alternate={"targetAbilities"})
 		public ArrayList<AvatarConfigAbility> abilities;
-	}
 		
-	public static class AvatarConfigAbility {
+		private static class AvatarConfigAbility {
 			public String abilityName;
 			public String toString() {
 				return abilityName;
 			}
 		}
+	}
 	
 	private static class OpenConfig {
 		public OpenConfigData[] data;

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

@@ -3,10 +3,7 @@ package emu.grasscutter.data.excels;
 import java.util.List;
 
 import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.GameDepot;
 import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceLoader.AvatarConfig;
-import emu.grasscutter.data.ResourceLoader.AvatarConfigAbility;
 import emu.grasscutter.data.ResourceType;
 import emu.grasscutter.data.ResourceType.LoadPriority;
 import emu.grasscutter.data.binout.AbilityEmbryoEntry;
@@ -98,21 +95,12 @@ public class AvatarSkillDepotData extends GameResource {
 	
 	@Override
 	public void onLoad() {
-		// Set energy skill data
     	this.energySkillData = GameData.getAvatarSkillDataMap().get(this.energySkill);
     	if (getEnergySkillData() != null) {
     		this.elementType = getEnergySkillData().getCostElemType();
     	} else {
     		this.elementType = ElementType.None;
     	}
-    	// Set embryo abilities (if player skill depot)
-    	if (getSkillDepotAbilityGroup() != null && getSkillDepotAbilityGroup().length() > 0) {
-    		AvatarConfig config = GameDepot.getPlayerAbilities().get(getSkillDepotAbilityGroup());
-    		
-    		if (config != null) {
-    			this.setAbilities(new AbilityEmbryoEntry(getSkillDepotAbilityGroup(), config.abilities.stream().map(Object::toString).toArray(String[]::new)));
-    		}
-    	}
     }
     
     public static class InherentProudSkillOpens {

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

@@ -1,32 +0,0 @@
-package emu.grasscutter.data.excels;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-import emu.grasscutter.game.props.ElementType;
-
-@ResourceType(name = "WorldAreaConfigData.json")
-public class WorldAreaData extends GameResource {
-	private int ID;
-	private int AreaID1;
-	private int AreaID2;
-	private int SceneID;
-	private ElementType elementType;
-	    
-	@Override
-	public int getId() {
-		return (this.AreaID2 << 16) + this.AreaID1;
-	}
-	
-	public int getSceneID() {
-		return this.SceneID;
-	}
-	
-	public ElementType getElementType() {
-		return this.elementType;
-	}
-
-	@Override
-	public void onLoad() {
-		
-	}
-}

src/main/java/emu/grasscutter/game/gacha/GachaBanner.java

@@ -1,8 +1,5 @@
 package emu.grasscutter.game.gacha;
 
-import emu.grasscutter.database.DatabaseHelper;
-import emu.grasscutter.game.Account;
-import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo;
 import emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo;
 import emu.grasscutter.utils.Utils;
@@ -47,7 +44,6 @@ public class GachaBanner {
 	private int[] rateUpItems2 = {};
 	private int eventChance = -1;
 	private int costItem = 0;
-	private int wishMaxProgress = 2;
 	
 	public int getGachaType() {
 		return gachaType;
@@ -112,11 +108,6 @@ public class GachaBanner {
 	public boolean getRemoveC6FromPool() {return removeC6FromPool;}
 	public boolean getAutoStripRateUpFromFallback() {return autoStripRateUpFromFallback;}
 
-	public int getWishMaxProgress() {return wishMaxProgress;}
-
-	public boolean hasEpitomized() {
-		return bannerType.equals(BannerType.WEAPON);
-	}
 
 	public int getWeight(int rarity, int pity) {
 		return switch(rarity) {
@@ -139,10 +130,12 @@ public class GachaBanner {
 		};
 	}
 
-	public GachaInfo toProto(Player player) {
+	@Deprecated
-		// TODO: use other Nonce/key insteadof session key to ensure the overall security for the player
+	public GachaInfo toProto() {
-		String sessionKey = player.getAccount().getSessionKey();
+		return toProto("");
+	}
 	
+	public GachaInfo toProto(String sessionKey) {
 		String record = "http" + (HTTP_ENCRYPTION.useInRouting ? "s" : "") + "://"
 						+ lr(HTTP_INFO.accessAddress, HTTP_INFO.bindAddress) + ":"
 						+ lr(HTTP_INFO.accessPort, HTTP_INFO.bindPort)
@@ -173,15 +166,6 @@ public class GachaBanner {
 	            .setLeftGachaTimes(Integer.MAX_VALUE)
 	            .setGachaTimesLimit(Integer.MAX_VALUE)
 	            .setGachaSortId(this.getSortId());
-
-		if(hasEpitomized()) {
-			PlayerGachaBannerInfo gachaInfo = player.getGachaInfo().getBannerInfo(this);
-
-			info.setWishItemId(gachaInfo.getWishItemId())
-				.setWishProgress(gachaInfo.getFailedChosenItemPulls())
-				.setWishMaxProgress(this.getWishMaxProgress());
-		}
-
 		if (this.getTitlePath() != null) {
 			info.setTitleTextmap(this.getTitlePath());
 		}

src/main/java/emu/grasscutter/game/gacha/GachaManager.java

@@ -35,7 +35,6 @@ import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 import emu.grasscutter.server.game.GameServer;
 import emu.grasscutter.server.game.GameServerTickEvent;
 import emu.grasscutter.server.packet.send.PacketDoGachaRsp;
-import emu.grasscutter.server.packet.send.PacketGachaWishRsp;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
@@ -48,7 +47,8 @@ import static emu.grasscutter.Configuration.*;
 public class GachaManager {
 	private final GameServer server;
 	private final Int2ObjectMap<GachaBanner> gachaBanners;
-	private WatchService watchService;
+	private GetGachaInfoRsp cachedProto;
+	WatchService watchService;
 	
 	private static final int starglitterId = 221;
 	private static final int stardustId = 222;
@@ -87,6 +87,9 @@ public class GachaManager {
 					getGachaBanners().put(banner.getScheduleId(), banner);
 				}
 				Grasscutter.getLogger().info("Banners successfully loaded.");
+
+
+				this.cachedProto = createProto();
 			} else {
 				Grasscutter.getLogger().error("Unable to load banners. Banners size is 0.");
 			}
@@ -179,15 +182,23 @@ public class GachaManager {
 		return 0;  // This should only be reachable if total==0
 	}
 
-	private synchronized int doFallbackRarePull(int[] fallback1, int[] fallback2, int rarity, GachaBanner banner, PlayerGachaBannerInfo gachaInfo) {
+	private synchronized int doRarePull(int[] featured, int[] fallback1, int[] fallback2, int rarity, GachaBanner banner, PlayerGachaBannerInfo gachaInfo) {
+		int itemId = 0;
+		boolean pullFeatured = (gachaInfo.getFailedFeaturedItemPulls(rarity) >= 1)  // Lost previous coinflip
+							|| (this.randomRange(1, 100) <= banner.getEventChance(rarity));  // Won this coinflip
+		if (pullFeatured && (featured.length > 0)) {
+			itemId = getRandom(featured);
+			gachaInfo.setFailedFeaturedItemPulls(rarity, 0);
+		} else {
+			gachaInfo.addFailedFeaturedItemPulls(rarity, 1);
 			if (fallback1.length < 1) {
 				if (fallback2.length < 1) {
-				return getRandom((rarity==5)? fallbackItems5Pool2Default : fallbackItems4Pool2Default);
+					itemId = getRandom((rarity==5)? fallbackItems5Pool2Default : fallbackItems4Pool2Default);
 				} else {
-				return getRandom(fallback2);
+					itemId = getRandom(fallback2);
 				}
 			} else if (fallback2.length < 1) {
-			return getRandom(fallback1);
+				itemId = getRandom(fallback1);
 			} else {  // Both pools are possible, use the pool balancer
 				int pityPool1 = banner.getPoolBalanceWeight(rarity, gachaInfo.getPityPool(rarity, 1));
 				int pityPool2 = banner.getPoolBalanceWeight(rarity, gachaInfo.getPityPool(rarity, 2));
@@ -195,7 +206,7 @@ public class GachaManager {
 					case 1 -> 1 + drawRoulette(new int[] {pityPool1, pityPool2}, 10000);
 					default -> 2 - drawRoulette(new int[] {pityPool2, pityPool1}, 10000);
 				};
-			return switch (chosenPool) {
+				itemId = switch (chosenPool) {
 					case 1:
 						gachaInfo.setPityPool(rarity, 1, 0);
 						yield getRandom(fallback1);
@@ -205,35 +216,6 @@ public class GachaManager {
 				};
 			}
 		}
-
-	private synchronized int doRarePull(int[] featured, int[] fallback1, int[] fallback2, int rarity, GachaBanner banner, PlayerGachaBannerInfo gachaInfo) {
-		int itemId = 0;
-		boolean epitomized = (banner.hasEpitomized()) && (rarity == 5) && (gachaInfo.getWishItemId() != 0);
-		boolean pityEpitomized = (gachaInfo.getFailedChosenItemPulls() >= banner.getWishMaxProgress());  // Maximum fate points reached
-		boolean pityFeatured = (gachaInfo.getFailedFeaturedItemPulls(rarity) >= 1);  // Lost previous coinflip
-		boolean rollFeatured = (this.randomRange(1, 100) <= banner.getEventChance(rarity));  // Won this coinflip
-		boolean pullFeatured = pityFeatured || rollFeatured;
-
-		if (epitomized && pityEpitomized) {  // Auto pick item when epitomized points reached
-			gachaInfo.setFailedFeaturedItemPulls(rarity, 0);  // Epitomized item will always be a featured one
-			itemId = gachaInfo.getWishItemId();
-		} else {
-			if (pullFeatured && (featured.length > 0)) {
-				gachaInfo.setFailedFeaturedItemPulls(rarity, 0);
-				itemId = getRandom(featured);
-			} else {
-				gachaInfo.addFailedFeaturedItemPulls(rarity, 1);  // This could be moved into doFallbackRarePull but having it here makes it clearer
-				itemId = doFallbackRarePull(fallback1, fallback2, rarity, banner, gachaInfo);
-			}
-		}
-
-		if (epitomized) {
-			if(itemId == gachaInfo.getWishItemId()) { // Reset epitomized points when got wished item
-				gachaInfo.setFailedChosenItemPulls(0);
-			} else { // Add epitomized points if not get wished item
-				gachaInfo.addFailedChosenItemPulls(1);
-			}
-		}
 		return itemId;
 	}
 
@@ -374,7 +356,7 @@ public class GachaManager {
 		}
 		
 		// Packets
-		player.sendPacket(new PacketDoGachaRsp(banner, list, gachaInfo));
+		player.sendPacket(new PacketDoGachaRsp(banner, list));
 	}
 
 	private synchronized void startWatcher(GameServer server) {
@@ -417,7 +399,18 @@ public class GachaManager {
 		}
 	}
 	
-	private synchronized GetGachaInfoRsp createProto(Player player) {
+	@Deprecated
+	private synchronized GetGachaInfoRsp createProto() {
+		GetGachaInfoRsp.Builder proto = GetGachaInfoRsp.newBuilder().setGachaRandom(12345);
+		
+		for (GachaBanner banner : getGachaBanners().values()) {
+			proto.addGachaInfoList(banner.toProto());
+		}
+				
+		return proto.build();
+	}
+
+	private synchronized GetGachaInfoRsp createProto(String sessionKey) {
 		GetGachaInfoRsp.Builder proto = GetGachaInfoRsp.newBuilder().setGachaRandom(12345);
 		
 		long currentTime = System.currentTimeMillis() / 1000L;
@@ -425,14 +418,22 @@ public class GachaManager {
 		for (GachaBanner banner : getGachaBanners().values()) {
 			if ((banner.getEndTime() >= currentTime && banner.getBeginTime() <= currentTime) || (banner.getBannerType() == BannerType.STANDARD))
 			{
-				proto.addGachaInfoList(banner.toProto(player));
+				proto.addGachaInfoList(banner.toProto(sessionKey));
 			}
 		}
 				
 		return proto.build();
 	}
 	
-	public GetGachaInfoRsp toProto(Player player) {
+	@Deprecated
-		return createProto(player);
+	public GetGachaInfoRsp toProto() {
+		if (this.cachedProto == null) {
+			this.cachedProto = createProto();
+		}
+		return this.cachedProto;
+	}
+
+	public GetGachaInfoRsp toProto(String sessionKey) {
+		return createProto(sessionKey);
 	}
 }

src/main/java/emu/grasscutter/game/gacha/PlayerGachaBannerInfo.java

@@ -13,9 +13,6 @@ public class PlayerGachaBannerInfo {
 	private int pity4Pool1 = 0;
 	private int pity4Pool2 = 0;
 	
-	private int failedChosenItemPulls = 0;
-	private int wishItemId = 0;
-	
 	public int getPity5() {
 		return pity5;
 	}
@@ -40,26 +37,6 @@ public class PlayerGachaBannerInfo {
 		this.pity4 += amount;
 	}
 	
-	public int getWishItemId() {
-		return wishItemId;
-	}
-
-	public void setWishItemId(int wishItemId) {
-		this.wishItemId = wishItemId;
-	}
-
-	public int getFailedChosenItemPulls() {
-		return failedChosenItemPulls;
-	}
-
-	public void setFailedChosenItemPulls(int amount) {
-		failedChosenItemPulls = amount;
-	}
-
-	public void addFailedChosenItemPulls(int amount) {
-		failedChosenItemPulls += amount;
-	}
-	
 	public int getFailedFeaturedItemPulls(int rarity) {
 		return switch (rarity) {
 			case 4 -> failedFeatured4ItemPulls;

src/main/java/emu/grasscutter/game/managers/ChatManager/ChatManager.java

@@ -1,4 +1,4 @@
-package emu.grasscutter.game.managers.chat;
+package emu.grasscutter.game.managers.ChatManager;
 
 import emu.grasscutter.command.CommandMap;
 import emu.grasscutter.game.player.Player;

src/main/java/emu/grasscutter/game/managers/ChatManager/ChatManagerHandler.java

@@ -1,4 +1,4 @@
-package emu.grasscutter.game.managers.chat;
+package emu.grasscutter.game.managers.ChatManager;
 
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.game.GameServer;

src/main/java/emu/grasscutter/game/managers/DeforestationManager/DeforestationManager.java

@@ -1,4 +1,4 @@
-package emu.grasscutter.game.managers.deforestation;
+package emu.grasscutter.game.managers.DeforestationManager;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/emu/grasscutter/game/managers/DeforestationManager/HitTreeRecord.java

@@ -1,4 +1,4 @@
-package emu.grasscutter.game.managers.deforestation;
+package emu.grasscutter.game.managers.DeforestationManager;
 
 
 

src/main/java/emu/grasscutter/game/managers/EnergyManager/EnergyDropEntry.java

@@ -1,4 +1,4 @@
-package emu.grasscutter.game.managers.energy;
+package emu.grasscutter.game.managers.EnergyManager;
 
 import java.util.List;
 

src/main/java/emu/grasscutter/game/managers/EnergyManager/EnergyDropInfo.java

@@ -1,4 +1,4 @@
-package emu.grasscutter.game.managers.energy;
+package emu.grasscutter.game.managers.EnergyManager;
 
 public class EnergyDropInfo {
     private int ballId;

src/main/java/emu/grasscutter/game/managers/EnergyManager/EnergyManager.java

@@ -1,4 +1,4 @@
-package emu.grasscutter.game.managers.energy;
+package emu.grasscutter.game.managers.EnergyManager;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.DataLoader;

src/main/java/emu/grasscutter/game/managers/EnergyManager/SkillParticleGenerationEntry.java

@@ -1,4 +1,4 @@
-package emu.grasscutter.game.managers.energy;
+package emu.grasscutter.game.managers.EnergyManager;
 
 import java.util.List;
 

src/main/java/emu/grasscutter/game/managers/EnergyManager/SkillParticleGenerationInfo.java

@@ -1,4 +1,4 @@
-package emu.grasscutter.game.managers.energy;
+package emu.grasscutter.game.managers.EnergyManager;
 
 public class SkillParticleGenerationInfo {
 	private int value;

src/main/java/emu/grasscutter/game/managers/ForgingManager/ActiveForgeData.java

@@ -1,4 +1,4 @@
-package emu.grasscutter.game.managers.forging;
+package emu.grasscutter.game.managers.ForgingManager;
 
 import dev.morphia.annotations.Entity;
 import emu.grasscutter.utils.Utils;

src/main/java/emu/grasscutter/game/managers/ForgingManager/ForgingManager.java

@@ -1,4 +1,4 @@
-package emu.grasscutter.game.managers.forging;
+package emu.grasscutter.game.managers.ForgingManager;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/emu/grasscutter/game/managers/MapMarkManager/MapMark.java

@@ -1,4 +1,4 @@
-package emu.grasscutter.game.managers.mapmark;
+package emu.grasscutter.game.managers.MapMarkManager;
 
 import dev.morphia.annotations.Entity;
 import emu.grasscutter.net.proto.MapMarkFromTypeOuterClass.MapMarkFromType;

src/main/java/emu/grasscutter/game/managers/MapMarkManager/MapMarksManager.java

@@ -1,4 +1,4 @@
-package emu.grasscutter.game.managers.mapmark;
+package emu.grasscutter.game.managers.MapMarkManager;
 
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.proto.MapMarkPointTypeOuterClass.MapMarkPointType;

src/main/java/emu/grasscutter/game/managers/StaminaManager/AfterUpdateStaminaListener.java

@@ -1,4 +1,4 @@
-package emu.grasscutter.game.managers.stamina;
+package emu.grasscutter.game.managers.StaminaManager;
 
 public interface AfterUpdateStaminaListener {
     /**

src/main/java/emu/grasscutter/game/managers/StaminaManager/BeforeUpdateStaminaListener.java

@@ -1,4 +1,4 @@
-package emu.grasscutter.game.managers.stamina;
+package emu.grasscutter.game.managers.StaminaManager;
 
 public interface BeforeUpdateStaminaListener {
     /**

src/main/java/emu/grasscutter/game/managers/StaminaManager/Consumption.java

@@ -1,4 +1,4 @@
-package emu.grasscutter.game.managers.stamina;
+package emu.grasscutter.game.managers.StaminaManager;
 
 public class Consumption {
     public ConsumptionType type = ConsumptionType.None;

src/main/java/emu/grasscutter/game/managers/StaminaManager/ConsumptionType.java

@@ -1,4 +1,4 @@
-package emu.grasscutter.game.managers.stamina;
+package emu.grasscutter.game.managers.StaminaManager;
 
 public enum ConsumptionType {
     None(0),

src/main/java/emu/grasscutter/game/managers/StaminaManager/StaminaManager.java

@@ -1,4 +1,4 @@
-package emu.grasscutter.game.managers.stamina;
+package emu.grasscutter.game.managers.StaminaManager;
 
 import ch.qos.logback.classic.Logger;
 import emu.grasscutter.Grasscutter;

src/main/java/emu/grasscutter/game/player/Player.java

@@ -14,6 +14,7 @@ import emu.grasscutter.game.avatar.AvatarProfileData;
 import emu.grasscutter.game.avatar.AvatarStorage;
 import emu.grasscutter.game.entity.EntityMonster;
 import emu.grasscutter.game.entity.EntityVehicle;
+import emu.grasscutter.game.managers.DeforestationManager.DeforestationManager;
 import emu.grasscutter.game.entity.EntityGadget;
 import emu.grasscutter.game.entity.EntityItem;
 import emu.grasscutter.game.entity.GameEntity;
@@ -27,19 +28,18 @@ import emu.grasscutter.game.mail.Mail;
 import emu.grasscutter.game.mail.MailHandler;
 import emu.grasscutter.game.managers.InsectCaptureManager;
 import emu.grasscutter.game.managers.ResinManager;
-import emu.grasscutter.game.managers.deforestation.DeforestationManager;
+import emu.grasscutter.game.managers.StaminaManager.StaminaManager;
-import emu.grasscutter.game.managers.energy.EnergyManager;
-import emu.grasscutter.game.managers.forging.ActiveForgeData;
-import emu.grasscutter.game.managers.forging.ForgingManager;
-import emu.grasscutter.game.managers.mapmark.*;
-import emu.grasscutter.game.managers.stamina.StaminaManager;
 import emu.grasscutter.game.managers.SotSManager;
+import emu.grasscutter.game.managers.EnergyManager.EnergyManager;
+import emu.grasscutter.game.managers.ForgingManager.ActiveForgeData;
+import emu.grasscutter.game.managers.ForgingManager.ForgingManager;
 import emu.grasscutter.game.props.ActionReason;
 import emu.grasscutter.game.props.EntityType;
 import emu.grasscutter.game.props.PlayerProperty;
 import emu.grasscutter.game.props.SceneType;
 import emu.grasscutter.game.quest.QuestManager;
 import emu.grasscutter.game.shop.ShopLimit;
+import emu.grasscutter.game.managers.MapMarkManager.*;
 import emu.grasscutter.game.tower.TowerData;
 import emu.grasscutter.game.tower.TowerManager;
 import emu.grasscutter.game.world.Scene;

src/main/java/emu/grasscutter/game/props/ElementType.java

@@ -10,14 +10,14 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 public enum ElementType {
 	None		(0, FightProperty.FIGHT_PROP_CUR_FIRE_ENERGY, FightProperty.FIGHT_PROP_MAX_FIRE_ENERGY),
-	Fire		(1, FightProperty.FIGHT_PROP_CUR_FIRE_ENERGY, FightProperty.FIGHT_PROP_MAX_FIRE_ENERGY, 10101, "TeamResonance_Fire_Lv2", 2),
+	Fire		(1, FightProperty.FIGHT_PROP_CUR_FIRE_ENERGY, FightProperty.FIGHT_PROP_MAX_FIRE_ENERGY, 10101, "TeamResonance_Fire_Lv2"),
-	Water		(2, FightProperty.FIGHT_PROP_CUR_WATER_ENERGY, FightProperty.FIGHT_PROP_MAX_WATER_ENERGY, 10201, "TeamResonance_Water_Lv2", 3),
+	Water		(2, FightProperty.FIGHT_PROP_CUR_WATER_ENERGY, FightProperty.FIGHT_PROP_MAX_WATER_ENERGY, 10201, "TeamResonance_Water_Lv2"),
 	Grass		(3, FightProperty.FIGHT_PROP_CUR_GRASS_ENERGY, FightProperty.FIGHT_PROP_MAX_GRASS_ENERGY),
-	Electric	(4, FightProperty.FIGHT_PROP_CUR_ELEC_ENERGY, FightProperty.FIGHT_PROP_MAX_ELEC_ENERGY, 10401, "TeamResonance_Electric_Lv2", 7),
+	Electric	(4, FightProperty.FIGHT_PROP_CUR_ELEC_ENERGY, FightProperty.FIGHT_PROP_MAX_ELEC_ENERGY, 10401, "TeamResonance_Electric_Lv2"),
-	Ice			(5, FightProperty.FIGHT_PROP_CUR_ICE_ENERGY, FightProperty.FIGHT_PROP_MAX_ICE_ENERGY, 10601, "TeamResonance_Ice_Lv2", 5),
+	Ice			(5, FightProperty.FIGHT_PROP_CUR_ICE_ENERGY, FightProperty.FIGHT_PROP_MAX_ICE_ENERGY, 10601, "TeamResonance_Ice_Lv2"),
 	Frozen		(6, FightProperty.FIGHT_PROP_CUR_ICE_ENERGY, FightProperty.FIGHT_PROP_MAX_ICE_ENERGY),
-	Wind		(7, FightProperty.FIGHT_PROP_CUR_WIND_ENERGY, FightProperty.FIGHT_PROP_MAX_WIND_ENERGY, 10301, "TeamResonance_Wind_Lv2", 4),
+	Wind		(7, FightProperty.FIGHT_PROP_CUR_WIND_ENERGY, FightProperty.FIGHT_PROP_MAX_WIND_ENERGY, 10301, "TeamResonance_Wind_Lv2"),
-	Rock		(8, FightProperty.FIGHT_PROP_CUR_ROCK_ENERGY, FightProperty.FIGHT_PROP_MAX_ROCK_ENERGY, 10701, "TeamResonance_Rock_Lv2", 6),
+	Rock		(8, FightProperty.FIGHT_PROP_CUR_ROCK_ENERGY, FightProperty.FIGHT_PROP_MAX_ROCK_ENERGY, 10701, "TeamResonance_Rock_Lv2"),
 	AntiFire	(9, FightProperty.FIGHT_PROP_CUR_FIRE_ENERGY, FightProperty.FIGHT_PROP_MAX_FIRE_ENERGY),
 	Default		(255, FightProperty.FIGHT_PROP_CUR_FIRE_ENERGY, FightProperty.FIGHT_PROP_MAX_FIRE_ENERGY, 10801, "TeamResonance_AllDifferent");
 	
@@ -25,7 +25,6 @@ public enum ElementType {
 	private final int teamResonanceId;
 	private final FightProperty curEnergyProp;
 	private final FightProperty maxEnergyProp;
-	private int depotValue;
 	private final int configHash;
 	private static final Int2ObjectMap<ElementType> map = new Int2ObjectOpenHashMap<>();
 	private static final Map<String, ElementType> stringMap = new HashMap<>();
@@ -53,11 +52,6 @@ public enum ElementType {
 		}
 	}
 
-	private ElementType(int value, FightProperty curEnergyProp, FightProperty maxEnergyProp, int teamResonanceId, String configName, int depotValue) {
-		this(value, curEnergyProp, maxEnergyProp, teamResonanceId, configName);
-		this.depotValue = depotValue;
-	}
-
 	public int getValue() {
 		return value;
 	}
@@ -70,10 +64,6 @@ public enum ElementType {
 		return maxEnergyProp;
 	}
 
-	public int getDepotValue() {
-		return depotValue;
-	}
-
 	public int getTeamResonanceId() {
 		return teamResonanceId;
 	}

src/main/java/emu/grasscutter/plugin/api/ServerHook.java

@@ -4,7 +4,6 @@ import emu.grasscutter.Grasscutter;
 import emu.grasscutter.auth.AuthenticationSystem;
 import emu.grasscutter.command.Command;
 import emu.grasscutter.command.CommandHandler;
-import emu.grasscutter.command.PermissionHandler;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.server.game.GameServer;
 import emu.grasscutter.server.http.HttpServer;
@@ -98,12 +97,4 @@ public final class ServerHook {
     public void setAuthSystem(AuthenticationSystem authSystem) {
         Grasscutter.setAuthenticationSystem(authSystem);
     }
-
-    /**
-     * Sets the server's permission handler.
-     * @param permHandler An instance of the permission handler.
-     */
-    public void setPermissionHandler(PermissionHandler permHandler) {
-        Grasscutter.setPermissionHandler(permHandler);
-    }
 }

src/main/java/emu/grasscutter/server/game/GameServer.java

@@ -10,10 +10,10 @@ import emu.grasscutter.game.drop.DropManager;
 import emu.grasscutter.game.dungeons.DungeonManager;
 import emu.grasscutter.game.expedition.ExpeditionManager;
 import emu.grasscutter.game.gacha.GachaManager;
+import emu.grasscutter.game.managers.ChatManager.ChatManager;
+import emu.grasscutter.game.managers.ChatManager.ChatManagerHandler;
 import emu.grasscutter.game.managers.InventoryManager;
 import emu.grasscutter.game.managers.MultiplayerManager;
-import emu.grasscutter.game.managers.chat.ChatManager;
-import emu.grasscutter.game.managers.chat.ChatManagerHandler;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.quest.ServerQuestHandler;
 import emu.grasscutter.game.shop.ShopManager;

src/main/java/emu/grasscutter/server/packet/recv/HandlerAvatarChangeElementTypeReq.java

@@ -1,68 +0,0 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.GameConstants;
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.excels.AvatarSkillDepotData;
-import emu.grasscutter.data.excels.WorldAreaData;
-import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.entity.EntityAvatar;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.AvatarChangeElementTypeReqOuterClass.AvatarChangeElementTypeReq;
-import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketAbilityChangeNotify;
-import emu.grasscutter.server.packet.send.PacketAvatarChangeElementTypeRsp;
-import emu.grasscutter.server.packet.send.PacketAvatarFightPropNotify;
-import emu.grasscutter.server.packet.send.PacketAvatarSkillDepotChangeNotify;
-
-@Opcodes(PacketOpcodes.AvatarChangeElementTypeReq)
-public class HandlerAvatarChangeElementTypeReq extends PacketHandler {
-	
-	@Override
-	public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-		AvatarChangeElementTypeReq req = AvatarChangeElementTypeReq.parseFrom(payload);
-		
-		WorldAreaData area = GameData.getWorldAreaDataMap().get(req.getAreaId());
-		
-		if (area == null || area.getElementType() == null || area.getElementType().getDepotValue() <= 0) {
-			session.send(new PacketAvatarChangeElementTypeRsp(Retcode.RET_SVR_ERROR_VALUE));
-			return;
-		}
-		
-		// Get current avatar, should be one of the main characters
-		EntityAvatar mainCharacterEntity = session.getPlayer().getTeamManager().getCurrentAvatarEntity();
-		
-		int intialSkillDepotId = 0;
-		if (mainCharacterEntity.getAvatar().getAvatarId() == GameConstants.MAIN_CHARACTER_MALE) {
-			intialSkillDepotId = 500;
-		} else if (mainCharacterEntity.getAvatar().getAvatarId() == GameConstants.MAIN_CHARACTER_FEMALE) {
-			intialSkillDepotId = 700;
-		} else {
-			session.send(new PacketAvatarChangeElementTypeRsp(Retcode.RET_SVR_ERROR_VALUE));
-			return;
-		}
-		intialSkillDepotId += area.getElementType().getDepotValue();
-		
-		// Sanity checks for skill depots
-		Avatar mainCharacter = mainCharacterEntity.getAvatar();
-		AvatarSkillDepotData skillDepot = GameData.getAvatarSkillDepotDataMap().get(intialSkillDepotId);
-		if (skillDepot == null || skillDepot.getId() == mainCharacter.getSkillDepotId()) {
-			session.send(new PacketAvatarChangeElementTypeRsp(Retcode.RET_SVR_ERROR_VALUE));
-			return;
-		}
-		
-		// Success
-		session.send(new PacketAvatarChangeElementTypeRsp());
-		
-		// Set skill depot
-		mainCharacter.setSkillDepotData(skillDepot);
-		
-		// Ability change packet
-		session.send(new PacketAvatarSkillDepotChangeNotify(mainCharacter));
-		session.send(new PacketAbilityChangeNotify(mainCharacterEntity));
-		session.send(new PacketAvatarFightPropNotify(mainCharacter));
-	}
-
-}

src/main/java/emu/grasscutter/server/packet/recv/HandlerGachaWishReq.java

@@ -1,28 +0,0 @@
-package emu.grasscutter.server.packet.recv;
-
-import emu.grasscutter.game.gacha.GachaBanner;
-import emu.grasscutter.game.gacha.PlayerGachaBannerInfo;
-import emu.grasscutter.net.packet.Opcodes;
-import emu.grasscutter.net.packet.PacketHandler;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.GachaWishReqOuterClass.GachaWishReq;
-import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketGachaWishRsp;
-
-@Opcodes(PacketOpcodes.GachaWishReq)
-public class HandlerGachaWishReq extends PacketHandler {
-
-    @Override
-    public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-        GachaWishReq req = GachaWishReq.parseFrom(payload);
-
-        GachaBanner banner = session.getServer().getGachaManager().getGachaBanners().get(req.getGachaScheduleId());
-        PlayerGachaBannerInfo gachaInfo = session.getPlayer().getGachaInfo().getBannerInfo(banner);
-
-        gachaInfo.setFailedChosenItemPulls(0);
-        gachaInfo.setWishItemId(req.getItemId());
-
-        session.send(new PacketGachaWishRsp(req.getGachaType(), req.getGachaScheduleId(), req.getItemId(), 0, banner.getWishMaxProgress()));
-    }
-
-}

src/main/java/emu/grasscutter/server/packet/recv/HandlerGetGachaInfoReq.java

@@ -1,12 +1,9 @@
 package emu.grasscutter.server.packet.recv;
 
-import emu.grasscutter.game.gacha.GachaBanner;
-import emu.grasscutter.game.gacha.PlayerGachaBannerInfo;
 import emu.grasscutter.net.packet.Opcodes;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.packet.PacketHandler;
 import emu.grasscutter.server.game.GameSession;
-import emu.grasscutter.server.packet.send.PacketGachaWishRsp;
 import emu.grasscutter.server.packet.send.PacketGetGachaInfoRsp;
 
 @Opcodes(PacketOpcodes.GetGachaInfoReq)
@@ -14,7 +11,10 @@ public class HandlerGetGachaInfoReq extends PacketHandler {
 	
 	@Override
 	public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
-		session.send(new PacketGetGachaInfoRsp(session.getServer().getGachaManager(), session.getPlayer()));
+		session.send(new PacketGetGachaInfoRsp(session.getServer().getGachaManager(),
+					// TODO: use other Nonce/key insteadof session key to ensure the overall security for the player
+					session.getPlayer().getAccount().getSessionKey())
+					);
 	}
 
 }

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

@@ -1,24 +0,0 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.AvatarChangeElementTypeRspOuterClass.AvatarChangeElementTypeRsp;
-
-public class PacketAvatarChangeElementTypeRsp extends BasePacket {
-	
-	public PacketAvatarChangeElementTypeRsp() {
-		super(PacketOpcodes.AvatarChangeElementTypeRsp);
-	}
-	
-	public PacketAvatarChangeElementTypeRsp(int retcode) {
-		super(PacketOpcodes.AvatarChangeElementTypeRsp);
-		
-		if (retcode > 0) {
-			AvatarChangeElementTypeRsp proto = AvatarChangeElementTypeRsp.newBuilder()
-					.setRetcode(retcode)
-					.build();
-			
-			this.setData(proto);
-		}
-	}
-}

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

@@ -1,26 +0,0 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.AvatarSkillDepotChangeNotifyOuterClass.AvatarSkillDepotChangeNotify;
-
-public class PacketAvatarSkillDepotChangeNotify extends BasePacket {
-	
-	public PacketAvatarSkillDepotChangeNotify(Avatar avatar) {
-		super(PacketOpcodes.AvatarSkillDepotChangeNotify);
-		
-		AvatarSkillDepotChangeNotify proto = AvatarSkillDepotChangeNotify.newBuilder()
-				.setAvatarGuid(avatar.getGuid())
-				.setEntityId(avatar.getEntityId())
-				.setSkillDepotId(avatar.getSkillDepotId())
-				.setCoreProudSkillLevel(avatar.getCoreProudSkillLevel())
-				.addAllTalentIdList(avatar.getTalentIdList())
-				.addAllProudSkillList(avatar.getProudSkillList())
-				.putAllSkillLevelMap(avatar.getSkillLevelMap())
-				.putAllProudSkillExtraLevelMap(avatar.getProudSkillBonusMap())
-				.build();
-		
-		this.setData(proto);
-	}
-}

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

@@ -4,7 +4,6 @@ import java.util.List;
 
 import emu.grasscutter.data.common.ItemParamData;
 import emu.grasscutter.game.gacha.GachaBanner;
-import emu.grasscutter.game.gacha.PlayerGachaBannerInfo;
 import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.DoGachaRspOuterClass.DoGachaRsp;
@@ -14,12 +13,12 @@ import emu.grasscutter.net.proto.RetcodeOuterClass;
 
 public class PacketDoGachaRsp extends BasePacket {
 	
-	public PacketDoGachaRsp(GachaBanner banner, List<GachaItem> list, PlayerGachaBannerInfo gachaInfo) {
+	public PacketDoGachaRsp(GachaBanner banner, List<GachaItem> list) {
 		super(PacketOpcodes.DoGachaRsp);
 
 		ItemParamData costItem = banner.getCost(1);
 		ItemParamData costItem10 = banner.getCost(10);
-		DoGachaRsp.Builder rsp = DoGachaRsp.newBuilder()
+		DoGachaRsp p = DoGachaRsp.newBuilder()
 				.setGachaType(banner.getGachaType())
 				.setGachaScheduleId(banner.getScheduleId())
 				.setGachaTimes(list.size())
@@ -29,15 +28,10 @@ public class PacketDoGachaRsp extends BasePacket {
 	            .setCostItemNum(costItem.getCount())
 	            .setTenCostItemId(costItem10.getId())
 	            .setTenCostItemNum(costItem10.getCount())
-	            .addAllGachaItemList(list);
+	            .addAllGachaItemList(list)
+				.build();
 		
-		if(banner.hasEpitomized()) {
+		this.setData(p);
-			rsp.setWishItemId(gachaInfo.getWishItemId())
-				.setWishProgress(gachaInfo.getFailedChosenItemPulls())
-				.setWishMaxProgress(banner.getWishMaxProgress());
-		}
-		
-		this.setData(rsp.build());
 	}
 
 	public PacketDoGachaRsp() {

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

@@ -1,23 +0,0 @@
-package emu.grasscutter.server.packet.send;
-
-import emu.grasscutter.net.packet.BasePacket;
-import emu.grasscutter.net.packet.PacketOpcodes;
-import emu.grasscutter.net.proto.GachaWishRspOuterClass.GachaWishRsp;
-
-public class PacketGachaWishRsp extends BasePacket {
-
-    public PacketGachaWishRsp(int gachaType, int scheduleId, int itemId, int progress, int maxProgress) {
-        super(PacketOpcodes.GachaWishRsp);
-
-        GachaWishRsp proto = GachaWishRsp.newBuilder()
-                .setGachaType(gachaType)
-                .setGachaScheduleId(scheduleId)
-                .setWishItemId(itemId)
-                .setWishProgress(progress)
-                .setWishMaxProgress(maxProgress)
-                .build();
-
-        this.setData(proto);
-    }
-
-}

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

@@ -1,16 +1,22 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.gacha.GachaManager;
-import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 
 public class PacketGetGachaInfoRsp extends BasePacket {
 	
-	public PacketGetGachaInfoRsp(GachaManager manager, Player player) {
+	@Deprecated
+	public PacketGetGachaInfoRsp(GachaManager manager) {
 		super(PacketOpcodes.GetGachaInfoRsp);
 		
-		this.setData(manager.toProto(player));
+		this.setData(manager.toProto());
+	}
+
+	public PacketGetGachaInfoRsp(GachaManager manager, String sessionKey) {
+		super(PacketOpcodes.GetGachaInfoRsp);
+		
+		this.setData(manager.toProto(sessionKey));
 	}
 
 }

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

@@ -1,6 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
-import emu.grasscutter.game.managers.mapmark.MapMark;
+import emu.grasscutter.game.managers.MapMarkManager.MapMark;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;