Skip to content

Commit 3edc8d1

Browse files
committed
Add setting for default java block/item format version
#3204
1 parent 45846da commit 3edc8d1

File tree

21 files changed

+62
-19
lines changed

21 files changed

+62
-19
lines changed

js/interface/setup_settings.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,11 @@ function setupSettings() {
254254
entity: 'format.bedrock',
255255
block: 'format.bedrock_block',
256256
}});
257+
new Setting('default_java_block_version', {category: 'defaults', type: 'select', value: 'latest', options: {
258+
latest: 'Latest',
259+
'1.21.6': '1.21.6 - 1.21.10',
260+
'1.9.0': '1.9 - 1.21.5',
261+
}});
257262
new Setting('animation_snap', {category: 'defaults', value: 24, type: 'number'});
258263
new Setting('default_keyframe_interpolation', {category: 'defaults', value: 'linear', type: 'select', options: {
259264
linear: 'action.keyframe_interpolation.linear',

js/io/project.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ new Property(ModelProject, 'string', 'modded_entity_version', {
483483
});
484484
new Property(ModelProject, 'string', 'java_block_version', {
485485
label: 'dialog.project.java_block_version',
486-
default: '1.21.11',
486+
default: () => settings.default_java_block_version.value == 'latest' ? '1.21.11' : settings.default_java_block_version.value,
487487
condition: {formats: ['java_block']},
488488
options: {
489489
'1.9.0': '1.9 - 1.21.5',

lang/cz.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2535,5 +2535,7 @@
25352535
"settings.limit_brush_opacity_per_stroke": "Omezit Průhlednost Štětce na Jeden Tah",
25362536
"settings.limit_brush_opacity_per_stroke.desc": "Omezit průhlednost, kterou může štětec aplikovat podle hodnoty posuvníku při každém tahu. U hladkého štětce může toto způsobit nežádoucí šum.",
25372537
"action.merge_splines": "Merge Splines",
2538-
"action.merge_splines.desc": "Merge multiple splines into one"
2538+
"action.merge_splines.desc": "Merge multiple splines into one",
2539+
"settings.default_java_block_version": "Default Java Block/Item Version",
2540+
"settings.default_java_block_version.desc": "Default format version when creating new Java block/item models or opening files without format version"
25392541
}

lang/de.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2535,5 +2535,7 @@
25352535
"settings.limit_brush_opacity_per_stroke": "Pinseldeckkraft pro Pinsenstrich begrenzen",
25362536
"settings.limit_brush_opacity_per_stroke.desc": "Begrenze die Deckkraft innerhalb eines einzelnen Pinsenstriches auf den Wert des Deckkraftreglers. Bei Verwendung eines weichen Pinsels kann hierbei ungewolltes Bildrauschen entstehen.",
25372537
"action.merge_splines": "Splines kombinieren",
2538-
"action.merge_splines.desc": "Kombiniere mehrere Splines zu einem"
2538+
"action.merge_splines.desc": "Kombiniere mehrere Splines zu einem",
2539+
"settings.default_java_block_version": "Default Java Block/Item Version",
2540+
"settings.default_java_block_version.desc": "Default format version when creating new Java block/item models or opening files without format version"
25392541
}

lang/en.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,6 +1129,8 @@
11291129
"settings.show_only_selected_uv.desc": "Only display the selected UV faces in the UV editor by default",
11301130
"settings.default_bedrock_format": "Default Bedrock Format",
11311131
"settings.default_bedrock_format.desc": "Select the default format to load Minecraft Bedrock models in, when no specific format can be detected from context.",
1132+
"settings.default_java_block_version": "Default Java Block/Item Version",
1133+
"settings.default_java_block_version.desc": "Default format version when creating new Java block/item models or opening files without format version",
11321134
"settings.animation_snap": "Animation Snap",
11331135
"settings.animation_snap.desc": "Default snap interval for keyframes in the animation timeline in steps per second. This can also be changed per animation. The default value is 24.",
11341136
"settings.default_keyframe_interpolation": "Default Keyframe Interpolation",

lang/es.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2535,5 +2535,7 @@
25352535
"settings.limit_brush_opacity_per_stroke": "Limitar la Opacidad del Pincel por Trazo",
25362536
"settings.limit_brush_opacity_per_stroke.desc": "Limite la opacidad que un pincel puede aplicar al valor del control deslizante de opacidad durante cada trazo. Con un pincel suave, este comportamiento puede generar un ligero ruido no deseado.",
25372537
"action.merge_splines": "Merge Splines",
2538-
"action.merge_splines.desc": "Merge multiple splines into one"
2538+
"action.merge_splines.desc": "Merge multiple splines into one",
2539+
"settings.default_java_block_version": "Default Java Block/Item Version",
2540+
"settings.default_java_block_version.desc": "Default format version when creating new Java block/item models or opening files without format version"
25392541
}

lang/fr.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2535,5 +2535,7 @@
25352535
"settings.limit_brush_opacity_per_stroke": "Limit Brush Opacity per Stroke",
25362536
"settings.limit_brush_opacity_per_stroke.desc": "Limit the opacity that a brush can apply to the value of the opacity slider during each brush stroke. With a smooth brush this behavior can potentially lead to slight unwanted noise.",
25372537
"action.merge_splines": "Merge Splines",
2538-
"action.merge_splines.desc": "Merge multiple splines into one"
2538+
"action.merge_splines.desc": "Merge multiple splines into one",
2539+
"settings.default_java_block_version": "Default Java Block/Item Version",
2540+
"settings.default_java_block_version.desc": "Default format version when creating new Java block/item models or opening files without format version"
25392541
}

lang/it.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2535,5 +2535,7 @@
25352535
"settings.limit_brush_opacity_per_stroke": "Limit Brush Opacity per Stroke",
25362536
"settings.limit_brush_opacity_per_stroke.desc": "Limit the opacity that a brush can apply to the value of the opacity slider during each brush stroke. With a smooth brush this behavior can potentially lead to slight unwanted noise.",
25372537
"action.merge_splines": "Merge Splines",
2538-
"action.merge_splines.desc": "Merge multiple splines into one"
2538+
"action.merge_splines.desc": "Merge multiple splines into one",
2539+
"settings.default_java_block_version": "Default Java Block/Item Version",
2540+
"settings.default_java_block_version.desc": "Default format version when creating new Java block/item models or opening files without format version"
25392541
}

lang/ja.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2535,5 +2535,7 @@
25352535
"settings.limit_brush_opacity_per_stroke": "Limit Brush Opacity per Stroke",
25362536
"settings.limit_brush_opacity_per_stroke.desc": "Limit the opacity that a brush can apply to the value of the opacity slider during each brush stroke. With a smooth brush this behavior can potentially lead to slight unwanted noise.",
25372537
"action.merge_splines": "Merge Splines",
2538-
"action.merge_splines.desc": "Merge multiple splines into one"
2538+
"action.merge_splines.desc": "Merge multiple splines into one",
2539+
"settings.default_java_block_version": "Default Java Block/Item Version",
2540+
"settings.default_java_block_version.desc": "Default format version when creating new Java block/item models or opening files without format version"
25392541
}

lang/ko.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2535,5 +2535,7 @@
25352535
"settings.limit_brush_opacity_per_stroke": "Limit Brush Opacity per Stroke",
25362536
"settings.limit_brush_opacity_per_stroke.desc": "Limit the opacity that a brush can apply to the value of the opacity slider during each brush stroke. With a smooth brush this behavior can potentially lead to slight unwanted noise.",
25372537
"action.merge_splines": "Merge Splines",
2538-
"action.merge_splines.desc": "Merge multiple splines into one"
2538+
"action.merge_splines.desc": "Merge multiple splines into one",
2539+
"settings.default_java_block_version": "Default Java Block/Item Version",
2540+
"settings.default_java_block_version.desc": "Default format version when creating new Java block/item models or opening files without format version"
25392541
}

0 commit comments

Comments
 (0)