Skip to content

Commit

Permalink
Update to 1.21.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Hugman76 committed Dec 19, 2024
1 parent 8ea4f82 commit f1e3f34
Show file tree
Hide file tree
Showing 248 changed files with 332 additions and 580 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 17
java-version: 21

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Build with Gradle
run: ./gradlew build

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: artifacts
path: build/libs
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v1
with:
java-version: '17'
java-version: '21'

- name: Grant execute permission for gradlew
run: chmod +x ./gradlew
Expand All @@ -36,7 +36,7 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}

changelog: ${{ github.event.release.body }}
java: 17
java: 21

modrinth-featured: false

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Build Rush can be installed on a client or a server. As this is a multiplayer mi

⚠ Build Rush **needs** the following mods to be installed:
- Plasmid: [GitHub](https://github.com/NucleoidMC/plasmid) / [Modrinth](https://modrinth.com/mod/plasmid)
- Fabric API: [GitHub](https://github.com/FabricMC/fabric) / [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api) / [Modrinth](https://modrinth.com/mod/fabric-api)
- Fabric API: [GitHub](https://github.com/FabricMC/fabric) / [Modrinth](https://modrinth.com/mod/fabric-api) / [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api)

## Usage

Expand Down
5 changes: 2 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "fabric-loom" version "1.5.+"
id "fabric-loom" version "1.8.+"
id 'maven-publish'
}

Expand Down Expand Up @@ -27,7 +27,6 @@ dependencies {
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

modImplementation "xyz.nucleoid:plasmid:${project.plasmid_version}"
modImplementation include("maven.modrinth:nota:${project.nota_version}")
}

processResources {
Expand All @@ -40,7 +39,7 @@ processResources {

tasks.withType(JavaCompile).configureEach {
it.options.encoding = "UTF-8"
it.options.release = 17
it.options.release = 21
}

java {
Expand Down
15 changes: 6 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,16 @@
org.gradle.jvmargs=-Xmx1G

# Mod Properties
mod_version=3.0.3
mod_version=4.0.0
maven_group=fr.hugman
archives_base_name=build_rush

# Fabric Properties
# check these on https://fabricmc.net/develop/
minecraft_version=1.20.4
yarn_mappings=1.20.4+build.1
loader_version=0.15.6
fabric_version=0.91.1+1.20.4
minecraft_version=1.21.4
yarn_mappings=1.21.4+build.2
loader_version=0.16.9
fabric_version=0.112.2+1.21.4

# check this on https://nucleoid.xyz/use/
plasmid_version=0.5.102-SNAPSHOT+1.20.4

# check this on https://modrinth.com/mod/nota/changelog
nota_version=0.1.0+1.19.4
plasmid_version=0.6.3-SNAPSHOT+1.21.4
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
10 changes: 5 additions & 5 deletions src/main/java/fr/hugman/build_rush/BRConfig.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package fr.hugman.build_rush;

import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import fr.hugman.build_rush.build.Build;
import fr.hugman.build_rush.map.BRMapConfig;
import net.minecraft.registry.entry.RegistryEntryList;
import xyz.nucleoid.plasmid.game.common.config.PlayerConfig;
import xyz.nucleoid.plasmid.api.game.common.config.WaitingLobbyConfig;

import java.util.Optional;

public record BRConfig(PlayerConfig playerConfig, BRMapConfig mapConfig, Optional<RegistryEntryList<Build>> builds) {
public static final Codec<BRConfig> CODEC = RecordCodecBuilder.create(instance -> instance.group(
PlayerConfig.CODEC.fieldOf("players").forGetter(BRConfig::playerConfig),
public record BRConfig(WaitingLobbyConfig playerConfig, BRMapConfig mapConfig, Optional<RegistryEntryList<Build>> builds) {
public static final MapCodec<BRConfig> CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(
WaitingLobbyConfig.CODEC.fieldOf("players").forGetter(BRConfig::playerConfig),
BRMapConfig.CODEC.fieldOf("map").forGetter(BRConfig::mapConfig),
Build.LIST_CODEC.optionalFieldOf("builds").forGetter(BRConfig::builds)
).apply(instance, BRConfig::new));
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/fr/hugman/build_rush/BuildRush.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import net.minecraft.util.Identifier;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import xyz.nucleoid.plasmid.game.GameType;
import xyz.nucleoid.plasmid.api.game.GameType;

public class BuildRush implements ModInitializer {
public static final String ID = "build_rush";
Expand All @@ -20,7 +20,7 @@ public void onInitialize() {
}

public static Identifier id(String s) {
return new Identifier(ID, s);
return Identifier.of(ID, s);
}

public static void debug(String s) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/fr/hugman/build_rush/build/Build.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import net.minecraft.registry.entry.RegistryEntryList;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
import xyz.nucleoid.plasmid.util.PlasmidCodecs;
import xyz.nucleoid.plasmid.api.util.PlasmidCodecs;

import java.util.List;
import java.util.Optional;
Expand Down
Loading

0 comments on commit f1e3f34

Please sign in to comment.