Cleanup package names

This commit is contained in:
Melledy 2022-06-16 07:57:57 -07:00
parent 8fdf9bfddf
commit 0e6e950734
24 changed files with 1198 additions and 1198 deletions

View File

@ -6,8 +6,8 @@ import java.util.Calendar;
import emu.grasscutter.auth.AuthenticationSystem; import emu.grasscutter.auth.AuthenticationSystem;
import emu.grasscutter.auth.DefaultAuthentication; import emu.grasscutter.auth.DefaultAuthentication;
import emu.grasscutter.command.CommandMap; import emu.grasscutter.command.CommandMap;
import emu.grasscutter.game.managers.EnergyManager.EnergyManager; import emu.grasscutter.game.managers.energy.EnergyManager;
import emu.grasscutter.game.managers.StaminaManager.StaminaManager; import emu.grasscutter.game.managers.stamina.StaminaManager;
import emu.grasscutter.plugin.PluginManager; import emu.grasscutter.plugin.PluginManager;
import emu.grasscutter.plugin.api.ServerHook; import emu.grasscutter.plugin.api.ServerHook;
import emu.grasscutter.scripts.ScriptLoader; import emu.grasscutter.scripts.ScriptLoader;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -14,7 +14,6 @@ import emu.grasscutter.game.avatar.AvatarProfileData;
import emu.grasscutter.game.avatar.AvatarStorage; import emu.grasscutter.game.avatar.AvatarStorage;
import emu.grasscutter.game.entity.EntityMonster; import emu.grasscutter.game.entity.EntityMonster;
import emu.grasscutter.game.entity.EntityVehicle; import emu.grasscutter.game.entity.EntityVehicle;
import emu.grasscutter.game.managers.DeforestationManager.DeforestationManager;
import emu.grasscutter.game.entity.EntityGadget; import emu.grasscutter.game.entity.EntityGadget;
import emu.grasscutter.game.entity.EntityItem; import emu.grasscutter.game.entity.EntityItem;
import emu.grasscutter.game.entity.GameEntity; import emu.grasscutter.game.entity.GameEntity;
@ -28,18 +27,19 @@ import emu.grasscutter.game.mail.Mail;
import emu.grasscutter.game.mail.MailHandler; import emu.grasscutter.game.mail.MailHandler;
import emu.grasscutter.game.managers.InsectCaptureManager; import emu.grasscutter.game.managers.InsectCaptureManager;
import emu.grasscutter.game.managers.ResinManager; import emu.grasscutter.game.managers.ResinManager;
import emu.grasscutter.game.managers.StaminaManager.StaminaManager; import emu.grasscutter.game.managers.deforestation.DeforestationManager;
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.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.ActionReason;
import emu.grasscutter.game.props.EntityType; import emu.grasscutter.game.props.EntityType;
import emu.grasscutter.game.props.PlayerProperty; import emu.grasscutter.game.props.PlayerProperty;
import emu.grasscutter.game.props.SceneType; import emu.grasscutter.game.props.SceneType;
import emu.grasscutter.game.quest.QuestManager; import emu.grasscutter.game.quest.QuestManager;
import emu.grasscutter.game.shop.ShopLimit; import emu.grasscutter.game.shop.ShopLimit;
import emu.grasscutter.game.managers.MapMarkManager.*;
import emu.grasscutter.game.tower.TowerData; import emu.grasscutter.game.tower.TowerData;
import emu.grasscutter.game.tower.TowerManager; import emu.grasscutter.game.tower.TowerManager;
import emu.grasscutter.game.world.Scene; import emu.grasscutter.game.world.Scene;

View File

@ -10,10 +10,10 @@ import emu.grasscutter.game.drop.DropManager;
import emu.grasscutter.game.dungeons.DungeonManager; import emu.grasscutter.game.dungeons.DungeonManager;
import emu.grasscutter.game.expedition.ExpeditionManager; import emu.grasscutter.game.expedition.ExpeditionManager;
import emu.grasscutter.game.gacha.GachaManager; 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.InventoryManager;
import emu.grasscutter.game.managers.MultiplayerManager; 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.player.Player;
import emu.grasscutter.game.quest.ServerQuestHandler; import emu.grasscutter.game.quest.ServerQuestHandler;
import emu.grasscutter.game.shop.ShopManager; import emu.grasscutter.game.shop.ShopManager;

View File

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