diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 1581db017..d8a6ec69e 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -17,6 +17,7 @@ import net.minecraftforge.client.model.BasicState; import net.minecraftforge.client.model.ICustomModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.ModelStateComposition; +import net.minecraftforge.client.model.data.EmptyModelData; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.model.TRSRTransformation; @@ -29,6 +30,7 @@ import javax.annotation.Nullable; import javax.vecmath.Vector3f; import java.util.ArrayList; import java.util.Collection; +import java.util.EnumMap; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -102,23 +104,44 @@ public class FloatingFlowerModel implements IUnbakedModel { } private static class Baked extends BakedModelWrapper { - private final Map islands; + private final Map> genQuads = new HashMap<>(); + private final Map>> faceQuads = new HashMap<>(); Baked(IBakedModel flower, Map islands) { super(flower); - this.islands = islands; + Random rand = new Random(); + for (Map.Entry e : islands.entrySet()) { + rand.setSeed(42); + List gen = new ArrayList<>(flower.getQuads(null, null, rand, EmptyModelData.INSTANCE)); + rand.setSeed(42); + gen.addAll(e.getValue().getQuads(null, null, rand, EmptyModelData.INSTANCE)); + genQuads.put(e.getKey(), gen); + + Map> fq = new EnumMap<>(Direction.class); + for (Direction dir : Direction.values()) { + rand.setSeed(42); + List lst = new ArrayList<>(flower.getQuads(null, dir, rand, EmptyModelData.INSTANCE)); + rand.setSeed(42); + lst.addAll(e.getValue().getQuads(null, dir, rand, EmptyModelData.INSTANCE)); + fq.put(dir, lst); + } + faceQuads.put(e.getKey(), fq); + } } @Nonnull @Override public List getQuads(@Nullable BlockState state, @Nullable Direction side, @Nonnull Random rand, @Nonnull IModelData extraData) { - List quads = super.getQuads(state, side, rand, extraData); IFloatingFlower.IslandType type = IFloatingFlower.IslandType.GRASS; if (extraData.hasProperty(BotaniaStateProps.FLOATING_DATA)) { type = extraData.getData(BotaniaStateProps.FLOATING_DATA).getIslandType(); } - quads.addAll(islands.get(type).getQuads(state, side, rand, extraData)); - return quads; + + if (side == null) { + return genQuads.get(type); + } else { + return faceQuads.get(type).get(side); + } } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 4c5e8d80a..b35fc4158 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -41,6 +41,9 @@ public class RenderTileFloatingFlower extends TileEntityRenderer { @Override public void render(@Nonnull TileEntity tile, double d0, double d1, double d2, float t, int digProgress) { + if (ConfigHandler.CLIENT.staticFloaters.get()) + return; + IModelData data = tile.getModelData(); if (!data.hasProperty(BotaniaStateProps.FLOATING_DATA)) return;