From c9bb556028b9f024316b1a6600d64515d786ea59 Mon Sep 17 00:00:00 2001 From: KeyLime17 Date: Thu, 26 Sep 2024 19:29:17 -0400 Subject: [PATCH] Blocking Change --- .../com/zivilon/cinder_loe/CinderEventHandler.java | 11 ----------- .../{lotr => cinder_loe}/sounds/boss/battle.ogg | Bin .../{lotr => cinder_loe}/sounds/boss/combat.ogg | Bin .../{lotr => cinder_loe}/sounds/boss/spiders.ogg | Bin .../{lotr => cinder_loe}/sounds/boss/victory.ogg | Bin 5 files changed, 11 deletions(-) rename src/main/resources/assets/{lotr => cinder_loe}/sounds/boss/battle.ogg (100%) rename src/main/resources/assets/{lotr => cinder_loe}/sounds/boss/combat.ogg (100%) rename src/main/resources/assets/{lotr => cinder_loe}/sounds/boss/spiders.ogg (100%) rename src/main/resources/assets/{lotr => cinder_loe}/sounds/boss/victory.ogg (100%) diff --git a/src/main/java/com/zivilon/cinder_loe/CinderEventHandler.java b/src/main/java/com/zivilon/cinder_loe/CinderEventHandler.java index 7485645..59ea466 100644 --- a/src/main/java/com/zivilon/cinder_loe/CinderEventHandler.java +++ b/src/main/java/com/zivilon/cinder_loe/CinderEventHandler.java @@ -96,9 +96,6 @@ public class CinderEventHandler implements IFuelHandler { EntityPlayerMP player = (EntityPlayerMP) event.entity; ItemStack sword = player.getHeldItem(); - player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Player Yaw " + player.getRotationYawHead())); - player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Attacker Yaw " + attacker.getRotationYawHead())); - float playerYaw = player.getRotationYawHead(); float attackerYaw = attacker.getRotationYawHead(); @@ -108,16 +105,10 @@ public class CinderEventHandler implements IFuelHandler { // Calculate the angle difference float angleDifference = Math.abs(playerYaw - attackerYaw); - player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Player Yaw " + playerYaw)); - player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Attacker Yaw " + attackerYaw)); - player.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + "Angle Difference " + angleDifference)); - if (angleDifference > 180) { angleDifference = 360 - angleDifference; } - - player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "DEBUG: Initial Damage: " + event.ammount)); ItemStack weapon = attacker.getHeldItem(); if (weapon != null) { if (player.isBlocking() && angleDifference >= 135 && angleDifference <=225) { @@ -147,8 +138,6 @@ public class CinderEventHandler implements IFuelHandler { event.ammount = player.getHealth(); // Ensure player dies if health reaches 0 or below } - player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "DEBUG: Total Additional Damage: " + newDamage)); - } } } diff --git a/src/main/resources/assets/lotr/sounds/boss/battle.ogg b/src/main/resources/assets/cinder_loe/sounds/boss/battle.ogg similarity index 100% rename from src/main/resources/assets/lotr/sounds/boss/battle.ogg rename to src/main/resources/assets/cinder_loe/sounds/boss/battle.ogg diff --git a/src/main/resources/assets/lotr/sounds/boss/combat.ogg b/src/main/resources/assets/cinder_loe/sounds/boss/combat.ogg similarity index 100% rename from src/main/resources/assets/lotr/sounds/boss/combat.ogg rename to src/main/resources/assets/cinder_loe/sounds/boss/combat.ogg diff --git a/src/main/resources/assets/lotr/sounds/boss/spiders.ogg b/src/main/resources/assets/cinder_loe/sounds/boss/spiders.ogg similarity index 100% rename from src/main/resources/assets/lotr/sounds/boss/spiders.ogg rename to src/main/resources/assets/cinder_loe/sounds/boss/spiders.ogg diff --git a/src/main/resources/assets/lotr/sounds/boss/victory.ogg b/src/main/resources/assets/cinder_loe/sounds/boss/victory.ogg similarity index 100% rename from src/main/resources/assets/lotr/sounds/boss/victory.ogg rename to src/main/resources/assets/cinder_loe/sounds/boss/victory.ogg