diff --git a/src/main/java/net/mcreator/superbwarfare/entity/projectile/ProjectileEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/projectile/ProjectileEntity.java index c8c3d5710..869ccaef3 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/projectile/ProjectileEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/projectile/ProjectileEntity.java @@ -355,7 +355,7 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa } } - this.onHitEntity(entity, entityHitResult.isHeadshot(), entityHitResult.isLegshot()); + this.onHitEntity(entity, entityHitResult.isHeadshot(), entityHitResult.isLegShot()); entity.invulnerableTime = 0; } } diff --git a/src/main/java/net/mcreator/superbwarfare/network/ModVariables.java b/src/main/java/net/mcreator/superbwarfare/network/ModVariables.java index 80aa92da8..d4e5c7903 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/ModVariables.java +++ b/src/main/java/net/mcreator/superbwarfare/network/ModVariables.java @@ -6,7 +6,6 @@ import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.Entity; @@ -185,7 +184,7 @@ public class ModVariables { @SubscribeEvent public static void onAttachCapabilities(AttachCapabilitiesEvent event) { if (event.getObject() instanceof Player && !(event.getObject() instanceof FakePlayer)) - event.addCapability(new ResourceLocation(ModUtils.MODID, "player_variables"), new PlayerVariablesProvider()); + event.addCapability(ModUtils.loc("player_variables"), new PlayerVariablesProvider()); } private final PlayerVariables playerVariables = new PlayerVariables(); diff --git a/src/main/java/net/mcreator/superbwarfare/tools/ExtendedEntityRayTraceResult.java b/src/main/java/net/mcreator/superbwarfare/tools/ExtendedEntityRayTraceResult.java index e2974a135..3324783c5 100644 --- a/src/main/java/net/mcreator/superbwarfare/tools/ExtendedEntityRayTraceResult.java +++ b/src/main/java/net/mcreator/superbwarfare/tools/ExtendedEntityRayTraceResult.java @@ -8,18 +8,19 @@ import net.minecraft.world.phys.EntityHitResult; */ public class ExtendedEntityRayTraceResult extends EntityHitResult { private final boolean headshot; - private final boolean legshot; + private final boolean legShot; public ExtendedEntityRayTraceResult(ProjectileEntity.EntityResult result) { super(result.getEntity(), result.getHitPos()); this.headshot = result.isHeadshot(); - this.legshot = result.isLegShot(); + this.legShot = result.isLegShot(); } public boolean isHeadshot() { return this.headshot; } - public boolean isLegshot() { - return this.legshot; + + public boolean isLegShot() { + return this.legShot; } } diff --git a/src/main/java/net/mcreator/superbwarfare/tools/ItemNBTTool.java b/src/main/java/net/mcreator/superbwarfare/tools/ItemNBTTool.java index 631d6cba5..8dc066d6c 100644 --- a/src/main/java/net/mcreator/superbwarfare/tools/ItemNBTTool.java +++ b/src/main/java/net/mcreator/superbwarfare/tools/ItemNBTTool.java @@ -2,7 +2,7 @@ package net.mcreator.superbwarfare.tools; import net.minecraft.world.item.ItemStack; -//from Botania +// From Botania public final class ItemNBTTool { public static boolean verifyExistence(ItemStack stack, String tag) { return !stack.isEmpty() && stack.getOrCreateTag().contains(tag); diff --git a/src/main/java/net/mcreator/superbwarfare/tools/RarityTool.java b/src/main/java/net/mcreator/superbwarfare/tools/RarityTool.java index 26d8f43fa..3fcde74b0 100644 --- a/src/main/java/net/mcreator/superbwarfare/tools/RarityTool.java +++ b/src/main/java/net/mcreator/superbwarfare/tools/RarityTool.java @@ -5,6 +5,6 @@ import net.minecraft.world.item.Rarity; public class RarityTool { - public static final Rarity LEGENDARY = Rarity.create("target_legendary", ChatFormatting.GOLD); + public static final Rarity LEGENDARY = Rarity.create("superbwarfare_legendary", ChatFormatting.GOLD); } diff --git a/src/main/java/net/mcreator/superbwarfare/tools/TraceTool.java b/src/main/java/net/mcreator/superbwarfare/tools/TraceTool.java index d752da8af..1ccce2569 100644 --- a/src/main/java/net/mcreator/superbwarfare/tools/TraceTool.java +++ b/src/main/java/net/mcreator/superbwarfare/tools/TraceTool.java @@ -7,6 +7,7 @@ import net.minecraft.world.entity.projectile.ProjectileUtil; import net.minecraft.world.phys.*; public class TraceTool { + public static Entity findLookingEntity(Entity player, double entityReach) { double distance = entityReach * entityReach; Vec3 eyePos = player.getEyePosition(1.0f);