more work on model fixing

also fixes some bugs in animation gui

src/main/java/pokecube/core/client/gui/AnimationGui.java

@@ -145,7 +145,11 @@ void onUpdated()
         this.toRender.onGenesChanged();
         this.dyeColour.setText("" + this.toRender.getDyeColour());
         if (this.renderHolder != null) this.renderHolder.overrideAnim = false;
+
         this.renderHolder = RenderPokemob.holders.get(AnimationGui.entry);
+        if (this.holder != null) this.renderHolder = RenderPokemob.customs.getOrDefault(this.holder.key,
+                this.renderHolder);
+
         this.renderHolder.overrideAnim = true;
         this.renderHolder.anim = ThutCore.trim(this.anim.getText());
         PacketPokedex.updateWatchEntry(AnimationGui.entry);
@@ -318,7 +322,7 @@ protected void init()
         super.init();
         final int yOffset = this.height / 2;
         final int xOffset = this.width / 2;
-
+        this.sexe = IPokemob.MALE;
         if (GuiPokedex.pokedexEntry != null) AnimationGui.mob = GuiPokedex.pokedexEntry.getName();
         AnimationGui.entry = Database.getEntry(AnimationGui.mob);
         if (AnimationGui.entry == null) AnimationGui.entry = Pokedex.getInstance().getFirstEntry();
@@ -349,8 +353,9 @@ protected void init()
             else AnimationGui.entry = Pokedex.getInstance().getFirstEntry();
             AnimationGui.mob = AnimationGui.entry.getForGender(this.sexe).getName();
             this.forme.setText(AnimationGui.mob);
-            this.holder = null;
-            this.forme_alt.setText("");
+            this.holder = AnimationGui.entry.getModel(this.sexe);
+            this.forme_alt.setText(this.holder == null ? "" : this.holder.key.toString());
+            System.out.println(AnimationGui.entry + " " + this.holder + " " + this.sexe);
             PacketPokedex.updateWatchEntry(AnimationGui.entry);
             this.onUpdated();
         }));
@@ -361,8 +366,8 @@ protected void init()
             else AnimationGui.entry = Pokedex.getInstance().getLastEntry();
             AnimationGui.mob = AnimationGui.entry.getForGender(this.sexe).getName();
             this.forme.setText(AnimationGui.mob);
-            this.holder = null;
-            this.forme_alt.setText("");
+            this.holder = AnimationGui.entry.getModel(this.sexe);
+            this.forme_alt.setText(this.holder == null ? "" : this.holder.key.toString());
             PacketPokedex.updateWatchEntry(AnimationGui.entry);
             this.onUpdated();
         }));
@@ -449,8 +454,8 @@ else if (gender[1].equalsIgnoreCase("m"))
                     {
                         AnimationGui.entry = i + 1 < formes.size() ? formes.get(i + 1) : formes.get(0);
                         AnimationGui.mob = AnimationGui.entry.getName();
-                        this.holder = null;
-                        this.forme_alt.setText("");
+                        this.holder = AnimationGui.entry.getModel(this.sexe);
+                        this.forme_alt.setText(this.holder == null ? "" : this.holder.key.toString());
                         this.forme.setText(AnimationGui.mob);
                         break;
                     }
@@ -470,8 +475,8 @@ else if (gender[1].equalsIgnoreCase("m"))
                     {
                         AnimationGui.entry = i - 1 >= 0 ? formes.get(i - 1) : formes.get(formes.size() - 1);
                         AnimationGui.mob = AnimationGui.entry.getName();
-                        this.holder = null;
-                        this.forme_alt.setText("");
+                        this.holder = AnimationGui.entry.getModel(this.sexe);
+                        this.forme_alt.setText(this.holder == null ? "" : this.holder.key.toString());
                         this.forme.setText(AnimationGui.mob);
                         break;
                     }
@@ -549,8 +554,8 @@ public boolean keyPressed(final int code, final int unk1, final int unk2)
             AnimationGui.mob = AnimationGui.entry.getForGender(this.sexe).getName();
             this.forme.setText(AnimationGui.mob);
             PacketPokedex.updateWatchEntry(AnimationGui.entry);
-            this.holder = null;
-            this.forme_alt.setText("");
+            this.holder = AnimationGui.entry.getModel(this.sexe);
+            this.forme_alt.setText(this.holder == null ? "" : this.holder.key.toString());
             this.onUpdated();
         }
         if (code == GLFW.GLFW_KEY_LEFT)
@@ -561,8 +566,8 @@ public boolean keyPressed(final int code, final int unk1, final int unk2)
             AnimationGui.mob = AnimationGui.entry.getForGender(this.sexe).getName();
             PacketPokedex.updateWatchEntry(AnimationGui.entry);
             this.forme.setText(AnimationGui.mob);
-            this.holder = null;
-            this.forme_alt.setText("");
+            this.holder = AnimationGui.entry.getModel(this.sexe);
+            this.forme_alt.setText(this.holder == null ? "" : this.holder.key.toString());
             this.onUpdated();
         }
         return super.keyPressed(code, unk1, unk2);

src/main/java/pokecube/core/client/render/mobs/RenderPokemob.java

@@ -447,7 +447,7 @@ public static void reloadModel(final PokedexEntry entry)
             if (custom.entry == entry) custom.init();
     }
 
-    static final Map<ResourceLocation, Holder> customs = Maps.newHashMap();
+    public static final Map<ResourceLocation, Holder> customs = Maps.newHashMap();
 
     public static Map<PokemobType<?>, Holder> holderMap = Maps.newHashMap();
     public static Map<PokedexEntry, Holder>   holders   = Maps.newHashMap();

src/main/java/thut/core/client/render/model/parts/Mesh.java

@@ -70,6 +70,7 @@ public Mesh(final Integer[] order, final Vertex[] vert, final Vertex[] norm, fin
             this.normalList[i] = c;
             this.normalList[i + 1] = c;
             this.normalList[i + 2] = c;
+            if (iter == 4) this.normalList[i + 3] = c;
         }
         // broken, lets just fill with z+
         else