mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-21 20:52:20 +00:00
Merge 1.12
This commit is contained in:
commit
13e56153a9
80 files changed
+1165
-784
No files matched your search
@@ -108,6 +108,11 @@ public class FloatingFlowerModel implements IBakedModel {
|
||||
private CompositeBakedModel getModel(IFloatingFlower.IslandType islandType, ResourceLocation identifier) {
|
||||
ModelManager modelManager = Minecraft.getInstance().getItemRenderer().getItemModelMesher().getModelManager();
|
||||
|
||||
if(islandType == null) // This and the next one can be null if obtained from a non-extended state
|
||||
islandType = IFloatingFlower.IslandType.GRASS;
|
||||
if(identifier == null)
|
||||
identifier = "";
|
||||
|
||||
if(CACHE.contains(islandType, identifier)) {
|
||||
return CACHE.get(islandType, identifier);
|
||||
} else {
|
||||
|
||||
Reference in new issue
Block a user