R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1.18 into 1.19.2

Browse Source
This commit is contained in:
embeddedt 2023-12-14 21:11:57 -05:00
commit 5e8a111fed
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemModelShaperMixin.java
View File

@ -6,6 +6,7 @@ import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.resources.model.ModelManager; import net.minecraft.client.resources.model.ModelManager;
import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import org.embeddedt.modernfix.dynamicresources.DynamicModelCache;
import org.embeddedt.modernfix.dynamicresources.ModelLocationCache; import org.embeddedt.modernfix.dynamicresources.ModelLocationCache;
import org.embeddedt.modernfix.util.DynamicInt2ObjectMap; import org.embeddedt.modernfix.util.DynamicInt2ObjectMap;
import org.spongepowered.asm.mixin.*; import org.spongepowered.asm.mixin.*;
@ -31,6 +32,8 @@ public abstract class ItemModelShaperMixin {
private static final ModelResourceLocation SENTINEL_VANILLA = new ModelResourceLocation("modernfix", "sentinel"); private static final ModelResourceLocation SENTINEL_VANILLA = new ModelResourceLocation("modernfix", "sentinel");
private final DynamicModelCache<Item> mfix$itemModelCache = new DynamicModelCache<>(k -> this.mfix$getModelForItem((Item)k), true);
@Inject(method = "<init>", at = @At("RETURN")) @Inject(method = "<init>", at = @At("RETURN"))
private void replaceLocationMap(CallbackInfo ci) { private void replaceLocationMap(CallbackInfo ci) {
overrideLocationsVanilla = new HashMap<>(); overrideLocationsVanilla = new HashMap<>();
@ -47,6 +50,12 @@ public abstract class ItemModelShaperMixin {
return map; return map;
} }
private BakedModel mfix$getModelForItem(Item item) {
ModelResourceLocation map = mfix$getLocation(item);
return map == null ? null : getModelManager().getModel(map);
}
/** /**
* @author embeddedt * @author embeddedt
* @reason Get the stored location for that item and meta, and get the model * @reason Get the stored location for that item and meta, and get the model
@ -54,8 +63,7 @@ public abstract class ItemModelShaperMixin {
**/ **/
@Overwrite @Overwrite
public BakedModel getItemModel(Item item) { public BakedModel getItemModel(Item item) {
ModelResourceLocation map = mfix$getLocation(item); return this.mfix$itemModelCache.get(item);
return map == null ? null : getModelManager().getModel(map);
} }
/** /**
@ -74,5 +82,7 @@ public abstract class ItemModelShaperMixin {
* all models). * all models).
**/ **/
@Overwrite @Overwrite
public void rebuildCache() {} public void rebuildCache() {
this.mfix$itemModelCache.clear();
}
} }