diff --git a/dependencies.gradle b/dependencies.gradle index 0d423c666..47755b5ad 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -84,7 +84,6 @@ dependencies { compileOnly("com.github.GTNewHorizons:ThaumicHorizons:1.7.1:dev") compileOnly("com.github.GTNewHorizons:Battlegear2:1.4.2:dev") { transitive = false } - compileOnly('com.github.GTNewHorizons:Backhand:1.6.11') { transitive = false } compileOnly("com.falsepattern:chunkapi-mc1.7.10:0.5.1:api") { transitive = false } compileOnly("com.falsepattern:endlessids-mc1.7.10:1.5-beta0003:dev") { transitive = false } diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java b/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java index 15de2926a..bfe8b69fb 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java @@ -1,13 +1,18 @@ package com.gtnewhorizons.angelica.compat; +import com.gtnewhorizons.angelica.compat.backhand.BackhandReflectionCompat; import com.gtnewhorizons.angelica.helpers.LoadControllerHelper; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.versioning.DefaultArtifactVersion; import mods.battlegear2.Battlegear; import net.dries007.holoInventory.HoloInventory; -import xonin.backhand.Backhand; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class ModStatus { + public static final Logger LOGGER = LogManager.getLogger("ModCompat"); + + public static BackhandReflectionCompat backhandCompat; /** * Mixin Version */ @@ -16,7 +21,6 @@ public class ModStatus { * ASM Version */ public static boolean isOldNEIDLoaded; - public static boolean isBetterCrashesLoaded; public static boolean isNEIDMetadataExtended; public static boolean isLotrLoaded; @@ -31,6 +35,11 @@ public class ModStatus { public static boolean isBaublesLoaded; public static void preInit(){ + isBackhandLoaded = Loader.isModLoaded("backhand"); + if(isBackhandLoaded) { + isBackhandLoaded = BackhandReflectionCompat.isBackhandLoaded(); + } + isBetterCrashesLoaded = Loader.isModLoaded("bettercrashes"); isNEIDLoaded = Loader.isModLoaded("neid"); isOldNEIDLoaded = Loader.isModLoaded("notenoughIDs"); @@ -40,7 +49,6 @@ public class ModStatus { isXaerosMinimapLoaded = Loader.isModLoaded("XaeroMinimap"); isHoloInventoryLoaded = Loader.isModLoaded("holoinventory"); isBattlegearLoaded = Loader.isModLoaded("battlegear2"); - isBackhandLoaded = Loader.isModLoaded("backhand"); isThaumcraftLoaded = Loader.isModLoaded("Thaumcraft"); isThaumicHorizonsLoaded = Loader.isModLoaded("ThaumicHorizons"); isBaublesLoaded = Loader.isModLoaded("Baubles"); @@ -60,13 +68,6 @@ public class ModStatus { ) <= 0; } - if (isBackhandLoaded){ - isBackhandLoaded = new DefaultArtifactVersion("1.6.9") - .compareTo( - LoadControllerHelper.getOwningMod(Backhand.class).getProcessedVersion() - ) <= 0; - } - isNEIDMetadataExtended = false; if (isNEIDLoaded) { diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/backhand/BackhandReflectionCompat.java b/src/main/java/com/gtnewhorizons/angelica/compat/backhand/BackhandReflectionCompat.java new file mode 100644 index 000000000..0e5eda4d9 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/compat/backhand/BackhandReflectionCompat.java @@ -0,0 +1,76 @@ +package com.gtnewhorizons.angelica.compat.backhand; + +import com.gtnewhorizons.angelica.helpers.LoadControllerHelper; +import cpw.mods.fml.common.versioning.DefaultArtifactVersion; +import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; + +import static com.gtnewhorizons.angelica.compat.ModStatus.LOGGER; + +public class BackhandReflectionCompat { + private static final String BACKHAND_CLASS = "xonin.backhand.Backhand"; + private static final String ITEM_RENDERER_HOOKS_CLASS = "xonin.backhand.client.hooks.ItemRendererHooks"; + private static final String BACKHAND_UTILS_CLASS = "xonin.backhand.api.core.BackhandUtils"; + + private static boolean isLoaded; + private static final MethodHandle renderOffhandReturn; + private static final MethodHandle getOffhandItem; + + static { + MethodHandle renderOffhandReturnTemp = null; + MethodHandle getOffhandItemTemp = null; + + try { + final Class backhandClass = ReflectionHelper.getClass(BackhandReflectionCompat.class.getClassLoader(), BACKHAND_CLASS); + final boolean versionCheck = new DefaultArtifactVersion("1.6.9").compareTo(LoadControllerHelper.getOwningMod(backhandClass).getProcessedVersion()) <= 0; + + if (versionCheck) { + final MethodHandles.Lookup lookup = MethodHandles.lookup(); + final Class itemRendererHooksClass = ReflectionHelper.getClass(BackhandReflectionCompat.class.getClassLoader(), ITEM_RENDERER_HOOKS_CLASS); + final Class backhandUtilsClass = ReflectionHelper.getClass(BackhandReflectionCompat.class.getClassLoader(), BACKHAND_UTILS_CLASS); + + renderOffhandReturnTemp = lookup.findStatic(itemRendererHooksClass, "renderOffhandReturn", MethodType.methodType(void.class, float.class)); + getOffhandItemTemp = lookup.findStatic(backhandUtilsClass, "getOffhandItem", MethodType.methodType(ItemStack.class, EntityPlayer.class)); + isLoaded = true; + LOGGER.info("Backhand compat loaded"); + } + } catch (Exception e) { + LOGGER.error("Failed to load Backhand compat", e); + isLoaded = false; + } + + renderOffhandReturn = renderOffhandReturnTemp; + getOffhandItem = getOffhandItemTemp; + } + + public static boolean isBackhandLoaded() { + return isLoaded; + } + + public static void renderOffhand(float partialTicks) { + if (isLoaded && renderOffhandReturn != null) { + try { + renderOffhandReturn.invokeExact(partialTicks); + } catch (Throwable e) { + LOGGER.error("Failed to invoke Backhand renderOffhandReturn", e); + isLoaded = false; + } + } + } + + public static ItemStack getOffhandItem(EntityPlayer player) { + if (isLoaded && getOffhandItem != null) { + try { + return (ItemStack) getOffhandItem.invokeExact(player); + } catch (Throwable e) { + LOGGER.error("Failed to invoke Backhand getOffhandItem", e); + isLoaded = false; + } + } + return null; + } +} diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/InteractionHand.java b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/InteractionHand.java index f8a17c221..c84c97f60 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/mojang/InteractionHand.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/mojang/InteractionHand.java @@ -4,7 +4,6 @@ package com.gtnewhorizons.angelica.compat.mojang; import com.gtnewhorizons.angelica.compat.ModStatus; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import xonin.backhand.api.core.BackhandUtils; public enum InteractionHand { MAIN_HAND, @@ -15,7 +14,7 @@ public enum InteractionHand { public ItemStack getItemInHand(EntityPlayer player){ if (ModStatus.isBackhandLoaded && this == InteractionHand.OFF_HAND){ // off hand (requires backhand) - return BackhandUtils.getOffhandItem(player); + return ModStatus.backhandCompat.getOffhandItem(player); } else { // main hand return player.getHeldItem(); diff --git a/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java b/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java index 1a6273348..274e2d2d0 100644 --- a/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java +++ b/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java @@ -27,7 +27,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import xonin.backhand.api.core.BackhandUtils; import java.util.Set; import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -383,7 +382,7 @@ public class DynamicLights { } } else if (ModStatus.isBackhandLoaded && living instanceof EntityPlayer player){ - ItemStack offhand = BackhandUtils.getOffhandItem(player); + ItemStack offhand = ModStatus.backhandCompat.getOffhandItem(player); if (offhand != null) { luminance = Math.max(luminance, getLuminanceFromItemStack(offhand, inWater)); } diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinItemRendererBackhand.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinItemRendererBackhand.java index dc7dff98d..eceef255d 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinItemRendererBackhand.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinItemRendererBackhand.java @@ -9,7 +9,6 @@ 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.CallbackInfo; -import xonin.backhand.client.hooks.ItemRendererHooks; @Mixin(ItemRenderer.class) public class MixinItemRendererBackhand { @@ -21,13 +20,13 @@ public class MixinItemRendererBackhand { ci.cancel(); if (ModStatus.isBackhandLoaded){ iris$skipTranslucentHandsBackhand(partialTicks, ci); - ItemRendererHooks.renderOffhandReturn(partialTicks); + ModStatus.backhandCompat.renderOffhand(partialTicks); } } else if (!HandRenderer.INSTANCE.isRenderingSolid() && !isHandTranslucent) { ci.cancel(); if (ModStatus.isBackhandLoaded){ iris$skipTranslucentHandsBackhand(partialTicks, ci); - ItemRendererHooks.renderOffhandReturn(partialTicks); + ModStatus.backhandCompat.renderOffhand(partialTicks); } } }