From 7cb3b7860485a9da17abaed0496aea9621c8ffe9 Mon Sep 17 00:00:00 2001 From: Yancey <1709185482@qq.com> Date: Thu, 11 Jul 2024 23:25:18 +0800 Subject: [PATCH] update minecraft 1.21 --- README.md | 2 +- README_CN.md | 2 +- build.gradle | 2 +- gradle.properties | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- .../commandfallingblock/command/FallingBlockCommand.java | 1 - .../entity/EntityBetterFallingBlock.java | 2 +- .../network/SummonFallingBlockPayloadS2C.java | 2 +- src/main/resources/fabric.mod.json | 2 +- 9 files changed, 11 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 405703a..904e457 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ English | [简体中文](README_CN.md) CommandFallingBlock, a fabric mod in minecraft, adds `fallingblock` command to summon falling block conveniently. -supported minecraft versions: `1.16.5`, `1.18.2`, `1.20.*` +supported minecraft versions: `1.16.5`, `1.18.2`, `1.20.*`, `1.21` ## How to use diff --git a/README_CN.md b/README_CN.md index e7dca01..945fc07 100644 --- a/README_CN.md +++ b/README_CN.md @@ -6,7 +6,7 @@ CommandFallingBlock是一个fabric的模组，增加了`fallingblock`指令来实现方便地生成掉落方块。 -游戏版本：`1.16.5`, `1.18.2`, `1.20.*` +游戏版本：`1.16.5`, `1.18.2`, `1.20.*`, `1.21` ## 模组怎么用 diff --git a/build.gradle b/build.gradle index f5309eb..439b7c8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.6-SNAPSHOT' + id 'fabric-loom' version '1.7-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 272d30d..48866da 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.20.6 -yarn_mappings=1.20.6+build.3 +minecraft_version=1.21 +yarn_mappings=1.21+build.9 loader_version=0.15.11 # Mod Properties -mod_version = 1.20.6-1.7-fabric +mod_version = 1.21-1.7-fabric maven_group = yancey archives_base_name = CommandFallingBlock # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.99.4+1.20.6 +fabric_version=0.100.6+1.21 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 20db9ad..2617362 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.8-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/yancey/commandfallingblock/command/FallingBlockCommand.java b/src/main/java/yancey/commandfallingblock/command/FallingBlockCommand.java index e4f164f..5cf2c0c 100644 --- a/src/main/java/yancey/commandfallingblock/command/FallingBlockCommand.java +++ b/src/main/java/yancey/commandfallingblock/command/FallingBlockCommand.java @@ -42,7 +42,6 @@ public class FallingBlockCommand { @SuppressWarnings("SpellCheckingInspection") private static final SimpleCommandExceptionType FAILED_EXCEPTION = new SimpleCommandExceptionType(Text.translatable("command.commandfallingblock.fallingblock.failedToCalculate")); - @SuppressWarnings("SpellCheckingInspection") public static void register(CommandDispatcher dispatcher, CommandRegistryAccess commandRegistryAccess) { Executor moveFromPos = FallingBlockCommand::moveFromPos; Executor moveFromPosByTick = FallingBlockCommand::moveFromPosByTick; diff --git a/src/main/java/yancey/commandfallingblock/entity/EntityBetterFallingBlock.java b/src/main/java/yancey/commandfallingblock/entity/EntityBetterFallingBlock.java index 55b8753..4991fbf 100644 --- a/src/main/java/yancey/commandfallingblock/entity/EntityBetterFallingBlock.java +++ b/src/main/java/yancey/commandfallingblock/entity/EntityBetterFallingBlock.java @@ -34,7 +34,7 @@ public class EntityBetterFallingBlock extends Entity { public static final EntityType BETTER_FALLING_BLOCK = Registry.register( Registries.ENTITY_TYPE, - new Identifier(CommandFallingBlock.MOD_ID, "better_falling_block"), + Identifier.of(CommandFallingBlock.MOD_ID, "better_falling_block"), EntityType.Builder.create((EntityType.EntityFactory) EntityBetterFallingBlock::new, SpawnGroup.MISC).dimensions(0.98f, 0.98f).maxTrackingRange(10).trackingTickInterval(20).build() ); diff --git a/src/main/java/yancey/commandfallingblock/network/SummonFallingBlockPayloadS2C.java b/src/main/java/yancey/commandfallingblock/network/SummonFallingBlockPayloadS2C.java index 1fa8232..aa7f4b2 100644 --- a/src/main/java/yancey/commandfallingblock/network/SummonFallingBlockPayloadS2C.java +++ b/src/main/java/yancey/commandfallingblock/network/SummonFallingBlockPayloadS2C.java @@ -17,7 +17,7 @@ public record SummonFallingBlockPayloadS2C(int id, UUID uuid, Vec3d pos, Vec3d v boolean hasNoGravity, int tickMove, BlockPos blockPosEnd) implements CustomPayload { - public static final CustomPayload.Id ID = new CustomPayload.Id<>(new Identifier(MOD_ID, "summon_falling_block")); + public static final CustomPayload.Id ID = new CustomPayload.Id<>(Identifier.of(MOD_ID, "summon_falling_block")); public static final PacketCodec CODEC = new PacketCodec<>() { @Override public SummonFallingBlockPayloadS2C decode(RegistryByteBuf buf) { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 8f354ad..db4fabe 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -8,7 +8,7 @@ "Yancey" ], "contact": { - "repo": "https://github.com/Yancey666/CommandFallingBlock" + "repo": "https://github.com/Yancey2023/CommandFallingBlock" }, "license": "GPL-3.0", "icon": "assets/commandfallingblock/icon.png",