From 7c7c28d909681a51e69e8ad5bc6b33494df78584 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 11 Feb 2021 21:45:52 +0800 Subject: [PATCH] Update to 21w06a --- .../shedaniel/architectury/hooks/ItemStackHooks.java | 2 +- fabric/build.gradle | 6 +++++- .../mixin/fabric/MixinBlockEntityExtension.java | 1 - .../fabric/MixinPersistentEntitySectionManager.java | 2 +- gradle.properties | 10 +++++----- testmod-common/build.gradle | 2 +- testmod-fabric/build.gradle | 1 - 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/common/src/main/java/me/shedaniel/architectury/hooks/ItemStackHooks.java b/common/src/main/java/me/shedaniel/architectury/hooks/ItemStackHooks.java index c6755140..a8e6d0f2 100644 --- a/common/src/main/java/me/shedaniel/architectury/hooks/ItemStackHooks.java +++ b/common/src/main/java/me/shedaniel/architectury/hooks/ItemStackHooks.java @@ -35,7 +35,7 @@ public final class ItemStackHooks { } public static void giveItem(ServerPlayer player, ItemStack stack) { - boolean bl = player.inventory.add(stack); + boolean bl = player.getInventory().add(stack); if (bl && stack.isEmpty()) { stack.setCount(1); ItemEntity entity = player.drop(stack, false); diff --git a/fabric/build.gradle b/fabric/build.gradle index 5399cca6..bbad71ae 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -26,12 +26,16 @@ architectury { platformSetupLoomIde() } +repositories { + maven { url "https://maven.terraformersmc.com/releases/" } +} + dependencies { minecraft "com.mojang:minecraft:${rootProject.architectury.minecraft}" mappings minecraft.officialMojangMappings() modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}" - modCompileOnly "io.github.prospector:modmenu:${rootProject.mod_menu_version}" + modCompileOnly "com.terraformersmc:modmenu:${rootProject.mod_menu_version}" implementation "net.jodah:typetools:0.6.2" shadow "net.jodah:typetools:0.6.2" diff --git a/fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinBlockEntityExtension.java b/fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinBlockEntityExtension.java index 0fb45747..967c0f49 100644 --- a/fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinBlockEntityExtension.java +++ b/fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinBlockEntityExtension.java @@ -42,7 +42,6 @@ public interface MixinBlockEntityExtension extends BlockEntityClientSerializable default void fromClientTag(CompoundTag tag) { BlockEntity entity = (BlockEntity) this; if (entity.hasLevel()) { - entity.setLevelAndPosition(entity.getLevel(), new BlockPos(tag.getInt("x"), tag.getInt("y"), tag.getInt("z"))); loadClientData(entity.getBlockState(), tag); } } diff --git a/fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinPersistentEntitySectionManager.java b/fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinPersistentEntitySectionManager.java index 637e3dcf..79d4e87d 100644 --- a/fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinPersistentEntitySectionManager.java +++ b/fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinPersistentEntitySectionManager.java @@ -26,7 +26,7 @@ public class MixinPersistentEntitySectionManager impleme } @Inject(method = "addEntity", at = @At(value = "INVOKE", - target = "Lnet/minecraft/world/level/entity/EntitySectionStorage;entityPosToSectionKey(Lnet/minecraft/core/BlockPos;)J"), + target = "Lnet/minecraft/core/SectionPos;asLong(Lnet/minecraft/core/BlockPos;)J"), cancellable = true) private void addEntity(T entityAccess, boolean bl, CallbackInfoReturnable cir) { // TODO: Check if other classes implements EntityAccess as well diff --git a/gradle.properties b/gradle.properties index b2ef99ba..1f9d3a88 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -minecraft_version=20w51a -supported_version=20w51a +minecraft_version=21w06a +supported_version=21w06a cf_type=beta @@ -11,8 +11,8 @@ archives_base_name_snapshot=architectury-snapshot base_version=2.0 maven_group=me.shedaniel -fabric_loader_version=0.10.8 -fabric_api_version=0.29.3+1.17 -mod_menu_version=2.0.0-beta.1+build.2 +fabric_loader_version=0.11.1 +fabric_api_version=0.30.2+1.17 +mod_menu_version=2.0.0-beta.2 #forge_version=35.1.36 diff --git a/testmod-common/build.gradle b/testmod-common/build.gradle index 67a232ad..29b8d3e4 100644 --- a/testmod-common/build.gradle +++ b/testmod-common/build.gradle @@ -8,5 +8,5 @@ dependencies { } architectury { - common() + common(false) } diff --git a/testmod-fabric/build.gradle b/testmod-fabric/build.gradle index 88aa6105..8d25c3ad 100644 --- a/testmod-fabric/build.gradle +++ b/testmod-fabric/build.gradle @@ -12,7 +12,6 @@ dependencies { mappings loom.officialMojangMappings() modCompile "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" modCompile "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}" - modCompileOnly "io.github.prospector:modmenu:${rootProject.mod_menu_version}" implementation project(path: ":fabric", configuration: "dev") compileOnly(project(path: ":common")) {