diff --git a/src/main/java/forestry/arboriculture/models/ModelWoodPile.java b/src/main/java/forestry/arboriculture/models/ModelWoodPile.java index 629229eaf..108274b7a 100644 --- a/src/main/java/forestry/arboriculture/models/ModelWoodPile.java +++ b/src/main/java/forestry/arboriculture/models/ModelWoodPile.java @@ -1,11 +1,12 @@ package forestry.arboriculture.models; import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; +import java.util.concurrent.TimeUnit; import com.google.common.base.Function; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import com.google.common.collect.ImmutableMap; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.TreeManager; @@ -31,6 +32,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.ModelProcessingHelper; @@ -38,14 +40,22 @@ import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class ModelWoodPile extends BlankModel{ private final Function textureGetter = new DefaultTextureGetter(); - @SideOnly(Side.CLIENT) - private IModel modelWoodPileItem; - private IModel modelWoodPileBlock; - private static final Map blockCache = new HashMap<>(); - private static final Map itemCache = new HashMap<>(); + private static IModel modelWoodPileItem; + private static IModel modelWoodPileBlock; + private static final Cache blockCache = CacheBuilder.newBuilder().expireAfterAccess(1, TimeUnit.MINUTES).build(); + private static final Cache itemCache = CacheBuilder.newBuilder().expireAfterAccess(1, TimeUnit.MINUTES).build(); + + /** + * Init the model with datas from the ModelBakeEvent. + */ + public static void onModelBake(ModelBakeEvent event){ + blockCache.invalidateAll(); + itemCache.invalidateAll(); + } @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { @@ -103,16 +113,19 @@ public class ModelWoodPile extends BlankModel{ } private IBakedModel bakeModel(IAlleleTreeSpecies treeSpecies, boolean isItem) { + if(treeSpecies == null || treeSpecies.getWoodProvider() == null || treeSpecies.getWoodProvider().getSprite(false) == null){ + return null; + } ImmutableMap.Builder textures = ImmutableMap.builder(); String treeUID = treeSpecies.getUID(); - Map map = isItem ? itemCache : blockCache; - if(!map.containsKey(treeUID)){ + Cache map = isItem ? itemCache : blockCache; + if(map.getIfPresent(treeUID) == null){ textures.put("woodBark", treeSpecies.getWoodProvider().getSprite(false).getIconName()); textures.put("woodTop", treeSpecies.getWoodProvider().getSprite(true).getIconName()); IModel retextureWoodPile = ModelProcessingHelper.retexture(isItem ? modelWoodPileItem : modelWoodPileBlock, textures.build()); map.put(treeUID, retextureWoodPile.bake(ModelRotation.X0_Y0, isItem ? DefaultVertexFormats.ITEM : DefaultVertexFormats.BLOCK, textureGetter)); } - return map.get(treeUID); + return map.getIfPresent(treeUID); } private class PileItemOverrideList extends ItemOverrideList { diff --git a/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java b/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java index 74bd5b45c..914f0969b 100644 --- a/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java +++ b/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java @@ -153,6 +153,7 @@ public class ProxyArboricultureClient extends ProxyArboriculture { } loadingExceptions.putAll(WoodModelLoader.loadingExceptions); + ModelWoodPile.onModelBake(event); } @Override diff --git a/src/main/java/forestry/core/models/ModelCrate.java b/src/main/java/forestry/core/models/ModelCrate.java index ab320522f..7d69caf43 100644 --- a/src/main/java/forestry/core/models/ModelCrate.java +++ b/src/main/java/forestry/core/models/ModelCrate.java @@ -11,8 +11,8 @@ package forestry.core.models; import com.google.common.base.Charsets; -import com.google.common.collect.Maps; - +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import org.apache.commons.io.IOUtils; import java.io.FileNotFoundException; @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.IdentityHashMap; import java.util.List; -import java.util.Map; +import java.util.concurrent.TimeUnit; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -60,7 +60,7 @@ import gnu.trove.map.hash.TIntObjectHashMap; @SideOnly(Side.CLIENT) public class ModelCrate extends BlankModel { - private static final Map cache = Maps.newHashMap(); + private static final Cache cache = CacheBuilder.newBuilder().expireAfterAccess(1, TimeUnit.MINUTES).build(); private static final String CUSTOM_CRATES = "forestry:item/crates/"; private static IModel crateModel; @@ -70,7 +70,7 @@ public class ModelCrate extends BlankModel { /** * Init the model with datas from the ModelBakeEvent. */ - public static void initModel(ModelBakeEvent event){ + public static void onModelBake(ModelBakeEvent event){ try { crateModel = ModelLoaderRegistry.getModel(new ResourceLocation("forestry:item/crate-filled")); MODEL_GENERATED = ObfuscationReflectionHelper.getPrivateValue(ModelBakery.class, event.getModelLoader(), 17); @@ -78,7 +78,7 @@ public class ModelCrate extends BlankModel { } catch (Exception e) { Log.error("Failed to init the crate model.", e); } - ModelCrate.cache.clear(); + ModelCrate.cache.invalidateAll(); } /** @@ -237,7 +237,7 @@ public class ModelCrate extends BlankModel { public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity) { ItemCrated crated = (ItemCrated) stack.getItem(); String crateUID = ItemStackUtil.getItemNameFromRegistry(crated).getResourcePath(); - if (cache.get(crateUID) == null) { + if (cache.getIfPresent(crateUID) == null) { IBakedModel baseBaked = getModel(new ItemStack(PluginStorage.items.crate, 1, 1)); //Set the crate color index to 100 for (BakedQuad quad : baseBaked.getQuads(null, null, 0)) { @@ -246,7 +246,7 @@ public class ModelCrate extends BlankModel { cache.put(crateUID, new IPerspectiveAwareModel.MapWrapper(new CrateBakedModel( bakeModel(crated, baseBaked)), ModelManager.getInstance().DEFAULT_ITEM)); } - return cache.get(crateUID); + return cache.getIfPresent(crateUID); } } diff --git a/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java b/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java index b335445c2..55cdf56fe 100644 --- a/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java +++ b/src/main/java/forestry/greenhouse/multiblock/FakeGreenhouseController.java @@ -67,8 +67,8 @@ public class FakeGreenhouseController extends FakeMultiblockController implement } @Override - public void setCamouflageBlock(String type, ItemStack camouflageBlock) { - + public boolean setCamouflageBlock(String type, ItemStack camouflageBlock, boolean sendClientUpdate) { + return false; } @Override diff --git a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java index 69d791966..9e9eaf85d 100644 --- a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java @@ -28,10 +28,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkGenerator; +import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Property; import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.RecipeSorter; @@ -43,6 +47,7 @@ import forestry.api.genetics.IAllele; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IAlleleButterflyCocoon; import forestry.api.lepidopterology.IAlleleButterflySpecies; +import forestry.arboriculture.proxy.ProxyArboricultureClient; import forestry.core.PluginCore; import forestry.core.config.Constants; import forestry.core.config.LocalizedConfiguration; @@ -65,6 +70,7 @@ import forestry.lepidopterology.genetics.alleles.AlleleButterflyEffect; import forestry.lepidopterology.items.ItemRegistryLepidopterology; import forestry.lepidopterology.proxy.ProxyLepidopterology; import forestry.lepidopterology.recipes.MatingRecipe; +import forestry.lepidopterology.render.ModelButterflyItem; import forestry.lepidopterology.tiles.TileCocoon; import forestry.lepidopterology.worldgen.CocoonDecorator; import forestry.plugins.BlankForestryPlugin; @@ -108,6 +114,7 @@ public class PluginLepidopterology extends BlankForestryPlugin { @Override public void preInit() { + MinecraftForge.EVENT_BUS.register(this); ButterflyBranchDefinition.createAlleles(); AlleleButterflyEffect.createAlleles(); @@ -303,4 +310,10 @@ public class PluginLepidopterology extends BlankForestryPlugin { public static float getSecondSerumChance() { return secondSerumChance; } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onModelBake(ModelBakeEvent event) { + ModelButterflyItem.onModelBake(event); + } } diff --git a/src/main/java/forestry/lepidopterology/render/ModelButterfly.java b/src/main/java/forestry/lepidopterology/render/ModelButterfly.java index 2c1c718c9..727d66e03 100755 --- a/src/main/java/forestry/lepidopterology/render/ModelButterfly.java +++ b/src/main/java/forestry/lepidopterology/render/ModelButterfly.java @@ -15,7 +15,10 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.Entity; import net.minecraft.util.math.MathHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class ModelButterfly extends ModelBase { private final ModelRenderer wingRight; diff --git a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java index 8a068ee0c..51ddc08db 100644 --- a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java +++ b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java @@ -11,9 +11,12 @@ package forestry.lepidopterology.render; import com.google.common.base.Function; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import com.google.common.collect.ImmutableMap; import java.util.Collections; +import java.util.concurrent.TimeUnit; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemOverrideList; @@ -24,6 +27,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.ModelProcessingHelper; @@ -40,8 +44,15 @@ import forestry.core.models.TRSRBakedModel; public class ModelButterflyItem extends BlankModel { private final Function textureGetter = new DefaultTextureGetter(); @SideOnly(Side.CLIENT) - private IModel modelButterfly; + private static IModel modelButterfly; + + private static final Cache cache = CacheBuilder.newBuilder().expireAfterAccess(1, TimeUnit.MINUTES).build(); + public static void onModelBake(ModelBakeEvent event){ + modelButterfly = null; + cache.invalidateAll(); + } + @Override protected ItemOverrideList createOverrides() { return new ButterflyItemOverrideList(); @@ -50,6 +61,17 @@ public class ModelButterflyItem extends BlankModel { private IBakedModel bakeModel(IButterfly butterfly) { ImmutableMap.Builder textures = ImmutableMap.builder(); textures.put("butterfly", butterfly.getGenome().getPrimary().getItemTexture()); + + if (modelButterfly == null) { + try { + modelButterfly = ModelLoaderRegistry.getModel(new ResourceLocation("forestry:item/butterflyGE")); + } catch (Exception e) { + return null; + } + if (modelButterfly == null) { + return null; + } + } IModel retexturedModel = ModelProcessingHelper.retexture(modelButterfly, textures.build()); return new TRSRBakedModel(retexturedModel.bake(ModelRotation.X0_Y0, DefaultVertexFormats.ITEM, textureGetter), -0.03125F, 0.5F, -0.03125F, butterfly.getSize() * 1.5F); } @@ -61,21 +83,14 @@ public class ModelButterflyItem extends BlankModel { @Override public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity) { - if (modelButterfly == null) { - try { - modelButterfly = ModelLoaderRegistry.getModel(new ResourceLocation("forestry:item/butterflyGE")); - } catch (Exception e) { - return null; - } - if (modelButterfly == null) { - return null; - } - } IButterfly butterfly = ButterflyManager.butterflyRoot.getMember(stack); if (butterfly == null) { butterfly = ButterflyManager.butterflyRoot.templateAsIndividual(ButterflyManager.butterflyRoot.getDefaultTemplate()); } - return bakeModel(butterfly); + if(cache.getIfPresent(butterfly) == null){ + cache.put(butterfly, bakeModel(butterfly)); + } + return cache.getIfPresent(butterfly); } } } diff --git a/src/main/java/forestry/storage/PluginStorage.java b/src/main/java/forestry/storage/PluginStorage.java index 2faaad59f..4c872a3d9 100644 --- a/src/main/java/forestry/storage/PluginStorage.java +++ b/src/main/java/forestry/storage/PluginStorage.java @@ -637,7 +637,7 @@ public class PluginStorage extends BlankForestryPlugin { @SubscribeEvent @SideOnly(Side.CLIENT) public void onBakeModel(ModelBakeEvent event) { - ModelCrate.initModel(event); + ModelCrate.onModelBake(event); } @Override diff --git a/src/main/resources/assets/forestry/models/item/butterflyGE.json b/src/main/resources/assets/forestry/models/item/butterflyGE.json index f21f0bdde..3157421d8 100644 --- a/src/main/resources/assets/forestry/models/item/butterflyGE.json +++ b/src/main/resources/assets/forestry/models/item/butterflyGE.json @@ -75,12 +75,12 @@ }, "ground": { "rotation": [ 0, 0, 0 ], - "translation": [ 0, -4, 0 ], - "scale": [ 0.5, 0.5, 0.5 ] + "scale": [ 0.5, 0.5, 0.5 ], + "translation": [ 0, -4, 0 ] }, "fixed": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 0.5, 4.91 ], + "rotation": [ -90, -180, 0 ], + "translation": [ 0, 0.5, 12.41 ], "scale": [ 1, 1, 1 ] }, "firstperson_righthand": {