complete magnorite skin generate

CodeOfArdonia · Jan 6, 2025 · 31f7b4b · 31f7b4b
1 parent 8a4d20f
commit 31f7b4b
Show file tree

Hide file tree

Showing 62 changed files with 263 additions and 187 deletions.
diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/AbstractArdoniEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/AbstractArdoniEntity.java
@@ -1,6 +1,7 @@
 package com.iafenvoy.sow.entity.ardoni;
 
 import com.iafenvoy.neptune.object.entity.MonsterEntityBase;
+import com.iafenvoy.neptune.render.EntityWithMarkerTextureProvider;
 import com.iafenvoy.neptune.util.Color4i;
 import com.iafenvoy.sow.data.ArdoniType;
 import com.iafenvoy.sow.item.block.entity.ArdoniGraveBlockEntity;
@@ -15,12 +16,9 @@
 import net.minecraft.entity.mob.HostileEntity;
 import net.minecraft.entity.mob.MobEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.Identifier;
 import net.minecraft.world.World;
 
-import java.util.Optional;
-
-public abstract class AbstractArdoniEntity extends MonsterEntityBase {
+public abstract class AbstractArdoniEntity extends MonsterEntityBase implements EntityWithMarkerTextureProvider {
     public AbstractArdoniEntity(EntityType<? extends HostileEntity> entityType, World world) {
         super(entityType, world, EntityGroup.DEFAULT);
     }
@@ -65,16 +63,12 @@ protected void dropLoot(DamageSource damageSource, boolean causedByPlayer) {
         this.dropStack(this.toGrave());
     }
 
-    public abstract Identifier getSkinTexture();
-
-    public abstract Optional<Identifier> getMarkerTexture();
-
     public abstract Color4i getColor();
 
     public abstract ArdoniType getArdoniType();
 
     public ItemStack toGrave() {
-        return this.getMarkerTexture().map(ArdoniGraveBlockEntity::buildGrave).orElse(ItemStack.EMPTY);
+        return this.getMarkerTextureId().map(ArdoniGraveBlockEntity::buildGrave).orElse(ItemStack.EMPTY);
     }
 
     public boolean isFemale() {

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/AegusEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/AegusEntity.java
@@ -23,12 +23,12 @@ public AegusEntity(EntityType<? extends HostileEntity> entityType, World world)
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return TEXTURE;
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.ofNullable(TEXTURE_MARKER);
     }
 

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/AureliusEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/AureliusEntity.java
@@ -23,12 +23,12 @@ public AureliusEntity(EntityType<? extends HostileEntity> entityType, World worl
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return TEXTURE;
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.ofNullable(TEXTURE_MARKER);
     }
 

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/DeathSingerEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/DeathSingerEntity.java
@@ -25,12 +25,12 @@ public DeathSingerEntity(EntityType<? extends HostileEntity> entityType, World w
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return TEXTURE;
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.ofNullable(TEXTURE_MARKER);
     }
 

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/GalleousEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/GalleousEntity.java
@@ -19,12 +19,12 @@ public GalleousEntity(EntityType<? extends HostileEntity> entityType, World worl
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return TEXTURE;
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.ofNullable(TEXTURE_MARKER);
     }
 

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/HadionEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/HadionEntity.java
@@ -23,12 +23,12 @@ public HadionEntity(EntityType<? extends HostileEntity> entityType, World world)
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return TEXTURE;
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.ofNullable(TEXTURE_MARKER);
     }
 

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/HubrisEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/HubrisEntity.java
@@ -19,12 +19,12 @@ public HubrisEntity(EntityType<? extends HostileEntity> entityType, World world)
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return TEXTURE;
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.ofNullable(TEXTURE_MARKER);
     }
 

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/KaltarisMasterEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/KaltarisMasterEntity.java
@@ -23,12 +23,12 @@ public KaltarisMasterEntity(EntityType<? extends HostileEntity> entityType, Worl
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return TEXTURE;
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.ofNullable(TEXTURE_MARKER);
     }
 

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/LucidiusEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/LucidiusEntity.java
@@ -19,12 +19,12 @@ public LucidiusEntity(EntityType<? extends HostileEntity> entityType, World worl
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return TEXTURE;
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.ofNullable(TEXTURE_MARKER);
     }
 

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/MendorisMasterEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/MendorisMasterEntity.java
@@ -23,12 +23,12 @@ public MendorisMasterEntity(EntityType<? extends HostileEntity> entityType, Worl
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return TEXTURE;
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.ofNullable(TEXTURE_MARKER);
     }
 

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/OsivianEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/OsivianEntity.java
@@ -19,12 +19,12 @@ public OsivianEntity(EntityType<? extends HostileEntity> entityType, World world
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return TEXTURE;
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.ofNullable(TEXTURE_MARKER);
     }
 

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/RiaEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/RiaEntity.java
@@ -24,12 +24,12 @@ public RiaEntity(EntityType<? extends HostileEntity> entityType, World world) {
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return TEXTURE;
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.ofNullable(TEXTURE_MARKER);
     }
 

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/SendarisMasterEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/SendarisMasterEntity.java
@@ -23,12 +23,12 @@ public SendarisMasterEntity(EntityType<? extends HostileEntity> entityType, Worl
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return TEXTURE;
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.ofNullable(TEXTURE_MARKER);
     }
 

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/SennEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/SennEntity.java
@@ -19,12 +19,12 @@ public SennEntity(EntityType<? extends HostileEntity> entityType, World world) {
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return TEXTURE;
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.ofNullable(TEXTURE_MARKER);
     }
 

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/SiderianEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/SiderianEntity.java
@@ -19,12 +19,12 @@ public SiderianEntity(EntityType<? extends HostileEntity> entityType, World worl
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return TEXTURE;
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.ofNullable(TEXTURE_MARKER);
     }
 

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/ThalleousEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/ThalleousEntity.java
@@ -28,12 +28,12 @@ public ThalleousEntity(EntityType<? extends HostileEntity> entityType, World wor
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return TEXTURE;
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.ofNullable(TEXTURE_MARKER);
     }
 

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/TideSingerEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/TideSingerEntity.java
@@ -24,12 +24,12 @@ public TideSingerEntity(EntityType<? extends HostileEntity> entityType, World wo
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return TEXTURE;
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.ofNullable(TEXTURE_MARKER);
     }
 

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/TygrenEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/TygrenEntity.java
@@ -35,12 +35,12 @@ protected void initDataTracker() {
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return TEXTURE;
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.ofNullable(TEXTURE_MARKER);
     }
 

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/ValEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/ValEntity.java
@@ -24,12 +24,12 @@ public ValEntity(EntityType<? extends HostileEntity> entityType, World world) {
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return TEXTURE;
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.ofNullable(TEXTURE_MARKER);
     }
 

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/ZinaidaEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/ZinaidaEntity.java
@@ -19,12 +19,12 @@ public ZinaidaEntity(EntityType<? extends HostileEntity> entityType, World world
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return TEXTURE;
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.ofNullable(TEXTURE_MARKER);
     }
 

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/ZuliusEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/ZuliusEntity.java
@@ -19,12 +19,12 @@ public ZuliusEntity(EntityType<? extends HostileEntity> entityType, World world)
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return TEXTURE;
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.ofNullable(TEXTURE_MARKER);
     }
 

diff --git a/common/src/main/java/com/iafenvoy/sow/entity/ardoni/random/ArdoniEntity.java b/common/src/main/java/com/iafenvoy/sow/entity/ardoni/random/ArdoniEntity.java
@@ -34,7 +34,7 @@ public ArdoniEntity(EntityType<? extends ArdoniEntity> entityType, World world)
     }
 
     @Override
-    public Optional<Identifier> getMarkerTexture() {
+    public Optional<Identifier> getMarkerTextureId() {
         return Optional.empty();
     }
 
@@ -46,7 +46,7 @@ public Color4i getColor() {
     }
 
     @Override
-    public Identifier getSkinTexture() {
+    public Identifier getTextureId() {
         return Identifier.of(SongsOfWar.MOD_ID, "textures/entity/ardoni/ardoni_base.png");
     }