Skip to content

Commit

Permalink
make it so the mixin doesnt suck
Browse files Browse the repository at this point in the history
  • Loading branch information
NopoTheGamer committed Sep 20, 2024
1 parent 1062c41 commit e5b31d2
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 18 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package at.hannibal2.skyhanni.mixins.hooks

import at.hannibal2.skyhanni.features.mining.MiningCommissionsBlocksColor
import at.hannibal2.skyhanni.features.mining.MiningCommissionsBlocksColor.CommissionBlock.Companion.onColor
import at.hannibal2.skyhanni.features.mining.MiningCommissionsBlocksColor.replaceBlocksMapCache
import at.hannibal2.skyhanni.features.mining.OreType.Companion.isOreType
import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.utils.LorenzUtils
import net.minecraft.block.state.IBlockState

fun modifyConnectedTexturesBlockState(state: IBlockState): IBlockState {
if (state == null) return state
var returnState: IBlockState = state

if (!LorenzUtils.inSkyBlock) return state

try {
if (MiningCommissionsBlocksColor.enabled && MiningCommissionsBlocksColor.active) {
returnState = replaceBlocksMapCache.getOrPut(state) {
MiningCommissionsBlocksColor.CommissionBlock.entries.firstOrNull {
state.isOreType(it.oreType)
}?.onColor(state) ?: state
}
}
} catch (e: Exception) {
ErrorManager.logErrorWithData(e, "Error in MiningCommissionsBlocksColor")
}

if (returnState !== state) {

return returnState
}
return state
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package at.hannibal2.skyhanni.mixins.transformers;

import at.hannibal2.skyhanni.mixins.hooks.OptifineConnectedTexturesHookKt;
import net.minecraft.block.state.IBlockState;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Pseudo;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyArg;

@Pseudo
@Mixin(targets = "net.optifine.ConnectedTextures", remap = false)
public class MixinOptifineConnectedTextures {

@ModifyArg(method = "getConnectedTexture", at = @At(value = "INVOKE", target = "getConnectedTextureMultiPass"))
private static IBlockState modifyGetConnectedTextureMultiPass(IBlockState state) {
return OptifineConnectedTexturesHookKt.modifyConnectedTexturesBlockState(state);
}

@ModifyArg(method = "getConnectedTexture", at = @At(value = "INVOKE", target = "skipConnectedTexture"))
private static IBlockState modifySkipConnectedTexture(IBlockState state) {
return OptifineConnectedTexturesHookKt.modifyConnectedTexturesBlockState(state);
}
}

0 comments on commit e5b31d2

Please sign in to comment.