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

Update mixin for 1.19 model data changes

Browse Source
This commit is contained in:
embeddedt 2023-12-26 20:52:23 -05:00
parent b5ef37a713
commit ae561db9e3
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/model_data_manager_cme/ModelDataManagerMixin.java
View File

@ -3,8 +3,7 @@ package org.embeddedt.modernfix.forge.mixin.bugfix.model_data_manager_cme;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.Level; import net.minecraftforge.client.model.data.ModelDataManager;
import net.minecraftforge.client.model.ModelDataManager;
import org.embeddedt.modernfix.annotation.ClientOnlyMixin; import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
@ -23,21 +22,19 @@ import java.util.function.Function;
@Mixin(ModelDataManager.class) @Mixin(ModelDataManager.class)
@ClientOnlyMixin @ClientOnlyMixin
public abstract class ModelDataManagerMixin { public abstract class ModelDataManagerMixin {
@Shadow protected static void refreshModelData(Level world, ChunkPos chunk) { @Shadow protected abstract void refreshAt(ChunkPos chunk);
throw new AssertionError();
}
/** /**
* Make the set of positions to refresh a real concurrent hash set rather than relying on synchronizedSet, * Make the set of positions to refresh a real concurrent hash set rather than relying on synchronizedSet,
* because the returned iterator won't be thread-safe otherwise. See https://github.com/AppliedEnergistics/Applied-Energistics-2/issues/7511 * because the returned iterator won't be thread-safe otherwise. See https://github.com/AppliedEnergistics/Applied-Energistics-2/issues/7511
*/ */
@ModifyArg(method = "requestModelDataRefresh", at = @At(value = "INVOKE", target = "Ljava/util/Map;computeIfAbsent(Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;", ordinal = 0), index = 1) @ModifyArg(method = "requestRefresh", at = @At(value = "INVOKE", target = "Ljava/util/Map;computeIfAbsent(Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;", ordinal = 0), index = 1, remap = false)
private static Function<ChunkPos, Set<BlockPos>> changeTypeOfSetUsed(Function<ChunkPos, Set<BlockPos>> mappingFunction) { private static Function<ChunkPos, Set<BlockPos>> changeTypeOfSetUsed(Function<ChunkPos, Set<BlockPos>> mappingFunction) {
return pos -> Collections.newSetFromMap(new ConcurrentHashMap<>()); return pos -> Collections.newSetFromMap(new ConcurrentHashMap<>());
} }
@Redirect(method = "getModelData(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/level/ChunkPos;)Ljava/util/Map;", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/client/model/ModelDataManager;refreshModelData(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/level/ChunkPos;)V")) @Redirect(method = "getAt(Lnet/minecraft/world/level/ChunkPos;)Ljava/util/Map;", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/client/model/data/ModelDataManager;refreshAt(Lnet/minecraft/world/level/ChunkPos;)V"), remap = false)
private static void onlyRefreshOnMainThread(Level toUpdate, ChunkPos pos) { private void onlyRefreshOnMainThread(ModelDataManager instance, ChunkPos pos) {
// Only refresh model data on the main thread. This prevents calling getBlockEntity from worker threads // Only refresh model data on the main thread. This prevents calling getBlockEntity from worker threads
// which could cause weird CMEs or other behavior. // which could cause weird CMEs or other behavior.
if(Minecraft.getInstance().isSameThread()) { if(Minecraft.getInstance().isSameThread()) {
@ -46,7 +43,7 @@ public abstract class ModelDataManagerMixin {
// try to access model data in neighboring chunks. // try to access model data in neighboring chunks.
for(int x = -1; x <= 1; x++) { for(int x = -1; x <= 1; x++) {
for(int z = -1; z <= 1; z++) { for(int z = -1; z <= 1; z++) {
refreshModelData(toUpdate, new ChunkPos(pos.x + x, pos.z + z)); refreshAt(new ChunkPos(pos.x + x, pos.z + z));
} }
} }
} }