[1.16.X] Changing Default Potion Texture

[urbanxx001]

Following the method outlined by diesieben07 here, I'm attempting to override a texture for a custom potion. I (think?) I have the full ModelBakeEvent implemented, but I'm not sure if it's running, as I get no response similar to here. The new model is being added in the ModelRegistryEvent though. Below are my event classes and item model. Thanks!

Spoiler

@Mod.EventBusSubscriber(modid = Main.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
public class ModSubscribeModEvents {

    @SubscribeEvent
    public static void onModelRegistry(ModelRegistryEvent event) {
        System.out.println("Added model");
        ModelLoader.addSpecialModel(new ResourceLocation(Main.MOD_ID, "item/new_potion_model"));
    }
}

Spoiler

@Mod.EventBusSubscriber(modid = Main.MOD_ID)
public class ModSubscribeForgeEvents {

    @SubscribeEvent
    public void onModelBake(ModelBakeEvent event) {
        IBakedModel oldModel = event.getModelRegistry().get(new ModelResourceLocation("minecraft:potion#inventory"));
        ModelResourceLocation newLocation = new ModelResourceLocation("mod_id:new_potion_model#inventory");
        IBakedModel newModel = event.getModelRegistry().get(newLocation);
        ItemOverrideList newList0 = newModel.getOverrides();
        System.out.println("Check1");

        ItemOverrideList newList1 = new ItemOverrideList() {
            @Override
            public IBakedModel resolve(IBakedModel model, ItemStack stack, @Nullable ClientWorld clientWorld, @Nullable LivingEntity livingEntity) {
                if (stack.getItem() instanceof PotionItem) {
                    if (PotionUtils.getPotion(stack) == ModEffects.MY_POTION.get()) {
                        System.out.println("Check2");
                        return newModel;
                    }
                }
                return super.resolve(model, stack, clientWorld, livingEntity);
            }

            @Override
            public ImmutableList<ItemOverride> getOverrides() {
                return newList0.getOverrides();
            }
        };

        BakedModelWrapper newBakedModelWrapper = new BakedModelWrapper(oldModel) {
            @Override
            public ItemOverrideList getOverrides() {
                return newList1;
            }
        };
        event.getModelRegistry().put(newLocation, newBakedModelWrapper);
    }
}

 

Spoiler

{
    "parent": "item/generated",
    "textures": {
        "layer0": "extra:item/new_potion_texture",
        "layer1": "extra:item/blank"
    }
}

 

Edited June 17, 2022 by urbanxx001

[urbanxx001]

Thanks. Sorry for the stupid mistake. The event is firing, but I'm not sure what to do with getOverrides(), unlike resolve() that has constructor parameters to check with. Trying to return or use newList0.getOverrides() here is null. The resource location should be correct.

Edited June 17, 2022 by urbanxx001

[urbanxx001]

18 hours ago, diesieben07 said:

You should seriously name your variables better.

Yeah I was confused and labeled both as newList. I'm returning:

ImmutableList<ItemOverride> oldList = oldModel.getOverrides().getOverrides();

in newList1.getOverride now.

I'm not sure what using oldList in newList1.resolve would do though, since the checks for the itemstack already exist, and new model is returned here. Unless it's for another form of check (what vanilla does). I also can't debug resolve as console outputs there don't work (or something's preventing it).

I appreciate your help. I've read the forge docs and tried finding similar examples, but this event hack is something else.

Edited June 19, 2022 by urbanxx001

[urbanxx001]

7 hours ago, diesieben07 said:

Show updated code.

Spoiler

public class ModelBakeHandler {

    @SubscribeEvent
    public void onModelBake(ModelBakeEvent event) {
        IBakedModel oldModel = event.getModelRegistry().get(new ModelResourceLocation(new ResourceLocation("minecraft", "potion"), "inventory"));
        ImmutableList<ItemOverride> oldImmutableList = oldModel.getOverrides().getOverrides();
        List<ItemOverride> oldList = new ArrayList<>(oldImmutableList);
        ModelResourceLocation newLocation = new ModelResourceLocation(new ResourceLocation("mod_id", "new_potion_model"), "inventory");
        IBakedModel newModel = event.getModelRegistry().get(newLocation);

        ItemOverrideList newList = new ItemOverrideList() {
            @Override
            public IBakedModel resolve(IBakedModel model, ItemStack stack, @Nullable ClientWorld clientWorld, @Nullable LivingEntity livingEntity) {
                if (!oldList.isEmpty()) { // Necessary? Assume list is single entry so don't loop through it like vanilla
                    if (PotionUtils.getPotion(stack) == ModEffects.MY_POTION.get()) {
                        if (newModel == null) { // In case resource location is bad
                            return model;
                        }
                        return newModel;
                    }
                }
                return super.resolve(model, stack, clientWorld, livingEntity);
            }
            @Override
            public ImmutableList<ItemOverride> getOverrides() {
                return oldImmutableList;
            }
        };

        BakedModelWrapper newBakedModelWrapper = new BakedModelWrapper(oldModel) {
            @Override
            public ItemOverrideList getOverrides() {
                return newList;
            }
        };
        event.getModelRegistry().put(newLocation, newBakedModelWrapper);
    }

}

 

Edited June 20, 2022 by urbanxx001

[urbanxx001]

51 minutes ago, diesieben07 said:

No. Refer to oldModel.getOverrides.

Understood, the return for newList.resolve() should be oldModel.getOverrides().resolve(params). It didn't dawn on me that 'proceed as previously' in step 4 referred to the oldModel here as well instead of the method's super, but it makes sense since you specified it should in step 3.

In newList.getOverrides, oldImmutableList already derives from oldModel.getOverrides, but I'll inline the variable if it makes a difference (oldModel.getOverrides().getOverrides())

Edited June 20, 2022 by urbanxx001

[urbanxx001]

Meant to follow up on this, but I discovered that brewing recipes can also be registered to BrewingRecipeRegistry vs trying to swap out textures for potions. I was only familiar with the reflection method, but it's neat that there's two ways. Doesn't address the original problem, but code below for future visitors:

Registry:

private static void commonSetup(FMLCommonSetupEvent event) {
    event.enqueueWork(() -> {
		ModEffects.addBrews1();
    });
	ModEffects.addBrews2();
}

Methods:

public class ModEffects extends Effects {

    public static final DeferredRegister<Effect> EFFECTS = DeferredRegister.create(ForgeRegistries.POTIONS, Main.MOD_ID);
    public static final DeferredRegister<Potion> POTIONS = DeferredRegister.create(ForgeRegistries.POTION_TYPES, Main.MOD_ID);

    public static RegistryObject<Effect> MY_EFFECT    = EFFECTS.register("my_effect", MyEffect::new);
    public static final RegistryObject<Potion> MY_POTION     = POTIONS.register("my_potion", () -> new Potion(new EffectInstance(MY_EFFECT.get(), 1)));
      
    // Method 1
      
    public static void addBrews1() {
      BrewingRecipeRegistry.addRecipe(Ingredient.of(ModItems.INPUT_ITEM), Ingredient.of(ModItems.INGREDIENT_ITEM), new ItemStack(ModItems.OUTPUT_ITEM));
    } 
      
    // Method 2 (vanilla-style, adds splash, lingering, and arrow variants)  
      
    private static Method brewing_mixes;

    private static void addMix(Potion start, Item ingredient, Potion result) {
        if (brewing_mixes == null) {
            brewing_mixes = ObfuscationReflectionHelper.findMethod(PotionBrewing.class, "addMix", Potion.class, Item.class, Potion.class);
            brewing_mixes.setAccessible(true);
        }
        try {
            brewing_mixes.invoke(null, start, ingredient, result);
        } catch(IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
            e.printStackTrace();
        }
    }

    public static void addBrews2() {
        addMix(Potions.AWKWARD, ModItems.INGREDIENT_ITEM, MY_POTION.get());
    }
}

 

Edited June 28, 2022 by urbanxx001