diff --git a/apps/Gruntfile.js b/apps/Gruntfile.js index 6b86707707f10..099d7e54b49cf 100644 --- a/apps/Gruntfile.js +++ b/apps/Gruntfile.js @@ -141,7 +141,7 @@ describe('entry tests', () => { }, { expand: true, - cwd: 'node_modules/@code-dot-org/craft/src/assets', + cwd: 'node_modules/@code-dot-org/craft/dist/assets', src: ['**'], dest: 'build/package/media/skins/craft', }, diff --git a/apps/package.json b/apps/package.json index fed5d52dd15f7..34b5452cd7cc1 100644 --- a/apps/package.json +++ b/apps/package.json @@ -44,7 +44,7 @@ "@code-dot-org/artist": "0.2.1", "@code-dot-org/blockly": "2.4.1", "@code-dot-org/bramble": "0.1.26", - "@code-dot-org/craft": "github:code-dot-org/craft#46cddf8482ef7fad2cd1c4e9ce813c7fde4e8adf", + "@code-dot-org/craft": "0.1.3", "@code-dot-org/johnny-five": "0.11.1-cdo.2", "@code-dot-org/js-interpreter-tyrant": "0.2.2", "@code-dot-org/js-numbers": "0.1.0-cdo.0", diff --git a/apps/src/craft/agent/craft.js b/apps/src/craft/agent/craft.js index 0c6b29c763a7c..6b9f927d6186e 100644 --- a/apps/src/craft/agent/craft.js +++ b/apps/src/craft/agent/craft.js @@ -8,10 +8,12 @@ import { tryGetLocalStorage, trySetLocalStorage } from '../../utils'; import { singleton as studioApp } from '../../StudioApp'; import craftMsg from './locale'; import CustomMarshalingInterpreter from '../../lib/tools/jsinterpreter/CustomMarshalingInterpreter'; -import GameController from '@code-dot-org/craft/src/js/game/GameController'; -import FacingDirection from '@code-dot-org/craft/src/js/game/LevelMVC/FacingDirection'; -import EventType from '@code-dot-org/craft/src/js/game/Event/EventType'; -import { convertActionPlaneEntitiesToConfig } from '@code-dot-org/craft/src/js/game/LevelMVC/Utils'; +import { + GameController, + FacingDirection, + EventType, + utils as CraftUtils, +} from '@code-dot-org/craft'; import dom from '../../dom'; import MusicController from '../../MusicController'; import { Provider } from 'react-redux'; @@ -470,7 +472,7 @@ export default class Craft { } static initializeAppLevel(levelConfig) { - convertActionPlaneEntitiesToConfig(levelConfig); + CraftUtils.convertActionPlaneEntitiesToConfig(levelConfig); const fluffPlane = []; // TODO(bjordan): remove configuration requirement in visualization diff --git a/apps/src/craft/designer/blocks.js b/apps/src/craft/designer/blocks.js index 10b7f4e7bac62..cf0aa71b86eac 100644 --- a/apps/src/craft/designer/blocks.js +++ b/apps/src/craft/designer/blocks.js @@ -2,7 +2,7 @@ const i18n = require('./locale'); import { singleton as studioApp } from '../../StudioApp'; import { stripQuotes } from '../../utils'; import _ from 'lodash'; -import eventTypes from '@code-dot-org/craft/src/js/game/Event/EventType'; +import { EventType } from '@code-dot-org/craft'; const ENTITY_INPUT_EXTRA_SPACING = 14; @@ -290,12 +290,12 @@ export const install = (blockly, blockInstallOptions) => { }; const statementNameToEvent = { - WHEN_USED: eventTypes.WhenUsed, - WHEN_TOUCHED: eventTypes.WhenTouched, - WHEN_SPAWNED: eventTypes.WhenSpawned, - WHEN_ATTACKED: eventTypes.WhenAttacked, - WHEN_NIGHT: eventTypes.WhenNight, - WHEN_DAY: eventTypes.WhenDay, + WHEN_USED: EventType.WhenUsed, + WHEN_TOUCHED: EventType.WhenTouched, + WHEN_SPAWNED: EventType.WhenSpawned, + WHEN_ATTACKED: EventType.WhenAttacked, + WHEN_NIGHT: EventType.WhenNight, + WHEN_DAY: EventType.WhenDay, }; const defaultEventOrder = [ @@ -391,9 +391,9 @@ export const install = (blockly, blockInstallOptions) => { }; } - makeGlobalEventBlock('whenDay', i18n.eventTypeWhenDay(), eventTypes.WhenDayGlobal); - makeGlobalEventBlock('whenNight', i18n.eventTypeWhenNight(), eventTypes.WhenNightGlobal); - makeGlobalEventBlock('whenRun', i18n.eventTypeWhenRun(), eventTypes.WhenRun); + makeGlobalEventBlock('whenDay', i18n.eventTypeWhenDay(), EventType.WhenDayGlobal); + makeGlobalEventBlock('whenNight', i18n.eventTypeWhenNight(), EventType.WhenNightGlobal); + makeGlobalEventBlock('whenRun', i18n.eventTypeWhenRun(), EventType.WhenRun); function dropdownEntityBlock(simpleFunctionName, blockText, dropdownArray, doSort) { blockly.Blocks[`craft_${simpleFunctionName}`] = { diff --git a/apps/src/craft/designer/craft.js b/apps/src/craft/designer/craft.js index c4b6b5b7e4af9..e9558bc774cac 100644 --- a/apps/src/craft/designer/craft.js +++ b/apps/src/craft/designer/craft.js @@ -7,9 +7,11 @@ import Hammer from "hammerjs"; import {singleton as studioApp} from '../../StudioApp'; import craftMsg from './locale'; import CustomMarshalingInterpreter from '../../lib/tools/jsinterpreter/CustomMarshalingInterpreter'; -import GameController from '@code-dot-org/craft/src/js/game/GameController'; -import FacingDirection from '@code-dot-org/craft/src/js/game/LevelMVC/FacingDirection'; -import {convertActionPlaneEntitiesToConfig} from '@code-dot-org/craft/src/js/game/LevelMVC/Utils'; +import { + GameController, + FacingDirection, + utils as CraftUtils, +} from '@code-dot-org/craft'; import dom from '../../dom'; import eventsLevelbuilderOverrides from './eventsLevelbuilderOverrides'; import MusicController from '../../MusicController'; @@ -488,7 +490,7 @@ Craft.clearPlayerState = function () { }; Craft.initializeAppLevel = function (levelConfig) { - convertActionPlaneEntitiesToConfig(levelConfig); + CraftUtils.convertActionPlaneEntitiesToConfig(levelConfig); // Fluff plane is no longer configured by level builders, pass in an empty plane const fluffPlane = []; diff --git a/apps/src/craft/simple/craft.js b/apps/src/craft/simple/craft.js index c78d6fe53dd5d..05599b9845fc4 100644 --- a/apps/src/craft/simple/craft.js +++ b/apps/src/craft/simple/craft.js @@ -5,9 +5,11 @@ import trackEvent from '../../util/trackEvent'; var studioApp = require('../../StudioApp').singleton; var craftMsg = require('./locale'); import CustomMarshalingInterpreter from '../../lib/tools/jsinterpreter/CustomMarshalingInterpreter'; -import GameController from '@code-dot-org/craft/src/js/game/GameController'; -import EventType from '@code-dot-org/craft/src/js/game/Event/EventType'; -import {convertActionPlaneEntitiesToConfig} from '@code-dot-org/craft/src/js/game/LevelMVC/Utils'; +import { + GameController, + EventType, + utils as CraftUtils, +} from '@code-dot-org/craft'; var dom = require('../../dom'); var houseLevels = require('./houseLevels'); var levelbuilderOverrides = require('./levelbuilderOverrides'); @@ -435,7 +437,7 @@ Craft.onHouseSelected = function (houseType) { }; Craft.initializeAppLevel = function (levelConfig) { - convertActionPlaneEntitiesToConfig(levelConfig); + CraftUtils.convertActionPlaneEntitiesToConfig(levelConfig); var houseBlocks = JSON.parse(window.localStorage.getItem('craftHouseBlocks')); Craft.foldInCustomHouseBlocks(houseBlocks, levelConfig); diff --git a/apps/webpack.js b/apps/webpack.js index e36deceb79fd1..195ad0a0bfaf7 100644 --- a/apps/webpack.js +++ b/apps/webpack.js @@ -17,7 +17,6 @@ var toTranspileWithinNodeModules = [ path.resolve(__dirname, 'node_modules', 'chai-as-promised'), path.resolve(__dirname, 'node_modules', 'enzyme-wait'), path.resolve(__dirname, 'node_modules', 'json-parse-better-errors'), - path.resolve(__dirname, 'node_modules', '@code-dot-org', 'craft'), ]; const scssIncludePath = path.resolve(__dirname, '..', 'shared', 'css'); diff --git a/apps/yarn.lock b/apps/yarn.lock index 30585373d2472..02172c7bc65ee 100644 --- a/apps/yarn.lock +++ b/apps/yarn.lock @@ -50,9 +50,9 @@ semver "^4.1.0" xmldoc "^0.1.2" -"@code-dot-org/craft@github:code-dot-org/craft#46cddf8482ef7fad2cd1c4e9ce813c7fde4e8adf": - version "0.1.2" - resolved "https://codeload.github.com/code-dot-org/craft/tar.gz/46cddf8482ef7fad2cd1c4e9ce813c7fde4e8adf" +"@code-dot-org/craft@0.1.3": + version "0.1.3" + resolved "https://registry.yarnpkg.com/@code-dot-org/craft/-/craft-0.1.3.tgz#428a1b02aadf6256c2ab968738e5a080f3a59c08" "@code-dot-org/johnny-five@0.11.1-cdo.2": version "0.11.1-cdo.2"