From 230c65fd5ca79682d79c9279e3f064d2e629b27c Mon Sep 17 00:00:00 2001 From: Flemmli97 Date: Mon, 2 Nov 2020 16:47:47 +0100 Subject: [PATCH] change container check to use Inventory --- Changelog.txt | 4 ++++ gradle.properties | 2 +- src/main/java/com/flemmli97/flan/commands/CommandClaim.java | 1 - src/main/java/com/flemmli97/flan/config/Config.java | 2 +- .../java/com/flemmli97/flan/event/BlockInteractEvents.java | 4 ++-- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index d0d19b0..46594e6 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,3 +1,7 @@ +Flan 1.1.1 +====================== +- Fix a wrong check regarding block entitys that affected modded container blocks to not be protected + Flan 1.1.0 ====================== - Add global per world perms (for more info visit https://github.com/Flemmli97/Flan/wiki/Config) diff --git a/gradle.properties b/gradle.properties index c5d4484..cd711c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx2G loader_version=0.9.1+build.205 # Mod Properties - mod_version = 1.1.0 + mod_version = 1.1.1 maven_group = com.flemmli97.flan archives_base_name = flan diff --git a/src/main/java/com/flemmli97/flan/commands/CommandClaim.java b/src/main/java/com/flemmli97/flan/commands/CommandClaim.java index e3ed509..8193dba 100644 --- a/src/main/java/com/flemmli97/flan/commands/CommandClaim.java +++ b/src/main/java/com/flemmli97/flan/commands/CommandClaim.java @@ -18,7 +18,6 @@ import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.BoolArgumentType; import com.mojang.brigadier.arguments.IntegerArgumentType; import com.mojang.brigadier.arguments.StringArgumentType; -import com.mojang.brigadier.builder.ArgumentBuilder; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.suggestion.Suggestions; diff --git a/src/main/java/com/flemmli97/flan/config/Config.java b/src/main/java/com/flemmli97/flan/config/Config.java index 71b4345..4e03710 100644 --- a/src/main/java/com/flemmli97/flan/config/Config.java +++ b/src/main/java/com/flemmli97/flan/config/Config.java @@ -121,7 +121,7 @@ public class Config { JsonObject global = new JsonObject(); this.globalDefaultPerms.forEach((key, value) -> { JsonObject perm = new JsonObject(); - value.entrySet().forEach(eperm -> perm.addProperty(eperm.getKey().toString(), eperm.getValue())); + value.forEach((key1, value1) -> perm.addProperty(key1.toString(), value1)); global.add(key, perm); }); obj.add("globalDefaultPerms", global); diff --git a/src/main/java/com/flemmli97/flan/event/BlockInteractEvents.java b/src/main/java/com/flemmli97/flan/event/BlockInteractEvents.java index abe09c7..cbbd9d8 100644 --- a/src/main/java/com/flemmli97/flan/event/BlockInteractEvents.java +++ b/src/main/java/com/flemmli97/flan/event/BlockInteractEvents.java @@ -13,12 +13,12 @@ import net.minecraft.block.DoorBlock; import net.minecraft.block.LecternBlock; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.LecternBlockEntity; -import net.minecraft.block.entity.LockableContainerBlockEntity; import net.minecraft.block.enums.DoubleBlockHalf; import net.minecraft.entity.Entity; import net.minecraft.entity.ItemEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.ProjectileEntity; +import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket; import net.minecraft.server.network.ServerPlayerEntity; @@ -69,7 +69,7 @@ public class BlockInteractEvents { BlockState state = world.getBlockState(hitResult.getBlockPos()); BlockEntity blockEntity = world.getBlockEntity(hitResult.getBlockPos()); if (blockEntity != null) { - if (blockEntity instanceof LockableContainerBlockEntity) { + if (blockEntity instanceof Inventory) { if (claim.canInteract(player, EnumPermission.OPENCONTAINER, hitResult.getBlockPos(), true)) return ActionResult.PASS; PlayerClaimData.get(player).addDisplayClaim(claim, EnumDisplayType.MAIN, player.getBlockPos().getY());