Skip to content

Commit 48bc29c

Browse files
committed
fix compile error on <1.21.5
1 parent 89e0e5c commit 48bc29c

5 files changed

Lines changed: 12 additions & 9 deletions

File tree

src/main/java/dev/isxander/controlify/bindings/RadialIcons.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private static void addItems(Map<Identifier, RadialIcon> map) {
6868

6969
private static void addPotionEffects(Map<Identifier, RadialIcon> map) {
7070
//? if <1.21.6
71-
/*var mobEffectTextureManager = minecraft.getMobEffectTextures();*/
71+
//var mobEffectTextureManager = minecraft.getMobEffectTextures();
7272

7373
BuiltInRegistries.MOB_EFFECT.entrySet().forEach(entry -> {
7474
ResourceKey<MobEffect> key = entry.getKey();

src/main/java/dev/isxander/controlify/gui/screen/BindConsumerScreen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float tickDe
4040
var pose = CGuiPose.ofPush(guiGraphics);
4141
// text renders with z > 0 so push everything back so text doesn't pop through fill
4242
//? if <1.21.6
43-
/*guiGraphics.pose().translate(0, 0, -20);*/
43+
//guiGraphics.pose().translate(0, 0, -20);
4444

4545
//? if >=1.21.10 {
4646
backgroundScreen.renderWithTooltipAndSubtitles(guiGraphics, dim.centerX(), dim.centerY(), tickDelta);

src/main/java/dev/isxander/controlify/mixins/feature/patches/sprintfix/LocalPlayerMixin.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
package dev.isxander.controlify.mixins.feature.patches.sprintfix;
22

3+
import net.minecraft.client.player.LocalPlayer;
4+
import org.spongepowered.asm.mixin.Mixin;
5+
6+
//? if >=1.21.5 {
37
import com.llamalad7.mixinextras.expression.Definition;
48
import com.llamalad7.mixinextras.expression.Expression;
59
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
610
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
711
import com.llamalad7.mixinextras.sugar.Local;
812
import dev.isxander.controlify.Controlify;
913
import net.minecraft.client.player.ClientInput;
10-
import net.minecraft.client.player.LocalPlayer;
11-
import org.spongepowered.asm.mixin.Mixin;
1214
import org.spongepowered.asm.mixin.Unique;
1315
import org.spongepowered.asm.mixin.injection.At;
16+
//?}
1417

1518
@Mixin(LocalPlayer.class)
1619
public class LocalPlayerMixin {

src/main/java/dev/isxander/controlify/platform/client/resource/SimpleControlifyReloadListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public interface SimpleControlifyReloadListener<T> extends ControlifyReloadListe
2525
PreparableReloadListener.PreparationBarrier helper,
2626
ResourceManager manager,
2727
//? if <1.21.2
28-
/^ProfilerFiller loadProfiler, ProfilerFiller applyProfiler,^/
28+
//ProfilerFiller loadProfiler, ProfilerFiller applyProfiler,
2929
Executor loadExecutor, Executor applyExecutor
3030
) {
3131
return reload0(helper, manager, loadExecutor, applyExecutor);

src/main/java/dev/isxander/controlify/utils/render/Blit.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static void tex(
3030
int textureWidth, int textureHeight
3131
) {
3232
//? if <1.21.2
33-
/*RenderSystem.enableBlend();*/ // maintain parity with guiTextured render type that enables blending
33+
//RenderSystem.enableBlend(); // maintain parity with guiTextured render type that enables blending
3434

3535
graphics.blit(
3636
//? if >=1.21.2
@@ -43,7 +43,7 @@ public static void tex(
4343
);
4444

4545
//? if <1.21.2
46-
/*RenderSystem.disableBlend();*/
46+
//RenderSystem.disableBlend();
4747
}
4848

4949
public static void tex(
@@ -55,7 +55,7 @@ public static void tex(
5555
int atlasWidth, int atlasHeight
5656
) {
5757
//? if <1.21.2
58-
/*RenderSystem.enableBlend();*/ // maintain parity with guiTextured render type that enables blending
58+
//RenderSystem.enableBlend(); // maintain parity with guiTextured render type that enables blending
5959

6060
graphics.blit(
6161
//? if >=1.21.2
@@ -68,7 +68,7 @@ public static void tex(
6868
);
6969

7070
//? if <1.21.2
71-
/*RenderSystem.disableBlend();*/
71+
//RenderSystem.disableBlend();
7272
}
7373

7474
public static void tex(

0 commit comments

Comments
 (0)