Skip to content
Open

26.1 #15

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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
build:
strategy:
matrix:
java: [ 21 ]
java: [ 25 ]
os: [
ubuntu-latest,
windows-latest
Expand Down
7 changes: 5 additions & 2 deletions README-en.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@ Most other MC versions that are the same as the supported major versions but hav

| Minecraft Version | Support Status |
|-------------------|--------------------------------------------------------------------------|
| 1.21.10 | Supporting, developing actively |
| 26.1 | Supporting, developing actively |
| 1.21.11 | Supporting, developing actively |
| 1.21.5 | Supporting, developing actively |
| 1.21 | Supporting, developing actively |
| 1.20.4 | Supporting, developing actively |
| 1.20.1 | Not supporting, development stopped (supporting stopped on Jun 18, 2025) |
| 1.19.3 | Not supporting, development stopped (supporting stopped on Jun 18, 2025) |
| 1.18.2 | Not supporting, development stopped (supporting stopped on Jun 18, 2025) |
| 1.17.1 | Supporting, developing actively |
| 1.17.1 | Not supporting, development stopped (supporting stopped on May 1, 2026) |
| 1.16.5 | Not supporting, development stopped (supporting stopped on Jan 8, 2023) |

## Rules
Expand Down Expand Up @@ -345,6 +346,8 @@ If `blockUpdate` is not needed, **disabling this is highly recommended**.

**just in >=1.20**

**removed after v2.0.0**

If you want to use note block update suppression in 1.20, this may help you.

- Default value: `false`
Expand Down
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ Language: [English](https://github.com/OptiJava/OptCarpetAddition/blob/master/RE

| Minecraft 版本 | 支持状态 |
|--------------|----------------------------|
| 1.21.10 | 支持,积极开发 |
| 26.1 | 支持,积极开发 |
| 1.21.11 | 支持,积极开发 |
| 1.21.5 | 支持,积极开发 |
| 1.21 | 支持,积极开发 |
| 1.20.4 | 支持,积极开发 |
| 1.20.1 | 不支持,停止维护(在`2025/6/18`停止维护) |
| 1.19.3 | 不支持,停止维护(在`2025/6/18`停止维护) |
| 1.18.2 | 不支持,停止维护(在`2025/6/18`停止维护) |
| 1.17.1 | 支持,积极开发 |
| 1.17.1 | 不支持,停止维护(在`2026/5/1`停止维护) |
| 1.16.5 | 不支持,停止维护(在`2023/1/8`停止维护) |

## 规则
Expand Down Expand Up @@ -346,6 +347,8 @@ DispenserBlockEntity dispenserBlockEntity = (DispenserBlockEntity)blockPointerIm

**仅限`1.20`版本及以上**

**在v2.0.0以上版本已被移除**

如果你想在`1.20`使用音符盒极简抑制器,这可能能帮助你

- Default value: `false`
Expand Down
21 changes: 0 additions & 21 deletions build.gradle

This file was deleted.

95 changes: 95 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
import java.text.SimpleDateFormat
import java.util.Date

plugins {
id("fabric-loom")
id("maven-publish")
}


val minecraftVer = stonecutter.current.version
val modver = "${property("mod_version")}"

val modBuildNameSuffix = "v${modver}+build.${SimpleDateFormat("yyMMddHHmm").format(Date())}-${minecraftVer}"
val archivesBaseName = project.findProperty("archives_base_name")

base {
archivesName.set("${archivesBaseName}+${modBuildNameSuffix}")
}

repositories {
mavenCentral()
// 阿里云镜像
maven {
url = uri("https://maven.aliyun.com/repository/public/")
}
// CurseMaven
maven {
url = uri("https://www.cursemaven.com")
}
// Modrinth
maven {
name = "Modrinth"
url = uri("https://api.modrinth.com/maven")
}
// JitPack
maven {
url = uri("https://jitpack.io")
}
}

tasks.withType<Test> {
enabled = false
}

//https://github.com/FabricMC/fabric-loader/issues/783
//configurations {
// modRuntimeOnly.exclude group: 'net.fabricmc', module: 'fabric-loader'
//}


dependencies {
// loom
"minecraft"("com.mojang:minecraft:${minecraftVer}")
"mappings"(loom.officialMojangMappings())
"modImplementation"("net.fabricmc:fabric-loader:${property("loader_version")}")
"modImplementation"("net.fabricmc.fabric-api:fabric-api:${property("fabric_version")}")
"modImplementation"("curse.maven:carpet-349239:${property("carpet_core_version")}")
}


tasks.processResources {
from("opt-carpet-addition.accesswidener")

inputs.property("version", modver)
inputs.property("minecraft_requirement_version", minecraftVer)

filesMatching("fabric.mod.json") {
val valueMap = mapOf(
"version" to modver,
"minecraft_requirement_version" to minecraftVer,
)
expand(valueMap)
}
}

loom {
accessWidenerPath.set(file("opt-carpet-addition.accesswidener"))

runConfigs.all {
ideConfigGenerated(true)
vmArgs("-Dmixin.debug.export=true")
runDir("../../run")
}
}

tasks.jar {
inputs.property("archivesName", base.archivesName)
from("LICENSE") {
rename { fileName ->
"${fileName}_${base.archivesName.get()}"
}
}
}

println(stonecutter.tree.versions.toString())
107 changes: 0 additions & 107 deletions common.gradle

This file was deleted.

4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ systemProp.http.socketTimeout=60000
systemProp.https.socketTimeout=60000

# Fabric Configurations
loader_version=0.17.3
loader_version=0.19.2
loader_requirement_version=>=0.15

# Mod Metadata
mod_version=1.9.0
mod_version=2.0.0
maven_group=io.github.optijava
archives_base_name=opt-carpet-addition
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.14.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
34 changes: 0 additions & 34 deletions settings.gradle

This file was deleted.

23 changes: 23 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/usr/bin/env kotlin

pluginManagement {
repositories {
mavenLocal()
mavenCentral()
gradlePluginPortal()
maven("https://maven.fabricmc.net/")
maven("https://maven.kikugie.dev/snapshots") { name = "KikuGie Snapshots" }
}
}

plugins {
id("dev.kikugie.stonecutter").version("0.9.2")
}

stonecutter {
create(rootProject) {
versions("1.21", "1.21.5", "1.21.11").buildscript("build.gradle.kts")
version("26.1").buildscript("unobfuscated.gradle.kts")
vcsVersion = "26.1"
}
}
Loading
Loading