diff --git a/src/main/java/net/mcreator/target/TargetMod.java b/src/main/java/net/mcreator/target/TargetMod.java index b0bafb395..bf1d0e677 100644 --- a/src/main/java/net/mcreator/target/TargetMod.java +++ b/src/main/java/net/mcreator/target/TargetMod.java @@ -34,7 +34,6 @@ public class TargetMod { TargetModBlocks.REGISTRY.register(bus); TargetModItems.register(bus); TargetModEntities.REGISTRY.register(bus); - TargetCustomModEntities.ENTITY_TYPES.register(bus); TargetModTabs.TABS.register(bus); TargetModMobEffects.REGISTRY.register(bus); TargetModParticleTypes.REGISTRY.register(bus); diff --git a/src/main/java/net/mcreator/target/entity/BocekArrowEntity.java b/src/main/java/net/mcreator/target/entity/BocekArrowEntity.java index cfb9784bb..a032453bc 100644 --- a/src/main/java/net/mcreator/target/entity/BocekArrowEntity.java +++ b/src/main/java/net/mcreator/target/entity/BocekArrowEntity.java @@ -6,11 +6,8 @@ import net.mcreator.target.init.TargetModDamageTypes; import net.mcreator.target.init.TargetModEntities; import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.network.TargetModVariables; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientGamePacketListener; -import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.util.Mth; @@ -133,8 +130,7 @@ public class BocekArrowEntity extends AbstractArrow implements ItemSupplier { capability.syncPlayerVariables(living); }); if (!living.level().isClientSide() && living.getServer() != null) { - living.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, living.position(), living.getRotationVector(), living.level() instanceof ServerLevel ? (ServerLevel) living.level() : null, 4, - living.getName().getString(), living.getDisplayName(), living.level().getServer(), living), "playsound target:headshot voice @a ~ ~ ~ 1 1"); + living.playSound(TargetModSounds.HEADSHOT.get()); } } } diff --git a/src/main/java/net/mcreator/target/entity/ProjectileEntity.java b/src/main/java/net/mcreator/target/entity/ProjectileEntity.java index f43eb6b4c..123c6496b 100644 --- a/src/main/java/net/mcreator/target/entity/ProjectileEntity.java +++ b/src/main/java/net/mcreator/target/entity/ProjectileEntity.java @@ -2,10 +2,7 @@ package net.mcreator.target.entity; import net.mcreator.target.headshot.BoundingBoxManager; import net.mcreator.target.headshot.IHeadshotBox; -import net.mcreator.target.init.TargetCustomModEntities; -import net.mcreator.target.init.TargetModDamageTypes; -import net.mcreator.target.init.TargetModParticleTypes; -import net.mcreator.target.init.TargetModSounds; +import net.mcreator.target.init.*; import net.mcreator.target.network.TargetModVariables; import net.mcreator.target.tools.ExtendedEntityRayTraceResult; import net.minecraft.core.BlockPos; @@ -58,7 +55,7 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa } public ProjectileEntity(Level level) { - super(TargetCustomModEntities.PROJECTILE.get(), level); + super(TargetModEntities.PROJECTILE.get(), level); } public ProjectileEntity shooter(LivingEntity shooter) { diff --git a/src/main/java/net/mcreator/target/init/TargetCustomModEntities.java b/src/main/java/net/mcreator/target/init/TargetCustomModEntities.java deleted file mode 100644 index 7141af7b3..000000000 --- a/src/main/java/net/mcreator/target/init/TargetCustomModEntities.java +++ /dev/null @@ -1,24 +0,0 @@ - -/* - * MCreator note: This file will be REGENERATED on each build. - */ -package net.mcreator.target.init; - -import net.mcreator.target.TargetMod; -import net.mcreator.target.entity.ProjectileEntity; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.MobCategory; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; - -@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) -public class TargetCustomModEntities { - public static final DeferredRegister> ENTITY_TYPES = DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, TargetMod.MODID); - - public static final RegistryObject> PROJECTILE = - ENTITY_TYPES.register("projectile", - () -> EntityType.Builder.of(ProjectileEntity::new, MobCategory.MISC).setTrackingRange(512).sized(0.5f, 0.5f).build("projectile")); - -} diff --git a/src/main/java/net/mcreator/target/init/TargetCustomModEntityRenderers.java b/src/main/java/net/mcreator/target/init/TargetCustomModEntityRenderers.java deleted file mode 100644 index 170e68961..000000000 --- a/src/main/java/net/mcreator/target/init/TargetCustomModEntityRenderers.java +++ /dev/null @@ -1,17 +0,0 @@ -package net.mcreator.target.init; - -import net.mcreator.target.client.renderer.entity.ProjectileRenderer; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.EntityRenderersEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) -public class TargetCustomModEntityRenderers { - @SubscribeEvent - public static void registerEntityRenderers(EntityRenderersEvent.RegisterRenderers event) { - - event.registerEntityRenderer(TargetCustomModEntities.PROJECTILE.get(), ProjectileRenderer::new); - - } -} diff --git a/src/main/java/net/mcreator/target/init/TargetModEntities.java b/src/main/java/net/mcreator/target/init/TargetModEntities.java index 694f6e938..4e2aac2b7 100644 --- a/src/main/java/net/mcreator/target/init/TargetModEntities.java +++ b/src/main/java/net/mcreator/target/init/TargetModEntities.java @@ -1,7 +1,3 @@ - -/* - * MCreator note: This file will be REGENERATED on each build. - */ package net.mcreator.target.init; import net.mcreator.target.TargetMod; @@ -20,6 +16,7 @@ import net.minecraftforge.registries.RegistryObject; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) public class TargetModEntities { public static final DeferredRegister> REGISTRY = DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, TargetMod.MODID); + public static final RegistryObject> TARGET_1 = register("target_1", EntityType.Builder.of(Target1Entity::new, MobCategory.CREATURE).setShouldReceiveVelocityUpdates(true).setTrackingRange(256).setUpdateInterval(3).setCustomClientFactory(Target1Entity::new).fireImmune().sized(0.875f, 2f)); public static final RegistryObject> MORTAR = register("mortar", @@ -42,6 +39,8 @@ public class TargetModEntities { EntityType.Builder.of(MortarShellEntity::new, MobCategory.MISC).setCustomClientFactory(MortarShellEntity::new).setShouldReceiveVelocityUpdates(true).setTrackingRange(64).setUpdateInterval(1).sized(0.5f, 0.5f)); public static final RegistryObject> BOCEK_ARROW = register("projectile_bocekarrow", EntityType.Builder.of(BocekArrowEntity::new, MobCategory.MISC).setCustomClientFactory(BocekArrowEntity::new).setShouldReceiveVelocityUpdates(true).setTrackingRange(64).setUpdateInterval(1).sized(0.5f, 0.5f)); + public static final RegistryObject> PROJECTILE = register("projectile", + EntityType.Builder.of(ProjectileEntity::new, MobCategory.MISC).setTrackingRange(512).sized(0.5f, 0.5f)); private static RegistryObject> register(String registryname, EntityType.Builder entityTypeBuilder) { diff --git a/src/main/java/net/mcreator/target/init/TargetModEntityRenderers.java b/src/main/java/net/mcreator/target/init/TargetModEntityRenderers.java index 4316a5e0c..4c4a05f66 100644 --- a/src/main/java/net/mcreator/target/init/TargetModEntityRenderers.java +++ b/src/main/java/net/mcreator/target/init/TargetModEntityRenderers.java @@ -20,5 +20,6 @@ public class TargetModEntityRenderers { event.registerEntityRenderer(TargetModEntities.RPG_ROCKET.get(), RpgRocketRenderer::new); event.registerEntityRenderer(TargetModEntities.MORTAR_SHELL.get(), MortarShellRenderer::new); event.registerEntityRenderer(TargetModEntities.BOCEK_ARROW.get(), BocekarrowRenderer::new); + event.registerEntityRenderer(TargetModEntities.PROJECTILE.get(), ProjectileRenderer::new); } }