Skip to content

Commit

Permalink
Update to 1.20.5
Browse files Browse the repository at this point in the history
  • Loading branch information
DrexHD committed Apr 23, 2024
1 parent 9b667ae commit 7da12ef
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 76 deletions.
29 changes: 7 additions & 22 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,25 @@
# Automatically build the project and run any configured tests for every push
# and submitted pull request. This can help catch issues that only occur on
# certain platforms or Java versions, and provides a first line of defence
# against bad commits.

name: build
on: [pull_request, push]

jobs:
build:
strategy:
matrix:
# Use these Java versions
java: [
17, # Current Java LTS & minimum supported by Minecraft
]
# and run on both Linux and Windows
os: [ubuntu-22.04, windows-2022]
runs-on: ${{ matrix.os }}
runs-on: ubuntu-latest
steps:
- name: checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: validate gradle wrapper
uses: gradle/wrapper-validation-action@v1
- name: setup jdk ${{ matrix.java }}
uses: actions/setup-java@v3
uses: gradle/wrapper-validation-action@v2
- name: setup jdk 21
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
java-version: 21
distribution: 'microsoft'
- name: make gradle wrapper executable
if: ${{ runner.os != 'Windows' }}
run: chmod +x ./gradlew
- name: build
run: ./gradlew build
- name: capture build artifacts
if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Artifacts
path: build/libs/
9 changes: 4 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.5-SNAPSHOT'
id 'fabric-loom' version '1.6-SNAPSHOT'
id 'maven-publish'
}

Expand All @@ -11,7 +11,6 @@ base {
}

repositories {
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
maven { url 'https://maven.nucleoid.xyz' }
maven { url "https://api.modrinth.com/maven" }
maven { url 'https://jitpack.io' }
Expand Down Expand Up @@ -43,7 +42,7 @@ processResources {
}

tasks.withType(JavaCompile).configureEach {
it.options.release = 17
it.options.release = 21
}

java {
Expand All @@ -52,8 +51,8 @@ java {
// If you remove this line, sources will not be generated.
withSourcesJar()

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

jar {
Expand Down
15 changes: 7 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ org.gradle.parallel=true

# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=24w13a

loader_version=0.15.7
minecraft_version=1.20.5
loader_version=0.15.10

# Mod Properties
mod_version=1.0.0+1.20.5
Expand All @@ -15,9 +14,9 @@ archives_base_name=votelistener


# Dependencies
fabric_version=0.96.12+1.20.5
fabric_version=0.97.6+1.20.5
nuvotifier_version=2.7.2
nuvotifier_fabric_version=1.0.0-1.20.4
placeholder_api_version=2.3.0+1.20.3
fabric_permission_api_version=0.3-SNAPSHOT
vanish_version=1.5.1+1.20.4
nuvotifier_fabric_version=1.0.0-1.20.5
placeholder_api_version=2.4.0-pre.1+1.20.5
fabric_permission_api_version=0.3.1
vanish_version=1.5.3+1.20.5
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-8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
1 change: 1 addition & 0 deletions src/main/java/me/drex/votelistener/VoteListener.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public void onInitializeServer() {
loadData(server);
VoteListener.server = server;
});
ServerLifecycleEvents.AFTER_SAVE.register((server, flush, force) -> saveData(server));
CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> Commands.register(dispatcher));
ServerTickEvents.START_SERVER_TICK.register(VoteListener::onTick);
com.vexsoftware.votifier.fabric.event.VoteListener.EVENT.register(VoteListener::onVote);
Expand Down
24 changes: 0 additions & 24 deletions src/main/java/me/drex/votelistener/mixin/MinecraftServerMixin.java

This file was deleted.

7 changes: 2 additions & 5 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,9 @@
"me.drex.votelistener.VoteListener"
]
},
"mixins": [
"votelistener.mixins.json"
],
"depends": {
"fabricloader": ">=0.15.6",
"java": ">=17",
"fabricloader": ">=0.15.10",
"java": ">=21",
"nuvotifier-fabric": "*",
"fabric-api": "*"
}
Expand Down
11 changes: 0 additions & 11 deletions src/main/resources/votelistener.mixins.json

This file was deleted.

0 comments on commit 7da12ef

Please sign in to comment.