Split client code from server

src/ts/components/shared/actions-modal/actions-modal.ts

@@ -12,7 +12,7 @@ import {
 import { createExpression, readFileAsText } from '../../../client/clientUtils';
 import { ACTION_EXPRESSION_BG, ACTION_EXPRESSION_EYE_COLOR, fillToOutline } from '../../../common/colors';
 import { faLock, faApple, faLaughBeam, faComment, faCog, faCogs } from '../../../client/icons';
-import { createEyeSprite } from '../../../client/spriteUtils';
+import { createEyeSprite } from '../../../common/spriteUtils';
 import { times, hasFlag } from '../../../common/utils';
 import { PonyTownGame } from '../../../client/game';
 import { getEntityNames } from '../../services/model';

src/ts/components/shared/character-preview/character-preview.ts

@@ -6,16 +6,16 @@ import { toPalette } from '../../../common/ponyInfo';
 import { GRASS_COLOR, TRANSPARENT } from '../../../common/colors';
 import {
 	createCanvas, disableImageSmoothing, getPixelRatio, resizeCanvas, resizeCanvasWithRatio
-} from '../../../client/canvasUtils';
-import { BLINK_FRAMES } from '../../../client/ponyUtils';
-import { defaultPonyState, defaultDrawPonyOptions } from '../../../client/ponyHelpers';
+} from '../../../common/canvasUtils';
+import { BLINK_FRAMES } from '../../../common/ponyUtils';
+import { defaultPonyState, defaultDrawPonyOptions } from '../../../common/ponyHelpers';
 import { ContextSpriteBatch } from '../../../graphics/contextSpriteBatch';
 import { colorToCSS } from '../../../common/color';
-import { loadAndInitSpriteSheets } from '../../../client/spriteUtils';
 import { drawNamePlate, commonPalettes, DrawNameFlags } from '../../../graphics/graphicsUtils';
 import { drawPony } from '../../../client/ponyDraw';
 import { paletteSpriteSheet } from '../../../generated/sprites';
-import { replaceEmojis } from '../../../client/emoji';
+import { replaceEmojis } from '../../../common/emoji';
+import { loadAndInitSpriteSheets } from '../../../client/loadSprites';
 
 const DEFAULT_STATE = defaultPonyState();
 const DEFAULT_OPTIONS = defaultDrawPonyOptions();

src/ts/components/shared/chat-box/chat-box.ts

@@ -4,16 +4,17 @@ import { ChatType, isPartyChat, Entity, FakeEntity } from '../../../common/inter
 import { SAY_MAX_LENGTH } from '../../../common/constants';
 import { Key } from '../../../client/input/input';
 import { PonyTownGame } from '../../../client/game';
-import { cleanMessage, isSpamMessage } from '../../../client/clientUtils';
+import { isSpamMessage } from '../../../client/clientUtils';
 import { faComment, faAngleDoubleRight } from '../../../client/icons';
 import { isInParty } from '../../../client/partyUtils';
 import { handleActionCommand } from '../../../client/playerActions';
-import { hasHeadAnimation } from '../../../common/pony';
-import { AutocompleteState, autocompleteMesssage, replaceEmojis, emojis } from '../../../client/emoji';
+import { hasHeadAnimation } from '../../../client/pony';
+import { AutocompleteState, autocompleteMesssage, replaceEmojis, emojis } from '../../../common/emoji';
 import { replaceNodes } from '../../../client/htmlUtils';
 import { invalidEnumReturn } from '../../../common/utils';
 import { findMatchingEntityNames, findEntityOrMockByAnyMeans, findBestEntityByName } from '../../../client/handlers';
 import { sample } from 'lodash';
+import { cleanMessage } from '../../../common/stringUtils';
 
 const chatTypeNames: string[] = [];
 const chatTypeClasses: string[] = [];

src/ts/components/shared/chat-log/chat-log.ts

@@ -11,7 +11,7 @@ import { element, textNode, removeAllNodes, replaceNodes } from '../../../client
 import { DEFAULT_CHATLOG_OPACITY, PONY_TYPE, SECOND } from '../../../common/constants';
 import { faCaretUp, faArrowDown, faSearch } from '../../../client/icons';
 import { sampleMessages } from '../../../common/debugData';
-import { findEntityById } from '../../../common/worldMap';
+import { findEntityById } from '../../../client/worldMap';
 import { colorToRGBA, rgb2hsl, HSL, hsl2CSS } from '../../../common/color';
 import * as moment from 'moment';
 import { isMobile } from '../../../client/data';

src/ts/components/shared/discord-pony/discord-pony.ts

@@ -1,9 +1,9 @@
 import { Component, OnInit, OnDestroy, Input, ViewChild } from '@angular/core';
-import { defaultExpression } from '../../../client/ponyUtils';
-import { defaultPonyState } from '../../../client/ponyHelpers';
+import { defaultExpression } from '../../../common/ponyUtils';
+import { defaultPonyState } from '../../../common/ponyHelpers';
 import { DISCORD_PONY } from '../../../common/constants';
 import { Expression, Muzzle, HeadAnimation, Iris } from '../../../common/interfaces';
-import { excite } from '../../../client/ponyAnimations';
+import { excite } from '../../../common/ponyAnimations';
 import { FrameService, FrameLoop } from '../../services/frameService';
 import { CharacterPreview } from '../character-preview/character-preview';
 import { decompressPonyString } from '../../../common/compressPony';

src/ts/components/shared/emote-box/emote-box.ts

@@ -1,8 +1,8 @@
 import { Component, Input, AfterViewInit, ElementRef, ChangeDetectionStrategy, ViewChild, NgZone } from '@angular/core';
-import { findEmoji, getEmojiImageAsync } from '../../../client/emoji';
-import { loadAndInitSpriteSheets } from '../../../client/spriteUtils';
-import { font } from '../../../client/fonts';
+import { findEmoji, getEmojiImageAsync } from '../../../common/emoji';
+import { font } from '../../../common/fonts';
 import { getCharacterSprite } from '../../../graphics/spriteFont';
+import { loadAndInitSpriteSheets } from '../../../client/loadSprites';
 
 @Component({
 	selector: 'emote-box',

src/ts/components/shared/notification/notification-item.ts

@@ -3,7 +3,7 @@ import { PlayerAction, Notification, NotificationFlags, EntityPlayerState } from
 import { PonyTownGame } from '../../../client/game';
 import { hasFlag, setFlag } from '../../../common/utils';
 import { faBan } from '../../../client/icons';
-import { getPaletteInfo } from '../../../common/pony';
+import { getPaletteInfo } from '../../../client/pony';
 
 @Component({
 	selector: 'notification-item',

src/ts/components/shared/party-box/party-box.ts

@@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core';
 import { PartyMember } from '../../../common/interfaces';
 import { PonyTownGame } from '../../../client/game';
 import { partyLeaderIcon, offlineIcon } from '../../../client/icons';
-import { getPaletteInfo } from '../../../common/pony';
+import { getPaletteInfo } from '../../../client/pony';
 
 @Component({
 	selector: 'party-box',

src/ts/components/shared/play-box/play-box.ts

@@ -10,10 +10,10 @@ import { GameService } from '../../services/gameService';
 import { Model } from '../../services/model';
 import { faSpinner, faExclamationCircle, faInfoCircle, faGlobe, faStar, faWrench } from '../../../client/icons';
 import { isBrowserOutdated, hardReload, isAndroidBrowser } from '../../../client/clientUtils';
-import { loadAndInitSpriteSheets } from '../../../client/spriteUtils';
 import { StorageService } from '../../services/storageService';
 import { ErrorReporter } from '../../services/errorReporter';
 import { REQUEST_DATE_OF_BIRTH } from '../../../common/constants';
+import { loadAndInitSpriteSheets } from '../../../client/loadSprites';
 
 const ignoredErrors = [
 	WEBGL_CREATION_ERROR,

src/ts/components/shared/pony-box/pony-box.ts

@@ -1,6 +1,6 @@
 import { Component, Input, Output, EventEmitter } from '@angular/core';
 import { PlayerAction, Pony, EntityPlayerState, Entity } from '../../../common/interfaces';
-import { getPaletteInfo } from '../../../common/pony';
+import { getPaletteInfo } from '../../../client/pony';
 import { Model } from '../../services/model';
 import { PonyTownGame } from '../../../client/game';
 import {

src/ts/components/shared/portrait-box/portrait-box.ts

@@ -3,11 +3,11 @@ import {
 } from '@angular/core';
 import { PalettePonyInfo } from '../../../common/interfaces';
 import { ContextSpriteBatch } from '../../../graphics/contextSpriteBatch';
-import { createCanvas, disableImageSmoothing, getPixelRatio, resizeCanvasWithRatio } from '../../../client/canvasUtils';
-import { defaultDrawPonyOptions, defaultPonyState } from '../../../client/ponyHelpers';
-import { loadAndInitSpriteSheets } from '../../../client/spriteUtils';
+import { createCanvas, disableImageSmoothing, getPixelRatio, resizeCanvasWithRatio } from '../../../common/canvasUtils';
+import { defaultDrawPonyOptions, defaultPonyState } from '../../../common/ponyHelpers';
 import { drawPony } from '../../../client/ponyDraw';
 import { paletteSpriteSheet } from '../../../generated/sprites';
+import { loadAndInitSpriteSheets } from '../../../client/loadSprites';
 
 const scales: { [key: string]: number } = {
 	large: 3,

src/ts/components/shared/set-selection/set-selection.ts

@@ -1,7 +1,7 @@
 import { Component, Input, Output, EventEmitter, OnChanges, Directive, Optional } from '@angular/core';
 import { clamp } from 'lodash';
 import { SpriteSet, ColorExtraSets, ColorExtraSet } from '../../../common/interfaces';
-import { getColorCount } from '../../../client/spriteUtils';
+import { getColorCount } from '../../../common/spriteUtils';
 
 const FILLS = ['Orange', 'DodgerBlue', 'LimeGreen', 'Orchid', 'crimson', 'Aquamarine'];
 const OUTLINES = ['Chocolate', 'SteelBlue', 'ForestGreen', 'DarkOrchid', 'darkred', 'DarkTurquoise'];

src/ts/components/shared/sprite-box/sprite-box.ts

@@ -5,12 +5,12 @@ import { Rect, Sprite, ColorExtra, Palette } from '../../../common/interfaces';
 import { parseColor, colorToCSS } from '../../../common/color';
 import { mockPaletteManager, toColorList, getColorsFromSet } from '../../../common/ponyInfo';
 import { ContextSpriteBatch } from '../../../graphics/contextSpriteBatch';
-import { createCanvas, disableImageSmoothing, resizeCanvas } from '../../../client/canvasUtils';
+import { createCanvas, disableImageSmoothing, resizeCanvas } from '../../../common/canvasUtils';
 import { WHITE } from '../../../common/colors';
 import { rect } from '../../../common/rect';
-import { loadAndInitSpriteSheets } from '../../../client/spriteUtils';
 import { faTimes } from '../../../client/icons';
 import { paletteSpriteSheet } from '../../../generated/sprites';
+import { loadAndInitSpriteSheets } from '../../../client/loadSprites';
 
 let redrawFrame = 0;
 const forRedraw: SpriteBox[] = [];

src/ts/components/shared/visit-pt-pony/visit-pt-pony.ts

@@ -1,8 +1,8 @@
 import { Component, OnInit, OnDestroy, Input, ViewChild } from '@angular/core';
-import { defaultExpression } from '../../../client/ponyUtils';
-import { defaultPonyState } from '../../../client/ponyHelpers';
+import { defaultExpression } from '../../../common/ponyUtils';
+import { defaultPonyState } from '../../../common/ponyHelpers';
 import { Expression, Muzzle, HeadAnimation, BodyAnimation, Eye } from '../../../common/interfaces';
-import { excite_meno, happy_tongue_meno, stand, boop, happy_tongue_meno_2 } from '../../../client/ponyAnimations';
+import { excite_meno, happy_tongue_meno, stand, boop, happy_tongue_meno_2 } from '../../../common/ponyAnimations';
 import { FrameService, FrameLoop } from '../../services/frameService';
 import { CharacterPreview } from '../character-preview/character-preview';
 import { decompressPonyString } from '../../../common/compressPony';