-
-
Notifications
You must be signed in to change notification settings - Fork 189
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
1062c41
commit e5b31d2
Showing
3 changed files
with
58 additions
and
18 deletions.
There are no files selected for viewing
35 changes: 35 additions & 0 deletions
35
src/main/java/at/hannibal2/skyhanni/mixins/hooks/OptifineConnectedTexturesHook.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
} | ||
|
18 changes: 0 additions & 18 deletions
18
src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinOptifineConfig.java
This file was deleted.
Oops, something went wrong.
23 changes: 23 additions & 0 deletions
23
src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinOptifineConnectedTextures.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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); | ||
} | ||
} |