feat: 1.21.6

This commit is contained in:
trafficlunar 2025-07-31 19:58:03 +01:00
parent 738517594b
commit 5c933c5b07
11 changed files with 25 additions and 33 deletions

View file

@ -1,5 +1,5 @@
plugins { plugins {
id 'dev.architectury.loom' version '1.7-SNAPSHOT' apply false id 'dev.architectury.loom' version '1.10-SNAPSHOT' apply false
id 'architectury-plugin' version '3.4-SNAPSHOT' id 'architectury-plugin' version '3.4-SNAPSHOT'
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
} }

View file

@ -26,9 +26,9 @@ dependencies {
modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version" modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version"
// Mod implementations // Mod implementations
modImplementation "maven.modrinth:sodium:mc1.21.4-0.6.13-fabric" // Sodium modImplementation "maven.modrinth:sodium:mc1.21.6-0.6.13-fabric" // Sodium
modImplementation "maven.modrinth:sodium-extra:mc1.21.4-0.6.1+fabric" // Sodium Extra modImplementation "maven.modrinth:sodium-extra:mc1.21.6-0.6.6+fabric" // Sodium Extra
modImplementation "maven.modrinth:iris:1.8.5+1.21.4-fabric" // Iris modImplementation "maven.modrinth:iris:1.9.1+1.21.7-fabric" // Iris
modImplementation "maven.modrinth:distanthorizons:2.2.1-a-1.21.1" // Distant Horizons modImplementation "maven.modrinth:distanthorizons:2.3.4-b-1.21.6" // Distant Horizons
modImplementation "maven.modrinth:controlify:2.1.1-fabric,1.21.4" // Controlify modImplementation "maven.modrinth:controlify:2.2.1-fabric,1.21.6" // Controlify
} }

View file

@ -117,7 +117,7 @@ public class OptionsToggleList extends ContainerObjectSelectionList<OptionsToggl
int posY = y - 2; int posY = y - 2;
int textY = y + entryHeight / 2; int textY = y + entryHeight / 2;
guiGraphics.drawString(fontRenderer, this.optionKey, x, textY - 9 / 2, 16777215, false); guiGraphics.drawString(fontRenderer, this.optionKey, x, textY - 9 / 2, -1);
this.toggleButton.setPosition(posX, posY); this.toggleButton.setPosition(posX, posY);
this.toggleButton.render(guiGraphics, mouseX, mouseY, tickDelta); this.toggleButton.render(guiGraphics, mouseX, mouseY, tickDelta);

View file

@ -109,7 +109,7 @@ public class ProfilesList extends ContainerObjectSelectionList<ProfilesList.Prof
int posY = y - 2; int posY = y - 2;
int textY = y + entryHeight / 2; int textY = y + entryHeight / 2;
guiGraphics.drawString(fontRenderer, this.profileName, x, textY - 9 / 2, 16777215, false); guiGraphics.drawString(fontRenderer, this.profileName, x, textY - 9 / 2, -1);
this.editButton.setPosition(posX - this.editButton.getWidth(), posY); this.editButton.setPosition(posX - this.editButton.getWidth(), posY);
this.editButton.render(guiGraphics, mouseX, mouseY, tickDelta); this.editButton.render(guiGraphics, mouseX, mouseY, tickDelta);

View file

@ -1,5 +1,7 @@
package net.trafficlunar.optionsprofiles.profiles.loaders; package net.trafficlunar.optionsprofiles.profiles.loaders;
import me.flashyreese.mods.sodiumextra.client.gui.FogTypeConfig;
import net.minecraft.world.level.material.FogType;
import net.trafficlunar.optionsprofiles.OptionsProfilesMod; import net.trafficlunar.optionsprofiles.OptionsProfilesMod;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
@ -10,6 +12,7 @@ import net.minecraft.resources.ResourceLocation;
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.EnumMap;
import java.util.Map; import java.util.Map;
public class SodiumExtraLoader { public class SodiumExtraLoader {
@ -47,10 +50,8 @@ public class SodiumExtraLoader {
SodiumExtraClientMod.options().detailSettings.biomeColors = configuration.detail_settings.biome_colors; SodiumExtraClientMod.options().detailSettings.biomeColors = configuration.detail_settings.biome_colors;
SodiumExtraClientMod.options().detailSettings.skyColors = configuration.detail_settings.sky_colors; SodiumExtraClientMod.options().detailSettings.skyColors = configuration.detail_settings.sky_colors;
SodiumExtraClientMod.options().renderSettings.fogDistance = configuration.render_settings.fog_distance; SodiumExtraClientMod.options().renderSettings.globalFog = configuration.render_settings.global_fog;
SodiumExtraClientMod.options().renderSettings.fogStart = configuration.render_settings.fog_start; SodiumExtraClientMod.options().renderSettings.fogTypeConfig = configuration.render_settings.fog_type_config;
SodiumExtraClientMod.options().renderSettings.multiDimensionFogControl = configuration.render_settings.multi_dimension_fog_control;
SodiumExtraClientMod.options().renderSettings.dimensionFogDistanceMap = configuration.render_settings.dimensionFogDistance;
SodiumExtraClientMod.options().renderSettings.lightUpdates = configuration.render_settings.light_updates; SodiumExtraClientMod.options().renderSettings.lightUpdates = configuration.render_settings.light_updates;
SodiumExtraClientMod.options().renderSettings.itemFrame = configuration.render_settings.item_frame; SodiumExtraClientMod.options().renderSettings.itemFrame = configuration.render_settings.item_frame;
SodiumExtraClientMod.options().renderSettings.armorStand = configuration.render_settings.armor_stand; SodiumExtraClientMod.options().renderSettings.armorStand = configuration.render_settings.armor_stand;
@ -120,10 +121,8 @@ public class SodiumExtraLoader {
} }
public static class RenderSettings { public static class RenderSettings {
public int fog_distance; public boolean global_fog;
public int fog_start; public EnumMap<FogType, FogTypeConfig> fog_type_config;
public boolean multi_dimension_fog_control;
public Map<ResourceLocation, Integer> dimensionFogDistance;
public boolean light_updates; public boolean light_updates;
public boolean item_frame; public boolean item_frame;
public boolean armor_stand; public boolean armor_stand;

View file

@ -42,8 +42,6 @@ public class SodiumLoader {
SodiumClientMod.options().notifications.hasClearedDonationButton = configuration.notifications.has_cleared_donation_button; SodiumClientMod.options().notifications.hasClearedDonationButton = configuration.notifications.has_cleared_donation_button;
SodiumClientMod.options().notifications.hasSeenDonationPrompt = configuration.notifications.has_seen_donation_prompt; SodiumClientMod.options().notifications.hasSeenDonationPrompt = configuration.notifications.has_seen_donation_prompt;
SodiumClientMod.options().debug.terrainSortingEnabled = configuration.debug.terrain_sorting_enabled;
try { try {
SodiumGameOptions.writeToDisk(SodiumClientMod.options()); SodiumGameOptions.writeToDisk(SodiumClientMod.options());
} catch (IOException e) { } catch (IOException e) {
@ -56,7 +54,6 @@ public class SodiumLoader {
public Advanced advanced; public Advanced advanced;
public Performance performance; public Performance performance;
public Notifications notifications; public Notifications notifications;
public Debug debug;
public static class Quality { public static class Quality {
public String weather_quality; public String weather_quality;
@ -84,9 +81,5 @@ public class SodiumLoader {
public boolean has_cleared_donation_button; public boolean has_cleared_donation_button;
public boolean has_seen_donation_prompt; public boolean has_seen_donation_prompt;
} }
public static class Debug {
public boolean terrain_sorting_enabled;
}
} }
} }

View file

@ -25,10 +25,10 @@
"optionsprofiles.mixins.json" "optionsprofiles.mixins.json"
], ],
"depends": { "depends": {
"fabricloader": ">=0.15.11", "fabricloader": ">=0.16.14",
"minecraft": "~1.21", "minecraft": "~1.21",
"java": ">=21", "java": ">=21",
"architectury": ">=15.0.3", "architectury": ">=17.0.6",
"fabric-api": "*" "fabric-api": "*"
} }
} }

View file

@ -11,10 +11,10 @@ archives_name=optionsprofiles
enabled_platforms=fabric,neoforge enabled_platforms=fabric,neoforge
# Minecraft properties # Minecraft properties
minecraft_version=1.21.4 minecraft_version=1.21.6
# Dependencies # Dependencies
architectury_api_version = 15.0.3 architectury_api_version = 17.0.6
fabric_loader_version=0.16.9 fabric_loader_version=0.16.14
fabric_api_version=0.111.0+1.21.4 fabric_api_version=0.128.2+1.21.6
neoforge_version=21.4.9-beta neoforge_version=21.6.20-beta

View file

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000 networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

0
gradlew vendored Normal file → Executable file
View file

View file

@ -16,7 +16,7 @@ logoFile = "icon.png"
[[dependencies.optionsprofiles]] [[dependencies.optionsprofiles]]
modId = "neoforge" modId = "neoforge"
type = "required" type = "required"
versionRange = "[21.0,)" versionRange = "[21.6,)"
ordering = "NONE" ordering = "NONE"
side = "BOTH" side = "BOTH"
@ -30,7 +30,7 @@ side = "BOTH"
[[dependencies.optionsprofiles]] [[dependencies.optionsprofiles]]
modId = "architectury" modId = "architectury"
type = "required" type = "required"
versionRange = "[15.0.3,)" versionRange = "[17.0.6,)"
ordering = "AFTER" ordering = "AFTER"
side = "BOTH" side = "BOTH"