From 862e2c2ad1bfbc31c636778ac10ec346aec00a97 Mon Sep 17 00:00:00 2001 From: Leclowndu93150 Date: Wed, 17 Jul 2024 14:22:38 +0200 Subject: [PATCH] Attempted to load class net/minecraft/client/player/LocalPlayer for invalid dist DEDICATED_SERVER --- gradle.properties | 2 +- .../modular_angelring/common/AngelRingItem.java | 13 +++++++------ .../modular_angelring/events/AngelRingEvents.java | 5 +++-- .../networking/PayloadActions.java | 11 ++++++++--- .../modular_angelring/registry/KeyBindRegistry.java | 7 +++---- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5b6106b..d32fcaf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,7 +23,7 @@ neo_version_range=[21.0.10-beta,) loader_version_range=[2,) -jei_version = 19.4.0.28 +jei_version = 19.5.0.35 mod_id=modular_angelring diff --git a/src/main/java/com/leclowndu93150/modular_angelring/common/AngelRingItem.java b/src/main/java/com/leclowndu93150/modular_angelring/common/AngelRingItem.java index 6a26335..f7ba595 100644 --- a/src/main/java/com/leclowndu93150/modular_angelring/common/AngelRingItem.java +++ b/src/main/java/com/leclowndu93150/modular_angelring/common/AngelRingItem.java @@ -1,5 +1,6 @@ package com.leclowndu93150.modular_angelring.common; +import com.leclowndu93150.modular_angelring.networking.PayloadActions; import com.leclowndu93150.modular_angelring.registry.DataComponentRegistry; import com.leclowndu93150.modular_angelring.registry.ItemRegistry; import com.leclowndu93150.modular_angelring.registry.KeyBindRegistry; @@ -61,8 +62,8 @@ public static void tickRing(ItemStack stack, Player player) { } ItemStack angelRingStack = slotResult.get().stack(); - if(angelRingStack.has(DataComponentRegistry.SPEED_MODIFIER) && ((player.getAbilities().getFlyingSpeed() != getSpeedModifier(angelRingStack)) || !KeyBindRegistry.speedEnabled)){ - if(KeyBindRegistry.speedEnabled){ + if(angelRingStack.has(DataComponentRegistry.SPEED_MODIFIER) && ((player.getAbilities().getFlyingSpeed() != getSpeedModifier(angelRingStack)) || !PayloadActions.speedEnabled)){ + if(PayloadActions.speedEnabled){ player.getAbilities().setFlyingSpeed(getSpeedModifier(angelRingStack)); } else player.getAbilities().setFlyingSpeed(0.05F); } @@ -85,16 +86,16 @@ public void appendHoverText(@NotNull ItemStack stack, @NotNull TooltipContext pC if (AngelRingModules.getMiningSpeedModifier(stack) /* && KeyBindRegistry.miningEnabled */) { pTooltipComponents.add(Component.literal("Mining Module")/*.append("Enabled")*/.withStyle(ChatFormatting.GRAY)); } - if (AngelRingModules.getInertiaModifier(stack) && KeyBindRegistry.inertiaEnabled){ + if (AngelRingModules.getInertiaModifier(stack) && PayloadActions.inertiaEnabled){ pTooltipComponents.add(Component.literal("Inertia Module: ").append("Enabled").withStyle(ChatFormatting.GREEN)); } - if (AngelRingModules.getInertiaModifier(stack) && !KeyBindRegistry.inertiaEnabled){ + if (AngelRingModules.getInertiaModifier(stack) && !PayloadActions.inertiaEnabled){ pTooltipComponents.add(Component.literal("Inertia Module: ").append("Disabled").withStyle(ChatFormatting.RED)); } - if (stack.has(DataComponentRegistry.SPEED_MODIFIER) && KeyBindRegistry.speedEnabled){ + if (stack.has(DataComponentRegistry.SPEED_MODIFIER) && PayloadActions.speedEnabled){ pTooltipComponents.add(Component.literal("Speed Module: ").append(String.valueOf(FlightSpeedPercentage.speedToPercentage(AngelRingModules.getSpeedModifier(stack)))).append("%").withStyle(ChatFormatting.GREEN)); } - if (stack.has(DataComponentRegistry.SPEED_MODIFIER) && !KeyBindRegistry.speedEnabled){ + if (stack.has(DataComponentRegistry.SPEED_MODIFIER) && !PayloadActions.speedEnabled){ pTooltipComponents.add(Component.literal("Speed Module: ").append(String.valueOf(FlightSpeedPercentage.speedToPercentage(AngelRingModules.getSpeedModifier(stack)))).append("%").withStyle(ChatFormatting.RED)); } diff --git a/src/main/java/com/leclowndu93150/modular_angelring/events/AngelRingEvents.java b/src/main/java/com/leclowndu93150/modular_angelring/events/AngelRingEvents.java index b48faca..a376ccb 100644 --- a/src/main/java/com/leclowndu93150/modular_angelring/events/AngelRingEvents.java +++ b/src/main/java/com/leclowndu93150/modular_angelring/events/AngelRingEvents.java @@ -2,6 +2,7 @@ import com.leclowndu93150.modular_angelring.AngelRingMain; import com.leclowndu93150.modular_angelring.common.AngelRingItem; +import com.leclowndu93150.modular_angelring.networking.PayloadActions; import com.leclowndu93150.modular_angelring.registry.DataComponentRegistry; import com.leclowndu93150.modular_angelring.registry.ItemRegistry; import com.leclowndu93150.modular_angelring.registry.KeyBindRegistry; @@ -39,7 +40,7 @@ public static void setRingBreakSpeed(PlayerEvent.BreakSpeed event) { if (slotResult.isPresent()) { ItemStack angelRingStack = slotResult.get().stack(); float newDigSpeed = event.getOriginalSpeed(); - if (getMiningSpeedModifier(angelRingStack) && !player.onGround() && KeyBindRegistry.miningEnabled) { + if (getMiningSpeedModifier(angelRingStack) && !player.onGround()) { newDigSpeed *= 5f; } if (newDigSpeed != event.getOriginalSpeed()) { @@ -56,7 +57,7 @@ public static void stopDrift(PlayerTickEvent.Pre event) { ItemStack angelRingStack = slotResult.get().stack(); Vec3 motion = player.getDeltaMovement(); Options opt = Minecraft.getInstance().options; - if (player.getAbilities().flying && getInertiaModifier(angelRingStack) && KeyBindRegistry.inertiaEnabled) { + if (player.getAbilities().flying && getInertiaModifier(angelRingStack) && PayloadActions.inertiaEnabled) { if (!opt.keyUp.isDown() && !opt.keyDown.isDown() && !opt.keyLeft.isDown() && !opt.keyRight.isDown()) { if (motion.x != 0 || motion.z != 0) { player.setDeltaMovement(0, motion.y, 0); diff --git a/src/main/java/com/leclowndu93150/modular_angelring/networking/PayloadActions.java b/src/main/java/com/leclowndu93150/modular_angelring/networking/PayloadActions.java index 4e6e8b1..a6b7673 100644 --- a/src/main/java/com/leclowndu93150/modular_angelring/networking/PayloadActions.java +++ b/src/main/java/com/leclowndu93150/modular_angelring/networking/PayloadActions.java @@ -1,20 +1,25 @@ package com.leclowndu93150.modular_angelring.networking; -import com.leclowndu93150.modular_angelring.AngelRingMain; import com.leclowndu93150.modular_angelring.registry.KeyBindRegistry; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.neoforged.neoforge.network.handling.IPayloadContext; public final class PayloadActions { + public static boolean inertiaEnabled = true; + public static boolean speedEnabled = true; + public static void keyPressedAction(KeyPressedPayload payload, IPayloadContext ctx) { // SERVER-SIDE Player player = ctx.player(); Level level = player.level(); int key = payload.key(); if (key == KeyBindRegistry.INERTIA_MODULE.get().getKey().getValue()) { - // do stuff if inertia module key was pressed - System.out.println("Inertia pressed"); + inertiaEnabled = !inertiaEnabled; + } + + if (key == KeyBindRegistry.SPEED_MODULE.get().getKey().getValue()) { + speedEnabled = !speedEnabled; } } } diff --git a/src/main/java/com/leclowndu93150/modular_angelring/registry/KeyBindRegistry.java b/src/main/java/com/leclowndu93150/modular_angelring/registry/KeyBindRegistry.java index cf72792..cce4860 100644 --- a/src/main/java/com/leclowndu93150/modular_angelring/registry/KeyBindRegistry.java +++ b/src/main/java/com/leclowndu93150/modular_angelring/registry/KeyBindRegistry.java @@ -1,8 +1,8 @@ package com.leclowndu93150.modular_angelring.registry; -import com.leclowndu93150.modular_angelring.common.AngelRingItem; import com.leclowndu93150.modular_angelring.common.AngelRingModules; import com.leclowndu93150.modular_angelring.networking.KeyPressedPayload; +import com.leclowndu93150.modular_angelring.networking.PayloadActions; import com.mojang.blaze3d.platform.InputConstants; import net.minecraft.ChatFormatting; import net.minecraft.client.KeyMapping; @@ -44,7 +44,6 @@ public static void registerBindings(RegisterKeyMappingsEvent event) { NeoForge.EVENT_BUS.addListener(KeyBindRegistry::onKey); } - public static boolean miningEnabled = true; public static boolean inertiaEnabled = true; public static boolean speedEnabled = true; @@ -56,9 +55,8 @@ public static void onKey(InputEvent.Key event) { ItemStack angelRingStack = slotResult.get().stack(); Level level = player.level(); if (INERTIA_MODULE.get().consumeClick() && AngelRingModules.getInertiaModifier(angelRingStack)) { - // Send payload to server - PacketDistributor.sendToServer(new KeyPressedPayload(INERTIA_MODULE.get().getKey().getValue())); inertiaEnabled = !inertiaEnabled; + PacketDistributor.sendToServer(new KeyPressedPayload(INERTIA_MODULE.get().getKey().getValue())); if (inertiaEnabled) { player.displayClientMessage(Component.literal("Inertia Module: Enabled").withStyle(ChatFormatting.GREEN), true); level.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.NOTE_BLOCK_BELL.value(), SoundSource.PLAYERS, 0.4f, 0.01f); @@ -69,6 +67,7 @@ public static void onKey(InputEvent.Key event) { } if (SPEED_MODULE.get().consumeClick() && angelRingStack.has(DataComponentRegistry.SPEED_MODIFIER)) { speedEnabled = !speedEnabled; + PacketDistributor.sendToServer(new KeyPressedPayload(SPEED_MODULE.get().getKey().getValue())); if (speedEnabled) { player.displayClientMessage(Component.literal("Speed Module: Enabled").withStyle(ChatFormatting.GREEN), true); level.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.NOTE_BLOCK_BELL.value(), SoundSource.PLAYERS, 0.4f, 0.01f);