From 53fa0a8aa9a704535dad5a4577236ce456378b5d Mon Sep 17 00:00:00 2001 From: Alex Thomson Date: Fri, 10 Aug 2018 23:59:35 +1200 Subject: [PATCH] Fix ClassCastException caused by Sponge assuming things --- build.gradle | 2 +- .../lxgaming/sledgehammer/Sledgehammer.java | 3 +- .../configuration/category/MixinCategory.java | 7 +++ ....java => MixinForgeHooks_Advancement.java} | 2 +- .../forge/common/MixinForgeHooks_Harvest.java | 53 +++++++++++++++++++ .../lxgaming/sledgehammer/util/Reference.java | 2 +- .../resources/mixins.sledgehammer.forge.json | 3 +- 7 files changed, 67 insertions(+), 5 deletions(-) rename src/main/java/io/github/lxgaming/sledgehammer/mixin/forge/common/{MixinForgeHooks.java => MixinForgeHooks_Advancement.java} (96%) create mode 100644 src/main/java/io/github/lxgaming/sledgehammer/mixin/forge/common/MixinForgeHooks_Harvest.java diff --git a/build.gradle b/build.gradle index c54d8b8..6575eb0 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ targetCompatibility = 1.8 group = "io.github.lxgaming" archivesBaseName = "Sledgehammer" -version = "1.2.2-1.12.2" +version = "1.2.3-1.12.2" minecraft { version = "1.12.2-14.23.4.2705" diff --git a/src/main/java/io/github/lxgaming/sledgehammer/Sledgehammer.java b/src/main/java/io/github/lxgaming/sledgehammer/Sledgehammer.java index ded5012..6ee3ff8 100644 --- a/src/main/java/io/github/lxgaming/sledgehammer/Sledgehammer.java +++ b/src/main/java/io/github/lxgaming/sledgehammer/Sledgehammer.java @@ -75,7 +75,8 @@ private void registerMappings() { // Mixin Forge getMixinMappings().put("io.github.lxgaming.sledgehammer.mixin.forge.common.MixinDimensionManager", MixinCategory::isDimensionManager); - getMixinMappings().put("io.github.lxgaming.sledgehammer.mixin.forge.common.MixinForgeHooks", MixinCategory::isAdvancementStacktrace); + getMixinMappings().put("io.github.lxgaming.sledgehammer.mixin.forge.common.MixinForgeHooks_Advancement", MixinCategory::isAdvancementStacktrace); + getMixinMappings().put("io.github.lxgaming.sledgehammer.mixin.forge.common.MixinForgeHooks_Harvest", MixinCategory::isHarvestBlock); getMixinMappings().put("io.github.lxgaming.sledgehammer.mixin.forge.entity.passive.MixinEntityVillager", MixinCategory::isTravelingMerchant); getMixinMappings().put("io.github.lxgaming.sledgehammer.mixin.forge.world.storage.MixinWorldInfo", MixinCategory::isCeremonyRain); } diff --git a/src/main/java/io/github/lxgaming/sledgehammer/configuration/category/MixinCategory.java b/src/main/java/io/github/lxgaming/sledgehammer/configuration/category/MixinCategory.java index 86b6880..ffae319 100644 --- a/src/main/java/io/github/lxgaming/sledgehammer/configuration/category/MixinCategory.java +++ b/src/main/java/io/github/lxgaming/sledgehammer/configuration/category/MixinCategory.java @@ -43,6 +43,9 @@ public class MixinCategory { @Setting(value = "dimension-manager", comment = "Fixes https://github.com/SpongePowered/SpongeForge/issues/2173 (Fixed in SpongeForge-1.12.2-2703-7.1.0-BETA-3124)") private boolean dimensionManager = false; + @Setting(value = "harvest-block", comment = "Prevents ClassCastException caused by Sponge assuming things") + private boolean harvestBlock = false; + @Setting(value = "interact-events", comment = "Fixes https://github.com/SpongePowered/SpongeCommon/issues/2013") private boolean interactEvents = false; @@ -80,6 +83,10 @@ public boolean isDimensionManager() { return dimensionManager; } + public boolean isHarvestBlock() { + return harvestBlock; + } + public boolean isInteractEvents() { return interactEvents; } diff --git a/src/main/java/io/github/lxgaming/sledgehammer/mixin/forge/common/MixinForgeHooks.java b/src/main/java/io/github/lxgaming/sledgehammer/mixin/forge/common/MixinForgeHooks_Advancement.java similarity index 96% rename from src/main/java/io/github/lxgaming/sledgehammer/mixin/forge/common/MixinForgeHooks.java rename to src/main/java/io/github/lxgaming/sledgehammer/mixin/forge/common/MixinForgeHooks_Advancement.java index 7205364..978d5c7 100644 --- a/src/main/java/io/github/lxgaming/sledgehammer/mixin/forge/common/MixinForgeHooks.java +++ b/src/main/java/io/github/lxgaming/sledgehammer/mixin/forge/common/MixinForgeHooks_Advancement.java @@ -24,7 +24,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(value = ForgeHooks.class, priority = 1337, remap = false) -public abstract class MixinForgeHooks { +public abstract class MixinForgeHooks_Advancement { @Redirect(method = "lambda$loadAdvancements$0", at = @At(value = "INVOKE", target = "Lorg/apache/logging/log4j/Logger;error(Ljava/lang/String;Ljava/lang/Throwable;)V")) private static void onLoadAdvancementsError(Logger logger, String message, Throwable throwable) { diff --git a/src/main/java/io/github/lxgaming/sledgehammer/mixin/forge/common/MixinForgeHooks_Harvest.java b/src/main/java/io/github/lxgaming/sledgehammer/mixin/forge/common/MixinForgeHooks_Harvest.java new file mode 100644 index 0000000..c94e028 --- /dev/null +++ b/src/main/java/io/github/lxgaming/sledgehammer/mixin/forge/common/MixinForgeHooks_Harvest.java @@ -0,0 +1,53 @@ +/* + * Copyright 2018 Alex Thomson + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.github.lxgaming.sledgehammer.mixin.forge.common; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.ForgeHooks; +import org.spongepowered.api.entity.living.player.Player; +import org.spongepowered.api.text.Text; +import org.spongepowered.api.text.chat.ChatTypes; +import org.spongepowered.api.text.format.TextColors; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import org.spongepowered.common.event.tracking.PhaseTracker; +import org.spongepowered.common.interfaces.world.IMixinWorld; + +@Mixin(value = ForgeHooks.class, priority = 1337, remap = false) +public abstract class MixinForgeHooks_Harvest { + + @Inject(method = "canHarvestBlock", + at = @At(value = "INVOKE", + target = "Lorg/spongepowered/common/event/tracking/IPhaseState;isInteraction()Z" + ), + cancellable = true + ) + private static void onCanHarvestBlock(Block block, EntityPlayer entityPlayer, IBlockAccess blockAccess, BlockPos blockPos, CallbackInfoReturnable callbackInfoReturnable) { + // Prevents ClassCastException caused by Sponge assuming the IBlockAccess is an instanceof IMixinWorld + if (!PhaseTracker.getInstance().getCurrentPhaseData().state.isInteraction() && !(blockAccess instanceof IMixinWorld)) { + callbackInfoReturnable.setReturnValue(false); + + // Using ACTION_BAR to prevent chat spam + ((Player) entityPlayer).sendMessage(ChatTypes.ACTION_BAR, Text.of(TextColors.RED, "Harvest denied at (", blockPos.getX(), ", ", blockPos.getY(), ", ", blockPos.getZ(), ")")); + } + } +} \ No newline at end of file diff --git a/src/main/java/io/github/lxgaming/sledgehammer/util/Reference.java b/src/main/java/io/github/lxgaming/sledgehammer/util/Reference.java index 48c41c6..1b432df 100644 --- a/src/main/java/io/github/lxgaming/sledgehammer/util/Reference.java +++ b/src/main/java/io/github/lxgaming/sledgehammer/util/Reference.java @@ -20,7 +20,7 @@ public class Reference { public static final String PLUGIN_ID = "sledgehammer"; public static final String PLUGIN_NAME = "Sledgehammer"; - public static final String PLUGIN_VERSION = "1.2.2-1.12.2"; + public static final String PLUGIN_VERSION = "1.2.3-1.12.2"; public static final String DESCRIPTION = "Smashes the stupid out of the server."; public static final String AUTHORS = "LX_Gaming"; public static final String SOURCE = "https://github.com/LXGaming/Sledgehammer/"; diff --git a/src/main/resources/mixins.sledgehammer.forge.json b/src/main/resources/mixins.sledgehammer.forge.json index 0807f44..0cdd726 100644 --- a/src/main/resources/mixins.sledgehammer.forge.json +++ b/src/main/resources/mixins.sledgehammer.forge.json @@ -8,7 +8,8 @@ "compatibilityLevel": "JAVA_8", "mixins": [ "common.MixinDimensionManager", - "common.MixinForgeHooks", + "common.MixinForgeHooks_Advancement", + "common.MixinForgeHooks_Harvest", "entity.passive.MixinEntityVillager", "world.storage.MixinWorldInfo" ],