chore: bump version

Fix Network Protocol Error when joining server on NeoForge

build.gradle

@@ -13,9 +13,6 @@ repositories {
     maven {
         url = "https://api.modrinth.com/maven"
     }
-    flatDir {
-        dirs("localMaven")
-    }
 }
 
 subprojects {
@@ -25,9 +22,6 @@ subprojects {
             url = "https://api.modrinth.com/maven"
         }
         maven { url 'https://jitpack.io' }
-        flatDir {
-            dirs("../localMaven")
-        }
     }
 
     dependencies {

common/build.gradle

@@ -39,7 +39,7 @@ dependencies {
     modCompileOnlyApi "org.quiltmc:quilt-json5:1.0.0"
     modImplementation "maven.modrinth:sodium:${project.sodium_version}-fabric"
     modCompileOnlyApi "maven.modrinth:emi:${project.emi_version}"
-    modImplementation "maven.modrinth:emotecraft:${project.emotecraft_version}"
+    modCompileOnlyApi "maven.modrinth:emotecraft:${project.emotecraft_version}"
     modCompileOnlyApi "io.github.kosmx:bendy-lib:${project.bendylib_version}"
     modCompileOnlyApi "dev.isxander:yet-another-config-lib:${project.yacl_version}"
     modCompileOnlyApi "maven.modrinth:inventory-tabs-updated:${project.inventorytabs_version}"

common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java

@@ -89,7 +89,7 @@ public class MidnightControlsClient extends MidnightControls {
             public void run() {
                 try {
                     if (lateInitDone && client.isRunning()) {
-                        if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && (client.isWindowFocused() || MidnightControlsConfig.unfocusedInput)) {
+                        if (MidnightControlsConfig.controlsMode != ControlsMode.DEFAULT && (client.isWindowFocused() || MidnightControlsConfig.unfocusedInput)) {
                             input.tickCameraStick();
                             input.updateCamera();
                         }

common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightReacharound.java

@@ -77,7 +77,7 @@ public class MidnightReacharound {
     }
 
     public static float getPlayerRange(@NotNull MinecraftClient client) {
-        return client.player != null ? Double.valueOf(client.player.getAttributeValue(EntityAttributes.BLOCK_INTERACTION_RANGE)).floatValue() : 0.f;
+        return client.player != null ? Double.valueOf(client.player.getAttributeValue(EntityAttributes.PLAYER_BLOCK_INTERACTION_RANGE)).floatValue() : 0.f;
     }
 
     /**

common/src/main/java/eu/midnightdust/midnightcontrols/client/compat/EmotecraftCompat.java

@@ -1,51 +1,36 @@
 package eu.midnightdust.midnightcontrols.client.compat;
 
 import eu.midnightdust.midnightcontrols.client.controller.InputManager;
-import eu.midnightdust.midnightcontrols.client.mixin.MouseAccessor;
-import io.github.kosmx.emotes.arch.screen.ingame.FastMenuScreen;
+import io.github.kosmx.emotes.arch.gui.EmoteMenuImpl;
+import io.github.kosmx.emotes.arch.gui.screen.ingame.FastChosseScreen;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
-import org.joml.Vector2i;
-import org.lwjgl.glfw.GLFW;
 
 public class EmotecraftCompat {
     private static final MinecraftClient client = MinecraftClient.getInstance();
 
     public static void openEmotecraftScreen(Screen parent) {
-        client.setScreen(new FastMenuScreen(parent));
+        client.setScreen(new EmoteMenuImpl(parent));
     }
     public static boolean isEmotecraftScreen(Screen screen) {
-        return screen instanceof FastMenuScreen;
+        return screen instanceof FastChosseScreen;
     }
 
-    static int prevIndex = -1;
     public static void handleEmoteSelector(int index) {
-        try {
-            if (client.currentScreen instanceof FastMenuScreen) {
-                boolean stickReleased = index == -1 && prevIndex != -1;
-                var pos = calcMousePos(stickReleased ? prevIndex : index);
-                InputManager.queueMousePosition(pos.x, pos.y);
-                InputManager.INPUT_MANAGER.updateMousePosition(client);
+        if (client.currentScreen instanceof FastChosseScreen) {
+            int x = client.getWindow().getWidth() / 2;
+            int y = client.getWindow().getHeight() / 2;
+            switch (index) {
+                case 0, 3, 5 -> x -= 200;
+                case 2, 4, 7 -> x += 200;
+            }
+            switch (index) {
+                case 0, 1, 2 -> y -= 200;
+                case 5, 6, 7 -> y += 200;
+            }
+            InputManager.queueMousePosition(x, y);
 
-                if (stickReleased) {
-                    ((MouseAccessor) client.mouse).midnightcontrols$onMouseButton(client.getWindow().getHandle(), GLFW.GLFW_MOUSE_BUTTON_LEFT, GLFW.GLFW_PRESS, 0);
-                    prevIndex = -1;
-                }
-                else prevIndex = index;
-            } else prevIndex = -1;
-        } catch (Exception ignored) {}
-    }
-    public static Vector2i calcMousePos(int index) {
-        int x = client.getWindow().getWidth() / 2;
-        int y = client.getWindow().getHeight() / 2;
-        switch (index) {
-            case 0, 3, 5 -> x -= 275;
-            case 2, 4, 7 -> x += 275;
+            InputManager.INPUT_MANAGER.updateMousePosition(client);
         }
-        switch (index) {
-            case 0, 1, 2 -> y -= 275;
-            case 5, 6, 7 -> y += 275;
-        }
-        return new Vector2i(x, y);
     }
 }

common/src/main/java/eu/midnightdust/midnightcontrols/client/controller/InputHandlers.java

@@ -60,11 +60,10 @@ public class InputHandlers {
             // When in-game
             if (client.currentScreen == null && client.player != null) {
                 if (!client.player.isSpectator()) {
-                    var inv = client.player.getInventory();
                     if (next)
-                        inv.setSelectedSlot(inv.selectedSlot < 8 ? inv.selectedSlot + 1 : inv.selectedSlot - 8);
+                        client.player.getInventory().scrollInHotbar(-1.0);
                     else
-                        inv.setSelectedSlot(inv.selectedSlot > 0 ? inv.selectedSlot - 1 : inv.selectedSlot + 8);
+                        client.player.getInventory().scrollInHotbar(1.0);
                 }
                 else {
                     if (client.inGameHud.getSpectatorHud().isOpen()) {
@@ -80,9 +79,11 @@ public class InputHandlers {
             } else if (client.currentScreen instanceof CreativeInventoryScreenAccessor inventory) {
                 inventory.midnightcontrols$setSelectedTab(ItemGroupUtil.cycleTab(next, client));
                 return true;
-            } else if (client.currentScreen instanceof RecipeBookScreen<?> recipeBookScreen) {
-                RecipeBookWidget<?> recipeBook = ((RecipeBookScreenAccessor) recipeBookScreen).getRecipeBook();
-
+            } else if (client.currentScreen instanceof InventoryScreen || client.currentScreen instanceof CraftingScreen || client.currentScreen instanceof AbstractFurnaceScreen<?>) {
+                RecipeBookWidget recipeBook;
+                if (client.currentScreen instanceof InventoryScreen inventoryScreen) recipeBook = inventoryScreen.getRecipeBookWidget();
+                else if (client.currentScreen instanceof CraftingScreen craftingScreen) recipeBook = craftingScreen.getRecipeBookWidget();
+                else recipeBook = ((AbstractFurnaceScreen<?>)client.currentScreen).getRecipeBookWidget();
                 var recipeBookAccessor = (RecipeBookWidgetAccessor) recipeBook;
                 var tabs = recipeBookAccessor.getTabButtons();
                 var currentTab = recipeBookAccessor.getCurrentTab();
@@ -97,7 +98,7 @@ public class InputHandlers {
                 currentTab.setToggled(false);
                 recipeBookAccessor.setCurrentTab(currentTab = tabs.get(nextTab));
                 currentTab.setToggled(true);
-                recipeBookScreen.refreshRecipeBook();
+                recipeBookAccessor.midnightcontrols$refreshResults(true);
                 return true;
             } else if (client.currentScreen instanceof AdvancementsScreenAccessor screen) {
                 var tabs = screen.getTabs().values().stream().distinct().toList();

common/src/main/java/eu/midnightdust/midnightcontrols/client/controller/MovementHandler.java

@@ -15,7 +15,6 @@ import eu.midnightdust.midnightcontrols.client.util.MathUtil;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.attribute.EntityAttributes;
-import net.minecraft.util.PlayerInput;
 import net.minecraft.util.math.MathHelper;
 import org.jetbrains.annotations.NotNull;
 
@@ -49,8 +48,10 @@ public final class MovementHandler implements PressAction {
     public void applyMovement(@NotNull ClientPlayerEntity player) {
         if (!this.shouldOverrideMovement)
             return;
-        player.input.playerInput = new PlayerInput(this.pressingForward, this.pressingBack, this.pressingLeft, this.pressingRight,
-                player.input.playerInput.jump(), player.input.playerInput.sneak(), player.input.playerInput.sprint());
+        player.input.pressingForward = this.pressingForward;
+        player.input.pressingBack = this.pressingBack;
+        player.input.pressingLeft = this.pressingLeft;
+        player.input.pressingRight = this.pressingRight;
 
         polarUtil.calculate(this.movementSideways, this.movementForward, this.slowdownFactor);
         player.input.movementForward = polarUtil.polarY;
@@ -80,7 +81,7 @@ public final class MovementHandler implements PressAction {
         }
 
         this.slowdownFactor = client.player.shouldSlowDown() ? (MathHelper.clamp(
-            0.3F + (float) client.player.getAttributeValue(EntityAttributes.SNEAKING_SPEED),
+            0.3F + (float) client.player.getAttributeValue(EntityAttributes.PLAYER_SNEAKING_SPEED),
             0.0F,
             1.0F
         )) : 1.f;

common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsRenderer.java

@@ -18,23 +18,24 @@ import eu.midnightdust.midnightcontrols.client.MidnightInput;
 import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.enums.VirtualMouseSkin;
-import eu.midnightdust.midnightcontrols.client.mixin.DrawContextAccessor;
 import eu.midnightdust.midnightcontrols.client.util.HandledScreenAccessor;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.render.*;
+import net.minecraft.client.render.BufferBuilder;
+import net.minecraft.client.render.BufferRenderer;
+import net.minecraft.client.render.GameRenderer;
+import net.minecraft.client.render.Tessellator;
+import net.minecraft.client.render.VertexFormat;
+import net.minecraft.client.render.VertexFormats;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.texture.Sprite;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.math.ColorHelper;
 import org.jetbrains.annotations.NotNull;
 import org.joml.Matrix4f;
 import org.lwjgl.glfw.GLFW;
 
-import java.util.function.Function;
-
 import static eu.midnightdust.midnightcontrols.MidnightControls.id;
 
 /**
@@ -174,7 +175,7 @@ public class MidnightControlsRenderer {
         int assetSize = axis || (button >= 15 && button <= 18) ? AXIS_SIZE : BUTTON_SIZE;
 
         RenderSystem.setShaderColor(1.f, second ? 0.f : 1.f, 1.f, 1.f);
-        context.drawTexture(RenderLayer::getGuiTextured, axis ? MidnightControlsClient.CONTROLLER_AXIS : button >= 15 && button <= 19 ? MidnightControlsClient.CONTROLLER_EXPANDED :MidnightControlsClient.CONTROLLER_BUTTONS
+        context.drawTexture(axis ? MidnightControlsClient.CONTROLLER_AXIS : button >= 15 && button <= 19 ? MidnightControlsClient.CONTROLLER_EXPANDED :MidnightControlsClient.CONTROLLER_BUTTONS
                 , x + (ICON_SIZE / 2 - assetSize / 2), y + (ICON_SIZE / 2 - assetSize / 2),
                 (float) buttonOffset, (float) (controllerType * assetSize),
                 assetSize, assetSize,
@@ -215,7 +216,7 @@ public class MidnightControlsRenderer {
             if (MidnightControlsConfig.virtualMouseSkin == VirtualMouseSkin.DEFAULT_DARK || MidnightControlsConfig.virtualMouseSkin == VirtualMouseSkin.SECOND_DARK)
                 spritePath = MidnightControlsClient.WAYLAND_CURSOR_TEXTURE_DARK;
             Sprite sprite = client.getGuiAtlasManager().getSprite(spritePath);
-            drawUnalignedTexturedQuad(RenderLayer::getGuiTextured, sprite.getAtlasId(), context, mouseX, mouseX + 8, mouseY, mouseY + 8, 999, sprite.getMinU(), sprite.getMaxU(), sprite.getMinV(), sprite.getMaxV());
+            drawUnalignedTexturedQuad(sprite.getAtlasId(), context, mouseX, mouseX + 8, mouseY, mouseY + 8, 999, sprite.getMinU(), sprite.getMaxU(), sprite.getMinV(), sprite.getMaxV());
         } catch (IllegalStateException ignored) {}
     }
 
@@ -259,20 +260,19 @@ public class MidnightControlsRenderer {
 
         try {
             Sprite sprite = client.getGuiAtlasManager().getSprite(id(MidnightControlsConfig.virtualMouseSkin.getSpritePath() + (hoverSlot ? "_slot" : "")));
-            drawUnalignedTexturedQuad(RenderLayer::getGuiTextured, sprite.getAtlasId(), context, mouseX, mouseX + 16, mouseY, mouseY + 16, 999, sprite.getMinU(), sprite.getMaxU(), sprite.getMinV(), sprite.getMaxV());
+            drawUnalignedTexturedQuad(sprite.getAtlasId(), context, mouseX, mouseX + 16, mouseY, mouseY + 16, 999, sprite.getMinU(), sprite.getMaxU(), sprite.getMinV(), sprite.getMaxV());
         } catch (IllegalStateException ignored) {}
     }
-    private static void drawUnalignedTexturedQuad(Function<Identifier, RenderLayer> renderLayers, Identifier texture, DrawContext context, float x1, float x2, float y1, float y2, float z, float u1, float u2, float v1, float v2) {
-        RenderLayer renderLayer = renderLayers.apply(texture);
-        //RenderSystem.setShaderTexture(0, texture);
+    private static void drawUnalignedTexturedQuad(Identifier texture, DrawContext context, float x1, float x2, float y1, float y2, float z, float u1, float u2, float v1, float v2) {
+        RenderSystem.setShaderTexture(0, texture);
+        RenderSystem.setShader(GameRenderer::getPositionTexProgram);
         Matrix4f matrix4f = context.getMatrices().peek().getPositionMatrix();
-        //BufferBuilder bufferBuilder = Tessellator.getInstance().begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE);
-        VertexConsumer vertexConsumer = ((DrawContextAccessor)context).getVertexConsumers().getBuffer(renderLayer);
-        vertexConsumer.vertex(matrix4f, x1, y1, z).texture(u1, v1).color(ColorHelper.getWhite(1.0f));
-        vertexConsumer.vertex(matrix4f, x1, y2, z).texture(u1, v2).color(ColorHelper.getWhite(1.0f));
-        vertexConsumer.vertex(matrix4f, x2, y2, z).texture(u2, v2).color(ColorHelper.getWhite(1.0f));
-        vertexConsumer.vertex(matrix4f, x2, y1, z).texture(u2, v1).color(ColorHelper.getWhite(1.0f));
-        context.draw();
+        BufferBuilder bufferBuilder = Tessellator.getInstance().begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE);
+        bufferBuilder.vertex(matrix4f, x1, y1, z).texture(u1, v1);
+        bufferBuilder.vertex(matrix4f, x1, y2, z).texture(u1, v2);
+        bufferBuilder.vertex(matrix4f, x2, y2, z).texture(u2, v2);
+        bufferBuilder.vertex(matrix4f, x2, y1, z).texture(u2, v1);
+        BufferRenderer.drawWithGlobalProgram(bufferBuilder.end());
     }
 
     public record ButtonSize(int length, int height) {

common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java

@@ -14,7 +14,6 @@ import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.util.platform.NetworkUtil;
 import org.thinkingstudio.obsidianui.background.Background;
-import org.thinkingstudio.obsidianui.mixin.DrawContextAccessor;
 import org.thinkingstudio.obsidianui.widget.SpruceWidget;
 import eu.midnightdust.lib.util.MidnightColorUtil;
 import eu.midnightdust.midnightcontrols.MidnightControls;
@@ -502,24 +501,27 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
         }
         @Override
         public void render(DrawContext context, SpruceWidget widget, int vOffset, int mouseX, int mouseY, float delta) {
-            fill(context, widget.getX(), widget.getY(), widget.getX() + widget.getWidth(), widget.getY() + widget.getHeight(), Color.black);
+            fill(context.getMatrices(), widget.getX(), widget.getY(), widget.getX() + widget.getWidth(), widget.getY() + widget.getHeight(), MidnightColorUtil.hex2Rgb("#000000"));
         }
-        private static void fill(DrawContext context, int x2, int y2, int x1, int y1, Color color) {
-            RenderLayer renderLayer = RenderLayer.getGui();
-            VertexConsumer vertexConsumer = ((DrawContextAccessor)context).getVertexConsumers().getBuffer(renderLayer);
+        private static void fill(MatrixStack matrixStack, int x2, int y2, int x1, int y1, Color color) {
+            matrixStack.push();
 
+            Matrix4f matrix = matrixStack.peek().getPositionMatrix();
             float r = (float)(color.getRed()) / 255.0F;
             float g = (float)(color.getGreen()) / 255.0F;
             float b = (float)(color.getBlue()) / 255.0F;
             float t = (float)(transparency) / 255.0F;
+            BufferBuilder bufferBuilder = Tessellator.getInstance().begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_COLOR);
             RenderSystem.enableBlend();
             RenderSystem.defaultBlendFunc();
-            vertexConsumer.vertex((float)x1, (float)y2, 0.0F).color(r, g, b, t);
-            vertexConsumer.vertex((float)x2, (float)y2, 0.0F).color(r, g, b, t);
-            vertexConsumer.vertex((float)x2, (float)y1, 0.0F).color(r, g, b, t);
-            vertexConsumer.vertex((float)x1, (float)y1, 0.0F).color(r, g, b, t);
+            RenderSystem.setShader(GameRenderer::getPositionColorProgram);
+            bufferBuilder.vertex(matrix, (float)x1, (float)y2, 0.0F).color(r, g, b, t);
+            bufferBuilder.vertex(matrix, (float)x2, (float)y2, 0.0F).color(r, g, b, t);
+            bufferBuilder.vertex(matrix, (float)x2, (float)y1, 0.0F).color(r, g, b, t);
+            bufferBuilder.vertex(matrix, (float)x1, (float)y1, 0.0F).color(r, g, b, t);
+            BufferRenderer.drawWithGlobalProgram(bufferBuilder.end());
             RenderSystem.disableBlend();
-            context.draw();
+            matrixStack.pop();
         }
     }
 }

common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ClientPlayerEntityMixin.java

@@ -77,7 +77,7 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
         }
     }
 
-    @Inject(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/input/Input;tick()V", shift = At.Shift.AFTER))
+    @Inject(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/input/Input;tick(ZF)V", shift = At.Shift.AFTER))
     public void onInputUpdate(CallbackInfo ci) {
         MovementHandler.HANDLER.applyMovement((ClientPlayerEntity) (Object) this);
     }
@@ -88,11 +88,11 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
             if (MidnightControlsConfig.verticalFlyDrifting || !MidnightControls.isExtrasLoaded)
                 return;
             int moving = 0;
-            if (this.input.playerInput.sneak()) {
+            if (this.input.sneaking) {
                 --moving;
             }
 
-            if (this.input.playerInput.jump()) {
+            if (this.input.jumping) {
                 ++moving;
             }
 

common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/DrawContextAccessor.java

@@ -1,21 +0,0 @@
-/*
- * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
- *
- * This file is part of midnightcontrols.
- *
- * Licensed under the MIT license. For more information,
- * see the LICENSE file.
- */
-
-package eu.midnightdust.midnightcontrols.client.mixin;
-
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.render.VertexConsumerProvider;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(DrawContext.class)
-public interface DrawContextAccessor {
-    @Accessor("vertexConsumers")
-    VertexConsumerProvider.Immediate getVertexConsumers();
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/GameOptionsScreenMixin.java

@@ -33,29 +33,22 @@ import static eu.midnightdust.midnightcontrols.MidnightControls.id;
 @Mixin(GameOptionsScreen.class)
 public abstract class GameOptionsScreenMixin extends Screen {
     @Shadow @Nullable protected OptionListWidget body;
-    @Unique TextIconButtonWidget midnightcontrols$button = TextIconButtonWidget.builder(Text.translatable("midnightcontrols.menu.title.controller"),
-                    (button -> this.client.setScreen(new MidnightControlsSettingsScreen(this, false))), true)
+    @Unique TextIconButtonWidget midnightcontrols$button = TextIconButtonWidget.builder(Text.translatable("midnightcontrols.menu.title.controller"), (button -> this.client.setScreen(new MidnightControlsSettingsScreen(this, false))), true)
             .dimension(20,20).texture(id("icon/controller"), 20, 20).build();
 
     protected GameOptionsScreenMixin(Text title) {
         super(title);
     }
 
-    @Inject(method = "initBody", at = @At("TAIL"))
+    @Inject(method = "init", at = @At("TAIL"))
     public void midnightcontrols$addMCButton(CallbackInfo ci) {
         if (this.getClass().toString().equals(ControlsOptionsScreen.class.toString())) {
             this.midnightcontrols$setButtonPos();
-            this.addSelectableChild(midnightcontrols$button);
-        }
-    }
-    @Inject(method = "init", at = @At("TAIL"))
-    public void midnightcontrols$drawMCButton(CallbackInfo ci) {
-        if (this.getClass().toString().equals(ControlsOptionsScreen.class.toString())) {
             this.addDrawableChild(midnightcontrols$button);
         }
     }
 
-    @Inject(method = "refreshWidgetPositions", at = @At("TAIL"))
+    @Inject(method = "initTabNavigation", at = @At("TAIL"))
     public void midnightcontrols$onResize(CallbackInfo ci) {
         this.midnightcontrols$setButtonPos();
     }

common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/MinecraftClientMixin.java

@@ -127,12 +127,12 @@ public abstract class MinecraftClientMixin {
                     int previousStackCount = stackInHand.getCount();
                     var result = this.interactionManager.interactBlock(this.player, hand, hitResult);
                     if (result.isAccepted()) {
-                        //if (result.shouldSwingHand()) {
+                        if (result.shouldSwingHand()) {
                             this.player.swingHand(hand);
                             if (!stackInHand.isEmpty() && (stackInHand.getCount() != previousStackCount || this.interactionManager.hasCreativeInventory())) {
                                 this.gameRenderer.firstPersonRenderer.resetEquipProgress(hand);
                             }
-                        //}
+                        }
 
                         ci.cancel();
                     }

common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/MouseMixin.java

@@ -20,7 +20,7 @@ import net.minecraft.client.Mouse;
 import net.minecraft.client.util.GlfwUtil;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ThrowablePotionItem;
-import net.minecraft.item.consume.UseAction;
+import net.minecraft.util.UseAction;
 import net.minecraft.util.math.Smoother;
 import org.lwjgl.glfw.GLFW;
 import org.spongepowered.asm.mixin.Final;

common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/RecipeBookScreenAccessor.java

@@ -1,21 +0,0 @@
-/*
- * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
- *
- * This file is part of midnightcontrols.
- *
- * Licensed under the MIT license. For more information,
- * see the LICENSE file.
- */
-
-package eu.midnightdust.midnightcontrols.client.mixin;
-
-import net.minecraft.client.gui.screen.ingame.RecipeBookScreen;
-import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(RecipeBookScreen.class)
-public interface RecipeBookScreenAccessor {
-    @Accessor("recipeBook")
-    RecipeBookWidget<?> getRecipeBook();
-}

common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/RecipeBookWidgetAccessor.java

@@ -27,4 +27,7 @@ public interface RecipeBookWidgetAccessor {
 
     @Accessor("currentTab")
     void setCurrentTab(RecipeGroupButtonWidget currentTab);
+
+    @Invoker("refreshResults")
+    void midnightcontrols$refreshResults(boolean resetCurrentPage);
 }

common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/WorldRendererMixin.java

@@ -9,8 +9,10 @@
 
 package eu.midnightdust.midnightcontrols.client.mixin;
 
+import com.llamalad7.mixinextras.sugar.Local;
 import eu.midnightdust.lib.util.MidnightColorUtil;
 import eu.midnightdust.midnightcontrols.ControlsMode;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.touch.TouchInput;
 import eu.midnightdust.midnightcontrols.client.enums.TouchMode;
@@ -26,7 +28,8 @@ import net.minecraft.item.ItemUsageContext;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.HitResult;
-import net.minecraft.util.math.ColorHelper;
+import net.minecraft.util.shape.VoxelShape;
+import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -58,8 +61,12 @@ public abstract class WorldRendererMixin {
     @Final
     private BufferBuilderStorage bufferBuilders;
 
-    @Redirect(method = "renderTargetBlockOutline", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/hit/BlockHitResult;getType()Lnet/minecraft/util/hit/HitResult$Type;"))
-    private HitResult.Type dontRenderOutline(BlockHitResult instance) {
+    @Shadow
+    private static void drawCuboidShapeOutline(MatrixStack matrices, VertexConsumer vertexConsumer, VoxelShape shape, double offsetX, double offsetY, double offsetZ, float red, float green, float blue, float alpha) {
+    }
+
+    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/hit/HitResult;getType()Lnet/minecraft/util/hit/HitResult$Type;"))
+    private HitResult.Type dontRenderOutline(HitResult instance) {
         if (MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN && MidnightControlsConfig.touchMode == TouchMode.FINGER_POS) {
             return HitResult.Type.MISS;
         }
@@ -67,10 +74,15 @@ public abstract class WorldRendererMixin {
     }
 
     @Inject(
-            method = "renderTargetBlockOutline",
-            at = @At("HEAD")
+            method = "render",
+            at = @At(
+                    value = "FIELD",
+                    target = "Lnet/minecraft/client/MinecraftClient;crosshairTarget:Lnet/minecraft/util/hit/HitResult;",
+                    ordinal = 1,
+                    shift = At.Shift.AFTER
+            )
     )
-    private void onOutlineRender(Camera camera, VertexConsumerProvider.Immediate vertexConsumers, MatrixStack matrices, boolean translucent, CallbackInfo ci) {
+    private void onOutlineRender(RenderTickCounter tickCounter, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightmapTextureManager lightmapTextureManager, Matrix4f matrix4f, Matrix4f matrix4f2, CallbackInfo ci, @Local MatrixStack matrices) {
         if (((MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && MidnightControlsConfig.touchInControllerMode) || MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN)
                 && MidnightControlsConfig.touchMode == TouchMode.FINGER_POS) {
             this.midnightcontrols$renderFingerOutline(matrices, camera);
@@ -90,8 +102,8 @@ public abstract class WorldRendererMixin {
             var pos = camera.getPos();
             matrices.push();
             var vertexConsumer = this.bufferBuilders.getEntityVertexConsumers().getBuffer(RenderLayer.getLines());
-            VertexRendering.drawOutline(matrices, vertexConsumer, outlineShape, blockPos.getX() - pos.getX(), blockPos.getY() - pos.getY(), blockPos.getZ() - pos.getZ(),
-                    ColorHelper.withAlpha(MidnightControlsConfig.touchOutlineColorAlpha, rgb.getRGB()));
+            drawCuboidShapeOutline(matrices, vertexConsumer, outlineShape, blockPos.getX() - pos.getX(), blockPos.getY() - pos.getY(), blockPos.getZ() - pos.getZ(),
+                    rgb.getRed() / 255.f, rgb.getGreen() / 255.f, rgb.getBlue() / 255.f, MidnightControlsConfig.touchOutlineColorAlpha / 255.f);
             matrices.pop();
         }
     }
@@ -122,8 +134,9 @@ public abstract class WorldRendererMixin {
             if (MidnightControlsConfig.reacharoundOutlineColorHex.isEmpty()) rgb = RainbowColor.radialRainbow(1,1);
             matrices.push();
             var vertexConsumer = this.bufferBuilders.getEntityVertexConsumers().getBuffer(RenderLayer.getLines());
-            VertexRendering.drawOutline(matrices, vertexConsumer, outlineShape, blockPos.getX() - pos.getX(), blockPos.getY() - pos.getY(), blockPos.getZ() - pos.getZ(),
-                    ColorHelper.withAlpha(MidnightControlsConfig.touchOutlineColorAlpha, rgb.getRGB()));
+            drawCuboidShapeOutline(matrices, vertexConsumer, outlineShape,
+                    (double) blockPos.getX() - pos.getX(), (double) blockPos.getY() - pos.getY(), (double) blockPos.getZ() - pos.getZ(),
+                    rgb.getRed() / 255.f, rgb.getGreen() / 255.f, rgb.getBlue() / 255.f, MidnightControlsConfig.reacharoundOutlineColorAlpha / 255.f);
             matrices.pop();
         }
     }

common/src/main/java/eu/midnightdust/midnightcontrols/client/touch/TouchInput.java

@@ -85,12 +85,12 @@ public class TouchInput {
                     int previousStackCount = stackInHand.getCount();
                     var interaction = client.interactionManager.interactBlock(client.player, client.player.getActiveHand(), blockHit);
                     if (interaction.isAccepted()) {
-                        //if (interaction.shouldSwingHand()) {
+                        if (interaction.shouldSwingHand()) {
                             client.player.swingHand(client.player.preferredHand);
                             if (!stackInHand.isEmpty() && (stackInHand.getCount() != previousStackCount || client.interactionManager.hasCreativeInventory())) {
                                 client.gameRenderer.firstPersonRenderer.resetEquipProgress(client.player.preferredHand);
                             }
-                        //}
+                        }
                         return true;
                     }
                 }

common/src/main/java/eu/midnightdust/midnightcontrols/client/touch/TouchUtils.java

@@ -7,7 +7,7 @@ import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.Camera;
 import net.minecraft.entity.projectile.ProjectileUtil;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.consume.UseAction;
+import net.minecraft.util.UseAction;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.EntityHitResult;
 import net.minecraft.util.hit.HitResult;

common/src/main/java/eu/midnightdust/midnightcontrols/client/touch/gui/ItemUseButtonWidget.java

@@ -1,12 +1,12 @@
 package eu.midnightdust.midnightcontrols.client.touch.gui;
 
-import net.minecraft.item.consume.UseAction;
 import org.thinkingstudio.obsidianui.Position;
 import org.thinkingstudio.obsidianui.widget.SpruceButtonWidget;
 import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import net.minecraft.item.ArmorItem;
 import net.minecraft.text.Text;
+import net.minecraft.util.UseAction;
 
 public class ItemUseButtonWidget extends SpruceButtonWidget {
 

common/src/main/java/eu/midnightdust/midnightcontrols/client/touch/gui/TouchscreenOverlay.java

@@ -15,10 +15,10 @@ import net.minecraft.client.gui.screen.ChatScreen;
 import net.minecraft.client.gui.screen.GameMenuScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.item.ArmorItem;
-import net.minecraft.item.consume.UseAction;
 import net.minecraft.util.Arm;
 import net.minecraft.util.Hand;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.UseAction;
 import org.thinkingstudio.obsidianui.Position;
 import org.thinkingstudio.obsidianui.widget.SpruceButtonWidget;
 import eu.midnightdust.lib.util.PlatformFunctions;

common/src/main/resources/midnightcontrols.mixins.json

@@ -3,27 +3,25 @@
   "package": "eu.midnightdust.midnightcontrols.client.mixin",
   "compatibilityLevel": "JAVA_21",
   "client": [
-    "AdvancementsScreenAccessor",
-    "ChatScreenMixin",
     "ClickableWidgetAccessor",
+    "AdvancementsScreenAccessor",
     "ClientPlayerEntityMixin",
-    "CreativeInventoryScreenAccessor",
-    "DrawContextAccessor",
     "GameOptionsScreenMixin",
+    "CreativeInventoryScreenAccessor",
     "GameRendererMixin",
     "HandledScreenMixin",
-    "InputUtilMixin",
-    "KeyBindingIDAccessor",
     "KeyBindingMixin",
-    "KeyboardMixin",
+    "InputUtilMixin",
     "MinecraftClientMixin",
-    "MouseAccessor",
     "MouseMixin",
-    "RecipeBookScreenAccessor",
+    "MouseAccessor",
+    "ChatScreenMixin",
     "RecipeBookWidgetAccessor",
-    "ScreenMixin",
+    "WorldRendererMixin",
+    "KeyBindingIDAccessor",
     "TabNavigationWidgetAccessor",
-    "WorldRendererMixin"
+    "ScreenMixin",
+    "KeyboardMixin"
   ],
   "injectors": {
     "defaultRequire": 1

fabric/build.gradle

@@ -26,7 +26,7 @@ dependencies {
     modImplementation include ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric")
     modImplementation include ("maven.modrinth:obsidianui:${rootProject.obsidianui_version}-fabric") {}
     include 'org.aperlambda:lambdajcommon:1.8.1'
-    modCompileOnly "maven.modrinth:emi:${project.emi_version}"
+    modImplementation "maven.modrinth:emi:${project.emi_version}"
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
@@ -92,8 +92,7 @@ unifiedPublishing {
             curseforge {
                 token = CURSEFORGE_TOKEN
                 id = rootProject.curseforge_id
-                gameVersions.addAll "Java 21", project.minecraft_version
-                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
+                gameVersions.addAll "Java 21", project.minecraft_version, project.supported_versions
             }
         }
 
@@ -103,8 +102,7 @@ unifiedPublishing {
                 token = MODRINTH_TOKEN
                 id = rootProject.modrinth_id
                 version = "$project.version-$project.name"
-                gameVersions.addAll project.minecraft_version
-                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
+                gameVersions.addAll project.minecraft_version, project.supported_versions
             }
         }
     }

gradle.properties

@@ -2,34 +2,34 @@
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx2048M
 
-minecraft_version=1.21.4
-supported_versions=
-yarn_mappings=1.21.4+build.1
+minecraft_version=1.21
+supported_versions=1.21.1
+yarn_mappings=1.21+build.2
 enabled_platforms=fabric,neoforge
 
 archives_base_name=midnightcontrols
-mod_version=1.10.5
+mod_version=1.10.0.1
 maven_group=eu.midnightdust
-release_type=release
+release_type=beta
 modrinth_id = bXX9h73M
 curseforge_id = 621768
 # Configure the IDs here after creating the projects on the websites
 
-midnightlib_version=1.6.8+1.21.4
+midnightlib_version=1.6.3
 
-fabric_loader_version=0.16.9
-fabric_api_version=0.110.5+1.21.4
+fabric_loader_version=0.15.11
+fabric_api_version=0.100.1+1.21
 
-neoforge_version=21.4.9-beta
+neoforge_version=21.0.14-beta
 yarn_mappings_patch_neoforge_version = 1.21+build.4
 
 quilt_loader_version=0.19.0-beta.18
 quilt_fabric_api_version=7.0.1+0.83.0-1.20
 
 sodium_version=mc1.21-0.6.0-beta.1
-obsidianui_version=0.2.10+mc1.21.3
+obsidianui_version=0.2.7+mc1.21
 modmenu_version=10.0.0-beta.1
-emotecraft_version=2.5.5+1.21.4-fabric
+emotecraft_version=2.1.3-SNAPSHOT-build.29-MC1.19-fabric
 bendylib_version=2.0.+
 emi_version=1.1.10+1.21+fabric
 libgui_version=6.0.0+1.19

neoforge/build.gradle

@@ -104,8 +104,7 @@ unifiedPublishing {
             curseforge {
                 token = CURSEFORGE_TOKEN
                 id = rootProject.curseforge_id
-                gameVersions.addAll "Java 21", project.minecraft_version
-                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
+                gameVersions.addAll "Java 21", project.minecraft_version, project.supported_versions
             }
         }
 
@@ -115,8 +114,7 @@ unifiedPublishing {
                 token = MODRINTH_TOKEN
                 id = rootProject.modrinth_id
                 version = "$project.version-$project.name"
-                gameVersions.addAll project.minecraft_version
-                if (project.supported_versions != "") gameVersions.addAll project.supported_versions
+                gameVersions.addAll project.minecraft_version, project.supported_versions
             }
         }
     }

neoforge/src/main/java/eu/midnightdust/midnightcontrols/client/util/platform/neoforge/NetworkUtilImpl.java

@@ -3,7 +3,7 @@ package eu.midnightdust.midnightcontrols.client.util.platform.neoforge;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.network.packet.CustomPayload;
 import net.minecraft.network.packet.Packet;
-import net.minecraft.network.packet.c2s.common.CustomPayloadC2SPacket;
+import net.neoforged.neoforge.network.PacketDistributor;
 
 import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client;
 
@@ -19,12 +19,7 @@ public class NetworkUtilImpl {
             handler.send(packet);
     }
     public static void sendPayloadC2S(CustomPayload payload) {
-        if (handler != null && client.world != null) {
-            try {
-                handler.send(new CustomPayloadC2SPacket(payload));
-            } catch (Exception e) {
-                e.fillInStackTrace();
-            }
-        }
+        if (handler != null && client.world != null && handler.hasChannel(payload.getId().id()))
+            PacketDistributor.sendToServer(payload);
     }
 }