Skip to content

Commit b649218

Browse files
committed
1.21.1 update
1 parent babd380 commit b649218

File tree

23 files changed

+545
-161
lines changed

23 files changed

+545
-161
lines changed

README.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1-
# Embedded Compute rMod
1+
# Embedded Computer Mod
22
This mod adds the "embedded computer" and related things
33

4-
# License
4+
## Versioning
55

6-
All versions prior to [v2.2 (82b367be5ee7d6888882f9b947e964fa6b011fbc)](https://github.com/WindClan/EmbeddedComputerMod/commit/82b367be5ee7d6888882f9b947e964fa6b011fbc) are under the MIT license
6+
(game version).(big update).(small update)
77

8-
With permission from the other contributor Herr Katze, all versions past that are licensed as MPL 2.0
8+
9+
- 1.20.1 is [0.X.X](https://github.com/WindClan/EmbeddedComputerMod/tree/1.20.1)
10+
- 1.21.1 is 1.X.X (you are here)
11+
12+
## License
13+
14+
All versions prior to [v0.2.2 (82b367be5ee7d6888882f9b947e964fa6b011fbc)](https://github.com/WindClan/EmbeddedComputerMod/commit/82b367be5ee7d6888882f9b947e964fa6b011fbc) are under the MIT license
15+
16+
With permission from the other contributor Herr Katze, all versions past that are licensed as MPL 2.0

build.gradle

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ repositories {
1818
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
1919
// for more information about repositories.
2020
maven {
21-
url "https://maven.squiddev.cc"
21+
url = "https://maven.squiddev.cc"
2222
content {
2323
includeGroup("cc.tweaked")
2424
}
2525
}
26-
maven { url "https://maven.shedaniel.me" }
26+
maven { url = "https://maven.shedaniel.me" }
2727
exclusiveContent {
2828
forRepository {
2929
maven {
@@ -47,21 +47,21 @@ dependencies {
4747
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
4848

4949
//ComputerCraft
50-
modImplementation "cc.tweaked:cc-tweaked-${project.minecraft_version}-fabric-api:$cctVersion"
50+
modCompileOnly "cc.tweaked:cc-tweaked-${project.minecraft_version}-fabric-api:$cctVersion"
5151
modImplementation "cc.tweaked:cc-tweaked-${project.minecraft_version}-fabric:$cctVersion"
5252

5353
//RoughlyEnoughItems
5454
modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:$reiVersion"
5555

56-
implementation 'com.google.code.findbugs:jsr305:3.0.2'
56+
testImplementation 'com.google.code.findbugs:jsr305:3.0.2'
5757
}
5858

5959
processResources {
6060
inputs.property "version", project.version
6161
inputs.property "minecraft_version", project.minecraft_version
6262
inputs.property "loader_version", project.loader_version
6363
inputs.property "cctVersion", project.cctVersion
64-
filteringCharset "UTF-8"
64+
filteringCharset = "UTF-8"
6565

6666
filesMatching("fabric.mod.json") {
6767
expand "version": project.version,
@@ -71,32 +71,23 @@ processResources {
7171
}
7272
}
7373

74-
def targetJavaVersion = 17
7574
tasks.withType(JavaCompile).configureEach {
76-
// ensure that the encoding is set to UTF-8, no matter what the system default is
77-
// this fixes some edge cases with special characters not displaying correctly
78-
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
79-
// If Javadoc is generated, this must be specified in that task too.
80-
it.options.encoding = "UTF-8"
81-
if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
82-
it.options.release.set(targetJavaVersion)
83-
}
75+
it.options.release = 21
8476
}
8577

8678
java {
87-
def javaVersion = JavaVersion.toVersion(targetJavaVersion)
88-
if (JavaVersion.current() < javaVersion) {
89-
toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
90-
}
9179
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
9280
// if it is present.
9381
// If you remove this line, sources will not be generated.
9482
withSourcesJar()
83+
84+
sourceCompatibility = JavaVersion.VERSION_21
85+
targetCompatibility = JavaVersion.VERSION_21
9586
}
9687

9788
jar {
9889
from("LICENSE") {
99-
rename { "${it}_${project.archivesBaseName}" }
90+
rename { "${it}_${inputs.properties.archivesName}" }
10091
}
10192
}
10293

gradle.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
org.gradle.jvmargs=-Xmx1G
33
# Fabric Properties
44
# check these on https://modmuss50.me/fabric.html
5-
minecraft_version=1.20.1
6-
yarn_mappings=1.20.1+build.10
5+
minecraft_version=1.21.1
6+
yarn_mappings=1.21.1+build.3
77
loader_version=0.16.10
88
# Mod Properties
9-
mod_version=0.3.0
10-
maven_group=org.featherwhisker
9+
mod_version=1.0.0
10+
maven_group=org.windclan
1111
archives_base_name=embeddedcomputer
1212
# Dependencies
1313
# check this on https://modmuss50.me/fabric.html
14-
fabric_version=0.92.5+1.20.1
14+
fabric_version=0.115.3+1.21.1
1515

1616
cctVersion=1.115.1
17-
reiVersion=12.1.780
17+
reiVersion=16.0.799

gradle/wrapper/gradle-wrapper.jar

42.6 KB
Binary file not shown.
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
6+
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

gradlew

Lines changed: 251 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)