Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-03-25 00:53:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert Multi-threaded resource loading

Browse Source
This commit is contained in:
KingRainbow44
2023-05-20 02:55:33 -04:00
parent 1a6fa43367
commit cad6e90c90
13 changed files with 117 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/emu/grasscutter/game/drop/DropSystemLegacy.java
View File

@@ -3,7 +3,6 @@ package emu.grasscutter.game.drop;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.DataLoader;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.ResourceLoader;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.game.entity.EntityItem;
import emu.grasscutter.game.entity.EntityMonster;
@@ -27,8 +26,7 @@ public class DropSystemLegacy extends BaseGameSystem {
public DropSystemLegacy(GameServer server) {
super(server);
this.dropData = new Int2ObjectOpenHashMap<>();
ResourceLoader.runAsync(this::load);
this.load();
}
public Int2ObjectMap<List<DropData>> getDropData() {

4
src/main/java/emu/grasscutter/game/expedition/ExpeditionSystem.java
View File

@@ -2,7 +2,6 @@ package emu.grasscutter.game.expedition;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.DataLoader;
import emu.grasscutter.data.ResourceLoader;
import emu.grasscutter.server.game.BaseGameSystem;
import emu.grasscutter.server.game.GameServer;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
@@ -14,9 +13,8 @@ public class ExpeditionSystem extends BaseGameSystem {
public ExpeditionSystem(GameServer server) {
super(server);
this.expeditionRewardData = new Int2ObjectOpenHashMap<>();
ResourceLoader.runAsync(this::load);
this.load();
}
public Int2ObjectMap<List<ExpeditionRewardDataList>> getExpeditionRewardDataList() {

4
src/main/java/emu/grasscutter/game/gacha/GachaSystem.java
View File

@@ -6,7 +6,6 @@ import com.sun.nio.file.SensitivityWatchEventModifier;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.DataLoader;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.ResourceLoader;
import emu.grasscutter.data.common.ItemParamData;
import emu.grasscutter.data.excels.ItemData;
import emu.grasscutter.database.DatabaseHelper;
@@ -46,9 +45,8 @@ public class GachaSystem extends BaseGameSystem {
public GachaSystem(GameServer server) {
super(server);
this.gachaBanners = new Int2ObjectOpenHashMap<>();
ResourceLoader.runAsync(this::load);
this.load();
this.startWatcher(server);
}

4
src/main/java/emu/grasscutter/game/shop/ShopSystem.java
View File

@@ -5,7 +5,6 @@ import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.DataLoader;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.ResourceLoader;
import emu.grasscutter.data.common.ItemParamData;
import emu.grasscutter.data.excels.ShopGoodsData;
import emu.grasscutter.server.game.BaseGameSystem;
@@ -25,10 +24,9 @@ public class ShopSystem extends BaseGameSystem {
public ShopSystem(GameServer server) {
super(server);
this.shopData = new Int2ObjectOpenHashMap<>();
this.shopChestData = new Int2ObjectOpenHashMap<>();
ResourceLoader.runAsync(this::load);
this.load();
}
public static int getShopNextRefreshTime(ShopInfo shopInfo) {

3
src/main/java/emu/grasscutter/game/systems/AnnouncementSystem.java
View File

@@ -2,7 +2,6 @@ package emu.grasscutter.game.systems;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.DataLoader;
import emu.grasscutter.data.ResourceLoader;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.game.world.World;
import emu.grasscutter.net.proto.AnnounceDataOuterClass;
@@ -24,7 +23,7 @@ public class AnnouncementSystem extends BaseGameSystem {
public AnnouncementSystem(GameServer server) {
super(server);
this.announceConfigItemMap = new HashMap<>();
ResourceLoader.runAsync(this::loadConfig);
loadConfig();
}
private int loadConfig() {

4
src/main/java/emu/grasscutter/game/tower/TowerSystem.java
View File

@@ -3,7 +3,6 @@ package emu.grasscutter.game.tower;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.DataLoader;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.ResourceLoader;
import emu.grasscutter.data.excels.tower.TowerScheduleData;
import emu.grasscutter.server.game.BaseGameSystem;
import emu.grasscutter.server.game.GameServer;
@@ -16,8 +15,7 @@ public class TowerSystem extends BaseGameSystem {
public TowerSystem(GameServer server) {
super(server);
ResourceLoader.runAsync(this::load);
this.load();
}
public synchronized void load() {

3
src/main/java/emu/grasscutter/game/world/WorldDataSystem.java
View File

@@ -3,7 +3,6 @@ package emu.grasscutter.game.world;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.data.DataLoader;
import emu.grasscutter.data.GameData;
import emu.grasscutter.data.ResourceLoader;
import emu.grasscutter.data.excels.InvestigationMonsterData;
import emu.grasscutter.data.excels.RewardPreviewData;
import emu.grasscutter.data.excels.world.WorldLevelData;
@@ -32,7 +31,7 @@ public class WorldDataSystem extends BaseGameSystem {
this.chestInteractHandlerMap = new HashMap<>();
this.sceneInvestigationGroupMap = new ConcurrentHashMap<>();
ResourceLoader.runAsync(this::loadChestConfig);
loadChestConfig();
}
public synchronized void loadChestConfig() {