trafficlunar/options-profiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: 1.21.1 backport

Browse source
This commit is contained in:
trafficlunar 2025-03-01 22:17:07 +00:00
parent fd17833a16
commit ae2245c4bd
8 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/build.gradle
View file

@ -26,8 +26,8 @@ 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.3-fabric" // Sodium modImplementation "maven.modrinth:sodium:mc1.21.1-0.6.9-fabric" // Sodium
modImplementation "maven.modrinth:sodium-extra:mc1.21.4-0.6.1+fabric" // Sodium Extra modImplementation "maven.modrinth:sodium-extra:mc1.21.1-0.6.0+fabric" // Sodium Extra
modImplementation "maven.modrinth:iris:1.8.5+1.21.4-fabric" // Iris modImplementation "maven.modrinth:iris:1.8.8+1.21.1-fabric" // Iris
modImplementation "maven.modrinth:distanthorizons:2.2.1-a-1.21.1" // Distant Horizons modImplementation "maven.modrinth:distanthorizons:2.2.1-a-1.21.1" // Distant Horizons
} }

6
common/src/main/java/net/trafficlunar/optionsprofiles/gui/OptionsToggleList.java
View file

@ -70,8 +70,8 @@ public class OptionsToggleList extends ContainerObjectSelectionList<OptionsToggl
} }
} }
protected int scrollBarX() { protected int getScrollbarPosition() {
return super.scrollBarX() + 15; return super.getScrollbarPosition() + 15;
} }
public int getRowWidth() { public int getRowWidth() {
@ -113,7 +113,7 @@ public class OptionsToggleList extends ContainerObjectSelectionList<OptionsToggl
public void render(GuiGraphics guiGraphics, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { public void render(GuiGraphics guiGraphics, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
Font fontRenderer = OptionsToggleList.this.minecraft.font; Font fontRenderer = OptionsToggleList.this.minecraft.font;
int posX = OptionsToggleList.this.scrollBarX() - this.toggleButton.getWidth() - 10; int posX = OptionsToggleList.this.getScrollbarPosition() - this.toggleButton.getWidth() - 10;
int posY = y - 2; int posY = y - 2;
int textY = y + entryHeight / 2; int textY = y + entryHeight / 2;

6
common/src/main/java/net/trafficlunar/optionsprofiles/gui/ProfilesList.java
View file

@ -58,8 +58,8 @@ public class ProfilesList extends ContainerObjectSelectionList<ProfilesList.Prof
this.children().forEach(ProfileEntry::checkLoaded); this.children().forEach(ProfileEntry::checkLoaded);
} }
protected int scrollBarX() { protected int getScrollbarPosition() {
return super.scrollBarX() + 15; return super.getScrollbarPosition() + 15;
} }
public int getRowWidth() { public int getRowWidth() {
@ -105,7 +105,7 @@ public class ProfilesList extends ContainerObjectSelectionList<ProfilesList.Prof
public void render(GuiGraphics guiGraphics, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { public void render(GuiGraphics guiGraphics, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
Font fontRenderer = ProfilesList.this.minecraft.font; Font fontRenderer = ProfilesList.this.minecraft.font;
int posX = ProfilesList.this.scrollBarX() - this.loadButton.getWidth() - 10; int posX = ProfilesList.this.getScrollbarPosition() - this.loadButton.getWidth() - 10;
int posY = y - 2; int posY = y - 2;
int textY = y + entryHeight / 2; int textY = y + entryHeight / 2;

2
fabric/build.gradle
View file

@ -41,7 +41,7 @@ dependencies {
modImplementation "dev.architectury:architectury-fabric:$rootProject.architectury_api_version" modImplementation "dev.architectury:architectury-fabric:$rootProject.architectury_api_version"
// Mod Menu API // Mod Menu API
modImplementation("com.terraformersmc:modmenu:13.0.2") modImplementation("com.terraformersmc:modmenu:11.0.3")
common(project(path: ':common', configuration: 'namedElements')) { transitive false } common(project(path: ':common', configuration: 'namedElements')) { transitive false }
shadowBundle project(path: ':common', configuration: 'transformProductionFabric') shadowBundle project(path: ':common', configuration: 'transformProductionFabric')

4
fabric/src/main/resources/fabric.mod.json
View file

@ -26,9 +26,9 @@
], ],
"depends": { "depends": {
"fabricloader": ">=0.15.11", "fabricloader": ">=0.15.11",
"minecraft": "~1.21", "minecraft": "~1.21.1",
"java": ">=21", "java": ">=21",
"architectury": ">=15.0.3", "architectury": ">=13.0.8",
"fabric-api": "*" "fabric-api": "*"
} }
} }

10
gradle.properties
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.1
# Dependencies # Dependencies
architectury_api_version = 15.0.3 architectury_api_version=13.0.8
fabric_loader_version=0.16.9 fabric_loader_version=0.16.10
fabric_api_version=0.111.0+1.21.4 fabric_api_version=0.115.1+1.21.1
neoforge_version=21.4.9-beta neoforge_version=21.1.128

4
neoforge/src/main/resources/META-INF/neoforge.mods.toml
View file

@ -23,14 +23,14 @@ side = "BOTH"
[[dependencies.optionsprofiles]] [[dependencies.optionsprofiles]]
modId = "minecraft" modId = "minecraft"
type = "required" type = "required"
versionRange = "[1.21,)" versionRange = "[1.21.1,)"
ordering = "NONE" ordering = "NONE"
side = "BOTH" side = "BOTH"
[[dependencies.optionsprofiles]] [[dependencies.optionsprofiles]]
modId = "architectury" modId = "architectury"
type = "required" type = "required"
versionRange = "[15.0.3,)" versionRange = "[13.0.8,)"
ordering = "AFTER" ordering = "AFTER"
side = "BOTH" side = "BOTH"

2
settings.gradle
View file

@ -11,4 +11,4 @@ include("common")
include("fabric") include("fabric")
include("neoforge") include("neoforge")
rootProject.name = "optionsprofiles-v1.4-1.21.4" rootProject.name = "optionsprofiles-v1.4-1.21.1"