Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Don't hide global overrides for textures with extra attributes ids

Browse Source
This commit is contained in:
Linnea Gräf
2025-01-21 13:17:01 +01:00
parent 2a3a4c07f5
commit 36cf26be6d
8 changed files with 79 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/texturePacks/java/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt
View File

@@ -76,7 +76,7 @@ object CustomSkyBlockTextures : FirmamentFeature {
fun onCustomModelId(it: CustomItemModelEvent) {
if (!TConfig.enabled) return
val id = it.itemStack.skyBlockId ?: return
it.overrideIfExists(Identifier.of("firmskyblock", id.identifier.path))
it.overrideIfEmpty(Identifier.of("firmskyblock", id.identifier.path))
}
private val skullTextureCache =

2
src/texturePacks/java/moe/nea/firmament/features/texturepack/predicates/ItemPredicate.kt
View File

@@ -17,7 +17,7 @@ class ItemPredicate(
val item: Item
) : FirmamentModelPredicate {
override fun test(stack: ItemStack): Boolean {
return stack.item == item
return stack.isOf(item)
}
object Parser : FirmamentModelPredicateParser {

22
src/texturePacks/java/moe/nea/firmament/mixins/custommodels/ReplaceItemModelPatch.java
View File

@@ -4,42 +4,40 @@ package moe.nea.firmament.mixins.custommodels;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import moe.nea.firmament.events.CustomItemModelEvent;
import moe.nea.firmament.util.mc.IntrospectableItemModelManager;
import net.minecraft.client.item.ItemModelManager;
import net.minecraft.client.render.item.model.ItemModel;
import net.minecraft.client.render.item.model.MissingItemModel;
import net.minecraft.client.render.model.BakedModelManager;
import net.minecraft.component.ComponentType;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Identifier;
import org.jetbrains.annotations.NotNull;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.function.Function;
@Mixin(ItemModelManager.class)
public class ReplaceItemModelPatch {
public class ReplaceItemModelPatch implements IntrospectableItemModelManager {
@Shadow
@Final
private Function<Identifier, ItemModel> modelGetter;
@Unique
private boolean hasModel(Identifier identifier) {
return !(modelGetter.apply(identifier) instanceof MissingItemModel);
}
@WrapOperation(
method = "update(Lnet/minecraft/client/render/item/ItemRenderState;Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ModelTransformationMode;Lnet/minecraft/world/World;Lnet/minecraft/entity/LivingEntity;I)V",
at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;get(Lnet/minecraft/component/ComponentType;)Ljava/lang/Object;"))
private Object replaceItemModelByIdentifier(ItemStack instance, ComponentType componentType, Operation<Object> original) {
var override = CustomItemModelEvent.getModelIdentifier(instance);
if (override != null && hasModel(override)) {
var override = CustomItemModelEvent.getModelIdentifier(instance, this);
if (override != null && hasModel_firmament(override)) {
return override;
}
return original.call(instance, componentType);
}
@Override
public boolean hasModel_firmament(@NotNull Identifier identifier) {
return !(modelGetter.apply(identifier) instanceof MissingItemModel);
}
}

5
src/texturePacks/java/moe/nea/firmament/mixins/custommodels/SupplyFakeModelPatch.java
View File

@@ -48,9 +48,8 @@ public class SupplyFakeModelPatch {
Map<Identifier, ItemAsset> newModels = new HashMap<>(oldModels.contents());
var resources = resourceManager.findResources(
"models/item",
id -> id.getNamespace().equals("firmskyblock")
&& id.getPath().endsWith(".json")
&& !id.getPath().substring("models/item/".length()).contains("/"));
id -> (id.getNamespace().equals("firmskyblock") || id.getNamespace().equals("cittofirmgenerated"))
&& id.getPath().endsWith(".json"));
for (Map.Entry<Identifier, Resource> model : resources.entrySet()) {
var resource = model.getValue();
var itemModelId = model.getKey().withPath(it -> it.substring("models/item/".length(), it.length() - ".json".length()));