Skip to content

Commit

Permalink
finish 2.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Treetrain1 committed Sep 22, 2023
1 parent cc98e83 commit 2ee47e1
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ What's new:
- No longer prevents launching the game with Sodium versions earlier than 0.5.0.
- Some rendering functionality will be lost.
- Updated embedded FrozenLib to 1.3.9.
- Internally changed how required dependencies are handled.
8 changes: 6 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ val mod_loader: String by project
val maven_group: String by project
val archives_base_name: String by project

val fabric_version: String by project
val fabric_api_version: String by project
val fabric_asm_version: String by project
val frozenlib_version: String by project

Expand Down Expand Up @@ -225,7 +225,7 @@ dependencies {
modImplementation("net.fabricmc:fabric-loader:$loader_version")

// Fabric API. This is technically optional, but you probably want it anyway.
modImplementation("net.fabricmc.fabric-api:fabric-api:$fabric_version")
modImplementation("net.fabricmc.fabric-api:fabric-api:$fabric_api_version")

// FrozenLib
if (local_frozenlib) {
Expand Down Expand Up @@ -321,6 +321,10 @@ tasks {
properties["version"] = version
properties["minecraft_version"] = "~$minecraft_version-"

properties["fabric_loader_version"] = ">=$loader_version"
properties["fabric_api_version"] = ">=$fabric_api_version"
properties["frozenlib_version"] = ">=${frozenlib_version.split('-').first}-"

properties.forEach { (a, b) -> inputs.property(a, b) }

filesNotMatching(
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
archives_base_name = WilderWild

# Dependencies
fabric_version=0.88.1+1.20.1
fabric_api_version=0.89.0+1.20.1
fabric_asm_version=v2.3
frozenlib_version=1.3.9-mc1.20.1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public String getRefMapperConfig() {
@Override
public boolean shouldApplyMixin(String targetClassName, @NotNull String mixinClassName) {
if (mixinClassName.contains("sodium")) {
return FrozenBools.HAS_SODIUM && FabricLoader.getInstance().getModContainer("sodum").orElseThrow().getMetadata().getVersion().getFriendlyString().contains("0.5.");
return FrozenBools.HAS_SODIUM && FabricLoader.getInstance().getModContainer("sodium").orElseThrow().getMetadata().getVersion().getFriendlyString().contains("0.5.");
}
if (mixinClassName.contains("LiquidBlockRenderer") || mixinClassName.contains("CloudRenderer") || mixinClassName.contains("EntityRenderDispatcher")) {
return !FrozenBools.HAS_SODIUM;
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
"depends": {
"frozenlib": ">=1.2.0-",
"nbtcrafting": ">=2.2.3",
"fabricloader": ">=0.14.13",
"fabric-api": ">=0.76.1",
"fabricloader": "${fabric_loader_version}",
"fabric-api": "${fabric_api_version}",
"minecraft": "${minecraft_version}",
"java": ">=17"
},
Expand Down

0 comments on commit 2ee47e1

Please sign in to comment.