Fix variants not rendering for now.

GenerationsMod · Nov 29, 2023 · 87eb893 · 87eb893
1 parent 284a8d8
commit 87eb893
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 3 deletions.
diff --git a/.../main/java/generations/gg/generations/core/generationscore/client/StatueEntityClient.java b/.../main/java/generations/gg/generations/core/generationscore/client/StatueEntityClient.java
@@ -7,9 +7,12 @@
 import generations.gg.generations.core.generationscore.client.render.rarecandy.LightingSettings;
 import generations.gg.generations.core.generationscore.client.render.rarecandy.PixelmonInstance;
 import generations.gg.generations.core.generationscore.world.entity.StatueEntity;
+import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix4f;
 
+import java.util.Set;
+
 public class StatueEntityClient extends PoseableEntityState<PokemonEntity> implements PixelmonInstanceProvider {
     private PixelmonInstance pixelmonInstance;
 
@@ -34,6 +37,16 @@ public void setInstance(PixelmonInstance instance) {
         pixelmonInstance = instance;
     }
 
+    @Override
+    public ResourceLocation species() {
+        return null;
+    }
+
+    @Override
+    public Set<String> aspects() {
+        return null;
+    }
+
     @Nullable
     @Override
     public PokemonEntity getEntity() {

diff --git a/...main/java/generations/gg/generations/core/generationscore/client/model/RareCandyBone.java b/...main/java/generations/gg/generations/core/generationscore/client/model/RareCandyBone.java
@@ -61,10 +61,17 @@ public void render(RenderContext context, PoseStack stack, VertexConsumer buffer
 
         if(model.renderObject.isReady()) {
             instance.setLight(packedLight);
-            var id = context.request(RenderContext.Companion.getTEXTURE());
+
+
+
+            var id = getTexture(context.request(RenderContext.Companion.getENTITY()));
             System.out.println("Rendering: " + id);
 
-            if(id != null && id.getNamespace().equals("pk")) instance.setVariant(id.getPath());
+            if (id != null) {
+                if (id.getNamespace().equals("pk")) {
+                    instance.setVariant(id.getPath());
+                }
+            }
 
             stack.pushPose();
 
@@ -84,6 +91,11 @@ public void render(RenderContext context, PoseStack stack, VertexConsumer buffer
         }
     }
 
+    private ResourceLocation getTexture(Entity entity) {
+        if(entity instanceof PixelmonInstanceProvider provider) return provider.getVariant();
+        else return null;
+    }
+
     @Override
     public void transform(PoseStack poseStack) {
 

diff --git a/...nerations/gg/generations/core/generationscore/client/render/PixelmonInstanceProvider.java b/...nerations/gg/generations/core/generationscore/client/render/PixelmonInstanceProvider.java
@@ -1,8 +1,20 @@
 package generations.gg.generations.core.generationscore.client.render;
 
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.PokemonModelRepository;
 import generations.gg.generations.core.generationscore.client.render.rarecandy.PixelmonInstance;
+import net.minecraft.resources.ResourceLocation;
+
+import java.util.Set;
 
 public interface PixelmonInstanceProvider {
     public PixelmonInstance getInstance();
     void setInstance(PixelmonInstance instance);
+
+    public ResourceLocation species();
+
+    public Set<String> aspects();
+
+    default ResourceLocation getVariant() {
+        return PokemonModelRepository.INSTANCE.getVariations().get(species()).getTexture(aspects(), 0.0f);
+    }
 }
diff --git a/...java/generations/gg/generations/core/generationscore/mixin/client/PokemonEntityMixin.java b/...java/generations/gg/generations/core/generationscore/mixin/client/PokemonEntityMixin.java
@@ -4,11 +4,14 @@
 import generations.gg.generations.core.generationscore.client.render.PixelmonInstanceProvider;
 import generations.gg.generations.core.generationscore.client.render.rarecandy.LightingSettings;
 import generations.gg.generations.core.generationscore.client.render.rarecandy.PixelmonInstance;
+import net.minecraft.resources.ResourceLocation;
 import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.Mixin;
 
+import java.util.Set;
+
 @Mixin(PokemonEntity.class)
-public class PokemonEntityMixin implements PixelmonInstanceProvider {
+public abstract class PokemonEntityMixin implements PixelmonInstanceProvider {
     private PixelmonInstance instance;
 
     public PixelmonInstance getInstance() {
@@ -18,8 +21,22 @@ public PixelmonInstance getInstance() {
         return instance;
     }
 
+    private PokemonEntity self() {
+        return (PokemonEntity) (Object) this;
+    }
+
     @Override
     public void setInstance(PixelmonInstance instance) {
         this.instance = instance;
     }
+
+    @Override
+    public Set<String> aspects() {
+        return self().getPokemon().getAspects();
+    }
+
+    @Override
+    public ResourceLocation species() {
+        return self().getPokemon().getSpecies().getResourceIdentifier();
+    }
 }
diff --git a/.../main/java/generations/gg/generations/core/generationscore/world/entity/StatueEntity.java b/.../main/java/generations/gg/generations/core/generationscore/world/entity/StatueEntity.java
@@ -30,6 +30,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
+import java.util.Set;
 
 import static dev.architectury.utils.Env.CLIENT;
 
@@ -204,6 +205,16 @@ public void setInstance(PixelmonInstance instance) {
         }
     }
 
+    @Override
+    public ResourceLocation species() {
+        return getStatueData().asRenderablePokemon().getSpecies().getResourceIdentifier();
+    }
+
+    @Override
+    public Set<String> aspects() {
+        return getStatueData().asRenderablePokemon().getAspects();
+    }
+
     @Override
     public float getScale() {
         return getStatueData().getScale();