-
-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix concurrency bugs in Mantle models
Backports SlimeKnights/Mantle@eb111d2 Related: embeddedt/embeddium#251
- Loading branch information
Showing
3 changed files
with
77 additions
and
0 deletions.
There are no files selected for viewing
24 changes: 24 additions & 0 deletions
24
...java/org/embeddedt/modernfix/forge/mixin/bugfix/mantle_model_cme/ConnectedModelMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package org.embeddedt.modernfix.forge.mixin.bugfix.mantle_model_cme; | ||
|
|
||
| import org.embeddedt.modernfix.annotation.ClientOnlyMixin; | ||
| import org.embeddedt.modernfix.annotation.RequiresMod; | ||
| import org.spongepowered.asm.mixin.Final; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Mutable; | ||
| import org.spongepowered.asm.mixin.Pseudo; | ||
| import org.spongepowered.asm.mixin.Shadow; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
|
|
||
| @Pseudo | ||
| @Mixin(targets = { "slimeknights/mantle/client/model/connected/ConnectedModel$Baked" }, remap = false) | ||
| @RequiresMod("mantle") | ||
| @ClientOnlyMixin | ||
| public class ConnectedModelMixin { | ||
| @SuppressWarnings("unused") | ||
| @Shadow | ||
| @Final | ||
| @Mutable | ||
| private final Map<String, String> nameMappingCache = new ConcurrentHashMap<>(); | ||
| } |
24 changes: 24 additions & 0 deletions
24
...embeddedt/modernfix/forge/mixin/bugfix/mantle_model_cme/FluidTextureModelLoaderMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package org.embeddedt.modernfix.forge.mixin.bugfix.mantle_model_cme; | ||
|
|
||
| import org.embeddedt.modernfix.annotation.ClientOnlyMixin; | ||
| import org.embeddedt.modernfix.annotation.RequiresMod; | ||
| import org.spongepowered.asm.mixin.Final; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Mutable; | ||
| import org.spongepowered.asm.mixin.Pseudo; | ||
| import org.spongepowered.asm.mixin.Shadow; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
|
|
||
| @Pseudo | ||
| @Mixin(targets = { "slimeknights/mantle/client/model/fluid/FluidTextureModel$Loader" }, remap = false) | ||
| @RequiresMod("mantle") | ||
| @ClientOnlyMixin | ||
| public class FluidTextureModelLoaderMixin { | ||
| @SuppressWarnings("unused") | ||
| @Shadow | ||
| @Final | ||
| @Mutable | ||
| private final Map<?, ?> modelCache = new ConcurrentHashMap<>(); | ||
| } |
29 changes: 29 additions & 0 deletions
29
...rg/embeddedt/modernfix/forge/mixin/bugfix/mantle_model_cme/RetexturedModelBakedMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package org.embeddedt.modernfix.forge.mixin.bugfix.mantle_model_cme; | ||
|
|
||
| import net.minecraft.client.resources.model.BakedModel; | ||
| import net.minecraft.resources.ResourceLocation; | ||
| import org.embeddedt.modernfix.annotation.ClientOnlyMixin; | ||
| import org.embeddedt.modernfix.annotation.RequiresMod; | ||
| import org.spongepowered.asm.mixin.Final; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Mutable; | ||
| import org.spongepowered.asm.mixin.Pseudo; | ||
| import org.spongepowered.asm.mixin.Shadow; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
|
|
||
| /** | ||
| * Fix ConcurrentModificationException from Mantle models by making the cache thread-safe. | ||
| */ | ||
| @Pseudo | ||
| @Mixin(targets = { "slimeknights/mantle/client/model/RetexturedModel$BakedModel" }, remap = false) | ||
| @RequiresMod("mantle") | ||
| @ClientOnlyMixin | ||
| public class RetexturedModelBakedMixin { | ||
| @SuppressWarnings("unused") | ||
| @Shadow | ||
| @Final | ||
| @Mutable | ||
| private final Map<ResourceLocation, BakedModel> cache = new ConcurrentHashMap<>(); | ||
| } |