修改材质位置和部分实体类

src/main/java/net/mcreator/target/client/renderer/entity/BocekArrowRenderer.java

@@ -13,13 +13,13 @@ import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 
-public class BocekarrowRenderer extends EntityRenderer<BocekArrowEntity> {
+public class BocekArrowRenderer extends EntityRenderer<BocekArrowEntity> {
-    private static final ResourceLocation texture = new ResourceLocation("target:textures/entities/bocekarrow.png");
+    private static final ResourceLocation texture = new ResourceLocation("target:textures/entity/bocek_arrow.png");
-    private final ModelBocekArrow model;
+    private final ModelBocekArrow<BocekArrowEntity> model;
 
-    public BocekarrowRenderer(EntityRendererProvider.Context context) {
+    public BocekArrowRenderer(EntityRendererProvider.Context context) {
         super(context);
-        model = new ModelBocekArrow(context.bakeLayer(ModelBocekArrow.LAYER_LOCATION));
+        model = new ModelBocekArrow<>(context.bakeLayer(ModelBocekArrow.LAYER_LOCATION));
     }
 
     @Override

src/main/java/net/mcreator/target/client/renderer/entity/GunGrenadeRenderer.java

@@ -14,12 +14,12 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 
 public class GunGrenadeRenderer extends EntityRenderer<GunGrenadeEntity> {
-    private static final ResourceLocation texture = new ResourceLocation("target:textures/entities/grenade.png");
+    private static final ResourceLocation texture = new ResourceLocation("target:textures/entity/grenade.png");
-    private final ModelGrenade model;
+    private final ModelGrenade<GunGrenadeEntity> model;
 
     public GunGrenadeRenderer(EntityRendererProvider.Context context) {
         super(context);
-        model = new ModelGrenade(context.bakeLayer(ModelGrenade.LAYER_LOCATION));
+        model = new ModelGrenade<>(context.bakeLayer(ModelGrenade.LAYER_LOCATION));
     }
 
     @Override

src/main/java/net/mcreator/target/client/renderer/entity/MortarShellRenderer.java

@@ -14,12 +14,12 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 
 public class MortarShellRenderer extends EntityRenderer<MortarShellEntity> {
-    private static final ResourceLocation texture = new ResourceLocation("target:textures/entities/mortar_shell.png");
+    private static final ResourceLocation texture = new ResourceLocation("target:textures/entity/mortar_shell.png");
-    private final ModelMortarShell model;
+    private final ModelMortarShell<MortarShellEntity> model;
 
     public MortarShellRenderer(EntityRendererProvider.Context context) {
         super(context);
-        model = new ModelMortarShell(context.bakeLayer(ModelMortarShell.LAYER_LOCATION));
+        model = new ModelMortarShell<>(context.bakeLayer(ModelMortarShell.LAYER_LOCATION));
     }
 
     @Override

src/main/java/net/mcreator/target/client/renderer/entity/ProjectileRenderer.java

@@ -15,12 +15,12 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 
 public class ProjectileRenderer extends EntityRenderer<ProjectileEntity> {
-    private static final ResourceLocation texture = new ResourceLocation("target:textures/entities/bullet_tex.png");
+    private static final ResourceLocation texture = new ResourceLocation("target:textures/entity/bullet_tex.png");
-    private final ModelBullet model;
+    private final ModelBullet<ProjectileEntity> model;
 
     public ProjectileRenderer(EntityRendererProvider.Context context) {
         super(context);
-        model = new ModelBullet(context.bakeLayer(ModelBullet.LAYER_LOCATION));
+        model = new ModelBullet<>(context.bakeLayer(ModelBullet.LAYER_LOCATION));
     }
 
     protected int getBlockLightLevel(ProjectileEntity pEntity, BlockPos pPos) {

src/main/java/net/mcreator/target/client/renderer/entity/RpgRocketRenderer.java

@@ -14,12 +14,12 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 
 public class RpgRocketRenderer extends EntityRenderer<RpgRocketEntity> {
-    private static final ResourceLocation texture = new ResourceLocation("target:textures/entities/rocket.png");
+    private static final ResourceLocation texture = new ResourceLocation("target:textures/entity/rocket.png");
-    private final ModelRPGRocket model;
+    private final ModelRPGRocket<RpgRocketEntity> model;
 
     public RpgRocketRenderer(EntityRendererProvider.Context context) {
         super(context);
-        model = new ModelRPGRocket(context.bakeLayer(ModelRPGRocket.LAYER_LOCATION));
+        model = new ModelRPGRocket<>(context.bakeLayer(ModelRPGRocket.LAYER_LOCATION));
     }
 
     @Override

src/main/java/net/mcreator/target/client/renderer/entity/TaserBulletProjectileRenderer.java

@@ -14,12 +14,12 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Mth;
 
 public class TaserBulletProjectileRenderer extends EntityRenderer<TaserBulletProjectileEntity> {
-    private static final ResourceLocation texture = new ResourceLocation("target:textures/entities/taser_rod.png");
+    private static final ResourceLocation texture = new ResourceLocation("target:textures/entity/taser_rod.png");
-    private final ModelTaserRod model;
+    private final ModelTaserRod<TaserBulletProjectileEntity> model;
 
     public TaserBulletProjectileRenderer(EntityRendererProvider.Context context) {
         super(context);
-        model = new ModelTaserRod(context.bakeLayer(ModelTaserRod.LAYER_LOCATION));
+        model = new ModelTaserRod<>(context.bakeLayer(ModelTaserRod.LAYER_LOCATION));
     }
 
     @Override

src/main/java/net/mcreator/target/client/screens/M79UIOverlay.java

@@ -16,7 +16,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 
 @Mod.EventBusSubscriber({Dist.CLIENT})
-public class M79uiOverlay {
+public class M79UIOverlay {
     @SubscribeEvent(priority = EventPriority.NORMAL)
     public static void eventHandler(RenderGuiEvent.Pre event) {
         int w = event.getWindow().getGuiScaledWidth();

src/main/java/net/mcreator/target/entity/ClaymoreEntity.java

@@ -56,11 +56,8 @@ import java.util.Comparator;
 public class ClaymoreEntity extends TamableAnimal implements GeoEntity, AnimatedEntity {
     public static final EntityDataAccessor<Boolean> SHOOT = SynchedEntityData.defineId(ClaymoreEntity.class, EntityDataSerializers.BOOLEAN);
     public static final EntityDataAccessor<String> ANIMATION = SynchedEntityData.defineId(ClaymoreEntity.class, EntityDataSerializers.STRING);
-    public static final EntityDataAccessor<String> TEXTURE = SynchedEntityData.defineId(ClaymoreEntity.class, EntityDataSerializers.STRING);
     private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
-    private boolean swinging;
+
-    private boolean lastloop;
-    private long lastSwing;
     public String animationProcedure = "empty";
 
     public ClaymoreEntity(PlayMessages.SpawnEntity packet, Level world) {
@@ -79,15 +76,6 @@ public class ClaymoreEntity extends TamableAnimal implements GeoEntity, Animated
         super.defineSynchedData();
         this.entityData.define(SHOOT, false);
         this.entityData.define(ANIMATION, "undefined");
-        this.entityData.define(TEXTURE, "claymore");
-    }
-
-    public void setTexture(String texture) {
-        this.entityData.set(TEXTURE, texture);
-    }
-
-    public String getTexture() {
-        return this.entityData.get(TEXTURE);
     }
 
     @Override
@@ -108,7 +96,7 @@ public class ClaymoreEntity extends TamableAnimal implements GeoEntity, Animated
 
     @Override
     public boolean removeWhenFarAway(double distanceToClosestPlayer) {
-        return false;
+        return super.removeWhenFarAway(distanceToClosestPlayer);
     }
 
     @Override
@@ -153,14 +141,11 @@ public class ClaymoreEntity extends TamableAnimal implements GeoEntity, Animated
     @Override
     public void addAdditionalSaveData(CompoundTag compound) {
         super.addAdditionalSaveData(compound);
-        compound.putString("Texture", this.getTexture());
     }
 
     @Override
     public void readAdditionalSaveData(CompoundTag compound) {
         super.readAdditionalSaveData(compound);
-        if (compound.contains("Texture"))
-            this.setTexture(compound.getString("Texture"));
     }
 
     @Override
@@ -396,7 +381,8 @@ public class ClaymoreEntity extends TamableAnimal implements GeoEntity, Animated
 
         if (entity instanceof ClaymoreEntity tamEnt && tamEnt.getOwner() == sourceentity) {
             if (tamEnt.getOwner() instanceof Player player && player.isCreative()) {
-                if (entity instanceof ClaymoreEntity claymore && damagesource.is(ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation("target:deleted_mod_element")))) {
+                ClaymoreEntity claymore = (ClaymoreEntity) entity;
+                if (damagesource.is(ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation("target:deleted_mod_element")))) {
                     entity.setYRot(sourceentity.getYRot());
                     entity.setXRot(entity.getXRot());
                     entity.setYBodyRot(entity.getYRot());

src/main/java/net/mcreator/target/entity/MortarEntity.java

@@ -57,11 +57,7 @@ import javax.annotation.Nullable;
 public class MortarEntity extends PathfinderMob implements GeoEntity, AnimatedEntity {
     public static final EntityDataAccessor<Boolean> SHOOT = SynchedEntityData.defineId(MortarEntity.class, EntityDataSerializers.BOOLEAN);
     public static final EntityDataAccessor<String> ANIMATION = SynchedEntityData.defineId(MortarEntity.class, EntityDataSerializers.STRING);
-    public static final EntityDataAccessor<String> TEXTURE = SynchedEntityData.defineId(MortarEntity.class, EntityDataSerializers.STRING);
     private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
-    private boolean swinging;
-    private boolean lastloop;
-    private long lastSwing;
     public String animationProcedure = "empty";
 
     public MortarEntity(PlayMessages.SpawnEntity packet, Level world) {
@@ -80,15 +76,6 @@ public class MortarEntity extends PathfinderMob implements GeoEntity, AnimatedEn
         super.defineSynchedData();
         this.entityData.define(SHOOT, false);
         this.entityData.define(ANIMATION, "undefined");
-        this.entityData.define(TEXTURE, "mortar");
-    }
-
-    public void setTexture(String texture) {
-        this.entityData.set(TEXTURE, texture);
-    }
-
-    public String getTexture() {
-        return this.entityData.get(TEXTURE);
     }
 
     @Override
@@ -163,14 +150,11 @@ public class MortarEntity extends PathfinderMob implements GeoEntity, AnimatedEn
     @Override
     public void addAdditionalSaveData(CompoundTag compound) {
         super.addAdditionalSaveData(compound);
-        compound.putString("Texture", this.getTexture());
     }
 
     @Override
     public void readAdditionalSaveData(CompoundTag compound) {
         super.readAdditionalSaveData(compound);
-        if (compound.contains("Texture"))
-            this.setTexture(compound.getString("Texture"));
     }
 
     @Override

src/main/java/net/mcreator/target/entity/SenpaiEntity.java

@@ -1,6 +1,7 @@
 package net.mcreator.target.entity;
 
 import net.mcreator.target.init.TargetModEntities;
+import net.mcreator.target.init.TargetModSounds;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.protocol.Packet;
@@ -49,11 +50,8 @@ import java.util.Comparator;
 public class SenpaiEntity extends Spider implements GeoEntity, AnimatedEntity {
     public static final EntityDataAccessor<Boolean> SHOOT = SynchedEntityData.defineId(SenpaiEntity.class, EntityDataSerializers.BOOLEAN);
     public static final EntityDataAccessor<String> ANIMATION = SynchedEntityData.defineId(SenpaiEntity.class, EntityDataSerializers.STRING);
-    public static final EntityDataAccessor<String> TEXTURE = SynchedEntityData.defineId(SenpaiEntity.class, EntityDataSerializers.STRING);
     private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
-    private boolean swinging;
+
-    private boolean lastloop;
-    private long lastSwing;
     public String animationProcedure = "empty";
 
     public SenpaiEntity(PlayMessages.SpawnEntity packet, Level world) {
@@ -71,15 +69,6 @@ public class SenpaiEntity extends Spider implements GeoEntity, AnimatedEntity {
         super.defineSynchedData();
         this.entityData.define(SHOOT, false);
         this.entityData.define(ANIMATION, "undefined");
-        this.entityData.define(TEXTURE, "senpai");
-    }
-
-    public void setTexture(String texture) {
-        this.entityData.set(TEXTURE, texture);
-    }
-
-    public String getTexture() {
-        return this.entityData.get(TEXTURE);
     }
 
     @Override
@@ -100,7 +89,7 @@ public class SenpaiEntity extends Spider implements GeoEntity, AnimatedEntity {
         this.goalSelector.addGoal(3, new RandomLookAroundGoal(this));
         this.goalSelector.addGoal(4, new FloatGoal(this));
         this.goalSelector.addGoal(5, new RandomStrollGoal(this, 0.8));
-        this.targetSelector.addGoal(6, new NearestAttackableTargetGoal(this, Player.class, false, false));
+        this.targetSelector.addGoal(6, new NearestAttackableTargetGoal<>(this, Player.class, false, false));
     }
 
     @Override
@@ -120,7 +109,7 @@ public class SenpaiEntity extends Spider implements GeoEntity, AnimatedEntity {
 
     @Override
     public void playStepSound(BlockPos pos, BlockState blockIn) {
-        this.playSound(ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation("target:step")), 0.15f, 1);
+        this.playSound(TargetModSounds.STEP.get(), 0.15f, 1);
     }
 
     @Override
@@ -136,14 +125,11 @@ public class SenpaiEntity extends Spider implements GeoEntity, AnimatedEntity {
     @Override
     public void addAdditionalSaveData(CompoundTag compound) {
         super.addAdditionalSaveData(compound);
-        compound.putString("Texture", this.getTexture());
     }
 
     @Override
     public void readAdditionalSaveData(CompoundTag compound) {
         super.readAdditionalSaveData(compound);
-        if (compound.contains("Texture"))
-            this.setTexture(compound.getString("Texture"));
     }
 
     @Override

src/main/java/net/mcreator/target/entity/Target1Entity.java

@@ -53,7 +53,6 @@ import java.text.DecimalFormat;
 public class Target1Entity extends PathfinderMob implements GeoEntity, AnimatedEntity {
     public static final EntityDataAccessor<Boolean> SHOOT = SynchedEntityData.defineId(Target1Entity.class, EntityDataSerializers.BOOLEAN);
     public static final EntityDataAccessor<String> ANIMATION = SynchedEntityData.defineId(Target1Entity.class, EntityDataSerializers.STRING);
-    public static final EntityDataAccessor<String> TEXTURE = SynchedEntityData.defineId(Target1Entity.class, EntityDataSerializers.STRING);
     private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
 
     public String animationProcedure = "empty";
@@ -75,15 +74,6 @@ public class Target1Entity extends PathfinderMob implements GeoEntity, AnimatedE
         super.defineSynchedData();
         this.entityData.define(SHOOT, false);
         this.entityData.define(ANIMATION, "undefined");
-        this.entityData.define(TEXTURE, "target");
-    }
-
-    public void setTexture(String texture) {
-        this.entityData.set(TEXTURE, texture);
-    }
-
-    public String getTexture() {
-        return this.entityData.get(TEXTURE);
     }
 
     @Override
@@ -159,14 +149,11 @@ public class Target1Entity extends PathfinderMob implements GeoEntity, AnimatedE
     @Override
     public void addAdditionalSaveData(CompoundTag compound) {
         super.addAdditionalSaveData(compound);
-        compound.putString("Texture", this.getTexture());
     }
 
     @Override
     public void readAdditionalSaveData(CompoundTag compound) {
         super.readAdditionalSaveData(compound);
-        if (compound.contains("Texture"))
-            this.setTexture(compound.getString("Texture"));
     }
 
     @SubscribeEvent

src/main/java/net/mcreator/target/entity/TargetEntity.java

@@ -36,11 +36,7 @@ import software.bernie.geckolib.util.GeckoLibUtil;
 public class TargetEntity extends PathfinderMob implements GeoEntity, AnimatedEntity {
     public static final EntityDataAccessor<Boolean> SHOOT = SynchedEntityData.defineId(TargetEntity.class, EntityDataSerializers.BOOLEAN);
     public static final EntityDataAccessor<String> ANIMATION = SynchedEntityData.defineId(TargetEntity.class, EntityDataSerializers.STRING);
-    public static final EntityDataAccessor<String> TEXTURE = SynchedEntityData.defineId(TargetEntity.class, EntityDataSerializers.STRING);
     private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
-    private boolean swinging;
-    private boolean lastloop;
-    private long lastSwing;
     public String animationProcedure = "empty";
 
     public TargetEntity(PlayMessages.SpawnEntity packet, Level world) {
@@ -60,15 +56,6 @@ public class TargetEntity extends PathfinderMob implements GeoEntity, AnimatedEn
         super.defineSynchedData();
         this.entityData.define(SHOOT, false);
         this.entityData.define(ANIMATION, "undefined");
-        this.entityData.define(TEXTURE, "target");
-    }
-
-    public void setTexture(String texture) {
-        this.entityData.set(TEXTURE, texture);
-    }
-
-    public String getTexture() {
-        return this.entityData.get(TEXTURE);
     }
 
     @Override
@@ -136,14 +123,11 @@ public class TargetEntity extends PathfinderMob implements GeoEntity, AnimatedEn
     @Override
     public void addAdditionalSaveData(CompoundTag compound) {
         super.addAdditionalSaveData(compound);
-        compound.putString("Texture", this.getTexture());
     }
 
     @Override
     public void readAdditionalSaveData(CompoundTag compound) {
         super.readAdditionalSaveData(compound);
-        if (compound.contains("Texture"))
-            this.setTexture(compound.getString("Texture"));
     }
 
     @Override

src/main/java/net/mcreator/target/entity/model/ClaymoreModel.java

@@ -17,7 +17,7 @@ public class ClaymoreModel extends GeoModel<ClaymoreEntity> {
 
     @Override
     public ResourceLocation getTextureResource(ClaymoreEntity entity) {
-        return new ResourceLocation("target", "textures/entities/" + entity.getTexture() + ".png");
+        return new ResourceLocation("target", "textures/entity/claymore.png");
     }
 
 }

src/main/java/net/mcreator/target/entity/model/MortarModel.java

@@ -22,7 +22,7 @@ public class MortarModel extends GeoModel<MortarEntity> {
 
     @Override
     public ResourceLocation getTextureResource(MortarEntity entity) {
-        return new ResourceLocation("target", "textures/entities/" + entity.getTexture() + ".png");
+        return new ResourceLocation("target", "textures/entity/mortar.png");
     }
 
     @Override

src/main/java/net/mcreator/target/entity/model/SenpaiModel.java

@@ -22,7 +22,7 @@ public class SenpaiModel extends GeoModel<SenpaiEntity> {
 
     @Override
     public ResourceLocation getTextureResource(SenpaiEntity entity) {
-        return new ResourceLocation("target", "textures/entities/" + entity.getTexture() + ".png");
+        return new ResourceLocation("target", "textures/entity/senpai.png");
     }
 
     @Override

src/main/java/net/mcreator/target/entity/model/Target1Model.java

@@ -22,7 +22,7 @@ public class Target1Model extends GeoModel<Target1Entity> {
 
     @Override
     public ResourceLocation getTextureResource(Target1Entity entity) {
-        return new ResourceLocation("target", "textures/entities/" + entity.getTexture() + ".png");
+        return new ResourceLocation("target", "textures/entity/target.png");
     }
 
     @Override

src/main/java/net/mcreator/target/entity/model/TargetModel.java

@@ -17,7 +17,7 @@ public class TargetModel extends GeoModel<TargetEntity> {
 
     @Override
     public ResourceLocation getTextureResource(TargetEntity entity) {
-        return new ResourceLocation("target", "textures/entities/" + entity.getTexture() + ".png");
+        return new ResourceLocation("target", "textures/entity/target.png");
     }
 
 }

src/main/java/net/mcreator/target/init/TargetModEntityRenderers.java

@@ -19,7 +19,7 @@ public class TargetModEntityRenderers {
         event.registerEntityRenderer(TargetModEntities.TARGET.get(), TargetRenderer::new);
         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.BOCEK_ARROW.get(), BocekArrowRenderer::new);
         event.registerEntityRenderer(TargetModEntities.PROJECTILE.get(), ProjectileRenderer::new);
     }
 }