Skip to content

Commit 1a194c1

Browse files
theEvilReaperrenovate[bot]TheMeinerLP
authored
Prepare next release (#46)
* Update dependency net.onelitefeather:mycelium-bom to v1.4.3 (#39) * Update dependency net.onelitefeather:mycelium-bom to v1.4.3 * Fix item test cases --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: theEvilReaper <theEvilReaper@users.noreply.github.com> * Overhaul annotation usage in the map builder (#40) * Improve documentation * Remove experimental annotation and change used annotation in the spawn method --------- Co-authored-by: theEvilReaper <theEvilReaper@users.noreply.github.com> * Update actions/setup-java action to v5 * Add deprecated annotation to the translation registry * Update Gradle to v9.1.0 * Update dependency net.onelitefeather:mycelium-bom to v1.4.4 (#43) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update gradle/actions action to v5 * Update mycelium bom to version 1.4.5 * Remove publishdata plugin usage (#45) * Remove publishdata plugin definition and plugin portal integration * Switch from publishdata to the standard publishing style * Revert downgrade of the mycelium bom version --------- Co-authored-by: theEvilReaper <theEvilReaper@users.noreply.github.com> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: theEvilReaper <theEvilReaper@users.noreply.github.com> Co-authored-by: Phillipp Glanz <6745190+TheMeinerLP@users.noreply.github.com>
1 parent a4222d6 commit 1a194c1

12 files changed

Lines changed: 35 additions & 49 deletions

File tree

.github/workflows/build-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Checkout repository
1616
uses: actions/checkout@v5
1717
- name: Setup Java
18-
uses: actions/setup-java@v4
18+
uses: actions/setup-java@v5
1919
with:
2020
distribution: temurin
2121
java-version: 21

.github/workflows/main-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
- name: Checkout Repository
2121
uses: actions/checkout@v5
2222
- name: Validate Gradle Wrapper
23-
uses: gradle/actions/wrapper-validation@v4
23+
uses: gradle/actions/wrapper-validation@v5
2424
- name: Setup Java
25-
uses: actions/setup-java@v4
25+
uses: actions/setup-java@v5
2626
with:
2727
distribution: temurin
2828
java-version: 21

.github/workflows/publishing.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions/checkout@v5
1818

1919
- name: Set up JDK 21
20-
uses: actions/setup-java@v4
20+
uses: actions/setup-java@v5
2121
with:
2222
distribution: 'temurin'
2323
java-version: '21'

build.gradle.kts

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ plugins {
33
`java-library`
44
`maven-publish`
55
jacoco
6-
alias(libs.plugins.publishdata)
76
}
87

98
group = "net.theevilreaper"
10-
version = "1.11.1"
9+
version = "1.11.2"
1110
description = "Aves"
1211

1312
java {
@@ -60,34 +59,25 @@ tasks {
6059
}
6160
}
6261

63-
publishData {
64-
addMainRepo("https://repo.onelitefeather.dev/onelitefeather-releases")
65-
addMasterRepo("https://repo.onelitefeather.dev/onelitefeather-releases")
66-
addSnapshotRepo("https://repo.onelitefeather.dev/onelitefeather-snapshots")
67-
publishTask("jar")
68-
}
69-
7062
publishing {
71-
publications {
72-
create<MavenPublication>("maven") {
73-
// configure the publication as defined previously.
74-
publishData.configurePublication(this)
75-
version = publishData.getVersion(false)
76-
}
63+
publications.create<MavenPublication>("maven") {
64+
from(components["java"])
7765
}
66+
7867
repositories {
7968
maven {
8069
authentication {
8170
credentials(PasswordCredentials::class) {
82-
// Those credentials need to be set under "Settings -> Secrets -> Actions" in your repository
8371
username = System.getenv("ONELITEFEATHER_MAVEN_USERNAME")
8472
password = System.getenv("ONELITEFEATHER_MAVEN_PASSWORD")
8573
}
8674
}
87-
8875
name = "OneLiteFeatherRepository"
89-
// Get the detected repository from the publish data
90-
url = uri(publishData.getRepository())
76+
url = if (project.version.toString().contains("SNAPSHOT")) {
77+
uri("https://repo.onelitefeather.dev/onelitefeather-snapshots")
78+
} else {
79+
uri("https://repo.onelitefeather.dev/onelitefeather-releases")
80+
}
9181
}
9282
}
9383
}

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.0.0-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

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

gradlew.bat

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

settings.gradle.kts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
rootProject.name = "aves"
2-
pluginManagement {
3-
repositories {
4-
gradlePluginPortal()
5-
maven("https://eldonexus.de/repository/maven-public/")
6-
}
7-
}
2+
83
dependencyResolutionManagement {
94
repositories {
105
mavenCentral()
@@ -26,17 +21,14 @@ dependencyResolutionManagement {
2621
}
2722
versionCatalogs {
2823
create("libs") {
29-
version("bom", "1.4.2")
30-
version("publishdata", "1.4.0")
24+
version("bom", "1.4.5")
3125
library("mycelium.bom", "net.onelitefeather", "mycelium-bom").versionRef("bom")
3226
library("minestom","net.minestom", "minestom").withoutVersion()
3327
library("adventure", "net.kyori", "adventure-text-minimessage").withoutVersion()
3428
library("cyano", "net.onelitefeather", "cyano").withoutVersion()
3529
library("junit-jupiter", "org.junit.jupiter", "junit-jupiter").withoutVersion()
3630
library("junit-jupiter-engine", "org.junit.jupiter", "junit-jupiter-engine").withoutVersion()
3731
library("junit.platform.launcher", "org.junit.platform", "junit-platform-launcher").withoutVersion()
38-
39-
plugin("publishdata", "de.chojo.publishdata").versionRef("publishdata")
4032
}
4133
}
4234
}

src/main/java/net/theevilreaper/aves/i18n/AvesTranslationRegistry.java

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,18 @@
2222
/**
2323
* A translation registry that uses MiniMessage to translate components.
2424
* Without the usage of the class the translation with MiniMessage would not be possible.
25+
*
2526
* @see TranslationRegistry
2627
*/
28+
@Deprecated(forRemoval = true, since = "Please use TranslationStore.messageFormat(Key) instead")
2729
public final class AvesTranslationRegistry implements TranslationRegistry {
2830

2931
private static final MiniMessage MM = MiniMessage.miniMessage();
3032
private final TranslationRegistry backedRegistry;
3133

3234
/**
3335
* Creates a new instance of the translation registry.
36+
*
3437
* @param backedRegistry the registry which should be used for the translation
3538
*/
3639
public AvesTranslationRegistry(@NotNull TranslationRegistry backedRegistry) {
@@ -39,6 +42,7 @@ public AvesTranslationRegistry(@NotNull TranslationRegistry backedRegistry) {
3942

4043
/**
4144
* Checks if the registry contains the given key.
45+
*
4246
* @param key the key to check
4347
* @return true if the key is present in the registry
4448
*/
@@ -54,6 +58,7 @@ public boolean contains(@NotNull String key, @NotNull Locale locale) {
5458

5559
/**
5660
* Returns the name of the registry as {@link Key}.
61+
*
5762
* @return the given name from the registry
5863
*/
5964
@Override
@@ -63,7 +68,8 @@ public boolean contains(@NotNull String key, @NotNull Locale locale) {
6368

6469
/**
6570
* The method doesn't do anything in this implementation.
66-
* @param key a translation key
71+
*
72+
* @param key a translation key
6773
* @param locale a locale
6874
* @return null
6975
*/
@@ -74,8 +80,9 @@ public boolean contains(@NotNull String key, @NotNull Locale locale) {
7480

7581
/**
7682
* Translates the given component with the provided locale.
83+
*
7784
* @param component the component to translate
78-
* @param locale the locale to use
85+
* @param locale the locale to use
7986
* @return the translated component
8087
*/
8188
@Override
@@ -102,6 +109,7 @@ public boolean contains(@NotNull String key, @NotNull Locale locale) {
102109

103110
/**
104111
* Sets the default locale for the registry.
112+
*
105113
* @param locale the locale to use a default
106114
*/
107115
@Override
@@ -111,7 +119,8 @@ public void defaultLocale(@NotNull Locale locale) {
111119

112120
/**
113121
* Registers a new translation in the registry.
114-
* @param key the key to register
122+
*
123+
* @param key the key to register
115124
* @param locale the locale to register
116125
* @param format the format to register
117126
*/
@@ -122,6 +131,7 @@ public void register(@NotNull String key, @NotNull Locale locale, @NotNull Messa
122131

123132
/**
124133
* Unregisters a translation from the registry.
134+
*
125135
* @param key the key to unregister
126136
*/
127137
@Override

src/main/java/net/theevilreaper/aves/map/BaseMap.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public BaseMap() {
3333

3434
/**
3535
* Creates a new reference from the {@link BaseMap}.
36-
* It requires all values which are needed to create a map.
36+
* It requires all values that are needed to create a map.
3737
*
3838
* @param name the name from the map
3939
* @param builders the builders from the map
@@ -83,7 +83,7 @@ public boolean equals(Object o) {
8383
}
8484

8585
/**
86-
* Returns a hash value from some data which are provided by the object.
86+
* Returns a hash value from some data that are provided by the object.
8787
* In general, the hash relies on the unique data.
8888
* For the basic implementation that is only the name of the map.
8989
*

0 commit comments

Comments
 (0)