Skip to content

Commit 2d79d64

Browse files
committed
26.1 upgrade + package name update
1 parent b211f42 commit 2d79d64

60 files changed

Lines changed: 687 additions & 624 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitattributes

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#
2+
# https://help.github.com/articles/dealing-with-line-endings/
3+
#
4+
# Linux start script should use lf
5+
/gradlew text eol=lf
6+
7+
# These are Windows script files and should use crlf
8+
*.bat text eol=crlf
9+

.github/workflows/build.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Automatically build the project and run any configured tests for every push
2+
# and submitted pull request. This can help catch issues that only occur on
3+
# certain platforms or Java versions, and provides a first line of defence
4+
# against bad commits.
5+
6+
name: build
7+
on: [pull_request, push]
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-24.04
12+
steps:
13+
- name: checkout repository
14+
uses: actions/checkout@v4
15+
- name: validate gradle wrapper
16+
uses: gradle/actions/wrapper-validation@v4
17+
- name: setup jdk
18+
uses: actions/setup-java@v4
19+
with:
20+
java-version: '25'
21+
distribution: 'microsoft'
22+
- name: make gradle wrapper executable
23+
run: chmod +x ./gradlew
24+
- name: build
25+
run: ./gradlew build
26+
- name: capture build artifacts
27+
uses: actions/upload-artifact@v4
28+
with:
29+
name: Artifacts
30+
path: build/libs/

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ run/
3737
hs_err_*.log
3838
replay_*.log
3939
*.hprof
40-
*.jfr
40+
*.jfr

LICENSE

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
Creative Commons Legal Code
2+
3+
CC0 1.0 Universal
4+
5+
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
6+
LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
7+
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
8+
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
9+
REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
10+
PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
11+
THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
12+
HEREUNDER.
13+
14+
Statement of Purpose
15+
16+
The laws of most jurisdictions throughout the world automatically confer
17+
exclusive Copyright and Related Rights (defined below) upon the creator
18+
and subsequent owner(s) (each and all, an "owner") of an original work of
19+
authorship and/or a database (each, a "Work").
20+
21+
Certain owners wish to permanently relinquish those rights to a Work for
22+
the purpose of contributing to a commons of creative, cultural and
23+
scientific works ("Commons") that the public can reliably and without fear
24+
of later claims of infringement build upon, modify, incorporate in other
25+
works, reuse and redistribute as freely as possible in any form whatsoever
26+
and for any purposes, including without limitation commercial purposes.
27+
These owners may contribute to the Commons to promote the ideal of a free
28+
culture and the further production of creative, cultural and scientific
29+
works, or to gain reputation or greater distribution for their Work in
30+
part through the use and efforts of others.
31+
32+
For these and/or other purposes and motivations, and without any
33+
expectation of additional consideration or compensation, the person
34+
associating CC0 with a Work (the "Affirmer"), to the extent that he or she
35+
is an owner of Copyright and Related Rights in the Work, voluntarily
36+
elects to apply CC0 to the Work and publicly distribute the Work under its
37+
terms, with knowledge of his or her Copyright and Related Rights in the
38+
Work and the meaning and intended legal effect of CC0 on those rights.
39+
40+
1. Copyright and Related Rights. A Work made available under CC0 may be
41+
protected by copyright and related or neighboring rights ("Copyright and
42+
Related Rights"). Copyright and Related Rights include, but are not
43+
limited to, the following:
44+
45+
i. the right to reproduce, adapt, distribute, perform, display,
46+
communicate, and translate a Work;
47+
ii. moral rights retained by the original author(s) and/or performer(s);
48+
iii. publicity and privacy rights pertaining to a person's image or
49+
likeness depicted in a Work;
50+
iv. rights protecting against unfair competition in regards to a Work,
51+
subject to the limitations in paragraph 4(a), below;
52+
v. rights protecting the extraction, dissemination, use and reuse of data
53+
in a Work;
54+
vi. database rights (such as those arising under Directive 96/9/EC of the
55+
European Parliament and of the Council of 11 March 1996 on the legal
56+
protection of databases, and under any national implementation
57+
thereof, including any amended or successor version of such
58+
directive); and
59+
vii. other similar, equivalent or corresponding rights throughout the
60+
world based on applicable law or treaty, and any national
61+
implementations thereof.
62+
63+
2. Waiver. To the greatest extent permitted by, but not in contravention
64+
of, applicable law, Affirmer hereby overtly, fully, permanently,
65+
irrevocably and unconditionally waives, abandons, and surrenders all of
66+
Affirmer's Copyright and Related Rights and associated claims and causes
67+
of action, whether now known or unknown (including existing as well as
68+
future claims and causes of action), in the Work (i) in all territories
69+
worldwide, (ii) for the maximum duration provided by applicable law or
70+
treaty (including future time extensions), (iii) in any current or future
71+
medium and for any number of copies, and (iv) for any purpose whatsoever,
72+
including without limitation commercial, advertising or promotional
73+
purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
74+
member of the public at large and to the detriment of Affirmer's heirs and
75+
successors, fully intending that such Waiver shall not be subject to
76+
revocation, rescission, cancellation, termination, or any other legal or
77+
equitable action to disrupt the quiet enjoyment of the Work by the public
78+
as contemplated by Affirmer's express Statement of Purpose.
79+
80+
3. Public License Fallback. Should any part of the Waiver for any reason
81+
be judged legally invalid or ineffective under applicable law, then the
82+
Waiver shall be preserved to the maximum extent permitted taking into
83+
account Affirmer's express Statement of Purpose. In addition, to the
84+
extent the Waiver is so judged Affirmer hereby grants to each affected
85+
person a royalty-free, non transferable, non sublicensable, non exclusive,
86+
irrevocable and unconditional license to exercise Affirmer's Copyright and
87+
Related Rights in the Work (i) in all territories worldwide, (ii) for the
88+
maximum duration provided by applicable law or treaty (including future
89+
time extensions), (iii) in any current or future medium and for any number
90+
of copies, and (iv) for any purpose whatsoever, including without
91+
limitation commercial, advertising or promotional purposes (the
92+
"License"). The License shall be deemed effective as of the date CC0 was
93+
applied by Affirmer to the Work. Should any part of the License for any
94+
reason be judged legally invalid or ineffective under applicable law, such
95+
partial invalidity or ineffectiveness shall not invalidate the remainder
96+
of the License, and in such case Affirmer hereby affirms that he or she
97+
will not (i) exercise any of his or her remaining Copyright and Related
98+
Rights in the Work or (ii) assert any associated claims and causes of
99+
action with respect to the Work, in either case contrary to Affirmer's
100+
express Statement of Purpose.
101+
102+
4. Limitations and Disclaimers.
103+
104+
a. No trademark or patent rights held by Affirmer are waived, abandoned,
105+
surrendered, licensed or otherwise affected by this document.
106+
b. Affirmer offers the Work as-is and makes no representations or
107+
warranties of any kind concerning the Work, express, implied,
108+
statutory or otherwise, including without limitation warranties of
109+
title, merchantability, fitness for a particular purpose, non
110+
infringement, or the absence of latent or other defects, accuracy, or
111+
the present or absence of errors, whether or not discoverable, all to
112+
the greatest extent permissible under applicable law.
113+
c. Affirmer disclaims responsibility for clearing rights of other persons
114+
that may apply to the Work or any use thereof, including without
115+
limitation any person's Copyright and Related Rights in the Work.
116+
Further, Affirmer disclaims responsibility for obtaining any necessary
117+
consents, permissions or other rights required for any use of the
118+
Work.
119+
d. Affirmer understands and acknowledges that Creative Commons is not a
120+
party to this document and has no duty or obligation with respect to
121+
this CC0 or use of the Work.

build.gradle

Lines changed: 19 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'net.fabricmc.fabric-loom-remap' version "${loom_version}"
2+
id 'net.fabricmc.fabric-loom' version "${loom_version}"
33
id 'maven-publish'
44
}
55

@@ -15,15 +15,14 @@ repositories {
1515
// You should only use this when depending on other mods because
1616
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
1717
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
18-
// for more information about repositories
19-
18+
// for more information about repositories.
2019
}
2120

2221
loom {
2322
splitEnvironmentSourceSets()
2423

2524
mods {
26-
"modid" {
25+
"multiworld" {
2726
sourceSet sourceSets.main
2827
sourceSet sourceSets.client
2928
}
@@ -44,12 +43,12 @@ fabricApi {
4443
dependencies {
4544
// To change the versions see the gradle.properties file
4645
minecraft "com.mojang:minecraft:${project.minecraft_version}"
47-
mappings loom.officialMojangMappings()
48-
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
46+
47+
implementation "net.fabricmc:fabric-loader:${project.loader_version}"
4948

5049
// Fabric API. This is technically optional, but you probably want it anyway.
51-
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
52-
50+
implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
51+
5352
}
5453

5554
processResources {
@@ -61,29 +60,32 @@ processResources {
6160
}
6261

6362
tasks.withType(JavaCompile).configureEach {
64-
it.options.release = 21
63+
it.options.release = 25
6564
}
6665

6766
java {
6867
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
6968
// if it is present.
7069
// If you remove this line, sources will not be generated.
71-
// withSourcesJar()
70+
withSourcesJar()
7271

73-
sourceCompatibility = JavaVersion.VERSION_21
74-
targetCompatibility = JavaVersion.VERSION_21
72+
sourceCompatibility = JavaVersion.VERSION_25
73+
targetCompatibility = JavaVersion.VERSION_25
7574
}
7675

7776
jar {
78-
//from("LICENSE") {
79-
//rename { "${it}_${project.archivesBaseName}"}
80-
//}
77+
inputs.property "archivesName", project.base.archivesName
78+
79+
from("LICENSE") {
80+
rename { "${it}_${inputs.properties.archivesName}"}
81+
}
8182
}
8283

8384
// configure the maven publication
8485
publishing {
8586
publications {
86-
mavenJava(MavenPublication) {
87+
create("mavenJava", MavenPublication) {
88+
artifactId = project.archives_base_name
8789
from components.java
8890
}
8991
}
@@ -95,23 +97,4 @@ publishing {
9597
// The repositories here will be used for publishing your artifact, not for
9698
// retrieving dependencies.
9799
}
98-
}
99-
100-
tasks.named("runGameTest") {
101-
doFirst {
102-
def gameTestRunDir = file("$buildDir/run/gameTest")
103-
def propsFile = file("$gameTestRunDir/server.properties")
104-
105-
if (!gameTestRunDir.exists()) {
106-
gameTestRunDir.mkdirs()
107-
}
108-
if (!propsFile.exists()) {
109-
propsFile.createNewFile()
110-
}
111-
112-
def props = new Properties()
113-
propsFile.withInputStream { props.load(it) }
114-
props.setProperty("level-seed", "424242424242")
115-
propsFile.withOutputStream { os -> props.store(os, "Minecraft server properties") }
116-
}
117-
}
100+
}

gradle.properties

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ org.gradle.configuration-cache=false
77

88
# Fabric Properties
99
# check these on https://fabricmc.net/develop
10-
minecraft_version=1.21.11
11-
yarn_mappings=1.21.11+build.4
10+
minecraft_version=26.1-rc-2
1211
loader_version=0.18.4
1312
loom_version=1.15-SNAPSHOT
1413

1514
# Mod Properties
16-
mod_version = 2.1.0
17-
maven_group = com.gmail.anthony17j
18-
archives_base_name = multiworld
15+
mod_version=2.1.1
16+
maven_group=fr.jeanney
17+
archives_base_name=multiworld
1918

2019
# Dependencies
21-
fabric_version=0.141.3+1.21.11
20+
fabric_api_version=0.144.0+26.1

gradle/wrapper/gradle-wrapper.jar

542 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)