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 61c9a42b2..a72826667 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -110,13 +110,9 @@ public class MiscellaneousIcons { // Mana Blaster ModelResourceLocation key = new ModelResourceLocation("botania:mana_gun", "inventory"); IBakedModel originalModel = evt.getModelRegistry().get(key); - evt.getModelRegistry().put(key, new GunModel(evt.getModelLoader(), originalModel)); - - // same as lexicon, reach into all json overrides and wrap them - for (int i = 0; i < originalModel.getOverrides().overrideBakedModels.size(); i++) { - Botania.LOGGER.info("wrapping {}", i); - originalModel.getOverrides().overrideBakedModels.set(i, new GunModel(evt.getModelLoader(), originalModel.getOverrides().overrideBakedModels.get(i))); - } + ModelResourceLocation clipKey = new ModelResourceLocation("botania:mana_gun_clip", "inventory"); + IBakedModel originalModelClip = evt.getModelRegistry().get(clipKey); + evt.getModelRegistry().put(key, new GunModel(evt.getModelLoader(), originalModel, originalModelClip)); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 1c0079d16..acd515be2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -14,6 +14,7 @@ import net.minecraft.client.renderer.entity.SpriteRenderer; import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.animation.TileEntityRendererAnimation; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.client.registry.ClientRegistry; @@ -60,6 +61,9 @@ import vazkii.botania.common.lib.LibMisc; public final class ModelHandler { @SubscribeEvent public static void registerModels(ModelRegistryEvent evt) { + ModelLoader.addSpecialModel(new ModelResourceLocation(LibMisc.MOD_ID + ":mana_gun_clip", "inventory")); + ModelLoader.addSpecialModel(new ModelResourceLocation(LibMisc.MOD_ID + ":desu_gun", "inventory")); + ModelLoader.addSpecialModel(new ModelResourceLocation(LibMisc.MOD_ID + ":desu_gun_clip", "inventory")); registerSubtiles(); RenderTileFloatingFlower renderTileFloatingFlower = new RenderTileFloatingFlower(); diff --git a/src/main/java/vazkii/botania/client/model/GunModel.java b/src/main/java/vazkii/botania/client/model/GunModel.java index 4200ba492..a7327c9fb 100644 --- a/src/main/java/vazkii/botania/client/model/GunModel.java +++ b/src/main/java/vazkii/botania/client/model/GunModel.java @@ -20,6 +20,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; import net.minecraft.util.Direction; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.model.BasicState; import net.minecraftforge.client.model.ModelLoader; @@ -30,6 +31,7 @@ import net.minecraftforge.client.model.pipeline.VertexTransformer; import net.minecraftforge.common.model.TRSRTransformation; import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.common.item.ItemManaGun; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -38,6 +40,7 @@ import javax.vecmath.Vector3f; import javax.vecmath.Vector4f; import java.util.ArrayList; import java.util.EnumMap; +import java.util.HashMap; import java.util.IdentityHashMap; import java.util.List; import java.util.Map; @@ -45,36 +48,37 @@ import java.util.Random; import java.util.stream.Collectors; public class GunModel implements IBakedModel { + private static final ModelResourceLocation DESU = new ModelResourceLocation(LibMisc.MOD_ID + ":desu_gun", "inventory"); + private static final ModelResourceLocation DESU_CLIP = new ModelResourceLocation(LibMisc.MOD_ID + ":desu_gun_clip", "inventory"); private final ModelBakery bakery; private final IBakedModel originalModel; + private final IBakedModel originalModelClip; - public GunModel(ModelBakery bakery, IBakedModel originalModel) { + public GunModel(ModelBakery bakery, IBakedModel originalModel, IBakedModel originalModelClip) { this.bakery = bakery; this.originalModel = Preconditions.checkNotNull(originalModel); + this.originalModelClip = Preconditions.checkNotNull(originalModelClip); } private final ItemOverrideList itemHandler = new ItemOverrideList() { @Nonnull @Override public IBakedModel getModelWithOverrides(IBakedModel model, ItemStack stack, @Nullable World worldIn, @Nullable LivingEntity entityIn) { - // TODO 1.13 this faffing around with double overrides is dumb. Move back from json overrides once a "load this model please" PR gets merged? + boolean clip = ItemManaGun.hasClip(stack); - // First, let json overrides on original model apply. This gets us to the clip GunModel instance - IBakedModel jsonOverride = originalModel.getOverrides().getModelWithOverrides(originalModel, stack, worldIn, entityIn); - if (jsonOverride != null && jsonOverride != originalModel) { - // Now, apply overrides again. This will add lenses. - return jsonOverride.getOverrides().getModelWithOverrides(jsonOverride, stack, worldIn, entityIn); + if (ItemManaGun.isSugoiKawaiiDesuNe(stack)) { + return Minecraft.getInstance().getModelManager().getModel(clip ? DESU_CLIP : DESU); } - // Done doing override stuff, look up our composite models ItemStack lens = ItemManaGun.getLens(stack); if(!lens.isEmpty()) { + // TODO 1.14 : currently broken because it goes through the vanilla codepath which doesn't handle builtin/generated models ModelResourceLocation mrl = new ModelResourceLocation(lens.getItem().getRegistryName(), "inventory"); IUnbakedModel unbaked = ModelLoaderRegistry.getModelOrMissing(mrl); - return GunModel.this.getModel(unbaked); + return GunModel.this.getModel(unbaked, clip); } - else return GunModel.this; + else return clip ? originalModelClip : originalModel; } }; @@ -91,10 +95,10 @@ public class GunModel implements IBakedModel { @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return originalModel.getParticleTexture(); } @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return originalModel.getItemCameraTransforms(); } - private final IdentityHashMap cache = new IdentityHashMap<>(); + private final HashMap, CompositeBakedModel> cache = new HashMap<>(); - private CompositeBakedModel getModel(IUnbakedModel lens) { - return cache.computeIfAbsent(lens, l -> new CompositeBakedModel(bakery, l, originalModel)); + private CompositeBakedModel getModel(IUnbakedModel lens, boolean clip) { + return cache.computeIfAbsent(Pair.of(lens, clip), p -> new CompositeBakedModel(bakery, p.getLeft(), p.getRight() ? originalModelClip : originalModel)); } private static class CompositeBakedModel implements IBakedModel { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 01637e60f..e757db751 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -60,8 +60,12 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { public ItemManaGun(Properties props) { super(props.defaultMaxDamage(COOLDOWN)); - addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "clip"), (stack, world, entity) -> hasClip(stack) ? 1 : 0); - addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "desu"), (stack, world, entity) -> isSugoiKawaiiDesuNe(stack) ? 1 : 0); + } + + // ItemRenderer does not call IBakedModel.getModelWithOverrides unless this is true, or we have called addPropertyOverride. + @Override + public boolean hasCustomProperties() { + return true; } @Nonnull @@ -116,7 +120,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { // ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN // ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN // ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN - private boolean isSugoiKawaiiDesuNe(ItemStack stack) { + public static boolean isSugoiKawaiiDesuNe(ItemStack stack) { return stack.getDisplayName().getString().equalsIgnoreCase("desu gun"); } diff --git a/src/main/resources/assets/botania/models/item/mana_gun.json b/src/main/resources/assets/botania/models/item/mana_gun.json index d926508bf..b9bc2b402 100644 --- a/src/main/resources/assets/botania/models/item/mana_gun.json +++ b/src/main/resources/assets/botania/models/item/mana_gun.json @@ -184,26 +184,5 @@ "translation": [ -1.8, 2.5, 0 ], "scale": [ 0.45, 0.45, 0.45 ] } - }, - "overrides": [ - { - "predicate": { - "botania:desu": 1 - }, - "model": "botania:item/desu_gun" - }, - { - "predicate": { - "botania:clip": 1 - }, - "model": "botania:item/mana_gun_clip" - }, - { - "predicate": { - "botania:desu": 1, - "botania:clip": 1 - }, - "model": "botania:item/desu_gun_clip" - } - ] + } } \ No newline at end of file