Skip to content

Commit 051707d

Browse files
rubensworksrubensworks
committed
Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21
2 parents a41c2a7 + a4c6131 commit 051707d

File tree

11 files changed

+324
-59
lines changed

11 files changed

+324
-59
lines changed

‎.github/workflows/publish-github-release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v3
1111
- name: Release
12-
uses: softprops/action-gh-release@v1
13-
env:
14-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
12+
uses: softprops/action-gh-release@v2
13+
with:
14+
body_path: CHANGELOG.md

‎CHANGELOG-1.20.1.md‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
# Changelog for Minecraft 1.20.1
2+
All notable changes to this project will be documented in this file.
3+
4+
<a name="1.20.1-1.0.15"></a>
5+
## [1.20.1-1.0.15](/compare/1.20.1-1.0.14...1.20.1-1.0.15) - 2025-10-07 07:38:06
6+
7+
8+
### Added
9+
* Add ValueTranslatorRegisterEvent for mod compats (required for Integrated Mekanism)
10+
11+
<a name="1.20.1-1.0.14"></a>
12+
## [1.20.1-1.0.14](/compare/1.20.1-1.0.13...1.20.1-1.0.14) - 2025-06-01 10:58:00 +0200
13+
14+
15+
### Fixed
16+
* Fix some modded keybindings activating in scripting terminal, Closes #40
17+
18+
<a name="1.20.1-1.0.13"></a>
19+
## [1.20.1-1.0.13](/compare/1.20.1-1.0.12...1.20.1-1.0.13) - 2025-02-21 16:03:56 +0100
20+
21+
22+
### Changed
23+
* Restrict access to parts of the Java API
24+
They can still be enabled if desired by the server admin.
25+
26+
<a name="1.20.1-1.0.12"></a>
27+
## [1.20.1-1.0.12](/compare/1.20.1-1.0.11...1.20.1-1.0.12) - 2025-02-08 17:38:55 +0100
28+
29+
30+
### Fixed
31+
* Use jar-in-jar instead of shadowing, Closes #34
32+
33+
<a name="1.20.1-1.0.11"></a>
34+
## [1.20.1-1.0.11](/compare/1.20.1-1.0.10...1.20.1-1.0.11) - 2025-01-17 16:51:13 +0100
35+
36+
37+
### Fixed
38+
* Re-enable shadow renames, except for com.oracle.truffle, Closes #32
39+
This makes this mod work correctle on all JVMs, including GraalVM 21 and 23.
40+
41+
<a name="1.20.1-1.0.10"></a>
42+
## [1.20.1-1.0.10](/compare/1.20.1-1.0.9...1.20.1-1.0.10) - 2025-01-11 10:11:06 +0100
43+
44+
45+
### Fixed
46+
* Update to graal 24.1.1, fixes issues for some JDK 23 users, Closes #30
47+
48+
<a name="1.20.1-1.0.9"></a>
49+
## [1.20.1-1.0.9](/compare/1.20.1-1.0.8...1.20.1-1.0.9) - 2024-12-28 15:31:32 +0100
50+
51+
52+
### Fixed
53+
* Fix infinite loop not being properly caught, Closes #28
54+
55+
<a name="1.20.1-1.0.8"></a>
56+
## [1.20.1-1.0.8](/compare/1.20.1-1.0.7...1.20.1-1.0.8) - 2024-12-23 13:59:08 +0100
57+
58+
59+
### Fixed
60+
* Fix display panel crash when translation undefined values, Closes #27
61+
62+
<a name="1.20.1-1.0.7"></a>
63+
## [1.20.1-1.0.7](/compare/1.20.1-1.0.6...1.20.1-1.0.7) - 2024-12-17 11:08:27 +0100
64+
65+
66+
### Changed
67+
* Cache scripts to improve performance
68+
Required for CyclopsMC/IntegratedDynamics#1439
69+
70+
### Fixed
71+
* Fix variable card writing failing when reselecting text, Closes #25
72+
73+
<a name="1.20.1-1.0.6"></a>
74+
## [1.20.1-1.0.6](/compare/1.20.1-1.0.5...1.20.1-1.0.6) - 2024-12-16 10:58:28 +0100
75+
76+
77+
### Fixed
78+
* Fix null object values not being skipped to NBT, Closes #22
79+
* Fix delete not being highlighted as keyword, Closes #23
80+
* Fix NPE in ScriptingData if FileWatcher was not initialized
81+
82+
<a name="1.20.1-1.0.5"></a>
83+
## [1.20.1-1.0.5](/compare/1.20.1-1.0.4...1.20.1-1.0.5) - 2024-10-22 16:23:33 +0200
84+
85+
86+
### Fixed
87+
* Fix NPE in ScriptingData if FileWatcher was not initialized
88+
89+
<a name="1.20.1-1.0.4"></a>
90+
## [1.20.1-1.0.4](/compare/1.20.1-1.0.3...1.20.1-1.0.4) - 2024-07-20 15:49:58 +0200
91+
92+
93+
### Fixed
94+
* Fix config file not being generated, Closes #14
95+
96+
<a name="1.20.1-1.0.3"></a>
97+
## [1.20.1-1.0.3](/compare/1.20.1-1.0.2...1.20.1-1.0.3) - 2024-06-23 07:11:02 +0200
98+
99+
100+
### Fixed
101+
* Fix incorrect error message for missing member
102+
* Fix invalid script member error not being caught, Closes #10
103+
* Fix stack size example errors in book, Closes #13
104+
105+
<a name="1.20.1-1.0.2"></a>
106+
## [1.20.1-1.0.2](/compare/1.20.1-1.0.1...1.20.1-1.0.2) - 2024-04-14 14:18:28 +0200
107+
108+
109+
### Changed
110+
* Add script context to errors during translation
111+
112+
### Fixed
113+
* Automatically invalidate network errors on script changes, Closes #5
114+
* Don't hard-crash on unsupported conversions to NBT, Closes #8
115+
* Fix missing type checking for script variables in aspects, Closes #9
116+
117+
<a name="1.20.1-1.0.1"></a>
118+
## [1.20.1-1.0.1](/compare/1.20.1-1.0.0...1.20.1-1.0.1) - 2024-02-06 19:07:07 +0100
119+
120+
121+
### Fixed
122+
* Fix crash when clicking in terminal without selected disk
123+
124+
<a name="1.20.1-1.0.0"></a>
125+
## [1.20.1-1.0.0] - 2024-02-04 16:12:10 +0100
126+
127+
128+
Initial release

‎CHANGELOG-1.21.1.md‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
# Changelog for Minecraft 1.21.1
2+
All notable changes to this project will be documented in this file.
3+
4+
<a name="1.21.1-1.0.19"></a>
5+
## [1.21.1-1.0.19](https://github.com/CyclopsMC/IntegratedScripting/compare/1.21.1-1.0.18...1.21.1-1.0.19) - 2025-10-07 07:50:49
6+
7+
8+
### Added
9+
* Add ValueTranslatorRegisterEvent for mod compats (required for Integrated Mekanism)
10+
* Add translations through Crowdin (#29)
11+
* Add PT_BR localization (#48)
12+
13+
### Fixed
14+
* Fix some spelling and grammar typos in lang (#47)
15+
* Fix spelling and grammar typos in lang (#45)
16+
17+
<a name="1.21.1-1.0.18"></a>
18+
## [1.21.1-1.0.18](https://github.com/CyclopsMC/IntegratedScripting/compare/1.21.1-1.0.17...1.21.1-1.0.18) - 2025-06-01 10:59:07 +0200
19+
20+
21+
### Fixed
22+
* Fix some modded keybindings activating in scripting terminal, Closes #40
23+
24+
<a name="1.21.1-1.0.17"></a>
25+
## [1.21.1-1.0.17](https://github.com/CyclopsMC/IntegratedScripting/compare/1.21.1-1.0.16...1.21.1-1.0.17) - 2025-02-21 16:08:49 +0100
26+
27+
28+
### Changed
29+
* Restrict access to parts of the Java API
30+
They can still be enabled if desired by the server admin.
31+
32+
<a name="1.21.1-1.0.16"></a>
33+
## [1.21.1-1.0.16](https://github.com/CyclopsMC/IntegratedScripting/compare/1.21.1-1.0.15...1.21.1-1.0.16) - 2025-02-15 10:21:10 +0100
34+
35+
36+
### Fixed
37+
* Fix broken advancement icons
38+
39+
<a name="1.21.1-1.0.15"></a>
40+
## [1.21.1-1.0.15](https://github.com/CyclopsMC/IntegratedScripting/compare/1.21.1-1.0.14...1.21.1-1.0.15) - 2025-02-08 17:37:34 +0100
41+
42+
43+
### Fixed
44+
* Use jar-in-jar instead of shadowing, Closes #34
45+
46+
<a name="1.21.1-1.0.14"></a>
47+
## [1.21.1-1.0.14](https://github.com/CyclopsMC/IntegratedScripting/compare/1.21.1-1.0.13...1.21.1-1.0.14) - 2025-01-17 16:44:48 +0100
48+
49+
50+
### Fixed
51+
* Re-enable shadow renames, except for com.oracle.truffle, Closes #32
52+
This makes this mod work correctle on all JVMs, including GraalVM 21 and 23.
53+
54+
<a name="1.21.1-1.0.13"></a>
55+
## [1.21.1-1.0.13](https://github.com/CyclopsMC/IntegratedScripting/compare/1.21.1-1.0.12...1.21.1-1.0.13) - 2025-01-11 10:07:39 +0100
56+
57+
58+
### Fixed
59+
* Stop shadow renaming to fix breakage for graal 24+
60+
61+
<a name="1.21.1-1.0.12"></a>
62+
## [1.21.1-1.0.12](https://github.com/CyclopsMC/IntegratedScripting/compare/1.21.1-1.0.11...1.21.1-1.0.12) - 2025-01-11 09:41:20 +0100
63+
64+
65+
### Fixed
66+
* Update to graal 24.1.1, fixes issues for some JDK 23 users, Closes #30
67+
68+
<a name="1.21.1-1.0.11"></a>
69+
## [1.21.1-1.0.11](https://github.com/CyclopsMC/IntegratedScripting/compare/1.21.1-1.0.10...1.21.1-1.0.11) - 2024-12-28 15:33:05 +0100
70+
71+
72+
### Fixed
73+
* Fix infinite loop not being properly caught, Closes #28
74+
75+
<a name="1.21.1-1.0.10"></a>
76+
## [1.21.1-1.0.10](https://github.com/CyclopsMC/IntegratedScripting/compare/1.21.1-1.0.9...1.21.1-1.0.10) - 2024-12-23 14:00:13 +0100
77+
78+
79+
### Fixed
80+
* Fix display panel crash when translation undefined values, Closes #27
81+
82+
<a name="1.21.1-1.0.9"></a>
83+
## [1.21.1-1.0.9](https://github.com/CyclopsMC/IntegratedScripting/compare/1.21.1-1.0.8...1.21.1-1.0.9) - 2024-12-17 11:09:16 +0100
84+
85+
86+
### Changed
87+
* Cache scripts to improve performance
88+
Required for CyclopsMC/IntegratedDynamics#1439
89+
90+
### Fixed
91+
* Fix variable card writing failing when reselecting text, Closes #25
92+
93+
<a name="1.21.1-1.0.8"></a>
94+
## [1.21.1-1.0.8](https://github.com/CyclopsMC/IntegratedScripting/compare/1.21.1-1.0.7...1.21.1-1.0.8) - 2024-12-16 11:01:48 +0100
95+
96+
97+
### Fixed
98+
* Fix null object values not being skipped to NBT, Closes #22
99+
* Fix delete not being highlighted as keyword, Closes #23
100+
* Fix NPE in ScriptingData if FileWatcher was not initialized
101+
102+
<a name="1.21.1-1.0.7"></a>
103+
## [1.21.1-1.0.7](https://github.com/CyclopsMC/IntegratedScripting/compare/1.21.1-1.0.6...1.21.1-1.0.7) - 2024-11-22 07:14:05 +0100
104+
105+
106+
### Fixed
107+
* Fix unable to clear part IDs, Closes CyclopsMC/IntegratedTunnels#309
108+
109+
<a name="1.21.1-1.0.6"></a>
110+
## [1.21.1-1.0.6] - 2024-10-22 16:20:24 +0200
111+
112+
113+
### Fixed
114+
* Fix NPE in ScriptingData if FileWatcher was not initialized

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CHANGELOG-1.21.1.md

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def getModrinthKey() {
6969
}
7070
def getChangelog() {
7171
if (System.getenv().RELEASE) {
72-
return file("./resources/changelog/${project.minecraft_version}-${project.mod_version}.txt").getText();
72+
return file("./CHANGELOG-${project.minecraft_version}.md").getText();
7373
} else {
7474
return "Changes since last release: ${project.github_url}/compare/${project.minecraft_version}-${project.mod_version}...${System.getenv().GITHUB_SHA}"
7575
}
@@ -312,7 +312,7 @@ task publishCurseForge(type: TaskPublishCurseForge) {
312312
apiToken = secrets.curseforgeKey;
313313
def mainFile = upload(project.curseforge_project_id, shadowJar)
314314
mainFile.releaseType = secrets.build_number.equals("RELEASE") ? Constants.RELEASE_TYPE_RELEASE : Constants.RELEASE_TYPE_BETA
315-
mainFile.changelogType = "text"
315+
mainFile.changelogType = "markdown"
316316
mainFile.changelog = secrets.changelog
317317
mainFile.addJavaVersion("Java ${project.java_version}")
318318
mainFile.addGameVersion(project.minecraft_version)

‎resources/changelog/1.20.1-1.0.15.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
As always, don't forget to backup your world before updating!
2+
Requires CyclopsCore version 1.19.0 or higher.
3+
4+
Additions:
5+
* Add ValueTranslatorRegisterEvent for mod compats (required for Integrated Mekanism)

‎resources/changelog/1.21.1-1.0.19.txt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
As always, don't forget to backup your world before updating!
2+
Requires CyclopsCore version 1.25.5 or higher.
3+
4+
Additions:
5+
* Add ValueTranslatorRegisterEvent for mod compats (required for Integrated Mekanism)
6+
* Add translations through Crowdin (#29)
7+
* Add PT_BR localization (#48)
8+
9+
Fixes:
10+
* Fix some spelling and grammar typos in lang (#47)
11+
* Fix spelling and grammar typos in lang (#45)

‎src/main/java/org/cyclops/integratedscripting/api/evaluate/translation/ValueTranslatorRegisterEvent.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package org.cyclops.integratedscripting.api.evaluate.translation;
2+
3+
import net.neoforged.fml.ModContainer;
4+
import net.neoforged.fml.event.lifecycle.ModLifecycleEvent;
5+
6+
/**
7+
* This event is emitted on the mod lifecycle bus.
8+
* @author rubensworks
9+
*/
10+
public class ValueTranslatorRegisterEvent extends ModLifecycleEvent {
11+
12+
private final IValueTranslatorRegistry registry;
13+
14+
public ValueTranslatorRegisterEvent(ModContainer container, IValueTranslatorRegistry registry) {
15+
super(container);
16+
this.registry = registry;
17+
}
18+
19+
public IValueTranslatorRegistry getRegistry() {
20+
return registry;
21+
}
22+
}

‎src/main/java/org/cyclops/integratedscripting/evaluate/translation/ValueTranslators.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
package org.cyclops.integratedscripting.evaluate.translation;
22

3+
import net.neoforged.fml.ModList;
4+
import net.neoforged.fml.javafmlmod.FMLModContainer;
35
import org.cyclops.cyclopscore.helper.IModHelpers;
46
import org.cyclops.integrateddynamics.core.evaluate.variable.ValueTypes;
57
import org.cyclops.integratedscripting.IntegratedScripting;
68
import org.cyclops.integratedscripting.api.evaluate.translation.IValueTranslatorRegistry;
9+
import org.cyclops.integratedscripting.api.evaluate.translation.ValueTranslatorRegisterEvent;
710
import org.cyclops.integratedscripting.evaluate.translation.translator.*;
811

912
/**
@@ -41,6 +44,16 @@ public static void load() {
4144
REGISTRY.register(new ValueTranslatorObjectAdapter<>("id_ingredients", ValueTypes.OBJECT_INGREDIENTS));
4245
REGISTRY.register(new ValueTranslatorObjectAdapter<>("id_recipe", ValueTypes.OBJECT_RECIPE));
4346

47+
// Allow others mod to register translators
48+
if(IModHelpers.get().getMinecraftHelpers().isModdedEnvironment()) {
49+
ValueTranslatorRegisterEvent registerEvent = new ValueTranslatorRegisterEvent(IntegratedScripting._instance.getContainer(), REGISTRY);
50+
ModList.get().forEachModContainer((name, container) -> {
51+
if (container instanceof FMLModContainer fmlModContainer) {
52+
fmlModContainer.getEventBus().post(registerEvent);
53+
}
54+
});
55+
}
56+
4457
// NBT has last priority
4558
REGISTRY.register(TRANSLATOR_NBT = new ValueTranslatorNbt());
4659
}

‎src/main/resources/assets/integratedscripting/lang/nl_nl.json‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,25 @@
1-
{}
1+
{
2+
"_comment": "------ Over de Dynamiek van Integratie inhoud ------",
3+
"itemGroup.integratedscripting": "Integrated Scripting",
4+
"gui.integratedscripting.create_file": "Maak bestand",
5+
"gui.integratedscripting.removal_dialog.delete": "Verwijderen",
6+
"gui.integratedscripting.removal_dialog.keep": "Behouden",
7+
"item.integratedscripting.scripting_disk.id": "ID: %s",
8+
"info_book.integratedscripting.section.main": "Scripting",
9+
"info_book.integratedscripting.introduction": "Introductie",
10+
"info_book.integratedscripting.materials": "Materialen",
11+
"info_book.integratedscripting.concepts": "Concepten",
12+
"info_book.integratedscripting.writing": "Scripts schrijven",
13+
"info_book.integratedscripting.writing.js": "JavaScript",
14+
"info_book.integratedscripting.writing.variables": "Constanten en variabelen",
15+
"info_book.integratedscripting.writing.functions": "Functies",
16+
"info_book.integratedscripting.writing.globals": "Globale functies",
17+
"info_book.integratedscripting.writing.methods": "Objectmethoden",
18+
"info_book.integratedscripting.advanced": "Geavanceerd",
19+
"info_book.integratedscripting.advanced.external_editing": "Extern bewerken",
20+
"info_book.integratedscripting.advanced.typescript": "TypeScript",
21+
"info_book.integratedscripting.section.tutorials": "Scriptinglessen",
22+
"info_book.integratedscripting.tutorials.introduction": "Introductie",
23+
"info_book.integratedscripting.tutorials.basics": "De grondbeginselen van scripting",
24+
"info_book.integratedscripting.tutorials.functions": "Scripting functies"
25+
}

0 commit comments

Comments
 (0)