Skip to content
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
6 changes: 3 additions & 3 deletions .github/workflows/build_status.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v6
with:
python-version: 3.13
- name: Set up JDK 21
python-version: 3.14
- name: Set up JDK 25
uses: actions/setup-java@v5
with:
distribution: 'microsoft'
java-version: 21
java-version: 25
cache: 'gradle'
- name: Build with Gradle
run: ./gradlew build --rerun-tasks
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
- uses: actions/checkout@v5
- name: Set up Python
uses: actions/setup-python@v6
- name: Set up JDK 21
- name: Set up JDK 25
uses: actions/setup-java@v5
with:
distribution: 'microsoft'
java-version: 21
java-version: 25
- name: Copy Maven Upload URL
id: extract_maven_upload_url
run: echo "maven_upload_url=${{ secrets.MAVEN_UPLOAD_URL }}" >> $GITHUB_OUTPUT
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Copyright © 2019-2025 Ennui Langeweile, All rights reserved.
Copyright © 2019-2026 Ennui Langeweile, All rights reserved.
1 change: 0 additions & 1 deletion build-logic/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
`kotlin-dsl`
id("groovy-gradle-plugin")
}

repositories {
Expand Down
12 changes: 6 additions & 6 deletions build-logic/src/main/kotlin/mod_conventions_common.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,26 @@ java {
repositories {
exclusiveContent {
forRepository {
maven("https://maven.parchmentmc.org")
maven("https://maven.uuid.gg/releases")
}
filter {
includeGroupAndSubgroups("org.parchmentmc")
includeGroup("page.langeweile.wrench_wrapper")
}
}
exclusiveContent {
forRepository {
maven("https://maven.uuid.gg/releases")
maven("https://maven.quiltmc.org/repository/release")
}
filter {
includeGroup("page.langeweile.wrench_wrapper")
includeGroupAndSubgroups("org.quiltmc")
}
}
exclusiveContent {
forRepository {
maven("https://maven.quiltmc.org/repository/release")
maven("https://maven.caffeinemc.net/releases")
}
filter {
includeGroupAndSubgroups("org.quiltmc")
includeGroup("net.caffeinemc")
}
}
mavenCentral()
Expand Down
4 changes: 2 additions & 2 deletions build-logic/src/main/kotlin/mod_conventions_loader.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ plugins {
}

dependencies {
compileOnly(project(":mod_common"))
implementation(project(":mod_common"))
}

sourceSets.main {
val common = project(":mod_common").sourceSets.main.get()
java.srcDirs(common.java)
java.srcDirs(common.java) // Required in order to bundle everything in, but this will make programming annoying!
resources.srcDirs(common.resources)
}
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Gradle Properties
#org.gradle.jvmargs=-Xmx1G -XX:+UseZGC -XX:+UnlockExperimentalVMOptions -XX:+UseCompactObjectHeaders
org.gradle.jvmargs=-Xmx3G
org.gradle.jvmargs=-Xmx1G -XX:+UseZGC
org.gradle.parallel=true
org.gradle.caching=true
13 changes: 7 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
minecraft = "1.21.11"
minecraft_unobfuscated = "1.21.11_unobfuscated"

fabric_loom = "1.14.4"
fabric_loader = "0.18.1"
moddevgradle = "2.0.121"
neoforge = "21.11.0-beta"
fabric_loom = "1.15.1"
fabric_loader = "0.18.4"
moddevgradle = "2.0.139"
neoforge = "21.11.36-beta"

fabric_api = "0.139.4+1.21.11"
fabric_api = "0.141.1+1.21.11"
wrench_wrapper = "0.8.1"

modmenu = "17.0.0-alpha.1"
modmenu = "17.0.0-beta.2"

[libraries]
minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
Expand All @@ -21,6 +21,7 @@ fabric_api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fab
wrench_wrapper_api_fabric = { module = "page.langeweile.wrench_wrapper:api_fabric", version.ref = "wrench_wrapper" }
wrench_wrapper_api_neoforge = { module = "page.langeweile.wrench_wrapper:api_neoforge", version.ref = "wrench_wrapper" }
wrench_wrapper_impl = { module = "page.langeweile.wrench_wrapper:impl", version.ref = "wrench_wrapper" }

modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }

# If you have multiple similar dependencies, you can declare a dependency bundle and reference it on the build script with "libs.bundles.example".
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
package page.langeweile.ok_zoomer.config;

public class ConfigEnums {
public enum CinematicCameraOptions implements ConfigEnum {
OFF,
VANILLA,
MULTIPLIED
}

public enum ZoomTransitionOptions implements ConfigEnum {
OFF,
public enum ZoomTransitionModes implements ConfigEnum {
INSTANT,
LINEAR,
SMOOTH,
LINEAR
SINE,
BALANCED,
SPRING
}

public enum ZoomModes implements ConfigEnum {
Expand Down Expand Up @@ -42,6 +39,7 @@ public enum ZoomPresets implements ConfigEnum {
CAMERA,
COMPETITIVE,
CLASSIC,
ZOOMINATOR,
PERSISTENT,
SPYGLASS
}
Expand Down
Loading