Skip to content
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.

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

Update to 1.20.3 #10

Merged
merged 3 commits into from
Dec 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ private void onValueChange(final String text, final CallbackInfo ci) {
}

@Inject(
method = "deleteChars",
method = "deleteCharsToPos",
at = @At(
value = "INVOKE", shift = At.Shift.BEFORE,
target = "Lnet/minecraft/client/gui/components/EditBox;moveCursorTo(IZ)V"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public final class MixinSelectWorldScreen {
method = "init",
at = @At(
value = "INVOKE", shift = At.Shift.AFTER,
target = "Lnet/minecraft/client/gui/screens/worldselection/WorldSelectionList;<init>(Lnet/minecraft/client/gui/screens/worldselection/SelectWorldScreen;Lnet/minecraft/client/Minecraft;IIIIILjava/lang/String;Lnet/minecraft/client/gui/screens/worldselection/WorldSelectionList;)V"
target = "Lnet/minecraft/client/gui/screens/worldselection/WorldSelectionList;<init>(Lnet/minecraft/client/gui/screens/worldselection/SelectWorldScreen;Lnet/minecraft/client/Minecraft;IIIILjava/lang/String;Lnet/minecraft/client/gui/screens/worldselection/WorldSelectionList;)V"
), cancellable = true
)
private void initWorldSelectionList(final CallbackInfo ci) {
Expand Down
4 changes: 2 additions & 2 deletions fabric/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"accessWidener": "caramelchat.accesswidener",
"mixins": [ "caramelchat.mixins.json" ],
"depends": {
"fabricloader": ">=0.14.0",
"minecraft": ">=1.20.2"
"fabricloader": ">=0.15.0",
"minecraft": ">=1.20.3"
},
"breaks": {
"lunar": "*",
Expand Down
6 changes: 3 additions & 3 deletions forge/src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
modLoader="javafml" #mandatory
# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
loaderVersion="[47,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
loaderVersion="[49,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
license="GNU LGPL 3.0"
Expand Down Expand Up @@ -48,11 +48,11 @@ Provides an enhanced IME input experience in Minecraft.
[[dependencies.caramelchat]]
modId = "forge"
mandatory = true
versionRange = "[48,)"
versionRange = "[49,)"
side = "CLIENT"

[[dependencies.caramelchat]]
modId="minecraft"
mandatory=true
versionRange = "[1.20.2,)"
versionRange = "[1.20.3,)"
side = "CLIENT"
2 changes: 1 addition & 1 deletion forge/src/main/resources/pack.mcmeta
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"pack": {
"description": "caramelChat Resources",
"pack_format": 18
"pack_format": 22
}
}
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ archives_base_name=caramelChat
mod_version=1.1.1
maven_group=moe.caramel

minecraft_version=1.20.2
fabric_loader_version=0.14.22
forge_version=1.20.2-48.0.0
neoforge_version=20.2.86
minecraft_version=1.20.4
fabric_loader_version=0.15.1
forge_version=1.20.4-49.0.3
neoforge_version=20.4.5-beta
4 changes: 2 additions & 2 deletions neoforge/src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ config = "caramelchat.mixins.json"
[[dependencies.caramelchat]]
modId="neoforge"
mandatory=true
versionRange="[20.2,)"
versionRange="[20.3,)"
ordering="NONE"
side="BOTH"

[[dependencies.caramelchat]]
modId="minecraft"
mandatory=true
versionRange="[1.20.2,)"
versionRange="[1.20.3,)"
ordering="NONE"
side="CLIENT"
2 changes: 1 addition & 1 deletion neoforge/src/main/resources/pack.mcmeta
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"pack": {
"description": "caramelChat Resources",
"pack_format": 18
"pack_format": 22
}
}