diff --git a/src/main/java/info/ata4/minecraft/dragon/client/model/DragonModel.java b/src/main/java/info/ata4/minecraft/dragon/client/model/DragonModel.java index 215294a3..c20e2f97 100644 --- a/src/main/java/info/ata4/minecraft/dragon/client/model/DragonModel.java +++ b/src/main/java/info/ata4/minecraft/dragon/client/model/DragonModel.java @@ -40,6 +40,7 @@ public class DragonModel extends ModelBase { public final ResourceLocation bodyTexture; public final ResourceLocation glowTexture; public final ResourceLocation saddleTexture; + public final ResourceLocation eggTexture; // model parts public ModelPart head; @@ -86,6 +87,7 @@ public DragonModel(DragonBreed breed) { bodyTexture = new ResourceLocation(DragonMounts.AID, DragonRenderer.TEX_BASE + breed.getSkin() + "/body.png"); glowTexture = new ResourceLocation(DragonMounts.AID, DragonRenderer.TEX_BASE + breed.getSkin() + "/glow.png"); saddleTexture = new ResourceLocation(DragonMounts.AID, DragonRenderer.TEX_BASE + breed.getSkin() + "/saddle.png"); + eggTexture = new ResourceLocation(DragonMounts.AID, DragonRenderer.TEX_BASE + breed.getSkin() + "/egg.png"); this.breed = breed; @@ -124,6 +126,10 @@ public DragonModel(DragonBreed breed) { buildLegs(); } + public ResourceLocation getEggTexture() { + return eggTexture; + } + private void buildHead() { head = new ModelPart(this, "head"); head.addBox("upperjaw", -6, -1, -8 + HEAD_OFS, 12, 5, 16); diff --git a/src/main/java/info/ata4/minecraft/dragon/client/render/DragonRenderer.java b/src/main/java/info/ata4/minecraft/dragon/client/render/DragonRenderer.java index f36e3289..db61f961 100644 --- a/src/main/java/info/ata4/minecraft/dragon/client/render/DragonRenderer.java +++ b/src/main/java/info/ata4/minecraft/dragon/client/render/DragonRenderer.java @@ -43,7 +43,6 @@ public class DragonRenderer extends RenderLiving { private Map breedModels = new HashMap(); private DragonModel dragonModel; private ResourceLocation dissolveTexture; - private ResourceLocation eggTexture; private IModelCustom eggModel; public DragonRenderer() { @@ -54,7 +53,6 @@ public DragonRenderer() { // create textures dissolveTexture = new ResourceLocation(DragonMounts.AID, TEX_BASE + "dissolve.png"); - eggTexture = new ResourceLocation(DragonMounts.AID, TEX_BASE + "dragon_egg.png"); // load egg model eggModel = AdvancedModelLoader.loadModel(new ResourceLocation(DragonMounts.AID, MDL_BASE + "dragon_egg.obj")); @@ -137,7 +135,7 @@ protected void renderEgg(EntityTameableDragon dragon, double x, double y, double glRotatef(rotX, 1, 0, 0); glRotatef(rotZ, 0, 0, 1); - bindTexture(eggTexture); + bindTexture(dragonModel.getEggTexture()); eggModel.renderAll(); glPopMatrix(); diff --git a/src/main/resources/assets/dragonmounts/textures/entities/dragon/aether/egg.png b/src/main/resources/assets/dragonmounts/textures/entities/dragon/aether/egg.png new file mode 100644 index 00000000..d0200b60 Binary files /dev/null and b/src/main/resources/assets/dragonmounts/textures/entities/dragon/aether/egg.png differ diff --git a/src/main/resources/assets/dragonmounts/textures/entities/dragon/dragon_egg.png b/src/main/resources/assets/dragonmounts/textures/entities/dragon/ender/egg.png similarity index 100% rename from src/main/resources/assets/dragonmounts/textures/entities/dragon/dragon_egg.png rename to src/main/resources/assets/dragonmounts/textures/entities/dragon/ender/egg.png diff --git a/src/main/resources/assets/dragonmounts/textures/entities/dragon/fire/egg.png b/src/main/resources/assets/dragonmounts/textures/entities/dragon/fire/egg.png new file mode 100644 index 00000000..b2bc6490 Binary files /dev/null and b/src/main/resources/assets/dragonmounts/textures/entities/dragon/fire/egg.png differ diff --git a/src/main/resources/assets/dragonmounts/textures/entities/dragon/forest/egg.png b/src/main/resources/assets/dragonmounts/textures/entities/dragon/forest/egg.png new file mode 100644 index 00000000..d96831f2 Binary files /dev/null and b/src/main/resources/assets/dragonmounts/textures/entities/dragon/forest/egg.png differ diff --git a/src/main/resources/assets/dragonmounts/textures/entities/dragon/ice/egg.png b/src/main/resources/assets/dragonmounts/textures/entities/dragon/ice/egg.png new file mode 100644 index 00000000..ab978bce Binary files /dev/null and b/src/main/resources/assets/dragonmounts/textures/entities/dragon/ice/egg.png differ diff --git a/src/main/resources/assets/dragonmounts/textures/entities/dragon/nether/egg.png b/src/main/resources/assets/dragonmounts/textures/entities/dragon/nether/egg.png new file mode 100644 index 00000000..e33c394f Binary files /dev/null and b/src/main/resources/assets/dragonmounts/textures/entities/dragon/nether/egg.png differ diff --git a/src/main/resources/assets/dragonmounts/textures/entities/dragon/sylphid/egg.png b/src/main/resources/assets/dragonmounts/textures/entities/dragon/sylphid/egg.png new file mode 100644 index 00000000..8b82b793 Binary files /dev/null and b/src/main/resources/assets/dragonmounts/textures/entities/dragon/sylphid/egg.png differ diff --git a/src/main/resources/assets/dragonmounts/textures/entities/dragon/undead/egg.png b/src/main/resources/assets/dragonmounts/textures/entities/dragon/undead/egg.png new file mode 100644 index 00000000..21c7f11d Binary files /dev/null and b/src/main/resources/assets/dragonmounts/textures/entities/dragon/undead/egg.png differ