diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 74f7c55..1915bc3 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,8 @@ +===Version 1.1.1=== +-Version information is no longer sent to logs during startup. +-Warning message for unopenable block being declared as openable now properly includes "FenceGateBlock" as class of blocks possible to open. +-Improved mod description. + ===Version 1.1=== -Blocks openable with key are now defined using "#irondoorkey:openable" tag, therefore they can now be added by other mods or datapacks (thanks to Anonyku05 for suggestion). -Minor improvements. \ No newline at end of file diff --git a/build.gradle b/build.gradle index 034cb38..1cc98c1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,6 @@ plugins { - id 'fabric-loom' version '1.6-SNAPSHOT' - id 'maven-publish' + id "fabric-loom" version "1.7-SNAPSHOT" } version = project.mod_version @@ -14,7 +13,7 @@ base repositories { - maven { url = 'https://maven.parchmentmc.org/' } + maven { url = "https://maven.parchmentmc.org/" } } dependencies @@ -44,9 +43,4 @@ java sourceCompatibility = JavaVersion.VERSION_21 targetCompatibility = JavaVersion.VERSION_21 -} - -jar -{ - from "LICENSE" } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index cd2b10b..e432371 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,14 +5,14 @@ org.gradle.parallel=true # Fabric Properties # https://fabricmc.net/develop # https://parchmentmc.org/docs/getting-started - minecraft_version=1.21 - loader_version=0.15.11 - mappings_version=1.20.6:2024.06.02 + minecraft_version=1.21.1 + loader_version=0.16.5 + mappings_version=1.21:2024.07.28 # Mod Properties - mod_version=1.1 + mod_version=1.1.1 maven_group=com.mt1006.irondoorkey archives_base_name=IronDoorKey # Dependencies - fabric_version=0.100.1+1.21 + fabric_version=0.104.0+1.21.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e644113..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..0aaefbc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30d..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/settings.gradle b/settings.gradle index e8cf1b3..3a692cb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,6 +4,6 @@ pluginManagement { mavenCentral() gradlePluginPortal() - maven { url = 'https://maven.fabricmc.net/' } + maven { url = "https://maven.fabricmc.net/" } } -} +} \ No newline at end of file diff --git a/src/main/java/com/mt1006/irondoorkey/IronDoorKeyItem.java b/src/main/java/com/mt1006/irondoorkey/IronDoorKeyItem.java index c6d3dc7..23f7f33 100644 --- a/src/main/java/com/mt1006/irondoorkey/IronDoorKeyItem.java +++ b/src/main/java/com/mt1006/irondoorkey/IronDoorKeyItem.java @@ -54,7 +54,7 @@ else if (blockType instanceof FenceGateBlock) } IronDoorKeyMod.LOGGER.warn("Failed to open the block - " + - "it has \"openable\" tag, but isn't instance of DoorBlock or TrapDoorBlock"); + "it has \"openable\" tag, but isn't instance of DoorBlock, TrapDoorBlock or FenceGateBlock"); return InteractionResult.PASS; } diff --git a/src/main/java/com/mt1006/irondoorkey/IronDoorKeyMod.java b/src/main/java/com/mt1006/irondoorkey/IronDoorKeyMod.java index 43a7141..871aee6 100644 --- a/src/main/java/com/mt1006/irondoorkey/IronDoorKeyMod.java +++ b/src/main/java/com/mt1006/irondoorkey/IronDoorKeyMod.java @@ -16,25 +16,14 @@ public class IronDoorKeyMod implements ModInitializer { public static final String MOD_ID = "irondoorkey"; - public static final String VERSION = "1.1"; - public static final String FOR_VERSION = "1.21"; - public static final String FOR_LOADER = "Fabric"; public static final Logger LOGGER = LogUtils.getLogger(); - public static final Item ITEM_IRON_DOOR_KEY = new IronDoorKeyItem(); + private static final Item ITEM_IRON_DOOR_KEY = new IronDoorKeyItem(); public static final TagKey OPENABLE = TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(MOD_ID, "openable")); @Override public void onInitialize() { - LOGGER.info("{} - Author: mt1006", getFullName()); Registry.register(BuiltInRegistries.ITEM, ResourceLocation.fromNamespaceAndPath(MOD_ID, "iron_door_key"), ITEM_IRON_DOOR_KEY); - - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES) - .register(content -> content.accept(ITEM_IRON_DOOR_KEY)); - } - - public static String getFullName() - { - return "IronDoorKey v" + VERSION + " for Minecraft " + FOR_VERSION + " [" + FOR_LOADER + "]"; + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((content) -> content.accept(ITEM_IRON_DOOR_KEY)); } } diff --git a/src/main/resources/assets/irondoorkey/lang/pl_pl.json b/src/main/resources/assets/irondoorkey/lang/pl_pl.json index 21d7a07..da29166 100644 --- a/src/main/resources/assets/irondoorkey/lang/pl_pl.json +++ b/src/main/resources/assets/irondoorkey/lang/pl_pl.json @@ -1,3 +1,5 @@ { - "item.irondoorkey.iron_door_key": "Klucz do żelaznych drzwi" + "item.irondoorkey.iron_door_key": "Klucz do żelaznych drzwi", + + "modmenu.descriptionTranslation.irondoorkey": "Dodaje klucz do żelaznych drzwi. Można go używać do otwierania żelaznych drzwi i klap." } \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 482db7a..06153a8 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -4,7 +4,7 @@ "version": "${version}", "name": "Iron Door Key", - "description": "Adds iron door key", + "description": "Adds iron door key. It can be used to open iron doors and trapdoors.", "authors": ["mt1006"], "contact": {