From 81ef33e2479548de34ada36bc45f566950501782 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Sun, 19 May 2024 19:27:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=90=E8=B4=A8=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E5=92=8C=E9=83=A8=E5=88=86=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...wRenderer.java => BocekArrowRenderer.java} | 10 ++++---- .../renderer/entity/GunGrenadeRenderer.java | 6 ++--- .../renderer/entity/MortarShellRenderer.java | 6 ++--- .../renderer/entity/ProjectileRenderer.java | 6 ++--- .../renderer/entity/RpgRocketRenderer.java | 6 ++--- .../entity/TaserBulletProjectileRenderer.java | 6 ++--- .../{M79uiOverlay.java => M79UIOverlay.java} | 2 +- .../target/entity/ClaymoreEntity.java | 22 ++++-------------- .../mcreator/target/entity/MortarEntity.java | 16 ------------- .../mcreator/target/entity/SenpaiEntity.java | 22 ++++-------------- .../mcreator/target/entity/Target1Entity.java | 13 ----------- .../mcreator/target/entity/TargetEntity.java | 16 ------------- .../target/entity/model/ClaymoreModel.java | 2 +- .../target/entity/model/MortarModel.java | 2 +- .../target/entity/model/SenpaiModel.java | 2 +- .../target/entity/model/Target1Model.java | 2 +- .../target/entity/model/TargetModel.java | 2 +- .../target/init/TargetModEntityRenderers.java | 2 +- .../bocekarrow.png => entity/bocek_arrow.png} | Bin .../textures/{entities => entity}/bullet.png | Bin .../{entities => entity}/bullet_e.png | Bin .../{entities => entity}/bullet_tex.png | Bin .../{entities => entity}/claymore.png | Bin .../textures/{entities => entity}/grenade.png | Bin .../textures/{entities => entity}/mortar.png | Bin .../{entities => entity}/mortar_shell.png | Bin .../textures/{entities => entity}/pad.png | Bin .../textures/{entities => entity}/rocket.png | Bin .../textures/{entities => entity}/senpai.png | Bin .../textures/{entities => entity}/target.png | Bin .../{entities => entity}/target_e.png | Bin .../{entities => entity}/taser_rod.png | Bin .../textures/{entities => entity}/trail.png | Bin 33 files changed, 35 insertions(+), 108 deletions(-) rename src/main/java/net/mcreator/target/client/renderer/entity/{BocekarrowRenderer.java => BocekArrowRenderer.java} (83%) rename src/main/java/net/mcreator/target/client/screens/{M79uiOverlay.java => M79UIOverlay.java} (98%) rename src/main/resources/assets/target/textures/{entities/bocekarrow.png => entity/bocek_arrow.png} (100%) rename src/main/resources/assets/target/textures/{entities => entity}/bullet.png (100%) rename src/main/resources/assets/target/textures/{entities => entity}/bullet_e.png (100%) rename src/main/resources/assets/target/textures/{entities => entity}/bullet_tex.png (100%) rename src/main/resources/assets/target/textures/{entities => entity}/claymore.png (100%) rename src/main/resources/assets/target/textures/{entities => entity}/grenade.png (100%) rename src/main/resources/assets/target/textures/{entities => entity}/mortar.png (100%) rename src/main/resources/assets/target/textures/{entities => entity}/mortar_shell.png (100%) rename src/main/resources/assets/target/textures/{entities => entity}/pad.png (100%) rename src/main/resources/assets/target/textures/{entities => entity}/rocket.png (100%) rename src/main/resources/assets/target/textures/{entities => entity}/senpai.png (100%) rename src/main/resources/assets/target/textures/{entities => entity}/target.png (100%) rename src/main/resources/assets/target/textures/{entities => entity}/target_e.png (100%) rename src/main/resources/assets/target/textures/{entities => entity}/taser_rod.png (100%) rename src/main/resources/assets/target/textures/{entities => entity}/trail.png (100%) diff --git a/src/main/java/net/mcreator/target/client/renderer/entity/BocekarrowRenderer.java b/src/main/java/net/mcreator/target/client/renderer/entity/BocekArrowRenderer.java similarity index 83% rename from src/main/java/net/mcreator/target/client/renderer/entity/BocekarrowRenderer.java rename to src/main/java/net/mcreator/target/client/renderer/entity/BocekArrowRenderer.java index 09b23a685..f7701018b 100644 --- a/src/main/java/net/mcreator/target/client/renderer/entity/BocekarrowRenderer.java +++ b/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 { - private static final ResourceLocation texture = new ResourceLocation("target:textures/entities/bocekarrow.png"); - private final ModelBocekArrow model; +public class BocekArrowRenderer extends EntityRenderer { + private static final ResourceLocation texture = new ResourceLocation("target:textures/entity/bocek_arrow.png"); + private final ModelBocekArrow 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 diff --git a/src/main/java/net/mcreator/target/client/renderer/entity/GunGrenadeRenderer.java b/src/main/java/net/mcreator/target/client/renderer/entity/GunGrenadeRenderer.java index 92e6bc5ed..c0df500c7 100644 --- a/src/main/java/net/mcreator/target/client/renderer/entity/GunGrenadeRenderer.java +++ b/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 { - private static final ResourceLocation texture = new ResourceLocation("target:textures/entities/grenade.png"); - private final ModelGrenade model; + private static final ResourceLocation texture = new ResourceLocation("target:textures/entity/grenade.png"); + private final ModelGrenade 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 diff --git a/src/main/java/net/mcreator/target/client/renderer/entity/MortarShellRenderer.java b/src/main/java/net/mcreator/target/client/renderer/entity/MortarShellRenderer.java index c8431f53b..2d088029a 100644 --- a/src/main/java/net/mcreator/target/client/renderer/entity/MortarShellRenderer.java +++ b/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 { - private static final ResourceLocation texture = new ResourceLocation("target:textures/entities/mortar_shell.png"); - private final ModelMortarShell model; + private static final ResourceLocation texture = new ResourceLocation("target:textures/entity/mortar_shell.png"); + private final ModelMortarShell 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 diff --git a/src/main/java/net/mcreator/target/client/renderer/entity/ProjectileRenderer.java b/src/main/java/net/mcreator/target/client/renderer/entity/ProjectileRenderer.java index dbc72ba32..7e593ab1a 100644 --- a/src/main/java/net/mcreator/target/client/renderer/entity/ProjectileRenderer.java +++ b/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 { - private static final ResourceLocation texture = new ResourceLocation("target:textures/entities/bullet_tex.png"); - private final ModelBullet model; + private static final ResourceLocation texture = new ResourceLocation("target:textures/entity/bullet_tex.png"); + private final ModelBullet 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) { diff --git a/src/main/java/net/mcreator/target/client/renderer/entity/RpgRocketRenderer.java b/src/main/java/net/mcreator/target/client/renderer/entity/RpgRocketRenderer.java index 21f625f39..8c49b7347 100644 --- a/src/main/java/net/mcreator/target/client/renderer/entity/RpgRocketRenderer.java +++ b/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 { - private static final ResourceLocation texture = new ResourceLocation("target:textures/entities/rocket.png"); - private final ModelRPGRocket model; + private static final ResourceLocation texture = new ResourceLocation("target:textures/entity/rocket.png"); + private final ModelRPGRocket 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 diff --git a/src/main/java/net/mcreator/target/client/renderer/entity/TaserBulletProjectileRenderer.java b/src/main/java/net/mcreator/target/client/renderer/entity/TaserBulletProjectileRenderer.java index a8c480a6f..8a7b47b6b 100644 --- a/src/main/java/net/mcreator/target/client/renderer/entity/TaserBulletProjectileRenderer.java +++ b/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 { - private static final ResourceLocation texture = new ResourceLocation("target:textures/entities/taser_rod.png"); - private final ModelTaserRod model; + private static final ResourceLocation texture = new ResourceLocation("target:textures/entity/taser_rod.png"); + private final ModelTaserRod 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 diff --git a/src/main/java/net/mcreator/target/client/screens/M79uiOverlay.java b/src/main/java/net/mcreator/target/client/screens/M79UIOverlay.java similarity index 98% rename from src/main/java/net/mcreator/target/client/screens/M79uiOverlay.java rename to src/main/java/net/mcreator/target/client/screens/M79UIOverlay.java index 195bcc1f4..72266fa11 100644 --- a/src/main/java/net/mcreator/target/client/screens/M79uiOverlay.java +++ b/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(); diff --git a/src/main/java/net/mcreator/target/entity/ClaymoreEntity.java b/src/main/java/net/mcreator/target/entity/ClaymoreEntity.java index a3fb49267..0839a743a 100644 --- a/src/main/java/net/mcreator/target/entity/ClaymoreEntity.java +++ b/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 SHOOT = SynchedEntityData.defineId(ClaymoreEntity.class, EntityDataSerializers.BOOLEAN); public static final EntityDataAccessor ANIMATION = SynchedEntityData.defineId(ClaymoreEntity.class, EntityDataSerializers.STRING); - public static final EntityDataAccessor 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()); diff --git a/src/main/java/net/mcreator/target/entity/MortarEntity.java b/src/main/java/net/mcreator/target/entity/MortarEntity.java index bb78b2e6e..fb0e8519f 100644 --- a/src/main/java/net/mcreator/target/entity/MortarEntity.java +++ b/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 SHOOT = SynchedEntityData.defineId(MortarEntity.class, EntityDataSerializers.BOOLEAN); public static final EntityDataAccessor ANIMATION = SynchedEntityData.defineId(MortarEntity.class, EntityDataSerializers.STRING); - public static final EntityDataAccessor 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 diff --git a/src/main/java/net/mcreator/target/entity/SenpaiEntity.java b/src/main/java/net/mcreator/target/entity/SenpaiEntity.java index 17760fe68..e68f46387 100644 --- a/src/main/java/net/mcreator/target/entity/SenpaiEntity.java +++ b/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 SHOOT = SynchedEntityData.defineId(SenpaiEntity.class, EntityDataSerializers.BOOLEAN); public static final EntityDataAccessor ANIMATION = SynchedEntityData.defineId(SenpaiEntity.class, EntityDataSerializers.STRING); - public static final EntityDataAccessor 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 diff --git a/src/main/java/net/mcreator/target/entity/Target1Entity.java b/src/main/java/net/mcreator/target/entity/Target1Entity.java index 6ec1bc9d8..ddb7fa3ad 100644 --- a/src/main/java/net/mcreator/target/entity/Target1Entity.java +++ b/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 SHOOT = SynchedEntityData.defineId(Target1Entity.class, EntityDataSerializers.BOOLEAN); public static final EntityDataAccessor ANIMATION = SynchedEntityData.defineId(Target1Entity.class, EntityDataSerializers.STRING); - public static final EntityDataAccessor 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 diff --git a/src/main/java/net/mcreator/target/entity/TargetEntity.java b/src/main/java/net/mcreator/target/entity/TargetEntity.java index 7efff60ce..b9ffd2f33 100644 --- a/src/main/java/net/mcreator/target/entity/TargetEntity.java +++ b/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 SHOOT = SynchedEntityData.defineId(TargetEntity.class, EntityDataSerializers.BOOLEAN); public static final EntityDataAccessor ANIMATION = SynchedEntityData.defineId(TargetEntity.class, EntityDataSerializers.STRING); - public static final EntityDataAccessor 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 diff --git a/src/main/java/net/mcreator/target/entity/model/ClaymoreModel.java b/src/main/java/net/mcreator/target/entity/model/ClaymoreModel.java index 883e3dea6..01174cf9a 100644 --- a/src/main/java/net/mcreator/target/entity/model/ClaymoreModel.java +++ b/src/main/java/net/mcreator/target/entity/model/ClaymoreModel.java @@ -17,7 +17,7 @@ public class ClaymoreModel extends GeoModel { @Override public ResourceLocation getTextureResource(ClaymoreEntity entity) { - return new ResourceLocation("target", "textures/entities/" + entity.getTexture() + ".png"); + return new ResourceLocation("target", "textures/entity/claymore.png"); } } diff --git a/src/main/java/net/mcreator/target/entity/model/MortarModel.java b/src/main/java/net/mcreator/target/entity/model/MortarModel.java index 6cc668187..c8ef15c81 100644 --- a/src/main/java/net/mcreator/target/entity/model/MortarModel.java +++ b/src/main/java/net/mcreator/target/entity/model/MortarModel.java @@ -22,7 +22,7 @@ public class MortarModel extends GeoModel { @Override public ResourceLocation getTextureResource(MortarEntity entity) { - return new ResourceLocation("target", "textures/entities/" + entity.getTexture() + ".png"); + return new ResourceLocation("target", "textures/entity/mortar.png"); } @Override diff --git a/src/main/java/net/mcreator/target/entity/model/SenpaiModel.java b/src/main/java/net/mcreator/target/entity/model/SenpaiModel.java index 63064c0e5..d3e6d155d 100644 --- a/src/main/java/net/mcreator/target/entity/model/SenpaiModel.java +++ b/src/main/java/net/mcreator/target/entity/model/SenpaiModel.java @@ -22,7 +22,7 @@ public class SenpaiModel extends GeoModel { @Override public ResourceLocation getTextureResource(SenpaiEntity entity) { - return new ResourceLocation("target", "textures/entities/" + entity.getTexture() + ".png"); + return new ResourceLocation("target", "textures/entity/senpai.png"); } @Override diff --git a/src/main/java/net/mcreator/target/entity/model/Target1Model.java b/src/main/java/net/mcreator/target/entity/model/Target1Model.java index 10cef478c..2b1e2cb87 100644 --- a/src/main/java/net/mcreator/target/entity/model/Target1Model.java +++ b/src/main/java/net/mcreator/target/entity/model/Target1Model.java @@ -22,7 +22,7 @@ public class Target1Model extends GeoModel { @Override public ResourceLocation getTextureResource(Target1Entity entity) { - return new ResourceLocation("target", "textures/entities/" + entity.getTexture() + ".png"); + return new ResourceLocation("target", "textures/entity/target.png"); } @Override diff --git a/src/main/java/net/mcreator/target/entity/model/TargetModel.java b/src/main/java/net/mcreator/target/entity/model/TargetModel.java index 148d37607..90aff89a5 100644 --- a/src/main/java/net/mcreator/target/entity/model/TargetModel.java +++ b/src/main/java/net/mcreator/target/entity/model/TargetModel.java @@ -17,7 +17,7 @@ public class TargetModel extends GeoModel { @Override public ResourceLocation getTextureResource(TargetEntity entity) { - return new ResourceLocation("target", "textures/entities/" + entity.getTexture() + ".png"); + return new ResourceLocation("target", "textures/entity/target.png"); } } diff --git a/src/main/java/net/mcreator/target/init/TargetModEntityRenderers.java b/src/main/java/net/mcreator/target/init/TargetModEntityRenderers.java index 4c4a05f66..6ef35788d 100644 --- a/src/main/java/net/mcreator/target/init/TargetModEntityRenderers.java +++ b/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); } } diff --git a/src/main/resources/assets/target/textures/entities/bocekarrow.png b/src/main/resources/assets/target/textures/entity/bocek_arrow.png similarity index 100% rename from src/main/resources/assets/target/textures/entities/bocekarrow.png rename to src/main/resources/assets/target/textures/entity/bocek_arrow.png diff --git a/src/main/resources/assets/target/textures/entities/bullet.png b/src/main/resources/assets/target/textures/entity/bullet.png similarity index 100% rename from src/main/resources/assets/target/textures/entities/bullet.png rename to src/main/resources/assets/target/textures/entity/bullet.png diff --git a/src/main/resources/assets/target/textures/entities/bullet_e.png b/src/main/resources/assets/target/textures/entity/bullet_e.png similarity index 100% rename from src/main/resources/assets/target/textures/entities/bullet_e.png rename to src/main/resources/assets/target/textures/entity/bullet_e.png diff --git a/src/main/resources/assets/target/textures/entities/bullet_tex.png b/src/main/resources/assets/target/textures/entity/bullet_tex.png similarity index 100% rename from src/main/resources/assets/target/textures/entities/bullet_tex.png rename to src/main/resources/assets/target/textures/entity/bullet_tex.png diff --git a/src/main/resources/assets/target/textures/entities/claymore.png b/src/main/resources/assets/target/textures/entity/claymore.png similarity index 100% rename from src/main/resources/assets/target/textures/entities/claymore.png rename to src/main/resources/assets/target/textures/entity/claymore.png diff --git a/src/main/resources/assets/target/textures/entities/grenade.png b/src/main/resources/assets/target/textures/entity/grenade.png similarity index 100% rename from src/main/resources/assets/target/textures/entities/grenade.png rename to src/main/resources/assets/target/textures/entity/grenade.png diff --git a/src/main/resources/assets/target/textures/entities/mortar.png b/src/main/resources/assets/target/textures/entity/mortar.png similarity index 100% rename from src/main/resources/assets/target/textures/entities/mortar.png rename to src/main/resources/assets/target/textures/entity/mortar.png diff --git a/src/main/resources/assets/target/textures/entities/mortar_shell.png b/src/main/resources/assets/target/textures/entity/mortar_shell.png similarity index 100% rename from src/main/resources/assets/target/textures/entities/mortar_shell.png rename to src/main/resources/assets/target/textures/entity/mortar_shell.png diff --git a/src/main/resources/assets/target/textures/entities/pad.png b/src/main/resources/assets/target/textures/entity/pad.png similarity index 100% rename from src/main/resources/assets/target/textures/entities/pad.png rename to src/main/resources/assets/target/textures/entity/pad.png diff --git a/src/main/resources/assets/target/textures/entities/rocket.png b/src/main/resources/assets/target/textures/entity/rocket.png similarity index 100% rename from src/main/resources/assets/target/textures/entities/rocket.png rename to src/main/resources/assets/target/textures/entity/rocket.png diff --git a/src/main/resources/assets/target/textures/entities/senpai.png b/src/main/resources/assets/target/textures/entity/senpai.png similarity index 100% rename from src/main/resources/assets/target/textures/entities/senpai.png rename to src/main/resources/assets/target/textures/entity/senpai.png diff --git a/src/main/resources/assets/target/textures/entities/target.png b/src/main/resources/assets/target/textures/entity/target.png similarity index 100% rename from src/main/resources/assets/target/textures/entities/target.png rename to src/main/resources/assets/target/textures/entity/target.png diff --git a/src/main/resources/assets/target/textures/entities/target_e.png b/src/main/resources/assets/target/textures/entity/target_e.png similarity index 100% rename from src/main/resources/assets/target/textures/entities/target_e.png rename to src/main/resources/assets/target/textures/entity/target_e.png diff --git a/src/main/resources/assets/target/textures/entities/taser_rod.png b/src/main/resources/assets/target/textures/entity/taser_rod.png similarity index 100% rename from src/main/resources/assets/target/textures/entities/taser_rod.png rename to src/main/resources/assets/target/textures/entity/taser_rod.png diff --git a/src/main/resources/assets/target/textures/entities/trail.png b/src/main/resources/assets/target/textures/entity/trail.png similarity index 100% rename from src/main/resources/assets/target/textures/entities/trail.png rename to src/main/resources/assets/target/textures/entity/trail.png