Skip to content

Commit

Permalink
Support Minecraft 1.21.2+
Browse files Browse the repository at this point in the history
  • Loading branch information
LemonCaramel committed Oct 27, 2024
1 parent 1b2e89c commit 5c0921c
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 21 deletions.
3 changes: 2 additions & 1 deletion common/src/main/java/moe/caramel/mica/mixin/MixinWindow.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package moe.caramel.mica.mixin;

import com.mojang.blaze3d.TracyFrameCapture;
import com.mojang.blaze3d.platform.DisplayData;
import com.mojang.blaze3d.platform.ScreenManager;
import com.mojang.blaze3d.platform.Window;
Expand Down Expand Up @@ -37,7 +38,7 @@ private void init(
}

@Inject(method = "updateFullscreen", at = @At(value = "TAIL"))
private void updateFullscreen(final boolean vsync, final CallbackInfo ci) {
private void updateFullscreen(final boolean vsync, final TracyFrameCapture capturer, final CallbackInfo ci) {
// Check OS
if (Util.getPlatform() != Util.OS.WINDOWS) {
return;
Expand Down
6 changes: 3 additions & 3 deletions fabric/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
},
"mixins": [ "mica-common.mixins.json" ],
"depends": {
"fabricloader": ">=0.14.21",
"minecraft": ">=1.19.4"
"fabricloader": ">=0.16.7",
"minecraft": ">=1.21.2"
},
"recommends": {
"yet_another_config_lib_v3": ">=3.1.0+1.19.4"
"yet_another_config_lib_v3": ">=3.6.0+1.21.2"
},

"custom": {
Expand Down
8 changes: 4 additions & 4 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="[50,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
loaderVersion="[53,)" #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="MIT"
Expand Down Expand Up @@ -51,7 +51,7 @@ Enable Mica or Acrylic on Windows 11 21H2 22000 or later.
# Does this dependency have to exist - if not, ordering below must be specified
mandatory=true #mandatory
# The version range of the dependency
versionRange="[50,)" #mandatory
versionRange="[53,)" #mandatory
# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
ordering="NONE"
# Side this dependency is applied on - BOTH, CLIENT or SERVER
Expand All @@ -61,12 +61,12 @@ Enable Mica or Acrylic on Windows 11 21H2 22000 or later.
modId="minecraft"
mandatory=true
# This version range declares a minimum of the current minecraft version up to but not including the next major version
versionRange="[1.20.6,)"
versionRange="[1.21.3,)"
ordering="NONE"
side="CLIENT"
[[dependencies.mica]]
modId="yet_another_config_lib_v3"
mandatory=false
versionRange="[3.4.0,)"
versionRange="[3.6.0,)"
ordering="AFTER"
side="CLIENT"
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ mod_version=1.0.2
maven_group=moe.caramel

# Build Info
minecraft_version=1.21.1
fabric_loader_version=0.15.11
forge_version=1.21.1-52.0.2
neoforge_version=21.1.8
minecraft_version=1.21.3
fabric_loader_version=0.16.7
forge_version=1.21.3-53.0.4
neoforge_version=21.3.3-beta

# Dependencies
fabric_version=0.102.1+1.21.1
yet_another_config_lib_version=3.5.0+1.21
mod_menu_version=11.0.1
fabric_version=0.107.0+1.21.3
yet_another_config_lib_version=3.6.1+1.21.2
mod_menu_version=12.0.0-beta.1
2 changes: 1 addition & 1 deletion neoforge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
common(project(path: ":common", configuration: "namedElements")) { transitive false }
shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive false }

modCompileOnly "dev.isxander:yet-another-config-lib:${rootProject.yet_another_config_lib_version}-neoforge"
//modCompileOnly "dev.isxander:yet-another-config-lib:${rootProject.yet_another_config_lib_version}-neoforge" // TODO repository broken
}

processResources {
Expand Down
10 changes: 5 additions & 5 deletions neoforge/src/main/resources/META-INF/neoforge.mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
# 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 FML version. This is currently 3.
loaderVersion="[3,)" #mandatory
# A version range to match for said mod loader - for regular FML @Mod it will be the FML version. This is currently 4.
loaderVersion="[4,)" #mandatory

# 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.
Expand Down Expand Up @@ -63,20 +63,20 @@ config="mica-common.mixins.json"
[[dependencies.mica]]
modId="neoforge"
type="required"
versionRange="[20.5,)"
versionRange="[21.2,)"
ordering="NONE"
side="BOTH"

[[dependencies.mica]]
modId="minecraft"
type="required"
versionRange="[1.20.5,)"
versionRange="[1.21.2,)"
ordering="NONE"
side="CLIENT"

[[dependencies.mica]]
modId="yet_another_config_lib_v3"
type="optional"
versionRange="[3.3.0,)"
versionRange="[3.6.0,)"
ordering="AFTER"
side="CLIENT"

0 comments on commit 5c0921c

Please sign in to comment.