diff --git a/src/main/java/forestry/api/genetics/AlleleSpeciesRegisterEvent.java b/src/main/java/forestry/api/genetics/AlleleSpeciesRegisterEvent.java index 2bd4e35be..81e03299f 100644 --- a/src/main/java/forestry/api/genetics/AlleleSpeciesRegisterEvent.java +++ b/src/main/java/forestry/api/genetics/AlleleSpeciesRegisterEvent.java @@ -1,7 +1,5 @@ package forestry.api.genetics; -import net.minecraftforge.fml.common.eventhandler.Event; - /** * Called after Forestry has registered all his species alleles of a individual. */ diff --git a/src/main/java/forestry/apiculture/genetics/BeeDefinition.java b/src/main/java/forestry/apiculture/genetics/BeeDefinition.java index 2441930b4..c55f55e0d 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeDefinition.java +++ b/src/main/java/forestry/apiculture/genetics/BeeDefinition.java @@ -1024,7 +1024,7 @@ public enum BeeDefinition implements IBeeDefinition { } public static void preInit() { - MinecraftForge.EVENT_BUS.post(new AlleleSpeciesRegisterEvent(BeeManager.beeRoot, IAlleleBeeSpecies.class)); + MinecraftForge.EVENT_BUS.post(new AlleleSpeciesRegisterEvent<>(BeeManager.beeRoot, IAlleleBeeSpecies.class)); } private void init() { diff --git a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java index db9462cde..4c3b94939 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java +++ b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java @@ -44,6 +44,7 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.ButterflyManager; +import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IAlleleButterflyCocoon; import forestry.api.lepidopterology.IAlleleButterflySpecies; @@ -284,7 +285,7 @@ public class ItemButterflyGE extends ItemGE implements ISpriteRegister, IColored @Override @SideOnly(Side.CLIENT) public void registerSprites(ITextureManager manager) { - for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) { + for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles(EnumButterflyChromosome.SPECIES)) { if (allele instanceof IAlleleButterflySpecies) { ((IAlleleButterflySpecies) allele).registerSprites(); } diff --git a/src/main/java/forestry/lepidopterology/render/ModelButterfly.java b/src/main/java/forestry/lepidopterology/render/ModelButterfly.java index 73a6842db..fd32e0016 100755 --- a/src/main/java/forestry/lepidopterology/render/ModelButterfly.java +++ b/src/main/java/forestry/lepidopterology/render/ModelButterfly.java @@ -71,24 +71,23 @@ public class ModelButterfly extends ModelBase { } @Override - public void render(Entity entity, float f, float f1, float swing, float f3, float f4, float f5) { - super.render(entity, f, f1, swing, f3, f4, f5); + public void render(Entity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { + super.render(entity, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale); //body.rotateAngleX = ((float)Math.PI / 4F) + MathHelper.cos(swing * 0.1F) * 0.15F; //body.rotateAngleY = 0.0F; - wingRight.rotateAngleZ = MathHelper.cos(swing * 1.3F) * (float) Math.PI * 0.25F; + wingRight.rotateAngleZ = MathHelper.cos(ageInTicks * 1.3F) * (float) Math.PI * 0.25F; wingLeft.rotateAngleZ = -wingRight.rotateAngleZ; GlStateManager.pushMatrix(); - GlStateManager.scale(scale, scale, scale); - GlStateManager.translate(0.0F, 20.0f / scale * f5, 0.0F); - wingRight.render(f5); - eyeRight.render(f5); - eyeLeft.render(f5); - wingLeft.render(f5); - body.render(f5); + GlStateManager.scale(this.scale, this.scale, this.scale); + GlStateManager.translate(0.0F, 20.0f / this.scale * scale, 0.0F); + wingRight.render(scale); + eyeRight.render(scale); + eyeLeft.render(scale); + wingLeft.render(scale); + body.render(scale); GlStateManager.popMatrix(); - } private static void setRotation(ModelRenderer model, float x, float y, float z) { diff --git a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java index ef70a5493..bbe31527c 100755 --- a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java +++ b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java @@ -38,6 +38,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IButterfly; +import forestry.core.config.Constants; import forestry.core.models.BlankModel; import forestry.core.models.DefaultTextureGetter; import forestry.core.models.TRSRBakedModel; @@ -60,12 +61,11 @@ public class ModelButterflyItem extends BlankModel { } private IBakedModel bakeModel(IButterfly butterfly) { - ImmutableMap.Builder textures = ImmutableMap.builder(); - textures.put("butterfly", butterfly.getGenome().getPrimary().getItemTexture()); + ImmutableMap textures = ImmutableMap.of("butterfly", butterfly.getGenome().getPrimary().getItemTexture()); if (modelButterfly == null) { try { - modelButterfly = ModelLoaderRegistry.getModel(new ResourceLocation("forestry:item/butterfly_ge")); + modelButterfly = ModelLoaderRegistry.getModel(new ResourceLocation(Constants.MOD_ID, "item/butterfly_ge")); } catch (Exception e) { throw new RuntimeException(e); } @@ -73,7 +73,7 @@ public class ModelButterflyItem extends BlankModel { throw new IllegalArgumentException("Could not bake butterfly model"); } } - IModel retexturedModel = modelButterfly.retexture(textures.build()); + IModel retexturedModel = modelButterfly.retexture(textures); IBakedModel bakedModel = retexturedModel.bake(ModelRotation.X0_Y0, DefaultVertexFormats.ITEM, DefaultTextureGetter.INSTANCE); return new TRSRBakedModel(bakedModel, -0.03125F, 0.25F - butterfly.getSize() * 0.37F, -0.03125F, butterfly.getSize() * 1.5F); }