Skip to content

Fix some keyframe icons being the wrong size (GeckoLib) #848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JannisX11 merged 1 commit into from
Feb 8, 2026
Merged

Fix some keyframe icons being the wrong size (GeckoLib) #848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@
"tags": [
"Minecraft: Java Edition"
],
"version": "4.2.3",
"version": "4.2.4",
"min_version": "5.0.0",
"max_version": "6.0.0",
"await_loading": true,
Expand Down
12 changes: 12 additions & 0 deletions plugins/geckolib/changelog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,5 +242,17 @@
]
}
]
},
"4.2.4": {
"title": "4.2.4",
"author": "Zigy",
"categories": [
{
"title": "Bug Fixes",
"list": [
"Fixed an issue where some keyframe icons displayed incorrectly."
]
}
]
}
}
16 changes: 14 additions & 2 deletions plugins/geckolib/geckolib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,12 @@ ___CSS_LOADER_EXPORT___.push([module.id, `@font-face {
font-variant: normal;
text-transform: none;
line-height: 1;
font-size: 1.4em;
max-width: 24px;
margin-top: 4px;
font-size: 14px;
margin-left: -1px;
pointer-events: none;
display: block;

-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
Expand Down Expand Up @@ -6989,7 +6993,7 @@ createToken('GTE0PRE', '^\\s*>=\\s*0\\.0\\.0-0\\s*$')
/***/ ((module) => {

"use strict";
module.exports = /*#__PURE__*/JSON.parse('{"name":"geckolib","version":"4.2.3","private":true,"description":"GeckoLib Models & Animations","main":"index.js","scripts":{"prebuild":"npm run test","build":"npm run build:only","build:only":"webpack && npm run update_manifest","update_manifest":"node scripts/updateManifest.mjs","start":"webpack --watch --mode=development","lint":"eslint .","lint:fix":"eslint --fix .","tsc":"tsc --noEmit","pretest":"npm run lint && npm run tsc","test":"npm run test:only","test:only":"jest"},"author":"Eliot Lash, Tslat, Gecko, McHorse","license":"MIT","pluginOptions":{"title":"GeckoLib Models & Animations","description":"Create animated blocks, items, entities, and armor for the GeckoLib java mod library.","icon":"icon.png","tags":["Minecraft: Java Edition"],"variant":"both","min_version":"5.0.0","max_version":"6.0.0","await_loading":true,"has_changelog":true,"website":"https://github.com/bernie-g/geckolib/wiki","repository":"https://github.com/JannisX11/blockbench-plugins/tree/master/plugins/geckolib","bug_tracker":"https://github.com/bernie-g/geckolib/issues"},"sideEffects":["./index.js"],"devDependencies":{"@types/jest":"^30.0.0","@types/lodash":"^4.17.20","@typescript-eslint/eslint-plugin":"^8.41.0","@typescript-eslint/parser":"^8.41.0","blockbench-types":"^5.0.0-beta.1","css-loader":"^7.1.2","eol":"0.10.0","eslint":"^9.34.0","indent-string":"^5.0.0","jest":"^30.1.1","to-string-loader":"^1.2.0","ts-jest":"^29.4.1","ts-loader":"^9.5.4","typescript":"^5.9.2","webpack":"^5.101.3","webpack-cli":"^6.0.1"},"dependencies":{"lodash":"^4.17.21","semver":"7.7.2"}}');
module.exports = /*#__PURE__*/JSON.parse('{"name":"geckolib","version":"4.2.4","private":true,"description":"GeckoLib Models & Animations","main":"index.js","scripts":{"prebuild":"npm run test","build":"npm run build:only","build:only":"webpack && npm run update_manifest","update_manifest":"node scripts/updateManifest.mjs","start":"webpack --watch --mode=development","lint":"eslint .","lint:fix":"eslint --fix .","tsc":"tsc --noEmit","pretest":"npm run lint && npm run tsc","test":"npm run test:only","test:only":"jest"},"author":"Eliot Lash, Tslat, Gecko, McHorse","license":"MIT","pluginOptions":{"title":"GeckoLib Models & Animations","description":"Create animated blocks, items, entities, and armor for the GeckoLib java mod library.","icon":"icon.png","tags":["Minecraft: Java Edition"],"variant":"both","min_version":"5.0.0","max_version":"6.0.0","await_loading":true,"has_changelog":true,"website":"https://github.com/bernie-g/geckolib/wiki","repository":"https://github.com/JannisX11/blockbench-plugins/tree/master/plugins/geckolib","bug_tracker":"https://github.com/bernie-g/geckolib/issues"},"sideEffects":["./index.js"],"devDependencies":{"@types/jest":"^30.0.0","@types/lodash":"^4.17.20","@typescript-eslint/eslint-plugin":"^8.41.0","@typescript-eslint/parser":"^8.41.0","blockbench-types":"^5.0.6","css-loader":"^7.1.2","eol":"0.10.0","eslint":"^9.34.0","indent-string":"^5.0.0","jest":"^30.1.1","to-string-loader":"^1.2.0","ts-jest":"^29.4.1","ts-loader":"^9.5.4","typescript":"^5.9.2","webpack":"^5.101.3","webpack-cli":"^6.0.1"},"dependencies":{"lodash":"^4.17.21","semver":"7.7.2"}}');

/***/ }),

Expand Down Expand Up @@ -8558,9 +8562,13 @@ __webpack_require__.r(__webpack_exports__);


function loadKeyframeOverrides() {
// @ts-ignore
(0,_utils__WEBPACK_IMPORTED_MODULE_2__.addMonkeypatch)(Keyframe, "prototype", "getLerp", keyframeGetLerp);
// @ts-ignore
(0,_utils__WEBPACK_IMPORTED_MODULE_2__.addMonkeypatch)(Keyframe, "prototype", "compileBedrockKeyframe", keyframeCompileBedrock);
// @ts-ignore
(0,_utils__WEBPACK_IMPORTED_MODULE_2__.addMonkeypatch)(Keyframe, "prototype", "getUndoCopy", keyframeGetUndoCopy);
// @ts-ignore
(0,_utils__WEBPACK_IMPORTED_MODULE_2__.addMonkeypatch)(Keyframe, "prototype", "extend", keyframeExtend);
(0,_utils__WEBPACK_IMPORTED_MODULE_2__.addMonkeypatch)(BarItems.reverse_keyframes, null, "click", onReverseKeyframes);
}
Expand Down Expand Up @@ -8588,6 +8596,7 @@ function lerp(start, stop, amt) {
// eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
function keyframeGetLerp(other, axis, amount, allow_expression) {
if (Format.id !== _constants__WEBPACK_IMPORTED_MODULE_4__.GECKOLIB_MODEL_ID)
// @ts-ignore
return _utils__WEBPACK_IMPORTED_MODULE_2__.Monkeypatches.get(Keyframe).getLerp.apply(this, arguments);
const easing = other.easing || _easing__WEBPACK_IMPORTED_MODULE_3__.EASING_DEFAULT;
let easingFunc = _easing__WEBPACK_IMPORTED_MODULE_3__.easingFunctions[easing];
Expand Down Expand Up @@ -8653,6 +8662,7 @@ function checkAndPatchKeyframeValues(vector, channel) {
// Replace the bedrock keyframe compilation with a custom handler
function keyframeCompileBedrock() {
if (Format.id !== _constants__WEBPACK_IMPORTED_MODULE_4__.GECKOLIB_MODEL_ID || !this.transform)
// @ts-ignore
return _utils__WEBPACK_IMPORTED_MODULE_2__.Monkeypatches.get(Keyframe).compileBedrockKeyframe.apply(this, arguments);
if (this.interpolation == 'catmullrom') {
const previous = this.getPreviousKeyframe.apply(this);
Expand All @@ -8669,6 +8679,7 @@ function keyframeCompileBedrock() {
}
function keyframeGetUndoCopy() {
const { easing, easingArgs } = this;
// @ts-ignore
const result = _utils__WEBPACK_IMPORTED_MODULE_2__.Monkeypatches.get(Keyframe).getUndoCopy.apply(this, arguments);
if (Format.id === _constants__WEBPACK_IMPORTED_MODULE_4__.GECKOLIB_MODEL_ID) {
Object.assign(result, { easing });
Expand Down Expand Up @@ -8698,6 +8709,7 @@ function keyframeExtend(dataIn) {
this.easingArgs = data.easingArgs;
}
}
// @ts-ignore
return _utils__WEBPACK_IMPORTED_MODULE_2__.Monkeypatches.get(Keyframe).extend.apply(this, arguments);
}
// Inject GeckoLib support for the reverse keyframes feature
Expand Down
28 changes: 7 additions & 21 deletions plugins/geckolib/src/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions plugins/geckolib/src/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "geckolib",
"version": "4.2.3",
"version": "4.2.4",
"private": true,
"description": "GeckoLib Models & Animations",
"main": "index.js",
Expand Down Expand Up @@ -43,7 +43,7 @@
"@types/lodash": "^4.17.20",
"@typescript-eslint/eslint-plugin": "^8.41.0",
"@typescript-eslint/parser": "^8.41.0",
"blockbench-types": "^5.0.0-beta.1",
"blockbench-types": "^5.0.6",
"css-loader": "^7.1.2",
"eol": "0.10.0",
"eslint": "^9.34.0",
Expand Down
6 changes: 5 additions & 1 deletion plugins/geckolib/src/resources/easing_keyframes.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions plugins/geckolib/src/ts/keyframe.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@ import {
import {GECKOLIB_MODEL_ID} from "./constants";

export function loadKeyframeOverrides() {
// @ts-ignore
addMonkeypatch(Keyframe, "prototype", "getLerp", keyframeGetLerp);
// @ts-ignore
addMonkeypatch(Keyframe, "prototype", "compileBedrockKeyframe", keyframeCompileBedrock);
// @ts-ignore
addMonkeypatch(Keyframe, "prototype", "getUndoCopy", keyframeGetUndoCopy);
// @ts-ignore
addMonkeypatch(Keyframe, "prototype", "extend", keyframeExtend);

addMonkeypatch(BarItems.reverse_keyframes, null, "click", onReverseKeyframes);
Expand Down Expand Up @@ -59,6 +63,7 @@ function lerp(start: number, stop: number, amt: number) {
// eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
function keyframeGetLerp(other, axis, amount, allow_expression) {
if (Format.id !== GECKOLIB_MODEL_ID)
// @ts-ignore
return Monkeypatches.get(Keyframe).getLerp.apply(this, arguments);

const easing = other.easing || EASING_DEFAULT;
Expand Down Expand Up @@ -140,6 +145,7 @@ function checkAndPatchKeyframeValues(vector: any[], channel: string) {
// Replace the bedrock keyframe compilation with a custom handler
function keyframeCompileBedrock() {
if (Format.id !== GECKOLIB_MODEL_ID || !this.transform)
// @ts-ignore
return Monkeypatches.get(Keyframe).compileBedrockKeyframe.apply(this, arguments);

if (this.interpolation == 'catmullrom') {
Expand All @@ -161,6 +167,7 @@ function keyframeCompileBedrock() {

function keyframeGetUndoCopy() {
const {easing, easingArgs} = this;
// @ts-ignore
const result = Monkeypatches.get(Keyframe).getUndoCopy.apply(this, arguments);

if (Format.id === GECKOLIB_MODEL_ID) {
Expand Down Expand Up @@ -199,6 +206,7 @@ function keyframeExtend(dataIn) {
}
}

// @ts-ignore
return Monkeypatches.get(Keyframe).extend.apply(this, arguments);
}

Expand Down
Loading