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

fix: Item predicates not applying unless a vanilla predicate is present

Browse Source
This commit is contained in:
Linnea Gräf
2024-11-17 19:41:18 +01:00
parent 6045077025
commit 86cbf9d422
8 changed files with 159 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/moe/nea/firmament/mixins/CustomModelEventPatch.java
View File

@@ -3,9 +3,11 @@
package moe.nea.firmament.mixins; package moe.nea.firmament.mixins;
import moe.nea.firmament.events.CustomItemModelEvent; import moe.nea.firmament.events.CustomItemModelEvent;
import moe.nea.firmament.features.texturepack.CustomGlobalTextures;
import net.minecraft.client.render.item.ItemModels; import net.minecraft.client.render.item.ItemModels;
import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.BakedModelManager; import net.minecraft.client.render.model.BakedModelManager;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
@@ -22,8 +24,13 @@ public class CustomModelEventPatch {
@Inject(method = "getModel(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/client/render/model/BakedModel;", at = @At("HEAD"), cancellable = true) @Inject(method = "getModel(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/client/render/model/BakedModel;", at = @At("HEAD"), cancellable = true)
public void onGetModel(ItemStack stack, CallbackInfoReturnable<BakedModel> cir) { public void onGetModel(ItemStack stack, CallbackInfoReturnable<BakedModel> cir) {
var model = CustomItemModelEvent.getModel(stack, (ItemModels) (Object) this); var $this = (ItemModels) (Object) this;
if (model != null) var model = CustomItemModelEvent.getModel(stack, $this);
if (model == null) {
model = CustomGlobalTextures.replaceGlobalModel($this, stack);
}
if (model != null) {
cir.setReturnValue(model); cir.setReturnValue(model);
}
} }
} }

31
src/main/java/moe/nea/firmament/mixins/custommodels/GlobalModelOverridePatch.java
View File

@@ -1,31 +0,0 @@
package moe.nea.firmament.mixins.custommodels;
import moe.nea.firmament.features.texturepack.CustomGlobalTextures;
import net.minecraft.client.render.item.ItemModels;
import net.minecraft.client.render.item.ItemRenderer;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.entity.LivingEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(ItemRenderer.class)
public abstract class GlobalModelOverridePatch {
@Shadow
@Final
private ItemModels models;
@Inject(method = "getModel(Lnet/minecraft/item/ItemStack;Lnet/minecraft/world/World;Lnet/minecraft/entity/LivingEntity;I)Lnet/minecraft/client/render/model/BakedModel;", at = @At("HEAD"), cancellable = true)
private void overrideGlobalModel(
ItemStack stack, World world, LivingEntity entity,
int seed, CallbackInfoReturnable<BakedModel> cir) {
CustomGlobalTextures.replaceGlobalModel(this.models, stack, cir);
}
}

23
src/main/java/moe/nea/firmament/mixins/custommodels/TestForFirmamentOverridePredicatesPatch.java
View File

@@ -2,7 +2,10 @@
package moe.nea.firmament.mixins.custommodels; package moe.nea.firmament.mixins.custommodels;
import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import com.llamalad7.mixinextras.sugar.Local; import com.llamalad7.mixinextras.sugar.Local;
import moe.nea.firmament.Firmament;
import moe.nea.firmament.features.texturepack.BakedOverrideData; import moe.nea.firmament.features.texturepack.BakedOverrideData;
import moe.nea.firmament.features.texturepack.CustomSkyBlockTextures; import moe.nea.firmament.features.texturepack.CustomSkyBlockTextures;
import moe.nea.firmament.features.texturepack.FirmamentModelPredicate; import moe.nea.firmament.features.texturepack.FirmamentModelPredicate;
@@ -10,13 +13,23 @@ import moe.nea.firmament.features.texturepack.ModelOverrideData;
import net.minecraft.client.render.model.json.ModelOverride; import net.minecraft.client.render.model.json.ModelOverride;
import net.minecraft.client.render.model.json.ModelOverrideList; import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.Identifier;
import org.objectweb.asm.Opcodes;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyArg; import org.spongepowered.asm.mixin.injection.ModifyArg;
import java.util.List;
import java.util.Objects;
@Mixin(ModelOverrideList.class) @Mixin(ModelOverrideList.class)
public class TestForFirmamentOverridePredicatesPatch { public class TestForFirmamentOverridePredicatesPatch {
@Shadow
private Identifier[] conditionTypes;
@ModifyArg(method = "<init>(Lnet/minecraft/client/render/model/Baker;Ljava/util/List;)V", @ModifyArg(method = "<init>(Lnet/minecraft/client/render/model/Baker;Ljava/util/List;)V",
at = @At( at = @At(
value = "INVOKE", target = "Ljava/util/List;add(Ljava/lang/Object;)Z" value = "INVOKE", target = "Ljava/util/List;add(Ljava/lang/Object;)Z"
@@ -26,8 +39,14 @@ public class TestForFirmamentOverridePredicatesPatch {
@Local ModelOverride modelOverride @Local ModelOverride modelOverride
) { ) {
var bakedOverride = (ModelOverrideList.BakedOverride) element; var bakedOverride = (ModelOverrideList.BakedOverride) element;
((BakedOverrideData) (Object) bakedOverride) var modelOverrideData = ModelOverrideData.cast(modelOverride);
.setFirmamentOverrides(((ModelOverrideData) (Object) modelOverride).getFirmamentOverrides()); BakedOverrideData.cast(bakedOverride)
.setFirmamentOverrides(modelOverrideData.getFirmamentOverrides());
if (conditionTypes.length == 0 &&
modelOverrideData.getFirmamentOverrides() != null &&
modelOverrideData.getFirmamentOverrides().length > 0) {
conditionTypes = new Identifier[]{Firmament.INSTANCE.identifier("sentinel/enforce_model_override_evaluation")};
}
return element; return element;
} }

8
src/main/kotlin/features/texturepack/BakedOverrideData.kt
View File

@@ -1,8 +1,14 @@
package moe.nea.firmament.features.texturepack package moe.nea.firmament.features.texturepack
import net.minecraft.client.render.model.json.ModelOverrideList
interface BakedOverrideData { interface BakedOverrideData {
fun getFirmamentOverrides(): Array<FirmamentModelPredicate>? fun getFirmamentOverrides(): Array<FirmamentModelPredicate>?
fun setFirmamentOverrides(overrides: Array<FirmamentModelPredicate>?) fun setFirmamentOverrides(overrides: Array<FirmamentModelPredicate>?)
companion object{
@Suppress("CAST_NEVER_SUCCEEDS")
@JvmStatic
fun cast(bakedOverride: ModelOverrideList.BakedOverride): BakedOverrideData = bakedOverride as BakedOverrideData
}
} }

218
src/main/kotlin/features/texturepack/CustomGlobalTextures.kt
View File

@@ -6,7 +6,6 @@ package moe.nea.firmament.features.texturepack
import java.util.Optional import java.util.Optional
import java.util.concurrent.CompletableFuture import java.util.concurrent.CompletableFuture
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.UseSerializers import kotlinx.serialization.UseSerializers
import kotlin.jvm.optionals.getOrNull import kotlin.jvm.optionals.getOrNull
@@ -35,132 +34,131 @@ import moe.nea.firmament.util.json.SingletonSerializableList
import moe.nea.firmament.util.runNull import moe.nea.firmament.util.runNull
object CustomGlobalTextures : SinglePreparationResourceReloader<CustomGlobalTextures.CustomGuiTextureOverride>(), object CustomGlobalTextures : SinglePreparationResourceReloader<CustomGlobalTextures.CustomGuiTextureOverride>(),
SubscriptionOwner { SubscriptionOwner {
override val delegateFeature: FirmamentFeature override val delegateFeature: FirmamentFeature
get() = CustomSkyBlockTextures get() = CustomSkyBlockTextures
class CustomGuiTextureOverride( class CustomGuiTextureOverride(
val classes: List<ItemOverrideCollection> val classes: List<ItemOverrideCollection>
) )
@Serializable @Serializable
data class GlobalItemOverride( data class GlobalItemOverride(
val screen: @Serializable(SingletonSerializableList::class) List<Identifier>, val screen: @Serializable(SingletonSerializableList::class) List<Identifier>,
val model: Identifier, val model: Identifier,
val predicate: FirmamentModelPredicate, val predicate: FirmamentModelPredicate,
) )
@Serializable @Serializable
data class ScreenFilter( data class ScreenFilter(
val title: StringMatcher, val title: StringMatcher,
) )
data class ItemOverrideCollection( data class ItemOverrideCollection(
val screenFilter: ScreenFilter, val screenFilter: ScreenFilter,
val overrides: List<GlobalItemOverride>, val overrides: List<GlobalItemOverride>,
) )
@Subscribe @Subscribe
fun onStart(event: FinalizeResourceManagerEvent) { fun onStart(event: FinalizeResourceManagerEvent) {
MC.resourceManager.registerReloader(this) MC.resourceManager.registerReloader(this)
} }
@Subscribe @Subscribe
fun onEarlyReload(event: EarlyResourceReloadEvent) { fun onEarlyReload(event: EarlyResourceReloadEvent) {
preparationFuture = CompletableFuture preparationFuture = CompletableFuture
.supplyAsync( .supplyAsync(
{ {
prepare(event.resourceManager) prepare(event.resourceManager)
}, event.preparationExecutor) }, event.preparationExecutor)
} }
@Subscribe @Subscribe
fun onBakeModels(event: BakeExtraModelsEvent) { fun onBakeModels(event: BakeExtraModelsEvent) {
for (guiClassOverride in preparationFuture.join().classes) { for (guiClassOverride in preparationFuture.join().classes) {
for (override in guiClassOverride.overrides) { for (override in guiClassOverride.overrides) {
event.addItemModel(ModelIdentifier(override.model, "inventory")) event.addItemModel(ModelIdentifier(override.model, "inventory"))
} }
} }
} }
@Volatile @Volatile
var preparationFuture: CompletableFuture<CustomGuiTextureOverride> = CompletableFuture.completedFuture( var preparationFuture: CompletableFuture<CustomGuiTextureOverride> = CompletableFuture.completedFuture(
CustomGuiTextureOverride(listOf())) CustomGuiTextureOverride(listOf()))
override fun prepare(manager: ResourceManager?, profiler: Profiler?): CustomGuiTextureOverride { override fun prepare(manager: ResourceManager?, profiler: Profiler?): CustomGuiTextureOverride {
return preparationFuture.join() return preparationFuture.join()
} }
override fun apply(prepared: CustomGuiTextureOverride, manager: ResourceManager?, profiler: Profiler?) { override fun apply(prepared: CustomGuiTextureOverride, manager: ResourceManager?, profiler: Profiler?) {
this.guiClassOverrides = prepared this.guiClassOverrides = prepared
} }
val logger = LoggerFactory.getLogger(CustomGlobalTextures::class.java) val logger = LoggerFactory.getLogger(CustomGlobalTextures::class.java)
fun prepare(manager: ResourceManager): CustomGuiTextureOverride { fun prepare(manager: ResourceManager): CustomGuiTextureOverride {
val overrideResources = val overrideResources =
manager.findResources("overrides/item") { it.namespace == "firmskyblock" && it.path.endsWith(".json") } manager.findResources("overrides/item") { it.namespace == "firmskyblock" && it.path.endsWith(".json") }
.mapNotNull { .mapNotNull {
Firmament.tryDecodeJsonFromStream<GlobalItemOverride>(it.value.inputStream).getOrElse { ex -> Firmament.tryDecodeJsonFromStream<GlobalItemOverride>(it.value.inputStream).getOrElse { ex ->
logger.error("Failed to load global item override at ${it.key}", ex) logger.error("Failed to load global item override at ${it.key}", ex)
null null
} }
} }
val byGuiClass = overrideResources.flatMap { override -> override.screen.toSet().map { it to override } } val byGuiClass = overrideResources.flatMap { override -> override.screen.toSet().map { it to override } }
.groupBy { it.first } .groupBy { it.first }
val guiClasses = byGuiClass.entries val guiClasses = byGuiClass.entries
.mapNotNull { .mapNotNull {
val key = it.key val key = it.key
val guiClassResource = val guiClassResource =
manager.getResource(Identifier.of(key.namespace, "filters/screen/${key.path}.json")) manager.getResource(Identifier.of(key.namespace, "filters/screen/${key.path}.json"))
.getOrNull() .getOrNull()
?: return@mapNotNull runNull { ?: return@mapNotNull runNull {
logger.error("Failed to locate screen filter at $key") logger.error("Failed to locate screen filter at $key")
} }
val screenFilter = val screenFilter =
Firmament.tryDecodeJsonFromStream<ScreenFilter>(guiClassResource.inputStream) Firmament.tryDecodeJsonFromStream<ScreenFilter>(guiClassResource.inputStream)
.getOrElse { ex -> .getOrElse { ex ->
logger.error("Failed to load screen filter at $key", ex) logger.error("Failed to load screen filter at $key", ex)
return@mapNotNull null return@mapNotNull null
} }
ItemOverrideCollection(screenFilter, it.value.map { it.second }) ItemOverrideCollection(screenFilter, it.value.map { it.second })
} }
logger.info("Loaded ${overrideResources.size} global item overrides") logger.info("Loaded ${overrideResources.size} global item overrides")
return CustomGuiTextureOverride(guiClasses) return CustomGuiTextureOverride(guiClasses)
} }
var guiClassOverrides = CustomGuiTextureOverride(listOf()) var guiClassOverrides = CustomGuiTextureOverride(listOf())
var matchingOverrides: Set<ItemOverrideCollection> = setOf() var matchingOverrides: Set<ItemOverrideCollection> = setOf()
@Subscribe @Subscribe
fun onOpenGui(event: ScreenChangeEvent) { fun onOpenGui(event: ScreenChangeEvent) {
val newTitle = event.new?.title ?: Text.empty() val newTitle = event.new?.title ?: Text.empty()
matchingOverrides = guiClassOverrides.classes matchingOverrides = guiClassOverrides.classes
.filterTo(mutableSetOf()) { it.screenFilter.title.matches(newTitle) } .filterTo(mutableSetOf()) { it.screenFilter.title.matches(newTitle) }
} }
val overrideCache = WeakCache.memoize<ItemStack, ItemModels, Optional<BakedModel>>("CustomGlobalTextureModelOverrides") { stack, models -> val overrideCache =
matchingOverrides WeakCache.memoize<ItemStack, ItemModels, Optional<BakedModel>>("CustomGlobalTextureModelOverrides") { stack, models ->
.firstNotNullOfOrNull { matchingOverrides
it.overrides .firstNotNullOfOrNull {
.asSequence() it.overrides
.filter { it.predicate.test(stack) } .asSequence()
.map { models.getModel(it.model) } .filter { it.predicate.test(stack) }
.firstOrNull() .map { models.getModel(it.model) }
} .firstOrNull()
.intoOptional() }
} .intoOptional()
}
@JvmStatic @JvmStatic
fun replaceGlobalModel( fun replaceGlobalModel(
models: ItemModels, models: ItemModels,
stack: ItemStack, stack: ItemStack,
cir: CallbackInfoReturnable<BakedModel> ): BakedModel? {
) { return overrideCache.invoke(stack, models).getOrNull()
overrideCache.invoke(stack, models) }
.ifPresent(cir::setReturnValue)
}
} }

14
src/main/kotlin/features/texturepack/ModelOverrideData.kt
View File

@@ -1,7 +1,15 @@
package moe.nea.firmament.features.texturepack package moe.nea.firmament.features.texturepack
import net.minecraft.client.render.model.json.ModelOverride
interface ModelOverrideData { interface ModelOverrideData {
fun getFirmamentOverrides(): Array<FirmamentModelPredicate>? companion object {
fun setFirmamentOverrides(overrides: Array<FirmamentModelPredicate>?)
@JvmStatic
@Suppress("CAST_NEVER_SUCCEEDS")
fun cast(override: ModelOverride) = override as ModelOverrideData
}
fun getFirmamentOverrides(): Array<FirmamentModelPredicate>?
fun setFirmamentOverrides(overrides: Array<FirmamentModelPredicate>?)
} }

2
src/main/kotlin/repo/HypixelStaticData.kt
View File

@@ -6,6 +6,7 @@ import org.apache.logging.log4j.LogManager
import org.lwjgl.glfw.GLFW import org.lwjgl.glfw.GLFW
import kotlinx.coroutines.async import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withTimeoutOrNull import kotlinx.coroutines.withTimeoutOrNull
import kotlinx.serialization.SerialName import kotlinx.serialization.SerialName
@@ -74,6 +75,7 @@ object HypixelStaticData {
while (true) { while (true) {
logger.info("Updating NEU prices") logger.info("Updating NEU prices")
updatePrices() updatePrices()
delay(10.minutes)
} }
} }
} }

1
src/main/resources/firmament.accesswidener
View File

@@ -6,6 +6,7 @@ accessible field net/minecraft/client/gui/hud/InGameHud SCOREBOARD_ENTRY_COMPARA
accessible field net/minecraft/client/render/item/HeldItemRenderer itemRenderer Lnet/minecraft/client/render/item/ItemRenderer; accessible field net/minecraft/client/render/item/HeldItemRenderer itemRenderer Lnet/minecraft/client/render/item/ItemRenderer;
accessible field net/minecraft/client/render/item/ItemModels missingModelSupplier Ljava/util/function/Supplier; accessible field net/minecraft/client/render/item/ItemModels missingModelSupplier Ljava/util/function/Supplier;
mutable field net/minecraft/client/render/model/json/ModelOverrideList conditionTypes [Lnet/minecraft/util/Identifier;
accessible class net/minecraft/client/render/model/json/ModelOverride$Deserializer accessible class net/minecraft/client/render/model/json/ModelOverride$Deserializer
accessible class net/minecraft/client/render/model/json/ModelOverrideList$BakedOverride accessible class net/minecraft/client/render/model/json/ModelOverrideList$BakedOverride