From dbfaa09b5b1ef3707d29eea4f0e2365b5541f3c6 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Thu, 8 Jul 2021 13:27:47 +0300 Subject: [PATCH] Test fix for "Detected setBlock in a far chunk" --- build.gradle | 2 +- .../blocks/entities/PedestalBlockEntity.java | 1 - .../mixin/common/WorldGenRegionMixin.java | 30 +++++++++++++++++++ .../resources/betterend.mixins.common.json | 7 +++-- 4 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 src/main/java/ru/betterend/mixin/common/WorldGenRegionMixin.java diff --git a/build.gradle b/build.gradle index f78c835e..b2fff8e6 100644 --- a/build.gradle +++ b/build.gradle @@ -72,7 +72,7 @@ def useApi(String dep) { processResources { inputs.property "version", project.version - duplicatesStrategy = 'EXCLUDE' + duplicatesStrategy = 'WARN' from(sourceSets.main.resources.srcDirs) { include "fabric.mod.json" diff --git a/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java b/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java index d62077f2..dab530c0 100644 --- a/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java +++ b/src/main/java/ru/betterend/blocks/entities/PedestalBlockEntity.java @@ -139,7 +139,6 @@ public class PedestalBlockEntity extends BlockEntity implements Container, Block if (blockEntity.age > blockEntity.maxAge) { blockEntity.age = 0; } - System.out.println(blockEntity.age); } } } diff --git a/src/main/java/ru/betterend/mixin/common/WorldGenRegionMixin.java b/src/main/java/ru/betterend/mixin/common/WorldGenRegionMixin.java new file mode 100644 index 00000000..c275b531 --- /dev/null +++ b/src/main/java/ru/betterend/mixin/common/WorldGenRegionMixin.java @@ -0,0 +1,30 @@ +package ru.betterend.mixin.common; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.SectionPos; +import net.minecraft.server.level.WorldGenRegion; +import net.minecraft.world.level.ChunkPos; +import net.minecraft.world.level.levelgen.feature.SpikeFeature; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import ru.bclib.util.MHelper; + +@Mixin(WorldGenRegion.class) +public class WorldGenRegionMixin { + @Final + @Shadow + private ChunkPos center; + + @Inject(method = "ensureCanWrite", at = @At("HEAD"), cancellable = true) + private void be_alterBlockCheck(BlockPos blockPos, CallbackInfoReturnable info) { + int x = blockPos.getX() >> 4; + int z = blockPos.getZ() >> 4; + WorldGenRegion region = (WorldGenRegion) (Object) this; + info.setReturnValue(Math.abs(x - center.x) < 2 && Math.abs(z - center.z) < 2); + } +} diff --git a/src/main/resources/betterend.mixins.common.json b/src/main/resources/betterend.mixins.common.json index 901e1855..d53b4518 100644 --- a/src/main/resources/betterend.mixins.common.json +++ b/src/main/resources/betterend.mixins.common.json @@ -17,12 +17,14 @@ "PotionBrewingAccessor", "MinecraftServerMixin", "EndDragonFightMixin", + "ShuffelingListMixin", + "WorldGenRegionMixin", "BlockBehaviourMixin", "DimensionTypeMixin", "CraftingMenuMixin", "LivingEntityMixin", "ServerPlayerMixin", - "SpikeFeatureMixin", + "SpikeFeatureMixin", "ServerLevelMixin", "PlayerListMixin", "AnvilMenuMixin", @@ -31,8 +33,7 @@ "MonsterMixin", "EntityMixin", "PlayerMixin", - "SlimeMixin", - "ShuffelingListMixin" + "SlimeMixin" ], "injectors": { "defaultRequire": 1