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;
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.model.BakedModel;
import net.minecraft.client.render.model.BakedModelManager;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Identifier;
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)
public void onGetModel(ItemStack stack, CallbackInfoReturnable<BakedModel> cir) {
var model = CustomItemModelEvent.getModel(stack, (ItemModels) (Object) this);
if (model != null)
var $this = (ItemModels) (Object) this;
var model = CustomItemModelEvent.getModel(stack, $this);
if (model == null) {
model = CustomGlobalTextures.replaceGlobalModel($this, stack);
}
if (model != null) {
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;
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 moe.nea.firmament.Firmament;
import moe.nea.firmament.features.texturepack.BakedOverrideData;
import moe.nea.firmament.features.texturepack.CustomSkyBlockTextures;
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.ModelOverrideList;
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.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import java.util.List;
import java.util.Objects;
@Mixin(ModelOverrideList.class)
public class TestForFirmamentOverridePredicatesPatch {
@Shadow
private Identifier[] conditionTypes;
@ModifyArg(method = "<init>(Lnet/minecraft/client/render/model/Baker;Ljava/util/List;)V",
at = @At(
value = "INVOKE", target = "Ljava/util/List;add(Ljava/lang/Object;)Z"
@@ -26,8 +39,14 @@ public class TestForFirmamentOverridePredicatesPatch {
@Local ModelOverride modelOverride
) {
var bakedOverride = (ModelOverrideList.BakedOverride) element;
((BakedOverrideData) (Object) bakedOverride)
.setFirmamentOverrides(((ModelOverrideData) (Object) modelOverride).getFirmamentOverrides());
var modelOverrideData = ModelOverrideData.cast(modelOverride);
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;
}

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

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

10
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.concurrent.CompletableFuture
import org.slf4j.LoggerFactory
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
import kotlinx.serialization.Serializable
import kotlinx.serialization.UseSerializers
import kotlin.jvm.optionals.getOrNull
@@ -140,7 +139,8 @@ object CustomGlobalTextures : SinglePreparationResourceReloader<CustomGlobalText
.filterTo(mutableSetOf()) { it.screenFilter.title.matches(newTitle) }
}
val overrideCache = WeakCache.memoize<ItemStack, ItemModels, Optional<BakedModel>>("CustomGlobalTextureModelOverrides") { stack, models ->
val overrideCache =
WeakCache.memoize<ItemStack, ItemModels, Optional<BakedModel>>("CustomGlobalTextureModelOverrides") { stack, models ->
matchingOverrides
.firstNotNullOfOrNull {
it.overrides
@@ -156,10 +156,8 @@ object CustomGlobalTextures : SinglePreparationResourceReloader<CustomGlobalText
fun replaceGlobalModel(
models: ItemModels,
stack: ItemStack,
cir: CallbackInfoReturnable<BakedModel>
) {
overrideCache.invoke(stack, models)
.ifPresent(cir::setReturnValue)
): BakedModel? {
return overrideCache.invoke(stack, models).getOrNull()
}

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

@@ -1,7 +1,15 @@
package moe.nea.firmament.features.texturepack
import net.minecraft.client.render.model.json.ModelOverride
interface ModelOverrideData {
companion object {
@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 kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import kotlinx.coroutines.withTimeoutOrNull
import kotlinx.serialization.SerialName
@@ -74,6 +75,7 @@ object HypixelStaticData {
while (true) {
logger.info("Updating NEU prices")
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/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/ModelOverrideList$BakedOverride