Skip to content

Commit 8d520fd

Browse files
SnaveSutitSnaveSutit
authored
🔀 Merge 🔖 v1.10.0-beta.7 (#511)
2 parents a0c0347 + 103c134 commit 8d520fd

50 files changed

Lines changed: 4018 additions & 700 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,21 +113,12 @@ body:
113113
114114
Provide details about your system and setup to help diagnose the issue.
115115
116-
- type: dropdown
116+
- type: input
117117
id: mc-version
118118
attributes:
119119
label: 🟩 Minecraft Version
120-
description: >-
121-
The version of Minecraft you're using. (Only versions supported by the
122-
latest version of Animated Java are listed).
123-
options:
124-
- 1.20.4
125-
- 1.20.5
126-
- 1.20.6
127-
- 1.21.1
128-
- 1.21.2
129-
- 1.21.3
130-
- 1.21.4
120+
description: The version of Minecraft you're using.
121+
placeholder: E.g. 1.20.4, 26.1.1
131122
validations:
132123
required: true
133124

‎bun.lock‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"title": "Animated Java",
55
"icon": "icon.svg",
66
"description": "Effortlessly craft complex animations for Minecraft: Java Edition",
7-
"version": "1.10.0-beta.6",
7+
"version": "1.10.0-beta.7",
88
"min_blockbench_version": "5.1.4",
99
"variant": "desktop",
1010
"tags": [
@@ -93,7 +93,7 @@
9393
"@typescript-eslint/eslint-plugin": "^5.54.0",
9494
"@typescript-eslint/parser": "^5.54.0",
9595
"blockbench-patch-manager": "^1.1.0",
96-
"book-and-quill": "^1.0.9",
96+
"book-and-quill": "^1.0.10",
9797
"esbuild": "^0.17.10",
9898
"esbuild-plugin-import-folder": "^1.0.1",
9999
"esbuild-plugin-import-glob": "^0.1.1",
@@ -105,7 +105,7 @@
105105
"firebase": "^9.19.0",
106106
"jiti": "^2.6.1",
107107
"js-yaml": "^4.1.0",
108-
"mc-build": "^4.0.4",
108+
"mc-build": "^4.1.2",
109109
"node-modules-vscode-problems-patch": "^1.0.9",
110110
"octokit": "^5.0.3",
111111
"prettier": "^3.8.2",

‎schemas/blueprint-project.schema.json‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,8 @@
517517
"glow_color",
518518
"shadow_radius",
519519
"shadow_strength",
520-
"brightness_override",
520+
"sky_brightness",
521+
"block_brightness",
521522
"enchanted",
522523
"invisible",
523524
"nbt"
@@ -556,6 +557,18 @@
556557
"maximum": 15,
557558
"default": 0
558559
},
560+
"sky_brightness": {
561+
"type": "number",
562+
"minimum": 0,
563+
"maximum": 15,
564+
"default": 0
565+
},
566+
"block_brightness": {
567+
"type": "number",
568+
"minimum": 0,
569+
"maximum": 15,
570+
"default": 0
571+
},
559572
"enchanted": {
560573
"type": "boolean",
561574
"default": false

‎schemas/plugin-blueprint.schema.json‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,8 +450,20 @@
450450
"default": "fixed"
451451
},
452452
"custom_brightness": {
453-
"type": "number",
454-
"default": 0
453+
"type": "object",
454+
"required": ["sky", "block"],
455+
"properties": {
456+
"sky": {
457+
"type": "number",
458+
"minimum": 0,
459+
"maximum": 15
460+
},
461+
"block": {
462+
"type": "number",
463+
"minimum": 0,
464+
"maximum": 15
465+
}
466+
}
455467
},
456468
"custom_name": {
457469
"$ref": "#/definitions/optional_adventure_component",

‎src/dialogs/displayEntityConfig/displayEntityConfig.svelte‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
3434
let billboard = observable<string>(DEFAULT_CONFIG.billboard)
3535
let overrideBrightness = observable<boolean>(DEFAULT_CONFIG.overrideBrightness)
36-
let brightnessOverride = observable<number>(DEFAULT_CONFIG.brightnessOverride)
36+
let skyBrightness = observable<number>(DEFAULT_CONFIG.skyBrightness)
37+
let blockBrightness = observable<number>(DEFAULT_CONFIG.blockBrightness)
3738
let enchanted = observable<boolean>(DEFAULT_CONFIG.enchanted)
3839
let glowing = observable<boolean>(DEFAULT_CONFIG.glowing)
3940
let overrideGlowColor = observable<boolean>(DEFAULT_CONFIG.overrideGlowColor)
@@ -58,7 +59,8 @@
5859
$onApplyFunction = config.onApplyFunction
5960
$billboard = config.billboard
6061
$overrideBrightness = config.overrideBrightness
61-
$brightnessOverride = config.brightnessOverride
62+
$skyBrightness = config.skyBrightness
63+
$blockBrightness = config.blockBrightness
6264
$enchanted = config.enchanted
6365
$glowing = config.glowing
6466
$overrideGlowColor = config.overrideGlowColor
@@ -95,7 +97,8 @@
9597
config.onApplyFunction = $onApplyFunction
9698
config.billboard = $billboard as BillboardMode
9799
config.overrideBrightness = $overrideBrightness
98-
config.brightnessOverride = $brightnessOverride
100+
config.skyBrightness = $skyBrightness
101+
config.blockBrightness = $blockBrightness
99102
config.enchanted = $enchanted
100103
config.glowing = $glowing
101104
config.overrideGlowColor = $overrideGlowColor
@@ -172,10 +175,20 @@
172175

173176
{#if $overrideBrightness}
174177
<NumberSlider
175-
label={translate('dialog.display_entity.brightness_override.title')}
176-
tooltip={translate('dialog.display_entity.brightness_override.description')}
177-
bind:value={brightnessOverride}
178-
defaultValue={DisplayEntityConfig.prototype.brightnessOverride}
178+
label={translate('dialog.display_entity.sky_brightness.title')}
179+
tooltip={translate('dialog.display_entity.sky_brightness.description')}
180+
bind:value={skyBrightness}
181+
defaultValue={DisplayEntityConfig.prototype.skyBrightness}
182+
min={0}
183+
max={15}
184+
valueStep={1}
185+
/>
186+
187+
<NumberSlider
188+
label={translate('dialog.display_entity.block_brightness.title')}
189+
tooltip={translate('dialog.display_entity.block_brightness.description')}
190+
bind:value={blockBrightness}
191+
defaultValue={DisplayEntityConfig.prototype.blockBrightness}
179192
min={0}
180193
max={15}
181194
valueStep={1}

‎src/dialogs/displayEntityConfig/displayEntityConfig.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,26 @@ export const DISPLAY_ENTITY_CONFIG_ACTION = registerDeletableHandlerPatch({
163163
copyAction,
164164
pasteAction,
165165
'_',
166+
{
167+
name: 'menu.cube.color',
168+
icon: 'color_lens',
169+
children() {
170+
return markerColors.map((color, i) => {
171+
return {
172+
icon: 'bubble_chart',
173+
color: color.standard,
174+
// @ts-expect-error - Broken BB types
175+
name: color.name ?? 'cube.color.' + color.id,
176+
click(element: any) {
177+
// @ts-expect-error - any
178+
element.forSelected(obj => obj.setColor(i), 'Change color')
179+
},
180+
}
181+
})
182+
},
183+
},
184+
'randomize_marker_colors',
185+
'_',
166186
'rename',
167187
'delete',
168188
])

‎src/dialogs/interactionConfig/interactionConfig.svelte‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
1111
export let response: Observable<boolean>
1212
export let onSummonFunction: Observable<string>
13-
export let onInteractionFunction: Observable<string>
13+
export let onInteractFunction: Observable<string>
1414
export let onAttackFunction: Observable<string>
1515
export let onRemoveFunction: Observable<string>
1616
export let onTickFunction: Observable<string>
@@ -38,9 +38,9 @@
3838
/>
3939

4040
<CodeInput
41-
label={localize('dialog.interaction_config.on_interaction_function.title')}
42-
tooltip={localize('dialog.interaction_config.on_interaction_function.description')}
43-
bind:value={onInteractionFunction}
41+
label={localize('dialog.interaction_config.on_interact_function.title')}
42+
tooltip={localize('dialog.interaction_config.on_interact_function.description')}
43+
bind:value={onInteractFunction}
4444
defaultValue=""
4545
syntax="mcfunction"
4646
/>

0 commit comments

Comments
 (0)