use @turbowarp/paper

JeremyGamer13 · JeremyGamer13 · commit 924d7c18e0e2 · 2024-11-03T23:42:01.000-07:00
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
-# TurboWarp/scratch-paint
+# PenguinMod/PenguinMod-Paint
 
-Modified version of scratch-paint for TurboWarp
+Modified version of scratch-paint from TurboWarp for use in PenguinMod.
+Uses @turbowarp/paper as it includes some nice fixes.
 
 ## License
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "url": "git+ssh://git@github.com/LLK/scratch-paint.git"
   },
   "dependencies": {
-    "@scratch/paper": "0.11.20200728195508",
+    "@turbowarp/paper": "^0.12.202407262155",
     "classnames": "2.2.5",
     "keymirror": "0.1.1",
     "lodash.bindall": "4.4.0",
@@ -44,7 +44,7 @@
     "react-style-proptype": "^3",
     "react-tooltip": "^3",
     "redux": "^3",
-    "scratch-render-fonts": "^1.0.0-prerelease.20210401210003"
+    "scratch-render-fonts": "github:PenguinMod/penguinmod-render-fonts#master"
   },
   "devDependencies": {
     "autoprefixer": "9.7.4",
@@ -93,7 +93,7 @@
     "regenerator-runtime": "0.13.9",
     "rimraf": "2.7.1",
     "scratch-l10n": "3.14.20220428031608",
-    "scratch-render-fonts": "1.0.0-prerelease.20210401210003",
+    "scratch-render-fonts": "github:PenguinMod/penguinmod-render-fonts#master",
     "style-loader": "1.3.0",
     "svg-url-loader": "3.0.3",
     "tap": "14.11.0",
diff --git a/src/components/paint-editor/paint-editor.jsx b/src/components/paint-editor/paint-editor.jsx
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import classNames from 'classnames';
 import {defineMessages, injectIntl, intlShape} from 'react-intl';
 import React from 'react';
diff --git a/src/containers/arrow-mode.jsx b/src/containers/arrow-mode.jsx
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { connect } from 'react-redux';
diff --git a/src/containers/bit-oval-mode.jsx b/src/containers/bit-oval-mode.jsx
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import PropTypes from 'prop-types';
 import React from 'react';
 import {connect} from 'react-redux';
diff --git a/src/containers/bit-rect-mode.jsx b/src/containers/bit-rect-mode.jsx
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import PropTypes from 'prop-types';
 import React from 'react';
 import {connect} from 'react-redux';
diff --git a/src/containers/bit-select-mode.jsx b/src/containers/bit-select-mode.jsx
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import PropTypes from 'prop-types';
 import React from 'react';
 import {connect} from 'react-redux';
diff --git a/src/containers/color-picker.jsx b/src/containers/color-picker.jsx
@@ -1,6 +1,6 @@
 import bindAll from 'lodash.bindall';
 import {connect} from 'react-redux';
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import parseColor from 'parse-color';
 import PropTypes from 'prop-types';
 import React from 'react';
diff --git a/src/containers/dragon-mode.jsx b/src/containers/dragon-mode.jsx
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { connect } from 'react-redux';
diff --git a/src/containers/font-dropdown.jsx b/src/containers/font-dropdown.jsx
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import {connect} from 'react-redux';
 import bindAll from 'lodash.bindall';
 import PropTypes from 'prop-types';
diff --git a/src/containers/line-mode.jsx b/src/containers/line-mode.jsx
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import PropTypes from 'prop-types';
 import React from 'react';
 import {connect} from 'react-redux';
diff --git a/src/containers/mode-tools.jsx b/src/containers/mode-tools.jsx
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import React from 'react';
 import PropTypes from 'prop-types';
 import {connect} from 'react-redux';
diff --git a/src/containers/oval-mode.jsx b/src/containers/oval-mode.jsx
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import PropTypes from 'prop-types';
 import React from 'react';
 import {connect} from 'react-redux';
diff --git a/src/containers/paint-editor.jsx b/src/containers/paint-editor.jsx
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import PropTypes from 'prop-types';
 import log from '../log/log';
 import React from 'react';
diff --git a/src/containers/paper-canvas.jsx b/src/containers/paper-canvas.jsx
@@ -2,7 +2,7 @@ import bindAll from 'lodash.bindall';
 import PropTypes from 'prop-types';
 import React from 'react';
 import {connect} from 'react-redux';
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import Formats from '../lib/format';
 import log from '../log/log';
 
diff --git a/src/containers/rect-mode.jsx b/src/containers/rect-mode.jsx
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import PropTypes from 'prop-types';
 import React from 'react';
 import {connect} from 'react-redux';
diff --git a/src/containers/rounded-rect-mode.jsx b/src/containers/rounded-rect-mode.jsx
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import PropTypes from 'prop-types';
 import React from 'react';
 import {connect} from 'react-redux';
diff --git a/src/containers/scrollable-canvas.jsx b/src/containers/scrollable-canvas.jsx
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import PropTypes from 'prop-types';
 
 import React from 'react';
diff --git a/src/containers/select-mode.jsx b/src/containers/select-mode.jsx
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import PropTypes from 'prop-types';
 import React from 'react';
 import {connect} from 'react-redux';
diff --git a/src/containers/sussy-mode.jsx b/src/containers/sussy-mode.jsx
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { connect } from 'react-redux';
diff --git a/src/containers/text-mode.jsx b/src/containers/text-mode.jsx
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import PropTypes from 'prop-types';
 import React from 'react';
 import {connect} from 'react-redux';
diff --git a/src/containers/triangle-mode.jsx b/src/containers/triangle-mode.jsx
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { connect } from 'react-redux';
diff --git a/src/helper/bit-tools/brush-tool.js b/src/helper/bit-tools/brush-tool.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import {getRaster, getGuideLayer, createCanvas} from '../layer';
 import {doesColorRequireMask, forEachLinePoint, getBrushMark} from '../bitmap';
 
diff --git a/src/helper/bit-tools/fill-tool.js b/src/helper/bit-tools/fill-tool.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import {floodFill, floodFillAll, getHitBounds} from '../bitmap';
 import {createGradientObject} from '../style-path';
 import {createCanvas, getRaster} from '../layer';
diff --git a/src/helper/bit-tools/line-tool.js b/src/helper/bit-tools/line-tool.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import {getRaster, createCanvas, getGuideLayer} from '../layer';
 import {createMaskingCanvas, forEachLinePoint, getBrushMark} from '../bitmap';
 import {ART_BOARD_WIDTH, ART_BOARD_HEIGHT} from '../view';
diff --git a/src/helper/bit-tools/oval-tool.js b/src/helper/bit-tools/oval-tool.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import Modes from '../../lib/modes';
 import {styleShape} from '../style-path';
 import {commitOvalToBitmap} from '../bitmap';
diff --git a/src/helper/bit-tools/rect-tool.js b/src/helper/bit-tools/rect-tool.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import Modes from '../../lib/modes';
 import {styleShape} from '../../helper/style-path';
 import {commitRectToBitmap} from '../bitmap';
diff --git a/src/helper/bit-tools/select-tool.js b/src/helper/bit-tools/select-tool.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import Modes from '../../lib/modes';
 
 import {getRaster} from '../layer';
diff --git a/src/helper/bitmap.js b/src/helper/bitmap.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import {createCanvas, clearRaster, getRaster, hideGuideLayers, showGuideLayers} from './layer';
 import {getGuideColor} from './guides';
 import {clearSelection} from './selection';
diff --git a/src/helper/blob-tools/blob.js b/src/helper/blob-tools/blob.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import log from '../../log/log';
 import BroadBrushHelper from './broad-brush-helper';
 import SegmentBrushHelper from './segment-brush-helper';
diff --git a/src/helper/blob-tools/broad-brush-helper.js b/src/helper/blob-tools/broad-brush-helper.js
@@ -1,5 +1,5 @@
 // Broadbrush based on http://paperjs.org/tutorials/interaction/working-with-mouse-vectors/
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import {styleBlob} from '../../helper/style-path';
 import log from '../../log/log';
 
diff --git a/src/helper/blob-tools/segment-brush-helper.js b/src/helper/blob-tools/segment-brush-helper.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import {styleBlob} from '../../helper/style-path';
 
 /**
diff --git a/src/helper/group.js b/src/helper/group.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import {getRootItem, isGroupItem} from './item';
 import {clearSelection, getSelectedRootItems, setItemSelection} from './selection';
 
diff --git a/src/helper/guides.js b/src/helper/guides.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import {getGuideLayer} from './layer';
 import {getAllRootItems} from './selection';
 
diff --git a/src/helper/hover.js b/src/helper/hover.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import {isBoundsItem, getRootItem} from './item';
 import {hoverBounds, hoverItem} from './guides';
 import {isGroupChild} from './group';
diff --git a/src/helper/item.js b/src/helper/item.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 
 const getRootItem = function (item) {
     if (item.parent.className === 'Layer') {
diff --git a/src/helper/layer.js b/src/helper/layer.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import log from '../log/log';
 import {ART_BOARD_BOUNDS, ART_BOARD_WIDTH, ART_BOARD_HEIGHT, CENTER, MAX_WORKSPACE_BOUNDS} from './view';
 import {isGroupItem} from './item';
diff --git a/src/helper/math.js b/src/helper/math.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 
 /** The ratio of the curve length to use for the handle length to convert squares into approximately circles. */
 const HANDLE_RATIO = 0.3902628565;
diff --git a/src/helper/selection-tools/bounding-box-tool.js b/src/helper/selection-tools/bounding-box-tool.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import keyMirror from 'keymirror';
 
 import {getSelectedRootItems} from '../selection';
diff --git a/src/helper/selection-tools/move-tool.js b/src/helper/selection-tools/move-tool.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import Modes, {BitmapModes} from '../../lib/modes';
 import {isGroup} from '../group';
 import {isCompoundPathItem, getRootItem} from '../item';
diff --git a/src/helper/selection-tools/nudge-tool.js b/src/helper/selection-tools/nudge-tool.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import {getSelectedRootItems} from '../selection';
 import {getActionBounds} from '../view';
 import {BitmapModes} from '../../lib/modes';
diff --git a/src/helper/selection-tools/reshape-tool.js b/src/helper/selection-tools/reshape-tool.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import log from '../../log/log';
 import keyMirror from 'keymirror';
 
diff --git a/src/helper/selection-tools/rotate-tool.js b/src/helper/selection-tools/rotate-tool.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 
 /**
  * Tool to handle rotation when dragging the rotation handle in the bounding box tool.
diff --git a/src/helper/selection-tools/scale-tool.js b/src/helper/selection-tools/scale-tool.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import {getItems} from '../selection';
 import {getActionBounds} from '../view';
 import {BitmapModes} from '../../lib/modes';
diff --git a/src/helper/selection-tools/select-tool.js b/src/helper/selection-tools/select-tool.js
@@ -5,7 +5,7 @@ import {selectRootItem} from '../selection';
 import BoundingBoxTool from './bounding-box-tool';
 import NudgeTool from './nudge-tool';
 import SelectionBoxTool from './selection-box-tool';
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 
 /**
  * paper.Tool that handles select mode. This is made up of 2 subtools.
diff --git a/src/helper/selection-tools/selection-box-tool.js b/src/helper/selection-tools/selection-box-tool.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import {rectSelect} from '../guides';
 import {clearSelection, processRectangularSelection} from '../selection';
 import {getRaster} from '../layer';
diff --git a/src/helper/selection.js b/src/helper/selection.js
@@ -1,4 +1,4 @@
-import paper from '@scratch/paper';
+import paper from '@turbowarp/paper';
 import Modes from '../lib/modes';
 
 import {getItemsGroup, isGroup} from './group';
diff --git a/src/helper/snapping.js b/src/helper/snapping.js
diff --git a/src/helper/style-path.js b/src/helper/style-path.js
diff --git a/src/helper/tools/arrow-tool.js b/src/helper/tools/arrow-tool.js
diff --git a/src/helper/tools/dragon-tool.js b/src/helper/tools/dragon-tool.js
diff --git a/src/helper/tools/eye-dropper.js b/src/helper/tools/eye-dropper.js
diff --git a/src/helper/tools/fill-tool.js b/src/helper/tools/fill-tool.js
diff --git a/src/helper/tools/oval-tool.js b/src/helper/tools/oval-tool.js
diff --git a/src/helper/tools/pen-tool.js b/src/helper/tools/pen-tool.js
diff --git a/src/helper/tools/rect-tool.js b/src/helper/tools/rect-tool.js
diff --git a/src/helper/tools/rounded-rect-tool.js b/src/helper/tools/rounded-rect-tool.js
diff --git a/src/helper/tools/sussy-tool.js b/src/helper/tools/sussy-tool.js
diff --git a/src/helper/tools/text-tool.js b/src/helper/tools/text-tool.js
diff --git a/src/helper/tools/triangle-tool.js b/src/helper/tools/triangle-tool.js
diff --git a/src/helper/undo.js b/src/helper/undo.js
diff --git a/src/helper/view.js b/src/helper/view.js
diff --git a/src/hocs/copy-paste-hoc.jsx b/src/hocs/copy-paste-hoc.jsx
diff --git a/src/hocs/selection-hoc.jsx b/src/hocs/selection-hoc.jsx
diff --git a/src/hocs/update-image-hoc.jsx b/src/hocs/update-image-hoc.jsx
diff --git a/src/reducers/fill-bitmap-shapes.js b/src/reducers/fill-bitmap-shapes.js
diff --git a/src/reducers/view-bounds.js b/src/reducers/view-bounds.js
diff --git a/src/reducers/zoom-levels.js b/src/reducers/zoom-levels.js

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import paper from '@scratch/paper';`
	`1`	`+import paper from '@turbowarp/paper';`
`2`	`2`	`import classNames from 'classnames';`
`3`	`3`	`import {defineMessages, injectIntl, intlShape} from 'react-intl';`
`4`	`4`	`import React from 'react';`