Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
ziqian zhang
Grasscutter
Commits
a23b29b6
Commit
a23b29b6
authored
May 28, 2022
by
Melledy
Browse files
Rename excel classes
parent
f1398182
Changes
119
Hide whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/game/entity/EntityMonster.java
View file @
a23b29b6
...
...
@@ -2,8 +2,8 @@ package emu.grasscutter.game.entity;
import
emu.grasscutter.data.GameData
;
import
emu.grasscutter.data.common.PropGrowCurve
;
import
emu.grasscutter.data.
def
.MonsterCurveData
;
import
emu.grasscutter.data.
def
.MonsterData
;
import
emu.grasscutter.data.
excels
.MonsterCurveData
;
import
emu.grasscutter.data.
excels
.MonsterData
;
import
emu.grasscutter.game.dungeons.DungeonChallenge
;
import
emu.grasscutter.game.player.Player
;
import
emu.grasscutter.game.props.EntityIdType
;
...
...
src/main/java/emu/grasscutter/game/gacha/GachaManager.java
View file @
a23b29b6
...
...
@@ -18,7 +18,7 @@ import emu.grasscutter.Grasscutter;
import
emu.grasscutter.data.DataLoader
;
import
emu.grasscutter.data.GameData
;
import
emu.grasscutter.data.common.ItemParamData
;
import
emu.grasscutter.data.
def
.ItemData
;
import
emu.grasscutter.data.
excels
.ItemData
;
import
emu.grasscutter.database.DatabaseHelper
;
import
emu.grasscutter.game.avatar.Avatar
;
import
emu.grasscutter.game.gacha.GachaBanner.BannerType
;
...
...
src/main/java/emu/grasscutter/game/inventory/GameItem.java
View file @
a23b29b6
...
...
@@ -15,9 +15,9 @@ import dev.morphia.annotations.Transient;
import
emu.grasscutter.data.GameData
;
import
emu.grasscutter.data.GameDepot
;
import
emu.grasscutter.data.
def
.ItemData
;
import
emu.grasscutter.data.
def
.ReliquaryAffixData
;
import
emu.grasscutter.data.
def
.ReliquaryMainPropData
;
import
emu.grasscutter.data.
excels
.ItemData
;
import
emu.grasscutter.data.
excels
.ReliquaryAffixData
;
import
emu.grasscutter.data.
excels
.ReliquaryMainPropData
;
import
emu.grasscutter.database.DatabaseHelper
;
import
emu.grasscutter.game.player.Player
;
import
emu.grasscutter.game.props.FightProperty
;
...
...
src/main/java/emu/grasscutter/game/inventory/Inventory.java
View file @
a23b29b6
...
...
@@ -8,10 +8,10 @@ import java.util.List;
import
emu.grasscutter.GameConstants
;
import
emu.grasscutter.data.GameData
;
import
emu.grasscutter.data.common.ItemParamData
;
import
emu.grasscutter.data.
def
.AvatarCostumeData
;
import
emu.grasscutter.data.
def
.AvatarData
;
import
emu.grasscutter.data.
def
.AvatarFlycloakData
;
import
emu.grasscutter.data.
def
.ItemData
;
import
emu.grasscutter.data.
excels
.AvatarCostumeData
;
import
emu.grasscutter.data.
excels
.AvatarData
;
import
emu.grasscutter.data.
excels
.AvatarFlycloakData
;
import
emu.grasscutter.data.
excels
.ItemData
;
import
emu.grasscutter.database.DatabaseHelper
;
import
emu.grasscutter.game.avatar.AvatarStorage
;
import
emu.grasscutter.game.avatar.Avatar
;
...
...
src/main/java/emu/grasscutter/game/managers/EnergyManager/EnergyManager.java
View file @
a23b29b6
...
...
@@ -3,9 +3,9 @@ package emu.grasscutter.game.managers.EnergyManager;
import
emu.grasscutter.Grasscutter
;
import
emu.grasscutter.data.DataLoader
;
import
emu.grasscutter.data.GameData
;
import
emu.grasscutter.data.
def
.AvatarSkillDepotData
;
import
emu.grasscutter.data.
def
.ItemData
;
import
emu.grasscutter.data.
def
.MonsterData.HpDrops
;
import
emu.grasscutter.data.
excels
.AvatarSkillDepotData
;
import
emu.grasscutter.data.
excels
.ItemData
;
import
emu.grasscutter.data.
excels
.MonsterData.HpDrops
;
import
emu.grasscutter.game.avatar.Avatar
;
import
emu.grasscutter.game.entity.EntityAvatar
;
import
emu.grasscutter.game.entity.EntityClientGadget
;
...
...
src/main/java/emu/grasscutter/game/managers/InventoryManager.java
View file @
a23b29b6
...
...
@@ -7,17 +7,17 @@ import java.util.Map;
import
java.util.stream.Collectors
;
import
emu.grasscutter.data.GameData
;
import
emu.grasscutter.data.binout.OpenConfigEntry
;
import
emu.grasscutter.data.binout.OpenConfigEntry.SkillPointModifier
;
import
emu.grasscutter.data.common.ItemParamData
;
import
emu.grasscutter.data.custom.OpenConfigEntry
;
import
emu.grasscutter.data.custom.OpenConfigEntry.SkillPointModifier
;
import
emu.grasscutter.data.def.AvatarPromoteData
;
import
emu.grasscutter.data.def.AvatarSkillData
;
import
emu.grasscutter.data.def.AvatarSkillDepotData
;
import
emu.grasscutter.data.def.ItemData
;
import
emu.grasscutter.data.def.WeaponPromoteData
;
import
emu.grasscutter.data.def.AvatarSkillDepotData.InherentProudSkillOpens
;
import
emu.grasscutter.data.def.AvatarTalentData
;
import
emu.grasscutter.data.def.ProudSkillData
;
import
emu.grasscutter.data.excels.AvatarPromoteData
;
import
emu.grasscutter.data.excels.AvatarSkillData
;
import
emu.grasscutter.data.excels.AvatarSkillDepotData
;
import
emu.grasscutter.data.excels.AvatarTalentData
;
import
emu.grasscutter.data.excels.ItemData
;
import
emu.grasscutter.data.excels.ProudSkillData
;
import
emu.grasscutter.data.excels.WeaponPromoteData
;
import
emu.grasscutter.data.excels.AvatarSkillDepotData.InherentProudSkillOpens
;
import
emu.grasscutter.game.avatar.Avatar
;
import
emu.grasscutter.game.inventory.GameItem
;
import
emu.grasscutter.game.inventory.ItemType
;
...
...
src/main/java/emu/grasscutter/game/player/Player.java
View file @
a23b29b6
...
...
@@ -3,7 +3,7 @@ package emu.grasscutter.game.player;
import
dev.morphia.annotations.*
;
import
emu.grasscutter.GameConstants
;
import
emu.grasscutter.data.GameData
;
import
emu.grasscutter.data.
def
.PlayerLevelData
;
import
emu.grasscutter.data.
excels
.PlayerLevelData
;
import
emu.grasscutter.database.DatabaseHelper
;
import
emu.grasscutter.game.Account
;
import
emu.grasscutter.game.CoopRequest
;
...
...
src/main/java/emu/grasscutter/game/player/PlayerCodex.java
View file @
a23b29b6
...
...
@@ -3,8 +3,8 @@ package emu.grasscutter.game.player;
import
dev.morphia.annotations.Entity
;
import
dev.morphia.annotations.Transient
;
import
emu.grasscutter.data.GameData
;
import
emu.grasscutter.data.
def
.CodexAnimalData
;
import
emu.grasscutter.data.
def
.CodexReliquaryData
;
import
emu.grasscutter.data.
excels
.CodexAnimalData
;
import
emu.grasscutter.data.
excels
.CodexReliquaryData
;
import
emu.grasscutter.game.entity.EntityMonster
;
import
emu.grasscutter.game.entity.GameEntity
;
import
emu.grasscutter.game.inventory.GameItem
;
...
...
src/main/java/emu/grasscutter/game/player/TeamManager.java
View file @
a23b29b6
...
...
@@ -5,7 +5,7 @@ import java.util.*;
import
dev.morphia.annotations.Entity
;
import
dev.morphia.annotations.Transient
;
import
emu.grasscutter.GameConstants
;
import
emu.grasscutter.data.
def
.AvatarSkillDepotData
;
import
emu.grasscutter.data.
excels
.AvatarSkillDepotData
;
import
emu.grasscutter.game.avatar.Avatar
;
import
emu.grasscutter.game.entity.EntityAvatar
;
import
emu.grasscutter.game.entity.EntityBaseGadget
;
...
...
src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
View file @
a23b29b6
...
...
@@ -11,8 +11,8 @@ import dev.morphia.annotations.Id;
import
dev.morphia.annotations.Indexed
;
import
dev.morphia.annotations.Transient
;
import
emu.grasscutter.data.GameData
;
import
emu.grasscutter.data.
custom
.MainQuestData
;
import
emu.grasscutter.data.
def
.RewardData
;
import
emu.grasscutter.data.
binout
.MainQuestData
;
import
emu.grasscutter.data.
excels
.RewardData
;
import
emu.grasscutter.database.DatabaseHelper
;
import
emu.grasscutter.game.player.Player
;
import
emu.grasscutter.game.props.ActionReason
;
...
...
src/main/java/emu/grasscutter/game/quest/GameQuest.java
View file @
a23b29b6
...
...
@@ -3,10 +3,10 @@ package emu.grasscutter.game.quest;
import
dev.morphia.annotations.Entity
;
import
dev.morphia.annotations.Transient
;
import
emu.grasscutter.data.GameData
;
import
emu.grasscutter.data.
custom
.MainQuestData
;
import
emu.grasscutter.data.
custom
.MainQuestData.SubQuestData
;
import
emu.grasscutter.data.
def
.QuestData
;
import
emu.grasscutter.data.
def
.QuestData.QuestCondition
;
import
emu.grasscutter.data.
binout
.MainQuestData
;
import
emu.grasscutter.data.
binout
.MainQuestData.SubQuestData
;
import
emu.grasscutter.data.
excels
.QuestData
;
import
emu.grasscutter.data.
excels
.QuestData.QuestCondition
;
import
emu.grasscutter.game.player.Player
;
import
emu.grasscutter.game.quest.enums.LogicType
;
import
emu.grasscutter.game.quest.enums.QuestState
;
...
...
src/main/java/emu/grasscutter/game/quest/QuestManager.java
View file @
a23b29b6
...
...
@@ -9,8 +9,8 @@ import java.util.function.Consumer;
import
java.util.function.Function
;
import
emu.grasscutter.data.GameData
;
import
emu.grasscutter.data.
def
.QuestData
;
import
emu.grasscutter.data.
def
.QuestData.QuestCondition
;
import
emu.grasscutter.data.
excels
.QuestData
;
import
emu.grasscutter.data.
excels
.QuestData.QuestCondition
;
import
emu.grasscutter.database.DatabaseHelper
;
import
emu.grasscutter.game.player.Player
;
import
emu.grasscutter.game.quest.enums.QuestTrigger
;
...
...
src/main/java/emu/grasscutter/game/quest/ServerQuestHandler.java
View file @
a23b29b6
...
...
@@ -5,7 +5,7 @@ import java.util.Set;
import
org.reflections.Reflections
;
import
emu.grasscutter.Grasscutter
;
import
emu.grasscutter.data.
def
.QuestData.QuestCondition
;
import
emu.grasscutter.data.
excels
.QuestData.QuestCondition
;
import
emu.grasscutter.game.quest.handlers.QuestBaseHandler
;
import
it.unimi.dsi.fastutil.ints.Int2ObjectMap
;
import
it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap
;
...
...
src/main/java/emu/grasscutter/game/quest/conditions/BaseCondition.java
View file @
a23b29b6
package
emu.grasscutter.game.quest.conditions
;
import
emu.grasscutter.data.def.QuestData.QuestCondition
;
import
emu.grasscutter.game.quest.QuestValue
;
import
emu.grasscutter.data.excels.QuestData.QuestCondition
;
import
emu.grasscutter.game.quest.GameQuest
;
import
emu.grasscutter.game.quest.enums.QuestTrigger
;
import
emu.grasscutter.game.quest.handlers.QuestBaseHandler
;
...
...
src/main/java/emu/grasscutter/game/quest/conditions/ConditionPlayerLevelEqualGreater.java
View file @
a23b29b6
package
emu.grasscutter.game.quest.conditions
;
import
emu.grasscutter.data.def.QuestData.QuestCondition
;
import
emu.grasscutter.game.quest.QuestValue
;
import
emu.grasscutter.data.excels.QuestData.QuestCondition
;
import
emu.grasscutter.game.quest.GameQuest
;
import
emu.grasscutter.game.quest.enums.QuestTrigger
;
import
emu.grasscutter.game.quest.handlers.QuestBaseHandler
;
...
...
src/main/java/emu/grasscutter/game/quest/conditions/ConditionStateEqual.java
View file @
a23b29b6
package
emu.grasscutter.game.quest.conditions
;
import
emu.grasscutter.data.def.QuestData.QuestCondition
;
import
emu.grasscutter.game.quest.QuestValue
;
import
emu.grasscutter.data.excels.QuestData.QuestCondition
;
import
emu.grasscutter.game.quest.GameQuest
;
import
emu.grasscutter.game.quest.enums.QuestTrigger
;
import
emu.grasscutter.game.quest.handlers.QuestBaseHandler
;
...
...
src/main/java/emu/grasscutter/game/quest/content/BaseContent.java
View file @
a23b29b6
package
emu.grasscutter.game.quest.content
;
import
emu.grasscutter.data.def.QuestData.QuestCondition
;
import
emu.grasscutter.game.quest.QuestValue
;
import
emu.grasscutter.data.excels.QuestData.QuestCondition
;
import
emu.grasscutter.game.quest.GameQuest
;
import
emu.grasscutter.game.quest.enums.QuestTrigger
;
import
emu.grasscutter.game.quest.handlers.QuestBaseHandler
;
...
...
src/main/java/emu/grasscutter/game/quest/content/ContentCompleteTalk.java
View file @
a23b29b6
package
emu.grasscutter.game.quest.content
;
import
emu.grasscutter.data.def.QuestData.QuestCondition
;
import
emu.grasscutter.game.quest.QuestValue
;
import
emu.grasscutter.data.excels.QuestData.QuestCondition
;
import
emu.grasscutter.game.quest.GameQuest
;
import
emu.grasscutter.game.quest.enums.QuestTrigger
;
import
emu.grasscutter.game.quest.handlers.QuestBaseHandler
;
...
...
src/main/java/emu/grasscutter/game/quest/content/ContentEnterDungeon.java
View file @
a23b29b6
package
emu.grasscutter.game.quest.content
;
import
emu.grasscutter.data.def.QuestData.QuestCondition
;
import
emu.grasscutter.game.quest.QuestValue
;
import
emu.grasscutter.data.excels.QuestData.QuestCondition
;
import
emu.grasscutter.game.quest.GameQuest
;
import
emu.grasscutter.game.quest.enums.QuestTrigger
;
import
emu.grasscutter.game.quest.handlers.QuestBaseHandler
;
...
...
src/main/java/emu/grasscutter/game/quest/content/ContentFinishPlot.java
View file @
a23b29b6
package
emu.grasscutter.game.quest.content
;
import
emu.grasscutter.data.def.QuestData.QuestCondition
;
import
emu.grasscutter.game.quest.QuestValue
;
import
emu.grasscutter.data.excels.QuestData.QuestCondition
;
import
emu.grasscutter.game.quest.GameQuest
;
import
emu.grasscutter.game.quest.enums.QuestTrigger
;
import
emu.grasscutter.game.quest.handlers.QuestBaseHandler
;
...
...
Prev
1
2
3
4
5
6
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment