From 4a4b11c44afbd27b0503e17e99c442fb22f943f0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 30 Oct 2019 14:53:06 -0500 Subject: [PATCH] Fix item models, finally done --- .../core/handler/MiscellaneousIcons.java | 12 ++++++++++ .../client/model/FloatingFlowerModel.java | 22 ++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index 34e0e84b3..6a5b9ca76 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -17,6 +17,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; +import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.client.model.GunModel; import vazkii.botania.client.model.LexiconModel; import vazkii.botania.client.model.PlatformModel; @@ -25,6 +26,8 @@ import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.relic.ItemKingKey; import vazkii.botania.common.lib.LibMisc; +import java.util.Map; + import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; public class MiscellaneousIcons { @@ -77,6 +80,15 @@ public class MiscellaneousIcons { @SubscribeEvent public void onModelBake(ModelBakeEvent evt) { + // Floating flower item models + for (Map.Entry e : evt.getModelRegistry().entrySet()) { + if (e.getValue() instanceof FloatingFlowerModel.Baked) { + ResourceLocation stripVariant = new ResourceLocation(e.getKey().getNamespace(), e.getKey().getPath()); + ModelResourceLocation itemPath = new ModelResourceLocation(stripVariant, "inventory"); + evt.getModelRegistry().put(itemPath, e.getValue()); + } + } + // Platforms ModelResourceLocation abstruseName = new ModelResourceLocation("botania:abstruse_platform", ""); IBakedModel abstruse = evt.getModelRegistry().get(abstruseName); diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index d8a6ec69e..e09d5236c 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -5,6 +5,7 @@ import net.minecraft.block.BlockState; import net.minecraft.client.renderer.model.BakedQuad; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.IUnbakedModel; +import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.texture.ISprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -21,12 +22,14 @@ 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; +import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.state.BotaniaStateProps; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import javax.vecmath.Matrix4f; import javax.vecmath.Vector3f; import java.util.ArrayList; import java.util.Collection; @@ -103,12 +106,14 @@ public class FloatingFlowerModel implements IUnbakedModel { return new Baked(bakedFlower, bakedIslands); } - private static class Baked extends BakedModelWrapper { + public 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); @@ -129,6 +134,13 @@ public class FloatingFlowerModel implements IUnbakedModel { } } + @Nonnull + @Override + public List getQuads(@Nullable BlockState state, @Nullable Direction side, @Nonnull Random rand) { + // Default to GRASS island + return getQuads(state, side, rand, EmptyModelData.INSTANCE); + } + @Nonnull @Override public List getQuads(@Nullable BlockState state, @Nullable Direction side, @Nonnull Random rand, @Nonnull IModelData extraData) { @@ -143,6 +155,14 @@ public class FloatingFlowerModel implements IUnbakedModel { return faceQuads.get(type).get(side); } } + + @Nonnull + @Override + public Pair handlePerspective(@Nonnull ItemCameraTransforms.TransformType cameraTransformType) { + // Use the item transforms from the islands since it looks better + Pair p = this.islands.values().iterator().next().handlePerspective(cameraTransformType); + return Pair.of(this, p.getRight()); + } } public enum Loader implements ICustomModelLoader {