Skip to content

Commit

Permalink
Merge pull request #39 from NotRyken/mc1.20.6
Browse files Browse the repository at this point in the history
Update to Java 21 and mc1.20.6
  • Loading branch information
NotRyken authored May 28, 2024
2 parents 2215c16 + 49117b3 commit 268026b
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/check-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
build:
strategy:
matrix:
java: [17]
java: [21]
os: [ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -41,7 +41,7 @@ jobs:
- name: Build
run: ./gradlew build --stacktrace --parallel
- name: Capture build artifacts
if: ${{ runner.os == 'Linux' && matrix.java == '17' }}
if: ${{ runner.os == 'Linux' && matrix.java == '21' }}
uses: actions/upload-artifact@v4
with:
name: Artifacts
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
release:
strategy:
matrix:
java: [17]
java: [21]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -31,7 +31,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
- name: Capture build artifacts
if: ${{ runner.os == 'Linux' && matrix.java == '17' }}
if: ${{ runner.os == 'Linux' && matrix.java == '21' }}
uses: actions/upload-artifact@v4
with:
name: Artifacts
Expand Down
36 changes: 18 additions & 18 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Neo/Forge version ranges: https://maven.apache.org/enforcer/enforcer-rules/versionRanges.html

# Project
mod_version=1.5.0
mod_version=1.5.1
mod_group=com.github.scotsguy
mod_id=now-playing
mod_name=Now Playing
Expand All @@ -16,39 +16,39 @@ mod_license=MIT
mod_environment=client

# Java
java_version=17
java_versions_fabric=>=17
java_versions_neoforge=[17,)
java_version=21
java_versions_fabric=>=21
java_versions_neoforge=[21,)

# Minecraft
minecraft_version=1.20.4
minecraft_versions_fabric=>1.20.2 <1.21
minecraft_versions_neoforge=(1.20.2, 1.21)
minecraft_version=1.20.6
minecraft_versions_fabric=>1.20.4
minecraft_versions_neoforge=(1.20.5,)

# Fabric https://fabricmc.net/develop/
fabric_loader_version=0.15.11
fabric_loader_versions=>=0.13
fabric_api_version=0.97.0+1.20.4
fabric_api_version=0.99.0+1.20.6
fabric_api_versions=*

# NeoForge https://projects.neoforged.net/neoforged/neoforge
neoforge_loader_versions=[1,)
neoforge_version=20.4.234
neoforge_versions=[20.3,)
neoforge_version=20.6.82-beta
neoforge_versions=[20.6,)

# Cloth Config https://modrinth.com/mod/9s6osm5g/versions
clothconfig_version=13.0.121
clothconfig_versions_fabric=>12
clothconfig_versions_neoforge=(12,)
clothconfig_version=14.0.126
clothconfig_versions_fabric=>13
clothconfig_versions_neoforge=(13,)

# ModMenu https://modrinth.com/mod/mOgUt4GM/versions
modmenu_version=9.0.0
modmenu_versions=>8
modmenu_version=10.0.0-beta.1
modmenu_versions=>9

# Links
homepage_url=https://modrinth.com/mod/eNF4Bfla
sources_url=https://github.com/Scotsguy/now-playing
issues_url=https://github.com/Scotsguy/now-playing
issues_url=https://github.com/Scotsguy/now-playing/issues
contact_url=

# GitHub and Modrinth releases
Expand All @@ -59,11 +59,11 @@ modrinth_id=eNF4Bfla
release_type=release
# comma-separated lists
release_mod_loaders_fabric=fabric,quilt
release_game_versions_fabric=1.20.3,1.20.4
release_game_versions_fabric=1.20.5,1.20.6
# Fabric API, Cloth Config API, ModMenu
release_required_dep_ids_fabric=P7dR8mSH,9s6osm5g,mOgUt4GM
release_mod_loaders_neoforge=neoforge
release_game_versions_neoforge=1.20.3,1.20.4
release_game_versions_neoforge=1.20.6
# Cloth Config API
release_required_dep_ids_neoforge=9s6osm5g

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@
import com.github.scotsguy.nowplaying.gui.screen.ConfigScreenProvider;
import net.neoforged.fml.ModLoadingContext;
import net.neoforged.fml.common.Mod;
import net.neoforged.neoforge.client.ConfigScreenHandler;
import net.neoforged.neoforge.client.gui.IConfigScreenFactory;

@Mod(NowPlaying.MOD_ID_NEOFORGE)
public class NowPlayingNeoForge {
public NowPlayingNeoForge() {
ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class,
() -> new ConfigScreenHandler.ConfigScreenFactory(
(mc, parent) -> ConfigScreenProvider.getConfigScreen(parent))
);
ModLoadingContext.get().registerExtensionPoint(IConfigScreenFactory.class,
() -> (mc, parent) -> ConfigScreenProvider.getConfigScreen(parent));

NowPlaying.init();
}
Expand Down

0 comments on commit 268026b

Please sign in to comment.