Skip to content

Commit

Permalink
some enableCountInjections fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Fallen-Breath committed Nov 12, 2024
1 parent 655f345 commit 92a7858
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 2 deletions.
2 changes: 1 addition & 1 deletion common.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ static String curseForgeOrOther(version, curseForge, other) {
// list of (dependencyNotation -> should use modImplementation)
def mod_dependencies = [
["fi.dy.masa.malilib:${project.malilib_version}", true],
[curseForgeOrOther(project.tweakeroo_file_id , 'curse.maven:tweakeroo-297344' , 'com.github.sakura-ryoko:tweakeroo' ), true],
[curseForgeOrOther(project.tweakeroo_file_id , 'curse.maven:tweakeroo-297344' , 'com.github.sakura-ryoko:tweakeroo' ), false],
[curseForgeOrOther(project.itemscroller_file_id, 'curse.maven:item-scroller-242064', 'com.github.sakura-ryoko:itemscroller'), true],
[curseForgeOrOther(project.minihud_file_id , 'curse.maven:minihud-244260' , 'com.github.sakura-ryoko:minihud' ), true],

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@ private Iterator<ClientBossBar> tweakerMore_bossBarMaxEntry_checkLimitation(Iter
method = "render",
at = @At(
value = "INVOKE",
//#if MC >= 12001
//$$ target = "Lnet/minecraft/client/gui/DrawContext;getScaledWindowHeight()I"
//#else
target = "Lnet/minecraft/client/util/Window;getScaledHeight()I"
//#endif
),
require = 0
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
@Mixin(DummyClass.class)
public abstract class MinecraftClientMixin
{
// mc 1.16+ only
// impl in mc [1.16, 1.20.4)
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.spongepowered.asm.mixin.injection.Coerce;
import org.spongepowered.asm.mixin.injection.Redirect;

// impl in mc [1.16, 1.20.4)
@Restriction(require = @Condition(type = Condition.Type.TESTER, tester = DevelopmentEnvironmentTester.class))
@Mixin(MinecraftClient.class)
public abstract class MinecraftClientMixin
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*
* This file is part of the TweakerMore project, licensed under the
* GNU Lesser General Public License v3.0
*
* Copyright (C) 2024 Fallen_Breath and contributors
*
* TweakerMore is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* TweakerMore is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with TweakerMore. If not, see <https://www.gnu.org/licenses/>.
*/

package me.fallenbreath.tweakermore.mixins.util.qol;

import me.fallenbreath.tweakermore.util.mixin.DummyClass;
import org.spongepowered.asm.mixin.Mixin;

@Mixin(DummyClass.class)
public abstract class MinecraftClientMixin
{
// impl in mc [1.16, 1.20.4)
}

0 comments on commit 92a7858

Please sign in to comment.