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 17a64aa33..d38af2041 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -102,22 +102,21 @@ public class MiscellaneousIcons { IBakedModel original = evt.getModelRegistry().get(new ModelResourceLocation("botania:lexicon", "inventory")); evt.getModelRegistry().put(new ModelResourceLocation("botania:lexicon", "inventory"), new LexiconModel(original)); - /* todo 1.13 models referenced using overrides aren't put in the model registry? - original = evt.getModelRegistry().get(new ModelResourceLocation("botania:lexicon_elven", "inventory")); - evt.getModelRegistry().put(new ModelResourceLocation("botania:lexicon_elven", "inventory"), - new LexiconModel(original)); - */ + + // models referenced using json overrides aren't put in the model registry, so just go through all override models and wrap them there + for (int i = 0; i < original.getOverrides().overrideBakedModels.size(); i++) { + original.getOverrides().overrideBakedModels.set(i, new LexiconModel(original.getOverrides().overrideBakedModels.get(i))); + } // Mana Blaster ModelResourceLocation key = new ModelResourceLocation("botania:mana_gun", "inventory"); IBakedModel originalModel = evt.getModelRegistry().get(key); evt.getModelRegistry().put(key, new GunModel(originalModel)); - /* todo 1.13 models referenced using overrides aren't put in the model registry? - key = new ModelResourceLocation("botania:mana_gun_clip", "inventory"); - originalModel = evt.getModelRegistry().get(key); - evt.getModelRegistry().put(key, new GunModel(originalModel)); - */ + // same as lexicon, reach into all json overrides and wrap them + for (int i = 0; i < originalModel.getOverrides().overrideBakedModels.size(); i++) { + originalModel.getOverrides().overrideBakedModels.set(i, new GunModel(originalModel.getOverrides().overrideBakedModels.get(i))); + } } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/client/model/GunModel.java b/src/main/java/vazkii/botania/client/model/GunModel.java index 9bff6817e..7c4a43ac1 100644 --- a/src/main/java/vazkii/botania/client/model/GunModel.java +++ b/src/main/java/vazkii/botania/client/model/GunModel.java @@ -47,6 +47,12 @@ public class GunModel implements IBakedModel { @Nonnull @Override public IBakedModel getModelWithOverrides(IBakedModel model, ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) { + // First, let json overrides on original model apply + IBakedModel origOverride = originalModel.getOverrides().getModelWithOverrides(originalModel, stack, worldIn, entityIn); + if (origOverride != null && origOverride != originalModel) + return origOverride; + + // Otherwise, look up our composite models ItemStack lens = ItemManaGun.getLens(stack); if(!lens.isEmpty()) { IBakedModel lensModel = Minecraft.getInstance().getItemRenderer().getItemModelMesher().getItemModel(lens); @@ -121,23 +127,26 @@ public class GunModel implements IBakedModel { for(EnumFacing e : EnumFacing.values()) faceQuads.put(e, new ArrayList<>()); + Random rand = new Random(0); // Add lens quads, scaled and translated - for(BakedQuad quad : lens.getQuads(null, null, new Random(0))) { + for(BakedQuad quad : lens.getQuads(null, null, rand)) { genBuilder.add(transform(quad, transform)); } for(EnumFacing e : EnumFacing.values()) { - faceQuads.get(e).addAll(lens.getQuads(null, e, new Random(0)).stream().map(input -> transform(input, transform)).collect(Collectors.toList())); + rand.setSeed(0); + faceQuads.get(e).addAll(lens.getQuads(null, e, rand).stream().map(input -> transform(input, transform)).collect(Collectors.toList())); } // Add gun quads - genBuilder.addAll(gun.getQuads(null, null, new Random(0))); + rand.setSeed(0); + genBuilder.addAll(gun.getQuads(null, null, rand)); for(EnumFacing e : EnumFacing.values()) { - faceQuads.get(e).addAll(gun.getQuads(null, e, new Random(0))); + rand.setSeed(0); + faceQuads.get(e).addAll(gun.getQuads(null, e, rand)); } genQuads = genBuilder.build(); - } @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, @Nonnull Random rand) { return face == null ? genQuads : faceQuads.get(face); } diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index dd16f8f88..267991bda 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -39,5 +39,5 @@ public class LexiconModel implements IBakedModel { @Override public boolean isBuiltInRenderer() { return false; } @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return original.getParticleTexture(); } @SuppressWarnings("deprecation") @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } - @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.EMPTY; } + @Nonnull @Override public ItemOverrideList getOverrides() { return original.getOverrides(); } } diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index 044470e1c..29b576999 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -51,4 +51,6 @@ public net.minecraft.entity.EntityLiving field_184659_bA # deathLootTable public net.minecraft.item.ItemUseContext (Lnet/minecraft/world/World;Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/EnumFacing;FFF)V -public net.minecraft.tileentity.TileEntityFurnace func_145952_a(Lnet/minecraft/item/ItemStack;)I # getItemBurnTime \ No newline at end of file +public net.minecraft.tileentity.TileEntityFurnace func_145952_a(Lnet/minecraft/item/ItemStack;)I # getItemBurnTime + +public net.minecraft.client.renderer.model.ItemOverrideList field_209582_c # overrideBakedModels