Skip to content

Commit

Permalink
update to 1.20.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Boxadactle committed May 21, 2024
1 parent 5070ef3 commit 92cfd39
Show file tree
Hide file tree
Showing 33 changed files with 402 additions and 639 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'

- name: Build with Gradle
Expand All @@ -37,8 +37,8 @@ jobs:
name: fabric-build
path: fabric/build/libs

- name: Upload forge
- name: Upload neoforge
uses: actions/upload-artifact@v3
with:
name: forge-build
path: forge/build/libs
name: neoforge-build
path: neoforge/build/libs
10 changes: 5 additions & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'

- name: Build with Gradle
Expand All @@ -37,11 +37,11 @@ jobs:
name: fabric-build
path: fabric/build/libs

- name: Upload forge
- name: Upload neoforge
uses: actions/upload-artifact@v3
with:
name: forge-build
path: forge/build/libs
name: neoforge-build
path: neoforge/build/libs

- name: Publish
run: ./gradlew publishUnified
Expand Down
77 changes: 46 additions & 31 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,52 +1,67 @@
plugins {
id "architectury-plugin" version "3.4-SNAPSHOT"
id "dev.architectury.loom" version "1.1-SNAPSHOT" apply false
id "me.shedaniel.unified-publishing" version "0.1.+"
id "maven-publish"
id 'dev.architectury.loom' version '1.6-SNAPSHOT' apply false
id 'architectury-plugin' version '3.4-SNAPSHOT'
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
}

architectury {
minecraft = rootProject.minecraft_version
minecraft = project.minecraft_version
}

subprojects {
apply plugin: "dev.architectury.loom"

loom {
silentMojangMappingsLicense()
}

dependencies {
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
// The following line declares the mojmap mappings, you may use other mappings as well
mappings loom.officialMojangMappings()
// The following line declares the yarn mappings you may select this one as well.
// mappings "net.fabricmc:yarn:@YARN_MAPPINGS@:v2"
}
allprojects {
group = rootProject.maven_group
version = rootProject.mod_version
}

allprojects {
apply plugin: "java"
apply plugin: "architectury-plugin"
apply plugin: "maven-publish"
subprojects {
apply plugin: 'dev.architectury.loom'
apply plugin: 'architectury-plugin'
apply plugin: 'maven-publish'

archivesBaseName = rootProject.archives_base_name
version = rootProject.mod_version
group = rootProject.maven_group
base {
// Set up a suffixed format for the mod jar names, e.g. `example-fabric`.
archivesName = "$rootProject.archives_name-$project.name"
}

repositories {
maven { url = "https://maven.boxadactle.dev/" }
maven { url = "https://maven.terraformersmc.com/releases/" }
}

tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
options.release = 17
dependencies {
minecraft "net.minecraft:minecraft:$rootProject.minecraft_version"
mappings loom.officialMojangMappings()
}

java {
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
// if it is present.
// If you remove this line, sources will not be generated.
withSourcesJar()

sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

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

tasks.register('modPublish')
// Configure Maven publishing.
publishing {
publications {
mavenJava(MavenPublication) {
artifactId = base.archivesName.get()
from components.java
}
}

// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
repositories {
// Add repositories to publish to here.
// Notice: This block does NOT have the same function as the block in the top level.
// The repositories here will be used for publishing your artifact, not for
// retrieving dependencies.
}
}
}
25 changes: 7 additions & 18 deletions common/build.gradle
Original file line number Diff line number Diff line change
@@ -1,23 +1,12 @@
dependencies {
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"

modCompileOnlyApi("dev.boxadactle:Boxlib:${rootProject.boxlib_version}")
}

architectury {
common("fabric", "forge")
common rootProject.enabled_platforms.split(',')
}

publishing {
publications {
mavenCommon(MavenPublication) {
artifactId = rootProject.archives_base_name
from components.java
}
}
dependencies {
// We depend on Fabric Loader here to use the Fabric @Environment annotations,
// which get remapped to the correct annotations on each platform.
// Do NOT use other classes from Fabric Loader.
modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"

// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
repositories {
// Add repositories to publish to here.
}
modImplementation "dev.boxadactle:Boxlib-common:$rootProject.boxlib_version"
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
import dev.boxadactle.debugkeybind.keybind.KeybindConfig;
import net.minecraft.client.KeyMapping;

public class DebugKeybindMain
{
public class DebugKeybindMain {
public static final String MOD_NAME = "DebugKeybind";

public static final String MOD_ID = "debugkeybind";

public static final String VERSION = "7.0.0";
public static final String VERSION = "9.0.0";

public static final String VERSION_STRING = MOD_NAME + " v" + VERSION;

Expand All @@ -21,6 +20,7 @@ public class DebugKeybindMain
public static BConfigClass<KeybindConfig> CONFIG;

public static void init() {
LOGGER.info("Initializing " + VERSION_STRING + "...");

CONFIG = BConfigHandler.registerConfig(KeybindConfig.class);

Expand Down
Loading

0 comments on commit 92cfd39

Please sign in to comment.