Skip to content

Commit

Permalink
minor cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@Thepigcat76
Thepigcat76 committed Jun 19, 2024
1 parent 7dc1a3c commit e5653be
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 78 deletions.
35 changes: 17 additions & 18 deletions src/main/java/com/leclowndu93150/modular_angelring/events/AngelRingEvents.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,38 +36,37 @@ public class AngelRingEvents {
public static void setRingBreakSpeed(PlayerEvent.BreakSpeed event) {
Player player = event.getEntity();
Optional<SlotResult> slotResult = CuriosApi.getCuriosInventory(player).flatMap(handler -> handler.findFirstCurio(ItemRegistry.ANGEL_RING.get()));
if (slotResult.isPresent()) {
ItemStack angelRingStack = slotResult.get().stack();
float newDigSpeed = event.getOriginalSpeed();
if (getMiningSpeedModifier(angelRingStack) && !player.onGround() && KeyBindRegistry.miningEnabled) {
newDigSpeed *= 5f;
}
if (newDigSpeed != event.getOriginalSpeed()) {
event.setNewSpeed(newDigSpeed);
}
if (slotResult.isPresent()) {
ItemStack angelRingStack = slotResult.get().stack();
float newDigSpeed = event.getOriginalSpeed();
if (getMiningSpeedModifier(angelRingStack) && !player.onGround() && KeyBindRegistry.miningEnabled) {
newDigSpeed *= 5f;
}
if (newDigSpeed != event.getOriginalSpeed()) {
event.setNewSpeed(newDigSpeed);
}
}
}

@SubscribeEvent(priority = EventPriority.LOW)
public static void stopDrift(PlayerTickEvent.Pre event) {
Player player = event.getEntity();
Optional<SlotResult> slotResult = CuriosApi.getCuriosInventory(player).flatMap(handler -> handler.findFirstCurio(ItemRegistry.ANGEL_RING.get()));
if (slotResult.isPresent()) {
ItemStack angelRingStack = slotResult.get().stack();
Vec3 motion = player.getDeltaMovement();
Options opt = Minecraft.getInstance().options;
if (player.getAbilities().flying && getInertiaModifier(angelRingStack) && KeyBindRegistry.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);
}
Vec3 motion = player.getDeltaMovement();
Options opt = Minecraft.getInstance().options;
if (player.getAbilities().flying && getInertiaModifier(angelRingStack) && KeyBindRegistry.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);
}
}
}
}
}



@SubscribeEvent(priority = EventPriority.LOW)
public static void newFlightSpeed(PlayerInteractEvent.RightClickItem event) {
final float MAX_FLY_SPEED = 0.15F;
Expand Down Expand Up @@ -102,4 +101,4 @@ public static void newFlightSpeed(PlayerInteractEvent.RightClickItem event) {
public static void onPlayerTick(PlayerTickEvent.Pre event) {
AngelRingItem.tickPlayer(event.getEntity());
}
}
}
11 changes: 5 additions & 6 deletions src/main/java/com/leclowndu93150/modular_angelring/events/AngelRingRenderEvents.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.leclowndu93150.modular_angelring.events;

import com.leclowndu93150.modular_angelring.AngelRingMain;
import com.leclowndu93150.modular_angelring.render.AngelRingRendererLeft;
import com.leclowndu93150.modular_angelring.render.AngelRingRendererRight;
import com.leclowndu93150.modular_angelring.render.AngelRingRenderer;
import net.minecraft.client.renderer.entity.EntityRenderer;
import net.minecraft.client.renderer.entity.player.PlayerRenderer;
import net.minecraft.client.resources.PlayerSkin;
Expand All @@ -21,12 +20,12 @@ public static void registerEntityLayers(EntityRenderersEvent.AddLayers event) {
EntityRenderer<? extends Player> slim = event.getSkin(PlayerSkin.Model.SLIM);

if (def instanceof PlayerRenderer playerRendererA) {
playerRendererA.addLayer(new AngelRingRendererLeft(playerRendererA));
playerRendererA.addLayer(new AngelRingRendererRight(playerRendererA));
playerRendererA.addLayer(new AngelRingRenderer(playerRendererA, false));
playerRendererA.addLayer(new AngelRingRenderer(playerRendererA, true));
}
if (slim instanceof PlayerRenderer playerRendererB) {
playerRendererB.addLayer(new AngelRingRendererLeft(playerRendererB));
playerRendererB.addLayer(new AngelRingRendererRight(playerRendererB));
playerRendererB.addLayer(new AngelRingRenderer(playerRendererB, false));
playerRendererB.addLayer(new AngelRingRenderer(playerRendererB, true));
}
}
}
46 changes: 24 additions & 22 deletions src/main/java/com/leclowndu93150/modular_angelring/registry/KeyBindRegistry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.neoforge.client.event.InputEvent;
Expand All @@ -27,10 +28,10 @@

@EventBusSubscriber(modid = MODID, bus = EventBusSubscriber.Bus.MOD)
public class KeyBindRegistry {
public static final Lazy<KeyMapping> INERTIA_MODULE = Lazy.of(() ->new KeyMapping(
public static final Lazy<KeyMapping> INERTIA_MODULE = Lazy.of(() -> new KeyMapping(
"Inertia Module", InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_L, "Modular Angel Ring"));

public static final Lazy<KeyMapping> SPEED_MODULE = Lazy.of(() ->new KeyMapping(
public static final Lazy<KeyMapping> SPEED_MODULE = Lazy.of(() -> new KeyMapping(
"Speed Module", InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_K, "Modular Angel Ring"));


Expand All @@ -49,29 +50,30 @@ public static void onKey(InputEvent.Key event) {
Player player = Minecraft.getInstance().player;
if (player == null) return;
Optional<SlotResult> slotResult = CuriosApi.getCuriosInventory(player).flatMap(handler -> handler.findFirstCurio(ItemRegistry.ANGEL_RING.get()));
if (slotResult.isPresent()) {
ItemStack angelRingStack = slotResult.get().stack();
if (INERTIA_MODULE.get().consumeClick() && AngelRingModules.getInertiaModifier(angelRingStack)) {
inertiaEnabled = !inertiaEnabled;
if (inertiaEnabled) {
player.displayClientMessage(Component.literal("Inertia Module: Enabled").withStyle(ChatFormatting.GREEN), true);
player.level().playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.NOTE_BLOCK_BELL.value(), SoundSource.PLAYERS, 0.4f, 0.01f);
} else {
player.displayClientMessage(Component.literal("Inertia Module: Disabled").withStyle(ChatFormatting.RED), true);
player.level().playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.NOTE_BLOCK_BELL.value(), SoundSource.PLAYERS, 0.4f, 0.09f);
}
if (slotResult.isPresent()) {
ItemStack angelRingStack = slotResult.get().stack();
Level level = player.level();
if (INERTIA_MODULE.get().consumeClick() && AngelRingModules.getInertiaModifier(angelRingStack)) {
inertiaEnabled = !inertiaEnabled;
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);
} else {
player.displayClientMessage(Component.literal("Inertia Module: Disabled").withStyle(ChatFormatting.RED), true);
level.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.NOTE_BLOCK_BELL.value(), SoundSource.PLAYERS, 0.4f, 0.09f);
}
if (SPEED_MODULE.get().consumeClick() && angelRingStack.has(DataComponentRegistry.SPEED_MODIFIER)) {
speedEnabled = !speedEnabled;
if (speedEnabled) {
player.displayClientMessage(Component.literal("Speed Module: Enabled").withStyle(ChatFormatting.GREEN), true);
player.level().playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.NOTE_BLOCK_BELL.value(), SoundSource.PLAYERS, 0.4f, 0.01f);
} else {
player.displayClientMessage(Component.literal("Speed Module: Disabled").withStyle(ChatFormatting.RED), true);
player.level().playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.NOTE_BLOCK_BELL.value(), SoundSource.PLAYERS, 0.4f, 0.09f);
}
}
if (SPEED_MODULE.get().consumeClick() && angelRingStack.has(DataComponentRegistry.SPEED_MODIFIER)) {
speedEnabled = !speedEnabled;
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);
} else {
player.displayClientMessage(Component.literal("Speed Module: Disabled").withStyle(ChatFormatting.RED), true);
level.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.NOTE_BLOCK_BELL.value(), SoundSource.PLAYERS, 0.4f, 0.09f);
}
}
}

}
}
5 changes: 2 additions & 3 deletions ...ing/render/AbstractAngelRingRenderer.java → ...r_angelring/render/AngelRingRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@

import static com.leclowndu93150.modular_angelring.render.AngelRingCheck.isEquipped;

public abstract class AbstractAngelRingRenderer extends RenderLayer<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>> {

public class AngelRingRenderer extends RenderLayer<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>> {
protected static final double FLAP_FREQUENCY = 0.5; // flaps per second
protected static final double MAX_ANGLE = 25.0; // Maximum flap angle

protected double angle; // Angle of rotation
private final double dir; //-1 or 1, depending on wing side

public AbstractAngelRingRenderer(RenderLayerParent<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>> playerModel, boolean isRightWing) {
public AngelRingRenderer(RenderLayerParent<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>> playerModel, boolean isRightWing) {
super(playerModel);
this.angle = 0.;
this.dir = isRightWing ? 1. : -1.;
Expand Down
15 changes: 0 additions & 15 deletions src/main/java/com/leclowndu93150/modular_angelring/render/AngelRingRendererLeft.java
View file

This file was deleted.

14 changes: 0 additions & 14 deletions src/main/java/com/leclowndu93150/modular_angelring/render/AngelRingRendererRight.java
View file

This file was deleted.

0 comments on commit e5653be

Please sign in to comment.